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