From 5c31f4aa7c11fcf720c0ce0e26d55788e2df1044 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 28 Sep 2016 13:57:21 +0200 Subject: gnu: Remove python-setuptools and python2-setuptools from inputs (part 4a) This patch contains the changes for all modules beside python.scm where setuptools are used in an inherited package and removing this input also removes the need for inheriting the package. This is the case if adding setuptools in the inherited package was the only change. Change this to not inherit and remove the new needless call to "strip-python2-variant (if applicable). * gnu/packages/bioinformatics.scm (python-biopython, python2-biopython, python-twobitreader, python2-twobitreader, python-plastid, python2-plastid, python2-pybigwig, python2-screed, sra-tools): No longer "inherit" Python 2 packages inheriting from a Python 3 package if the sole reason for inheriting was adding python-setuptools respective python2-setuptools to [inputs], [native-inputs] or [propagated-inputs]. Remove now needless [properties] "python2-variant" where applicable. * gnu/packages/django.scm (python-pytest-django, python2-pytest-django, python-django-filter, python2-django-filter): Likewise. * gnu/packages/gnupg.scm (python2-pygpgme): Likewise. * gnu/packages/mail.scm (python-mailmanclient, python2-mailmanclient): Likewise. * gnu/packages/mpd.scm (python-msp, python2-mpd2): Likewise. * gnu/packages/music.scm (python-pylast, python2-pylast): Likewise. * gnu/packages/openstack.scm (python-requests-mock, python2-requests-mock, python2-git-review): Likewise. * gnu/packages/password-utils.scm (python2-bcrypt): Likewise. * gnu/packages/protobuf.scm (python-protobuf, python2-protobuf): Likewise. * gnu/packages/statistics.scm (python-patsy, python2-patsy): Likewise. * gnu/packages/web.scm (python2-feedparser): Likewise. --- gnu/packages/gnupg.scm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'gnu/packages/gnupg.scm') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 82932489de..b160d04ff7 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -417,12 +417,7 @@ decrypt messages using the OpenPGP format by making use of GPGME.") (license license:lgpl2.1+))) (define-public python2-pygpgme - (let ((base (package-with-python2 python-pygpgme))) - (package - (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-pygpgme)) (define-public python-gnupg (package -- cgit v1.2.3 From 402efb61d3c3bf362b260baa83a50c58bc93986e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 17 Dec 2016 00:57:39 -0500 Subject: gnu: npth: Update to 1.3. * gnu/packages/gnupg.scm (npth): Update to 1.3. --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnupg.scm') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 1e9d814889..6fdddebef5 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -188,7 +188,7 @@ specifications are building blocks of S/MIME and TLS.") (define-public npth (package (name "npth") - (version "1.2") + (version "1.3") (source (origin (method url-fetch) @@ -197,7 +197,7 @@ specifications are building blocks of S/MIME and TLS.") version ".tar.bz2")) (sha256 (base32 - "12n0nvhw4fzwp0k7gjv3rc6pdml0qiinbbfiz4ilg6pl5kdxvnvd")))) + "0am86vblapwz84254qpmhz0chk70g6qzh3wdxcs0gvba8d01ka5w")))) (build-system gnu-build-system) (home-page "https://www.gnupg.org") (synopsis "Non-preemptive thread library") -- cgit v1.2.3 From 9b1d77f6d4e939188be4556cda0cddadc1ff4b88 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 17 Dec 2016 00:58:45 -0500 Subject: gnu: pinentry: Update to 1.0.0. * gnu/packages/gnupg.scm (pinentry-tty, pinentry-gtk2, pinentry-gnome3, pinentry-qt): Update to 1.0.0. --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnupg.scm') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 6fdddebef5..2d769c88df 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -585,14 +585,14 @@ including tools for signing keys, keyring analysis, and party preparation. (define-public pinentry-tty (package (name "pinentry-tty") - (version "0.9.7") + (version "1.0.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/pinentry/pinentry-" version ".tar.bz2")) (sha256 (base32 - "1cp7wjqr6nx31mdclr61s2h84ijqjl0ph99kgj4vyawpjj1j1633")))) + "0ni7g4plq6x78p32al7m8h2zsakvg1rhfz0qbc3kdc7yq7nw4whn")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--enable-pinentry-tty"))) -- cgit v1.2.3 From 06fcd4a89ebbdf589fb49d860406e5aa7eb9bd75 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 20 Dec 2016 15:48:24 +0100 Subject: gnu: gnupg: Update to 2.1.17. * gnu/packages/gnupg.scm (gnupg): Update to 2.1.17. --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnupg.scm') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 2d769c88df..76a684de8c 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -213,14 +213,14 @@ compatible to GNU Pth.") (define-public gnupg (package (name "gnupg") - (version "2.1.16") + (version "2.1.17") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gnupg/gnupg-" version ".tar.bz2")) (sha256 (base32 - "0i483m9q032a0s50f1izb213g4h5i7pcgn395m6hvl3sg2kadfa9")))) + "1js308b46ifx1gim0c9nivr5yxhans7iq1yvkf7zl2928gdm9p65")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From e31d35de3f80a013b8264994e97658305d1c0e80 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 20 Dec 2016 20:19:21 +0200 Subject: gnu: gnupg: Remove unneeded input. * gnu/packages/gnupg.scm (gnupg)[inputs]: Remove adns. --- gnu/packages/gnupg.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages/gnupg.scm') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 76a684de8c..096fcb96f5 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -225,8 +225,7 @@ compatible to GNU Pth.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("adns" ,adns) - ("bzip2" ,bzip2) + `(("bzip2" ,bzip2) ("curl" ,curl) ("gnutls" ,gnutls) ("libassuan" ,libassuan) -- cgit v1.2.3 From 059b3aa9c335041d947cf2b765ab3dab811cfdc5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 22 Dec 2016 14:56:48 +0100 Subject: gnu: gnupg: Fix build on 32-bit architectures. * gnu/packages/patches/gnupg-test-segfault-on-32bit-arch.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/gnupg.scm (gnupg)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/gnupg.scm | 6 +++- .../gnupg-test-segfault-on-32bit-arch.patch | 40 ++++++++++++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gnupg-test-segfault-on-32bit-arch.patch (limited to 'gnu/packages/gnupg.scm') diff --git a/gnu/local.mk b/gnu/local.mk index f55d8e5e74..ee8f1e591f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -588,6 +588,7 @@ dist_patch_DATA = \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnome-tweak-tool-search-paths.patch \ %D%/packages/patches/gnucash-price-quotes-perl.patch \ + %D%/packages/patches/gnupg-test-segfault-on-32bit-arch.patch \ %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ %D%/packages/patches/gobject-introspection-cc.patch \ %D%/packages/patches/gobject-introspection-girepository.patch \ diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 096fcb96f5..5d5a6cdff0 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -220,7 +220,11 @@ compatible to GNU Pth.") ".tar.bz2")) (sha256 (base32 - "1js308b46ifx1gim0c9nivr5yxhans7iq1yvkf7zl2928gdm9p65")))) + "1js308b46ifx1gim0c9nivr5yxhans7iq1yvkf7zl2928gdm9p65")) + (patches + ;; This fixes a test failure on 32bit. Remove for next version. + ;; https://lists.gnu.org/archive/html/guix-devel/2016-12/msg00869.html + (search-patches "gnupg-test-segfault-on-32bit-arch.patch")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/patches/gnupg-test-segfault-on-32bit-arch.patch b/gnu/packages/patches/gnupg-test-segfault-on-32bit-arch.patch new file mode 100644 index 0000000000..79bb41caaa --- /dev/null +++ b/gnu/packages/patches/gnupg-test-segfault-on-32bit-arch.patch @@ -0,0 +1,40 @@ +This fixes a segfault on 32-bit architectures. Upstream discussion: + +https://lists.gnupg.org/pipermail/gnupg-devel/2016-December/032364.html + +Guix thread: https://lists.gnu.org/archive/html/guix-devel/2016-12/msg00631.html + +Patch copied from upstream source repository: + +https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=6e96cdd41a0e55b672309431062f37c4a4a9f485 + +From 6e96cdd41a0e55b672309431062f37c4a4a9f485 Mon Sep 17 00:00:00 2001 +From: Justus Winter +Date: Wed, 21 Dec 2016 16:14:45 +0100 +Subject: [PATCH] gpgscm: Guard use of union member. + +* tests/gpgscm/scheme.c (opexe_5): Check that we have a file port +before accessing filename. Fixes a crash on 32-bit architectures. + +Fixes-commit: e7429b1ced0c69fa7901f888f8dc25f00fc346a4 +Signed-off-by: Justus Winter +--- + tests/gpgscm/scheme.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/gpgscm/scheme.c b/tests/gpgscm/scheme.c +index a5b7691..2844545 100644 +--- a/tests/gpgscm/scheme.c ++++ b/tests/gpgscm/scheme.c +@@ -4838,7 +4838,7 @@ static pointer opexe_5(scheme *sc, enum scheme_opcodes op) { + } else { + sc->nesting_stack[sc->file_i]++; + #if USE_TAGS && SHOW_ERROR_LINE +- { ++ if (sc->load_stack[sc->file_i].kind & port_file) { + const char *filename = + sc->load_stack[sc->file_i].rep.stdio.filename; + int lineno = +-- +2.8.0.rc3 + -- cgit v1.2.3 From 0f391063d9a96fb99d11c2ddbddd040527746bc4 Mon Sep 17 00:00:00 2001 From: Troy Sankey Date: Sat, 24 Dec 2016 22:53:07 -0500 Subject: gnu: pius: Update to 2.2.2-0.891687c. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnupg.scm (pius): Update to 2.2.2-0.891687c. [inputs]: Change GNUPG-2.0 to GNUPG (2.1). Signed-off-by: Ludovic Courtès --- gnu/packages/gnupg.scm | 72 ++++++++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 31 deletions(-) (limited to 'gnu/packages/gnupg.scm') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 5d5a6cdff0..167d9ace8c 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2016 ng0 ;;; Copyright © 2016 Christopher Baines ;;; Copyright © 2016 Mike Gerwitz +;;; Copyright © 2016 Troy Sankey ;;; ;;; This file is part of GNU Guix. ;;; @@ -48,6 +49,7 @@ #:use-module (gnu packages tls) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system python)) @@ -460,35 +462,43 @@ and signature functionality from Python programs.") (package-with-python2 python-gnupg)) (define-public pius - (package - (name "pius") - (version "2.2.2") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/jaymzh/pius/releases/download/v" - version "/pius-" version ".tar.bz2")) - (sha256 - (base32 - "0k94mlr7l12mplph7pdgjbampqha47d8mfjq69n4xm80qwbn1rq1")))) - (build-system python-build-system) - (inputs `(("perl" ,perl) ;for 'pius-party-worksheet' - ("gpg" ,gnupg-2.0))) ;2.1 fails to talk to gpg-agent 2.0 - (arguments - `(#:tests? #f - #:python ,python-2 ;uses the Python 2 'print' syntax - #:phases - (modify-phases %standard-phases - (add-before - 'build 'set-gpg-file-name - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((gpg (string-append (assoc-ref inputs "gpg") - "/bin/gpg"))) - (substitute* "libpius/constants.py" - (("/usr/bin/gpg2") gpg)))))))) - (synopsis "Programs to simplify GnuPG key signing") - (description - "Pius (PGP Individual UID Signer) helps attendees of PGP keysigning + ;; pius 2.2.2 does not work with gpg-agent 2.1, so we take a newer + ;; commit. When a new pius (> 2.2.2) is released, update this package + ;; and delete this message. + ;; More info: https://github.com/jaymzh/pius/issues/46 + (let ((commit "891687ccb3d232a1fc0e7da7d22572c0318644cb") + (base-version "2.2.2")) ; i.e. there were no releases + ; between BASE-VERSION and COMMIT + (package + (name "pius") + (version (string-append base-version "-0." + (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jaymzh/pius.git") + (commit commit))) + (sha256 + (base32 + "0m2na4bnf1rv0zpf404l9ga6pwyf7ijldp4lw5irgh7gkmpllxr3")))) + (build-system python-build-system) + (inputs `(("perl" ,perl) ;for 'pius-party-worksheet' + ("gpg" ,gnupg))) + (arguments + `(#:tests? #f + #:python ,python-2 ;uses the Python 2 'print' syntax + #:phases + (modify-phases %standard-phases + (add-before + 'build 'set-gpg-file-name + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((gpg (string-append (assoc-ref inputs "gpg") + "/bin/gpg"))) + (substitute* "libpius/constants.py" + (("/usr/bin/gpg2") gpg)))))))) + (synopsis "Programs to simplify GnuPG key signing") + (description + "Pius (PGP Individual UID Signer) helps attendees of PGP keysigning parties. It is the main utility and makes it possible to quickly and easily sign each UID on a set of PGP keys. It is designed to take the pain out of the sign-all-the-keys part of PGP Keysigning Party while adding security @@ -496,8 +506,8 @@ to the process. pius-keyring-mgr and pius-party-worksheet help organisers of PGP keysigning parties.") - (license license:gpl2) - (home-page "https://www.phildev.net/pius/index.shtml"))) + (license license:gpl2) + (home-page "https://www.phildev.net/pius/index.shtml")))) (define-public signing-party (package -- cgit v1.2.3 From 9e0f16f23f421fe8e310e2feb654267218394be8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 19 Nov 2016 15:01:16 -0500 Subject: gnu: gpgme: Update to 1.8.0. * gnu/packages/gnupg.scm (gpgme): Update to 1.8.0. [arguments]: Don't set 'GPG=gpg2' in #:configure-flags. GnuPG-2.x is installed as 'gpg' on Guix. --- gnu/packages/gnupg.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gnupg.scm') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 167d9ace8c..4a7b323b43 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -352,7 +352,7 @@ libskba (working with X.509 certificates and CMS data).") (define-public gpgme (package (name "gpgme") - (version "1.6.0") + (version "1.8.0") (source (origin (method url-fetch) @@ -360,7 +360,7 @@ libskba (working with X.509 certificates and CMS data).") ".tar.bz2")) (sha256 (base32 - "17892sclz3yg45wbyqqrzzpq3l0icbnfl28f101b3062g8cy97dh")))) + "0csx3qnycwm0n90ql6gs65if5xi4gqyzzy21fxs2xqicghjrfq2r")))) (build-system gnu-build-system) (propagated-inputs ;; Needs to be propagated because gpgme.h includes gpg-error.h. @@ -368,7 +368,6 @@ libskba (working with X.509 certificates and CMS data).") (inputs `(("gnupg" ,gnupg-2.0) ("libassuan" ,libassuan))) - (arguments '(#:make-flags '("GPG=gpg2"))) (home-page "https://www.gnupg.org/related_software/gpgme/") (synopsis "Library providing simplified access to GnuPG functionality") (description -- cgit v1.2.3 From e3dd1f0cb8b0aaca5665e9c5450354b8cda8a5cf Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 2 Jan 2017 15:21:15 -0500 Subject: gnu: Add python-gpg. * gnu/packages/gnupg.scm (python-gpg, python2-gpg): New variable. --- gnu/packages/gnupg.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages/gnupg.scm') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 4a7b323b43..56fba45e3a 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2016 Christopher Baines ;;; Copyright © 2016 Mike Gerwitz ;;; Copyright © 2016 Troy Sankey +;;; Copyright © 2017 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,6 +47,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages ncurses) #:use-module (gnu packages security-token) + #:use-module (gnu packages swig) #:use-module (gnu packages tls) #:use-module (guix packages) #:use-module (guix download) @@ -382,6 +384,33 @@ instead. This way bug fixes or improvements can be done at a central place and every application benefits from this.") (license license:lgpl2.1+))) +(define-public python-gpg + (package + (name "python-gpg") + (version (package-version gpgme)) + (source (origin + (method url-fetch) + (uri (pypi-uri "gpg" version)) + (sha256 + (base32 + "1x74i6q713c0bckls7rdm8kgsmllf9qvy9x62jghszlhgjkyh9nd")))) + (build-system python-build-system) + (arguments + '(#:tests? #f)) ; No test suite. + (inputs + `(("gpgme" ,gpgme))) + (native-inputs + `(("swig" ,swig))) + (home-page (package-home-page gpgme)) + (synopsis "Python bindings for GPGME GnuPG cryptography library") + (description "This package provides Python bindings to the GPGME GnuPG +cryptographic library. It is developed in the GPGME source code, and then +distributed separately.") + (license license:lgpl2.1+))) + +(define-public python2-gpg + (package-with-python2 python-gpg)) + (define-public python-pygpgme (package (name "python-pygpgme") -- cgit v1.2.3