[bug#56775] [PATCH] gnu: rust-miniz-oxide: Do not skip build.

[bug#56775] [PATCH] gnu: rust-miniz-oxide: Do not skip build.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm
(rust-miniz-oxide-0.2): Keeping skip-build? #t.
(rust-miniz-oxide-0.3): Deleting skip-build? #t.
(rust-miniz-oxide-0.4): Deleting skip-build? #t.
---
 gnu/packages/crates-io.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 41e5041c79..30e2db0777 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -34832,8 +34832,7 @@ (define-public rust-miniz-oxide-0.4
         (base32 "17d1xp29v5xgh4vahxld14w1c1hgh38qmxpv7i18wy096gn2cb8g"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-adler" ,rust-adler-0.2)
         ("rust-autocfg" ,rust-autocfg-1)
         ("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
@@ -34861,8 +34860,7 @@ (define-public rust-miniz-oxide-0.3
          (base32
           "198n4hfpq0qcxf275l6fpzh7b9cl7ck2xs6pjgpds74bazv9yrxa"))))
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs (("rust-adler32" ,rust-adler32-1))))))
+     `(#:cargo-inputs (("rust-adler32" ,rust-adler32-1))))))
 
 (define-public rust-miniz-oxide-0.2
   (package
@@ -34877,7 +34875,8 @@ (define-public rust-miniz-oxide-0.2
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "17f92krv9hhsyc38prpfyn99m2hqhr4fgszpsla66a6gcrnpbhxn"))))))
+         "17f92krv9hhsyc38prpfyn99m2hqhr4fgszpsla66a6gcrnpbhxn"))))
+    (arguments `(#:skip-build? #t))))
 
 (define-public rust-miniz-oxide-c-api-0.2
   (package
-- 
2.37.1

[bug#56775] [PATCH 1/4] gnu: Add rust-adler-1.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm
(rust-adler-1): New variable.
(rust-adler-0.2): Add development-inputs.
---
 gnu/packages/crates-io.scm | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 30e2db0777..8ddceaabfc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1815,23 +1815,24 @@ (define-public rust-addr2line-0.9
         ("rust-memmap" ,rust-memmap-0.7)
         ("rust-rustc-test" ,rust-rustc-test-0.3))))))
 
-(define-public rust-adler-0.2
+(define-public rust-adler-1
   (package
     (name "rust-adler")
-    (version "0.2.3")
+    (version "1.0.2")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "adler" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0zpdsrfq5bd34941gmrlamnzjfbsx0x586afb7b0jqhr8g1lwapf"))))
+        (base32 "1zim79cvzd5yrkzl3nyfx0avijwgk9fqv3yrscdy1cc79ih02qpj"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
-        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))))
+        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3))))
     (home-page "https://github.com/jonas-schievink/adler")
     (synopsis "Implementation of the Adler-32 checksum")
     (description
@@ -1842,6 +1843,20 @@ (define-public rust-adler-0.2
            license:asl2.0
            (license:non-copyleft "https://spdx.org/licenses/0BSD.html")))))
 
+(define-public rust-adler-0.2
+  (package
+    (inherit rust-adler-1)
+    (name "rust-adler")
+    (version "0.2.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "adler" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0zpdsrfq5bd34941gmrlamnzjfbsx0x586afb7b0jqhr8g1lwapf"))))
+    (build-system cargo-build-system)))
+
 (define-public rust-adler32-1
   (package
     (name "rust-adler32")
-- 
2.37.1

[bug#56775] [PATCH 2/4] gnu: rust-adler32-1: Update to 1.2.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-adler32-1): Update to 1.2.0.
---
 gnu/packages/crates-io.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8ddceaabfc..1b9fd827d9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1860,7 +1860,7 @@ (define-public rust-adler-0.2
 (define-public rust-adler32-1
   (package
     (name "rust-adler32")
-    (version "1.1.0")
+    (version "1.2.0")
     (source
       (origin
         (method url-fetch)
@@ -1869,15 +1869,19 @@ (define-public rust-adler32-1
           (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "0bgks405vz823bphgwhj4l9h6vpfh900s0phfk4qqijyh9xhfysn"))))
+          "0d7jq7jsjyhsgbhnfq5fvrlh9j0i9g1fqrl2735ibv5f75yjgqda"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
         ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))
        #:cargo-development-inputs
-       (("rust-bencher" ,rust-bencher-0.1)
-        ("rust-rand" ,rust-rand-0.4))))
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-getrandom" ,rust-getrandom-0.1)
+        ("rust-humansize" ,rust-humansize-1)
+        ("rust-rand" ,rust-rand-0.7)
+        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
     (home-page "https://github.com/remram44/adler32-rs")
     (synopsis "Implementation of the Adler32 rolling hash algorithm")
     (description
-- 
2.37.1

[bug#56775] [PATCH 2/4] gnu: rust-adler32-1: Update to 1.2.0.

[Maxime Devos]

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


On 26-07-2022 09:26, Nicolas Graves via Guix-patches via wrote:
> +        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
> +        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))

These will be automatically removed  by antioxidant, as Guix does not 
support cross-compilation to wasm, so you don't need to include them 
unless leaving them out causes build failures.

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#56775] [PATCH 2/4] gnu: rust-adler32-1: Update to 1.2.0.

[( via Guix-patches via]

On Tue Jul 26, 2022 at 11:14 AM BST, Maxime Devos wrote:
>
> These will be automatically removed by antioxidant, as Guix does not 
> support cross-compilation to wasm, so you don't need to include them 
> unless leaving them out causes build failures.
>
> Greetings,
> Maxime.
It will cause build failures, because Cargo requires you to include all
dependencies, even the optional/unused ones.

    -- (

[bug#56775] [PATCH 2/4] gnu: rust-adler32-1: Update to 1.2.0.

[Maxime Devos]

[-- Attachment #1.1.1.1: Type: text/plain, Size: 677 bytes --]


On 26-07-2022 12:21, ( wrote:
> On Tue Jul 26, 2022 at 11:14 AM BST, Maxime Devos wrote:
>> These will be automatically removed by antioxidant, as Guix does not
>> support cross-compilation to wasm, so you don't need to include them
>> unless leaving them out causes build failures.
>>
>> Greetings,
>> Maxime.
> It will cause build failures, because Cargo requires you to include all
> dependencies, even the optional/unused ones.

This is true for some kind of dependencies (e.g., build-dependencies 
IIRC) but not for other kind of dependencies (e.g. dependencies) IIRC. I 
don't know which of them is the case for dev-dependencies.

Greetings,
Maxime.


[-- Attachment #1.1.1.2: Type: text/html, Size: 1241 bytes --]

[-- 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#56775] [PATCH 2/4] gnu: rust-adler32-1: Update to 1.2.0.

[( via Guix-patches via]

On Tue Jul 26, 2022 at 11:47 AM BST, Maxime Devos wrote:
> This is true for some kind of dependencies (e.g., build-dependencies 
> IIRC) but not for other kind of dependencies (e.g. dependencies) IIRC. I 
> don't know which of them is the case for dev-dependencies.
That has not been the case in my experience; Cargo seems to want them all
to be provided.

    -- (

[bug#56775] [PATCH 2/4] gnu: rust-adler32-1: Update to 1.2.0.

[Nicolas Graves via Guix-patches via]

Tested and it indeed fails

phase `patch-cargo-checksums' succeeded after 41.5 seconds
starting phase `build'
error: no matching package named `wasm-bindgen-test` found
location searched: registry `crates-io`
required by package `adler32 v1.2.0 (/tmp/guix-build-rust-adler32-1.2.0.drv-0/adler32-1.2.0)`
error: in phase 'build': uncaught exception:
%exception #<&invoke-error program: "cargo" arguments: ("build" "--release") exit-status: 101 term-signal: #f stop-signal: #f>
phase `build' failed after 0.2 seconds

-- 
Best regards,
Nicolas Graves

[bug#56775] [PATCH 2/4] gnu: rust-adler32-1: Update to 1.2.0.

[Marius Bakke]

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

Nicolas Graves via Guix-patches via <guix-patches@gnu.org> skriver:

> * gnu/packages/crates-io.scm (rust-adler32-1): Update to 1.2.0.

This causes a rebuild of 500+ packages through 'librsvg', so I pushed it
to the 'staging' branch in 7aad4a99f790e256ef03bcf4c6a619560ae48075.

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

[bug#56775] [PATCH 3/4] gnu: Add rust-simd-adler32-0.3.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-simd-adler32-0.3): New variable.
---
 gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1b9fd827d9..1673daabe5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -56506,6 +56506,33 @@ (define-public rust-simd-0.1
        #:cargo-development-inputs
        (("rust-cfg-if" ,rust-cfg-if-0.1))))))
 
+(define-public rust-simd-adler32-0.3
+  (package
+    (name "rust-simd-adler32")
+    (version "0.3.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "simd-adler32" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "060b9v15s3miq06582cj2ywam92ph6xs34s62mc8az3xc4wxz98l"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs
+       (("rust-adler" ,rust-adler-1)
+        ("rust-adler32" ,rust-adler32-1)
+        ("rust-criterion" ,rust-criterion-0.3)
+        ("rust-rand" ,rust-rand-0.8))))
+    (home-page "https://github.com/mcountryman/simd-adler32")
+    (synopsis
+     "Adler-32 rolling hash algorithm implementation")
+    (description
+     "This package provides a SIMD-accelerated Adler-32 rolling hash algorithm
+implementation in Rust.")
+    (license license:expat)))
+
 (define-public rust-simd-helpers-0.1
   (package
     (name "rust-simd-helpers")
-- 
2.37.1

[bug#56775] [PATCH 4/4] gnu: Add rust-miniz-oxide-0.5.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-miniz-oxide-0.5): New variable.
---
 gnu/packages/crates-io.scm | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1673daabe5..b5cbc17ced 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -34838,25 +34838,25 @@ (define-public rust-minimal-lexical-0.1
         (sha256
          (base32 "0xynhr97vyv5n5lls41dl7bfa3ba122lix9mqij1l7yprl6n6r4w"))))))
 
-(define-public rust-miniz-oxide-0.4
+(define-public rust-miniz-oxide-0.5
   (package
     (name "rust-miniz-oxide")
-    (version "0.4.3")
+    (version "0.5.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "miniz_oxide" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "17d1xp29v5xgh4vahxld14w1c1hgh38qmxpv7i18wy096gn2cb8g"))))
+        (base32 "1k1wfxb35v129mhqy14yqhrj3wvknafrwygiq7zvi0m5iml7ap3g"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-adler" ,rust-adler-0.2)
-        ("rust-autocfg" ,rust-autocfg-1)
+       (("rust-adler" ,rust-adler-1)
         ("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
         ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
-        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))))
+        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)
+        ("rust-simd-adler32" ,rust-simd-adler32-0.3))))
     (home-page  "https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide")
     (synopsis "Pure rust replacement for the miniz DEFLATE/zlib encoder/decoder")
     (description
@@ -34865,6 +34865,19 @@ (define-public rust-miniz-oxide-0.4
 streaming API for miniz_oxide.")
     (license (list license:expat license:zlib license:asl2.0))))
 
+(define-public rust-miniz-oxide-0.4
+  (package
+    (inherit rust-miniz-oxide-0.5)
+    (name "rust-miniz-oxide")
+    (version "0.4.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "miniz_oxide" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "17d1xp29v5xgh4vahxld14w1c1hgh38qmxpv7i18wy096gn2cb8g"))))))
+
 (define-public rust-miniz-oxide-0.3
   (package
     (inherit rust-miniz-oxide-0.4)
-- 
2.37.1

[bug#56775] [PATCH 4/4] gnu: Add rust-miniz-oxide-0.5.

[Maxime Devos]

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


On 26-07-2022 09:26, Nicolas Graves via Guix-patches via wrote:
>       (arguments
>        `(#:cargo-inputs
> -       (("rust-adler" ,rust-adler-0.2)
> -        ("rust-autocfg" ,rust-autocfg-1)
> +       (("rust-adler" ,rust-adler-1)
>           ("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
>           ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
> -        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))))
> +        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)
> +        ("rust-simd-adler32" ,rust-simd-adler32-0.3))))

You are removing rust-autocfg, but @0.4.3 still uses that, so this would 
cause a build failure for dependents of @0.4.3. Well, maybe not because 
of how cargo-build-system effectively propagates inputs, but antioxidant 
doesn't do propagation.

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#56775] [PATCH] gnu: Add rust-miniz-oxide-0.5.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-miniz-oxide-0.5): New variable.
---
 gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1673daabe5..58218ac8dc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -34838,25 +34838,25 @@ (define-public rust-minimal-lexical-0.1
         (sha256
          (base32 "0xynhr97vyv5n5lls41dl7bfa3ba122lix9mqij1l7yprl6n6r4w"))))))
 
-(define-public rust-miniz-oxide-0.4
+(define-public rust-miniz-oxide-0.5
   (package
     (name "rust-miniz-oxide")
-    (version "0.4.3")
+    (version "0.5.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "miniz_oxide" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "17d1xp29v5xgh4vahxld14w1c1hgh38qmxpv7i18wy096gn2cb8g"))))
+        (base32 "1k1wfxb35v129mhqy14yqhrj3wvknafrwygiq7zvi0m5iml7ap3g"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-adler" ,rust-adler-0.2)
-        ("rust-autocfg" ,rust-autocfg-1)
+       (("rust-adler" ,rust-adler-1)
         ("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
         ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
-        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))))
+        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)
+        ("rust-simd-adler32" ,rust-simd-adler32-0.3))))
     (home-page  "https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide")
     (synopsis "Pure rust replacement for the miniz DEFLATE/zlib encoder/decoder")
     (description
@@ -34865,6 +34865,26 @@ (define-public rust-miniz-oxide-0.4
 streaming API for miniz_oxide.")
     (license (list license:expat license:zlib license:asl2.0))))
 
+(define-public rust-miniz-oxide-0.4
+  (package
+    (inherit rust-miniz-oxide-0.5)
+    (name "rust-miniz-oxide")
+    (version "0.4.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "miniz_oxide" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "17d1xp29v5xgh4vahxld14w1c1hgh38qmxpv7i18wy096gn2cb8g"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-adler" ,rust-adler-0.2)
+        ("rust-autocfg" ,rust-autocfg-1)
+        ("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+        ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
+        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)))))
+
 (define-public rust-miniz-oxide-0.3
   (package
     (inherit rust-miniz-oxide-0.4)
-- 
2.37.1

[bug#56775] [PATCH] gnu: Add rust-miniz-oxide-0.5.

[Nicolas Graves via Guix-patches via]

The last patch sent replaces the fourth so that rust-autocfg stays in
cargo-inputs for 0.4.

Nicolas 

bug#56775: [PATCH] gnu: Add rust-miniz-oxide-0.5.

[Marius Bakke]

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

Nicolas Graves via Guix-patches via <guix-patches@gnu.org> skriver:

> * gnu/packages/crates-io.scm (rust-miniz-oxide-0.5): New variable.

[...]

> +(define-public rust-miniz-oxide-0.4
> +  (package
> +    (inherit rust-miniz-oxide-0.5)
> +    (name "rust-miniz-oxide")
> +    (version "0.4.3")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (crate-uri "miniz_oxide" version))
> +       (file-name (string-append name "-" version ".tar.gz"))
> +       (sha256
> +        (base32 "17d1xp29v5xgh4vahxld14w1c1hgh38qmxpv7i18wy096gn2cb8g"))))
> +    (arguments
> +     `(#:cargo-inputs
> +       (("rust-adler" ,rust-adler-0.2)
> +        ("rust-autocfg" ,rust-autocfg-1)
> +        ("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
> +        ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
> +        ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)))))
                                                                                 ^
This message was missing a closing paren.  I fixed that, and also
updated your copyright header in crates-io.scm, hope that was okay.

Patches pushed in 9a1cd6e7e8..56e17f6493.

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