[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
18/20: gnu: toybox: Update to 0.8.5.
From: |
guix-commits |
Subject: |
18/20: gnu: toybox: Update to 0.8.5. |
Date: |
Mon, 29 Nov 2021 19:09:18 -0500 (EST) |
nckx pushed a commit to branch master
in repository guix.
commit cdf7b3daa3d7281b6bf9ec0cc8e21076cc836ddf
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Tue Nov 30 00:06:56 2021 +0100
gnu: toybox: Update to 0.8.5.
* gnu/packages/busybox.scm (toybox): Update to 0.8.5.
[arguments]: Add a new 'fix-or-skip-broken-tests phase.
Don't explicitly return #t from the other phases.
---
gnu/packages/busybox.scm | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm
index 5b03887..f365281 100644
--- a/gnu/packages/busybox.scm
+++ b/gnu/packages/busybox.scm
@@ -122,7 +122,7 @@ any small or embedded system.")
(define-public toybox
(package
(name "toybox")
- (version "0.8.3")
+ (version "0.8.5")
(source (origin
(method url-fetch)
(uri (string-append
@@ -130,7 +130,7 @@ any small or embedded system.")
version ".tar.gz"))
(sha256
(base32
- "00aw9d809wj1bqlb2fsssdgz7rj0363ya14py0gfdm0rkp98zcpa"))))
+ "0j896rblxd8jyll6dg1w9zz1v1q52y2ca7qswgvlfqvjhz0k1lmz"))))
(build-system gnu-build-system)
(arguments
`(#:phases
@@ -138,10 +138,19 @@ any small or embedded system.")
(add-before 'configure 'set-environment-variables
(lambda _
(setenv "CC" ,(cc-for-target))
- (setenv "HOSTCC" (which "gcc"))
- #t))
+ (setenv "HOSTCC" (which "gcc"))))
(replace 'configure
(lambda _ (invoke "make" "defconfig")))
+ (add-before 'check 'fix-or-skip-broken-tests
+ (lambda _
+ ;; Some tests expects $USER to magically be the current user name.
+ (setenv "USER" (passwd:name (getpwnam (geteuid))))
+ ;; All these expect directories to be exactly 4K. They aren't!
+ (delete-file "tests/du.test")
+ ;; Delete tests that expect a root or 0 user to exist.
+ (substitute* "tests/id.test"
+ (("^testing .*[ \\(]root.*") ""))
+ ))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
@@ -151,8 +160,7 @@ any small or embedded system.")
(add-after 'install 'remove-usr-directory
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
- (delete-file-recursively (string-append out "/usr"))
- #t))))
+ (delete-file-recursively (string-append out "/usr"))))))
#:test-target "tests"))
(native-inputs `(("bc" ,bc)))
(synopsis "Many common UNIX utilities in a single executable")
- 10/20: gnu: xa: Update to 2.3.12., (continued)
- 10/20: gnu: xa: Update to 2.3.12., guix-commits, 2021/11/29
- 12/20: gnu: quazip@1: Update to 1.2., guix-commits, 2021/11/29
- 15/20: gnu: diffoscope: Update to 194., guix-commits, 2021/11/29
- 11/20: gnu: thefuck: Update to 3.31., guix-commits, 2021/11/29
- 13/20: gnu: lttoolbox: Update to 3.5.4., guix-commits, 2021/11/29
- 16/20: gnu: simdjson: Update to 1.0.2., guix-commits, 2021/11/29
- 17/20: gnu: indi: Update to 1.9.3., guix-commits, 2021/11/29
- 14/20: gnu: lttoolbox: Omit static libraries., guix-commits, 2021/11/29
- 20/20: services: Accept <inferior-package>s in lieu of <package>s., guix-commits, 2021/11/29
- 19/20: gnu: squashfs-tools: Update to 4.5., guix-commits, 2021/11/29
- 18/20: gnu: toybox: Update to 0.8.5.,
guix-commits <=