@@ -12,7 +12,7 @@
1212with stdenv.lib;
1313
1414stdenv.mkDerivation rec {
15− version = "0.28.4"; # not really, git
15+ version = "0.29.1";
1616 pname = "notmuch";
1717
1818 passthru = {
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
2121 };
2222
2323 src = fetchurl {
24− url = "https://notmuchmail.org/releases/${pname}-${version}.tar.gz";
25− sha256 = "1jjnhs4xs4gksvg0a9qn68rxrj41im5bh58snka2pkj20nxwmcds";
24+ url = "https://notmuchmail.org/releases/${pname}-${version}.tar.xz";
25+ sha256 = "0rg3rwghd3wivf3bmqcqpkkd5c779ld5hi363zjcw5fl6a7gqilq";
2626 };
2727
2828 nativeBuildInputs = [ pkgconfig ];
@@ -40,16 +40,12 @@ stdenv.mkDerivation rec {
4040 patchShebangs configure
4141 patchShebangs test/
4242
43− for src in \
44− util/crypto.c \
45− notmuch-config.c
46− do
47− substituteInPlace "$src" \
48− --replace \"gpg\" \"${gnupg}/bin/gpg\"
49− done
50−
5143 substituteInPlace lib/Makefile.local \
5244 --replace '-install_name $(libdir)' "-install_name $out/lib"
45+
46+ substituteInPlace emacs/notmuch-emacs-mua \
47+ --replace 'EMACS:-emacs' 'EMACS:-${emacs}/bin/emacs' \
48+ --replace 'EMACSCLIENT:-emacsclient' 'EMACSCLIENT:-${emacs}/bin/emacsclient'
5349 '';
5450
5551 configureFlags = [ "--zshcompletiondir=${placeholder "out"}/share/zsh/site-functions" ];
@@ -68,7 +64,7 @@ stdenv.mkDerivation rec {
6864 in ''
6965 ln -s ${test-database} test/test-databases/database-v1.tar.xz
7066 '';
71− doCheck = !stdenv.hostPlatform.isDarwin && (versionAtLeast gmime.version "3.0");
67+ doCheck = !stdenv.hostPlatform.isDarwin && (versionAtLeast gmime.version "3.0.3");
7268 checkTarget = "test";
7369 checkInputs = [
7470 which dtach openssl bash
@@ -83,7 +79,7 @@ stdenv.mkDerivation rec {
8379 description = "Mail indexer";
8480 homepage = https://notmuchmail.org/;
8581 license = licenses.gpl3;
86− maintainers = with maintainers; [ flokli the-kenny ];
82+ maintainers = with maintainers; [ flokli puckipedia the-kenny ];
8783 platforms = platforms.unix;
8884 };
8985}