pyrox.dev
lol
Merge pull request #159604 from stigtsp/package/gnupg-2.3.4
gnupg: 2.3.3 -> 2.3.4
authored by
Dmitry Kalinkin
and committed by
GitHub
a522dfbf
2bae93ca
+3
-13
pkgs/tools/security/gnupg/23.nix
+3
-13
pkgs/tools/security/gnupg/23.nix
···
15
15
16
16
stdenv.mkDerivation rec {
17
17
pname = "gnupg";
18
-
version = "2.3.3";
18
+
version = "2.3.4";
19
19
20
20
src = fetchurl {
21
21
url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2";
22
-
sha256 = "0dz9x0r5021bhk1kjh29m1q13xbslwb8yn9qzcp7b9m1lrnvi2ap";
22
+
sha256 = "sha256-80aOyvsdf5rXtR/R23rr8XzridLvqKBc8vObTUBUAq4=";
23
23
};
24
24
25
25
depsBuildBuild = [ buildPackages.stdenv.cc ];
···
34
34
./tests-add-test-cases-for-import-without-uid.patch
35
35
./allow-import-of-previously-known-keys-even-without-UI.patch
36
36
./accept-subkeys-with-a-good-revocation-but-no-self-sig.patch
37
-
] ++ lib.optional stdenv.isDarwin [
38
-
# Remove an innocent warning printed on systems without procfs
39
-
# https://dev.gnupg.org/T5656
40
-
(fetchpatch {
41
-
url = "https://raw.githubusercontent.com/Homebrew/formula-patches/890be5f6af88e7913d177af87a50129049e681bb/gnupg/2.3.3-proc-error.patch";
42
-
sha256 = "sha256-oiTa7Nf+AEmhZ683CJEaCb559PXJ6RpSSgRLpxz4CKU=";
43
-
})
44
37
];
45
38
postPatch = ''
46
-
sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' configure doc/dirmngr.texi doc/gnupg.info-1
47
-
# Fix broken SOURCE_DATE_EPOCH usage - remove on the next upstream update
48
-
sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.am
49
-
sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.in
39
+
sed -i 's,\(hkps\|https\)://keyserver.ubuntu.com,hkps://keys.openpgp.org,g' configure configure.ac doc/dirmngr.texi doc/gnupg.info-1
50
40
'' + lib.optionalString (stdenv.isLinux && pcsclite != null) ''
51
41
sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
52
42
'';