simplex-chat/haskell.nix
1
0
Fork 0
mirror of https://github.com/simplex-chat/haskell.nix.git synced 2026-06-03 09:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use gitMinimal in call-cabal-project-to-nix (#1387)

Browse Source 
This was using full `git`, which isn't part of the project `roots`, and so
would often not be cached.

I don't know how this ended up not being problematic before, since this
has been here for a while...
This commit is contained in:
Michael Peyton Jones
2022-03-02 23:44:58 +00:00
committed by GitHub
parent 50c6984263
commit 4751dc70a6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/call-cabal-project-to-nix.nix
+2 -2
View File
@@ -207,7 +207,7 @@ let
# Download the source-repository-package commit and add it to a minimal git
# repository that `cabal` will be able to access from a non fixed output derivation.
location = pkgs.evalPackages.runCommand "source-repository-package" {
nativeBuildInputs = [ pkgs.evalPackages.rsync pkgs.evalPackages.git ];
nativeBuildInputs = [ pkgs.evalPackages.rsync pkgs.evalPackages.gitMinimal ];
} ''
mkdir $out
rsync -a --prune-empty-dirs "${fetched}/" "$out/"
@@ -437,7 +437,7 @@ let
} // pkgs.lib.optionalAttrs (checkMaterialization != null) {
inherit checkMaterialization;
}) (pkgs.evalPackages.runCommand (nameAndSuffix "plan-to-nix-pkgs") {
nativeBuildInputs = [ nix-tools dummy-ghc dummy-ghc-pkg cabal-install pkgs.evalPackages.rsync pkgs.evalPackages.git ];
nativeBuildInputs = [ nix-tools dummy-ghc dummy-ghc-pkg cabal-install pkgs.evalPackages.rsync pkgs.evalPackages.gitMinimal ];
# Needed or stack-to-nix will die on unicode inputs
LOCALE_ARCHIVE = pkgs.lib.optionalString (pkgs.evalPackages.stdenv.buildPlatform.libc == "glibc") "${pkgs.evalPackages.glibcLocales}/lib/locale/locale-archive";
LANG = "en_US.UTF-8";