From a838003c323c8910f479a75d070b880695d9a294 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 13 Oct 2018 00:04:15 -0500 Subject: [PATCH 1/2] notmuch: 0.27 -> 0.28 https://notmuchmail.org/pipermail/notmuch/2018/027128.html --- .../applications/networking/mailreaders/notmuch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 2d1b6ee1530..9db9782e2ed 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.27"; + version = "0.28"; name = "notmuch-${version}"; passthru = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "0xh8vq2sa7r07xb3n13drc6gdiqhcgl0pj0za5xj43qkiwpikls0"; + sha256 = "0dqarmjc8544m2w7bqrqmvsfy55fw82707z3lz9cql8nr777bjmc"; }; nativeBuildInputs = [ pkgconfig ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { doxygen perl # (optional) api docs pythonPackages.sphinx pythonPackages.python # (optional) documentation -> doc/INSTALL bash-completion # (optional) dependency to install bash completion - emacs # (optional) to byte compile emacs code + emacs # (optional) to byte compile emacs code, also needed for tests ruby # (optional) ruby bindings which dtach openssl bash # test dependencies ] From 13f3021bbbddd060eb92672d570c2a87fda65795 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 13 Oct 2018 00:17:22 -0500 Subject: [PATCH 2/2] notmuch: fix zsh completions by specifying dir to use --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 9db9782e2ed..c2c5d18e2f0 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -56,6 +56,8 @@ stdenv.mkDerivation rec { done ''; + configureFlags = [ "--zshcompletiondir=$(out)/share/zsh/site-functions" ]; + # Notmuch doesn't use autoconf and consequently doesn't tag --bindir and # friends setOutputFlags = false;