Author: chaoflow
Date: Sat Jan 21 18:29:14 2012
New Revision: 31768
URL: https://nixos.org/websvn/nix/?rev=31768&sc=1

Log:
notmuch as emacsPackage and top-level without emacs support

Modified:
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix       Sat Jan 21 18:29:11 
2012        (r31767)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix       Sat Jan 21 18:29:14 
2012        (r31768)
@@ -6681,6 +6681,8 @@
 
     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 @@
   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 { };
 
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to