From dc57d527aee4eb18ec5fb345f90d6637bbd1a4d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 3 Nov 2015 09:37:52 +0100
Subject: [PATCH] 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.
---
gnu/packages/package-management.scm | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 65464f7691c..c1ef2e15c40 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -82,6 +82,7 @@ (define-public guix-0.8.3
(string-append "--with-libgcrypt-prefix="
(assoc-ref %build-inputs
"libgcrypt")))
+ #:parallel-tests? #f ;work around <http://bugs.gnu.org/21097>
#:phases (modify-phases %standard-phases
(add-before
'configure 'copy-bootstrap-guile
@@ -117,7 +118,17 @@ (define (copy arch)
(substitute* "tests/containers.scm"
(("^\\(test-assert" 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))
+ (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
'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
@@ -184,7 +195,7 @@ (define guix-devel
;;
;; Note: use a short commit id; when using the long one, the limit on socket
;; file names is exceeded while running the tests.
- (let ((commit "abbe2c6"))
+ (let ((commit "b485f75"))
(package (inherit guix-0.8.3)
(version (string-append "0.8.3." commit))
(source (origin
@@ -194,7 +205,7 @@ (define guix-devel
(commit commit)))
(sha256
(base32
- "1zgjj5knpz3qbbqdjm4yh436bzfgasc6p0k3xnx58hfjd88mdsga"))
+ "1frn74y5c3n91qxs5b3sxbr8ai43s6svlb2djfnp7nqbr1ax3mph"))
(file-name (string-append "guix-" version "-checkout"))))
(arguments
(substitute-keyword-arguments (package-arguments guix-0.8.3)
--
GitLab