[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/04: self: Use Guile 2.2 unconditionally for recent 'guix pull'.
|
From: |
Ludovic Courtès |
|
Subject: |
04/04: self: Use Guile 2.2 unconditionally for recent 'guix pull'. |
|
Date: |
Wed, 10 Oct 2018 08:58:06 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 099bb0175f681e5f68dafb8ad973866f31fe515c
Author: Ludovic Courtès <address@hidden>
Date: Wed Oct 10 14:54:18 2018 +0200
self: Use Guile 2.2 unconditionally for recent 'guix pull'.
Fixes <https://bugs.gnu.org/32929>.
Reported by Michael Bowcutt <address@hidden>.
* guix/self.scm (guix-derivation)[guile]: Use "2.2" when PULL-VERSION >= 1.
Likewise for the #:guile-version argument.
---
guix/self.scm | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/guix/self.scm b/guix/self.scm
index 126116e..ecf8464 100644
--- a/guix/self.scm
+++ b/guix/self.scm
@@ -911,7 +911,11 @@ is not supported."
version))
(define guile
- (guile-for-build guile-version))
+ ;; When PULL-VERSION >= 1, produce a self-contained Guix and use Guile 2.2
+ ;; unconditionally.
+ (guile-for-build (if (>= pull-version 1)
+ "2.2"
+ guile-version)))
(mbegin %store-monad
(set-guile-for-build guile)
@@ -920,9 +924,11 @@ is not supported."
#:name (string-append "guix-"
(shorten version))
#:pull-version pull-version
- #:guile-version (match guile-version
- ("2.2.2" "2.2")
- (version version))
+ #:guile-version (if (>= pull-version 1)
+ "2.2"
+ (match guile-version
+ ("2.2.2" "2.2")
+ (version version)))
#:guile-for-build guile)))
(if guix
(lower-object guix)