From 41a4bded9b9fc0ba93be35915e61a2a100c655ea Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 14 Dec 2017 13:37:17 +0100 Subject: [PATCH] gpgme: 1.9.0 -> 1.10.0 I've removed qgpgme-format-security.patch as version 1.10.0 already contains it: git tag --contains=5d4f977dac542340c877fdd4b1304fa8f6e058e6 Everything rebuilds fine so far. Upstream release notes (Noteworthy changes in version 1.10.0): * Now returns more specific error codes for decryption to distinguish between bad passphrase, user canceled, and no secret key. * Now returns key origin information if available. * Added context flag "auto-key-retrieve" to selectively enable the corresponding gpg option. * Added flag is_de_vs to decryption and verify results. * py: Use SEEK_SET as default for data.seek. * cpp: Various new APIs. * Reduced spawn overhead on Linux again. Added new configure option --disable-linux-getdents to disable this feature for very old Linux versions. * Improved the Python bindings build system. * Made the test suite less fragile. --- pkgs/development/libraries/gpgme/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 9773ef8b896..1e59e8f1d65 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -4,21 +4,13 @@ let inherit (stdenv) lib system; in stdenv.mkDerivation rec { - name = "gpgme-1.9.0"; + name = "gpgme-1.10.0"; src = fetchurl { url = "mirror://gnupg/gpgme/${name}.tar.bz2"; - sha256 = "1ssc0gs02r4fasabk7c6v6r865k2j02mpb5g1vkpbmzsigdzwa8v"; + sha256 = "14q619lxbk64vz7lih5gjb928qm28jrnn1h3yhsrrff3jw8yv3qs"; }; - patches = [ - (fetchpatch { - url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff_plain;h=5d4f977dac542340c877fdd4b1304fa8f6e058e6"; - sha256 = "0swpxzd3x3b6h2ry2py9j8l0xp3vdw8rixxhgfavzia5p869qyyx"; - name = "qgpgme-format-security.patch"; - }) - ]; - outputs = [ "out" "dev" "info" ]; outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool