From 7b9d6af90f3ed77f04377ac8c8bc1514eff38c62 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Mon, 21 Apr 2025 20:50:24 +0800 Subject: [PATCH] gnu: rust-rustc-demangle-capi-0.1: Move to (gnu packages rust-sources). * gnu/packages/crates-io.scm (rust-rustc-demangle-capi-0.1): Move to... * gnu/packages/rust-sources.scm (rust-rustc-demangle-capi-0.1): ...here. * gnu/packages/linux.scm: Adjust module import. * gnu/packages/qt.scm: Likewise. * gnu/packages/rust-crates.scm (lookup-cargo-inputs) [rust-rustc-demangle-capi-0.1]: New entry. Change-Id: Ib679b6caebcd31ff793c48a63aa3aa998c99a157 --- gnu/packages/crates-io.scm | 31 ------------------------------- gnu/packages/linux.scm | 2 +- gnu/packages/qt.scm | 2 +- gnu/packages/rust-crates.scm | 3 +++ gnu/packages/rust-sources.scm | 32 ++++++++++++++++++++++++++++++++ 5 files changed, 37 insertions(+), 33 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 46d8cf4b727cc3120741bfd85fa4944735ded683..9f928455ac1cd90f6dfc5d61beada37a2b37b87e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -71389,37 +71389,6 @@ reading and writing BAM files.") (license (list license:asl2.0 license:expat)))) -(define-public rust-rustc-demangle-capi-0.1 - (package - (name "rust-rustc-demangle-capi") - (version "0.1.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "rustc-demangle-capi" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1s2g4z1yrh1sxl4qkmpd19ss3x2lr9115vbir7pnhgy63r1d63yv")))) - (build-system cargo-build-system) - (arguments - (list - #:cargo-inputs `(("rust-rustc-demangle" ,rust-rustc-demangle-0.1)) - #:phases - #~(modify-phases %standard-phases - (add-after 'install 'install-c-library - (lambda _ - (install-file - (car (find-files "." "^rustc_demangle\\.h$")) - (string-append #$output "/include")) - (install-file - (car (find-files "." "^librustc_demangle.so$")) - (string-append #$output "/lib"))))))) - (home-page "https://github.com/alexcrichton/rustc-demangle") - (synopsis "C API for the @code{rustc-demangle} crate") - (description "This package provides a C API library for the -@code{rustc-demangle} crate.") - (license (list license:expat license:asl2.0)))) - (define-public rust-rustc-hash-2 (package (name "rust-rustc-hash") diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a9bd64e6748a1e24ab9f8143779d5bcb5ce5fee2..36cef84b149b61a0dc240462de456f38de477970 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -118,7 +118,6 @@ #:use-module (gnu packages check) #:use-module (gnu packages cpio) #:use-module (gnu packages cpp) - #:use-module (gnu packages crates-io) #:use-module (gnu packages crypto) #:use-module (gnu packages cryptsetup) #:use-module (gnu packages compression) @@ -182,6 +181,7 @@ #:use-module (gnu packages rpc) #:use-module (gnu packages rrdtool) #:use-module (gnu packages rsync) + #:use-module (gnu packages rust-sources) #:use-module (gnu packages samba) #:use-module (gnu packages sdl) #:use-module (gnu packages serialization) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 20e60fc7323edb9a24c9b921a0512d5003f065a5..263740b6feb8cb246660a4879f18128754036638 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -78,7 +78,6 @@ #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) - #:use-module (gnu packages crates-io) #:use-module (gnu packages cups) #:use-module (gnu packages curl) #:use-module (gnu packages databases) @@ -128,6 +127,7 @@ #:use-module (gnu packages kde) #:use-module (gnu packages regex) #:use-module (gnu packages ruby) + #:use-module (gnu packages rust-sources) #:use-module (gnu packages sdl) #:use-module (gnu packages serialization) #:use-module (gnu packages sqlite) diff --git a/gnu/packages/rust-crates.scm b/gnu/packages/rust-crates.scm index 39d47f44591330f4843e73c6c200a4ea32eea049..19b81c6bf00d49a4e1d06cdf16b4b531648cc1d3 100644 --- a/gnu/packages/rust-crates.scm +++ b/gnu/packages/rust-crates.scm @@ -33102,6 +33102,9 @@ rust-windows-x86-64-gnu-0.52.6 rust-windows-x86-64-gnullvm-0.52.6 rust-windows-x86-64-msvc-0.52.6)) + (rust-rustc-demangle-capi-0.1 => + (list + rust-rustc-demangle-0.1.24)) (rust-smithay-for-niri => (list rust-adler2-2.0.0 rust-ahash-0.8.11 diff --git a/gnu/packages/rust-sources.scm b/gnu/packages/rust-sources.scm index 91b72287a544af124f1c6dd3ab2f9ba80a0ac7b3..85ae5f512f26585d61f5551b1f190fcb56f14b29 100644 --- a/gnu/packages/rust-sources.scm +++ b/gnu/packages/rust-sources.scm @@ -391,6 +391,38 @@ UTF-32 support.") (description "This package provided safe, fast, small crypto using Rust.") (license (list license:isc license:openssl))))) +(define-public rust-rustc-demangle-capi-0.1 + (hidden-package + (package + (name "rust-rustc-demangle-capi") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustc-demangle-capi" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1s2g4z1yrh1sxl4qkmpd19ss3x2lr9115vbir7pnhgy63r1d63yv")))) + (build-system cargo-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-c-library + (lambda _ + (install-file + (car (find-files "." "^rustc_demangle\\.h$")) + (string-append #$output "/include")) + (install-file + (car (find-files "." "^librustc_demangle.so$")) + (string-append #$output "/lib"))))))) + (inputs (cargo-inputs 'rust-rustc-demangle-capi-0.1)) + (home-page "https://github.com/alexcrichton/rustc-demangle") + (synopsis "C API for the @code{rustc-demangle} crate") + (description "This package provides a C API library for the +@code{rustc-demangle} crate.") + (license (list license:expat license:asl2.0))))) + (define-public rust-smithay-for-niri (let ((commit "0cd3345c59f7cb139521f267956a1a4e33248393") (revision "0"))