efraim pushed a commit to branch rust-team
in repository guix.
commit 5b04a96ab2002bafe4e2f34cf0a8ab1bd18e803b
Author: Efraim Flashner <[email protected]>
AuthorDate: Thu Dec 26 22:06:19 2024 +0200
gnu: rust-zip: Move to (gnu packages crates-compression).
* gnu/packages/crates-io.scm (rust-zip-2, rust-zip-0.6, rust-zip-0.5):
Move from here ...
* gnu/packages/crates-compression.scm: ... to here.
Change-Id: I0c441b3f7e6d30fa6866ca0e9f83bcebb4e2ac58
---
gnu/packages/crates-compression.scm | 120 +++++++++++++++++++++++++++++++++++-
gnu/packages/crates-io.scm | 118 -----------------------------------
gnu/packages/crates-windows.scm | 1 +
3 files changed, 120 insertions(+), 119 deletions(-)
diff --git a/gnu/packages/crates-compression.scm
b/gnu/packages/crates-compression.scm
index c6e8804cf0..173ff8670a 100644
--- a/gnu/packages/crates-compression.scm
+++ b/gnu/packages/crates-compression.scm
@@ -9,7 +9,7 @@
;;; Copyright © 2022 Petr Hodina <[email protected]>
;;; Copyright © 2022 Marius Bakke <[email protected]>
;;; Copyright © 2022 Ricardo Wurmus <[email protected]>
-;;; Copyright © 2024 Steve George <[email protected]>
+;;; Copyright © 2023, 2024 Steve George <[email protected]>
;;; Copyright © 2024 Wilko Meyer <[email protected]>
;;; Copyright © 2024 Troy Figiel <[email protected]>
;;; Copyright © 2024 Herman Rimm <[email protected]>
@@ -806,6 +806,124 @@ algorithm and related formats (ZLIB, GZIP).")
#:cargo-development-inputs
(("rust-libflate" ,rust-libflate-1))))))
+(define-public rust-zip-2
+ (package
+ (name "rust-zip")
+ (version "2.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "zip" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "151lrzswjkhwzlr6dkmgbi4s51sa8dr496n6mwiswms0xa444pnw"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; loosen version requirement for rust-clap-4
+ '(begin (substitute* "Cargo.toml"
+ (("version = \"=") "version = \"^"))))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #f ;;tests missing
+ #:cargo-inputs
+ (("rust-aes" ,rust-aes-0.8)
+ ("rust-arbitrary" ,rust-arbitrary-1)
+ ("rust-bzip2" ,rust-bzip2-0.4)
+ ("rust-chrono" ,rust-chrono-0.4)
+ ("rust-constant-time-eq" ,rust-constant-time-eq-0.3)
+ ("rust-crc32fast" ,rust-crc32fast-1)
+ ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
+ ("rust-deflate64" ,rust-deflate64-0.1)
+ ("rust-displaydoc" ,rust-displaydoc-0.2)
+ ("rust-flate2" ,rust-flate2-1)
+ ("rust-hmac" ,rust-hmac-0.12)
+ ("rust-indexmap" ,rust-indexmap-2)
+ ("rust-lzma-rs" ,rust-lzma-rs-0.3)
+ ("rust-memchr" ,rust-memchr-2)
+ ("rust-pbkdf2" ,rust-pbkdf2-0.12)
+ ("rust-rand" ,rust-rand-0.8)
+ ("rust-sha1" ,rust-sha1-0.10)
+ ("rust-thiserror" ,rust-thiserror-1)
+ ("rust-time" ,rust-time-0.3)
+ ("rust-zeroize" ,rust-zeroize-1)
+ ("rust-zopfli" ,rust-zopfli-0.8)
+ ("rust-zstd" ,rust-zstd-0.13))
+ #:cargo-development-inputs
+ (("rust-anyhow" ,rust-anyhow-1)
+ ("rust-bencher" ,rust-bencher-0.1)
+ ("rust-clap" ,rust-clap-4)
+ ("rust-getrandom" ,rust-getrandom-0.2)
+ ("rust-tempdir" ,rust-tempdir-0.3)
+ ("rust-time" ,rust-time-0.3)
+ ("rust-walkdir" ,rust-walkdir-2))))
+ (native-inputs (list pkg-config))
+ (inputs (list (list zstd "lib")))
+ (home-page "https://github.com/zip-rs/zip2";)
+ (synopsis "Library to support reading and writing Zip files")
+ (description
+ "Rust library for reading and writing Zip files.")
+ (license license:expat)))
+
+(define-public rust-zip-0.6
+ (package
+ (inherit rust-zip-2)
+ (name "rust-zip")
+ (version "0.6.6")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "zip" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0qcjbqfvbwxi5g9wbymf2r05cvziic2qqj4xy64q3hp48vi980vn"))))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-aes" ,rust-aes-0.8)
+ ("rust-byteorder" ,rust-byteorder-1)
+ ("rust-bzip2" ,rust-bzip2-0.4)
+ ("rust-constant-time-eq" ,rust-constant-time-eq-0.1)
+ ("rust-crc32fast" ,rust-crc32fast-1)
+ ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
+ ("rust-flate2" ,rust-flate2-1)
+ ("rust-hmac" ,rust-hmac-0.12)
+ ("rust-pbkdf2" ,rust-pbkdf2-0.11)
+ ("rust-sha1" ,rust-sha1-0.10)
+ ("rust-time" ,rust-time-0.3)
+ ("rust-zstd" ,rust-zstd-0.11))
+ #:cargo-development-inputs
+ (("rust-bencher" ,rust-bencher-0.1)
+ ("rust-getrandom" ,rust-getrandom-0.2)
+ ("rust-time" ,rust-time-0.3)
+ ("rust-walkdir" ,rust-walkdir-2))))
+ (native-inputs (list pkg-config))
+ (inputs (list (list zstd "lib")))))
+
+(define-public rust-zip-0.5
+ (package
+ (inherit rust-zip-0.6)
+ (name "rust-zip")
+ (version "0.5.13")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "zip" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0588z88sj37nj1clis1rf4fh794av0hwaiaihfrin9b19n24iawk"))))
+ (arguments
+ `(#:skip-build? #t
+ #:cargo-inputs
+ (("rust-byteorder" ,rust-byteorder-1)
+ ("rust-bzip2" ,rust-bzip2-0.4)
+ ("rust-crc32fast" ,rust-crc32fast-1)
+ ("rust-flate2" ,rust-flate2-1)
+ ("rust-thiserror" ,rust-thiserror-1)
+ ("rust-time" ,rust-time-0.1))))
+ (native-inputs '())
+ (inputs '())))
+
(define-public rust-zopfli-0.8
(package
(name "rust-zopfli")
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0b7c364aae..fd4fd168f5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -97346,124 +97346,6 @@ implementation that works everywhere, even WASM!")
(description "This package provides custom derive for the zerovec crate.")
(license license:unicode)))
-(define-public rust-zip-2
- (package
- (name "rust-zip")
- (version "2.2.0")
- (source
- (origin
- (method url-fetch)
- (uri (crate-uri "zip" version))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32 "151lrzswjkhwzlr6dkmgbi4s51sa8dr496n6mwiswms0xa444pnw"))
- (modules '((guix build utils)))
- (snippet
- ;; loosen version requirement for rust-clap-4
- '(begin (substitute* "Cargo.toml"
- (("version = \"=") "version = \"^"))))))
- (build-system cargo-build-system)
- (arguments
- `(#:tests? #f ;;tests missing
- #:cargo-inputs
- (("rust-aes" ,rust-aes-0.8)
- ("rust-arbitrary" ,rust-arbitrary-1)
- ("rust-bzip2" ,rust-bzip2-0.4)
- ("rust-chrono" ,rust-chrono-0.4)
- ("rust-constant-time-eq" ,rust-constant-time-eq-0.3)
- ("rust-crc32fast" ,rust-crc32fast-1)
- ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
- ("rust-deflate64" ,rust-deflate64-0.1)
- ("rust-displaydoc" ,rust-displaydoc-0.2)
- ("rust-flate2" ,rust-flate2-1)
- ("rust-hmac" ,rust-hmac-0.12)
- ("rust-indexmap" ,rust-indexmap-2)
- ("rust-lzma-rs" ,rust-lzma-rs-0.3)
- ("rust-memchr" ,rust-memchr-2)
- ("rust-pbkdf2" ,rust-pbkdf2-0.12)
- ("rust-rand" ,rust-rand-0.8)
- ("rust-sha1" ,rust-sha1-0.10)
- ("rust-thiserror" ,rust-thiserror-1)
- ("rust-time" ,rust-time-0.3)
- ("rust-zeroize" ,rust-zeroize-1)
- ("rust-zopfli" ,rust-zopfli-0.8)
- ("rust-zstd" ,rust-zstd-0.13))
- #:cargo-development-inputs
- (("rust-anyhow" ,rust-anyhow-1)
- ("rust-bencher" ,rust-bencher-0.1)
- ("rust-clap" ,rust-clap-4)
- ("rust-getrandom" ,rust-getrandom-0.2)
- ("rust-tempdir" ,rust-tempdir-0.3)
- ("rust-time" ,rust-time-0.3)
- ("rust-walkdir" ,rust-walkdir-2))))
- (native-inputs (list pkg-config))
- (inputs (list (list zstd "lib")))
- (home-page "https://github.com/zip-rs/zip2";)
- (synopsis "Library to support reading and writing Zip files")
- (description
- "Rust library for reading and writing Zip files.")
- (license license:expat)))
-
-(define-public rust-zip-0.6
- (package
- (inherit rust-zip-2)
- (name "rust-zip")
- (version "0.6.6")
- (source
- (origin
- (method url-fetch)
- (uri (crate-uri "zip" version))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32 "0qcjbqfvbwxi5g9wbymf2r05cvziic2qqj4xy64q3hp48vi980vn"))))
- (arguments
- `(#:cargo-inputs
- (("rust-aes" ,rust-aes-0.8)
- ("rust-byteorder" ,rust-byteorder-1)
- ("rust-bzip2" ,rust-bzip2-0.4)
- ("rust-constant-time-eq" ,rust-constant-time-eq-0.1)
- ("rust-crc32fast" ,rust-crc32fast-1)
- ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
- ("rust-flate2" ,rust-flate2-1)
- ("rust-hmac" ,rust-hmac-0.12)
- ("rust-pbkdf2" ,rust-pbkdf2-0.11)
- ("rust-sha1" ,rust-sha1-0.10)
- ("rust-time" ,rust-time-0.3)
- ("rust-zstd" ,rust-zstd-0.11))
- #:cargo-development-inputs
- (("rust-bencher" ,rust-bencher-0.1)
- ("rust-getrandom" ,rust-getrandom-0.2)
- ("rust-time" ,rust-time-0.3)
- ("rust-walkdir" ,rust-walkdir-2))))
- (native-inputs (list pkg-config))
- (inputs (list (list zstd "lib")))))
-
-(define-public rust-zip-0.5
- (package
- (inherit rust-zip-0.6)
- (name "rust-zip")
- (version "0.5.13")
- (source
- (origin
- (method url-fetch)
- (uri (crate-uri "zip" version))
- (file-name
- (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "0588z88sj37nj1clis1rf4fh794av0hwaiaihfrin9b19n24iawk"))))
- (arguments
- `(#:skip-build? #t
- #:cargo-inputs
- (("rust-byteorder" ,rust-byteorder-1)
- ("rust-bzip2" ,rust-bzip2-0.4)
- ("rust-crc32fast" ,rust-crc32fast-1)
- ("rust-flate2" ,rust-flate2-1)
- ("rust-thiserror" ,rust-thiserror-1)
- ("rust-time" ,rust-time-0.1))))
- (native-inputs '())
- (inputs '())))
-
(define-public rust-zlib-rs-0.4
(package
(name "rust-zlib-rs")
diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index c1b503629e..97b2ad0752 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -42,6 +42,7 @@
#:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages crates-check)
+ #:use-module (gnu packages crates-compression)
#:use-module (gnu packages crates-crypto)
#:use-module (gnu packages crates-io))
