diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2018-07-25 21:30:18 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2018-07-25 21:30:18 +0300 |
| commit | 95da60845127731f1395f8a7f5ab7e235aca5dfc (patch) | |
| tree | 0d2fec7b243b91ac7a5d6140d4edad52946174e6 /gnu/packages/busybox.scm | |
| parent | 2a43df2270345babd768b0057d3cccdf08398e77 (diff) | |
| parent | b19f3337eae86ad0cd910da45b9d45e3866c98fd (diff) | |
| download | guix-95da60845127731f1395f8a7f5ab7e235aca5dfc.tar guix-95da60845127731f1395f8a7f5ab7e235aca5dfc.tar.gz | |
Merge remote-tracking branch 'origin/master' into qt-updates
Diffstat (limited to 'gnu/packages/busybox.scm')
| -rw-r--r-- | gnu/packages/busybox.scm | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index 4cdea3a294..480b777574 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington <jmd@gnu.org> -;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. @@ -31,7 +31,7 @@ (define-public busybox (package (name "busybox") - (version "1.26.2") + (version "1.29.1") (source (origin (method url-fetch) (uri (string-append @@ -39,11 +39,18 @@ version ".tar.bz2")) (sha256 (base32 - "05mg6rh5smkzfwqfcazkpwy6h6555llsazikqnvwkaf17y8l8gns")))) + "1hqlr5b3bsyb6avadz1z4za6pyl32r1krnpcpwwqilhnx8q0f9gw")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases + (add-before 'configure 'disable-taskset + ;; This feature fails its tests in the build environment, + ;; was default 'n' until after 1.26.2. + (lambda _ + (substitute* "util-linux/taskset.c" + (("default y") "default n")) + #t)) (replace 'configure (lambda _ (invoke "make" "defconfig"))) (replace 'check |