git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Add 'name' to cleanSource calls in tests (#505)
171c57aMichael Peyton Jones
test/buildable/default.nix+1−1
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -5,7 +5,7 @@ with stdenv.lib;
5let
5let
6 project = cabalProject' {
6 project = cabalProject' {
7 index-state = "2019-04-30T00:00:00Z";
7 index-state = "2019-04-30T00:00:00Z";
8− src = haskellLib.cleanGit { src = ../..; subDir = "test/buildable"; };
8+ src = haskellLib.cleanGit { src = ../..; name = "buildable"; subDir = "test/buildable"; };
9 modules = [ { packages.buildable-test.flags.exclude-broken = true; } ];
9 modules = [ { packages.buildable-test.flags.exclude-broken = true; } ];
10 };
10 };
11 packages = project.hsPkgs;
11 packages = project.hsPkgs;
test/cabal-22/default.nix+1−1
@@ -4,7 +4,7 @@ with stdenv.lib;
4
4
5let
5let
6 project = cabalProject' {
6 project = cabalProject' {
7− src = haskellLib.cleanGit { src = ../..; subDir = "test/cabal-22"; };
7+ src = haskellLib.cleanGit { src = ../..; name = "cabal22"; subDir = "test/cabal-22"; };
8 };
8 };
9
9
10 packages = project.hsPkgs;
10 packages = project.hsPkgs;
test/cabal-simple-prof/default.nix+1−1
@@ -16,7 +16,7 @@ let
16 ];
16 ];
17
17
18 project = cabalProject' {
18 project = cabalProject' {
19− src = haskellLib.cleanGit { src = ../..; subDir = "test/cabal-simple-prof"; };
19+ src = haskellLib.cleanGit { src = ../..; name = "cabal-simple-prof"; subDir = "test/cabal-simple-prof"; };
20 inherit modules;
20 inherit modules;
21 };
21 };
22
22
test/cabal-simple/default.nix+1−1
@@ -13,7 +13,7 @@ let
13 ];
13 ];
14
14
15 project = cabalProject' {
15 project = cabalProject' {
16− src = haskellLib.cleanGit { src = ../..; subDir = "test/cabal-simple"; };
16+ src = haskellLib.cleanGit { src = ../..; name = "cabal-simple"; subDir = "test/cabal-simple"; };
17 inherit modules;
17 inherit modules;
18 };
18 };
19
19
test/cabal-sublib/default.nix+1−1
@@ -14,7 +14,7 @@ let
14
14
15 # The ./pkgs.nix works for linux & darwin, but not for windows
15 # The ./pkgs.nix works for linux & darwin, but not for windows
16 project = cabalProject' {
16 project = cabalProject' {
17− src = haskellLib.cleanGit { src = ../..; subDir = "test/cabal-sublib"; };
17+ src = haskellLib.cleanGit { src = ../..; name = "cabal-sublib"; subDir = "test/cabal-sublib"; };
18 inherit modules;
18 inherit modules;
19 };
19 };
20
20
test/setup-deps/default.nix+1−1
@@ -5,7 +5,7 @@ with stdenv.lib;
5
5
6let
6let
7 project = haskell-nix.cabalProject' {
7 project = haskell-nix.cabalProject' {
8− src = pkgs.haskell-nix.haskellLib.cleanGit { src = ../..; subDir = "test/setup-deps"; };
8+ src = pkgs.haskell-nix.haskellLib.cleanGit { src = ../..; name = "setup-deps"; subDir = "test/setup-deps"; };
9 modules = [{
9 modules = [{
10 # Package has no exposed modules which causes
10 # Package has no exposed modules which causes
11 # haddock: No input file(s)
11 # haddock: No input file(s)