efraim pushed a commit to branch rust-team
in repository guix.

commit dbd49505e5ff658b6829bc323b0e3c126544d559
Author: Efraim Flashner <[email protected]>
AuthorDate: Thu Dec 26 21:55:14 2024 +0200

    gnu: rust-libdelfate-sys: Move to (gnu packages crates-compression).
    
    * gnu/packages/crates-io.scm (rust-libdeflate-sys-1,
    rust-libdeflate-sys-0.12, rust-libdeflate-sys-0.11,
    rust-libdeflate-sys-0.7): Move from here ...
    * gnu/packages/crates-compression.scm: ... to here.
    
    Change-Id: Id83e569fbe3a0af759e24a8ee4340ee483473a6a
---
 gnu/packages/crates-compression.scm | 79 +++++++++++++++++++++++++++++++++++++
 gnu/packages/crates-io.scm          | 77 ------------------------------------
 2 files changed, 79 insertions(+), 77 deletions(-)

diff --git a/gnu/packages/crates-compression.scm 
b/gnu/packages/crates-compression.scm
index 1fe11d380d..94ed9e09af 100644
--- a/gnu/packages/crates-compression.scm
+++ b/gnu/packages/crates-compression.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2022 Ricardo Wurmus <[email protected]>
 ;;; Copyright © 2024 Steve George <[email protected]>
 ;;; Copyright © 2024 Wilko Meyer <[email protected]>
+;;; Copyright © 2024 Troy Figiel <[email protected]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -551,3 +552,81 @@ of gzip files based on the gzip header implementation in 
the @code{flate2} crate
     (synopsis "Parallel compression library")
     (description "This package provides a library for parallel compression.")
     (license (list license:unlicense license:expat))))
+
+(define-public rust-libdeflate-sys-1
+  (package
+    (name "rust-libdeflate-sys")
+    (version "1.23.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "libdeflate-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "0hbrhz3jxjs4a3lnyw9c2wlfknmijb7ahxbs53kcnpvri9y6cfs1"))
+              (snippet
+               #~(begin (use-modules (guix build utils))
+                        ;; Prefer the system libdeflate.
+                        (substitute* "Cargo.toml"
+                          (("^dynamic") "default = [\"dynamic\"]\ndynamic"))
+                        ;; Accept any version of libdeflate.
+                        (substitute* "build.rs"
+                          ((".*exactly_version.*") ""))
+                        (delete-file-recursively "libdeflate")))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cc" ,rust-cc-1)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3))))
+    (native-inputs (list pkg-config))
+    (inputs (list libdeflate))
+    (home-page "https://github.com/adamkewley/libdeflater";)
+    (synopsis "Bindings to libdeflate")
+    (description
+     "This package provides bindings to libdeflate for DEFLATE (de)compression
+exposed as non-streaming buffer operations.  It contains bindings for raw
+deflate, zlib, and gzip data.")
+    (license license:asl2.0)))
+
+;; TODO: Unbundle libdeflate
+(define-public rust-libdeflate-sys-0.12
+  (package
+    (inherit rust-libdeflate-sys-1)
+    (name "rust-libdeflate-sys")
+    (version "0.12.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "libdeflate-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 
"11a7nn3p73vw3cnra36vz7mz60wx9jzhzwwji1hbmql5gy0v1xz1"))))
+    (arguments
+     `(#:cargo-inputs (("rust-cc" ,rust-cc-1))))))
+
+(define-public rust-libdeflate-sys-0.11
+  (package
+    (inherit rust-libdeflate-sys-1)
+    (name "rust-libdeflate-sys")
+    (version "0.11.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "libdeflate-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 
"0xs2wdly73ar7r9qyrbwnkwjjz4wd92kv5h78cdxfrsbp2v88ryb"))))
+    (arguments
+     `(#:cargo-inputs (("rust-cc" ,rust-cc-1))))))
+
+(define-public rust-libdeflate-sys-0.7
+  (package
+    (inherit rust-libdeflate-sys-0.11)
+    (name "rust-libdeflate-sys")
+    (version "0.7.5")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "libdeflate-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0a5pkrxa7zcb0nab2j48dn6j8d8g1pjvz196c308wrax6dpazkjc"))))
+    (arguments
+     `(#:cargo-inputs (("rust-cc" ,rust-cc-1))))))
+
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 34b2fca949..59004dd5f8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -39865,83 +39865,6 @@ macros on libc without stdlib.")
     (description "This package provides FFI bindings to libdbus.")
     (license (list license:asl2.0 license:expat))))
 
-(define-public rust-libdeflate-sys-1
-  (package
-    (name "rust-libdeflate-sys")
-    (version "1.23.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "libdeflate-sys" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32 "0hbrhz3jxjs4a3lnyw9c2wlfknmijb7ahxbs53kcnpvri9y6cfs1"))
-              (snippet
-               #~(begin (use-modules (guix build utils))
-                        ;; Prefer the system libdeflate.
-                        (substitute* "Cargo.toml"
-                          (("^dynamic") "default = [\"dynamic\"]\ndynamic"))
-                        ;; Accept any version of libdeflate.
-                        (substitute* "build.rs"
-                          ((".*exactly_version.*") ""))
-                        (delete-file-recursively "libdeflate")))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs (("rust-cc" ,rust-cc-1)
-                       ("rust-pkg-config" ,rust-pkg-config-0.3))))
-    (native-inputs (list pkg-config))
-    (inputs (list libdeflate))
-    (home-page "https://github.com/adamkewley/libdeflater";)
-    (synopsis "Bindings to libdeflate")
-    (description
-     "This package provides bindings to libdeflate for DEFLATE (de)compression
-exposed as non-streaming buffer operations.  It contains bindings for raw
-deflate, zlib, and gzip data.")
-    (license license:asl2.0)))
-
-;; TODO: Unbundle libdeflate
-(define-public rust-libdeflate-sys-0.12
-  (package
-    (inherit rust-libdeflate-sys-1)
-    (name "rust-libdeflate-sys")
-    (version "0.12.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "libdeflate-sys" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32 
"11a7nn3p73vw3cnra36vz7mz60wx9jzhzwwji1hbmql5gy0v1xz1"))))
-    (arguments
-     `(#:cargo-inputs (("rust-cc" ,rust-cc-1))))))
-
-(define-public rust-libdeflate-sys-0.11
-  (package
-    (inherit rust-libdeflate-sys-1)
-    (name "rust-libdeflate-sys")
-    (version "0.11.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "libdeflate-sys" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32 
"0xs2wdly73ar7r9qyrbwnkwjjz4wd92kv5h78cdxfrsbp2v88ryb"))))
-    (arguments
-     `(#:cargo-inputs (("rust-cc" ,rust-cc-1))))))
-
-(define-public rust-libdeflate-sys-0.7
-  (package
-    (inherit rust-libdeflate-sys-0.11)
-    (name "rust-libdeflate-sys")
-    (version "0.7.5")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "libdeflate-sys" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0a5pkrxa7zcb0nab2j48dn6j8d8g1pjvz196c308wrax6dpazkjc"))))
-    (arguments
-     `(#:cargo-inputs (("rust-cc" ,rust-cc-1))))))
-
 (define-public rust-libdeflater-1
   (package
     (name "rust-libdeflater")

Reply via email to