diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-03-21 22:16:02 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-21 22:16:02 +0100 |
| commit | d19b14c8349ce8cacb62619ab68953265daeeca7 (patch) | |
| tree | 9aacc6f9378ca69951c87232b3a7526fef2f2054 /gnu/packages/gnupg.scm | |
| parent | 680b56116a4840a281a45cb130fd45d6d3d46c56 (diff) | |
| parent | ee4c927f33a1d3b01cf36be3c74227f6b7fd69ff (diff) | |
| download | guix-patches-d19b14c8349ce8cacb62619ab68953265daeeca7.tar guix-patches-d19b14c8349ce8cacb62619ab68953265daeeca7.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/gnupg.scm')
| -rw-r--r-- | gnu/packages/gnupg.scm | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index c22eb57fc7..e1abcc1c83 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Petter <petter@mykolab.ch> -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> @@ -251,14 +251,14 @@ compatible to GNU Pth.") (define-public gnupg (package (name "gnupg") - (version "2.2.19") + (version "2.2.20") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gnupg/gnupg-" version ".tar.bz2")) (sha256 (base32 - "1h6yx6sdpz3lf9gdppgxqcf73baynr8gflmh43286fkgw3058994")))) + "0c6a4v9p6qzhsw1pfcwc459bxpc8hma0w9z8iqb9khvligack9q4")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -404,6 +404,15 @@ libskba (working with X.509 certificates and CMS data).") (sha256 (base32 "0imyjfryvvjdbai454p70zcr95m94j9xnzywrlilqdw2fqi0pqy4")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'disable-failing-test + ;; XXX gnupg@2.2.20 breaks the expected JSON response for this test. + (lambda _ + (substitute* "tests/json/t-json.c" + (("\"t-keylist-secret\", ") "")) + #t))))) (native-inputs `(("gnupg" ,gnupg))) (propagated-inputs @@ -1003,6 +1012,16 @@ however, pgpdump produces more detailed and easier to understand output.") (base32 "1cbpc45f8qbdkd62p12s3q2rdq6fa5xdzwmcwd3xrj55bzkspnwm")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gnupg (assoc-ref inputs "gnupg"))) + (wrap-program (string-append out "/bin/gpa") + `("PATH" ":" prefix (,(string-append gnupg "/bin")))) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs |