diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-08-19 09:48:17 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-08-19 09:56:11 +0200 |
| commit | 46c853dfc225f9ad9bc986dd42dc86515233c8b1 (patch) | |
| tree | 6d0d4ecc6f8568b1fd3c5fcc47df3821bf6648d9 | |
| parent | Merge staging-next-21.05 into staging-21.05 (diff) | |
| download | nixpkgs-46c853dfc225f9ad9bc986dd42dc86515233c8b1.tar.gz | |
Merge #134714: gpgme: move flaky patch URL to local file
(cherry picked from commit 4c88dc6a7035089ab3a311bfd09a790ea3ff5d35)
| -rw-r--r-- | pkgs/development/libraries/gpgme/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/gpgme/fix_gpg_list_keys.diff | 12 |
2 files changed, 14 insertions, 8 deletions
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 09ec32cea549..5b11f014d5fd 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -21,14 +21,8 @@ stdenv.mkDerivation rec { }; patches = [ - (fetchpatch { # gpg: Send --with-keygrip when listing keys - name = "c4cf527ea227edb468a84bf9b8ce996807bd6992.patch"; - urls = [ - "https://files.gnupg.net/file/data/2ufcg7ny5jdnv7hmewb4/PHID-FILE-7iwvryn2btti6txr3bsz/file" - "http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=c4cf527ea227edb468a84bf9b8ce996807bd6992" - ]; - sha256 = "0y0b0lb2nq5p9kx13b59b2jaz157mvflliw1qdvg1v1hynvgb8m4"; - }) + # https://dev.gnupg.org/rMc4cf527ea227edb468a84bf9b8ce996807bd6992 + ./fix_gpg_list_keys.diff # https://lists.gnupg.org/pipermail/gnupg-devel/2020-April/034591.html (fetchpatch { name = "0001-Fix-python-tests-on-non-Linux.patch"; diff --git a/pkgs/development/libraries/gpgme/fix_gpg_list_keys.diff b/pkgs/development/libraries/gpgme/fix_gpg_list_keys.diff new file mode 100644 index 000000000000..bd8da4edd6e0 --- /dev/null +++ b/pkgs/development/libraries/gpgme/fix_gpg_list_keys.diff @@ -0,0 +1,12 @@ +diff --git a/src/engine-gpg.c b/src/engine-gpg.c +index b51ea173..4e74665e 100644 +--- a/src/engine-gpg.c ++++ b/src/engine-gpg.c +@@ -3005,6 +3005,7 @@ gpg_keylist_build_options (engine_gpg_t gpg, int secret_only, + gpg_error_t err; + + err = add_arg (gpg, "--with-colons"); ++ err = add_arg (gpg, "--with-keygrip"); + + /* Since gpg 2.1.15 fingerprints are always printed, thus there is + * no more need to explicitly request them. */
\ No newline at end of file |