diff options
author | Ludovic Courtès <ludo@gnu.org> | 2021-12-13 22:15:07 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2021-12-13 22:15:07 +0100 |
commit | e3196755e60ba7f1ed9d432e73f26a85e0c8893c (patch) | |
tree | 06bc27447f2f72b20a2be0201b41b964af03fc87 /gnu/packages/admin.scm | |
parent | fc9ca46aa6403c90e2ea5c815d813d2dba162dfb (diff) | |
download | guix-e3196755e60ba7f1ed9d432e73f26a85e0c8893c.tar.gz guix-e3196755e60ba7f1ed9d432e73f26a85e0c8893c.zip |
gnu: Further simplify package inputs.
This is the result of running:
./pre-inst-env guix style --input-simplification=safe
and manually undoing changes on a dozen of packages to reduce
rebuilds (derivations for emacs, icecat, and libreoffice are unchanged.)
Diffstat (limited to 'gnu/packages/admin.scm')
-rw-r--r-- | gnu/packages/admin.scm | 46 |
1 files changed, 22 insertions, 24 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 4ed1f1abf3..de2f67f238 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -206,13 +206,13 @@ simplicity in mind.") (native-inputs (list bison flex)) (inputs - `(("libgcrypt" ,libgcrypt) - ("libgpg-error" ,libgpg-error) - ("libmhash" ,libmhash) - ("pcre:static" ,pcre "static") - ("pcre" ,pcre) - ("zlib:static" ,zlib "static") - ("zlib" ,zlib))) + (list libgcrypt + libgpg-error + libmhash + `(,pcre "static") + pcre + `(,zlib "static") + zlib)) (synopsis "File and directory integrity checker") (description "AIDE (Advanced Intrusion Detection Environment) is a file and directory @@ -645,9 +645,7 @@ console.") (inputs (list ncurses)) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("python" ,python-minimal-wrapper))) ; for scripts/MakeHeader.py + (list autoconf automake python-minimal-wrapper)) ; for scripts/MakeHeader.py (home-page "https://htop.dev") (synopsis "Interactive process viewer") (description @@ -2303,14 +2301,14 @@ characters can be replaced as well, as can UTF-8 characters.") "1zlh44w67py416hkvw6nrfmjickc2d43v51vcli5p374d5sw84ql")))) (build-system gnu-build-system) (inputs - `(("ntfs-3g" ,ntfs-3g) - ("util-linux" ,util-linux "lib") - ("openssl" ,openssl) - ;; FIXME: add reiserfs. - ("zlib" ,zlib) - ("e2fsprogs" ,e2fsprogs) - ("libjpeg" ,libjpeg-turbo) - ("ncurses" ,ncurses))) + (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 @@ -3918,12 +3916,12 @@ late.") #t)))) (build-system gnu-build-system) (inputs - `(("mpi" ,openmpi) - ("munge" ,munge) - ("boost" ,boost) - ("libelf" ,libelf) - ("libgcrypt" ,libgcrypt) - ("libgpg-error" ,libgpg-error))) + (list openmpi + munge + boost + libelf + libgcrypt + libgpg-error)) (synopsis "Infrastructue for large scale tool daemon launching") (description "LaunchMON is a software infrastructure that enables HPC run-time |