Test with GHC-9.2.1

acowley · Mar 11, 2022 · 85e2c1d · 85e2c1d
1 parent fd2fae9
commit 85e2c1d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/ffmpeg-light.cabal b/ffmpeg-light.cabal
@@ -28,7 +28,7 @@ category:            Codec
 build-type:          Simple
 extra-source-files:  src/hscMacros.h, src/nameCompat.h, CHANGELOG.md
 cabal-version:       >=1.10
-tested-with:         GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.2
+tested-with:         GHC == 8.6.5 || == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.1
 
 source-repository head
   type:     git

diff --git a/flake.nix b/flake.nix
@@ -12,8 +12,20 @@
       let pkgs = import nixpkgs { 
             inherit system;
           };
-          compiler = "ghc8107";
-          hspkgs = pkgs.haskell.packages.${compiler};
+          # compiler = "8107";
+          compiler = "921";
+          hspkgs =
+            let doJailbreak = pkgs.haskell.lib.doJailbreak;
+                dontCheck = pkgs.haskell.lib.dontCheck;
+            in pkgs.haskell.packages."ghc${compiler}".override {
+            overrides = final: prev:
+              if compiler == "921"
+              then {
+                linear = prev.callHackage "linear" "1.21.8" {};
+                sdl2 = dontCheck (prev.callHackage "sdl2" "2.5.3.1" {});
+              }
+              else { };
+          };
           ffmpeg-light = hspkgs.callPackage (import ./default.nix) { nix-filter = nix-filter.lib; };
           ghc = hspkgs.ghc.withHoogle (ps: ffmpeg-light.passthru.getBuildInputs.haskellBuildInputs);
       in {