pyrox.dev
Merge pull request #93976 from prusnak/gnupg
gnupg22: 2.2.20 -> 2.2.21
authored by
Sarah Brofeldt
and committed by
GitHub
f2be6bd9
8e0b2b91
+6
-4
pkgs/tools/security/gnupg/22.nix
+6
-4
pkgs/tools/security/gnupg/22.nix
···
16
16
stdenv.mkDerivation rec {
17
17
pname = "gnupg";
18
18
19
-
version = "2.2.20";
19
+
version = "2.2.21";
20
20
21
21
src = fetchurl {
22
22
url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2";
23
-
sha256 = "0c6a4v9p6qzhsw1pfcwc459bxpc8hma0w9z8iqb9khvligack9q4";
23
+
sha256 = "1v3nirp9m7yxjkkcdixibckl379pdyr3mdx8b1k379szzdw35s31";
24
24
};
25
25
26
26
depsBuildBuild = [ buildPackages.stdenv.cc ];
···
38
38
./accept-subkeys-with-a-good-revocation-but-no-self-sig.patch
39
39
];
40
40
postPatch = ''
41
-
sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' \
42
-
configure doc/dirmngr.texi doc/gnupg.info-1
41
+
sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' configure doc/dirmngr.texi doc/gnupg.info-1
42
+
# Fix broken SOURCE_DATE_EPOCH usage - remove on the next upstream update
43
+
sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.am
44
+
sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.in
43
45
'' + stdenv.lib.optionalString ( stdenv.isLinux && pcsclite != null) ''
44
46
sed -i 's,"libpcsclite\.so[^"]*","${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
45
47
''; #" fix Emacs syntax highlighting :-(