From adcb2909f78ce47bc429b782aad8d475bdbca02a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 26 Apr 2007 16:14:01 +0000
Subject: [PATCH] * Added git. * Backed out the curl change for now.

svn path=/nixpkgs/trunk/; revision=8612
---
 .../version-management/git/default.nix           | 16 ++++++++++++++++
 pkgs/top-level/all-packages.nix                  |  8 ++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/version-management/git/default.nix

diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix
new file mode 100644
index 000000000000..4616fb4432c5
--- /dev/null
+++ b/pkgs/applications/version-management/git/default.nix
@@ -0,0 +1,16 @@
+{stdenv, fetchurl, curl, openssl, zlib, expat, perl}:
+
+stdenv.mkDerivation {
+  name = "git-1.5.1.2";
+
+  src = fetchurl {
+    url = http://www.kernel.org/pub/software/scm/git/git-1.5.1.2.tar.bz2;
+    sha256 = "0a7nnw9631h6nxk7sny0cjv89qlibilvsm6947620vr2kgc6p6k2";
+  };
+
+  buildInputs = [curl openssl zlib expat];
+
+  preBuild = "
+    makeFlagsArray=(prefix=$out PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.bash}/bin/sh)
+  ";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 36ff89d1704f..4ba2129988b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -484,10 +484,10 @@ rec {
     inherit (xlibs) libX11 libXext;
   };
 
-  realCurl = useFromStdenv (stdenv ? curl) stdenv.curl (import ../tools/networking/curl {
+  realCurl = import ../tools/networking/curl {
     inherit fetchurl stdenv zlib;
     zlibSupport = !stdenv ? isDietLibC;
-  });
+  };
 
   rpm = import ../tools/package-management/rpm {
     inherit fetchurl stdenv cpio zlib bzip2 file sqlite beecrypt neon elfutils;
@@ -2632,6 +2632,10 @@ rec {
     inherit (gnome) gtk libgtkhtml glib pango atk libart_lgpl;
   };
 
+  git = import ../applications/version-management/git {
+    inherit fetchurl stdenv curl openssl zlib expat perl;
+  };
+
   gnash = import ../applications/video/gnash {
     inherit fetchurl stdenv SDL SDL_mixer GStreamer
             libogg libxml2 libjpeg mesa libpng;