diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-07-21 09:28:18 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-07-21 09:28:18 +0200 |
| commit | 16105403bdd843540cbef9c63fc0f16c1c6eaa70 (patch) | |
| tree | bb7f6125599843a8fbbc0cda2609249ad95d0ab5 /pkgs/development | |
| parent | 436c1a938eddd62b498e0cb436ba79c7516ccc47 (diff) | |
gpgme: upstream patch for failing test
Changes cause stdenv rebuild, so for now let's only patch on i686-linux where the test fails: https://hydra.nixos.org/build/148090126 The issue was triggered by the last update (PR #128098).
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/gpgme/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index ccf03ccabdcf2..c8dad069dccc3 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -20,7 +20,14 @@ stdenv.mkDerivation rec { sha256 = "1l4yw9fqc1blvx1sq1jnfvp1jijla3ca2jw90p4x9m8hvfpc933c"; }; - patches = [ + patches = + # TODO: apply unconditionally on a rebuild; probably included in > 1.16.0 + lib.optional (stdenv.is32bit && stdenv.isLinux) (fetchpatch { + name = "test_t-edit-sign.diff"; # we experienced segmentation fault in this test + url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=81a33ea5e1b86d586b956e893a5b25c4cd41c969"; + sha256 = "1xxvv0kc9wdj5hzpddzs3cn8dhmm2cb29224a7h9vairraq5272h"; + }) + ++ [ (fetchpatch { # gpg: Send --with-keygrip when listing keys name = "c4cf527ea227edb468a84bf9b8ce996807bd6992.patch"; url = "http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=c4cf527ea227edb468a84bf9b8ce996807bd6992"; |