summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorYelninei <yelninei@tutamail.com>2026-03-07 23:09:26 +0000
committerLudovic Courtès <ludo@gnu.org>2026-03-08 14:11:48 +0100
commitf6c4dbdf5d151abf001e05d56081c8b65776edc2 (patch)
tree88ce3feb2e18ffe42eef5a6632b176edb49ce82a /gnu
parent4cf7975a307471c8492f364b7fe2d8b158e39660 (diff)
gnu: commencement: Reintroduce ‘git-fetch-from-tarball’.
Evaluating the derivations with a daemon not supporting ‘builtin:git-download’ causes a dependency cycle. Add back the fallback with ‘git-fetch-from-tarball’ to work around it. This is a followup to 5d518a2b743ff836e5127199a95a7b6ca45dae7b and related upgrades, which introduced this regression. * gnu/packages/commencement.scm (gnumach-headers-boot0, mig-boot0, hurd-headers-boot0): Change source fetch method to git-fetch-from-tarball. Change-Id: I0a799dfe02200a3f2851537ab13063f34411a1e5 Signed-off-by: Ludovic Courtès <ludo@gnu.org> Fixes: guix/guix#6464 Merges: #6966
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/commencement.scm80
1 files changed, 59 insertions, 21 deletions
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index d28f1599bc2..3c02b8f74f8 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2726,32 +2726,70 @@ memoized as a function of '%current-system'."
(source
(origin
(inherit (package-source gnumach-headers))
- (patches '())))
+ (patches '())
+ (method
+ (git-fetch-from-tarball
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://gnu/guix/mirror/gnumach-"
+ (package-version gnumach-headers) ".tar.gz"))
+ (sha256
+ (base32
+ "0dchfv2fg92503ydw4kj3myz2036x4hbf6i9k1s4q6mg210qanfs")))))))
(native-inputs (list autoconf-boot0 automake-boot0 texinfo-boot0)))))
(define mig-boot0
- (with-boot0
- (package
- (inherit mig)
- (name "mig-boot0")
- (native-inputs (list autoconf-boot0 automake-boot0 bison-boot0 flex-boot0
- gnumach-headers-boot0))
- (inputs (list flex-boot0 gnumach-headers-boot0))
- (arguments
- (substitute-keyword-arguments (package-arguments mig)
- ((#:configure-flags flags '())
- #~(list (string-append "LDFLAGS=-Wl,-rpath="
- #$(this-package-native-input "flex")
- "/lib/"))))))))
+ (let ((tarball-version "1.8+git3f4b006"))
+ (with-boot0
+ (package
+ (inherit mig)
+ (name "mig-boot0")
+ (source
+ (origin
+ (inherit (package-source mig))
+ (method
+ (git-fetch-from-tarball
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://gnu/guix/mirror/mig-"
+ tarball-version ".tar.gz"))
+ (sha256
+ (base32
+ "0bgrhbkaym1y222abjrcz3qrv28jr1kvq99a8vssplww73mcf92c")))))))
+ (native-inputs (list autoconf-boot0 automake-boot0 bison-boot0 flex-boot0
+ gnumach-headers-boot0))
+ (inputs (list flex-boot0 gnumach-headers-boot0))
+ (arguments
+ (substitute-keyword-arguments (package-arguments mig)
+ ((#:configure-flags flags '())
+ #~(list (string-append "LDFLAGS=-Wl,-rpath="
+ #$(this-package-native-input "flex")
+ "/lib/")))))))))
(define hurd-headers-boot0
- (with-boot0
- (package
- (inherit hurd-headers)
- (name "hurd-headers-boot0")
- (native-inputs
- (list autoconf-boot0 automake-boot0 mig-boot0))
- (inputs '()))))
+ (let ((tarball-version "0.9+git6290b4c"))
+ (with-boot0
+ (package
+ (inherit hurd-headers)
+ (name "hurd-headers-boot0")
+ (source
+ (origin
+ (inherit (package-source hurd-headers))
+ (method
+ (git-fetch-from-tarball
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://gnu/guix/mirror/hurd-"
+ tarball-version ".tar.gz"))
+ (sha256
+ (base32
+ "0w18nv4bv0b5vg6mqxhajma3h56nf9iipa444hby5hqf9c1kaa32")))))))
+ (native-inputs
+ (list autoconf-boot0 automake-boot0 mig-boot0))
+ (inputs '())))))
(define hurd-minimal-boot0
(with-boot0