ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-04 01:42:53 +03:00
Code Issues Projects Releases Wiki Activity

notmuch: Update to 0.19.

Browse Source 
This commit also enables manpages.
This commit is contained in:
Moritz Ulrich 2014-11-15 17:58:40 +01:00
parent fdd9d132ca
commit c227e8f259
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/networking/mailreaders/notmuch/default.nix
View File

@ -1,17 +1,18 @@
{ fetchurl, stdenv, bash, emacs, fixDarwinDylibNames, { fetchurl, stdenv, bash, emacs, fixDarwinDylibNames
gdb, glib, gmime, gnupg, , gdb, glib, gmime, gnupg
pkgconfig, talloc, xapian , pkgconfig, talloc, xapian
, sphinx, python
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "notmuch-0.18.2"; name = "notmuch-0.19";
src = fetchurl { src = fetchurl {
url = "http://notmuchmail.org/releases/${name}.tar.gz"; url = "http://notmuchmail.org/releases/${name}.tar.gz";
sha256 = "175wzrw1mfpl4h72n9ims66zn5l34zn2dn857vraj2i5w7z7p7z9"; sha256 = "1szf6c44g209pcjq5nvfhlp3nzcm3lrcwv4spsxmwy13hiaccvrr";
}; };
buildInputs = [ bash emacs gdb glib gmime gnupg pkgconfig talloc xapian ] buildInputs = [ bash emacs gdb glib gmime gnupg pkgconfig talloc xapian sphinx python ]
++ stdenv.lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; ++ stdenv.lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];
patchPhase = '' patchPhase = ''
@ -29,6 +30,10 @@ stdenv.mkDerivation rec {
done done
''; '';
postInstall = ''
make install-man
'';
preFixup = if stdenv.isDarwin then preFixup = if stdenv.isDarwin then
'' ''
prg="$out/bin/notmuch" prg="$out/bin/notmuch"

7
pkgs/top-level/all-packages.nix
View File

@ -9356,7 +9356,7 @@ let
metaweblog = callPackage ../applications/editors/emacs-modes/metaweblog { }; metaweblog = callPackage ../applications/editors/emacs-modes/metaweblog { };
notmuch = lowPrio (callPackage ../applications/networking/mailreaders/notmuch { }); notmuch = lowPrio (pkgs.notmuch.override { inherit emacs; });
ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { }; ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { };
@ -10290,8 +10290,11 @@ let
netsurf = recurseIntoAttrs (import ../applications/networking/browsers/netsurf { inherit pkgs; }); netsurf = recurseIntoAttrs (import ../applications/networking/browsers/netsurf { inherit pkgs; });
notmuch = callPackage ../applications/networking/mailreaders/notmuch { notmuch = callPackage ../applications/networking/mailreaders/notmuch {
# use emacsPackages.notmuch if you want emacs support # No need to build Emacs - notmuch.el works just fine without
# byte-compilation. Use emacs24Packages.notmuch if you want to
# byte-compiled files
emacs = null; emacs = null;
sphinx = pythonPackages.sphinx;
}; };
nova = callPackage ../applications/virtualization/nova { }; nova = callPackage ../applications/virtualization/nova { };