From 7aabf2daf2a88aaec3126ad01365ece188f2b1cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 17 Jul 2024 12:43:02 +0200
Subject: [PATCH] =?UTF-8?q?gnu:=20commencement:=20=E2=80=98git-fetch-from-?=
 =?UTF-8?q?tarball=E2=80=99=20can=20use=20=E2=80=98git-download=E2=80=99.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This works around the fact that hash mismatches for the tarball
download would lead to a build failure.

* gnu/packages/commencement.scm (built-in-builders*): New variable.
(git-fetch-from-tarball): Adjust to use the ‘git-download’ builder when
it’s available.  Add comments.

Change-Id: I63502da6c942f85bf012f7c6bf3aa3617f818183
---
 gnu/packages/commencement.scm | 67 ++++++++++++++++++++++-------------
 1 file changed, 43 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index d4b5fa2ab0..b31f976900 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -59,10 +59,13 @@ (define-module (gnu packages commencement)
   #:use-module (guix gexp)
   #:use-module (guix packages)
   #:use-module (guix platform)
-  #:use-module ((guix store) #:select (%store-monad))
+  #:use-module ((guix store) #:select (%store-monad
+                                       store-lift
+                                       built-in-builders))
   #:use-module (guix monads)
   #:use-module (guix download)
-  #:use-module ((guix git-download) #:select (git-reference git-file-name))
+  #:use-module ((guix git-download)
+                #:select (git-fetch git-reference git-file-name))
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system trivial)
   #:use-module ((guix licenses) #:prefix license:)
@@ -94,37 +97,53 @@ (define-module (gnu packages commencement)
 ;;;
 ;;; Code:
 
+(define built-in-builders*
+  (store-lift built-in-builders))
+
 (define* (git-fetch-from-tarball tarball)
   "Return an <origin> method equivalent to 'git-fetch', except that it fetches
 the checkout from TARBALL, a tarball containing said checkout.
 
   The purpose of this procedure is to work around bootstrapping issues:
 'git-fetch' depends on Git, which is much higher in the dependency graph."
-  (lambda* (url hash-algo hash
+  (lambda* (ref hash-algo hash
                 #:optional name
                 #:key (system (%current-system))
                 (guile %bootstrap-guile))
-    (mlet %store-monad ((guile (package->derivation guile system)))
-      (gexp->derivation
-       (or name "git-checkout")
-       (with-imported-modules '((guix build utils))
-         #~(begin
-             (use-modules (guix build utils)
-                          (ice-9 ftw)
-                          (ice-9 match))
-             (setenv "PATH"
-                     #+(file-append %bootstrap-coreutils&co "/bin"))
-             (invoke "tar" "xf" #$tarball)
-             (match (scandir ".")
-               (("." ".." directory)
-                (copy-recursively directory #$output)))))
-       #:recursive? #t
-       #:hash-algo hash-algo
-       #:hash hash
-       #:system system
-       #:guile-for-build guile
-       #:graft? #f
-       #:local-build? #t))))
+    (mlet %store-monad ((builtins (built-in-builders*)))
+      ;; Use the 'git-download' built-in builder when it's available: it's the
+      ;; preferred and most reliable method.
+      (if (member "git-download" builtins)
+          (git-fetch ref hash-algo hash name #:system system)
+
+          ;; This method is kept for compatibility with daemons that lack
+          ;; 'git-download' to work around bootstrapping issues.
+          (mlet %store-monad ((guile (package->derivation guile system)))
+            (gexp->derivation
+             (or name "git-checkout")
+             (with-imported-modules '((guix build utils))
+               #~(begin
+                   (use-modules (guix build utils)
+                                (ice-9 ftw)
+                                (ice-9 match))
+                   (setenv "PATH"
+                           #+(file-append %bootstrap-coreutils&co "/bin"))
+
+                   ;; FIXME: This assumes that TARBALL, an origin, was
+                   ;; successfully downloaded under its given hash; however
+                   ;; that hash is bound to change over time since it's a
+                   ;; generated tarball.
+                   (invoke "tar" "xf" #$tarball)
+                   (match (scandir ".")
+                     (("." ".." directory)
+                      (copy-recursively directory #$output)))))
+             #:recursive? #t
+             #:hash-algo hash-algo
+             #:hash hash
+             #:system system
+             #:guile-for-build guile
+             #:graft? #f
+             #:local-build? #t))))))
 
 (define bootar
   (package