gnu: screenfetch: Use the tagged release.

* gnu/packages/admin.scm (screenfetch): Use the new 3.9.0 release tag
instead of a (functionally identical) naked commit.
This commit is contained in:
Tobias Geerinckx-Rice 2019-10-05 10:34:51 +02:00
parent 4d755996a7
commit 9dbda847af
No known key found for this signature in database
GPG Key ID: D889B0F018C5493C
1 changed files with 51 additions and 52 deletions

View File

@ -2852,61 +2852,60 @@ you are running, what theme or icon set you are using, etc.")
(license license:expat))) (license license:expat)))
(define-public screenfetch (define-public screenfetch
(let ((commit "e7b94fc3c529b9b97f32b71fd4bc05fb1d0f5864")) (package
(package (name "screenfetch")
(name "screenfetch") (version "3.9.0")
(version (git-version "3.8.0" "2" commit)) (source (origin
(source (origin (method git-fetch)
(method git-fetch) (uri (git-reference
(uri (git-reference (url "https://github.com/KittyKatt/screenFetch")
(url "https://github.com/KittyKatt/screenFetch") (commit (string-append "v" version))))
(commit commit))) (file-name (git-file-name name version))
(file-name (git-file-name name version)) (sha256
(sha256 (base32
(base32 "13i7dczbqwhws08zzrdraki1zkqv0qkbgx9c1r8vmg5qr9f7hfzg"))))
"13i7dczbqwhws08zzrdraki1zkqv0qkbgx9c1r8vmg5qr9f7hfzg")))) (build-system trivial-build-system)
(build-system trivial-build-system) (arguments
(arguments `(#:modules ((guix build utils))
`(#:modules ((guix build utils)) #:builder
#:builder (begin
(begin (use-modules (guix build utils))
(use-modules (guix build utils)) (let ((source (assoc-ref %build-inputs "source"))
(let ((source (assoc-ref %build-inputs "source")) (out (assoc-ref %outputs "out")))
(out (assoc-ref %outputs "out"))) (mkdir-p (string-append out "/bin/"))
(mkdir-p (string-append out "/bin/")) (copy-file (string-append source "/screenfetch-dev")
(copy-file (string-append source "/screenfetch-dev") (string-append out "/bin/screenfetch"))
(string-append out "/bin/screenfetch")) (install-file (string-append source "/screenfetch.1")
(install-file (string-append source "/screenfetch.1") (string-append out "/man/man1/"))
(string-append out "/man/man1/")) (install-file (string-append source "/COPYING")
(install-file (string-append source "/COPYING") (string-append out "/share/doc/" ,name "-" ,version))
(string-append out "/share/doc/" ,name "-" ,version)) (substitute* (string-append out "/bin/screenfetch")
(substitute* (string-append out "/bin/screenfetch") (("/usr/bin/env bash")
(("/usr/bin/env bash") (string-append (assoc-ref %build-inputs "bash")
(string-append (assoc-ref %build-inputs "bash") "/bin/bash")))
"/bin/bash"))) (wrap-program
(wrap-program
(string-append out "/bin/screenfetch") (string-append out "/bin/screenfetch")
`("PATH" ":" prefix `("PATH" ":" prefix
(,(string-append (assoc-ref %build-inputs "bc") "/bin:" (,(string-append (assoc-ref %build-inputs "bc") "/bin:"
(assoc-ref %build-inputs "scrot") "/bin:" (assoc-ref %build-inputs "scrot") "/bin:"
(assoc-ref %build-inputs "xdpyinfo") "/bin" (assoc-ref %build-inputs "xdpyinfo") "/bin"
(assoc-ref %build-inputs "xprop") "/bin")))) (assoc-ref %build-inputs "xprop") "/bin"))))
(substitute* (string-append out "/bin/screenfetch") (substitute* (string-append out "/bin/screenfetch")
(("#!#f") (("#!#f")
(string-append "#!" (assoc-ref %build-inputs "bash") (string-append "#!" (assoc-ref %build-inputs "bash")
"/bin/bash"))))))) "/bin/bash")))))))
(inputs (inputs
`(("bash" ,bash) `(("bash" ,bash)
("bc" ,bc) ("bc" ,bc)
("scrot" ,scrot) ("scrot" ,scrot)
("xdpyinfo" ,xdpyinfo) ("xdpyinfo" ,xdpyinfo)
("xprop" ,xprop))) ("xprop" ,xprop)))
(home-page "https://github.com/KittyKatt/screenFetch") (home-page "https://github.com/KittyKatt/screenFetch")
(synopsis "System information script") (synopsis "System information script")
(description "Bash screenshot information tool which can be used to (description "Bash screenshot information tool which can be used to
generate those nifty terminal theme information and ASCII distribution logos in generate those nifty terminal theme information and ASCII distribution logos in
everyone's screenshots nowadays.") everyone's screenshots nowadays.")
(license license:gpl3)))) (license license:gpl3)))
(define-public nnn (define-public nnn
(package (package