nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: gnupg: Update to 2.1.16. 

* gnu/packages/gnupg.scm (gnupg): Update to 2.1.16.
[arguments]: Remove obsolete substitution from 'patch-paths' phase.
Remove 'set-home' phase. Add 'set-gnupg-home' phase.
This commit is contained in:
Leo Famulari 2016-11-19 13:28:16 -05:00
parent 9fff9e6484
commit 764c566221
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/packages/gnupg.scm
View File

@ -213,14 +213,14 @@ compatible to GNU Pth.")
(define-public gnupg (define-public gnupg
(package (package
(name "gnupg") (name "gnupg")
(version "2.1.15") (version "2.1.16")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnupg/gnupg/gnupg-" version (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
".tar.bz2")) ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1pgz02gd84ab94w4xdg67p9z8kvkyr9d523bvcxxd2hviwh1m362")))) "0i483m9q032a0s50f1izb213g4h5i7pcgn395m6hvl3sg2kadfa9"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -245,8 +245,6 @@ compatible to GNU Pth.")
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'patch-paths (add-before 'configure 'patch-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "tests/openpgp/defs.inc"
(("/bin/pwd") (which "pwd")))
(substitute* "scd/scdaemon.c" (substitute* "scd/scdaemon.c"
(("\"(libpcsclite\\.so[^\"]*)\"" _ name) (("\"(libpcsclite\\.so[^\"]*)\"" _ name)
(string-append "\"" (assoc-ref inputs "pcsc-lite") (string-append "\"" (assoc-ref inputs "pcsc-lite")
@ -256,13 +254,12 @@ compatible to GNU Pth.")
(lambda _ (lambda _
(substitute* (find-files "tests" ".\\.scm$") (substitute* (find-files "tests" ".\\.scm$")
(("/usr/bin/env gpgscm") (("/usr/bin/env gpgscm")
(string-append (getcwd) "/tests/gpgscm/gpgscm"))))) (string-append (getcwd) "/tests/gpgscm/gpgscm")))
(add-before 'check 'set-home #t))
;; Some tests require write access to $HOME, otherwise leading to ;; If this variable is undefined, /bin/pwd is invoked.
;; 'failed to create directory /homeless-shelter/.asy' error. (add-before 'check 'set-gnupg-home
;; TODO Try removing this phase for GnuPG 2.1.16.
(lambda _ (lambda _
(setenv "HOME" "/tmp") (setenv "GNUPGHOME" (getcwd))
#t))))) #t)))))
(home-page "https://gnupg.org/") (home-page "https://gnupg.org/")
(synopsis "GNU Privacy Guard") (synopsis "GNU Privacy Guard")