From 1949c8b20612d476f64586f3a3812b051774a320 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Sat, 29 Jan 2022 00:53:31 -0600 Subject: gnu: cpulimit: Fix build with glibc-2.32. * gnu/packages/patches/cpulimit-with-glib-2.32.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/admin.scm (cpulimit)[source]: Use it. --- gnu/packages/admin.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index ed66e358ea..17dc0f1315 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 ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2014, 2015, 2016, 2018, 2019, 2020 Mark H Weaver -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2020, 2021 Eric Bavier +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2020, 2021, 2022 Eric Bavier ;;; Copyright © 2015, 2016 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015 Alex Sassmannshausen ;;; Copyright © 2015 Eric Dvorsak @@ -2858,7 +2858,8 @@ (define-public cpulimit (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1dz045yhcsw1rdamzpz4bk8mw888in7fyqk1q1b3m1yk4pd1ahkh")))) + (base32 "1dz045yhcsw1rdamzpz4bk8mw888in7fyqk1q1b3m1yk4pd1ahkh")) + (patches (search-patches "cpulimit-with-glib-2.32.patch")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 3344567bb14b8445495e402f0043dcf23f588242 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 2 Sep 2021 15:20:37 +0300 Subject: gnu: isc-dhcp: Fix building on riscv64-linux. * gnu/packages/admin.scm (isc-dhcp)[arguments]: Add phase to update configure scripts. [inputs]: Add config. --- gnu/packages/admin.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 17dc0f1315..f2ad66ea5b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1220,6 +1220,21 @@ (define-public isc-dhcp ;; build system uses the built 'gen' executable. (setenv "BUILD_CC" "gcc")))) '()) + (add-before 'build 'update-config-scripts + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (for-each (lambda (file) + (install-file + (search-input-file + (or native-inputs inputs) + (string-append "/bin/" file)) ".")) + '("config.guess" "config.sub")) + (for-each (lambda (file) + (install-file + (search-input-file + (or native-inputs inputs) + (string-append "/bin/" file)) + (string-append "bind/bind-" ,bind-version))) + '("config.guess" "config.sub")))) (add-after 'configure 'post-configure (lambda* (#:key outputs #:allow-other-keys) ;; Point to the right client script, which will be @@ -1302,6 +1317,7 @@ (define-public isc-dhcp (base32 "108nh7hha4r0lb5hf1fn7lqaascvhsrghpz6afm5lf9vf2vgqly9")))) + ("config" ,config) ("coreutils*" ,coreutils) ("sed*" ,sed))) -- cgit v1.2.3 From 063b43b95e796d189b4d3ae4325137a981afc16e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 7 Feb 2022 14:09:38 +0200 Subject: gnu: novena-eeprom: Build with older i2c-tools. * gnu/packages/admin.scm (novena-eeprom)[inputs]: Build with i2c-tools-3. * gnu/packages/linux.scm (i2c-tools-3): New variable. --- gnu/packages/admin.scm | 2 +- gnu/packages/linux.scm | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index f2ad66ea5b..daab720be5 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4770,7 +4770,7 @@ (define-public novena-eeprom (install-file "novena-eeprom" out-bin) (install-file "novena-eeprom.8" out-share-man))))))) (inputs - (list i2c-tools)) + (list i2c-tools-3)) (synopsis "Novena EEPROM editor") (description "This package provides an editor for the Novena EEPROM. Novena boards contain a device-dependent descriptive EEPROM that defines diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 74c65f86bc..c405a34197 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4507,6 +4507,24 @@ (define-public i2c-tools SMBus access.") (license license:gpl2+))) +(define-public i2c-tools-3 + (package + (inherit i2c-tools) + (name "i2c-tools") + (version "3.1.2") + (source (origin + (method url-fetch) + (uri (string-append + "http://jdelvare.nerim.net/mirror/i2c-tools/i2c-tools-" + version ".tar.bz2")) + (sha256 + (base32 "0hd4c1w8lnwc3j95h3vpd125170l1d4myspyrlpamqx6wbr6jpnv")))) + (arguments + (substitute-keyword-arguments (package-arguments i2c-tools) + ((#:make-flags _) + #~(list (string-append "prefix=" #$output) + (string-append "CC=" #$(cc-for-target)))))))) + (define-public xsensors (package (name "xsensors") -- cgit v1.2.3 From 8487383030bad4f85ab28b6153a455f0588e7804 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 13 Feb 2022 06:09:28 +0100 Subject: gnu: udpcast: Update to 20211207. * gnu/packages/admin.scm (udpcast): Update to 20211207. [source]: Remove buildroot.net uri. Signed-off-by: Nicolas Goaziou --- gnu/packages/admin.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index daab720be5..525a5fdb69 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -32,7 +32,7 @@ ;;; Copyright © 2019, 2020, 2021 Mathieu Othacehe ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen -;;; Copyright © 2020, 2021 Michael Rohleder +;;; Copyright © 2020, 2021, 2022 Michael Rohleder ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Morgan Smith ;;; Copyright © 2021 Maxim Cournoyer @@ -4912,23 +4912,20 @@ (define-public runitor (define-public udpcast (package (name "udpcast") - (version "20200328") + (version "20211207") (source (origin (method url-fetch) ;; XXX: Original server is at https://www.udpcast.linux.lu is not ;; reliable. (uri (list (string-append - "http://sources.buildroot.net/udpcast/udpcast-" - version ".tar.gz") - (string-append "https://fossies.org/linux/privat/udpcast-" version ".tar.gz") (string-append "https://www.udpcast.linux.lu/download/udpcast-" version ".tar.gz"))) (sha256 - (base32 "06pj86nbi9hx7abbb0z2c5ynhfq0rv89b7nmy0kq3xz2lsxfw6cw")))) + (base32 "0l6hck694szrrvz85nm48rwb7mzvg2z2bwa50v51pkvym3kvxkm3")))) (build-system gnu-build-system) (native-inputs (list autoconf automake m4 perl)) -- cgit v1.2.3 From 8937253fdeac838dd99072faa0cfad43ae286b4d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 13 Feb 2022 01:00:03 +0100 Subject: gnu: audit: Update to 3.0.7. * gnu/packages/admin.scm (audit): Update to 3.0.7. --- 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 525a5fdb69..e26458ae7e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3069,13 +3069,13 @@ (define-public audit (package (name "audit") (home-page "https://people.redhat.com/sgrubb/audit/") - (version "3.0.6") + (version "3.0.7") (source (origin (method url-fetch) (uri (string-append home-page "audit-" version ".tar.gz")) (sha256 (base32 - "0pnc9wzslks9p6kxw0llp1n8h8yg0frcxl3x84fl0hisa5vlvr63")))) + "15r5lrrkv2zj3dvpqssd46w61hmrq27y7c2rz33s20ck59iphk4b")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list "--with-python=no" -- cgit v1.2.3 From a0a3ff72a22179f9b0532442450b5d5a4602143d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 13 Feb 2022 01:00:02 +0100 Subject: gnu: opendoas: Update to 6.8.2. * gnu/packages/admin.scm (opendoas): Update to 6.8.2. [arguments]: Don't explicitly return #t from phases. --- gnu/packages/admin.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index e26458ae7e..5bb8840e94 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1802,7 +1802,7 @@ (define-public sudo (define-public opendoas (package (name "opendoas") - (version "6.8.1") + (version "6.8.2") (source (origin (method git-fetch) (uri (git-reference @@ -1811,7 +1811,7 @@ (define-public opendoas (file-name (git-file-name name version)) (sha256 (base32 - "0gfcssm21vdfg6kcrcc7hz1h4jmhy2zv29rfqyrrj3a6r9b5ah8p")))) + "1qrin7x9vcprk5pwjbr3w8z2qj8hk6xbvxicdhlk27xr6vcr1qzn")))) (build-system gnu-build-system) (arguments `(#:phases @@ -1820,7 +1820,7 @@ (define-public opendoas (lambda* (#:key outputs #:allow-other-keys) (substitute* "GNUmakefile" (("^\tchown.*$") "")) - ;; OpenDoas look for binaries in safepath when a rule specify a + ;; OpenDoas looks for binaries in safepath when a rule specifies a ;; relative command, such as “permit keepenv :wheel cmd guix”. (substitute* "doas.c" (("safepath =" match) @@ -1828,8 +1828,7 @@ (define-public opendoas "/run/setuid-programs:" "/run/current-system/profile/bin:" "/run/current-system/profile/sbin:" - "\" "))) - #t)) + "\" "))))) (replace 'configure ;; The configure script doesn't accept most of the default flags. (lambda* (#:key configure-flags #:allow-other-keys) -- cgit v1.2.3 From 3aaab0c9c4298aadb5d4e5306a1ef612dacb9588 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 19 Feb 2022 18:39:58 +0200 Subject: gnu: tree: Update to 2.0.2. * gnu/packages/admin.scm (tree): Update to 2.0.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 5bb8840e94..7da8a29306 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2373,14 +2373,14 @@ (define-public testdisk (define-public tree (package (name "tree") - (version "2.0.1") + (version "2.0.2") (source (origin (method url-fetch) (uri (string-append "http://mama.indstate.edu/users/ice/tree/src/tree-" version ".tgz")) (sha256 - (base32 "0f92vx6gpz7v29wi9clklzah57v7lgx5kv0m1w4b9xjc35d9qcz3")))) + (base32 "1bzfkr3kmn2v5x7ljir691fr9hhjvjxqsfz0fc5fgi6ki0fklsbx")))) (build-system gnu-build-system) (arguments (list -- cgit v1.2.3 From f1f1b8b4e69055313fc0281528d31b5afa42b861 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 22 Feb 2022 23:19:28 -0500 Subject: gnu: testdisk: Relocate and improve description. This is the result of attempting to package 'photorec', only to realize it's part of testdisk, which we already had in the first place. * gnu/packages/admin.scm (testdisk): Move to... * gnu/packages/disk.scm (testdisk): ... here. [description]: Expound, and add a description section about the included PhotoRec tool. --- gnu/packages/admin.scm | 28 ----------------------- gnu/packages/disk.scm | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 28 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 7da8a29306..d232013ef9 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2342,34 +2342,6 @@ (define-public detox characters can be replaced as well, as can UTF-8 characters.") (license license:bsd-3))) -(define-public testdisk - (package - (name "testdisk") - (version "7.1") - (source (origin - (method url-fetch) - (uri (string-append "https://www.cgsecurity.org/testdisk-" - version ".tar.bz2")) - (sha256 - (base32 - "1zlh44w67py416hkvw6nrfmjickc2d43v51vcli5p374d5sw84ql")))) - (build-system gnu-build-system) - (inputs - (list ntfs-3g - `(,util-linux "lib") - openssl - ;; FIXME: add reiserfs. - zlib - e2fsprogs - libjpeg-turbo - ncurses)) - (home-page "https://www.cgsecurity.org/wiki/TestDisk") - (synopsis "Data recovery tool") - (description - "TestDisk is a program for data recovery, primarily designed to help -recover lost partitions and/or make non-booting disks bootable again.") - (license license:gpl2+))) - (define-public tree (package (name "tree") diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 1a196f4b40..15d0401090 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -22,6 +22,8 @@ ;;; Copyright © 2021 Mathieu Othacehe ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2021 Justin Veilleux +;;; Copyright © 2014 Ludovic Courtès +;;; Copyright © 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -63,6 +65,7 @@ (define-module (gnu packages disk) #:use-module (gnu packages graphics) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) + #:use-module (gnu packages image) #:use-module (gnu packages linux) #:use-module (gnu packages ncurses) #:use-module (gnu packages nss) @@ -81,6 +84,7 @@ (define-module (gnu packages disk) #:use-module (gnu packages swig) #:use-module (gnu packages terminals) #:use-module (gnu packages textutils) + #:use-module (gnu packages tls) #:use-module (gnu packages vim) #:use-module (gnu packages w3m) #:use-module (gnu packages web) @@ -586,6 +590,62 @@ (define-public gparted ;; The home page says GPLv2, but the source code says GPLv2+. (license license:gpl2+))) +(define-public testdisk + (package + (name "testdisk") + (version "7.1") + (source (origin + (method url-fetch) + (uri (string-append "https://www.cgsecurity.org/testdisk-" + version ".tar.bz2")) + (sha256 + (base32 + "1zlh44w67py416hkvw6nrfmjickc2d43v51vcli5p374d5sw84ql")))) + (build-system gnu-build-system) + (inputs + (list ntfs-3g + `(,util-linux "lib") + openssl + ;; FIXME: add reiserfs. + zlib + e2fsprogs + libjpeg-turbo + ncurses)) + (home-page "https://www.cgsecurity.org/wiki/TestDisk") + (synopsis "Data recovery tool") + (description "TestDisk is primarily designed to help recover lost +partitions and/or make non-booting disks bootable again when these symptoms +were caused by faulty software or human error (such as accidentally deleting a +partition table). TestDisk can: +@enumerate +@item Fix partition table, recover deleted partition +@item Recover FAT32 boot sector from its backup +@item Rebuild FAT12/FAT16/FAT32 boot sector +@item Fix FAT tables +@item Rebuild NTFS boot sector +@item Recover NTFS boot sector from its backup +@item Fix MFT using MFT mirror +@item Locate ext2/ext3/ext4 Backup SuperBlock +@item Un-delete files from FAT, exFAT, NTFS and ext2 file systems +@item Copy files from deleted FAT, exFAT, NTFS and ext2/ext3/ext4 partitions. +@end enumerate +This package also includes the @command{photorec} command, described below. + +PhotoRec is file data recovery software designed to recover lost files +including video, documents and archives from hard disks, CD-ROMs, and lost +pictures (thus the Photo Recovery name) from digital camera memory. PhotoRec +ignores the file system and goes after the underlying data, so it will still +work even if your media's file system has been severely damaged or +reformatted. It can recover lost files from at least: +@enumerate +@item FAT +@item NTFS +@item exFAT +@item ext2/ext3/ext4 file system +@item HFS+ +@end enumerate") + (license license:gpl2+))) + (define-public pydf (package (name "pydf") -- cgit v1.2.3 From 73db69bea15e390a31289fdfadb1d5b9a7d13557 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 26 Feb 2022 17:14:14 +0100 Subject: gnu: thermald: Fix build. * gnu/packages/admin.scm (thermald)[arguments]: Add "--disable-werror" to 'configure-flags'. --- gnu/packages/admin.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index d232013ef9..c8f91aab0d 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -28,7 +28,7 @@ ;;; Copyright © 2019 Jakob L. Kreuze ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2019 Alex Griffin -;;; Copyright © 2019, 2021 Guillaume Le Vaillant +;;; Copyright © 2019, 2021, 2022 Guillaume Le Vaillant ;;; Copyright © 2019, 2020, 2021 Mathieu Othacehe ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen @@ -3869,7 +3869,8 @@ (define-public thermald (let ((out (assoc-ref %outputs "out"))) (list (string-append "--with-dbus-sys-dir=" out "/etc/dbus-1/system.d") - "--localstatedir=/var")) + "--localstatedir=/var" + "--disable-werror")) #:make-flags (list "V=1") ; log build commands #:phases -- cgit v1.2.3 From a001522657a7f960e6c5c903c042557e73c61f4a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 27 Feb 2022 01:00:01 +0100 Subject: gnu: sudo: Update to 1.9.10. * gnu/packages/admin.scm (sudo): Update to 1.9.10. --- 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 c8f91aab0d..81c2d2a38c 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1708,7 +1708,7 @@ (define-public rottlog (define-public sudo (package (name "sudo") - (version "1.9.8p2") + (version "1.9.10") (source (origin (method url-fetch) (uri @@ -1718,7 +1718,7 @@ (define-public sudo version ".tar.gz"))) (sha256 (base32 - "0b8gd15l2g22w4fhhz0gzmq5c8370klanmy2c1p3px6yly6qnfwy")) + "1x34k8sd2msfjjsahff1q143gr5j9z19jx2rmkkbiiz7k084d8a4")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 4ba35ccd18f90314caa76ea1833ffc383559401c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 14 Mar 2022 09:44:45 +0100 Subject: gnu: isc-dhcp: Fix cross-compilation. * gnu/packages/admin.scm (isc-dhcp)[inputs]: Move config to ... [native-inputs]: ... here. --- gnu/packages/admin.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 81c2d2a38c..f96d668269 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1297,7 +1297,7 @@ (define-public isc-dhcp (list inetutils net-tools coreutils sed)))))))))) (native-inputs - (list perl file)) + (list config perl file)) (inputs `(("inetutils" ,inetutils) ("bash" ,(canonical-package bash-minimal)) ;for wrap-program @@ -1317,7 +1317,6 @@ (define-public isc-dhcp (base32 "108nh7hha4r0lb5hf1fn7lqaascvhsrghpz6afm5lf9vf2vgqly9")))) - ("config" ,config) ("coreutils*" ,coreutils) ("sed*" ,sed))) -- cgit v1.2.3 From 3076e695771794e7193901f9c263fb5ae2abd194 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 13 Mar 2022 01:00:02 +0100 Subject: gnu: isc-dhcp: Update bundled BIND to 9.11.37. * gnu/packages/admin.scm (isc-dhcp)[inputs]: Update bind-source-tarball to 9.11.37. --- 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 f96d668269..9867dd8729 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1166,7 +1166,7 @@ (define-public alive (define-public isc-dhcp (let* ((bind-major-version "9") (bind-minor-version "11") - (bind-patch-version "36") + (bind-patch-version "37") (bind-release-type "") ; for patch release, use "-P" (bind-release-version "") ; for patch release, e.g. "6" (bind-version (string-append bind-major-version @@ -1315,7 +1315,7 @@ (define-public isc-dhcp "/bind-" bind-version ".tar.gz")) (sha256 (base32 - "108nh7hha4r0lb5hf1fn7lqaascvhsrghpz6afm5lf9vf2vgqly9")))) + "1zsszgxs9043dfpxb6xs1iwk9jg7nxkl5pbawj8dlshnxkkzp3hd")))) ("coreutils*" ,coreutils) ("sed*" ,sed))) -- cgit v1.2.3 From fe83583b7fbf14907f60ec9652f5fdd1b960e10e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 20 Mar 2022 22:11:07 +0100 Subject: gnu: shadow: Add variant with man pages. * gnu/packages/admin.scm (shadow)[properties]: New field. (shadow-with-man-pages): New variable. --- gnu/packages/admin.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 9867dd8729..8331c42f8b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès +;;; Copyright © 2012-2022 Ludovic Courtès ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2014, 2015, 2016, 2018, 2019, 2020 Mark H Weaver ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2020, 2021, 2022 Eric Bavier @@ -876,10 +876,27 @@ (define-public shadow "Shadow provides a number of authentication-related tools, including: login, passwd, su, groupadd, and useradd.") + (properties '((hidden? . #t))) ;see below + ;; The `vipw' program is GPLv2+. ;; libmisc/salt.c is public domain. (license license:bsd-3))) +(define-public shadow-with-man-pages + ;; TODO: Merge with 'shadow' on the next core-updates cycle. + (package/inherit shadow + (properties '()) ;not hidden + (arguments + (substitute-keyword-arguments (package-arguments shadow) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-after 'install 'install-man-pages + (lambda _ + ;; The top-level Makefile.am wrongfully has "SUBDIRS += man" + ;; under "if ENABLE_REGENERATE_MAN", even though prebuilt man + ;; pages are available. Thus, install them manually. + (invoke "make" "-C" "man" "install"))))))))) + (define-public mingetty (package (name "mingetty") -- cgit v1.2.3