[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: build-self: Add a dummy (git) module to 'compute-guix-derivation'
From: |
Ludovic Courtès |
Subject: |
01/02: build-self: Add a dummy (git) module to 'compute-guix-derivation'. |
Date: |
Thu, 13 Sep 2018 04:30:06 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 78c9058dde237d6913a30a40c1f5ca19395f86c3
Author: Ludovic Courtès <address@hidden>
Date: Thu Sep 13 10:10:49 2018 +0200
build-self: Add a dummy (git) module to 'compute-guix-derivation'.
Fixes a regression introduced in
aed0a594058a59bc3bb1d2686391dc0e8a181b1f.
* build-aux/build-self.scm (build-program)[fake-git]: New variable.
Use it as an imported module.
---
build-aux/build-self.scm | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm
index f91b439..09979dc 100644
--- a/build-aux/build-self.scm
+++ b/build-aux/build-self.scm
@@ -263,6 +263,9 @@ interface (FFI) of Guile.")
#~(define-module (gcrypt hash)
#:export (sha1 sha256))))
+ (define fake-git
+ (scheme-file "git.scm" #~(define-module (git))))
+
(with-imported-modules `(((guix config)
=> ,(make-config.scm))
@@ -272,6 +275,11 @@ interface (FFI) of Guile.")
;; adjust %LOAD-PATH later on.
((gcrypt hash) => ,fake-gcrypt-hash)
+ ;; (guix git-download) depends on (git) but only
+ ;; for peripheral functionality. Provide a dummy
+ ;; (git) to placate it.
+ ((git) => ,fake-git)
+
,@(source-module-closure `((guix store)
(guix self)
(guix derivations)