Skip to content

Commit bf88deb

Browse files
committed
Nix: Mark clash-ffi broken on the GHC versions it does not work on
1 parent c4f95e3 commit bf88deb

File tree

4 files changed

+18
-3
lines changed

4 files changed

+18
-3
lines changed

.github/workflows/nix.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@ jobs:
8080
"clash-term",
8181
"clash-testsuite"
8282
]
83+
exclude:
84+
- ghc: ghc9103
85+
package: clash-ffi
86+
- ghc: ghc984
87+
package: clash-ffi
8388
needs: packages_common
8489
steps:
8590
- uses: actions/checkout@v4

nix/overlay-ghc910.nix

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{ pkgs }:
22
final: prev:
33
let
4-
inherit (pkgs.haskell.lib) doJailbreak dontCheck markUnbroken;
4+
inherit (pkgs.haskell.lib) overrideCabal doJailbreak dontCheck markUnbroken;
55
in
66
{
77
# Use an older version than the default in nixpkgs. Since rewrite-inspector
@@ -17,4 +17,9 @@ in
1717

1818
# An ipv6 test fails on CI. Most likely due to missing kernel support?
1919
network = dontCheck prev.network;
20+
21+
# Broken on GHC > 9.8.3 see clash-ffi cabal file for details
22+
clash-ffi = overrideCabal prev.clash-ffi (drv: {
23+
broken = true;
24+
});
2025
}

nix/overlay-ghc98.nix

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{ pkgs }:
22
final: prev:
33
let
4-
inherit (pkgs.haskell.lib) doJailbreak markUnbroken;
4+
inherit (pkgs.haskell.lib) overrideCabal doJailbreak markUnbroken;
55
in
66
{
77
# Use an older version than the default in nixpkgs. Since rewrite-inspector
@@ -21,4 +21,9 @@ in
2121

2222
# singletons-th 3.3 requires th-desugar 1.16
2323
th-desugar = prev.callHackage "th-desugar" "1.16" { };
24+
25+
# Broken on GHC > 9.10.1 see clash-ffi cabal file for details
26+
clash-ffi = overrideCabal prev.clash-ffi (drv: {
27+
broken = true;
28+
});
2429
}

nix/overlay.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,9 @@ let
222222

223223
haskellOverlays =
224224
prev.lib.composeManyExtensions [
225-
ghcOverlay
226225
haskellExternalPackages
227226
haskellInternalPackages
227+
ghcOverlay
228228
];
229229
in
230230
{

0 commit comments

Comments
 (0)