From e91a5258584026935daacd4543d5b3aa76e6c8f6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 28 Mar 2022 13:46:47 -0400 Subject: gnu: ansible: Use GUIX_PYTHONPATH in the search path specification. * gnu/packages/admin.scm (ansible)[native-search-paths]: Use GUIX_PYTHONPATH. --- gnu/packages/admin.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 8331c42f8b..2c47fb318d 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2706,15 +2706,15 @@ (define-public ansible (build-system python-build-system) (propagated-inputs (list ansible-core)) - ;; The Ansible collections are found by ansible-core via PYTHONPATH; the - ;; following search path ensures that they are found even when Python is - ;; not present in the profile. + ;; The Ansible collections are found by ansible-core via the Python search + ;; path; the following search path ensures that they are found even when + ;; Python is not present in the profile. (native-search-paths ;; XXX: Attempting to use (package-native-search-paths python) ;; here would cause an error about python being an unbound ;; variable in the tests/cpan.scm test. (list (search-path-specification - (variable "PYTHONPATH") + (variable "GUIX_PYTHONPATH") (files (list "lib/python3.9/site-packages"))))) (home-page "https://www.ansible.com/") (synopsis "Radically simple IT automation") -- cgit v1.2.3 From b103d8e4908baff6d048e3936aaa7a9c5be3ffa9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 28 Mar 2022 20:52:40 +0300 Subject: gnu: munge: Fix cross-compiling. * gnu/packages/admin.scm (munge)[arguments]: Add configure-flag to set path to libgcrypt prefix. Add configure flags when cross-compiling to assume support for pipes. --- gnu/packages/admin.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 2c47fb318d..512361cef6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3017,10 +3017,17 @@ (define-public munge (list openssl libgcrypt)) (build-system gnu-build-system) (arguments - '(#:configure-flags + `(#:configure-flags (list "--localstatedir=/var" (string-append "--with-pkgconfigdir=" - (assoc-ref %outputs "out") "/lib/pkgconfig")) + (assoc-ref %outputs "out") "/lib/pkgconfig") + (string-append "--with-libgcrypt-prefix=" + (assoc-ref %build-inputs "libgcrypt")) + ,@(if (%current-target-system) + ;; Assume yes on pipes when cross compiling. + `("ac_cv_file__dev_spx=yes" + "x_ac_cv_check_fifo_recvfd=yes") + '())) #:phases (modify-phases %standard-phases ;; XXX Many test series fail. Some might be fixable, others do no-no -- cgit v1.2.3 From d4172babe0f54c69a1203ce05e719e9021e26110 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 30 Mar 2022 17:14:45 +0200 Subject: gnu: shepherd: Add 0.9.0. * gnu/packages/admin.scm (shepherd): Rename to... (shepherd-0.8): ... this. New variable. (shepherd): Define as an alias for SHEPHERD-0.8. (shepherd-0.9): New variable. (guile2.2-shepherd): Inherit from SHEPHERD-0.9 and adjust inputs accordingly. --- gnu/packages/admin.scm | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 512361cef6..1db04adf71 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -109,6 +109,7 @@ (define-module (gnu packages admin) #:use-module (gnu packages groff) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) + #:use-module (gnu packages guile-xyz) #:use-module (gnu packages hurd) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) @@ -266,7 +267,7 @@ (define-public progress and provides a \"top-like\" mode (monitoring).") (license license:gpl3+))) -(define-public shepherd +(define-public shepherd-0.8 (package (name "shepherd") (version "0.8.1") @@ -307,14 +308,29 @@ (define-public shepherd (license license:gpl3+) (home-page "https://www.gnu.org/software/shepherd/"))) -(define-public guile2.2-shepherd +;; Update on the next rebuild cycle. +(define-public shepherd shepherd-0.8) + +(define-public shepherd-0.9 (package (inherit shepherd) + (version "0.9.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/shepherd/shepherd-" + version ".tar.gz")) + (sha256 + (base32 + "1rdwhrcibs2ly4hjwwb5kmzb133ccjmrfvb0a70cqkv9jy1pg061")))) + (native-inputs (list pkg-config guile-3.0)) + (inputs (list guile-3.0 guile-fibers-1.1)))) + +(define-public guile2.2-shepherd + (package + (inherit shepherd-0.9) (name "guile2.2-shepherd") - (native-inputs - (list pkg-config guile-2.2)) - (inputs - (list guile-2.2 guile2.2-readline)))) + (native-inputs (list pkg-config guile-2.2)) + (inputs (list guile-2.2 guile2.2-fibers)))) (define-public guile2.0-shepherd (package -- cgit v1.2.3 From 6e174c4edd4786d93c1e424c45052f70b2bb3fb0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 15 Apr 2022 18:12:24 +0200 Subject: gnu: shepherd: Support cross-compilation. Reported by phodina . * gnu/packages/admin.scm (shepherd-0.9)[arguments]: New field. [native-inputs]: Add GUILE-FIBERS-1.1. --- gnu/packages/admin.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 1db04adf71..94636faf8b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -322,7 +322,27 @@ (define-public shepherd-0.9 (sha256 (base32 "1rdwhrcibs2ly4hjwwb5kmzb133ccjmrfvb0a70cqkv9jy1pg061")))) - (native-inputs (list pkg-config guile-3.0)) + (arguments + (list #:configure-flags #~'("--localstatedir=/var") + #:make-flags #~'("GUILE_AUTO_COMPILE=0") + #:phases (if (%current-target-system) + #~(modify-phases %standard-phases + (add-before 'configure 'set-fibers-directory + (lambda _ + ;; When cross-compiling, refer to the target + ;; Fibers, not the native one. + (substitute* '("herd.in" "shepherd.in") + (("%FIBERS_SOURCE_DIRECTORY%") + #$(file-append + (this-package-input "guile-fibers") + "/share/guile/site/3.0")) + (("%FIBERS_OBJECT_DIRECTORY%") + #$(file-append + (this-package-input "guile-fibers") + "/lib/guile/3.0/site-ccache")))))) + #~%standard-phases))) + (native-inputs (list pkg-config guile-3.0 + guile-fibers-1.1)) ;for cross-compilation (inputs (list guile-3.0 guile-fibers-1.1)))) (define-public guile2.2-shepherd -- cgit v1.2.3 From ff12cf5e0702757661f870b2679a4c5fecc714b9 Mon Sep 17 00:00:00 2001 From: "Wamm K. D" Date: Wed, 20 Apr 2022 13:18:25 -0500 Subject: gnu: Add hyfetch. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/admin.scm (hyfetch): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/admin.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 94636faf8b..a200050d97 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -47,6 +47,7 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 Petr Hodina ;;; Copyright © 2021 Artyom V. Poptsov +;;; Copyright © 2022 Wamm K. D. ;;; ;;; This file is part of GNU Guix. ;;; @@ -3733,6 +3734,32 @@ (define-public neofetch you are running, what theme or icon set you are using, etc.") (license license:expat))) +(define-public hyfetch + (package + (name "hyfetch") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "HyFetch" version)) + (sha256 + (base32 "1bfkycdhsyzkk6q24gdy1xwvyz0rvkr7xk2khbn74b3nk6kp83r2")))) + (build-system python-build-system) + (inputs (list python-hypy-utils python-typing-extensions)) + (arguments `(#:phases (modify-phases %standard-phases + (add-before 'build 'set-HOME + (lambda _ ;; Tries to set files in .config + (setenv "HOME" "/tmp")))))) + (home-page "https://github.com/hykilpikonna/HyFetch") + (synopsis "@code{neofetch} with pride flags <3") + (description "HyFetch is a command-line system information tool fork of +@code{neofetch}. HyFetch displays information about your system next to your +OS logo in ASCII representation. The ASCII representation is then colored in +the pattern of the pride flag of your choice. The main purpose of HyFetch is to +be used in screenshots to show other users what operating system or distribution +you are running, what theme or icon set you are using, etc.") + (license license:expat))) + (define-public screenfetch (package (name "screenfetch") -- cgit v1.2.3 From 0bb0984724e87ae71b30b95bbb40f15b626bddd0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 May 2022 02:00:02 +0200 Subject: gnu: acpica: Update to 20220331. * gnu/packages/admin.scm (acpica): Update to 20220331. --- gnu/packages/admin.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index a200050d97..5bc6edb54f 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2016 Peter Feigl ;;; Copyright © 2016 John J. Foerch ;;; Copyright © 2016, 2017 Nikita -;;; Copyright © 2016–2021 Tobias Geerinckx-Rice +;;; Copyright © 2016–2022 Tobias Geerinckx-Rice ;;; Copyright © 2016 John Darrington ;;; Copyright © 2017 Ben Sturmfels ;;; Copyright © 2017 Ethan R. Jones @@ -2211,7 +2211,7 @@ (define-public dmidecode (define-public acpica (package (name "acpica") - (version "20211217") + (version "20220331") (source (origin (method url-fetch) (uri (string-append @@ -2219,7 +2219,7 @@ (define-public acpica version ".tar.gz")) (sha256 (base32 - "0521hmaw2zhi0mpgnaf2i83dykfgql4bx98cg7xqy8wmj649z194")))) + "0yjcl00nnnlw01sz6a1i5d3v75gr17mkbxkxfx2v344al33abk8w")))) (build-system gnu-build-system) (native-inputs (list flex bison)) (arguments -- cgit v1.2.3 From 28741adda9c2083daf7a0c9323e79bfd571a9b25 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 May 2022 02:00:02 +0200 Subject: gnu: audit: Update to 3.0.8. * gnu/packages/admin.scm (audit): Update to 3.0.8. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 5bc6edb54f..3626511bf4 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3100,13 +3100,13 @@ (define-public audit (package (name "audit") (home-page "https://people.redhat.com/sgrubb/audit/") - (version "3.0.7") + (version "3.0.8") (source (origin (method url-fetch) (uri (string-append home-page "audit-" version ".tar.gz")) (sha256 (base32 - "15r5lrrkv2zj3dvpqssd46w61hmrq27y7c2rz33s20ck59iphk4b")))) + "04w9m9ffvi58z11i344wa1hji9ba68cdklrkizhiwf39mnwxkx5m")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list "--with-python=no" -- cgit v1.2.3 From 769202ecf81e7a0cb5810f929a1105304f15f5b4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 May 2022 02:00:02 +0200 Subject: gnu: nnn: Update to 4.5. * gnu/packages/admin.scm (nnn): Update to 4.5. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 3626511bf4..e9c9ed28ed 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3903,14 +3903,14 @@ (define-public pfetch (define-public nnn (package (name "nnn") - (version "4.4") + (version "4.5") (source (origin (method url-fetch) (uri (string-append "https://github.com/jarun/nnn/releases/download/v" version "/nnn-v" version ".tar.gz")) (sha256 - (base32 "0lqn7pyy8c1vy29vn8ad4x23cw67cy1d21ghns6f3w9a1h7kyjp0")))) + (base32 "1aj9hzhpwxl2v1dlf3jpd3rp81z689dq8iycbipc0024dnyibp7s")))) (build-system gnu-build-system) (inputs (list ncurses readline)) -- cgit v1.2.3 From 755e702db7bcd5eed241b5e26072640150745564 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 May 2022 02:00:01 +0200 Subject: gnu: nnn: Use G-expressions. * gnu/packages/admin.scm (nnn)[arguments]: Rewrite as G-expressions. --- gnu/packages/admin.scm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index e9c9ed28ed..1b01f2fe63 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3917,16 +3917,15 @@ (define-public nnn (native-inputs (list pkg-config)) (arguments - `(#:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (delete 'configure)) ; no configure script - #:make-flags - (list - (string-append "PREFIX=" - (assoc-ref %outputs "out")) - (string-append "CC=" ,(cc-for-target)) - (string-append "PKG_CONFIG=" ,(pkg-config-for-target))))) + (list #:tests? #f ; no tests + #:make-flags + #~(list + (string-append "PREFIX=" #$output) + (string-append "CC=" #$(cc-for-target)) + (string-append "PKG_CONFIG=" #$(pkg-config-for-target))) + #:phases + #~(modify-phases %standard-phases + (delete 'configure)))) ; no configure script (home-page "https://github.com/jarun/nnn") (synopsis "Terminal file browser") (description -- cgit v1.2.3 From ef2a240100a196f477b58c1d753b8dcf9278d3ea Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 May 2022 02:00:03 +0200 Subject: gnu: libcap-ng: Update to 0.8.3. * gnu/packages/admin.scm (libcap-ng): Update to 0.8.3. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 1b01f2fe63..7538f7f021 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2496,7 +2496,7 @@ (define-public direvent (define-public libcap-ng (package (name "libcap-ng") - (version "0.8.2") + (version "0.8.3") (source (origin (method url-fetch) (uri (string-append @@ -2504,7 +2504,7 @@ (define-public libcap-ng version ".tar.gz")) (sha256 (base32 - "1sasp1n154aqy9fz0knlb966svm7xg1zjhg1vr4q839bgjvq7h2j")))) + "0ba9dfga7chwf6lf7a03x1a30fgdy2pb4r7pnn1jzfr2is2gdmmy")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 644a96677269ef7c2ffb8cdff01e62367949611c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 May 2022 02:00:02 +0200 Subject: gnu: libcap-ng: Omit static libraries. * gnu/packages/admin.scm (libcap-ng)[arguments]: Add "--disable-static" to #:configure-flags. --- gnu/packages/admin.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 7538f7f021..813aa59093 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2508,7 +2508,8 @@ (define-public libcap-ng (build-system gnu-build-system) (arguments `(#:configure-flags - (list "--without-python"))) + (list "--disable-static" + "--without-python"))) (home-page "https://people.redhat.com/sgrubb/libcap-ng/") (synopsis "Library for more easily working with POSIX capabilities") (description -- cgit v1.2.3 From 8de6d6ffb24ac2f07b3f3594816df570e579ddba Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 8 May 2022 02:00:02 +0200 Subject: gnu: htop: Update to 3.2.0. * gnu/packages/admin.scm (htop): Update to 3.2.0. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 813aa59093..7e6a040493 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -671,7 +671,7 @@ (define-public ttyload (define-public htop (package (name "htop") - (version "3.1.2") + (version "3.2.0") (source (origin (method git-fetch) @@ -679,7 +679,7 @@ (define-public htop (url "https://github.com/htop-dev/htop") (commit version))) (sha256 - (base32 "024qhrlmqgwmn6bwb5yiff9bhhdabryiphzx8y654k8r8vqi59j4")) + (base32 "16l1r2ixzs640ybqp2x8bfyvk98kiywy7k3sjmp5j5npdzn5ryd7")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From 85d56c1780bd68929498ed9b4e9cc7938e94a6e5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 8 May 2022 02:00:01 +0200 Subject: gnu: inxi-minimal: Update to 3.3.15-1. * gnu/packages/admin.scm (inxi-minimal): Update to 3.3.15-1. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 7e6a040493..a32d28a92e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4128,7 +4128,7 @@ (define-public inxi-minimal (let ((real-name "inxi")) (package (name "inxi-minimal") - (version "3.3.11-1") + (version "3.3.15-1") (source (origin (method git-fetch) @@ -4137,7 +4137,7 @@ (define-public inxi-minimal (commit version))) (file-name (git-file-name real-name version)) (sha256 - (base32 "1nk3q2xg0myykq1myasxhvhhr0vk8qv3m7pb3icw81r3ydasnls0")))) + (base32 "02zy94bd6ayfl9y7ka6gk32q254k49cbq3a6wgi31r2fcvybyrf7")))) (build-system trivial-build-system) (inputs `(("bash" ,bash-minimal) -- cgit v1.2.3 From 09e885d848f7c86e62881c749843582ccfb6c9a3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 8 May 2022 02:00:01 +0200 Subject: gnu: netcat-openbsd: Update to 1.218-5. * gnu/packages/admin.scm (netcat-openbsd): Update to 1.218-5. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index a32d28a92e..ff2ff2fc2d 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1068,7 +1068,7 @@ (define-public netcat (define-public netcat-openbsd (package (name "netcat-openbsd") - (version "1.218-2") + (version "1.218-5") (source (origin (method git-fetch) (uri (git-reference @@ -1077,7 +1077,7 @@ (define-public netcat-openbsd (file-name (git-file-name name version)) (sha256 (base32 - "1rj4nx0jdism1idc4fghahqbafhv72cpk7zlyq9czgvbps10d1kh")))) + "0hpbmz9m2q22a6qgbn9590z2x96xgffim8g0m1v47mariz3pqhlc")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no test suite -- cgit v1.2.3 From 4051231d208ddd681a741893768efd912ffb0496 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 8 May 2022 02:00:03 +0200 Subject: gnu: nq: Update to 0.5. * gnu/packages/admin.scm (nq): Update to 0.5. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index ff2ff2fc2d..52f832bdf0 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4868,7 +4868,7 @@ (define-public lrzsz (define-public nq (package (name "nq") - (version "0.4") + (version "0.5") (source (origin (method git-fetch) @@ -4877,7 +4877,7 @@ (define-public nq (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0sdamjzvmf6cxhjmd1rjvn7zm6k10fp5n6vabyxd3yl30cgrxw2i")))) + (base32 "0szbndvwl6ghwjzb165s09977s0r1yq8h0ziknm0h6xndkcjspl3")))) (build-system gnu-build-system) (native-inputs (list perl)) -- cgit v1.2.3 From d24ad3949127a938cad306f0524c120afe5e2e4f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 8 May 2022 02:00:02 +0200 Subject: gnu: nq: Use G-expressions. * gnu/packages/admin.scm (nq)[arguments]: Rewrite as G-expressions. --- gnu/packages/admin.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 52f832bdf0..cd7053f819 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4882,11 +4882,12 @@ (define-public nq (native-inputs (list perl)) (arguments - `(#:make-flags (list (string-append "CC=" ,(cc-for-target)) - (string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - (delete 'configure)))) + (list #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure)))) (synopsis "Unix command line queue utility") (description "@code{nq} can create very lightweight job queue systems which require no -- cgit v1.2.3 From 388e0390441ca7a8e8a57e71d92e6f963f07af9f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 8 May 2022 02:00:01 +0200 Subject: gnu: isc-dhcp: Update to 4.4.3. * gnu/packages/admin.scm (isc-dhcp): Update to 4.4.3. [source]: Remove upstreamed patch. * gnu/packages/patches/isc-dhcp-gcc-compat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/admin.scm | 5 +- gnu/packages/patches/isc-dhcp-gcc-compat.patch | 72 -------------------------- 3 files changed, 2 insertions(+), 76 deletions(-) delete mode 100644 gnu/packages/patches/isc-dhcp-gcc-compat.patch (limited to 'gnu/packages/admin.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 3b7db46b26..ed901a5ba8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1297,7 +1297,6 @@ dist_patch_DATA = \ %D%/packages/patches/iputils-libcap-compat.patch \ %D%/packages/patches/ipxe-reproducible-geniso.patch \ %D%/packages/patches/irrlicht-use-system-libs.patch \ - %D%/packages/patches/isc-dhcp-gcc-compat.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \ %D%/packages/patches/json-c-0.13-CVE-2020-12762.patch \ %D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index cd7053f819..34e4a6e8ca 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1232,15 +1232,14 @@ (define-public isc-dhcp bind-release-version))) (package (name "isc-dhcp") - (version "4.4.2-P1") + (version "4.4.3") (source (origin (method url-fetch) (uri (string-append "https://ftp.isc.org/isc/dhcp/" version "/dhcp-" version ".tar.gz")) - (patches (search-patches "isc-dhcp-gcc-compat.patch")) (sha256 (base32 - "06jsr0cg5rsmyibshrpcb9za0qgwvqccashdma7mlm1rflrh8pmh")))) + "062q2g8cj2zv0zv22x6pg21m21bdlscxkg3li0ac0pm0qasccghf")))) (build-system gnu-build-system) (arguments `(#:parallel-build? #f diff --git a/gnu/packages/patches/isc-dhcp-gcc-compat.patch b/gnu/packages/patches/isc-dhcp-gcc-compat.patch deleted file mode 100644 index 82cb572d17..0000000000 --- a/gnu/packages/patches/isc-dhcp-gcc-compat.patch +++ /dev/null @@ -1,72 +0,0 @@ -Add minor fixes for compiling with GCC 10. - -Taken from upstream: -https://gitlab.isc.org/isc-projects/dhcp/-/commit/6c7e61578b1b449272dbb40dd8b98d03dad8a57a - -diff --git a/client/dhclient.c b/client/dhclient.c ---- a/client/dhclient.c -+++ b/client/dhclient.c -@@ -83,8 +83,9 @@ static const char message [] = "Internet Systems Consortium DHCP Client"; - static const char url [] = "For info, please visit https://www.isc.org/software/dhcp/"; - #endif /* UNIT_TEST */ - --u_int16_t local_port = 0; --u_int16_t remote_port = 0; -+extern u_int16_t local_port; -+extern u_int16_t remote_port; -+ - #if defined(DHCPv6) && defined(DHCP4o6) - int dhcp4o6_state = -1; /* -1 = stopped, 0 = polling, 1 = started */ - #endif -diff --git a/common/discover.c b/common/discover.c ---- a/common/discover.c -+++ b/common/discover.c -@@ -45,8 +45,8 @@ struct interface_info *fallback_interface = 0; - - int interfaces_invalidated; - int quiet_interface_discovery; --u_int16_t local_port; --u_int16_t remote_port; -+u_int16_t local_port = 0; -+u_int16_t remote_port = 0; - u_int16_t relay_port = 0; - int dhcpv4_over_dhcpv6 = 0; - int (*dhcp_interface_setup_hook) (struct interface_info *, struct iaddr *); -diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c ---- a/relay/dhcrelay.c -+++ b/relay/dhcrelay.c -@@ -95,8 +95,8 @@ enum { forward_and_append, /* Forward and append our own relay option. */ - forward_untouched, /* Forward without changes. */ - discard } agent_relay_mode = forward_and_replace; - --u_int16_t local_port; --u_int16_t remote_port; -+extern u_int16_t local_port; -+extern u_int16_t remote_port; - - /* Relay agent server list. */ - struct server_list { -diff --git a/server/mdb.c b/server/mdb.c ---- a/server/mdb.c -+++ b/server/mdb.c -@@ -67,7 +67,7 @@ static host_id_info_t *host_id_info = NULL; - - int numclasseswritten; - --omapi_object_type_t *dhcp_type_host; -+extern omapi_object_type_t *dhcp_type_host; - - isc_result_t enter_class(cd, dynamicp, commit) - struct class *cd; -diff --git a/server/mdb6.c b/server/mdb6.c ---- a/server/mdb6.c -+++ b/server/mdb6.c -@@ -1945,7 +1945,7 @@ create_prefix6(struct ipv6_pool *pool, struct iasubopt **pref, - } - new_ds.data = new_ds.buffer->data; - memcpy(new_ds.buffer->data, ds.data, ds.len); -- memcpy(new_ds.buffer->data + ds.len, &tmp, sizeof(tmp)); -+ memcpy(&new_ds.buffer->data[0] + ds.len, &tmp, sizeof(tmp)); - data_string_forget(&ds, MDL); - data_string_copy(&ds, &new_ds, MDL); - data_string_forget(&new_ds, MDL); -- cgit v1.2.3 From e81f26d2c1d3748e06c75d940a395271821474e9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 17 May 2022 09:56:10 +0300 Subject: gnu: atop: Add release-monitoring-url. * gnu/packages/admin.scm (atop)[properties]: New field. --- gnu/packages/admin.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 34e4a6e8ca..13c8a2dfd5 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4746,6 +4746,8 @@ (define-public atop to the CPU, memory, swap, disks (including LVM) and network layers, and for every process (and thread) it shows e.g. the CPU utilization, memory growth, disk utilization, priority, username, state, and exit code.") + (properties + `((release-monitoring-url . "https://www.atoptool.nl/downloadatop.php"))) (license license:gpl2+))) ;; TODO: Unvendor u-root (pkg: forth, golang, testutil). -- cgit v1.2.3 From eab070a89d9906359ffe0a90c96b74771d836f19 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 17 May 2022 10:57:52 +0300 Subject: gnu: atop: Update to 2.7.1. * gnu/packages/admin.scm (atop): Update to 2.7.1. [arguments]: Remove unnecessary make-flag. Remove unneeded substitutions. --- gnu/packages/admin.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 13c8a2dfd5..34df56d5e7 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4693,21 +4693,19 @@ (define-public nmrpflash (define-public atop (package (name "atop") - (version "2.6.0") + (version "2.7.1") (source (origin (method url-fetch) (uri (string-append "https://www.atoptool.nl/download/atop-" version ".tar.gz")) (sha256 (base32 - "0wlg0n0h9vwpjp2dcb623jvvqck422jrjpq9mbpzg4hnawxcmhly")))) + "0kjwgf94skbrndv1krlmsrq34smzi3iwk73fbsnyw787gvqx4j6a")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no test suite #:make-flags (list (string-append "CC=" ,(cc-for-target)) - ;; The installer requires a choice between systemd or SysV. - "systemdinstall" (string-append "DESTDIR=" (assoc-ref %outputs "out")) (string-append "BINPATH=/bin") (string-append "SBINPATH=/sbin") @@ -4722,12 +4720,8 @@ (define-public atop (modify-phases %standard-phases (delete 'configure) ; No ./configure script (add-before 'build 'patch-build - (lambda* (#:key outputs #:allow-other-keys) + (lambda _ (substitute* "Makefile" - ;; We don't need to chown things in the build environment. - (("chown.*$") "") - ;; We can't toggle the setuid bit in the build environment. - (("chmod 04711") "chmod 0711") ;; Otherwise, it creates a blank configuration file as a "default". (("touch.*DEFPATH)/atop") "") (("chmod.*DEFPATH)/atop") "")) -- cgit v1.2.3 From 2d229578bd50b7137603ff14ce5588784a6c07b9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 17 May 2022 10:59:36 +0300 Subject: gnu: atop: Adjust build. * gnu/packages/admin.scm (atop)[arguments]: Adjust custom 'patch-build phase to remove references to '/usr' and adjust make-flags accordingly. Remove trailing #t. --- gnu/packages/admin.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 34df56d5e7..30f51ef4b3 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4707,13 +4707,8 @@ (define-public atop #:make-flags (list (string-append "CC=" ,(cc-for-target)) (string-append "DESTDIR=" (assoc-ref %outputs "out")) - (string-append "BINPATH=/bin") - (string-append "SBINPATH=/sbin") (string-append "SYSDPATH=/etc/systemd/system") (string-append "PMPATHD=/etc/systemd/system-sleep") - (string-append "MAN1PATH=/share/man/man1") - (string-append "MAN5PATH=/share/man/man5") - (string-append "MAN8PATH=/share/man/man8") ;; Or else it tries to create /var/log/atop... (string-append "LOGPATH=")) #:phases @@ -4722,10 +4717,11 @@ (define-public atop (add-before 'build 'patch-build (lambda _ (substitute* "Makefile" + ;; Don't use /usr as a prefix + (("/usr") "") ;; Otherwise, it creates a blank configuration file as a "default". (("touch.*DEFPATH)/atop") "") - (("chmod.*DEFPATH)/atop") "")) - #t))))) + (("chmod.*DEFPATH)/atop") ""))))))) (inputs `(("ncurses" ,ncurses) ("python" ,python-wrapper) ; for `atopgpud` -- cgit v1.2.3 From ef55192ef8a0d9bd336731350f73b709ffd101a0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 17 May 2022 12:29:08 +0300 Subject: gnu: atop: Use new package format. * gnu/packages/admin.scm (atop)[arguments]: Rewrite using g-exps. [inputs]: Remove input labels. --- gnu/packages/admin.scm | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 30f51ef4b3..363f26ed0c 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4703,29 +4703,30 @@ (define-public atop "0kjwgf94skbrndv1krlmsrq34smzi3iwk73fbsnyw787gvqx4j6a")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no test suite + (list + #:tests? #f ; no test suite #:make-flags - (list (string-append "CC=" ,(cc-for-target)) - (string-append "DESTDIR=" (assoc-ref %outputs "out")) - (string-append "SYSDPATH=/etc/systemd/system") - (string-append "PMPATHD=/etc/systemd/system-sleep") - ;; Or else it tries to create /var/log/atop... - (string-append "LOGPATH=")) + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "DESTDIR=" #$output) + (string-append "SYSDPATH=/etc/systemd/system") + (string-append "PMPATHD=/etc/systemd/system-sleep") + ;; Or else it tries to create /var/log/atop... + (string-append "LOGPATH=")) #:phases - (modify-phases %standard-phases - (delete 'configure) ; No ./configure script - (add-before 'build 'patch-build - (lambda _ - (substitute* "Makefile" - ;; Don't use /usr as a prefix - (("/usr") "") - ;; Otherwise, it creates a blank configuration file as a "default". - (("touch.*DEFPATH)/atop") "") - (("chmod.*DEFPATH)/atop") ""))))))) + #~(modify-phases %standard-phases + (delete 'configure) ; No ./configure script + (add-before 'build 'patch-build + (lambda _ + (substitute* "Makefile" + ;; Don't use /usr as a prefix. + (("/usr") "") + ;; Otherwise, it creates a blank configuration file as a "default". + (("touch.*DEFPATH)/atop") "") + (("chmod.*DEFPATH)/atop") ""))))))) (inputs - `(("ncurses" ,ncurses) - ("python" ,python-wrapper) ; for `atopgpud` - ("zlib" ,zlib))) + (list ncurses + python-wrapper ; for `atopgpud` + zlib)) (home-page "https://www.atoptool.nl/") (synopsis "Linux performance monitoring console") (description "Atop is an ASCII full-screen performance monitor for Linux -- cgit v1.2.3 From 8a588eb8715acfa204144329abb080c91018716b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 22 May 2022 18:22:44 +0200 Subject: gnu: shepherd: Update to 0.9.1. * gnu/packages/admin.scm (shepherd-0.9): Update to 0.9.1. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 363f26ed0c..f763cb5c19 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -315,14 +315,14 @@ (define-public shepherd shepherd-0.8) (define-public shepherd-0.9 (package (inherit shepherd) - (version "0.9.0") + (version "0.9.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/shepherd/shepherd-" version ".tar.gz")) (sha256 (base32 - "1rdwhrcibs2ly4hjwwb5kmzb133ccjmrfvb0a70cqkv9jy1pg061")))) + "0l2arn6gsyw88xk9phxnyplvv1mn8sqp3ipgyyb0nszdzvxlgd36")))) (arguments (list #:configure-flags #~'("--localstatedir=/var") #:make-flags #~'("GUILE_AUTO_COMPILE=0") -- cgit v1.2.3 From e490aacde1f8d9bb30cb7bdd4ea72810ca1a3837 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 May 2022 02:00:03 +0200 Subject: gnu: lynis: Update to 3.0.8. * gnu/packages/admin.scm (lynis): Update to 3.0.8. --- gnu/packages/admin.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index f763cb5c19..38239e1f05 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4367,7 +4367,7 @@ (define-public lynis (package (name "lynis") ;; Also update the ‘lynis-sdk’ input to the commit matching this release. - (version "3.0.6") + (version "3.0.8") (source (origin (method git-fetch) @@ -4376,7 +4376,7 @@ (define-public lynis (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1a1n8alcq6zil1rwk9940cg3x2nz3igcxfad99505pdh7ccz9324")) + (base32 "19kz1ffbbd431cdfw7fjcl5hjkks3gfkwk3w2zkwsxgyiky1gx3w")) (modules '((guix build utils))) (snippet '(begin @@ -4392,10 +4392,10 @@ (define-public lynis (method git-fetch) (uri (git-reference (url "https://github.com/CISOfy/lynis-sdk") - (commit "1c4e5f60a03e29a1525ca9ec17c793461058253d"))) + (commit "dffe5d352e4d6029ea95a84d50604ccd97cb8999"))) (file-name (git-file-name "lynis-sdk" version)) (sha256 - (base32 "060k8k1q4c7nvrv3cwscxq8md2v75q3nrwwim1hgfw20divw3npy")))))) + (base32 "05qq4395x8f0kyl1ppm74npsf8sb3hhgz0ck4fya91sy6a26b4ja")))))) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 52431e42ef92beb89ef31e3fd3ec178254b8d630 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 May 2022 02:00:00 +0200 Subject: gnu: lynis: Work. Work around . * gnu/packages/admin.scm (lynis)[arguments]: Add a custom 'unpack phase that doesn't MAKE-FILE-WRITABLE. --- gnu/packages/admin.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 38239e1f05..d22753c64f 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4399,6 +4399,13 @@ (define-public lynis (arguments `(#:phases (modify-phases %standard-phases + (replace 'unpack + ;; XXX Remove after fixing . + (lambda* (#:key source #:allow-other-keys) + (mkdir "source") + (chdir "source") + (copy-recursively source "." + #:keep-mtime? #t))) (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) (substitute* "lynis" -- cgit v1.2.3 From 1a6be557010bcf55d1c6d2e38ab1f8b5efe7303b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 May 2022 02:00:01 +0200 Subject: gnu: jc: Update to 1.19.0. * gnu/packages/admin.scm (jc): Update to 1.19.0. [arguments]: Add a new 'hack-time-zone phase. --- gnu/packages/admin.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index d22753c64f..af75dee697 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4541,7 +4541,7 @@ (define-public pam-mount (define-public jc (package (name "jc") - (version "1.13.4") + (version "1.19.0") (source (origin ;; The PyPI tarball lacks the test suite. @@ -4551,8 +4551,16 @@ (define-public jc (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0rwvyyrdnw43pixp8h51rncq2inc9pbbj1j2191y5si00pjw34zr")))) + (base32 "021zk0y8kb6v3qf3hwfg8qjzzmrca039nz3fjywiy2njmbhr8hyi")))) (build-system python-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + ;; XXX Guix's America/Los_Angeles time zone is somehow broken. + (add-before 'check 'hack-time-zone + (lambda _ + (substitute* (find-files "tests" "^test.*\\.py$") + (("America/Los_Angeles") "PST8PDT"))))))) (propagated-inputs (list python-pygments python-ruamel.yaml python-xmltodict)) (home-page "https://github.com/kellyjonbrazil/jc") -- cgit v1.2.3 From e4fe344a5c64063f8201a637973aa366a3ded200 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 May 2022 16:29:36 +0300 Subject: gnu: nmap: Honor tests? flag. * gnu/packages/admin.scm (nmap)[arguments]: In custom 'check phase honor the #:tests? flag. --- gnu/packages/admin.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index af75dee697..4e655551bd 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3191,10 +3191,12 @@ (define (python-path dir) (,(python-path ndiff))))))) ;; These are the tests that do not require network access. (replace 'check - (lambda _ (invoke "make" - "check-nse" - "check-ndiff" - "check-dns")))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "make" + "check-nse" + "check-ndiff" + "check-dns"))))) ;; Nmap can't cope with out-of-source building. #:out-of-source? #f)) (home-page "https://nmap.org/") -- cgit v1.2.3 From cd46c8c34b4287f550d7744e31cf339dbd07dc45 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 13:34:44 -0400 Subject: gnu: Remove graphios. * gnu/packages/admin.scm (graphios): Delete variable. --- gnu/packages/admin.scm | 36 ------------------------------------ 1 file changed, 36 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 4e655551bd..2d817fc00f 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2567,42 +2567,6 @@ (define-public fdupes specified directories.") (license license:expat))) -(define-public graphios - (package - (name "graphios") - (version "2.0.3") - (source - (origin - (method url-fetch) - (uri (pypi-uri "graphios" version)) - (sha256 - (base32 - "1h87hvc315wg6lklbf4l7csd3n5pgljwrfli1p3nasdi0izgn66i")))) - (build-system python-build-system) - (arguments - ;; Be warned: Building with Python 3 succeeds, but the build process - ;; throws a syntax error that is ignored. - `(#:python ,python-2 - #:phases - (modify-phases %standard-phases - (add-before 'build 'fix-setup.py - (lambda* (#:key outputs #:allow-other-keys) - ;; Fix hardcoded, unprefixed file names. - (let ((out (assoc-ref outputs "out"))) - (substitute* '("setup.py") - (("/etc") (string-append out "/etc")) - (("/usr") out) - (("distro_ver = .*") "distro_ver = ''")) - #t)))))) - (home-page "https://github.com/shawn-sterling/graphios") - (synopsis "Emit Nagios metrics to Graphite, Statsd, and Librato") - (description - "Graphios is a script to emit nagios perfdata to various upstream metrics -processing and time-series systems. It's currently compatible with Graphite, -Statsd, Librato and InfluxDB. Graphios can emit Nagios metrics to any number -of supported upstream metrics systems simultaneously.") - (license license:gpl2+))) - (define-public ansible-core (package (name "ansible-core") -- cgit v1.2.3 From 1e42c76c0f08764a7624593e381c00fef410e386 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 May 2022 02:00:01 +0200 Subject: gnu: daemonize: Use HTTPS home page. * gnu/packages/admin.scm (daemonize)[home-page]: Use HTTPS. --- gnu/packages/admin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 2d817fc00f..c6bd418c3e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -525,7 +525,7 @@ (define-public daemonize (base32 "0w4g0iyssyw7dd0061881z8s5czcl01mz6v00znax57zfxjqpvnm")))) (build-system gnu-build-system) (arguments '(#:tests? #f)) ; No tests available. - (home-page "http://software.clapper.org/daemonize/") + (home-page "https://software.clapper.org/daemonize/") (synopsis "Command line utility to run a program as a daemon") (description "daemonize runs a command as a Unix daemon. It will close all open file -- cgit v1.2.3 From aaed8bab4614502822adeb999bad4ee0502009d9 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 2 Jun 2022 11:57:17 -0700 Subject: gnu: inxi-minimal: Build reproducibly. Avoid embedding timestamp in inxi.1.gz manpage. * gnu/packages/admin.scm (inxi-minimal)[arguments]: Pass "-n" to gzip invocation. --- gnu/packages/admin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c6bd418c3e..92ee007729 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4152,7 +4152,7 @@ (define-public inxi-minimal (string-append dir "/lib/perl5/site_perl")) (_ "")) %build-inputs))))) - (invoke "gzip" "inxi.1") + (invoke "gzip" "-n" "inxi.1") (install-file "inxi.1.gz" (string-append %output "/share/man/man1")))))) (home-page "https://smxi.org/docs/inxi.htm") -- cgit v1.2.3 From 0e5e26dc71212147cac1250be0ee61f57d2ed3ab Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 May 2022 02:00:01 +0200 Subject: gnu: cloud-utils: Update to 0.33. * gnu/packages/admin.scm (cloud-utils): Update to 0.33. [arguments]: Don't explicitly return #t from phases. --- gnu/packages/admin.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 92ee007729..f30509a0ff 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -407,7 +407,7 @@ (define-public cfm (define-public cloud-utils (package (name "cloud-utils") - (version "0.32") + (version "0.33") (source (origin (method url-fetch) @@ -434,8 +434,7 @@ (define-public cloud-utils "/bin/growpart"))) (wrap-program growpart `("PATH" ":" prefix (,(dirname (which "sfdisk")) - ,(dirname (which "readlink")))))) - #t))))) + ,(dirname (which "readlink"))))))))))) (inputs (list python util-linux)) ; contains sfdisk for growpart (home-page "https://launchpad.net/cloud-utils") -- cgit v1.2.3 From d6d06ee2377e2366767e53365dbcfa42e62971d7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 May 2022 02:00:00 +0200 Subject: gnu: cloud-utils: Fix wrapping. * gnu/packages/admin.scm (cloud-utils)[arguments]: Search for readlink & sfdisk in inputs. [inputs]: Add coreutils. --- gnu/packages/admin.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index f30509a0ff..e9787f1c43 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -419,7 +419,11 @@ (define-public cloud-utils "0xxdi55lzw7j91zfajw7jhd2ilsqj2dy04i9brlk8j3pvb5ma8hk")))) (build-system gnu-build-system) (arguments - '(#:make-flags + '(#:modules + ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-26)) + #:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "BINDIR=" out "/bin") (string-append "MANDIR=" out "/share/man/man1") @@ -433,10 +437,15 @@ (define-public cloud-utils (let ((growpart (string-append (assoc-ref outputs "out") "/bin/growpart"))) (wrap-program growpart - `("PATH" ":" prefix (,(dirname (which "sfdisk")) - ,(dirname (which "readlink"))))))))))) + `("PATH" ":" prefix + ,(map dirname + (map (cut search-input-file inputs <>) + (list "bin/readlink" + "sbin/sfdisk"))))))))))) (inputs - (list python util-linux)) ; contains sfdisk for growpart + (list coreutils ; for readlink + python + util-linux)) ; sfdisk for growpart (home-page "https://launchpad.net/cloud-utils") (synopsis "Set of utilities for cloud computing environments") (description -- cgit v1.2.3 From 544a886ae1702502c0965ad658816741fb07c309 Mon Sep 17 00:00:00 2001 From: Roman Riabenko Date: Sat, 28 May 2022 18:36:48 +0300 Subject: gnu: wpa-supplicant: Install DBus service file. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/admin.scm (wpa-supplicant)[arguments]: In 'install-dbus-conf' phase, install DBus service file for dbus-system-services-builder to find. Signed-off-by: Ludovic Courtès --- gnu/packages/admin.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index e9787f1c43..7f0543ac52 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -48,6 +48,7 @@ ;;; Copyright © 2021 Petr Hodina ;;; Copyright © 2021 Artyom V. Poptsov ;;; Copyright © 2022 Wamm K. D. +;;; Copyright © 2022 Roman Riabenko ;;; ;;; This file is part of GNU Guix. ;;; @@ -2036,10 +2037,16 @@ (define-public wpa-supplicant (add-after 'install-documentation 'install-dbus-conf (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (dir (string-append out "/etc/dbus-1/system.d"))) - (mkdir-p dir) + (interfaces (string-append out "/etc/dbus-1/system.d")) + (services (string-append out + "/share/dbus-1/system-services"))) + (mkdir-p interfaces) (copy-file "dbus/dbus-wpa_supplicant.conf" - (string-append dir "/wpa_supplicant.conf"))) + (string-append interfaces "/wpa_supplicant.conf")) + (mkdir-p services) + (copy-file "dbus/fi.w1.wpa_supplicant1.service" + (string-append services + "/fi.w1.wpa_supplicant1.service"))) #t)))))))) (define-public wpa-supplicant-gui -- cgit v1.2.3 From e3b94eddf6d2cea2b1fa060a10a100975d85734d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Jun 2022 02:00:01 +0200 Subject: gnu: sudo: Update to 1.9.11. * gnu/packages/admin.scm (sudo): Update to 1.9.11. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 7f0543ac52..42ae928419 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1769,7 +1769,7 @@ (define-public rottlog (define-public sudo (package (name "sudo") - (version "1.9.10") + (version "1.9.11") (source (origin (method url-fetch) (uri @@ -1779,7 +1779,7 @@ (define-public sudo version ".tar.gz"))) (sha256 (base32 - "1x34k8sd2msfjjsahff1q143gr5j9z19jx2rmkkbiiz7k084d8a4")) + "1gjingc1h7d6p17m0nn87yiwh8gbdchg4w4kv8s4g89wv0q6wixm")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3