Merge pull request #33680 from flokli/notmuch

notmuch: 0.25.3 -> 0.26
This commit is contained in:
Andreas Rammhold 2018-01-10 13:52:07 +00:00 committed by GitHub
commit f77a5ba72b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions

View File

@ -12,7 +12,7 @@
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.25.3"; version = "0.26";
name = "notmuch-${version}"; name = "notmuch-${version}";
passthru = { passthru = {
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "http://notmuchmail.org/releases/${name}.tar.gz"; url = "http://notmuchmail.org/releases/${name}.tar.gz";
sha256 = "1fyx20rjpwbf2j1v5fpa5s0rjnwhcgvijzh2qyinp8rlbh1qxmab"; sha256 = "1pvn1n7giv8n3xlazi3wpscdqhd2yak0fgv68aj23myr5bnr9s6k";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
@ -46,9 +46,8 @@ stdenv.mkDerivation rec {
"{}" ";" "{}" ";"
for src in \ for src in \
crypto.c \ util/crypto.c \
notmuch-config.c \ notmuch-config.c
emacs/notmuch-crypto.el
do do
substituteInPlace "$src" \ substituteInPlace "$src" \
--replace \"gpg\" \"${gnupg}/bin/gpg\" --replace \"gpg\" \"${gnupg}/bin/gpg\"
@ -97,7 +96,7 @@ stdenv.mkDerivation rec {
description = "Mail indexer"; description = "Mail indexer";
homepage = https://notmuchmail.org/; homepage = https://notmuchmail.org/;
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with maintainers; [ chaoflow garbas the-kenny ]; maintainers = with maintainers; [ chaoflow flokli garbas the-kenny ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }