diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-05-21 13:22:32 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-05-21 13:22:32 -0400 |
| commit | 0661758e133c0384d20043d3526b5ebc794e1f04 (patch) | |
| tree | 46fb6d731fd0e562379ecfffba499deb17847a23 /gnu/packages/gnupg.scm | |
| parent | 539bf8f2c071b53834829259bb3fabf0390c5dc6 (diff) | |
| parent | c036959b1a61c37c9b7d72e655e1441f2feefb6e (diff) | |
| download | gnu-guix-0661758e133c0384d20043d3526b5ebc794e1f04.tar gnu-guix-0661758e133c0384d20043d3526b5ebc794e1f04.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/gnupg.scm')
| -rw-r--r-- | gnu/packages/gnupg.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index c88ed3e520..dbbe8368a8 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> -;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr> +;;; Copyright © 2013, 2015, 2018 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> @@ -592,10 +592,12 @@ signing, decryption, verification, and key-listing parsing.") version "/pius-" version ".tar.bz2")) (sha256 (base32 - "1893hzpx3zv724drqv48csrn0cm98xw4ymb1zmhs2jvjj1778zfj")))) + "1893hzpx3zv724drqv48csrn0cm98xw4ymb1zmhs2jvjj1778zfj")) + (patches (search-patches "pius.patch")))) (build-system python-build-system) (inputs `(("perl" ,perl) ;for 'pius-party-worksheet' - ("gpg" ,gnupg))) + ("gpg" ,gnupg) + ("python-six" ,python2-six))) (arguments `(#:tests? #f #:python ,python-2 ;uses the Python 2 'print' syntax |