public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #67844 from puckipedia/notmuch

Browse Source 
notmuch: 0.28.4 -> 0.29.1 (and assorted fixes)
This commit is contained in:
Florian Klink 2019-09-01 14:04:13 +02:00 committed by GitHub
commit d4283f47dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -5095,6 +5095,12 @@
githubId = 9568176; githubId = 9568176;
name = "Piotr Halama"; name = "Piotr Halama";
}; };
puckipedia = {
email = "puck@puckipedia.com";
github = "puckipedia";
githubId = 488734;
name = "Puck Meerburg";
};
puffnfresh = { puffnfresh = {
email = "brian@brianmckenna.org"; email = "brian@brianmckenna.org";
github = "puffnfresh"; github = "puffnfresh";

22
pkgs/applications/networking/mailreaders/notmuch/default.nix
View File

@ -12,7 +12,7 @@
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.28.4"; # not really, git version = "0.29.1";
pname = "notmuch"; pname = "notmuch";
passthru = { passthru = {
@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
}; };
src = fetchurl { src = fetchurl {
url = "https://notmuchmail.org/releases/${pname}-${version}.tar.gz"; url = "https://notmuchmail.org/releases/${pname}-${version}.tar.xz";
sha256 = "1jjnhs4xs4gksvg0a9qn68rxrj41im5bh58snka2pkj20nxwmcds"; sha256 = "0rg3rwghd3wivf3bmqcqpkkd5c779ld5hi363zjcw5fl6a7gqilq";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
@ -40,16 +40,12 @@ stdenv.mkDerivation rec {
patchShebangs configure patchShebangs configure
patchShebangs test/ patchShebangs test/
for src in \
util/crypto.c \
notmuch-config.c
do
substituteInPlace "$src" \
--replace \"gpg\" \"${gnupg}/bin/gpg\"
done
substituteInPlace lib/Makefile.local \ substituteInPlace lib/Makefile.local \
--replace '-install_name $(libdir)' "-install_name $out/lib" --replace '-install_name $(libdir)' "-install_name $out/lib"
substituteInPlace emacs/notmuch-emacs-mua \
--replace 'EMACS:-emacs' 'EMACS:-${emacs}/bin/emacs' \
--replace 'EMACSCLIENT:-emacsclient' 'EMACSCLIENT:-${emacs}/bin/emacsclient'
''; '';
configureFlags = [ "--zshcompletiondir=${placeholder "out"}/share/zsh/site-functions" ]; configureFlags = [ "--zshcompletiondir=${placeholder "out"}/share/zsh/site-functions" ];
@ -68,7 +64,7 @@ stdenv.mkDerivation rec {
in '' in ''
ln -s ${test-database} test/test-databases/database-v1.tar.xz ln -s ${test-database} test/test-databases/database-v1.tar.xz
''; '';
doCheck = !stdenv.hostPlatform.isDarwin && (versionAtLeast gmime.version "3.0"); doCheck = !stdenv.hostPlatform.isDarwin && (versionAtLeast gmime.version "3.0.3");
checkTarget = "test"; checkTarget = "test";
checkInputs = [ checkInputs = [
which dtach openssl bash which dtach openssl bash
@ -83,7 +79,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; [ flokli the-kenny ]; maintainers = with maintainers; [ flokli puckipedia the-kenny ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }