* Emacs 22.1. This is the default now, but 21.4 is still around

  (as is the 23.0.0.1 alpha).

svn path=/nixpkgs/trunk/; revision=9175

5 files changed, 9 insertions, 6 deletions

diff --git a/pkgs/applications/editors/emacs/builder.sh b/pkgs/applications/editors/emacs-21/builder.sh
index e9c909739d5..e9c909739d5 100644
--- a/pkgs/applications/editors/emacs/builder.sh
+++ b/pkgs/applications/editors/emacs-21/builder.sh
diff --git a/pkgs/applications/editors/emacs/crt.patch b/pkgs/applications/editors/emacs-21/crt.patch
index 93f17643a1a..93f17643a1a 100644
--- a/pkgs/applications/editors/emacs/crt.patch
+++ b/pkgs/applications/editors/emacs-21/crt.patch
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs-21/default.nix
index 31a685ef717..31a685ef717 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs-21/default.nix
diff --git a/pkgs/applications/editors/emacs-22/default.nix b/pkgs/applications/editors/emacs-22/default.nix
index a2b67584fba..2248b5b2c27 100644
--- a/pkgs/applications/editors/emacs-22/default.nix
+++ b/pkgs/applications/editors/emacs-22/default.nix
@@ -4,6 +4,7 @@
 , gtkGUI ? false
 , stdenv, fetchurl, x11, libXaw ? null, libXpm ? null, Xaw3d ? null
 , pkgconfig ? null, gtk ? null
+, ncurses
 }:
 
 assert xawSupport && !xaw3dSupport -> libXaw != null;
@@ -12,15 +13,15 @@ assert xpmSupport -> libXpm != null;
 assert gtkGUI -> pkgconfig != null && gtk != null;
 
 stdenv.mkDerivation {
-  name = "emacs-22.0.50-pre20051207";
+  name = "emacs-22.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/emacs-22.0.50-pre20051207.tar.bz2;
-    md5 = "011d40367015691e4319ddc65b4e7843";
+    url = http://ftp.nluug.nl/pub/gnu/emacs/emacs-22.1.tar.gz;
+    sha256 = "1l1y3il98pq3cz464p244wz2d3nga5lq8fkw5pwp5r97f7pkpi0y";
   };
   patches = [./crt.patch];
   buildInputs = [
-    x11
+    ncurses x11
     (if xawSupport then if xaw3dSupport then Xaw3d else libXaw else null)
     (if xpmSupport then libXpm else null)
   ] ++ (if gtkGUI then [pkgconfig gtk] else []);
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f26408788b6..816a383b747 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3029,14 +3029,16 @@ rec {
     inherit stdenv fetchurl python perl ncurses x11 zlib openssl;
   };
 
-  emacs = import ../applications/editors/emacs {
+  emacs = emacs22;
+
+  emacs21 = import ../applications/editors/emacs-21 {
     inherit fetchurl stdenv ncurses x11 Xaw3d;
     inherit (xlibs) libXaw libXpm;
     xaw3dSupport = true;
   };
 
   emacs22 = import ../applications/editors/emacs-22 {
-    inherit fetchurl stdenv pkgconfig x11 Xaw3d;
+    inherit fetchurl stdenv ncurses pkgconfig x11 Xaw3d;
     inherit (xlibs) libXaw libXpm;
     inherit (gtkLibs) gtk;
     xaw3dSupport = false;