[bug#75242] [PATCH rust-team 1/2] gnu: rust-bzip2-0.3: Downgrade to 0.3.2.

[bug#75242] [PATCH rust-team 1/2] gnu: rust-bzip2-0.3: Downgrade to 0.3.2.

[Herman Rimm via Guix-patches via]

rust-buffered-reader-0.9 and rust-sequoia-openpgp-0.9 require ^0.3.2.

* gnu/packages/crates-compression.scm (rust-bzip2-0.3): Downgrade.
[source]: Remove bzip2-sys path.
[arguments]: Build.  Remove rust-partial-io-0.2, use rust-quicheck-0.2
instead of 0.4.

Change-Id: Ifaa98cf43c4aa5c44358dd225a62b102f9e1218d
---
 gnu/packages/crates-compression.scm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-compression.scm b/gnu/packages/crates-compression.scm
index 78a92108f03..08ce7a8a6c2 100644
--- a/gnu/packages/crates-compression.scm
+++ b/gnu/packages/crates-compression.scm
@@ -285,7 +285,8 @@ (define-public rust-bzip2-0.3
   (package
     (inherit rust-bzip2-0.4)
     (name "rust-bzip2")
-    (version "0.3.3")
+    ;; XXX: Version 0.3.3 relies on a non-existant partial-io version.
+    (version "0.3.2")
     (source
      (origin
        (method url-fetch)
@@ -293,18 +294,19 @@ (define-public rust-bzip2-0.3
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0fvfwanp42j1zpig880jhb5mc0na50bijmwd6211p77sy35w7ds2"))))
+        (base32 "095yi13ajgnbcmza9s4c7fspzzlqa0bk3hdiwryq43afqi1grsn3"))
+       (modules '((guix build utils)))
+       (snippet #~(substitute* "Cargo.toml"
+                    ((", path =.*}") "}")))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-bzip2-sys" ,rust-bzip2-sys-0.1)
         ("rust-futures" ,rust-futures-0.1)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-tokio-io" ,rust-tokio-io-0.1))
        #:cargo-development-inputs
-       (("rust-partial-io" ,rust-partial-io-0.2)
-        ("rust-quickcheck" ,rust-quickcheck-0.4)
+       (("rust-quickcheck" ,rust-quickcheck-0.2)
         ("rust-rand" ,rust-rand-0.3)
         ("rust-tokio-core" ,rust-tokio-core-0.1))))))
 

base-commit: 5f92f009a19c1a5a8b7df5a7bcb1e1f283a953f8
-- 
2.45.2

[bug#75242] [PATCH rust-team 2/2] gnu: rust-partial-io-0.2: Remove.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-partial-io-0.2): Delete variable.

Change-Id: I63a3f1d49211a083b31a3d01a55d0b7f89c8738a
---
 gnu/packages/crates-io.scm | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 480b5b21e4d..720a1764dce 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -50774,31 +50774,6 @@ (define-public rust-partial-io-0.3
         ("rust-quickcheck" ,rust-quickcheck-0.6)
         ("rust-tokio-core" ,rust-tokio-core-0.1))))))
 
-(define-public rust-partial-io-0.2
-  (package
-    (inherit rust-partial-io-0.3)
-    (name "rust-partial-io")
-    (version "0.2.5")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "partial-io" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "03iynvayh11a4mckhwflm5y1qmnkw5m3b20gzi1crpasndy3h8xx"))))
-    (arguments
-     `(#:cargo-inputs
-       (("rust-futures" ,rust-futures-0.1)
-        ("rust-quickcheck" ,rust-quickcheck-0.4)
-        ("rust-tokio-io" ,rust-tokio-io-0.1))
-       #:cargo-development-inputs
-       (("rust-lazy-static" ,rust-lazy-static-0.2)
-        ("rust-quickcheck" ,rust-quickcheck-0.4)
-        ("rust-tokio-core" ,rust-tokio-core-0.1))))
-    (license license:bsd-3)))
-
 (define-public rust-partial-ref-0.3
   (package
     (name "rust-partial-ref")
-- 
2.45.2

[bug#75242] [PATCH rust-team 1/2] gnu: rust-bzip2-0.3: Downgrade to 0.3.2.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 921 bytes --]

Good find!

I'm actually going to take this opportunity to see about packaging
pijul, which should take care of this also.  If that doesn't work then I
think we'll go with your patch.

On Wed, Jan 01, 2025 at 12:33:07PM +0100, Herman Rimm wrote:
> rust-buffered-reader-0.9 and rust-sequoia-openpgp-0.9 require ^0.3.2.
> 
> * gnu/packages/crates-compression.scm (rust-bzip2-0.3): Downgrade.
> [source]: Remove bzip2-sys path.
> [arguments]: Build.  Remove rust-partial-io-0.2, use rust-quicheck-0.2
> instead of 0.4.
> 
> Change-Id: Ifaa98cf43c4aa5c44358dd225a62b102f9e1218d
> ---
>  gnu/packages/crates-compression.scm | 14 ++++++++------
>  1 file changed, 8 insertions(+), 6 deletions(-)

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

bug#75242: [PATCH rust-team 1/2] gnu: rust-bzip2-0.3: Downgrade to 0.3.2.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 297 bytes --]

With pijul packaged and these two crates removed we no longer need these
patches.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]