[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/15: gnu: toybox: Use G-expressions.
From: |
guix-commits |
Subject: |
05/15: gnu: toybox: Use G-expressions. |
Date: |
Wed, 5 Jan 2022 23:23:49 -0500 (EST) |
nckx pushed a commit to branch master
in repository guix.
commit 24b04f5d4e82284a48f07213bd02b83401db8898
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Thu Jan 6 01:15:11 2022 +0100
gnu: toybox: Use G-expressions.
* gnu/packages/busybox.scm (toybox)[arguments]:
Rewrite as G-expressions.
---
gnu/packages/busybox.scm | 56 +++++++++++++++++++++++-------------------------
1 file changed, 27 insertions(+), 29 deletions(-)
diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm
index 33a343e576..7a548582f3 100644
--- a/gnu/packages/busybox.scm
+++ b/gnu/packages/busybox.scm
@@ -19,6 +19,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages busybox)
+ #:use-module (guix gexp)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
@@ -133,35 +134,32 @@ any small or embedded system.")
"0jq3368jps6jg717ikzhlc6whml3k2s9xy69zpj4i0r35c5ck622"))))
(build-system gnu-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-before 'configure 'set-environment-variables
- (lambda _
- (setenv "CC" ,(cc-for-target))
- (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")))
- (invoke "make"
- (string-append "PREFIX=" out)
- "install"))))
- (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"))))))
- #:test-target "tests"))
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'configure 'set-environment-variables
+ (lambda _
+ (setenv "CC" #$(cc-for-target))
+ (setenv "HOSTCC" (which "gcc"))))
+ (replace 'configure
+ (lambda _ (invoke "make" "defconfig")))
+ (add-before 'check 'fix-or-skip-broken-tests
+ (lambda _
+ ;; Some tests expect $USER to magically be the current user.
+ (setenv "USER" (passwd:name (getpwnam (geteuid))))
+ ;; This expects 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)
+ (invoke "make"
+ (string-append "PREFIX=" #$output)
+ "install")))
+ (add-after 'install 'remove-usr-directory
+ (lambda* (#:key outputs #:allow-other-keys)
+ (delete-file-recursively (string-append #$output "/usr")))))
+ #:test-target "tests"))
(native-inputs (list bc))
(synopsis "Many common UNIX utilities in a single executable")
(description "ToyBox combines tiny versions of many common UNIX utilities
- branch master updated (c233b7b422 -> b18fb4bf77), guix-commits, 2022/01/05
- 01/15: gnu: knot-resolver: Update to 5.4.4., guix-commits, 2022/01/05
- 05/15: gnu: toybox: Use G-expressions.,
guix-commits <=
- 03/15: gnu: vice: Update to 3.6., guix-commits, 2022/01/05
- 09/15: gnu: pan: Use G-expressions., guix-commits, 2022/01/05
- 10/15: gnu: borgmatic: Update to 1.5.22., guix-commits, 2022/01/05
- 11/15: gnu: borgmatic: Use G-expressions., guix-commits, 2022/01/05
- 13/15: gnu: snapraid: Use G-expressions., guix-commits, 2022/01/05
- 04/15: gnu: toybox: Update to 0.8.6., guix-commits, 2022/01/05
- 02/15: gnu: xchm: Update to 1.33., guix-commits, 2022/01/05
- 08/15: gnu: pan: Update to 0.149., guix-commits, 2022/01/05
- 06/15: gnu: xxhash: Update to 0.8.1., guix-commits, 2022/01/05
- 07/15: gnu: xxhash: Use G-expressions., guix-commits, 2022/01/05