guix_mirror_bot pushed a commit to branch master
in repository guix.
commit b13cbaabc936644ebf2893f6dbdb50ca64835a0f
Author: Efraim Flashner <[email protected]>
AuthorDate: Thu Jan 1 16:24:24 2026 +0200
gnu: sequoia-sqv: Simplify install-extras phase.
* gnu/packages/sequoia.scm (sequoia-sqv)[arguments]: Rewrite the
'install-extras phase to use the 'install phase from the
copy-build-system. Fix the bash completion path.
Change-Id: I4a5e206b3a2a167123d82dc155b8ff67f927b418
---
gnu/packages/sequoia.scm | 47 ++++++++++++++++++++---------------------------
1 file changed, 20 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm
index e661e4144c..001f82c0c3 100644
--- a/gnu/packages/sequoia.scm
+++ b/gnu/packages/sequoia.scm
@@ -215,39 +215,32 @@ gpg-agent, openpgp-card and softkeys keystore backends.")
(native-inputs
(list clang pkg-config))
(arguments
- `(#:install-source? #f
+ `(#:imported-modules ((guix build copy-build-system)
+ ,@%cargo-build-system-modules)
+ #:modules ((guix build cargo-build-system)
+ ((guix build copy-build-system) #:prefix copy:)
+ (guix build utils))
+ #:install-source? #f
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'set-asset-out-dir
(lambda _
(setenv "ASSET_OUT_DIR" "target/assets")))
(add-after 'install 'install-more
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (share (string-append out "/share"))
- (bash-completions-dir
- (string-append out "/etc/bash_completion.d"))
- (zsh-completions-dir
- (string-append share "/zsh/site-functions"))
- (fish-completions-dir
- (string-append share "/fish/vendor_completions.d"))
- (elvish-completions-dir
- (string-append share "/elvish/lib"))
- (man1 (string-append share "/man/man1")))
- ;; The completions are generated in build.rs.
- (mkdir-p bash-completions-dir)
- (mkdir-p elvish-completions-dir)
- (for-each (lambda (file)
- (install-file file man1))
- (find-files "target/assets/man-pages" "\\.1$"))
- (copy-file "target/assets/shell-completions/sqv.bash"
- (string-append bash-completions-dir "/sqv"))
- (install-file "target/assets/shell-completions/_sqv"
- zsh-completions-dir)
- (install-file "target/assets/shell-completions/sqv.fish"
- fish-completions-dir)
- (copy-file "target/assets/shell-completions/sqv.elv"
- (string-append elvish-completions-dir "/sqv"))))))))
+ (lambda args
+ (apply (assoc-ref copy:%standard-phases 'install)
+ #:install-plan
+ '(("target/assets/man-pages" "share/man/man1"
+ #:include-regexp ("\\.1$"))
+ ("target/assets/shell-completions/sqv.bash"
+ "share/bash-completion/completions/sqv")
+ ("target/assets/shell-completions/sqv.elv"
+ "share/elvish/lib/sqv")
+ ("target/assets/shell-completions/sqv.fish"
+ "share/fish/vendor_completions.d/")
+ ("target/assets/shell-completions/_sqv"
+ "share/zsh/site-functions/"))
+ args))))))
(home-page "https://sequoia-pgp.org/";)
(synopsis "Simple OpenPGP signature verification program")
(description "@code{sqv} verifies detached OpenPGP signatures. It is a
