diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-04-28 16:24:46 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-04-28 16:24:46 +0200 |
| commit | 284fa7264963acc5d114ef5d54c347126b1654ba (patch) | |
| tree | 3e5360fcc81b6d0dce76a65aca60cf8528f2931f /gnu/packages/password-utils.scm | |
| parent | 12c9da35389dfba86ae0d863132a6b2c4374205a (diff) | |
| parent | 882cacc1bb5be0df334dd7ce55b385a3a1678728 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/password-utils.scm')
| -rw-r--r-- | gnu/packages/password-utils.scm | 52 |
1 files changed, 32 insertions, 20 deletions
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 35a2d0249c..86e80e8328 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org> ;;; Copyright © 2017, 2019 Eric Bavier <bavier@member.fsf.org> -;;; Copyright © 2017, 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2017, 2020-2022 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2018, 2022 Marius Bakke <marius@gnu.org> @@ -82,6 +82,7 @@ #:use-module (gnu packages guile) #:use-module (gnu packages kerberos) #:use-module (gnu packages libffi) + #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages man) #:use-module (gnu packages multiprecision) @@ -130,7 +131,7 @@ human.") (define-public keepassxc (package (name "keepassxc") - (version "2.6.6") + (version "2.7.1") (source (origin (method url-fetch) @@ -138,39 +139,50 @@ human.") "/releases/download/" version "/keepassxc-" version "-src.tar.xz")) (sha256 - (base32 "1qm4a1k11vy35mrzbzcc7lwlpmjzw18a2zy7z93rqa4vqcdb20rn")))) + (base32 "1ryk2ndv93jb155cp7qkjm7jd8hjy0v5gqvdvbdidhrmdiibl0b0")))) (build-system cmake-build-system) (arguments - `(#:modules ((guix build cmake-build-system) + (list + #:modules '((guix build cmake-build-system) (guix build qt-utils) (guix build utils)) - #:imported-modules (,@%cmake-build-system-modules - (guix build qt-utils)) - #:configure-flags '("-DWITH_XC_ALL=YES" - "-DWITH_XC_UPDATECHECK=NO") - #:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-qt - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-qt-program "keepassxc" #:output out #:inputs inputs))))))) + #:imported-modules `(,@%cmake-build-system-modules + (guix build qt-utils)) + #:configure-flags + #~(list "-DWITH_XC_ALL=YES" + "-DWITH_XC_UPDATECHECK=NO") + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Fails with "TestCli::testClip() Compared values are not the + ;; same". That test also requires a phase with (setenv + ;; "QT_QPA_PLATFORM" "offscreen") in order to work. + (invoke "ctest" "--exclude-regex" "testcli")))) + (add-after 'install 'wrap-qt + (lambda* (#:key inputs #:allow-other-keys) + (wrap-qt-program "keepassxc" #:output #$output #:inputs inputs)))))) (native-inputs - `(("asciidoctor" ,ruby-asciidoctor) - ("qttools" ,qttools))) + (list qttools ruby-asciidoctor)) (inputs (list argon2 + botan libgcrypt - libsodium ; XC_BROWSER - libyubikey ; XC_YUBIKEY + libsodium ; XC_BROWSER + libusb + libyubikey ; XC_YUBIKEY libxi libxtst + minizip + pcsc-lite qrencode qtbase-5 qtsvg qtx11extras - quazip-0 ; XC_KEESHARE + quazip-0 ; XC_KEESHARE readline - yubikey-personalization ; XC_YUBIKEY + yubikey-personalization ; XC_YUBIKEY zlib)) (home-page "https://www.keepassxc.org") (synopsis "Password manager") |