diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2025-02-28 18:01:26 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2025-02-28 23:03:36 +0100 |
| commit | 6f6a008bb14814b6c6bc3c19935814b34acee129 (patch) | |
| tree | b2c9b215493fda5b5a2a33a6a6d8612f6b9ea636 | |
| parent | 1a010d0e084a1497755223db0fa0c05208b226bb (diff) | |
| download | guix-6f6a008bb14814b6c6bc3c19935814b34acee129.tar.gz guix-6f6a008bb14814b6c6bc3c19935814b34acee129.zip | |
download: ‘url-fetch/*bomb’ use ungrafted Guile derivation.
Fixes a bug whereby the derivation of origins using one of these methods
would depend on whether grafts are enabled, in practice causing rebuilds
for anyone keeping grafts enabled—e.g., ‘java-xz’ and its 142
dependents.
* guix/download.scm (url-fetch/tarbomb, url-fetch/zipbomb):
Pass #:graft? #f when computing ‘guile’.
Reported-by: Ricardo Wurmus <rekado@elephly.net>
Change-Id: I75d634fcaf20c9912419c26ca251fff136c528c6
| -rw-r--r-- | guix/download.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/guix/download.scm b/guix/download.scm index d88ad0ee44..bab5a36875 100644 --- a/guix/download.scm +++ b/guix/download.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012-2021, 2024 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012-2021, 2024-2025 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> @@ -559,7 +559,8 @@ own. This helper makes it easier to deal with \"tar bombs\"." (or name file-name)) #:system system #:guile guile)) - (guile (package->derivation guile system))) + (guile (package->derivation guile system + #:graft? #f))) ;; Take the tar bomb, and simply unpack it as a directory. ;; Use ungrafted tar/gzip so that the resulting tarball doesn't depend on ;; whether grafts are enabled. @@ -597,7 +598,8 @@ own. This helper makes it easier to deal with \"zip bombs\"." (or name file-name)) #:system system #:guile guile)) - (guile (package->derivation guile system))) + (guile (package->derivation guile system + #:graft? #f))) ;; Take the zip bomb, and simply unpack it as a directory. ;; Use ungrafted unzip so that the resulting tarball doesn't depend on ;; whether grafts are enabled. |