me
/
guix
Archived
1
0
Fork 0
Code

gnu: guix: Remove trailing #t from phases. 

* gnu/packages/package-management.scm (guix)[arguments]: Remove trailing
  #t from phases.
master
Efraim Flashner 2023-05-28 14:45:12 +03:00
parent ef5a05bac8
commit 9845e408e5
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -272,8 +272,7 @@ $(prefix)/etc/openrc\n")))
(("\"[^\"]*/bin/gzip") gzip (("\"[^\"]*/bin/gzip") gzip
(string-append "\"" gzip "/bin/gzip")) (string-append "\"" gzip "/bin/gzip"))
(("\"[^\"]*/bin//xz") (("\"[^\"]*/bin//xz")
(string-append "\"" xz "/bin/xz"))))) (string-append "\"" xz "/bin/xz")))))))
#t))
(add-before 'build 'set-font-path (add-before 'build 'set-font-path
(lambda* (#:key native-inputs inputs #:allow-other-keys) (lambda* (#:key native-inputs inputs #:allow-other-keys)
;; Tell 'dot' where to look for fonts. ;; Tell 'dot' where to look for fonts.
@ -320,8 +319,7 @@ $(prefix)/etc/openrc\n")))
(for-each (lambda (input) (for-each (lambda (input)
(intern (assoc-ref inputs input) #t)) (intern (assoc-ref inputs input) #t))
'("bootstrap/bash" "bootstrap/mkdir" '("bootstrap/bash" "bootstrap/mkdir"
"bootstrap/tar" "bootstrap/xz"))) "bootstrap/tar" "bootstrap/xz")))))
#t))
(add-after 'unpack 'disable-failing-tests (add-after 'unpack 'disable-failing-tests
;; XXX FIXME: These tests fail within the build container. ;; XXX FIXME: These tests fail within the build container.
(lambda _ (lambda _
@ -334,14 +332,12 @@ $(prefix)/etc/openrc\n")))
(when (file-exists? "tests/guix-environment-container.sh") (when (file-exists? "tests/guix-environment-container.sh")
(substitute* "tests/guix-environment-container.sh" (substitute* "tests/guix-environment-container.sh"
(("guix environment --version") (("guix environment --version")
"exit 77\n"))) "exit 77\n")))))
#t))
(add-before 'check 'set-SHELL (add-before 'check 'set-SHELL
(lambda _ (lambda _
;; 'guix environment' tests rely on 'SHELL' having a ;; 'guix environment' tests rely on 'SHELL' having a
;; correct value, so set it. ;; correct value, so set it.
(setenv "SHELL" (which "sh")) (setenv "SHELL" (which "sh"))))
#t))
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
(lambda* (#:key inputs native-inputs outputs target (lambda* (#:key inputs native-inputs outputs target
#:allow-other-keys) #:allow-other-keys)