Skip to content

Commit f22266d

Browse files
committed
Fix ghc plugin tests
1 parent df41705 commit f22266d

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

test/cabal.project.local

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ repository head.hackage.ghc.haskell.org
2222
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
2323
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
2424
7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
25-
--sha256: sha256-dx4WtCafVcu1+IlaK1ABcqQ1UummqTN8HRo3svRdTOE=
25+
--sha256: sha256-gDLkCAZPa4xALm37iKVjDVnmBj0CwNKT1qzY/xiiPOY=
2626

2727
repository ghcjs-overlay
2828
url: https://raw.githubusercontent.com/input-output-hk/hackage-overlay-ghcjs/ed91ac93832fdfc50471ab8df13b8174e91b35ed

test/plugin/default.nix

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@ let
66
project = project' {
77
inherit compiler-nix-name evalPackages;
88
src = testSrc "plugin";
9-
cabalProjectLocal = builtins.readFile ../cabal.project.local;
10-
modules = [{
11-
reinstallableLibGhc = builtins.compareVersions buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.8.1" < 0;
12-
}];
9+
cabalProjectLocal = builtins.readFile ../cabal.project.local + ''
10+
allow-newer: polysemy-plugin:containers, polysemy:containers
11+
'';
1312
};
1413

1514
packages = project.hsPkgs;
@@ -21,7 +20,7 @@ in recurseIntoAttrs {
2120

2221
# Not sure why this breaks for ghc 8.10.7
2322
meta.disabled = compiler-nix-name == "ghc8107"
24-
|| builtins.elem compiler-nix-name [ "ghc9101" "ghc91120240504" ]
23+
|| builtins.elem compiler-nix-name [ "ghc9101x" "ghc91120240620" ]
2524
|| stdenv.hostPlatform.isMusl
2625
|| stdenv.hostPlatform.isGhcjs
2726
|| stdenv.hostPlatform.isWindows

0 commit comments

Comments
 (0)