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

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:
Christopher Baines 2017-08-29 07:41:30 +01:00
parent fa9f5222a9
commit a9d5e4bed1
No known key found for this signature in database
GPG Key ID: 5E28A33B0B84F577
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -312,10 +312,11 @@ generated file."
#t))) #t)))
(define-public current-guix (define-public current-guix
(let ((select? (delay (or (git-predicate (let* ((repository-root (canonicalize-path
(string-append (current-source-directory) (string-append (current-source-directory)
"/../..")) "/../..")))
source-file?)))) (select? (delay (or (git-predicate repository-root)
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.
This works by adding the current source tree to the store (after filtering it This works by adding the current source tree to the store (after filtering it
@ -323,7 +324,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 "../.." "guix-current" (source (local-file repository-root "guix-current"
#:recursive? #t #:recursive? #t
#:select? (force select?))))))) #:select? (force select?)))))))