01/03: build/cargo-build-system: Move generate-all-checksums to cargo-utils.

[guix-commits]

efraim pushed a commit to branch staging
in repository guix.

commit 17c26b7ec52b21f19234eaf160036ad400071eb0
Author: Efraim Flashner <address@hidden>
Date:   Mon Aug 12 13:57:44 2019 +0300

    build/cargo-build-system: Move generate-all-checksums to cargo-utils.
    
    * guix/build/cargo-build-system.scm (generate-all-checksums): Move
    procedure ...
    * guix/build/cargo-utils.scm: ... to here.
---
 guix/build/cargo-build-system.scm | 15 ---------------
 guix/build/cargo-utils.scm        | 16 +++++++++++++++-
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/guix/build/cargo-build-system.scm 
b/guix/build/cargo-build-system.scm
index 7d363a1..8aa9390 100644
--- a/guix/build/cargo-build-system.scm
+++ b/guix/build/cargo-build-system.scm
@@ -40,21 +40,6 @@
 ;;
 ;; Code:
 
-;; TODO: Move this to (guix build cargo-utils). Will cause a full rebuild
-;; of all rust compilers.
-
-(define (generate-all-checksums dir-name)
-  (for-each
-    (lambda (filename)
-      (let* ((dir (dirname filename))
-             (checksum-file (string-append dir "/.cargo-checksum.json")))
-        (when (file-exists? checksum-file) (delete-file checksum-file))
-        (display (string-append
-                   "patch-cargo-checksums: generate-checksums for "
-                   dir "\n"))
-        (generate-checksums dir)))
-    (find-files dir-name "Cargo.toml$")))
-
 (define (manifest-targets)
   "Extract all targets from the Cargo.toml manifest"
   (let* ((port (open-input-pipe "cargo read-manifest"))
diff --git a/guix/build/cargo-utils.scm b/guix/build/cargo-utils.scm
index 79e5440..5ac429a 100644
--- a/guix/build/cargo-utils.scm
+++ b/guix/build/cargo-utils.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2016 David Craven <address@hidden>
 ;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
 ;;; Copyright © 2019 Ivan Petkov <address@hidden>
+;;; Copyright © 2019 Efraim Flashner <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -22,7 +23,8 @@
   #:use-module (guix build utils)
   #:use-module (ice-9 popen)
   #:use-module (ice-9 rdelim)
-  #:export (generate-checksums))
+  #:export (generate-checksums
+            generate-all-checksums))
 
 ;; Commentary:
 ;;
@@ -66,3 +68,15 @@ the same directory."
         (display "},\"package\":" port)
         (write (file-sha256 "/dev/null") port)
         (display "}" port)))))
+
+(define (generate-all-checksums dir-name)
+  (for-each
+    (lambda (filename)
+      (let* ((dir (dirname filename))
+             (checksum-file (string-append dir "/.cargo-checksum.json")))
+        (when (file-exists? checksum-file) (delete-file checksum-file))
+        (display (string-append
+                   "patch-cargo-checksums: generate-checksums for "
+                   dir "\n"))
+        (generate-checksums dir)))
+    (find-files dir-name "Cargo.toml$")))