amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: password-store: Improve style.

Browse source 
* gnu/packages/password-utils.scm (password-store)[arguments]: Use
G-Expressions.

Change-Id: If9ffc75174f401cd00acfee84844f718ab57b24f
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
This commit is contained in:
Cayetano Santos 2025-09-16 16:32:49 +02:00 • committed by Liliana Marie Prikler
parent bea4bc442b
commit f1ffccf1d0
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
1 changed files with 71 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

142
gnu/packages/password-utils.scm
View file

@ -856,78 +856,78 @@ any X11 window.")
(package (package
(name "password-store") (name "password-store")
(version "1.7.4") (version "1.7.4")
(source (origin (source
(method git-fetch) (origin
(uri (git-reference (method git-fetch)
(url "git://git.zx2c4.com/password-store") (uri (git-reference
(commit version))) (url "git://git.zx2c4.com/password-store")
(sha256 (commit version)))
(base32 (sha256
"17zp9pnb3i9sd2zn9qanngmsywrb7y495ngcqs6313pv3gb83v53")) (base32
(patches (search-patches "password-store-tree-compat.patch")) "17zp9pnb3i9sd2zn9qanngmsywrb7y495ngcqs6313pv3gb83v53"))
(file-name (git-file-name name version)))) (patches (search-patches "password-store-tree-compat.patch"))
(file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (list
(modify-phases %standard-phases #:make-flags
(delete 'configure) #~(list (string-append "CC=" #$(cc-for-target))
(delete 'build) (string-append "PREFIX=" #$output)
(add-before 'install 'patch-system-extension-dir "WITH_ALLCOMP=yes"
(lambda* (#:key outputs #:allow-other-keys) (string-append "BASHCOMPDIR=" #$output "/etc/bash_completion.d"))
(let* ((out (assoc-ref outputs "out")) ;; Parallel tests may cause a race condition leading to a
(extension-dir (string-append out "/lib/password-store/extensions"))) ;; timeout in some circumstances.
(substitute* "src/password-store.sh" #:parallel-tests? #f
(("^SYSTEM_EXTENSION_DIR=.*$") #:test-target "test"
;; lead with whitespace to prevent 'make install' from #:phases
;; overwriting it again #~(modify-phases %standard-phases
(string-append " SYSTEM_EXTENSION_DIR=\"" (delete 'configure)
"${PASSWORD_STORE_SYSTEM_EXTENSION_DIR:-" (delete 'build)
extension-dir (add-before 'install 'patch-system-extension-dir
"}\"\n")))))) (lambda _
(add-before 'install 'patch-program-name (substitute* "src/password-store.sh"
;; Use pass not .pass-real in tmpdir and cmd_usage (("^SYSTEM_EXTENSION_DIR=.*$")
(lambda _ ;; lead with whitespace to prevent 'make install' from
(substitute* "src/password-store.sh" ;; overwriting it again
(("^PROGRAM=.*$") (string-append
"PROGRAM=\"pass\"\n")))) " SYSTEM_EXTENSION_DIR=\""
(add-before 'install 'patch-passmenu-path "${PASSWORD_STORE_SYSTEM_EXTENSION_DIR:-"
;; FIXME Wayland support requires ydotool and dmenu-wl packages (string-append #$output "/lib/password-store/extensions")
;; We are ignoring part of the script that gets executed if "}\"\n")))))
;; WAYLAND_DISPLAY env variable is set, leaving dmenu-wl and ydotool (add-before 'install 'patch-program-name
;; commands as is. ;; Use pass not .pass-real in tmpdir and cmd_usage
(lambda* (#:key inputs #:allow-other-keys) (lambda _
(substitute* "contrib/dmenu/passmenu" (substitute* "src/password-store.sh"
(("dmenu=dmenu\n") (("^PROGRAM=.*$")
(string-append "dmenu=" "PROGRAM=\"pass\"\n"))))
(search-input-file inputs "/bin/dmenu") (add-before 'install 'patch-passmenu-path
"\n")) ;; FIXME Wayland support requires ydotool and dmenu-wl packages
(("xdotool=\"xdotool") ;; We are ignoring part of the script that gets executed if
(string-append "xdotool=\"" ;; WAYLAND_DISPLAY env variable is set, leaving dmenu-wl and ydotool
(search-input-file inputs "/bin/xdotool")))))) ;; commands as is.
(add-after 'install 'install-passmenu (lambda* (#:key inputs #:allow-other-keys)
(lambda* (#:key outputs #:allow-other-keys) (substitute* "contrib/dmenu/passmenu"
(let* ((out (assoc-ref outputs "out")) (("dmenu=dmenu\n")
(bin (string-append out "/bin"))) (string-append
(install-file "contrib/dmenu/passmenu" bin)))) "dmenu=" (search-input-file inputs "/bin/dmenu") "\n"))
(add-after 'install 'wrap-path (("xdotool=\"xdotool")
(lambda* (#:key inputs outputs #:allow-other-keys) (string-append
(let* ((out (assoc-ref outputs "out")) "xdotool=\"" (search-input-file inputs "/bin/xdotool"))))))
(requisites '("getopt" "git" "gpg" "qrencode" "sed" (add-after 'install 'install-passmenu
"tail" "tree" "which" "wl-copy" "xclip")) (lambda _
(path (map (lambda (pkg) (install-file
(dirname (search-input-file "contrib/dmenu/passmenu" (string-append #$output "/bin"))))
inputs (string-append "/bin/" pkg)))) (add-after 'install 'wrap-path
requisites))) (lambda* (#:key inputs #:allow-other-keys)
(wrap-program (string-append out "/bin/pass") (let* ((requisites '("getopt" "git" "gpg" "qrencode" "sed"
`("PATH" ":" prefix (,(string-join path ":")))))))) "tail" "tree" "which" "wl-copy" "xclip"))
#:make-flags (list "CC=gcc" (string-append "PREFIX=" %output) (path
"WITH_ALLCOMP=yes" (map (lambda (pkg)
(string-append "BASHCOMPDIR=" (dirname (search-input-file
%output "/etc/bash_completion.d")) inputs (string-append "/bin/" pkg))))
;; Parallel tests may cause a race condition leading to a requisites)))
;; timeout in some circumstances. (wrap-program (string-append #$output "/bin/pass")
#:parallel-tests? #f `("PATH" ":" prefix (,(string-join path ":"))))))))))
#:test-target "test"))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
(variable "PASSWORD_STORE_SYSTEM_EXTENSION_DIR") (variable "PASSWORD_STORE_SYSTEM_EXTENSION_DIR")
@ -937,12 +937,12 @@ any X11 window.")
(list bash-minimal (list bash-minimal
coreutils coreutils
dmenu dmenu
util-linux
git git
gnupg gnupg
qrencode qrencode
sed sed
tree tree
util-linux
which which
wl-clipboard wl-clipboard
xclip xclip