From 5186e75c4f171680ccd20bf18c324bb0c6d77362 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 11 Mar 2013 19:05:45 +0100
Subject: [PATCH] emacs: update to version 24.3

The builder.sh script used to call "make bootstrap" before running the build.
This build step, however, removes all kinds of generated files normally
included in the distributions -- such as the 'configure' script. If that target
is run, then new version of Emacs require Autoconf and Automake to compile.
Since the benefit of running "make bootstrap" is unclean to me, I chose to
remove that build step instead. As far as I can tell, the Emacs binary that
results from this build works fine.
---
 pkgs/applications/editors/emacs-24/builder.sh  | 2 --
 pkgs/applications/editors/emacs-24/default.nix | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/emacs-24/builder.sh b/pkgs/applications/editors/emacs-24/builder.sh
index d04e7a4fdd3..c472d2b1a64 100644
--- a/pkgs/applications/editors/emacs-24/builder.sh
+++ b/pkgs/applications/editors/emacs-24/builder.sh
@@ -29,6 +29,4 @@ preConfigure() {
     done
 }
 
-preBuild="make bootstrap"
-
 genericBuild
diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix
index 82238a55d1c..a781cb37346 100644
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ b/pkgs/applications/editors/emacs-24/default.nix
@@ -9,13 +9,13 @@ assert (libXft != null) -> libpng != null;	# probably a bug
 assert stdenv.isDarwin -> libXaw != null;	# fails to link otherwise
 
 stdenv.mkDerivation rec {
-  name = "emacs-24.2";
+  name = "emacs-24.3";
 
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = "mirror://gnu/emacs/${name}.tar.bz2";
-    sha256 = "13wbjfjmz13qpjwssy44nw2230lllmkkgjsy0rqfm6am2cf87n3k";
+    url = "mirror://gnu/emacs/${name}.tar.xz";
+    sha256 = "1385qzs3bsa52s5rcncbrkxlydkw0ajzrvfxgv8rws5fx512kakh";
   };
 
   buildInputs =