diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-26 15:27:03 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-26 15:27:03 +0000 |
commit | 5b132f6e96a9794018ae1c085da482b381d1e039 (patch) | |
tree | ff54ae514799540c093adcfeca0d501b75cde506 /pkgs/applications/networking/mailreaders | |
parent | f878980c8b78a639b3feabd1f8f9ed9f1b7c388c (diff) | |
parent | d9de74edd67f7dc31f5297bc785712afb322dbdd (diff) |
svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug) svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
Diffstat (limited to 'pkgs/applications/networking/mailreaders')
-rw-r--r-- | pkgs/applications/networking/mailreaders/notmuch/default.nix | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 9cf5909575b9c..dc4c0531031c5 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -1,41 +1,51 @@ -{ fetchurl, stdenv, bash, emacs, gdb, git, glib, gmime, gnupg1, pkgconfig, talloc, xapian }: +{ fetchurl, stdenv, bash, emacs, gdb, glib, gmime, gnupg1, + pkgconfig, talloc, xapian +}: stdenv.mkDerivation rec { - name = "notmuch-0.9"; + name = "notmuch-0.11"; src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "e6f1046941d2894d143cb7c19d4810f97946f98742f6d9b8a7208ddb858c57e4"; + sha256 = "ce062b31db6868babaf3088adee95bfd1030b2691493e815da1730dd262226c0"; }; - buildInputs = [ bash emacs gdb git glib gmime gnupg1 pkgconfig talloc xapian ]; + buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ]; patchPhase = '' (cd test && for prg in \ aggregate-results.sh \ + argument-parsing \ atomicity \ author-order \ basic \ crypto \ + count \ dump-restore \ emacs \ emacs-large-search-buffer \ encoding \ from-guessing \ + help-test \ + hooks \ json \ long-id \ maildir-sync \ + multipart \ new \ notmuch-test \ + python \ raw \ reply \ search \ search-by-folder \ search-insufficient-from-quoting \ search-folder-coherence \ + search-limiting \ search-output \ search-position-overlap-bug \ symbol-hiding \ + tagging \ test-lib.sh \ test-verbose \ thread-naming \ @@ -47,15 +57,16 @@ stdenv.mkDerivation rec { done) ''; - postBuild = '' - make test - ''; + # XXX: emacs tests broken + #postBuild = '' + # make test + #''; meta = { description = "Notmuch -- The mail indexer"; longDescription = ""; license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.chaoflow ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + maintainers = with stdenv.lib.maintainers; [ chaoflow ]; + platforms = stdenv.lib.platforms.gnu; }; } |