me
/
guix
Archived
1
0
Fork 0
Code

gnu: shadow: Merge in shadow-with-man-pages. 

* gnu/packages/admin.scm (shadow)[arguments]: Add phase to install the
manpages. Make sure 'remove-groups comes after installing the manpages.
[properties]: Remove field.
(shadow-with-man-pages): Remove variable.
* gnu/system.scm (%base-packages-utils): Replace shadow-with-man-pages
with shadow.
master
Efraim Flashner 2022-11-27 15:53:09 +02:00
parent 6b51f33fbf
commit 26a200f71c
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gnu/packages/admin.scm
View File

@ -932,7 +932,13 @@ hostname.")
(substitute* "lib/nscd.c" (substitute* "lib/nscd.c"
(("/usr/sbin/nscd") (("/usr/sbin/nscd")
(string-append libc "/sbin/nscd")))))) (string-append libc "/sbin/nscd"))))))
(add-after 'install 'remove-groups (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")))
(add-after 'install-man-pages 'remove-groups
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Remove `groups', which is already provided by Coreutils. ;; Remove `groups', which is already provided by Coreutils.
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -953,27 +959,10 @@ hostname.")
"Shadow provides a number of authentication-related tools, including: "Shadow provides a number of authentication-related tools, including:
login, passwd, su, groupadd, and useradd.") login, passwd, su, groupadd, and useradd.")
(properties '((hidden? . #t))) ;see below
;; The `vipw' program is GPLv2+. ;; The `vipw' program is GPLv2+.
;; libmisc/salt.c is public domain. ;; libmisc/salt.c is public domain.
(license license:bsd-3))) (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 (define-public mingetty
(package (package
(name "mingetty") (name "mingetty")

2
gnu/system.scm
View File

@ -846,7 +846,7 @@ of PROVENANCE-SERVICE-TYPE to its services."
(define %base-packages-utils (define %base-packages-utils
;; Default set of utilities packages. ;; Default set of utilities packages.
(cons* procps psmisc which (cons* procps psmisc which
(@ (gnu packages admin) shadow-with-man-pages) ;for 'passwd' shadow ;for 'passwd'
guile-3.0-latest guile-3.0-latest