gnu: busybox: Update to 1.26.0.

* gnu/packages/busybox.scm (busybox): Update to 1.26.0.
[arguments]: Enable previously broken grep test.
This commit is contained in:
Efraim Flashner 2016-12-23 04:12:13 +02:00
parent db82557013
commit 7604106f2c
No known key found for this signature in database
GPG Key ID: F4C1D3917EACEE93
1 changed files with 2 additions and 10 deletions

View File

@ -30,7 +30,7 @@
(define-public busybox (define-public busybox
(package (package
(name "busybox") (name "busybox")
(version "1.25.0") (version "1.26.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -38,7 +38,7 @@
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1z52mh6prhd6v47qryz4rvng5r1z0am6masrnigq06zfhmlf03ss")))) "0k0g3hk58m99c2sfq97ngnixb2rv2wzyhv3z00lxaw78bqvjglis"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -65,14 +65,6 @@
(substitute* "testsuite/pidof.tests" (substitute* "testsuite/pidof.tests"
(("-s init") "-s $(cat /proc/1/comm)")) (("-s init") "-s $(cat /proc/1/comm)"))
(substitute* "testsuite/grep.tests"
;; The subject of this test is buggy. It is known by upstream (fixed in git)
;; So mark it with SKIP_KNOWN_BUGS like the others.
;; Presumably it wasn't known at the time of release ...
;; (It is strange that they release software which they know to have bugs)
(("testing \"grep -w \\^str doesn't match str not at the beginning\"")
"test x\"$SKIP_KNOWN_BUGS\" = x\"\" && testing \"grep -w ^str doesn't match str not at the beginning\""))
;; This test cannot possibly pass. ;; This test cannot possibly pass.
;; It is trying to test that "which ls" returns "/bin/ls" when PATH is not set. ;; 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. ;; However, this relies on /bin/ls existing. Which it does not in guix.