From 9b572aba85696520956ea838c3fe08426b6ce88c Mon Sep 17 00:00:00 2001 From: Tim Gesthuizen via Guix-patches via Date: Sun, 24 May 2020 20:58:23 +0200 Subject: gnu: pwsafe: Update to 3.52.0. * gnu/packages/password-utils.scm (pwsafe): Update to 3.52.0. [arguments]: Remove obsolete work-arounds. Co-authored-by: Tobias Geerinckx-Rice --- gnu/packages/password-utils.scm | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'gnu/packages/password-utils.scm') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 4f5ac1029f..a59fb9dc75 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Amirouche Boubekki -;;; Copyright © 2018, 2019 Tim Gesthuizen +;;; Copyright © 2018, 2019, 2020 Tim Gesthuizen ;;; Copyright © 2019 Jens Mølgaard ;;; Copyright © 2019 Tanguy Le Carrour ;;; Copyright © 2020 Guillaume Le Vaillant @@ -196,7 +196,7 @@ (define-public keepassx (define-public pwsafe (package (name "pwsafe") - (version "3.50.0") + (version "3.52.0") (home-page "https://www.pwsafe.org/") (source (origin @@ -205,7 +205,7 @@ (define-public pwsafe (url "https://github.com/pwsafe/pwsafe.git") (commit version))) (sha256 - (base32 "01kfssd2vr64yh4dqhch58x36n3aj3hpj5n560f41rsxym69c6qs")) + (base32 "1ka7xsl63v0559fzf3pwc1iqr37gwr4vq5iaxa2hzar2g28hsxvh")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (native-inputs @@ -232,15 +232,7 @@ (define-public pwsafe (display "find_package(GTest) add_subdirectory(src/test)\n" cmake-port) (close cmake-port) - #t))) - (add-after 'add-gtest 'patch-executables - (lambda* (#:key inputs #:allow-other-keys) - (chmod "src/test/OSTest.cpp" #o644) - (substitute* "src/os/unix/media.cpp" - (("/usr/bin/file") - (string-append (assoc-ref inputs "file") - "/bin/file"))) - #t))))) + #t)))))) (synopsis "Password safe with automatic input and key generation") (description "pwsafe is a password manager originally designed by Bruce Schneier. It offers a simple UI to manage passwords for different services. -- cgit v1.2.3 From e1e9baf22f57b2926859a6d3d29ecb6875233162 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 10 Jun 2020 16:19:57 +0300 Subject: gnu: qtpass: Update to 1.3.2. * gnu/packages/password-utils.scm (qtpass): Update to 1.3.2. --- gnu/packages/password-utils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/password-utils.scm') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index a59fb9dc75..8e1339eb85 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -581,7 +581,7 @@ (define-public pass-otp (define-public qtpass (package (name "qtpass") - (version "1.2.3") + (version "1.3.2") (source (origin (method git-fetch) @@ -591,7 +591,7 @@ (define-public qtpass (file-name (git-file-name name version)) (sha256 (base32 - "1vfhfyccrxq9snyvayqfzm5rqik8ny2gysyv7nipc91kvhq3bhky")))) + "0748hjvhjrybi33ci3c8hcr74k9pdrf5jv8npf9hrsrmdyy1kr9x")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 73d9caba79b63e8ac714b8b851b7ae92a3878eca Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 10 Jun 2020 16:21:18 +0300 Subject: gnu: qtpass: Wrap binary. * gnu/packages/password-utils.scm (qtpass)[arguments]: Import qt-utils modules. Add phase to wrap qtpass binary. --- gnu/packages/password-utils.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu/packages/password-utils.scm') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 8e1339eb85..6bd1e94c91 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -594,7 +594,12 @@ (define-public qtpass "0748hjvhjrybi33ci3c8hcr74k9pdrf5jv8npf9hrsrmdyy1kr9x")))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:modules ((guix build gnu-build-system) + (guix build qt-utils) + (guix build utils)) + #:imported-modules (,@%gnu-build-system-modules + (guix build qt-utils)) + #:phases (modify-phases %standard-phases (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) @@ -630,6 +635,10 @@ (define-public qtpass (string-append icons "/qtpass-icon.svg")) (install-file "qtpass.1" man) #t))) + (add-after 'install 'wrap-qt + (lambda* (#:key outputs #:allow-other-keys) + (wrap-qt-program (assoc-ref outputs "out") "qtpass") + #t)) (add-before 'check 'check-setup ;; Make Qt render "offscreen", required for tests. (lambda _ -- cgit v1.2.3