Merge branch 'gitMinimal' of github.com:proger/nixpkgs

since git is used to bootstrap a lot, this can save lots of waiting
time.
This commit is contained in:
Shea Levy 2014-11-20 08:26:46 -05:00
commit a75e6c8b45
1 changed files with 7 additions and 5 deletions

View File

@ -309,7 +309,8 @@ let
}; };
fetchgit = import ../build-support/fetchgit { fetchgit = import ../build-support/fetchgit {
inherit stdenv git cacert; inherit stdenv cacert;
git = gitMinimal;
}; };
fetchgitPrivate = import ../build-support/fetchgit/private.nix { fetchgitPrivate = import ../build-support/fetchgit/private.nix {
@ -3983,10 +3984,7 @@ let
nix-exec = callPackage ../development/interpreters/nix-exec { nix-exec = callPackage ../development/interpreters/nix-exec {
nix = nixUnstable; nix = nixUnstable;
git = git.override { git = gitMinimal;
withManual = false;
pythonSupport = false;
};
}; };
octave = callPackage ../development/interpreters/octave { octave = callPackage ../development/interpreters/octave {
@ -9653,6 +9651,10 @@ let
}); });
git = gitAndTools.git; git = gitAndTools.git;
gitFull = gitAndTools.gitFull; gitFull = gitAndTools.gitFull;
gitMinimal = git.override {
withManual = false;
pythonSupport = false;
};
gitSVN = gitAndTools.gitSVN; gitSVN = gitAndTools.gitSVN;
gitRepo = callPackage ../applications/version-management/git-repo { gitRepo = callPackage ../applications/version-management/git-repo {