diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2026-04-21 18:20:27 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2026-04-27 10:03:05 +0200 |
| commit | 2568426ebf6e136002bc0eaf2edaa026f4cd14a9 (patch) | |
| tree | b1c0ffe9a1357eb286e45cad518714b6b7eaca4c /gnu | |
| parent | 52d151a253a6a754f174a7c906851611e5b68813 (diff) | |
gnu: munge: Build from a Git checkout.
* gnu/packages/admin.scm (munge)[source]: Switch to ‘git-fetch’ and adjust
‘snippet’ accordingly.
[native-inputs]: Add ‘autoconf’, ‘automake’, and ‘libtool’.
[arguments]: Add ‘pre-bootstrap’ phase. Adjust ‘skip-failing-tests’ phase.
Change-Id: I807a7cff020757f785812f321a22ab03b0b04d5e
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/admin.scm | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 6a743eb032..9f29fc4b5e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012-2025 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012-2026 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-2018, 2020-2023 Eric Bavier <bavier@posteo.net> @@ -3753,22 +3753,27 @@ summarizes network bandwidth by process and remote host.") (name "munge") (version "0.5.18") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/dun/munge/releases/" - "download/munge-" version "/munge-" - version ".tar.xz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/dun/munge") + (commit (string-append "munge-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1p1qv2pa335r1yy599g4dl7h86aibp00z8cadqhgljv0ympfrhrr")) + "1b7gm680dlvmgvj9vxy7n0cqmnv1rl9n4563vasxdxx54f78j30s")) (modules '((guix build utils))) (snippet ;; Don't insist on write access to /var. - #~(substitute* "src/etc/Makefile.in" + #~(substitute* "src/etc/Makefile.am" (("\\$\\(MKDIR_P\\) .*(local|run)statedir.*" all) (string-append ": " all)))))) (inputs (list openssl libgcrypt)) - (native-inputs (list procps)) ;for tests + (native-inputs + (list autoconf + automake + libtool + procps)) ;for tests (build-system gnu-build-system) (arguments `(#:configure-flags @@ -3784,6 +3789,9 @@ summarizes network bandwidth by process and remote host.") '())) #:phases (modify-phases %standard-phases + (add-before 'bootstrap 'pre-bootstrap + (lambda _ + (for-each patch-shebang (find-files "build-aux")))) (add-after 'unpack 'skip-failing-tests (lambda _ ;; Pass '--force' to 'munged'; without it, it fails with "Socket @@ -3796,7 +3804,7 @@ summarizes network bandwidth by process and remote host.") ;; The tests below invoke 'sudo' or have special expectations ;; about network interfaces. (for-each (lambda (test) - (substitute* "tests/Makefile.in" + (substitute* "tests/Makefile.am" (((string-append test "\\.t ")) ""))) (list "0100-munged-lock" "0101-munged-security-socket" |