bump doctest

polysemy-research · Feb 2, 2025 · dbdc48e · dbdc48e
1 parent 335df90
commit dbdc48e
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 10 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -19,6 +19,7 @@
       "96" = hsPkgs nixpkgs "ghc96";
       "98" = hsPkgs nixpkgs "ghc98";
       "910" = hsPkgs nixpkgs "ghc910";
+      "latest" = hsPkgs nixpkgs "ghc9101";
     };
 
     default = "96";
@@ -39,7 +40,7 @@
       packages = p: [p.polysemy p.polysemy-plugin];
       buildInputs = with ghc; [
         cabal-install
-      ] ++ nixpkgs.lib.optionals (name != "910" && name != "98" && name != "90") [
+      ] ++ nixpkgs.lib.optionals (name != "latest" && name != "910" && name != "98" && name != "90") [
         (ghc.pkgs.haskell.lib.dontCheck ghcid)
         haskell-language-server
       ];

diff --git a/nix/overlay.nix b/nix/overlay.nix
@@ -5,6 +5,7 @@
 }:
 let
   pkgs = import nixpkgs { inherit system; };
+  hlib = pkgs.haskell.lib;
 
   overrides = self: super:
   let
@@ -15,6 +16,14 @@ let
   in {
     polysemy = c2n "polysemy" ../.;
     polysemy-plugin = c2n "polysemy-plugin" ../polysemy-plugin;
+  } // pkgs.lib.optionalAttrs (compiler == "ghc9101") {
+
+    doctest = hlib.dontCheck (self.callHackageDirect {
+      pkg = "doctest";
+      ver = "0.23.0";
+      sha256 = "sha256-fDCOM5CSRmDjFKK3kOA06JYIBWbaQf+11fciTEPIZlk=";
+    } {});
+
   };
 in
   pkgs.haskell.packages.${compiler}.override { inherit overrides; } // { inherit pkgs; }
diff --git a/package.yaml b/package.yaml
@@ -82,7 +82,7 @@ tests:
     - polysemy
     - inspection-testing >= 0.4.2 && < 0.7
     - hspec >= 2.6.0 && < 3
-    - doctest >= 0.16.0.1 && < 0.23
+    - doctest >= 0.16.0.1 && < 0.24
     - hspec-discover >= 2.0
     generated-other-modules:
     - Build_doctests

diff --git a/polysemy-plugin/package.yaml b/polysemy-plugin/package.yaml
@@ -63,7 +63,7 @@ tests:
     - hspec >= 2.6.0 && < 3
     - should-not-typecheck >= 2.1.0 && < 3
     - inspection-testing >= 0.4.2 && < 0.7
-    - doctest >= 0.16.0.1 && < 0.23
+    - doctest >= 0.16.0.1 && < 0.24
     generated-other-modules:
     - Build_doctests
 

diff --git a/polysemy-plugin/polysemy-plugin.cabal b/polysemy-plugin/polysemy-plugin.cabal
@@ -1,6 +1,6 @@
 cabal-version: 2.0
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.36.1.
 --
 -- see: https://github.com/sol/hpack
 
@@ -111,7 +111,7 @@ test-suite polysemy-plugin-test
   build-depends:
       base >=4.9 && <5
     , containers >=0.5 && <0.8
-    , doctest >=0.16.0.1 && <0.23
+    , doctest >=0.16.0.1 && <0.24
     , ghc >=8.6.5 && <10
     , ghc-tcplugins-extra >=0.3 && <0.5
     , hspec >=2.6.0 && <3

diff --git a/polysemy.cabal b/polysemy.cabal
@@ -1,6 +1,6 @@
 cabal-version: 2.0
 
--- This file has been generated from package.yaml by hpack version 0.36.0.
+-- This file has been generated from package.yaml by hpack version 0.36.1.
 --
 -- see: https://github.com/sol/hpack
 
@@ -167,7 +167,7 @@ test-suite polysemy-test
       async >=2.2 && <3
     , base >=4.9 && <5
     , containers >=0.5 && <0.8
-    , doctest >=0.16.0.1 && <0.23
+    , doctest >=0.16.0.1 && <0.24
     , first-class-families >=0.5.0.0 && <0.9
     , hspec >=2.6.0 && <3
     , hspec-discover >=2.0