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

commit 6833f83d5ea1279fd4db7578be4d5be7505aae66
Author: Efraim Flashner <[email protected]>
AuthorDate: Thu Dec 26 21:45:26 2024 +0200

    gnu: rust-deflate: Move to (gnu packages crates-compression).
    
    * gnu/packages/crates-io.scm (rust-deflate-1, rust-deflate-0.9,
    rust-deflate-0.8, rust-deflate-0.7, rust-deflate64-0.1): Move from here
    * gnu/packages/crates-compression.scm: ... to here.
    
    Change-Id: If8a06a94dba191b258af8d52fc98a5df801bf8a4
---
 gnu/packages/crates-compression.scm | 116 ++++++++++++++++++++++++++++++++++++
 gnu/packages/crates-graphics.scm    |   1 +
 gnu/packages/crates-io.scm          | 113 -----------------------------------
 3 files changed, 117 insertions(+), 113 deletions(-)

diff --git a/gnu/packages/crates-compression.scm 
b/gnu/packages/crates-compression.scm
index a8693c72e4..94172dbee0 100644
--- a/gnu/packages/crates-compression.scm
+++ b/gnu/packages/crates-compression.scm
@@ -5,6 +5,9 @@
 ;;; Copyright © 2020 Hartmut Goebel <[email protected]>
 ;;; Copyright © 2020, 2023, 2024 Efraim Flashner <[email protected]>
 ;;; Copyright © 2022 Aleksandr Vityazev <[email protected]>
+;;; Copyright © 2022 Petr Hodina <[email protected]>
+;;; Copyright © 2022 Marius Bakke <[email protected]>
+;;; Copyright © 2024 Steve George <[email protected]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -320,3 +323,116 @@ exposed as Reader/Writer streams.")
 exposed as Reader/Writer streams.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-deflate-1
+  (package
+    (name "rust-deflate")
+    (version "1.0.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "deflate" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0bs319wa9wl7pn9j6jrrxg1gaqbak581rkx210cbix0qyljpwvy8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f      ; not all test files included
+       #:cargo-inputs
+       (("rust-adler32" ,rust-adler32-1)
+        ("rust-gzip-header" ,rust-gzip-header-1))
+       #:cargo-development-inputs
+       (("rust-miniz-oxide" ,rust-miniz-oxide-0.5))))
+    (home-page "https://github.com/image-rs/deflate-rs";)
+    (synopsis "DEFLATE, zlib and gzip encoder written in rust")
+    (description "This package provides a DEFLATE, zlib and gzip encoder
+written in rust.")
+    (license (list license:expat license:asl2.0))))
+
+(define-public rust-deflate-0.9
+  (package
+    (inherit rust-deflate-1)
+    (name "rust-deflate")
+    (version "0.9.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "deflate" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0w0ww0hrq4bjnihxgbnrri4lj5c8yzg31fyzx36fd9pvvw2vz5az"))))
+    (arguments
+     `(#:tests? #f      ; not all test files included
+       #:cargo-inputs
+       (("rust-adler32" ,rust-adler32-1)
+        ("rust-gzip-header" ,rust-gzip-header-0.3))
+       #:cargo-development-inputs
+       (("rust-miniz-oxide" ,rust-miniz-oxide-0.3))))))
+
+(define-public rust-deflate-0.8
+  (package
+    (inherit rust-deflate-0.9)
+    (name "rust-deflate")
+    (version "0.8.6")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "deflate" version))
+        (file-name
+         (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0x6iqlayg129w63999kz97m279m0jj4x4sm6gkqlvmp73y70yxvk"))))
+    (arguments
+     `(#:tests? #f      ; not all test files included
+       #:cargo-inputs
+         (("rust-adler32" ,rust-adler32-1)
+          ("rust-byteorder" ,rust-byteorder-1)
+          ("rust-gzip-header" ,rust-gzip-header-0.3))
+       #:cargo-development-inputs
+         (("rust-miniz-oxide" ,rust-miniz-oxide-0.3))))))
+
+(define-public rust-deflate-0.7
+  (package
+    (inherit rust-deflate-0.8)
+    (name "rust-deflate")
+    (version "0.7.20")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "deflate" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1d7d9fpmgjnznrksmd3vlv3dyw01wsrm11ifil6ag22871xnlyvh"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-adler32" ,rust-adler32-1)
+        ("rust-byteorder" ,rust-byteorder-1)
+        ("rust-gzip-header" ,rust-gzip-header-0.3)
+        ("rust-flate2" ,rust-flate2-1))))))
+
+(define-public rust-deflate64-0.1
+  (package
+    (name "rust-deflate64")
+    (version "0.1.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "deflate64" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+          "06scix17pa7wzzfsnhkycpcc6s04shs49cdaxx2k1sl0226jnsfs"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs (("rust-bytemuck" ,rust-bytemuck-1)
+                                   ("rust-proptest" ,rust-proptest-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://github.com/anatawa12/deflate64-rs#readme";)
+    (synopsis "Deflate64 implementation based on .NET's implementation")
+    (description "Deflate64 implementation based on .NET's implementation.")
+    (license license:expat)))
+
diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 278e8d6006..fc3c05bc3b 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -44,6 +44,7 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages crates-apple)
   #:use-module (gnu packages crates-check)
+  #:use-module (gnu packages crates-compression)
   #:use-module (gnu packages crates-io)
   #:use-module (gnu packages crates-web)
   #:use-module (gnu packages crates-windows)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8a7e89fefe..47a5ef3c7f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -20855,119 +20855,6 @@ verifying the contents.")
 thread.")
     (license license:mpl2.0)))
 
-(define-public rust-deflate-1
-  (package
-    (name "rust-deflate")
-    (version "1.0.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "deflate" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0bs319wa9wl7pn9j6jrrxg1gaqbak581rkx210cbix0qyljpwvy8"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:tests? #f      ; not all test files included
-       #:cargo-inputs
-       (("rust-adler32" ,rust-adler32-1)
-        ("rust-gzip-header" ,rust-gzip-header-1))
-       #:cargo-development-inputs
-       (("rust-miniz-oxide" ,rust-miniz-oxide-0.5))))
-    (home-page "https://github.com/image-rs/deflate-rs";)
-    (synopsis "DEFLATE, zlib and gzip encoder written in rust")
-    (description "This package provides a DEFLATE, zlib and gzip encoder
-written in rust.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-deflate-0.9
-  (package
-    (inherit rust-deflate-1)
-    (name "rust-deflate")
-    (version "0.9.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "deflate" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0w0ww0hrq4bjnihxgbnrri4lj5c8yzg31fyzx36fd9pvvw2vz5az"))))
-    (arguments
-     `(#:tests? #f      ; not all test files included
-       #:cargo-inputs
-       (("rust-adler32" ,rust-adler32-1)
-        ("rust-gzip-header" ,rust-gzip-header-0.3))
-       #:cargo-development-inputs
-       (("rust-miniz-oxide" ,rust-miniz-oxide-0.3))))))
-
-(define-public rust-deflate-0.8
-  (package
-    (inherit rust-deflate-0.9)
-    (name "rust-deflate")
-    (version "0.8.6")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "deflate" version))
-        (file-name
-         (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0x6iqlayg129w63999kz97m279m0jj4x4sm6gkqlvmp73y70yxvk"))))
-    (arguments
-     `(#:tests? #f      ; not all test files included
-       #:cargo-inputs
-         (("rust-adler32" ,rust-adler32-1)
-          ("rust-byteorder" ,rust-byteorder-1)
-          ("rust-gzip-header" ,rust-gzip-header-0.3))
-       #:cargo-development-inputs
-         (("rust-miniz-oxide" ,rust-miniz-oxide-0.3))))))
-
-(define-public rust-deflate-0.7
-  (package
-    (inherit rust-deflate-0.8)
-    (name "rust-deflate")
-    (version "0.7.20")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "deflate" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1d7d9fpmgjnznrksmd3vlv3dyw01wsrm11ifil6ag22871xnlyvh"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-adler32" ,rust-adler32-1)
-        ("rust-byteorder" ,rust-byteorder-1)
-        ("rust-gzip-header" ,rust-gzip-header-0.3)
-        ("rust-flate2" ,rust-flate2-1))))))
-
-(define-public rust-deflate64-0.1
-  (package
-    (name "rust-deflate64")
-    (version "0.1.9")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "deflate64" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-          "06scix17pa7wzzfsnhkycpcc6s04shs49cdaxx2k1sl0226jnsfs"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-development-inputs (("rust-bytemuck" ,rust-bytemuck-1)
-                                   ("rust-proptest" ,rust-proptest-1)
-                                   ("rust-tempfile" ,rust-tempfile-3))))
-    (home-page "https://github.com/anatawa12/deflate64-rs#readme";)
-    (synopsis "Deflate64 implementation based on .NET's implementation")
-    (description "Deflate64 implementation based on .NET's implementation.")
-    (license license:expat)))
-
 (define-public rust-defmac-0.2
   (package
     (name "rust-defmac")

Reply via email to