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

gnu: busybox: Fix indentation. 

* gnu/packages/busybox.scm (busybox)[arguments]: Whitespace changes.
master
Efraim Flashner 2017-06-21 10:13:31 +03:00
parent 5897428f1c
commit 6d96af5eaa
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gnu/packages/busybox.scm
View File

@ -41,41 +41,41 @@
"05mg6rh5smkzfwqfcazkpwy6h6555llsazikqnvwkaf17y8l8gns")))) "05mg6rh5smkzfwqfcazkpwy6h6555llsazikqnvwkaf17y8l8gns"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
(lambda _ (zero? (system* "make" "defconfig")))) (lambda _ (zero? (system* "make" "defconfig"))))
(replace 'check (replace 'check
(lambda _ (lambda _
(substitute* '("testsuite/du/du-s-works" (substitute* '("testsuite/du/du-s-works"
"testsuite/du/du-works") "testsuite/du/du-works")
(("/bin") "/etc")) ; there is no /bin but there is a /etc (("/bin") "/etc")) ; there is no /bin but there is a /etc
;; There is no /usr/bin or /bin - replace it with /gnu/store ;; There is no /usr/bin or /bin - replace it with /gnu/store
(substitute* "testsuite/cpio.tests" (substitute* "testsuite/cpio.tests"
(("/usr/bin") (%store-directory)) (("/usr/bin") (%store-directory))
(("usr") (car (filter (negate string-null?) (("usr") (car (filter (negate string-null?)
(string-split (%store-directory) #\/))))) (string-split (%store-directory) #\/)))))
(substitute* "testsuite/date/date-works-1" (substitute* "testsuite/date/date-works-1"
(("/bin/date") (which "date"))) (("/bin/date") (which "date")))
;; The pidof tests assume that pid 1 is called "init" but that is not ;; The pidof tests assume that pid 1 is called "init" but that is not
;; true in guix build environment ;; true in guix build environment
(substitute* "testsuite/pidof.tests" (substitute* "testsuite/pidof.tests"
(("-s init") "-s $(cat /proc/1/comm)")) (("-s init") "-s $(cat /proc/1/comm)"))
;; This test cannot possibly pass.
;; It is trying to test that "which ls" returns "/bin/ls" when PATH is not set.
;; However, this relies on /bin/ls existing. Which it does not in guix.
(delete-file "testsuite/which/which-uses-default-path")
(rmdir "testsuite/which")
;; This test cannot possibly pass. (zero? (system* "make"
;; It is trying to test that "which ls" returns "/bin/ls" when PATH is not set. ;; "V=1"
;; However, this relies on /bin/ls existing. Which it does not in guix. "SKIP_KNOWN_BUGS=1"
(delete-file "testsuite/which/which-uses-default-path") "SKIP_INTERNET_TESTS=1"
(rmdir "testsuite/which") "check"))))
(zero? (system* "make"
;; "V=1"
"SKIP_KNOWN_BUGS=1"
"SKIP_INTERNET_TESTS=1"
"check"))))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))