[bug#75096] [PATCH rust-team 1/9] gnu: rust-sha1-0.2: Use snippet.

[bug#75096] [PATCH rust-team 1/9] gnu: rust-sha1-0.2: Use snippet.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-crypto.scm (rust-sha-0.2): Add snippet.
[phases]: Remove 'fix-cargo-toml phase.

Change-Id: Iaaa129e438a8798f9a8f8d418bb3c9302c7c6fcb
---
 gnu/packages/crates-crypto.scm | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm
index fef6ba8d44..2b4f81e023 100644
--- a/gnu/packages/crates-crypto.scm
+++ b/gnu/packages/crates-crypto.scm
@@ -5714,23 +5714,17 @@ (define-public rust-sha1-0.2
      (origin
        (method url-fetch)
        (uri (crate-uri "sha1" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "0p09zfhd27z6yr5in07gfjcx345010rw51ivlcf14364x3hv2c6c"))))
+        (base32 "0p09zfhd27z6yr5in07gfjcx345010rw51ivlcf14364x3hv2c6c"))
+       (modules '((guix build utils)))
+       (snippet #~(substitute* "Cargo.toml"
+                    ((", path =.*}") "}")))))
     (arguments
      `(#:tests? #f  ; Tests require openssl-1.0
        #:cargo-development-inputs
        (("rust-openssl" ,rust-openssl-0.7)
-        ("rust-rand" ,rust-rand-0.3))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-cargo-toml
-           (lambda _
-             (substitute* "Cargo.toml"
-               ((", path =.*}") "}"))
-             #t)))))))
+        ("rust-rand" ,rust-rand-0.3))))))
 
 (define-public rust-sha1-asm-0.5
   (package

base-commit: 893599007e9304ea9785ebb839946cc5979ecd45
-- 
2.45.2

[bug#75096] [PATCH rust-team 2/9] gnu: rust-itertools-0.9: Use snippet.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-itertools-0.9): Add snippet.
[phases]: Remove patch-cargo-toml phase.

Change-Id: I27e5999daa849c2e9300ab5d7174c093a23f28ea
---
 gnu/packages/crates-io.scm | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4e05235585..2286eabb75 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -38810,14 +38810,15 @@ (define-public rust-itertools-0.9
     (name "rust-itertools")
     (version "0.9.0")
     (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "itertools" version))
-        (file-name
-         (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0jyml7ygr7kijkcjdl3fk5f34y5h5jsavclim7l13zjiavw1hkr8"))))
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "itertools" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0jyml7ygr7kijkcjdl3fk5f34y5h5jsavclim7l13zjiavw1hkr8"))
+       (modules '((guix build utils)))
+       (snippet #~(substitute* "Cargo.toml"
+                    (("=0.3.0") "0.3")))))
     (arguments
      `(#:cargo-inputs
        (("rust-either" ,rust-either-1))
@@ -38825,14 +38826,7 @@ (define-public rust-itertools-0.9
        (("rust-criterion" ,rust-criterion-0.3)
         ("rust-permutohedron" ,rust-permutohedron-0.2)
         ("rust-quickcheck" ,rust-quickcheck-0.9)
-        ("rust-rand" ,rust-rand-0.7))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-cargo-toml
-           (lambda _
-             (substitute* "Cargo.toml"
-               (("=0.3.0") "0.3"))
-             #t)))))))
+        ("rust-rand" ,rust-rand-0.7))))))
 
 (define-public rust-itertools-0.8
   (package
-- 
2.45.2

[bug#75096] [PATCH rust-team 3/9] gnu: rust-openssl-0.7: Use snippet.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-openssl-0.7): Add snippet.
[phases]: Remove fix-cargo-toml phase.

Change-Id: I27e5999daa849c2e9300ab5d7174c093a23f28ea
---
 gnu/packages/crates-io.scm | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2286eabb75..0518e9e98b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -54307,11 +54307,12 @@ (define-public rust-openssl-0.7
      (origin
        (method url-fetch)
        (uri (crate-uri "openssl" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "0cw767rbasg4dbsfcsnxqm3q5ljkv6s1jq0a2p82xi5a8ii7n4f4"))))
+        (base32 "0cw767rbasg4dbsfcsnxqm3q5ljkv6s1jq0a2p82xi5a8ii7n4f4"))
+       (modules '((guix build utils)))
+       (snippet #~(substitute* "Cargo.toml"
+                    ((", path =.*}") "}")))))
     (arguments
      `(#:skip-build? #t ; Build depends on openssl-1.0.
        #:cargo-inputs
@@ -54325,14 +54326,7 @@ (define-public rust-openssl-0.7
        (("rust-net2" ,rust-net2-0.2)
         ("rust-rustc-serialize" ,rust-rustc-serialize-0.3)
         ("rust-winapi" ,rust-winapi-0.2)
-        ("rust-ws2-32-sys" ,rust-ws2-32-sys-0.2))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-cargo-toml
-           (lambda _
-             (substitute* "Cargo.toml"
-               ((", path =.*}") "}"))
-             #t)))))))
+        ("rust-ws2-32-sys" ,rust-ws2-32-sys-0.2))))))
 
 (define-public rust-openssl-macros-0.1
   (package
-- 
2.45.2

[bug#75096] [PATCH rust-team 4/9] gnu: rust-openssl-sys-extras-0.7: Use snippet.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-openssl-sys-extras-0.7): Add snippet.
[phases]: Remove fix-cargo-toml phase.

Change-Id: I27e5999daa849c2e9300ab5d7174c093a23f28ea
---
 gnu/packages/crates-io.scm | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0518e9e98b..ccced67305 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -54450,25 +54450,19 @@ (define-public rust-openssl-sys-extras-0.7
      (origin
        (method url-fetch)
        (uri (crate-uri "openssl-sys-extras" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "1ymrmfnknyjji74fflbnnq9r5ihx25h0vgs5y203vl6klzdy3i8i"))))
+        (base32 "1ymrmfnknyjji74fflbnnq9r5ihx25h0vgs5y203vl6klzdy3i8i"))
+       (modules '((guix build utils)))
+       (snippet #~(substitute* "Cargo.toml"
+                    ((", path =.*}") "}")))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t ; Depends on openssl-1.0.
        #:cargo-inputs
        (("rust-libc" ,rust-libc-0.2)
         ("rust-openssl-sys" ,rust-openssl-sys-0.7)
-        ("rust-gcc" ,rust-gcc-0.3))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-cargo-toml
-           (lambda _
-             (substitute* "Cargo.toml"
-               ((", path =.*}") "}"))
-             #t)))))
+        ("rust-gcc" ,rust-gcc-0.3))))
     (home-page "https://github.com/sfackler/rust-openssl")
     (synopsis
      "Extra FFI bindings to OpenSSL that require a C shim")
-- 
2.45.2

[bug#75096] [PATCH rust-team 5/9] gnu: rust-serde-0.9: Use snippet.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-serde-0.9): Add snippet.
[phases]: Remove fix-cargo-toml phase.

Change-Id: I27e5999daa849c2e9300ab5d7174c093a23f28ea
---
 gnu/packages/crates-io.scm | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ccced67305..672846f54c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -75664,20 +75664,14 @@ (define-public rust-serde-0.9
      (origin
        (method url-fetch)
        (uri (crate-uri "serde" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "1bsla8l5xr9pp5sirkal6mngxcq6q961km88jvf339j5ff8j7dil"))))
+        (base32 "1bsla8l5xr9pp5sirkal6mngxcq6q961km88jvf339j5ff8j7dil"))
+       (modules '((guix build utils)))
+       (snippet #~(substitute* "Cargo.toml"
+                    ((", path =.*}") "}")))))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-cargo-toml
-           (lambda _
-             (substitute* "Cargo.toml"
-               ((", path =.*}") "}"))
-             #t)))
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-serde-derive" ,rust-serde-derive-0.9))
        #:cargo-development-inputs
        (("rust-serde-derive" ,rust-serde-derive-0.9))))))
-- 
2.45.2

[bug#75096] [PATCH rust-team 6/9] gnu: rust-serde-derive-0.9: Use snippet.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-serde-derive-0.9): Add snippet.
[phases]: Remove fix-cargo-toml phase.

Change-Id: I27e5999daa849c2e9300ab5d7174c093a23f28ea
---
 gnu/packages/crates-io.scm | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 672846f54c..f08278c9ce 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -75967,20 +75967,14 @@ (define-public rust-serde-derive-0.9
      (origin
        (method url-fetch)
        (uri (crate-uri "serde_derive" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "1fkldf0lnl6pwxs00qpyp79m30qmfpi3bk0wm22211ylyikdi3wp"))))
+        (base32 "1fkldf0lnl6pwxs00qpyp79m30qmfpi3bk0wm22211ylyikdi3wp"))
+       (modules '((guix build utils)))
+       (snippet #~(substitute* "Cargo.toml"
+                    ((", path =.*}") "}")))))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-cargo-toml
-           (lambda _
-             (substitute* "Cargo.toml"
-               ((", path =.*}") "}"))
-             #t)))
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-quote" ,rust-quote-0.3)
         ("rust-serde-codegen-internals" ,rust-serde-codegen-internals-0.14)
         ("rust-syn" ,rust-syn-0.11))))))
-- 
2.45.2

[bug#75096] [PATCH rust-team 7/9] gnu: rust-serde-test-0.9: Use snippet.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-serde-test-0.9): Add snippet.
[phases]: Remove fix-cargo-toml phase.

Change-Id: I27e5999daa849c2e9300ab5d7174c093a23f28ea
---
 gnu/packages/crates-io.scm | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f08278c9ce..e5c93436c4 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -76522,20 +76522,14 @@ (define-public rust-serde-test-0.9
      (origin
        (method url-fetch)
        (uri (crate-uri "serde_test" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "193mf0qkhvjywd06x6hhmkixlqcyfbpfwfmr75dp2b8xwzpsvxwf"))))
+        (base32 "193mf0qkhvjywd06x6hhmkixlqcyfbpfwfmr75dp2b8xwzpsvxwf"))
+       (modules '((guix build utils)))
+       (snippet #~(substitute* "Cargo.toml"
+                    ((", path =.*}") "}")))))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-cargo-toml
-           (lambda _
-             (substitute* "Cargo.toml"
-               ((", path =.*}") "}"))
-             #t)))
-       #:cargo-inputs (("rust-serde" ,rust-serde-0.9))))))
+     `(#:cargo-inputs (("rust-serde" ,rust-serde-0.9))))))
 
 (define-public rust-serde-test-0.8
   (package
-- 
2.45.2

[bug#75096] [PATCH rust-team 8/9] gnu: rust-serde-test-0.8: Use snippet.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-serde-test-0.8): Add snippet.
[phases]: Remove fix-Cargo-toml phase.

Change-Id: I39a361603f5b7277e99c3b15c0b2ef4ffafd422f
---
 gnu/packages/crates-io.scm | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e5c93436c4..7b8d6bedf3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -76542,17 +76542,12 @@ (define-public rust-serde-test-0.8
        (uri (crate-uri "serde_test" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "1m939j7cgs7i58r6vxf0ffp3nbr8advr8p9dqa9w8zk0z2yks2qi"))))
+        (base32 "1m939j7cgs7i58r6vxf0ffp3nbr8advr8p9dqa9w8zk0z2yks2qi"))
+       (modules '((guix build utils)))
+       (snippet #~(substitute* "Cargo.toml"
+                    ((", path = \"../serde\"") "")))))
     (arguments
-     `(#:cargo-inputs (("rust-serde" ,rust-serde-0.8))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-Cargo-toml
-           (lambda _
-             (substitute* "Cargo.toml"
-               ((", path = \"../serde\"") ""))
-             #t)))))))
+     `(#:cargo-inputs (("rust-serde" ,rust-serde-0.8))))))
 
 (define-public rust-serde-transcode-1
   (package
-- 
2.45.2

[bug#75096] [PATCH rust-team 9/9] gnu: rust-synstructure-0.12: Use snippet.

[Herman Rimm via Guix-patches via]

* gnu/packages/crates-io.scm (rust-synstructure-0.12): Add snippet.
[phases]: Remove fix-test phase.

Change-Id: Ie8f966b4f76c4de18a0e4a18a89c81064b8a6beb
---
 gnu/packages/crates-io.scm | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7b8d6bedf3..859e6aaa7d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -84685,11 +84685,13 @@ (define-public rust-synstructure-0.12
      (origin
        (method url-fetch)
        (uri (crate-uri "synstructure" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "03r1lydbf3japnlpc4wka7y90pmz1i0danaj3f9a7b431akdlszk"))))
+        (base32 "03r1lydbf3japnlpc4wka7y90pmz1i0danaj3f9a7b431akdlszk"))
+       (modules '((guix build utils)))
+       (snippet #~(substitute* "src/lib.rs"
+                    (("non_upper_case_globals )")
+                     "non_upper_case_globals)")))))
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -84698,14 +84700,8 @@ (define-public rust-synstructure-0.12
         ("rust-syn" ,rust-syn-1)
         ("rust-quote" ,rust-quote-1))
        #:cargo-development-inputs
-       (("rust-synstructure-test-traits" ,rust-synstructure-test-traits-0.1))
-       #:phases
-       (modify-phases %standard-phases
-         ;; https://github.com/mystor/synstructure/issues/51
-         (add-after 'unpack 'fix-test
-           (lambda _
-             (substitute* "src/lib.rs"
-               (("non_upper_case_globals )") "non_upper_case_globals)")))))))))
+       (("rust-synstructure-test-traits"
+         ,rust-synstructure-test-traits-0.1))))))
 
 (define-public rust-synstructure-test-traits-0.1
   (package
-- 
2.45.2

bug#75096: [PATCH rust-team 1/9] gnu: rust-sha1-0.2: Use snippet.

[Efraim Flashner]

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

Thanks! Patches pushed to the rust-team branch.

-- 
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 --]