diff options
Diffstat (limited to 'gnu/packages/gnupg.scm')
| -rw-r--r-- | gnu/packages/gnupg.scm | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index ed89b2661b..f71c627781 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -65,6 +65,7 @@ #:use-module (gnu packages tls) #:use-module (gnu packages tor) #:use-module (gnu packages web) + #:use-module (gnu packages xorg) #:use-module (gnu packages xml) #:use-module (guix packages) #:use-module (guix download) @@ -995,7 +996,7 @@ files, to verify signatures, and to manage the private and public keys.") (define-public parcimonie (package (name "parcimonie") - (version "0.10.3") + (version "0.11.0") (source (origin (method url-fetch) (uri (string-append "https://gaffer.boum.org/intrigeri/files/" @@ -1003,10 +1004,10 @@ files, to verify signatures, and to manage the private and public keys.") version ".tar.gz")) (sha256 (base32 - "1kf891117s1f3k6lxvbjdb21va9gxh29vlp9bd664ssgw266rcyb")))) + "14pvapvzrxh1yh8zgcj1llmc2dd8g1fgzskxlja21gmw8c88aqdk")))) (build-system perl-build-system) (inputs - `(("gnupg" ,gnupg-1) ; This is the version used by perl-gnupg-interface + `(("gnupg" ,gnupg) ("perl-config-general" ,perl-config-general) ("perl-clone" ,perl-clone) ("perl-data" ,perl-data) @@ -1026,10 +1027,12 @@ files, to verify signatures, and to manage the private and public keys.") ("perl-moox-handlesvia" ,perl-moox-handlesvia) ("perl-moox-late" ,perl-moox-late) ("perl-moox-options" ,perl-moox-options) + ("perl-moox-strictconstructor" ,perl-moox-strictconstructor) ("perl-namespace-clean" ,perl-namespace-clean) ("perl-net-dbus" ,perl-net-dbus) ("perl-net-dbus-glib" ,perl-net-dbus-glib) ("perl-path-tiny" ,perl-path-tiny) + ("perl-strictures" ,perl-strictures-2) ("perl-test-most" ,perl-test-most) ("perl-test-trap" ,perl-test-trap) ("perl-time-duration" ,perl-time-duration) @@ -1041,24 +1044,29 @@ files, to verify signatures, and to manage the private and public keys.") ("perl-xml-parser" ,perl-xml-parser) ("perl-xml-twig" ,perl-xml-twig) ("torsocks" ,torsocks))) + (native-inputs + `(("xorg-server" ,xorg-server))) (arguments `(#:phases (modify-phases %standard-phases ;; Needed for using gpg-connect-agent during tests. - (add-before 'check 'set-HOME - (lambda _ (setenv "HOME" "/tmp") #t)) + (add-before 'check 'prepare-for-tests + (lambda* (#:key inputs #:allow-other-keys) + (let ((xorg-server (assoc-ref inputs "xorg-server"))) + (system (string-append xorg-server "/bin/Xvfb :1 &")) + (setenv "DISPLAY" ":1") + (setenv "HOME" "/tmp") + ;; These tests are known to fail + (delete-file "t/32-keyserver_defined_on_command_line.t") + (delete-file "t/33-checkGpgHasDefinedKeyserver.t") + ;; The applet is deprecated upstream. + (delete-file "t/00-load_all.t") + #t))) (add-before 'install 'fix-references (lambda* (#:key inputs outputs #:allow-other-keys) (substitute* "lib/App/Parcimonie/GnuPG/Interface.pm" - (("gpg2") "gpg") ;; Skip check whether dependencies are in the PATH - (("defined which.*") "") - (("call\\('parcimonie-torified-gpg'\\)") - (string-append "call('" (assoc-ref outputs "out") - "/bin/parcimonie-torified-gpg')"))) - (substitute* "bin/parcimonie-torified-gpg" - (("torsocks") (string-append (assoc-ref inputs "torsocks") - "/bin/torsocks"))) + (("defined which.*") "")) #t)) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) |