Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0ddae82e6a63
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 15c05c6c1583
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 26, 2019

  1. 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.
    @dtzWill
    dtzWill committed Mar 26, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    5c280ce View commit details

  2. Merge pull request #58388 from dtzWill/update/gpgme-1.13.0 

    gpgme: 1.12.0 -> 1.13.0
    @dtzWill
    dtzWill authored Mar 26, 2019
    Copy the full SHA
    15c05c6 View commit details
Showing with 3 additions and 13 deletions.
  1. +3 −13 pkgs/development/libraries/gpgme/default.nix
16 changes: 3 additions & 13 deletions pkgs/development/libraries/gpgme/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
'';