alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Pull requests Activity

Merge pull request #23386 from lsix/update_gnupg21

Browse source 
gnupg21: 2.1.18 -> 2.1.19
This commit is contained in:
Graham Christensen 2017-03-06 09:03:18 -05:00 • committed by GitHub
commit 33b738be44
2 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/libgpg-error/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libgpg-error-${version}"; name = "libgpg-error-${version}";
version = "1.26"; version = "1.27";
src = fetchurl { src = fetchurl {
url = "mirror://gnupg/libgpg-error/${name}.tar.bz2"; url = "mirror://gnupg/libgpg-error/${name}.tar.bz2";
sha256 = "0sgfia0syq78k1c9h10rkhc1nfv5v097icrprlx2x4qn074wnjsc"; sha256 = "1li95ni122fzinzlmxbln63nmgij63irxfvi52ws4zfbzv3am4sg";
}; };
postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure"; postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure";

15
pkgs/tools/security/gnupg/21.nix
View file

@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnupg-${version}"; name = "gnupg-${version}";
version = "2.1.18"; version = "2.1.19";
src = fetchurl { src = fetchurl {
url = "mirror://gnupg/gnupg/${name}.tar.bz2"; url = "mirror://gnupg/gnupg/${name}.tar.bz2";
sha256 = "157rrv3ly9j2k0acz43nhiba5hfl6h7048jvj55wwqjmgsmnyk6h"; sha256 = "1w4vccmb5l50lm4yrz9vkdj7whbfvzx543r55362kkj1aqgyvk26";
}; };
buildInputs = [ buildInputs = [
@ -31,17 +31,6 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./fix-libusb-include-path.patch ./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 '' postPatch = stdenv.lib.optionalString stdenv.isLinux ''
sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c