JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'nix-exec-git' of git://github.com/proger/nixpkgs

Browse Source
This commit is contained in:
Shea Levy 2014-11-12 20:04:11 -05:00
commit 8bc56d5d8e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -55,7 +55,7 @@ stdenv.mkDerivation {
# Install git-subtree. # Install git-subtree.
pushd contrib/subtree pushd contrib/subtree
make make
make install install-doc make install ${stdenv.lib.optionalString withManual "install-doc"}
popd popd
rm -rf contrib/subtree rm -rf contrib/subtree

4
pkgs/top-level/all-packages.nix
View File

@ -4023,6 +4023,10 @@ let
nix-exec = callPackage ../development/interpreters/nix-exec { nix-exec = callPackage ../development/interpreters/nix-exec {
nix = nixUnstable; nix = nixUnstable;
git = git.override {
withManual = false;
pythonSupport = false;
};
}; };
octave = callPackage ../development/interpreters/octave { octave = callPackage ../development/interpreters/octave {