Skip to content

Commit 2330bb4

Browse files
Nix: Mark clash-ffi broken on the GHC version it does not work on
Co-authored-by: Rowan Goemans <[email protected]>
1 parent f99af1b commit 2330bb4

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

.github/workflows/nix.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ jobs:
8080
"clash-term",
8181
"clash-testsuite"
8282
]
83+
exclude:
84+
- ghc: ghc984
85+
package: clash-ffi
86+
8387
needs: packages_common
8488
steps:
8589
- uses: actions/checkout@v4

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) doJailbreak markUnbroken overrideCabal;
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.8.4 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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ let
9090
];
9191
});
9292

93+
# Broken on GHC 9.8.4
9394
clash-ffi =
9495
prev.haskell.lib.overrideCabal (hprev.callCabal2nix "clash-ffi" ../clash-ffi {})
9596
(drv: {
@@ -225,9 +226,9 @@ let
225226

226227
haskellOverlays =
227228
prev.lib.composeManyExtensions [
228-
ghcOverlay
229229
haskellExternalPackages
230230
haskellInternalPackages
231+
ghcOverlay
231232
];
232233
in
233234
{

0 commit comments

Comments
 (0)