diff options
| author | Sarah Brofeldt <sbrofeldt@gmail.com> | 2020-08-06 20:19:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-06 20:19:22 +0200 |
| commit | f2be6bd91a7f2bcbcd625a82f66617b52497161d (patch) | |
| tree | 0b5470c59b0909cc203fb56f830c53126e29fa38 /pkgs/tools/security | |
| parent | 8e0b2b91772ce53f314a9814f22d6f21cba69264 (diff) | |
| parent | e296e89d75ab8aa1d0eed1c3688883a4f7937515 (diff) | |
| download | nixpkgs-f2be6bd91a7f2bcbcd625a82f66617b52497161d.tar nixpkgs-f2be6bd91a7f2bcbcd625a82f66617b52497161d.tar.gz nixpkgs-f2be6bd91a7f2bcbcd625a82f66617b52497161d.tar.bz2 nixpkgs-f2be6bd91a7f2bcbcd625a82f66617b52497161d.tar.lz nixpkgs-f2be6bd91a7f2bcbcd625a82f66617b52497161d.tar.xz nixpkgs-f2be6bd91a7f2bcbcd625a82f66617b52497161d.tar.zst nixpkgs-f2be6bd91a7f2bcbcd625a82f66617b52497161d.zip | |
Merge pull request #93976 from prusnak/gnupg
gnupg22: 2.2.20 -> 2.2.21
Diffstat (limited to 'pkgs/tools/security')
| -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 7c095cffa31..3a99c8eb3f2 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 :-( |