From c04dac7807cc07f618e8afb68ae81be6fd2026cd Mon Sep 17 00:00:00 2001 From: Vladimir Kirillov Date: Wed, 12 Nov 2014 17:30:08 +0200 Subject: [PATCH 1/2] nix-exec: make git less heavyweight --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e535520acb57..b672b8c4e6bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4021,6 +4021,10 @@ let nix-exec = callPackage ../development/interpreters/nix-exec { nix = nixUnstable; + git = git.override { + withManual = false; + pythonSupport = false; + }; }; octave = callPackage ../development/interpreters/octave { From 1b9f756e4e258e14fb1d4be9b492423f28a1bab0 Mon Sep 17 00:00:00 2001 From: Vladimir Kirillov Date: Wed, 12 Nov 2014 17:36:17 +0200 Subject: [PATCH 2/2] git: do not do install-doc when !withManual --- .../version-management/git-and-tools/git/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index fbb57a658120..7ba69a9fc182 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { # Install git-subtree. pushd contrib/subtree make - make install install-doc + make install ${stdenv.lib.optionalString withManual "install-doc"} popd rm -rf contrib/subtree