* Added git.

* Backed out the curl change for now.

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

1 files changed, 6 insertions, 2 deletions

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 36ff89d1704..4ba2129988b 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;