From 17f168fcadcae78284d2b88accb4250a2e0d43fa Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 27 Aug 2020 15:38:45 +0200 Subject: gnu: isc-dhcp: Do not refer to canonical coreutils. Make sure not to retain a reference to the canonical coreutils and sed packages. The Guix System closure size would otherwise be increased by including references to both canonical and non-canonical version of those packages. * gnu/packages/admin.scm (isc-dhcp)[inputs]: Add "coreutils" and "sed", [arguments]: and use them, instead of their canonical counterpart. --- gnu/packages/admin.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 61a98cc1cc..5efe67b0cb 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1042,10 +1042,10 @@ connection alive.") ;; if finds all the programs it needs. (let* ((out (assoc-ref outputs "out")) (libexec (string-append out "/libexec")) - (coreutils (assoc-ref inputs "coreutils")) + (coreutils (assoc-ref inputs "coreutils*")) (inetutils (assoc-ref inputs "inetutils")) (net-tools (assoc-ref inputs "net-tools")) - (sed (assoc-ref inputs "sed"))) + (sed (assoc-ref inputs "sed*"))) (substitute* "client/scripts/linux" (("/sbin/ip") (string-append (assoc-ref inputs "iproute") @@ -1085,12 +1085,8 @@ connection alive.") (base32 "1j9a4r83a77mp8k1y8z524c9rzdqgd8rzwczd6zwmw86a00xiimg")))) - ;; When cross-compiling, we need the cross Coreutils and sed. - ;; Otherwise just use those from %FINAL-INPUTS. - ,@(if (%current-target-system) - `(("coreutils" ,coreutils) - ("sed" ,sed)) - '()))) + ("coreutils*" ,coreutils) + ("sed*" ,sed))) (home-page "https://www.isc.org/products/DHCP/") (synopsis "Dynamic Host Configuration Protocol (DHCP) tools") -- cgit v1.2.3 From 61560d4bef05711db86320794437e1b261f4b5aa Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 27 Aug 2020 16:18:31 +0200 Subject: gnu: inetutils: Do not refer to canonical coreutils. Make sure not to retain a reference to the canonical coreutils package. The Guix System closure size would otherwise be increased by including references to both canonical and non-canonical version of those packages. * gnu/packages/admin.scm (inetutils)[inputs]: Add "coreutils", [arguments]: and point to it with PATHDEF_CP variable. --- gnu/packages/admin.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 5efe67b0cb..a1b9761633 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -623,10 +623,16 @@ re-executing them as necessary.") "--disable-uucpd" "--disable-whois") '())) + ;; Make sure that canonical "coreutils" package is not referred. + #:make-flags + (list (string-append "CPPFLAGS=-DPATHDEF_CP=\\\"" + (assoc-ref %build-inputs "coreutils*") + "/bin/cp\\\"")) ;; On some systems, 'libls.sh' may fail with an error such as: ;; "Failed to tell switch -a apart from -A". #:parallel-tests? #f)) - (inputs `(("ncurses" ,ncurses) + (inputs `(("coreutils*" ,coreutils) + ("ncurses" ,ncurses) ("readline" ,readline))) ;for 'ftp' (native-inputs (if (member (%current-system) (package-supported-systems net-tools)) -- cgit v1.2.3 From 3dd310087a883df6eb5ce47ca24fe8fbac15a2d7 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 27 Aug 2020 16:33:13 +0200 Subject: Revert "gnu: inetutils: Do not refer to canonical coreutils." This reverts commit 61560d4bef05711db86320794437e1b261f4b5aa because it triggers too many rebuilds. --- gnu/packages/admin.scm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index a1b9761633..5efe67b0cb 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -623,16 +623,10 @@ re-executing them as necessary.") "--disable-uucpd" "--disable-whois") '())) - ;; Make sure that canonical "coreutils" package is not referred. - #:make-flags - (list (string-append "CPPFLAGS=-DPATHDEF_CP=\\\"" - (assoc-ref %build-inputs "coreutils*") - "/bin/cp\\\"")) ;; On some systems, 'libls.sh' may fail with an error such as: ;; "Failed to tell switch -a apart from -A". #:parallel-tests? #f)) - (inputs `(("coreutils*" ,coreutils) - ("ncurses" ,ncurses) + (inputs `(("ncurses" ,ncurses) ("readline" ,readline))) ;for 'ftp' (native-inputs (if (member (%current-system) (package-supported-systems net-tools)) -- cgit v1.2.3 From d81b89bf0231c1a994d5f54bc60002f434a3f567 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 28 Aug 2020 10:27:53 +0200 Subject: gnu: rottlog: Do not refer to the canonical coreutils. * gnu/packages/admin.scm (rottlog)[inputs]: Add "coreutils", [arguments]: and use it in the 'tweak-rc-weekly phase. --- gnu/packages/admin.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 5efe67b0cb..6610b8f5c1 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1365,10 +1365,11 @@ at once based on a Perl regular expression.") "packdir=\"/var/log\"")) #t)) (add-before 'install 'tweak-rc-weekly - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (substitute* "rc/weekly" (("/bin/kill") - (which "kill")) + (string-append (assoc-ref inputs "coreutils*") + "/bin/kill")) (("syslogd\\.pid") ;; The file is called 'syslog.pid' (no 'd'). "syslog.pid")) @@ -1379,6 +1380,7 @@ at once based on a Perl regular expression.") (native-inputs `(("texinfo" ,texinfo) ("automake" ,automake) ("util-linux" ,util-linux))) ; for 'cal' + (inputs `(("coreutils*" ,coreutils))) (home-page "https://www.gnu.org/software/rottlog/") (synopsis "Log rotation and management") (description -- cgit v1.2.3 From 9925a2347a96f1125de4acee65eac064b7e02a46 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Aug 2020 01:01:38 +0200 Subject: gnu: htop: Update to 3.0.0. * gnu/packages/admin.scm (htop): Update to 3.0.0. [source]: Switch to new upstream. Use GIT-FETCH and GIT-FILE-NAME. [native-inputs]: Add autoconf and automake. [home-page]: Switch to new upstream. --- gnu/packages/admin.scm | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 6610b8f5c1..5d2c05618a 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -514,20 +514,24 @@ or via the @code{facter} Ruby library.") (define-public htop (package (name "htop") - (version "2.2.0") - (source (origin - (method url-fetch) - (uri (string-append "http://hisham.hm/htop/releases/" - version "/htop-" version ".tar.gz")) - (sha256 - (base32 - "0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr")))) + (version "3.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/htop-dev/htop") + (commit version))) + (sha256 + (base32 "096gdnpaszs5rfp7qj8npi2jkvdqpp8mznn89f97ykrg6pgagwq4")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses))) (native-inputs - `(("python" ,python-wrapper))) ;for scripts/MakeHeader.py - (home-page "https://hisham.hm/htop/") + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("python" ,python-wrapper))) ; for scripts/MakeHeader.py + (home-page "https://htop.dev") (synopsis "Interactive process viewer") (description "This is htop, an interactive process viewer. It is a text-mode -- cgit v1.2.3 From 5a9f2ae19b9d50cb8d0d94612c7bd074ce85f0c5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Aug 2020 03:11:02 +0200 Subject: gnu: fdupes: Update to 2.1.2. * gnu/packages/admin.scm (fdupes): Update to 2.1.2. [source]: Use bootstrapped release tarball. [arguments]: Delete field. [inputs]: Add ncurses and pcre2. --- gnu/packages/admin.scm | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 5d2c05618a..a7ecc378d5 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2133,24 +2133,19 @@ degradation and failure.") (define-public fdupes (package (name "fdupes") - (version "1.6.1") + (version "2.1.2") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/adrianlopezroche/fdupes") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "https://github.com/adrianlopezroche/fdupes/" + "releases/download/v" version "/" + "fdupes-" version ".tar.gz")) (sha256 - (base32 "19b6vqblddaw8ccw4sn0qsqzbswlhrz8ia6n4m3hymvcxn8skpz9")))) + (base32 "1g9p50xhi2sp0hqxml4w2k0kq9jv988q2yxm347z5349dlxvap6d")))) (build-system gnu-build-system) - (arguments - '(#:phases (modify-phases %standard-phases - (delete 'configure)) - #:tests? #f ; no 'check' target - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" - (assoc-ref %outputs "out"))))) + (inputs + `(("ncurses" ,ncurses) + ("pcre2" ,pcre2))) (home-page "https://github.com/adrianlopezroche/fdupes") (synopsis "Identify duplicate files") (description -- cgit v1.2.3 From 5cea72818db253c3cb7bc688d8d04d72d7b78777 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 31 Aug 2020 00:27:58 +0200 Subject: gnu: facter: Update to 4.0.35. * gnu/packages/admin.scm (facter): Update to 4.0.35. --- 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 a7ecc378d5..aaed5b8e55 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -443,7 +443,7 @@ graphs and can export its output to different formats.") (define-public facter (package (name "facter") - (version "4.0.34") + (version "4.0.35") (source (origin (method git-fetch) (uri (git-reference @@ -452,7 +452,7 @@ graphs and can export its output to different formats.") (file-name (git-file-name name version)) (sha256 (base32 - "19lcmmcnxkbirvh5bn5xa9a99z48zmb1b8845cp5r598y019gxqp")))) + "1f203g2hp96cp8w4x1myhqdj5j09z9s23kylwkrxr69fjhn0vhnb")))) (build-system ruby-build-system) (arguments `(#:phases -- cgit v1.2.3 From a603d1e66cdb90a4d45e938fe6ca5151fdae8b33 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Thu, 3 Sep 2020 10:38:55 +0200 Subject: gnu: inxi-minimal: Update to 3.1.06-1. * gnu/packages/admin.scm (inxi-minimal): Update to 3.1.06-1. Signed-off-by: Oleg Pykhalov --- 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 aaed5b8e55..55f731c3cd 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3589,7 +3589,7 @@ Python loading in HPC environments.") (let ((real-name "inxi")) (package (name "inxi-minimal") - (version "3.1.05-2") + (version "3.1.06-1") (source (origin (method git-fetch) @@ -3598,7 +3598,7 @@ Python loading in HPC environments.") (commit version))) (file-name (git-file-name real-name version)) (sha256 - (base32 "1a7nl2wk49yz5hcrph692xh5phv1mdg1m5cbvgv3ya12c6r32pa2")))) + (base32 "0h65n03q9kdsv0i1q5f88i11iv79ca7fqq97rdkzkmiqb4whhnm2")))) (build-system trivial-build-system) (inputs `(("bash" ,bash-minimal) -- cgit v1.2.3 From b2e5d1c1453af557fdff1a6c79d431bfc64ccbc8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 7 Sep 2020 19:43:33 +0200 Subject: gnu: htop: Update to 3.0.1. * gnu/packages/admin.scm (htop): Update to 3.0.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 55f731c3cd..38ec33da1b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -514,7 +514,7 @@ or via the @code{facter} Ruby library.") (define-public htop (package (name "htop") - (version "3.0.0") + (version "3.0.1") (source (origin (method git-fetch) @@ -522,7 +522,7 @@ or via the @code{facter} Ruby library.") (url "https://github.com/htop-dev/htop") (commit version))) (sha256 - (base32 "096gdnpaszs5rfp7qj8npi2jkvdqpp8mznn89f97ykrg6pgagwq4")) + (base32 "0kjlphdvwwbj91kk91s4ksc954d3c2bznddzx2223jmb1bn9rcsa")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From 7090159c23d6345992ab976d71fefeb1583cfcdf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 9 Sep 2020 19:40:41 +0200 Subject: gnu: libcap-ng: Update to 0.8. * gnu/packages/admin.scm (libcap-ng): Update to 0.8. --- 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 38ec33da1b..4e470abd8a 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2081,7 +2081,7 @@ track changes in important system configuration files.") (define-public libcap-ng (package (name "libcap-ng") - (version "0.7.11") + (version "0.8") (source (origin (method url-fetch) (uri (string-append @@ -2089,7 +2089,7 @@ track changes in important system configuration files.") version ".tar.gz")) (sha256 (base32 - "1s8akhnnazk0b5c6z5i3x54rjb26p8pz2wdl1m21ml3231qmr0c5")))) + "08cy59iassiwbmfxa5v0kb374r80290vv32f5q1mnip11av26kgi")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3