diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2023-05-22 17:54:53 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2023-08-14 19:37:59 +0300 |
| commit | d5019a375478f4f2486c51d2c0279cf73e8ad02c (patch) | |
| tree | 56af63fba5de99e61c732cba66783a4938200e00 /gnu | |
| parent | c15bda577112c1f9e0bd69c43111aec92f2c65a6 (diff) | |
gnu: sequoia: Update to 1.16.0.
* gnu/packages/sequoia.scm (sequoia): Update to 1.16.0.
[outputs]: Remove python.
[inputs]: Remove glibc, libsequoia, libsequoia:python. Add sequoia-wot.
[arguments]: Adjust how package is built.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/sequoia.scm | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm index 9155093cd8..6d6733c055 100644 --- a/gnu/packages/sequoia.scm +++ b/gnu/packages/sequoia.scm @@ -564,39 +564,43 @@ This Guix package is built to use the nettle cryptographic library.") This Guix package is built to use the nettle cryptographic library."))) +;; + (define-public sequoia (package (name "sequoia") - (version "1.6.0") + (version "1.16.0") (source #f) (build-system trivial-build-system) - (outputs '("out" "python")) - (inputs - (list glibc ;; for ldconfig in make-dynamic-linker-cache - libsequoia - `(,libsequoia "python") - sequoia-sq - sequoia-sqv)) (arguments (list - #:modules '((guix build utils) (guix build gnu-build-system) - (guix build gremlin) (guix elf)) + #:modules '((guix build utils) + (guix build union) + (guix build gnu-build-system) + (guix build gremlin) + (guix elf)) #:builder #~(begin - (use-modules (guix build utils) (guix build gnu-build-system)) + (use-modules (guix build utils) + (guix build union) + (guix build gnu-build-system) + (ice-9 match)) (let ((make-dynamic-linker-cache (assoc-ref %standard-phases 'make-dynamic-linker-cache)) (ld.so.cache (string-append #$output "/etc/ld.so.cache"))) - (copy-recursively #$libsequoia #$output) - (copy-recursively #$sequoia-sq #$output) + (match %build-inputs + (((names . directories) ...) + (union-build #$output directories))) (delete-file ld.so.cache) - (copy-recursively #$sequoia-sqv #$output) - (delete-file ld.so.cache) - (copy-recursively #$libsequoia:python #$output:python) - (setenv "PATH" - (string-append (getenv "PATH") ":" #$glibc "/sbin")) - (make-dynamic-linker-cache #:outputs %outputs))))) + (setenv "PATH" + (string-append (getenv "PATH") ":" #$glibc "/sbin")) + (make-dynamic-linker-cache #:outputs %outputs))))) + (inputs + (list ;glibc ;; for ldconfig in make-dynamic-linker-cache + sequoia-sq + sequoia-sqv + sequoia-wot)) (home-page "https://sequoia-pgp.org") (synopsis "New OpenPGP implementation (meta-package)") (description "Sequoia is a new OpenPGP implementation, written in Rust, |