diff options
author | Florian Friesdorf <flo@chaoflow.net> | 2012-01-21 18:29:14 +0000 |
---|---|---|
committer | Florian Friesdorf <flo@chaoflow.net> | 2012-01-21 18:29:14 +0000 |
commit | 364f1ce3f78ca2582debe0571b8251f9fd24c00d (patch) | |
tree | 01f30232a6fcf0da47225cbea8f54d50585f336e | |
parent | a8a8f5df23bbc441cd9909b336a844627a8370b5 (diff) | |
download | nixpkgs-364f1ce3f78ca2582debe0571b8251f9fd24c00d.tar nixpkgs-364f1ce3f78ca2582debe0571b8251f9fd24c00d.tar.gz nixpkgs-364f1ce3f78ca2582debe0571b8251f9fd24c00d.tar.bz2 nixpkgs-364f1ce3f78ca2582debe0571b8251f9fd24c00d.tar.lz nixpkgs-364f1ce3f78ca2582debe0571b8251f9fd24c00d.tar.xz nixpkgs-364f1ce3f78ca2582debe0571b8251f9fd24c00d.tar.zst nixpkgs-364f1ce3f78ca2582debe0571b8251f9fd24c00d.zip |
notmuch as emacsPackage and top-level without emacs support
svn path=/nixpkgs/trunk/; revision=31768
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1da2635245..f8dacecb26f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6681,6 +6681,8 @@ let maudeMode = callPackage ../applications/editors/emacs-modes/maude { }; + notmuch = callPackage ../applications/networking/mailreaders/notmuch { }; + nxml = callPackage ../applications/editors/emacs-modes/nxml { }; # This is usually a newer version of Org-Mode than that found in GNU Emacs, so @@ -7246,7 +7248,11 @@ let netsurfBrowser = netsurf.browser; 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 + emacs = null; + }; + notmuchGit = callPackage ../applications/networking/mailreaders/notmuch/git.nix { }; nova = callPackage ../applications/virtualization/nova { }; |