diff options
| author | Lancelot SIX <lsix@lancelotsix.com> | 2017-03-02 10:10:02 +0100 |
|---|---|---|
| committer | Lancelot SIX <lsix@lancelotsix.com> | 2017-03-02 10:10:02 +0100 |
| commit | ade2357c653cbe336d8a7dc17a8dc02099ced432 (patch) | |
| tree | dbf6e4fda5621834de9673ad49e7c76ca34a2f04 | |
| parent | ff9891767f11d1f52b8e970bd145fb4959f2ac42 (diff) | |
gnupg21: 2.1.18 -> 2.1.19
See http://lists.gnu.org/archive/html/info-gnu/2017-03/msg00000.html for release information
| -rw-r--r-- | pkgs/tools/security/gnupg/21.nix | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index f7968e47b1cec..0f021c6b4a125 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.1.18"; + version = "2.1.19"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "157rrv3ly9j2k0acz43nhiba5hfl6h7048jvj55wwqjmgsmnyk6h"; + sha256 = "1w4vccmb5l50lm4yrz9vkdj7whbfvzx543r55362kkj1aqgyvk26"; }; buildInputs = [ @@ -31,17 +31,6 @@ stdenv.mkDerivation rec { patches = [ ./fix-libusb-include-path.patch - # TODO: Remove the following two patches on the next gnupg release after 2.1.18 - (fetchpatch { - name = "scd-Backport-two-fixes-from-master"; - url = "https://anonscm.debian.org/git/pkg-gnupg/gnupg2.git/plain/debian/patches/0028-scd-Backport-two-fixes-from-master.patch?h=debian/2.1.18-6"; - sha256 = "01l2s4s7kp6j2f3qd371arq7pfphvncc9k1m63rqm0kyzy9jk20k"; - }) - (fetchpatch { - name = "scd-Fix-use-case-of-PC-SC"; - url = "https://anonscm.debian.org/git/pkg-gnupg/gnupg2.git/plain/debian/patches/0029-scd-Fix-use-case-of-PC-SC.patch?h=debian/2.1.18-6"; - sha256 = "0lxqj614fialbqs2x0z13q5ikq2rc9xwphmkly179qs03d4mawsz"; - }) ]; postPatch = stdenv.lib.optionalString stdenv.isLinux '' sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c |