From ef9652ef4e6556fd85bc84dca53dfe97f518b060 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 15 May 2020 13:36:45 +0200 Subject: gnu: rottlog: Fix aarch64 cross-compilation. * gnu/packages/admin.scm (rottlog)[arguments]: Add a 'fix-configure phase to replace outdated config.sub and config.guess, without aarch64 support, [native-inputs]: add "automake". --- gnu/packages/admin.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 6083691e19..9822ba8a9b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1229,7 +1229,7 @@ at once based on a Perl regular expression.") #t)))) (build-system gnu-build-system) (arguments - '(#:configure-flags (list "ROTT_ETCDIR=/etc/rottlog" ;rc file location + `(#:configure-flags (list "ROTT_ETCDIR=/etc/rottlog" ;rc file location "--localstatedir=/var") ;; Install example config files in OUT/etc. @@ -1243,6 +1243,20 @@ at once based on a Perl regular expression.") (substitute* "rc/rc" (("/usr/sbin/sendmail") "sendmail")) #t)) + (add-after 'unpack 'fix-configure + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.sub and config.guess: + (for-each (lambda (file) + (install-file + (string-append + (assoc-ref + (or native-inputs inputs) "automake") + "/share/automake-" + ,(version-major+minor + (package-version automake)) + "/" file) ".")) + '("config.sub" "config.guess")) + #t)) (add-after 'build 'set-packdir (lambda _ ;; Set a default location for archived logs. @@ -1263,6 +1277,7 @@ at once based on a Perl regular expression.") (lambda _ (invoke "make" "install-info")))))) (native-inputs `(("texinfo" ,texinfo) + ("automake" ,automake) ("util-linux" ,util-linux))) ; for 'cal' (home-page "https://www.gnu.org/software/rottlog/") (synopsis "Log rotation and management") -- cgit 1.4.1 From c1ca686bc8b227e9bb17ba533097aa3de02436dd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 05:09:19 +0200 Subject: gnu: acpica: Update to 20200430. * gnu/packages/admin.scm (acpica): Update to 20200430. --- 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 9822ba8a9b..8182544544 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1691,7 +1691,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") (define-public acpica (package (name "acpica") - (version "20200326") + (version "20200430") (source (origin (method url-fetch) (uri (string-append @@ -1699,7 +1699,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") version ".tar.gz")) (sha256 (base32 - "0y08l6djjn87jmsp5kj0myjdb48000g20xlfs0a22jzzi383h3by")))) + "1hiaz9lrmjzdbi5zl0ajfflja41cixzx2j76iyx02qbjlmy9cfjc")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) ("bison" ,bison))) -- cgit 1.4.1 From 018be4ca5ebc0e25af4f50d22b3f1c43ff05fe5f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 05:10:01 +0200 Subject: gnu: acpica: Fix typo in synopsis. * gnu/packages/admin.scm (acpica)[synopsis]: Fix typo or grammar. --- 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 8182544544..f6bf8526ef 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1711,7 +1711,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") #:tests? #f ; no 'check' target #:phases (modify-phases %standard-phases (delete 'configure)))) (home-page "https://acpica.org/") - (synopsis "Tools for the development and debug of ACPI tables") + (synopsis "Tools for the development and debugging of ACPI tables") (description "The ACPI Component Architecture (@dfn{ACPICA}) project provides an OS-independent reference implementation of the Advanced Configuration and -- cgit 1.4.1 From 4d1e4af4e9cfcb75e1b531ec5e5408747f1c903c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 05:11:29 +0200 Subject: gnu: acpica: Drop Texinfo @dfn{} usage. * gnu/packages/admin.scm (acpica)[description]: Substitute @acronym{} for @dfn{}. --- gnu/packages/admin.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index f6bf8526ef..9314abf5be 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1713,12 +1713,14 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") (home-page "https://acpica.org/") (synopsis "Tools for the development and debugging of ACPI tables") (description - "The ACPI Component Architecture (@dfn{ACPICA}) project provides an -OS-independent reference implementation of the Advanced Configuration and -Power Interface Specification (@dfn{ACPI}). ACPICA code contains those portions -of ACPI meant to be directly integrated into the host OS as a kernel-resident -subsystem, and a small set of tools to assist in developing and debugging ACPI -tables. This package contains only the user-space tools needed for ACPI table + "The @acronym{ACPICA, ACPI Component Architecture} project provides an +OS-independent reference implementation of the @acronym{ACPI, Advanced +Configuration and Power Interface} specification. ACPICA code contains those +portions of ACPI meant to be directly integrated into the host OS as a +kernel-resident subsystem, and a small set of tools to assist in developing and +debugging ACPI tables. + +This package contains only the user-space tools needed for ACPI table development, not the kernel implementation of ACPI.") (license license:gpl2))) ; dual GPLv2/ACPICA Licence -- cgit 1.4.1 From 9fdf982b418e379dc5abfaa072583f19eb314240 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 22:33:22 +0200 Subject: gnu: inxi: Update to 3.1.00-1. * gnu/packages/admin.scm (inxi-minimal): Update to 3.1.00-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 9314abf5be..cb8e73e95a 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3336,7 +3336,7 @@ Python loading in HPC environments.") (let ((real-name "inxi")) (package (name "inxi-minimal") - (version "3.0.38-1") + (version "3.1.00-1") (source (origin (method git-fetch) @@ -3345,7 +3345,7 @@ Python loading in HPC environments.") (commit version))) (file-name (git-file-name real-name version)) (sha256 - (base32 "1qw3sxgd3ly916bzzl3873s3flngwd3vh57slw0shsj7ivz8bfnm")))) + (base32 "0md6yfd297l8695g0rsbs4mm74dc3k00rfjl4x2n4i33mkylp6qa")))) (build-system trivial-build-system) (inputs `(("bash" ,bash-minimal) -- cgit 1.4.1 From ae58ebba8211f3593fb6d7214f5b80bc6aca5929 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 19:29:43 +0200 Subject: gnu: netcat-openbsd: Update to 1.217-1. * gnu/packages/admin.scm (netcat-openbsd): Update to 1.217-1. [arguments]: Remove obsolete #:configure-flags. --- gnu/packages/admin.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index cb8e73e95a..7ec68d1d64 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -718,7 +718,7 @@ would need and has several interesting built-in capabilities.") (define-public netcat-openbsd (package (name "netcat-openbsd") - (version "1.206-1") + (version "1.217-1") (source (origin (method git-fetch) (uri (git-reference @@ -727,14 +727,12 @@ would need and has several interesting built-in capabilities.") (file-name (git-file-name name version)) (sha256 (base32 - "08r3mmck3s5pbvwyq19wp5g8jqcxza3cm8nkc6jm7rqn4jdydc4z")))) + "0kcvi3pav2fdx5c22psjv5dggk4cmrqiaq2cklhqngsk4a7vrjan")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no test suite + `(#:tests? #f ; no test suite #:make-flags - (list "CC=gcc" - (string-append "CFLAGS=-I" (assoc-ref %build-inputs "libbsd") "/include") - "LDFLAGS=-lbsd") + (list "CC=gcc") #:phases (modify-phases %standard-phases (delete 'configure) -- cgit 1.4.1 From 057c7f1c6707c0585cc84d6e770eb8de84b965b8 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 25 May 2020 23:57:51 +0200 Subject: gnu: ansible: Update to 2.9.9. * gnu/packages/admin.scm (ansible): Update to 2.9.9. Signed-off-by: Tobias Geerinckx-Rice --- 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 7ec68d1d64..08131a8dd0 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2025,13 +2025,13 @@ of supported upstream metrics systems simultaneously.") (define-public ansible (package (name "ansible") - (version "2.9.6") + (version "2.9.9") (source (origin (method url-fetch) (uri (pypi-uri "ansible" version)) (sha256 - (base32 "1jfbp1i3nl4yvqwd5ssy43dz3pq2x03mn875vb8r56gqh43kmksr")))) + (base32 "1l99vwkl48iwr8ffd1ihqia995mz8h8hwk4akm4w0cgiifp88gg8")))) (build-system python-build-system) (native-inputs `(("python-bcrypt" ,python-bcrypt) -- cgit 1.4.1 From ea3e94e5fe0dbba3928c7a6380392b1495bfbcac Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 27 May 2020 18:41:41 +0200 Subject: gnu: nnn: Update to 3.2. * gnu/packages/admin.scm (nnn): Update to 3.2. --- 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 08131a8dd0..b0a43d9644 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3116,14 +3116,14 @@ everyone's screenshots nowadays.") (define-public nnn (package (name "nnn") - (version "2.8.1") + (version "3.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/jarun/nnn/releases/download/v" version "/nnn-v" version ".tar.gz")) (sha256 - (base32 "1g47bndxld875d0xb3pgmlw223mz47p1xcvwym861y6l4zkgiyp0")))) + (base32 "1zflz7yj5wzdnl0728g8qrld2z6dqn7sblbmkjvyqlv1fwjd1fsf")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses) -- cgit 1.4.1 From 2d2d5b29fb461850858638e023cee3a3a04beb77 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 May 2020 17:04:36 +0200 Subject: gnu: Add facter. * gnu/packages/admin.scm (facter): New public variable. --- gnu/packages/admin.scm | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index b0a43d9644..36f063ca96 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -58,6 +58,7 @@ #:use-module (guix build-system meson) #:use-module (guix build-system perl) #:use-module (guix build-system python) + #:use-module (guix build-system ruby) #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix git-download) @@ -121,6 +122,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline) + #:use-module (gnu packages ruby) #:use-module (gnu packages sphinx) #:use-module (gnu packages tcl) #:use-module (gnu packages terminals) @@ -429,6 +431,71 @@ services.") graphs and can export its output to different formats.") (license license:bsd-3))) +(define-public facter + (package + (name "facter") + (version "4.0.24") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/puppetlabs/facter-ng") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1n8yd2p7m0jf0wld6q43f2gqxyz8fiamz3p79wbl53q5qih0vba2")))) + (build-system ruby-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'delete-facter-ng-gemspec + (lambda _ + ;; XXX: ruby-build-system incorrectly finds + ;; facter-ng.gemspec from this directory and tries to + ;; build that instead of the proper facter.gemspec. + ;; Just delete it as a workaround, as it appears to + ;; only exist for backwards-compatibility after the + ;; facter-ng->facter rename. + (delete-file "agent/facter-ng.gemspec") + #t)) + (add-after 'unpack 'embed-iproute-reference + (lambda* (#:key inputs #:allow-other-keys) + (let ((iproute (assoc-ref inputs "iproute"))) + ;; Provide an absolute reference to the 'ip' executable + ;; to avoid propagating it. + (substitute* "lib/resolvers/networking_linux_resolver.rb" + (("execute\\('ip") + (string-append "execute('" iproute "/sbin/ip"))) + #t))) + (delete 'check) + (add-after 'wrap 'check + (lambda* (#:key tests? outputs #:allow-other-keys) + ;; XXX: The test suite wants to run Bundler and + ;; complains that the gemspec is invalid. For now + ;; just make sure that we can run the wrapped + ;; executable directly. + (if tests? + (invoke (string-append (assoc-ref outputs "out") + "/bin/facter") + ;; Many facts depend on /sys, /etc/os-release, + ;; etc, so we only run a small sample. + "facterversion" "architecture" + "kernel" "kernelversion") + (format #t "tests disabled~%")) + #t))))) + (inputs + `(("iproute" ,iproute) + ("ruby-hocon" ,ruby-hocon) + ("ruby-sys-filesystem" ,ruby-sys-filesystem) + ("ruby-thor" ,ruby-thor))) + (synopsis "Collect and display system facts") + (description + "Facter is a tool that gathers basic facts about nodes (systems) such +as hardware details, network settings, OS type and version, and more. These +facts can be collected on the command line with the @command{facter} command +or via the @code{facter} Ruby library.") + (home-page "https://github.com/puppetlabs/facter-ng") + (license license:expat))) + (define-public htop (package (name "htop") -- cgit 1.4.1 From 1c556e65a554fbb585adaf6f6d0980821dbcdc78 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 May 2020 13:17:53 +0200 Subject: gnu: facter: Update to 4.0.25. * gnu/packages/admin.scm (facter): Update to 4.0.25. --- 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 36f063ca96..c331a662a7 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -434,7 +434,7 @@ graphs and can export its output to different formats.") (define-public facter (package (name "facter") - (version "4.0.24") + (version "4.0.25") (source (origin (method git-fetch) (uri (git-reference @@ -443,7 +443,7 @@ graphs and can export its output to different formats.") (file-name (git-file-name name version)) (sha256 (base32 - "1n8yd2p7m0jf0wld6q43f2gqxyz8fiamz3p79wbl53q5qih0vba2")))) + "04nbk9rn5lfhbivsx68dggsp05czm7mzfr1i7yv6168bl92d233y")))) (build-system ruby-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From 248af68449e33c621afbff9d05bcb77d1097c1d6 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Thu, 28 May 2020 11:35:07 -0400 Subject: gnu: Add opendoas. * gnu/packages/admin.scm (opendoas): New variable. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/admin.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c331a662a7..0bc1d160fb 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2020 Morgan Smith ;;; ;;; This file is part of GNU Guix. ;;; @@ -1456,6 +1457,53 @@ commands and their arguments.") ;; See . (license license:x11))) +(define-public opendoas + (package + (name "opendoas") + (version "6.6.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Duncaen/OpenDoas.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07kkc5729p654jrgfsc8zyhiwicgmq38yacmwfvay2b3gmy728zn")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'configure + ;; The configure script doesn't accept most of the default flags. + (lambda* (#:key configure-flags #:allow-other-keys) + ;; The configure script can only be told which compiler to use + ;; through environment variables. + (setenv "CC" ,(cc-for-target)) + (apply invoke "./configure" configure-flags))) + (add-before 'install 'fix-makefile + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "bsd.prog.mk" + (("^\tchown.*$") "")) + #t))) + #:configure-flags + (list (string-append "--prefix=" (assoc-ref %outputs "out")) + (string-append "--target=" (or ,(%current-target-system) "")) + "--with-timestamp") + ;; Compiler choice is not carried over from the configure script. + #:make-flags + (list (string-append "CC=" ,(cc-for-target))) + #:tests? #f)) ; no test suite + (native-inputs + `(("bison" ,bison))) + (home-page "https://github.com/Duncaen/OpenDoas") + (synopsis "Portable version of OpenBSD's doas command") + (description "Doas is a minimal replacement for the venerable sudo. It was +initially written by Ted Unangst of the OpenBSD project to provide 95% of the +features of sudo with a fraction of the codebase.") + (license (list license:bsd-3 ; libbsd/* + license:isc)))) ; everything else + (define-public wpa-supplicant-minimal (package (name "wpa-supplicant-minimal") -- cgit 1.4.1 From b378297798ce207a47d348788785266b0047db68 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 31 May 2020 01:53:33 +0200 Subject: gnu: opendoas: Don't pass unused target to ./configure. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/admin.scm (opendoas)[arguments]: Remove ‘--target=…’ from the #:configure-flags for now. --- 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 0bc1d160fb..2bd1922fea 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1488,7 +1488,8 @@ commands and their arguments.") #t))) #:configure-flags (list (string-append "--prefix=" (assoc-ref %outputs "out")) - (string-append "--target=" (or ,(%current-target-system) "")) + ;; Nothing is done with this value (yet?) but it's supported. + ;; (string-append "--target=" (or ,(%current-target-system) "")) "--with-timestamp") ;; Compiler choice is not carried over from the configure script. #:make-flags -- cgit 1.4.1 From 0792984459a692e21e2503c7e2818ed46783b633 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 01:50:22 +0200 Subject: gnu: acpica: Update to 20200528. * gnu/packages/admin.scm (acpica): Update to 20200528. --- 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 2bd1922fea..2490d76618 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1805,7 +1805,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") (define-public acpica (package (name "acpica") - (version "20200430") + (version "20200528") (source (origin (method url-fetch) (uri (string-append @@ -1813,7 +1813,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") version ".tar.gz")) (sha256 (base32 - "1hiaz9lrmjzdbi5zl0ajfflja41cixzx2j76iyx02qbjlmy9cfjc")))) + "01ajxnz9dpnvdbib7yv20dw21a1yyfgwiw3whg0xi57cf4app2md")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) ("bison" ,bison))) -- cgit 1.4.1 From 3b394f6a3ec070b34f91715b8a228e6edebe45aa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 01:51:19 +0200 Subject: gnu: inxi-minimal: Update to 3.1.01-1. * gnu/packages/admin.scm (inxi-minimal): Update to 3.1.01-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 2490d76618..bfbd533bcb 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3450,7 +3450,7 @@ Python loading in HPC environments.") (let ((real-name "inxi")) (package (name "inxi-minimal") - (version "3.1.00-1") + (version "3.1.01-1") (source (origin (method git-fetch) @@ -3459,7 +3459,7 @@ Python loading in HPC environments.") (commit version))) (file-name (git-file-name real-name version)) (sha256 - (base32 "0md6yfd297l8695g0rsbs4mm74dc3k00rfjl4x2n4i33mkylp6qa")))) + (base32 "0r204w0r06ibdr4dck7yw2nmvj7xq68bjr7xwwiy7liqdml0n0yc")))) (build-system trivial-build-system) (inputs `(("bash" ,bash-minimal) -- cgit 1.4.1 From 3f9c62d1a8b345909adaeb22f454ad22554c55a1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 3 Jun 2020 14:51:38 +0200 Subject: gnu: shepherd: Update to 0.8.1. * gnu/packages/admin.scm (shepherd): Update to 0.8.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 bfbd533bcb..77981e520a 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -247,14 +247,14 @@ and provides a \"top-like\" mode (monitoring).") (define-public shepherd (package (name "shepherd") - (version "0.8.0") + (version "0.8.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/shepherd/shepherd-" version ".tar.gz")) (sha256 (base32 - "02lbc8z5gd8v8wfi4yh1zww8mk03w0zcwnmk4l4p3vpjlvlb63ll")))) + "0x9zr0x3xvk4qkb6jnda451d5iyrl06cz1bjzjsm0lxvjj3fabyk")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--localstatedir=/var"))) -- cgit 1.4.1 From cfec1af96a19be3fef26e13900937773355ee580 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 17:17:07 +0200 Subject: gnu: di: Update to 4.48. * gnu/packages/admin.scm (di): Update to 4.48. --- 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 77981e520a..2e1c4d1ada 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2743,13 +2743,13 @@ a new command using the matched rule, and runs it.") (define-public di (package (name "di") - (version "4.47.3") + (version "4.48") (source (origin (method url-fetch) (uri (string-append "https://gentoo.com/di/di-" version ".tar.gz")) (sha256 - (base32 "0m4npba50sf5s61g5z3xd2r7937zwja941f2h3f081xi24c2hfck")))) + (base32 "0crvvfsxh8ryc0j19a2x52i9zacvggm8zi6j3kzygkcwnpz4km8r")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; obscure test failures -- cgit 1.4.1 From aba98be5406eaeaf70dbd6b9b30e16d254ede9d7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 17:23:32 +0200 Subject: gnu: di: Cross-compile. * gnu/packages/admin.scm (di)[arguments]: Use CC-FOR-TARGET. --- 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 2e1c4d1ada..bb93f7efb1 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2758,7 +2758,7 @@ a new command using the matched rule, and runs it.") (delete 'configure) ; no configure script (add-before 'build 'setup-environment (lambda* (#:key outputs #:allow-other-keys) - (setenv "CC" "gcc") + (setenv "CC" ,(cc-for-target)) (setenv "prefix" (assoc-ref outputs "out")) #t))) #:make-flags (list "--environment-overrides"))) -- cgit 1.4.1 From 173d22a1c03450c804b2c7fab1393670fef45606 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 6 Jun 2020 10:54:58 +0200 Subject: gnu: sudo: Separate Python output. The Python plugin of "sudo" drags the Python interpreter to the closure of Guix System. Put it in a separate output. * gnu/packages/admin.scm (sudo)[arguments]: Add a 'separate-python-output phase, that's populating ... [outputs]: ... the new "python" output. --- gnu/packages/admin.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index bb93f7efb1..bcbdf9b395 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1375,6 +1375,7 @@ system administrator.") (delete-file-recursively "lib/zlib") #t)))) (build-system gnu-build-system) + (outputs (list "out" "python")) (arguments `(#:configure-flags (list (string-append "--docdir=" (assoc-ref %outputs "out") @@ -1432,7 +1433,22 @@ system administrator.") (substitute* "plugins/sudoers/Makefile.in" (("^pre-install:" match) (string-append match "\ndisabled-" match))) - #t))) + #t)) + (add-after 'install 'separate-python-output + (lambda* (#:key target outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (out:python (assoc-ref outputs "python"))) + (if target + (mkdir-p (string-append out:python "/empty")) + (for-each + (lambda (file) + (let ((old (string-append out "/" file)) + (new (string-append out:python "/" file))) + (mkdir-p (dirname new)) + (rename-file old new))) + (list "libexec/sudo/python_plugin.so" + "libexec/sudo/python_plugin.la"))) + #t)))) ;; XXX: The 'testsudoers' test series expects user 'root' to exist, but ;; the chroot's /etc/passwd doesn't have it. Turn off the tests. -- cgit 1.4.1 From c90730aefef8906d4a3c2056695d79fd44946247 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 20:36:23 +0200 Subject: gnu: progress: Update to 0.15. * gnu/packages/admin.scm (progress): Update to 0.15. --- 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 bcbdf9b395..1a0e19b19a 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -213,7 +213,7 @@ usual file attributes can be checked for inconsistencies.") (define-public progress (package (name "progress") - (version "0.14") + (version "0.15") (source (origin (method git-fetch) @@ -221,7 +221,7 @@ usual file attributes can be checked for inconsistencies.") (url "https://github.com/Xfennec/progress.git") (commit (string-append "v" version)))) (sha256 - (base32 "1lk2v4b767klib93an4g3f7z5qrv9kdk9jf7545vw1immc4kamrl")) + (base32 "1cnb4ixlhshn139mj5sr42k5m6gjjbyqvkn1324c47niwrgp7dqm")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs -- cgit 1.4.1 From ac6f1c777a7cfaa431000c4c9bd4dd690a806018 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Jun 2020 17:13:24 +0200 Subject: gnu: facter: Update to 4.0.26. * gnu/packages/admin.scm (facter): Update to 4.0.26. --- 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 1a0e19b19a..9c5ab3be13 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -435,7 +435,7 @@ graphs and can export its output to different formats.") (define-public facter (package (name "facter") - (version "4.0.25") + (version "4.0.26") (source (origin (method git-fetch) (uri (git-reference @@ -444,7 +444,7 @@ graphs and can export its output to different formats.") (file-name (git-file-name name version)) (sha256 (base32 - "04nbk9rn5lfhbivsx68dggsp05czm7mzfr1i7yv6168bl92d233y")))) + "0bab3by926gavbhkvp0in82vim575ybj8z6av3b12jdvla1s9rmz")))) (build-system ruby-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From b97b8b44ca34d2a6282dd90ab96957d650840dc5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 11 Jun 2020 17:42:32 +0200 Subject: gnu: progress: Fix cross-compilation. * gnu/packages/admin.scm (progress)[arguments]: Use CC-FOR-TARGET and a target-specific pkg-config when cross-compiling. --- gnu/packages/admin.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 9c5ab3be13..d34864505a 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -231,8 +231,14 @@ usual file attributes can be checked for inconsistencies.") `(("ncurses" ,ncurses))) (arguments `(#:tests? #f ; no test suite - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:make-flags + (let ((target ,(%current-target-system))) + (list ,(string-append "CC=" (cc-for-target)) + (string-append "PKG_CONFIG=" + (if target + (string-append target "-pkg-config") + "pkg-config")) + (string-append "PREFIX=" (assoc-ref %outputs "out")))) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script -- cgit 1.4.1