From e80a447976ce7784db1cb2dc9e99a42b58ea1b6c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 12 Aug 2019 14:00:46 +0300 Subject: gnu: gnuzilla: Use 'generate-all-checksums'. * gnu/packages/gnuzilla.scm (icecat)[arguments]: During custom 'patch-cargo-checksums phase, replace call to 'generate-checksums' with call to 'generate-all-checksums'. --- gnu/packages/gnuzilla.scm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ff382b2388..eec66b15c9 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Mark H Weaver ;;; Copyright © 2015 Sou Bunnbu -;;; Copyright © 2016, 2017, 2018 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 ng0 @@ -743,7 +743,7 @@ from forcing GEXP-PROMISE." ;; "--with-system-png" ) - #:imported-modules ,%cargo-utils-modules ;for `generate-checksums' + #:imported-modules ,%cargo-utils-modules ;for `generate-all-checksums' #:modules ((ice-9 ftw) (ice-9 rdelim) @@ -843,15 +843,7 @@ from forcing GEXP-PROMISE." (substitute* '("Cargo.lock" "servo/Cargo.lock") (("(\"checksum .* = )\".*\"" all name) (string-append name "\"" null-hash "\""))) - (for-each - (lambda (filename) - (delete-file filename) - (let ((dir (dirname filename))) - (display (string-append - "patch-cargo-checksums: generate-checksums for " - dir "\n")) - (generate-checksums dir))) - (find-files "third_party/rust" ".cargo-checksum.json"))) + (generate-all-checksums "third_party/rust")) #t)) (add-before 'configure 'augment-CPLUS_INCLUDE_PATH (lambda* (#:key build inputs #:allow-other-keys) -- cgit v1.2.3