bug#57864: rust-zstd-sys bundles zstd

bug#57864: rust-zstd-sys bundles zstd

[Maxime Devos]

[-- Attachment #1.1.1: Type: text/plain, Size: 387 bytes --]

X-Debbugs-CC: Arun Isaac <arunisaac@systemreboot.net>

^ author of the commit adding the rust-zstd-sys

I noticed that the package 'rust-zstd-sys' bundles a copy of zstd.  This 
is against policy for the reasons documented in the manual.  This 
package was added in commit 4402eb48cdd18aed8072696496362f2e774e973f.

I'll try unbundling it in antioxidant.

Greetings,
Maxime.

[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 929 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]

bug#57864: rust-zstd-sys bundles zstd

[Maxime Devos]

[-- Attachment #1.1.1: Type: text/plain, Size: 1808 bytes --]

Solved as follows in antioxidant (i.e., enable the 'pkg-config' feature 
and remove the local copy in a snippet).

diff --git a/antioxidant-packages.scm b/antioxidant-packages.scm
index e851bc9..b0296e7 100644
--- a/antioxidant-packages.scm
+++ b/antioxidant-packages.scm
@@ -4708,6 +4708,7 @@ RFC-compliant `EmailAddress` newtype. ")
      ;; rust-num-bigint-dig's zeroize feature requires the "derive"
      ;; feature of rust-zeroize
      ("rust-zeroize" ,#~'("default" "derive"))
+    ("rust-zstd-sys" ,#~'("default" "pkg-config" "non-cargo"))
      ("rust-zip" ,#~'("bzip2" "deflate" "time" "zstd")))) ; avoid 
default "aes-crypto" feature, which requiers an ol

  (define %replacements
@@ -5748,6 +5749,8 @@ RFC-compliant `EmailAddress` newtype. ")
       (("rust-parking-lot" ,(p rust-parking-lot-0.11)))) ; test input
      ("rust-zip" ; new inputs for new version
       (("rust-zstd" ,(p rust-zstd-0.9))))
+    ("rust-zstd-sys"
+     (("zstd:lib" ,(@ (gnu packages compression) zstd) "lib")))
      ("sniffglue" (("rust-bstr" ,(@ (gnu packages crates-io) 
rust-bstr-0.2))))))

  (define %no-parallel-tests?
@@ -6628,6 +6631,14 @@ RFC-compliant `EmailAddress` newtype. ")
                (inherit (package-source pack))
                (modules '((guix build utils)))
                (snippet #~(delete-file-recursively "source"))))
+            ("rust-zstd-sys"
+             ;; Unbundle zstd
+             (origin
+              (inherit (package-source pack))
+              (modules '((guix build utils)))
+              (snippet #~(begin
+                           (delete-file-recursively "zstd")
+                           (delete-file "zstd.h")))))
              ("rust-itoa"
               (origin
                (inherit (package-source pack))

[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 929 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]

bug#57864: rust-zstd-sys bundles zstd

[Arun Isaac]

Hi Maxime,

> X-Debbugs-CC: Arun Isaac <arunisaac@systemreboot.net>
>
> ^ author of the commit adding the rust-zstd-sys
>
> I noticed that the package 'rust-zstd-sys' bundles a copy of zstd.  This 
> is against policy for the reasons documented in the manual.  This 
> package was added in commit 4402eb48cdd18aed8072696496362f2e774e973f.
>
> I'll try unbundling it in antioxidant.

Sorry for the trouble. Thanks for working on this!

Regards,
Arun