diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-10-10 14:54:18 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-10-10 14:54:18 +0200 |
| commit | 099bb0175f681e5f68dafb8ad973866f31fe515c (patch) | |
| tree | abb0963873aa0ddb11eaf6123521191e12d836bb | |
| parent | 121f32a104de6d88774c4a819eb40334a618199c (diff) | |
| download | guix-099bb0175f681e5f68dafb8ad973866f31fe515c.tar guix-099bb0175f681e5f68dafb8ad973866f31fe515c.tar.gz | |
self: Use Guile 2.2 unconditionally for recent 'guix pull'.
Fixes <https://bugs.gnu.org/32929>.
Reported by Michael Bowcutt <mwb71@case.edu>.
* guix/self.scm (guix-derivation)[guile]: Use "2.2" when PULL-VERSION >= 1.
Likewise for the #:guile-version argument.
| -rw-r--r-- | guix/self.scm | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/guix/self.scm b/guix/self.scm index 126116e08a..ecf846490f 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) |