From 5c280ce1e4634b690aea9c7af26f7b68054eca6d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 26 Mar 2019 13:09:17 -0500 Subject: [PATCH] gpgme: 1.12.0 -> 1.13.0 https://lists.gnupg.org/pipermail/gnupg-announce/2019q1/000437.html Drop autoreconfHook and git, otherwise version contains `-unknown` which is unfortunate but also breaks build w/seahorse. --- pkgs/development/libraries/gpgme/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index ed2c3e6b800..98a42aac72a 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan , file, which, ncurses -, autoreconfHook, fetchpatch -, git , texinfo , buildPackages , qtbase ? null @@ -15,11 +13,11 @@ in stdenv.mkDerivation rec { name = "gpgme-${version}"; - version = "1.12.0"; + version = "1.13.0"; src = fetchurl { url = "mirror://gnupg/gpgme/${name}.tar.bz2"; - sha256 = "1n4c1q2ls7sqx1vpr3p5n8vbjkw6kqp8jxqa28p0x9j36wf9bp5l"; + sha256 = "0c6676g0yhfsmy32i1dgwh5cx0ja8vhcqf4k08zad177m53kxcnl"; }; outputs = [ "out" "dev" "info" ]; @@ -29,19 +27,11 @@ stdenv.mkDerivation rec { [ libgpgerror glib libassuan pth ] ++ lib.optional (qtbase != null) qtbase; - nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo ] + nativeBuildInputs = [ file pkgconfig gnupg texinfo ] ++ lib.optionals pythonSupport [ python swig2 which ncurses ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - patches = [ - (fetchpatch { - name = "fix-key-expiry.patch"; - url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=66376f3e206a1aa791d712fb8577bb3490268f60"; - sha256 = "0i777dzcbv4r568l8623ar6y6j44bv46bbxi751qa5mdcihpya02"; - }) - ]; - postPatch ='' substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file '';