From b6d6f301c4a72e37e9ace8532bedfdf7ebb2eed8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Mar 2010 12:13:40 +0000
Subject: [PATCH] pkgs/applications/editors/emacs-modes/magit: updated to
 version magit-0.7-94-gbf42bf8

Magit has seen plenty of development since version 0.7, but for some reason
there haven't been any new releases. This version bump updates the expression to
build a current version of Magit directly from the Git repository.

This change adds buildInputs 'autoconf' and 'automake'. These tools are required
only because we aren't building from a proper release tarball. Once version 0.8
comes out, these dependencies can be dropped again.

svn path=/nixpkgs/trunk/; revision=20650
---
 .../editors/emacs-modes/magit/default.nix     | 12 ++++++----
 pkgs/top-level/all-packages.nix               | 24 +++++++++----------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix
index de555632f52d..bd27ed8aa36c 100644
--- a/pkgs/applications/editors/emacs-modes/magit/default.nix
+++ b/pkgs/applications/editors/emacs-modes/magit/default.nix
@@ -1,14 +1,16 @@
-{stdenv, fetchurl, emacs, texinfo}:
+{stdenv, fetchurl, emacs, texinfo, autoconf, automake}:
 
 stdenv.mkDerivation {
-  name = "magit-0.7";
+  name = "magit-0.7-94-gbf42bf8";
 
   src = fetchurl {
-    url = "http://zagadka.vm.bytemark.co.uk/magit/magit-0.7.tar.gz";
-    sha256 = "0qry1vj41pycwkf71sqrz3zgzh85zdg5acq26asscq4s7jksrjiz";
+    url = "http://gitorious.org/magit/mainline/archive-tarball/magit_0.7-94-gbf42bf8";
+    sha256 = "6543a4e312d1a4249ff1edd192914d02f1a9016c321c8fdd0f015074e522759a";
   };
+  unpackCmd = "tar xf $src";
+  preConfigure = "./autogen.sh";
 
-  buildInputs = [emacs texinfo];
+  buildInputs = [emacs texinfo autoconf automake];
 
   meta = {
     description = "An an interface to Git, implemented as an extension to Emacs.";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 966b6f062ba8..85b5d16c3e28 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3808,14 +3808,14 @@ let
     inherit fetchurl stdenv;
   };
 
-  gmp = 
+  gmp =
     if stdenv.system == "i686-darwin" then
       # GMP 4.3.2 is broken on Darwin, so use 4.3.1.
       makeOverridable (import ../development/libraries/gmp/4.3.1.nix) {
         inherit stdenv fetchurl m4;
         cxx = false;
       }
-    else 
+    else
       makeOverridable (import ../development/libraries/gmp) {
         inherit stdenv fetchurl m4;
         cxx = false;
@@ -4450,7 +4450,7 @@ let
     inherit fetchurl stdenv pkgconfig;
     inherit (xlibs) libX11 libxcb xcbutil;
   };
-  
+
   libtasn1 = import ../development/libraries/libtasn1 {
     inherit fetchurl stdenv;
   };
@@ -4883,17 +4883,17 @@ let
   librdf_raptor = import ../development/libraries/librdf/raptor.nix {
     inherit fetchurl stdenv lib libxml2 curl;
   };
-  
+
   librdf_rasqal = import ../development/libraries/librdf/rasqal.nix {
     inherit fetchurl stdenv lib pcre libxml2 gmp librdf_raptor;
   };
-  
+
   librdf = import ../development/libraries/librdf {
     inherit fetchurl stdenv lib pkgconfig librdf_raptor ladspaH openssl zlib;
   };
 
   redland = redland_1_0_10;
-  
+
   redland_1_0_8 = makeOverridable (import ../development/libraries/redland/1.0.8.nix) {
     inherit fetchurl stdenv openssl libxml2 pkgconfig perl sqlite
       libxslt curl pcre librdf_rasqal librdf_raptor;
@@ -6616,7 +6616,7 @@ let
     inherit fetchurl stdenv pkgconfig gettext
       intltool perl perlXMLParser libxml2 glib;
   };
-  
+
   shared_desktop_ontologies = import ../data/misc/shared-desktop-ontologies {
     inherit stdenv fetchurl cmake;
   };
@@ -7050,7 +7050,7 @@ let
 
   dmtx = builderDefsPackage (import ../tools/graphics/dmtx) {
     inherit libpng libtiff libjpeg imagemagick librsvg
-      pkgconfig bzip2 zlib libtool freetype fontconfig 
+      pkgconfig bzip2 zlib libtool freetype fontconfig
       ghostscript;
     inherit (xlibs) libX11;
   };
@@ -7174,7 +7174,7 @@ let
     };
 
     magit = import ../applications/editors/emacs-modes/magit {
-      inherit fetchurl stdenv emacs texinfo;
+      inherit fetchurl stdenv emacs texinfo autoconf automake;
     };
 
     maudeMode = import ../applications/editors/emacs-modes/maude {
@@ -8753,13 +8753,13 @@ let
   };
 
   kde4 = kde43;
-  
+
   kde43 = makeOverridable (import ../desktops/kde-4.3) (pkgs // {
     openexr = openexr_1_6_1;
     qt4 = qt45;
     popplerQt4 = popplerQt45;
   });
-  
+
   kde44 = makeOverridable (import ../desktops/kde-4.4) (pkgs // {
     openexr = openexr_1_6_1;
     qt4 = qt46;
@@ -8767,7 +8767,7 @@ let
     sip = sip410;
     pyqt4 = pyqt47;
   });
-  
+
 
   kdelibs = kde3.kdelibs;
   kdebase = kde3.kdebase;