Skip to content

Commit 85e2c1d

Browse files
committed
Test with GHC-9.2.1
1 parent fd2fae9 commit 85e2c1d

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

ffmpeg-light.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ category: Codec
2828
build-type: Simple
2929
extra-source-files: src/hscMacros.h, src/nameCompat.h, CHANGELOG.md
3030
cabal-version: >=1.10
31-
tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.2
31+
tested-with: GHC == 8.6.5 || == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.1
3232

3333
source-repository head
3434
type: git

flake.nix

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,20 @@
1212
let pkgs = import nixpkgs {
1313
inherit system;
1414
};
15-
compiler = "ghc8107";
16-
hspkgs = pkgs.haskell.packages.${compiler};
15+
# compiler = "8107";
16+
compiler = "921";
17+
hspkgs =
18+
let doJailbreak = pkgs.haskell.lib.doJailbreak;
19+
dontCheck = pkgs.haskell.lib.dontCheck;
20+
in pkgs.haskell.packages."ghc${compiler}".override {
21+
overrides = final: prev:
22+
if compiler == "921"
23+
then {
24+
linear = prev.callHackage "linear" "1.21.8" {};
25+
sdl2 = dontCheck (prev.callHackage "sdl2" "2.5.3.1" {});
26+
}
27+
else { };
28+
};
1729
ffmpeg-light = hspkgs.callPackage (import ./default.nix) { nix-filter = nix-filter.lib; };
1830
ghc = hspkgs.ghc.withHoogle (ps: ffmpeg-light.passthru.getBuildInputs.haskellBuildInputs);
1931
in {

0 commit comments

Comments
 (0)