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

Merge pull request #18753 from rnhmjoj/mutt 

mutt: 1.6.2 -> 1.7.0
This commit is contained in:
Joachim F 2016-09-20 14:33:22 +02:00 committed by GitHub
parent 3cb6f522db 5c0e73e860
commit f6ce8894dd
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/applications/networking/mailreaders/mutt/default.nix
View File

@ -1,16 +1,14 @@
{ stdenv, fetchurl, fetchpatch, ncurses, which, perl, autoreconfHook { stdenv, fetchurl, ncurses, which, perl
, gdbm ? null , gdbm ? null
, openssl ? null , openssl ? null
, cyrus_sasl ? null , cyrus_sasl ? null
, gpgme ? null , gpgme ? null
, aclocal ? null
, headerCache ? true , headerCache ? true
, sslSupport ? true , sslSupport ? true
, saslSupport ? true , saslSupport ? true
, gpgmeSupport ? true , gpgmeSupport ? true
, imapSupport ? true , imapSupport ? true
, withSidebar ? false , withSidebar ? true
, withTrash ? false
}: }:
assert headerCache -> gdbm != null; assert headerCache -> gdbm != null;
@ -22,11 +20,11 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mutt-${version}"; name = "mutt-${version}";
version = "1.6.2"; version = "1.7.0";
src = fetchurl { src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz";
sha256 = "13hxmji7v9m2agmvzrs7gzx8s3c9jiwrv7pbkr7z1kc6ckq2xl65"; sha256 = "0idkamdiwj9fgqaz1vzkfg78cnmkzp74skv0ibw2xjfq6ds9hghx";
}; };
buildInputs = buildInputs =
@ -34,8 +32,7 @@ stdenv.mkDerivation rec {
++ optional headerCache gdbm ++ optional headerCache gdbm
++ optional sslSupport openssl ++ optional sslSupport openssl
++ optional saslSupport cyrus_sasl ++ optional saslSupport cyrus_sasl
++ optional gpgmeSupport gpgme ++ optional gpgmeSupport gpgme;
++ optional withSidebar autoreconfHook;
configureFlags = [ configureFlags = [
(enableFeature headerCache "hcache") (enableFeature headerCache "hcache")
@ -60,18 +57,6 @@ stdenv.mkDerivation rec {
] ++ optional sslSupport "--with-ssl" ] ++ optional sslSupport "--with-ssl"
++ optional saslSupport "--with-sasl"; ++ optional saslSupport "--with-sasl";
patches =
optional withTrash (fetchpatch {
name = "trash.patch";
url = "https://aur.archlinux.org/cgit/aur.git/plain/trash.patch?h=mutt-sidebar";
sha256 = "1hrib9jk28mqd02nzv0sx01jfdabzvnwcc5qjc3810zfglzc1nql";
}) ++
optional withSidebar (fetchpatch {
name = "sidebar.patch";
url = "https://aur.archlinux.org/cgit/aur.git/plain/sidebar.patch?h=mutt-sidebar";
sha256 = "1l63wj7kw41jrh00mcxdw4p4vrbc9wld42s99liw8kz2aclymq5m";
});
meta = { meta = {
description = "A small but very powerful text-based mail client"; description = "A small but very powerful text-based mail client";
homepage = http://www.mutt.org; homepage = http://www.mutt.org;