guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#43647] [PATCH 2/3] gnu: icedove: Update to 78.3.0.


From: Jonathan Brielmaier
Subject: [bug#43647] [PATCH 2/3] gnu: icedove: Update to 78.3.0.
Date: Mon, 28 Sep 2020 11:41:38 +0200
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.3.0

             (lambda _
               (use-modules (guix build cargo-utils))
               (let ((null-hash 
"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"))
-               (substitute* '("Cargo.lock" "gfx/wr/Cargo.lock")
-                 (("(\"checksum .* = )\".*\"" all name)
-                  (string-append name "\"" null-hash "\"")))
-               (generate-all-checksums "third_party/rust"))
+               (for-each (lambda (file)
+                           (format #t "patching checksums in ~a~%" file)
+                           (substitute* (find-files "." "Cargo.lock$")
+                             (("^checksum = \".*\"")
+                              (string-append "checksum = \"" null-hash "\""))))
+                         (find-files "." "Cargo.lock$"))
+               (for-each generate-all-checksums
+                         '("third_party/rust"
+                           "toolkit/library/rust")))
               #t))

This change was inherited from a change I made in the IceCat 78 update
(commit c7011ff850420fdbe1319b3d218bd362f2f9d618), and as Zhu Zihao
<all_but_last@163.com> recently pointed out on guix-devel, it has a
problem which turns out to be harmless but wasteful: the argument to the
second call to 'substitute*' should be 'files' instead of
(find-files "." "Cargo.lock$").

I'm currently testing the 'icedove' build with this minor fix applied.

I saw this proposal already on the ML and it's a good one :)





reply via email to

[Prev in Thread] Current Thread [Next in Thread]