git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Revert "cleanGit: Detect when called inside a submodule (#847)" (#890)
3991463Hamish Mackenzie
lib/clean-git.nix+1−2
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -53,10 +53,9 @@ let
53 lines = s: filter (x : x != [] && x != "") (split "\n" s);
53 lines = s: filter (x : x != [] && x != "") (split "\n" s);
54
54
55 origSrcSubDir = toString (src.origSrcSubDir or src);
55 origSrcSubDir = toString (src.origSrcSubDir or src);
56− directoryExists = path: builtins.pathExists (builtins.toPath path + "/.");
57in
56in
58
57
59−if directoryExists (origSrcSubDir + "/.git")
58+if builtins.pathExists (origSrcSubDir + "/.git")
60then
59then
61 let
60 let
62 hasIndex = builtins.pathExists (origSrcSubDir + "/.git/index");
61 hasIndex = builtins.pathExists (origSrcSubDir + "/.git/index");