mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-29 06:45:54 +03:00
notmuch: Update to 0.19.
This commit also enables manpages.
This commit is contained in:
parent
fdd9d132ca
commit
c227e8f259
@ -1,17 +1,18 @@
|
||||
{ fetchurl, stdenv, bash, emacs, fixDarwinDylibNames,
|
||||
gdb, glib, gmime, gnupg,
|
||||
pkgconfig, talloc, xapian
|
||||
{ fetchurl, stdenv, bash, emacs, fixDarwinDylibNames
|
||||
, gdb, glib, gmime, gnupg
|
||||
, pkgconfig, talloc, xapian
|
||||
, sphinx, python
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "notmuch-0.18.2";
|
||||
name = "notmuch-0.19";
|
||||
|
||||
src = fetchurl {
|
||||
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 ];
|
||||
|
||||
patchPhase = ''
|
||||
@ -29,6 +30,10 @@ stdenv.mkDerivation rec {
|
||||
done
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
make install-man
|
||||
'';
|
||||
|
||||
preFixup = if stdenv.isDarwin then
|
||||
''
|
||||
prg="$out/bin/notmuch"
|
||||
|
@ -9356,7 +9356,7 @@ let
|
||||
|
||||
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 { };
|
||||
|
||||
@ -10290,8 +10290,11 @@ let
|
||||
netsurf = recurseIntoAttrs (import ../applications/networking/browsers/netsurf { inherit pkgs; });
|
||||
|
||||
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;
|
||||
sphinx = pythonPackages.sphinx;
|
||||
};
|
||||
|
||||
nova = callPackage ../applications/virtualization/nova { };
|
||||
|
Loading…
Reference in New Issue
Block a user