03/03: gnu: rust: Use 'generate-all-checksums'.

[guix-commits]

efraim pushed a commit to branch staging
in repository guix.

commit e07b04882a621f0e78ec9cc81071722529530290
Author: Efraim Flashner <address@hidden>
Date:   Mon Aug 12 14:04:31 2019 +0300

    gnu: rust: Use 'generate-all-checksums'.
    
    * gnu/packages/rust.scm (rust@1.19)[arguments]: During custom
    'patch-cargo-checksums phase, replace call to 'generate-checksums' with
    call to 'generate-all-checksums'.
    (rust@1.32)[arguments]: Same.
---
 gnu/packages/rust.scm | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index b4c5043..584c48a 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -4,7 +4,7 @@
 ;;; Copyright © 2016 ng0 <address@hidden>
 ;;; Copyright © 2017 Ben Woodcroft <address@hidden>
 ;;; Copyright © 2017, 2018 Nikolai Merinov <address@hidden>
-;;; Copyright © 2017 Efraim Flashner <address@hidden>
+;;; Copyright © 2017, 2019 Efraim Flashner <address@hidden>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <address@hidden>
 ;;; Copyright © 2018 Danny Milosavljevic <address@hidden>
 ;;; Copyright © 2019 Ivan Petkov <address@hidden>
@@ -196,7 +196,7 @@ safety and thread safety guarantees.")
     (properties '((timeout . 72000)               ;20 hours
                   (max-silent-time . 18000)))     ;5 hours (for armel)
     (arguments
-     `(#:imported-modules ,%cargo-utils-modules ;for `generate-checksums'
+     `(#:imported-modules ,%cargo-utils-modules ;for `generate-all-checksums'
        #:modules ((guix build utils) (ice-9 match) (guix build 
gnu-build-system))
        #:phases
        (modify-phases %standard-phases
@@ -273,16 +273,7 @@ test = { path = \"../libtest\" }
              (substitute* "src/Cargo.lock"
                (("(\"checksum .* = )\".*\"" all name)
                 (string-append name "\"" ,%cargo-reference-hash "\"")))
-             (for-each
-              (lambda (filename)
-                (use-modules (guix build cargo-utils))
-                (delete-file filename)
-                (let* ((dir (dirname filename)))
-                  (display (string-append
-                            "patch-cargo-checksums: generate-checksums for "
-                            dir "\n"))
-                  (generate-checksums dir)))
-              (find-files "src/vendor" ".cargo-checksum.json"))
+             (generate-all-checksums "src/vendor")
              #t))
          ;; This phase is overridden by newer versions.
          (replace 'configure
@@ -978,16 +969,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
                  (substitute* "Cargo.lock"
                    (("(\"checksum .* = )\".*\"" all name)
                     (string-append name "\"" ,%cargo-reference-hash "\"")))
-                 (for-each
-                  (lambda (filename)
-                    (use-modules (guix build cargo-utils))
-                    (delete-file filename)
-                    (let* ((dir (dirname filename)))
-                      (display (string-append
-                                "patch-cargo-checksums: generate-checksums for 
"
-                                dir "\n"))
-                      (generate-checksums dir)))
-                  (find-files "vendor" ".cargo-checksum.json"))
+                 (generate-all-checksums "vendor")
                  #t))
              (add-after 'enable-codegen-tests 'override-jemalloc
                (lambda* (#:key inputs #:allow-other-keys)