gnu: password-store: Update to 1.7.4.

* gnu/packages/password-utils.scm (password-store): Update to 1.7.4.

Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
This commit is contained in:
Xinglu Chen 2021-06-11 22:35:16 +02:00 committed by Nicolas Goaziou
parent 228e689000
commit 599c4ed000
No known key found for this signature in database
GPG key ID: DA00B4F048E92F2D

View file

@ -30,6 +30,7 @@
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at> ;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -484,100 +485,95 @@ (define-public assword
(license license:gpl3+))) (license license:gpl3+)))
(define-public password-store (define-public password-store
;; The 1.7.3 release does not include support for wl-clipboard, which was (package
;; added in b0b784b1a57c0b06936e6f5d6560712b4b810cd3. Instead, use the (name "password-store")
;; latest commit on master at the time of writing. (version "1.7.4")
(let ((commit "918992c19231b33b3d4a3288a7288a620e608cb4") (source (origin
(revision "1")) (method git-fetch)
(package (uri (git-reference
(name "password-store") (url "git://git.zx2c4.com/password-store")
(version (git-version "1.7.3" revision commit)) (commit version)))
(source (origin (sha256
(method git-fetch) (base32
(uri (git-reference "17zp9pnb3i9sd2zn9qanngmsywrb7y495ngcqs6313pv3gb83v53"))
(url "git://git.zx2c4.com/password-store") (file-name (git-file-name name version))))
(commit commit))) (build-system gnu-build-system)
(sha256 (arguments
(base32 '(#:phases
"0ni62f4pq96g0i0q66bch1dl9k4zqwhg7xaf746k3gbbqxcdh3vi")) (modify-phases %standard-phases
(file-name (git-file-name name version)) )) (delete 'configure)
(build-system gnu-build-system) (delete 'build)
(arguments (add-before 'install 'patch-system-extension-dir
'(#:phases (lambda* (#:key outputs #:allow-other-keys)
(modify-phases %standard-phases (let* ((out (assoc-ref outputs "out"))
(delete 'configure) (extension-dir (string-append out "/lib/password-store/extensions")))
(delete 'build) (substitute* "src/password-store.sh"
(add-before 'install 'patch-system-extension-dir (("^SYSTEM_EXTENSION_DIR=.*$")
(lambda* (#:key outputs #:allow-other-keys) ;; lead with whitespace to prevent 'make install' from
(let* ((out (assoc-ref outputs "out")) ;; overwriting it again
(extension-dir (string-append out "/lib/password-store/extensions"))) (string-append " SYSTEM_EXTENSION_DIR=\""
(substitute* "src/password-store.sh" "${PASSWORD_STORE_SYSTEM_EXTENSION_DIR:-"
(("^SYSTEM_EXTENSION_DIR=.*$") extension-dir
;; lead with whitespace to prevent 'make install' from "}\"\n"))))
;; overwriting it again #t))
(string-append " SYSTEM_EXTENSION_DIR=\"" (add-before 'install 'patch-passmenu-path
"${PASSWORD_STORE_SYSTEM_EXTENSION_DIR:-" (lambda* (#:key inputs #:allow-other-keys)
extension-dir (substitute* "contrib/dmenu/passmenu"
"}\"\n")))) (("dmenu") (string-append (assoc-ref inputs "dmenu")
#t)) "/bin/dmenu"))
(add-before 'install 'patch-passmenu-path (("xdotool") (string-append (assoc-ref inputs "xdotool")
(lambda* (#:key inputs #:allow-other-keys) "/bin/xdotool")))
(substitute* "contrib/dmenu/passmenu" #t))
(("dmenu") (string-append (assoc-ref inputs "dmenu") (add-after 'install 'install-passmenu
"/bin/dmenu")) (lambda* (#:key outputs #:allow-other-keys)
(("xdotool") (string-append (assoc-ref inputs "xdotool") (let* ((out (assoc-ref outputs "out"))
"/bin/xdotool"))) (bin (string-append out "/bin")))
#t)) (install-file "contrib/dmenu/passmenu" bin)
(add-after 'install 'install-passmenu #t)))
(lambda* (#:key outputs #:allow-other-keys) (add-after 'install 'wrap-path
(let* ((out (assoc-ref outputs "out")) (lambda* (#:key inputs outputs #:allow-other-keys)
(bin (string-append out "/bin"))) (let ((out (assoc-ref outputs "out"))
(install-file "contrib/dmenu/passmenu" bin) (path (map (lambda (pkg)
#t))) (string-append (assoc-ref inputs pkg) "/bin"))
(add-after 'install 'wrap-path '("coreutils" "getopt" "git" "gnupg" "qrencode"
(lambda* (#:key inputs outputs #:allow-other-keys) "sed" "tree" "which" "wl-clipboard" "xclip"))))
(let ((out (assoc-ref outputs "out")) (wrap-program (string-append out "/bin/pass")
(path (map (lambda (pkg) `("PATH" ":" prefix (,(string-join path ":"))))
(string-append (assoc-ref inputs pkg) "/bin")) #t))))
'("coreutils" "getopt" "git" "gnupg" "qrencode" #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)
"sed" "tree" "which" "wl-clipboard" "xclip")))) "WITH_ALLCOMP=yes"
(wrap-program (string-append out "/bin/pass") (string-append "BASHCOMPDIR="
`("PATH" ":" prefix (,(string-join path ":")))) %output "/etc/bash_completion.d"))
#t)))) ;; Parallel tests may cause a race condition leading to a
#:make-flags (list "CC=gcc" (string-append "PREFIX=" %output) ;; timeout in some circumstances.
"WITH_ALLCOMP=yes" #:parallel-tests? #f
(string-append "BASHCOMPDIR=" #:test-target "test"))
%output "/etc/bash_completion.d")) (native-search-paths
;; Parallel tests may cause a race condition leading to a (list (search-path-specification
;; timeout in some circumstances. (variable "PASSWORD_STORE_SYSTEM_EXTENSION_DIR")
#:parallel-tests? #f (separator #f) ;single entry
#:test-target "test")) (files '("lib/password-store/extensions")))))
(native-search-paths (inputs
(list (search-path-specification `(("dmenu" ,dmenu)
(variable "PASSWORD_STORE_SYSTEM_EXTENSION_DIR") ("getopt" ,util-linux)
(separator #f) ;single entry ("git" ,git)
(files '("lib/password-store/extensions"))))) ("gnupg" ,gnupg)
(inputs ("qrencode" ,qrencode)
`(("dmenu" ,dmenu) ("sed" ,sed)
("getopt" ,util-linux) ("tree" ,tree)
("git" ,git) ("which" ,which)
("gnupg" ,gnupg) ("wl-clipboard" ,wl-clipboard)
("qrencode" ,qrencode) ("xclip" ,xclip)
("sed" ,sed) ("xdotool" ,xdotool)))
("tree" ,tree) (home-page "https://www.passwordstore.org/")
("which" ,which) (synopsis "Encrypted password manager")
("wl-clipboard" ,wl-clipboard) (description "Password-store is a password manager which uses GnuPG to
("xclip" ,xclip)
("xdotool" ,xdotool)))
(home-page "https://www.passwordstore.org/")
(synopsis "Encrypted password manager")
(description "Password-store is a password manager which uses GnuPG to
store and retrieve passwords. The tool stores each password in its own store and retrieve passwords. The tool stores each password in its own
GnuPG-encrypted file, allowing the program to be simple yet secure. GnuPG-encrypted file, allowing the program to be simple yet secure.
Synchronization is possible using the integrated git support, which commits Synchronization is possible using the integrated git support, which commits
changes to your password database to a git repository that can be managed changes to your password database to a git repository that can be managed
through the pass command.") through the pass command.")
(license license:gpl2+)))) (license license:gpl2+)))
(define-public pass-otp (define-public pass-otp
(package (package