From 55f5556e243e85865e69c50bc040123345c4295b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jun 2018 03:18:02 +0200 Subject: gnu: inxi: Fix man page location. * gnu/packages/admin.scm (inxi)[arguments]: Install man page to /share/man instead of /share/doc/man. --- 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 def1fa1ed2..70dbaeb17d 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2716,7 +2716,7 @@ Python loading in HPC environments.") %build-inputs))))) (invoke "gzip" "inxi.1") (install-file "inxi.1.gz" - (string-append %output "/share/doc/man/man1"))) + (string-append %output "/share/man/man1"))) #t))) (home-page "https://smxi.org/docs/inxi.htm") (synopsis "Full featured system information script") -- cgit v1.2.3 From b740a30527737f66007ec0f77b11e39438a6baa7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jun 2018 03:20:08 +0200 Subject: gnu: inxi: Use GIT-FETCH. * gnu/packages/admin.scm (inxi)[source]: Use GIT-FETCH. [native-inputs]: Remove tar. [arguments]: Adjust accordingly. --- gnu/packages/admin.scm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 70dbaeb17d..7f2e0678fa 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2655,10 +2655,10 @@ Python loading in HPC environments.") (version "3.0.04-1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/smxi/inxi" - "/archive/" version "/inxi.tar.gz")) - (file-name (string-append real-name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/smxi/inxi") + (commit version))) (sha256 (base32 "14zxdsjgh9dbijmpp0hhvg2yiqqfwnqgcc6x8dpl1v15z1h1r7pc")))) @@ -2667,8 +2667,7 @@ Python loading in HPC environments.") `(("bash" ,bash) ("perl" ,perl))) (native-inputs - `(("gzip" ,gzip) - ("tar" ,tar))) + `(("gzip" ,gzip))) (arguments `(#:modules ((guix build utils) @@ -2682,9 +2681,9 @@ Python loading in HPC environments.") (setenv "PATH" (string-append (assoc-ref %build-inputs "bash") "/bin" ":" (assoc-ref %build-inputs "gzip") "/bin" ":" - (assoc-ref %build-inputs "perl") "/bin" ":" - (assoc-ref %build-inputs "tar") "/bin" ":")) - (invoke "tar" "xvf" (assoc-ref %build-inputs "source")) + (assoc-ref %build-inputs "perl") "/bin" ":")) + (copy-recursively (assoc-ref %build-inputs "source") + ,(string-append real-name "-" version)) (with-directory-excursion ,(string-append real-name "-" version) (with-fluids ((%default-port-encoding #f)) (substitute* "inxi" (("/usr/bin/env perl") (which "perl")))) -- cgit v1.2.3 From 4f12e5cc7cedca15e46d30e96fb89f7c63eb43e5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jun 2018 03:22:34 +0200 Subject: gnu: inxi: Update to 3.0.11-1. * gnu/packages/admin.scm (inxi): Update to 3.0.11-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 7f2e0678fa..5e4b873d4e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2652,7 +2652,7 @@ Python loading in HPC environments.") (let ((real-name "inxi")) (package (name "inxi-minimal") - (version "3.0.04-1") + (version "3.0.11-1") (source (origin (method git-fetch) @@ -2661,7 +2661,7 @@ Python loading in HPC environments.") (commit version))) (sha256 (base32 - "14zxdsjgh9dbijmpp0hhvg2yiqqfwnqgcc6x8dpl1v15z1h1r7pc")))) + "07wihl4gsamq98mhxvm6k4vpphym75467cxfa19b3g5ggpyq894g")))) (build-system trivial-build-system) (inputs `(("bash" ,bash) -- cgit v1.2.3