nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: current-guix: Delay effectful bits. 

* gnu/packages/package-management.scm (current-guix): Delay 'repository-root'.
This commit is contained in:
Ludovic Courtès 2019-03-26 11:06:16 +01:00
parent 28d32817d8
commit 863519f660
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/packages/package-management.scm
View File

@ -410,10 +410,10 @@ generated file."
(make-parameter #f)) (make-parameter #f))
(define-public current-guix (define-public current-guix
(let* ((repository-root (canonicalize-path (let* ((repository-root (delay (canonicalize-path
(string-append (current-source-directory) (string-append (current-source-directory)
"/../.."))) "/../.."))))
(select? (delay (or (git-predicate repository-root) (select? (delay (or (git-predicate (force repository-root))
source-file?)))) source-file?))))
(lambda () (lambda ()
"Return a package representing Guix built from the current source tree. "Return a package representing Guix built from the current source tree.
@ -423,7 +423,7 @@ out) and returning a package that uses that as its 'source'."
(package (package
(inherit guix) (inherit guix)
(version (string-append (package-version guix) "+")) (version (string-append (package-version guix) "+"))
(source (local-file repository-root "guix-current" (source (local-file (force repository-root) "guix-current"
#:recursive? #t #:recursive? #t
#:select? (force select?)))))))) #:select? (force select?))))))))