diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-10-17 20:47:11 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-10-17 20:47:11 +0200 |
| commit | d02bb02f7d833ad371c53c346b6cb77f01377cf4 (patch) | |
| tree | 9506f04a7fde2f3b264ba1d2a9012085e1f72b72 /guix/self.scm | |
| parent | fb3ff265cd8c6b4c6160f94240dc8932097e637b (diff) | |
| parent | acce0a474c1493ab18912bc46285248e4ccb0314 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/self.scm')
| -rw-r--r-- | guix/self.scm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/guix/self.scm b/guix/self.scm index 733c4a2cc9..3e29c9a42a 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -904,7 +904,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) @@ -913,7 +917,8 @@ is not supported." #:name (string-append "guix-" (shorten version)) #:pull-version pull-version - #:guile-version guile-version + #:guile-version (if (>= pull-version 1) + "2.2" guile-version) #:guile-for-build guile))) (if guix (lower-object guix) |