diff options
| author | Pavol Rusnak <pavol@rusnak.io> | 2020-07-27 15:37:35 +0200 |
|---|---|---|
| committer | Pavol Rusnak <pavol@rusnak.io> | 2020-07-27 18:22:26 +0200 |
| commit | e296e89d75ab8aa1d0eed1c3688883a4f7937515 (patch) | |
| tree | a0dfe36ac7ae4e0e25f4ce594afa8bf301f14729 /pkgs/tools/security/gnupg | |
| parent | d489409aaa93cf70b57ad2c4b7986ea0acb78ec0 (diff) | |
gnupg22: 2.2.20 -> 2.2.21
Fix reproducibility by fixing SOURCE_DATE_EPOCH usage
Diffstat (limited to 'pkgs/tools/security/gnupg')
| -rw-r--r-- | pkgs/tools/security/gnupg/22.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 7c095cffa3116..3a99c8eb3f296 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -16,11 +16,11 @@ assert guiSupport -> pinentry != null && enableMinimal == false; stdenv.mkDerivation rec { pname = "gnupg"; - version = "2.2.20"; + version = "2.2.21"; src = fetchurl { url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; - sha256 = "0c6a4v9p6qzhsw1pfcwc459bxpc8hma0w9z8iqb9khvligack9q4"; + sha256 = "1v3nirp9m7yxjkkcdixibckl379pdyr3mdx8b1k379szzdw35s31"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -38,8 +38,10 @@ stdenv.mkDerivation rec { ./accept-subkeys-with-a-good-revocation-but-no-self-sig.patch ]; postPatch = '' - sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' \ - configure doc/dirmngr.texi doc/gnupg.info-1 + sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' configure doc/dirmngr.texi doc/gnupg.info-1 + # Fix broken SOURCE_DATE_EPOCH usage - remove on the next upstream update + sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.am + sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.in '' + stdenv.lib.optionalString ( stdenv.isLinux && pcsclite != null) '' sed -i 's,"libpcsclite\.so[^"]*","${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c ''; #" fix Emacs syntax highlighting :-( |