aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2018-06-06 03:20:08 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2018-06-06 06:12:20 +0200
commitb740a30527737f66007ec0f77b11e39438a6baa7 (patch)
tree571ed5a7f8bd7aac28494b4a074cbedf48685693
parent55f5556e243e85865e69c50bc040123345c4295b (diff)
downloadguix-b740a30527737f66007ec0f77b11e39438a6baa7.tar
guix-b740a30527737f66007ec0f77b11e39438a6baa7.tar.gz
gnu: inxi: Use GIT-FETCH.
* gnu/packages/admin.scm (inxi)[source]: Use GIT-FETCH. [native-inputs]: Remove tar. [arguments]: Adjust accordingly.
-rw-r--r--gnu/packages/admin.scm17
1 files changed, 8 insertions, 9 deletions
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"))))