rebase mutt-kz on master, as requested in:

https://github.com/NixOS/nixpkgs/pull/6836

pkgs/applications/networking/mailreaders/mutt-kz/default.nix

@@ -0,0 +1,64 @@
+{ stdenv, fetchurl, ncurses, which, perl, autoreconfHook, autoconf, automake, notmuch
+, sslSupport ? true
+, imapSupport ? true
+, headerCache ? true
+, saslSupport ? true
+, gpgmeSupport ? true
+, gdbm ? null
+, openssl ? null
+, cyrus_sasl ? null
+, gpgme ? null
+}:
+
+assert headerCache -> gdbm != null;
+assert sslSupport -> openssl != null;
+assert saslSupport -> cyrus_sasl != null;
+assert gpgmeSupport -> gpgme != null;
+
+let
+  version = "1.5.23.1-rc1";
+in
+stdenv.mkDerivation rec {
+  name = "mutt-kz-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/karelzak/mutt-kz/archive/v${version}.tar.gz";
+    sha256 = "1m4bnn8psyrx2wy8ribannmp5qf75lv1gz116plji2z37z015zny";
+  };
+
+  buildInputs = with stdenv.lib;
+    [ ncurses which perl autoreconfHook autoconf automake notmuch]
+    ++ optional headerCache gdbm
+    ++ optional sslSupport openssl
+    ++ optional saslSupport cyrus_sasl
+    ++ optional gpgmeSupport gpgme;
+
+configureFlags = [
+    "--with-mailpath=" "--enable-smtp"
+
+    # This allows calls with "-d N", that output debug info into ~/.muttdebug*
+    "--enable-debug"
+
+    "--enable-pop" "--enable-imap"
+
+    "--enable-notmuch"
+
+    # The next allows building mutt without having anything setgid
+    # set by the installer, and removing the need for the group 'mail'
+    # I set the value 'mailbox' because it is a default in the configure script
+    "--with-homespool=mailbox"
+    (if headerCache then "--enable-hcache" else "--disable-hcache")
+    (if sslSupport then "--with-ssl" else "--without-ssl")
+    (if imapSupport then "--enable-imap" else "--disable-imap")
+    (if saslSupport then "--with-sasl" else "--without-sasl")
+    (if gpgmeSupport then "--enable-gpgme" else "--disable-gpgme")
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A small but very powerful text-based mail client, forked to support notmuch";
+    homepage = https://github.com/karelzak/mutt-kz/;
+    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ magnetophon ];
+  };
+}

pkgs/top-level/all-packages.nix

@@ -11194,6 +11194,8 @@ let
     withSidebar = true;
   };
 
+  mutt-kz = callPackage ../applications/networking/mailreaders/mutt-kz { };
+
   panamax_api = callPackage ../applications/networking/cluster/panamax/api {
     ruby = ruby_2_1;
   };