diff options
| author | Marius Bakke <marius@gnu.org> | 2021-05-22 17:21:57 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-05-22 17:21:57 +0200 |
| commit | 4ea6852c5ff1606cf6848f3ddbb669120b228c13 (patch) | |
| tree | 6f21e3cad7a3cad4eb847f404b6ba6450dfc2bef /gnu/packages/admin.scm | |
| parent | fcf45f8d756b92c5a99308d671af8992b489c4b4 (diff) | |
| parent | d4ffa9630277fa8699c783c08381d688626d4bc3 (diff) | |
| download | guix-4ea6852c5ff1606cf6848f3ddbb669120b228c13.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/admin.scm')
| -rw-r--r-- | gnu/packages/admin.scm | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 60a624fbd1..531686fdbb 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2014, 2015, 2016, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org> -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2020 Eric Bavier <bavier@posteo.net> +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2020, 2021 Eric Bavier <bavier@posteo.net> ;;; Copyright © 2015, 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015 Alex Sassmannshausen <alex.sassmannshausen@gmail.com> ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr> @@ -1150,7 +1150,7 @@ connection alive.") (define-public isc-dhcp (let* ((bind-major-version "9") (bind-minor-version "11") - (bind-patch-version "31") + (bind-patch-version "32") (bind-release-type "") ; for patch release, use "-P" (bind-release-version "") ; for patch release, e.g. "6" (bind-version (string-append bind-major-version @@ -1287,7 +1287,7 @@ connection alive.") "/bind-" bind-version ".tar.gz")) (sha256 (base32 - "0sm3vy5g21isdywxr650442x9r00fpj9cxc81n3qcbibyibl9wpm")))) + "0hhkb4d14hvly2751cxl2s2xyim3bri8qaisgkcm456xfi5wpy6b")))) ("coreutils*" ,coreutils) ("sed*" ,sed))) @@ -2149,7 +2149,7 @@ system is under heavy load.") (define-public detox (package (name "detox") - (version "1.3.3") + (version "1.4.2") (source (origin (method git-fetch) (uri (git-reference @@ -2158,21 +2158,23 @@ system is under heavy load.") (file-name (git-file-name name version)) (sha256 (base32 - "13mhs62m7bpff45liy65pajq5jg3i12jj90vwdkra94z9mlr2rlz")))) + "0q16dvjbry573j4ayh9dwskdh1dxx8dk4rj94w6f2dcv4ww37is1")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) ("flex" ,flex))) (arguments - `(#:tests? #f ;no 'check' target - #:phases (modify-phases %standard-phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'delete-configure ;; The "configure" script is present, but otherwise the ;; project is not bootstrapped: missing install-sh and ;; Makefile.in, so delete it so the bootstrap phase will ;; take over. - (lambda _ (delete-file "configure") #t))))) + (lambda _ (delete-file "configure") #t)) + (replace 'check + (lambda _ + (invoke "./tests/test.sh" "src/detox")))))) (home-page "https://github.com/dharple/detox") (synopsis "Clean up file names") (description |