diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2018-06-06 22:43:37 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2018-06-06 22:43:37 +0200 |
| commit | 116ca65b583ba4e404289f1481dc3a3ffef1c3dd (patch) | |
| tree | 79796424eb21443c76594304162b6629c3a8a54e /gnu/packages/admin.scm | |
| parent | 477ee222aa796257b5f32966da662e76fe706332 (diff) | |
| parent | 25133ca172d7dd436c4c08055d18f1a393037dbb (diff) | |
| download | guix-patches-116ca65b583ba4e404289f1481dc3a3ffef1c3dd.tar guix-patches-116ca65b583ba4e404289f1481dc3a3ffef1c3dd.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/admin.scm')
| -rw-r--r-- | gnu/packages/admin.scm | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index f253fca57e..fde09b001b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2661,23 +2661,22 @@ 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 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")))) + "07wihl4gsamq98mhxvm6k4vpphym75467cxfa19b3g5ggpyq894g")))) (build-system trivial-build-system) (inputs `(("bash" ,bash) ("perl" ,perl))) (native-inputs - `(("gzip" ,gzip) - ("tar" ,tar))) + `(("gzip" ,gzip))) (arguments `(#:modules ((guix build utils) @@ -2691,9 +2690,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")))) @@ -2725,7 +2724,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") |