Git: Revert pointless `all-packages.nix' in r11877.

svn path=/nixpkgs/trunk/; revision=11878
This commit is contained in:
Ludovic Courtès 2008-05-22 09:58:31 +00:00
parent 392d2f5acf
commit e37d384491

View File

@ -5323,25 +5323,19 @@ let pkgs = rec {
inherit (gnome) gtk libgtkhtml libart_lgpl; inherit (gnome) gtk libgtkhtml libart_lgpl;
}; };
git = git = import ../applications/version-management/git {
let svnSupport = getConfig [ "git" "svnSupport" ] false; inherit fetchurl stdenv curl openssl zlib expat perl gettext
in asciidoc texinfo xmlto docbook2x
import ../applications/version-management/git { docbook_xsl docbook_xml_dtd_42 libxslt
inherit fetchurl stdenv curl openssl zlib expat perl gettext cpio tcl tk makeWrapper;
asciidoc texinfo xmlto docbook2x
docbook_xsl docbook_xml_dtd_42 libxslt
cpio tcl tk makeWrapper;
# `git-svn' support # for git-svn support:
inherit svnSupport; svnSupport = getConfig [ "git" "svnSupport" ] false;
subversion = (if svnSupport then subversion else null) ; inherit subversion ;
perlLibs = (if svnSupport perlLibs = [ perlLWP perlURI perlTermReadKey subversion ];
then [ perlLWP perlURI perlTermReadKey subversion ]
else []);
# Emacs support emacs = if (getConfig ["git" "useEmacs"] true) then emacs else null;
emacs = if (getConfig ["git" "useEmacs"] true) then emacs else null; };
};
gkrellm = import ../applications/misc/gkrellm { gkrellm = import ../applications/misc/gkrellm {
inherit fetchurl stdenv gettext pkgconfig; inherit fetchurl stdenv gettext pkgconfig;