Allow GHC 9.10

tweag · Oct 31, 2024 · 8e5cbdf · 8e5cbdf
1 parent 670eb3d
commit 8e5cbdf
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/flake.nix b/flake.nix
@@ -29,7 +29,7 @@
       inputs = {
         flake-compat.follows = "flake-compat";
         flake-utils.follows = "flake-utils";
-       };
+      };
     };
   };
   outputs = {
@@ -75,20 +75,28 @@
             cabal2nixOptions = "--benchmark -fdev";
 
             # https://github.com/tweag/monad-bayes/pull/256: Don't run tests on Mac because of machine precision issues
-            modifier = drv: if system == "x86_64-linux" then drv else pkgs.haskell.lib.dontCheck drv;
-            overrides = self: super: with pkgs.haskell.lib; { # Please check after flake.lock updates whether some of these overrides can be removed
-              brick = super.brick_2_3_1;
-            };
+            modifier = drv:
+              if system == "x86_64-linux"
+              then drv
+              else pkgs.haskell.lib.dontCheck drv;
+            overrides = self: super:
+              with pkgs.haskell.lib; {
+                # Please check after flake.lock updates whether some of these overrides can be removed
+                brick = super.brick_2_3_1;
+              };
           };
-          ghcs = [ # Always keep this up to date with the tested-with section in monad-bayes.cabal!
+          ghcs = [
+            # Always keep this up to date with the tested-with section in monad-bayes.cabal!
             "ghc902"
             "ghc927"
             "ghc945"
             "ghc964"
             "ghc982"
+            "ghc9102"
           ];
           buildForVersion = ghcVersion: (builtins.getAttr ghcVersion pkgs.haskell.packages).developPackage opts;
-          in lib.attrsets.genAttrs ghcs buildForVersion;
+        in
+          lib.attrsets.genAttrs ghcs buildForVersion;
 
         monad-bayes = monad-bayes-per-ghc.ghc902;
 

diff --git a/monad-bayes.cabal b/monad-bayes.cabal
@@ -7,7 +7,9 @@ copyright:       2015-2020 Adam Scibior
 maintainer:      dominic.steinitz@tweag.io
 author:          Adam Scibior <adscib@gmail.com>
 stability:       experimental
-tested-with:     GHC ==9.0.2 || ==9.2.7 || ==9.4.5 || ==9.6.4 || ==9.8.2
+tested-with:
+  GHC ==9.0.2 || ==9.2.7 || ==9.4.5 || ==9.6.4 || ==9.8.2 || ==9.10.2
+
 homepage:        http://github.com/tweag/monad-bayes#readme
 bug-reports:     https://github.com/tweag/monad-bayes/issues
 synopsis:        A library for probabilistic programming.
@@ -38,7 +40,7 @@ flag dev
 
 common deps
   build-depends:
-    , base             >=4.15     && <4.20
+    , base             >=4.15     && <4.21
     , brick            >=2.3.1    && <2.5
     , containers       >=0.5.10   && <0.7
     , foldl            ^>=1.4