gnu: Fix current-guix.
Without this change, I get errors like: ERROR: In procedure string-drop: ERROR: Value out of range 0 to 35: 51 * gnu/packages/package-management.scm (current-guix): Pass exactly the same path to git-predicate and local-file, to ensure that the select? function is compatible.
This commit is contained in:
parent
fa9f5222a9
commit
a9d5e4bed1
1 changed files with 6 additions and 5 deletions
|
@ -312,9 +312,10 @@ (define (wrong-extension? file)
|
|||
#t)))
|
||||
|
||||
(define-public current-guix
|
||||
(let ((select? (delay (or (git-predicate
|
||||
(let* ((repository-root (canonicalize-path
|
||||
(string-append (current-source-directory)
|
||||
"/../.."))
|
||||
"/../..")))
|
||||
(select? (delay (or (git-predicate repository-root)
|
||||
source-file?))))
|
||||
(lambda ()
|
||||
"Return a package representing Guix built from the current source tree.
|
||||
|
@ -323,7 +324,7 @@ (define-public current-guix
|
|||
(package
|
||||
(inherit guix)
|
||||
(version (string-append (package-version guix) "+"))
|
||||
(source (local-file "../.." "guix-current"
|
||||
(source (local-file repository-root "guix-current"
|
||||
#:recursive? #t
|
||||
#:select? (force select?)))))))
|
||||
|
||||
|
|
Loading…
Reference in a new issue