TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

self: Use Guile 2.2 unconditionally for recent 'guix pull'.

Browse source 
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.
This commit is contained in:
Ludovic Courtès 2018-10-10 14:54:18 +02:00
parent 121f32a104
commit 099bb0175f
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
guix/self.scm
View file

@ -911,7 +911,11 @@ (define (shorten version)
version)) version))
(define guile (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 (mbegin %store-monad
(set-guile-for-build guile) (set-guile-for-build guile)
@ -920,9 +924,11 @@ (define guile
#:name (string-append "guix-" #:name (string-append "guix-"
(shorten version)) (shorten version))
#:pull-version pull-version #:pull-version pull-version
#:guile-version (match guile-version #:guile-version (if (>= pull-version 1)
"2.2"
(match guile-version
("2.2.2" "2.2") ("2.2.2" "2.2")
(version version)) (version version)))
#:guile-for-build guile))) #:guile-for-build guile)))
(if guix (if guix
(lower-object guix) (lower-object guix)