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

gnu: guix: Update development snapshot. 

* gnu/packages/package-management.scm (guix-0.8.3)[arguments]: In
  'disable-container-tests' phase, modify
  "tests/guix-environment-container.sh".  Add 'set-SHELL' phase.
* gnu/packages/package-management.scm (guix-devel): Update to b485f75.
This commit is contained in:
Ludovic Courtès 2015-11-03 09:37:52 +01:00
parent 6e32aa568c
commit dc57d527ae
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,6 +82,7 @@
(string-append "--with-libgcrypt-prefix=" (string-append "--with-libgcrypt-prefix="
(assoc-ref %build-inputs (assoc-ref %build-inputs
"libgcrypt"))) "libgcrypt")))
#:parallel-tests? #f ;work around <http://bugs.gnu.org/21097>
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-before (add-before
'configure 'copy-bootstrap-guile 'configure 'copy-bootstrap-guile
@ -117,7 +118,17 @@
(substitute* "tests/containers.scm" (substitute* "tests/containers.scm"
(("^\\(test-assert" all) (("^\\(test-assert" all)
(string-append "(test-skip 1)\n" all))) (string-append "(test-skip 1)\n" all)))
(when (file-exists? "tests/guix-environment-container.sh")
(substitute* "tests/guix-environment-container.sh"
(("guix environment --version")
"exit 77\n")))
#t)) #t))
(add-before 'check 'set-SHELL
(lambda _
;; 'guix environment' tests rely on 'SHELL' having a
;; correct value, so set it.
(setenv "SHELL" (which "sh"))
#t))
(add-after (add-after
'install 'wrap-program 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
@ -184,7 +195,7 @@ the Nix package manager.")
;; ;;
;; Note: use a short commit id; when using the long one, the limit on socket ;; Note: use a short commit id; when using the long one, the limit on socket
;; file names is exceeded while running the tests. ;; file names is exceeded while running the tests.
(let ((commit "abbe2c6")) (let ((commit "b485f75"))
(package (inherit guix-0.8.3) (package (inherit guix-0.8.3)
(version (string-append "0.8.3." commit)) (version (string-append "0.8.3." commit))
(source (origin (source (origin
@ -194,7 +205,7 @@ the Nix package manager.")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"1zgjj5knpz3qbbqdjm4yh436bzfgasc6p0k3xnx58hfjd88mdsga")) "1frn74y5c3n91qxs5b3sxbr8ai43s6svlb2djfnp7nqbr1ax3mph"))
(file-name (string-append "guix-" version "-checkout")))) (file-name (string-append "guix-" version "-checkout"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments guix-0.8.3) (substitute-keyword-arguments (package-arguments guix-0.8.3)