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

gnu: guix: Update snapshot. 

* gnu/packages/package-management.scm (guix-devel): Update to dd91141.
  [arguments]: Use 'modify-phases'.  Add 'disable-container-tests' phase.
This commit is contained in:
Mark H Weaver 2015-07-09 17:41:38 -04:00
parent dd9114107d
commit b93c1d9dba
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,7 +165,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 "684bf7c")) (let ((commit "dd91141"))
(package (inherit guix-0.8.2) (package (inherit guix-0.8.2)
(version (string-append "0.8.2." commit)) (version (string-append "0.8.2." commit))
(source (origin (source (origin
@ -175,12 +175,13 @@ the Nix package manager.")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"0fq9ajj17kbb0f1p79al2vcqah9sl0imayhggcp31c3vq0ahya9g")) "05rgz1kkxjsc07asvwrf6gpjc8blpvs5ipbby4kvjjq6j0g2bgxa"))
(file-name (string-append "guix-" version "-checkout")))) (file-name (string-append "guix-" version "-checkout"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments guix-0.8.2) (substitute-keyword-arguments (package-arguments guix-0.8.2)
((#:phases phases) ((#:phases phases)
`(alist-cons-after `(modify-phases ,phases
(add-after
'unpack 'bootstrap 'unpack 'bootstrap
(lambda _ (lambda _
;; Make sure 'msgmerge' can modify the PO files. ;; Make sure 'msgmerge' can modify the PO files.
@ -188,8 +189,18 @@ the Nix package manager.")
(chmod po #o666)) (chmod po #o666))
(find-files "." "\\.po$")) (find-files "." "\\.po$"))
(zero? (system* "sh" "bootstrap"))) (zero? (system* "sh" "bootstrap"))))
,phases)))) (add-after
'unpack 'disable-container-tests
;; XXX FIXME: These tests fail within the build container.
(lambda _
(substitute* "tests/syscalls.scm"
(("^\\(test-assert \"(clone|setns|pivot-root)\"" all)
(string-append "(test-skip 1)\n" all)))
(substitute* "tests/containers.scm"
(("^\\(test-assert" all)
(string-append "(test-skip 1)\n" all)))
#t))))))
(native-inputs (native-inputs
`(("autoconf" ,(autoconf-wrapper)) `(("autoconf" ,(autoconf-wrapper))
("automake" ,automake) ("automake" ,automake)