on iko/ghcjs-patch-master help sign in
Use gitMinimal in call-cabal-project-to-nix (#1387)
4751dc7Michael Peyton Jones
lib/call-cabal-project-to-nix.nix+2−2
@@ -207,7 +207,7 @@ let
207 # Download the source-repository-package commit and add it to a minimal git
207 # Download the source-repository-package commit and add it to a minimal git
208 # repository that `cabal` will be able to access from a non fixed output derivation.
208 # repository that `cabal` will be able to access from a non fixed output derivation.
209 location = pkgs.evalPackages.runCommand "source-repository-package" {
209 location = pkgs.evalPackages.runCommand "source-repository-package" {
210− nativeBuildInputs = [ pkgs.evalPackages.rsync pkgs.evalPackages.git ];
210+ nativeBuildInputs = [ pkgs.evalPackages.rsync pkgs.evalPackages.gitMinimal ];
211 } ''
211 } ''
212 mkdir $out
212 mkdir $out
213 rsync -a --prune-empty-dirs "${fetched}/" "$out/"
213 rsync -a --prune-empty-dirs "${fetched}/" "$out/"
@@ -437,7 +437,7 @@ let
437 } // pkgs.lib.optionalAttrs (checkMaterialization != null) {
437 } // pkgs.lib.optionalAttrs (checkMaterialization != null) {
438 inherit checkMaterialization;
438 inherit checkMaterialization;
439 }) (pkgs.evalPackages.runCommand (nameAndSuffix "plan-to-nix-pkgs") {
439 }) (pkgs.evalPackages.runCommand (nameAndSuffix "plan-to-nix-pkgs") {
440− nativeBuildInputs = [ nix-tools dummy-ghc dummy-ghc-pkg cabal-install pkgs.evalPackages.rsync pkgs.evalPackages.git ];
440+ nativeBuildInputs = [ nix-tools dummy-ghc dummy-ghc-pkg cabal-install pkgs.evalPackages.rsync pkgs.evalPackages.gitMinimal ];
441 # Needed or stack-to-nix will die on unicode inputs
441 # Needed or stack-to-nix will die on unicode inputs
442 LOCALE_ARCHIVE = pkgs.lib.optionalString (pkgs.evalPackages.stdenv.buildPlatform.libc == "glibc") "${pkgs.evalPackages.glibcLocales}/lib/locale/locale-archive";
442 LOCALE_ARCHIVE = pkgs.lib.optionalString (pkgs.evalPackages.stdenv.buildPlatform.libc == "glibc") "${pkgs.evalPackages.glibcLocales}/lib/locale/locale-archive";
443 LANG = "en_US.UTF-8";
443 LANG = "en_US.UTF-8";