support GHC 9.8

camfort · Sep 17, 2024 · 60826f1 · 60826f1
1 parent dac52c3
commit 60826f1
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 22 deletions.
diff --git a/flake.nix b/flake.nix
@@ -46,7 +46,28 @@
 
         haskellProjects.ghc96 = {
           basePackages = pkgs.haskell.packages.ghc96;
+          devShell = {
+            tools = hp: {
+              # disable these while unused (often slow/annoying to build)
+              haskell-language-server = null;
+              ghcid = null;
+              hlint = null;
+            };
+          };
         };
+
+        haskellProjects.ghc98 = {
+          basePackages = pkgs.haskell.packages.ghc98;
+          devShell = {
+            tools = hp: {
+              # disable these while unused (often slow/annoying to build)
+              haskell-language-server = null;
+              ghcid = null;
+              hlint = null;
+            };
+          };
+        };
+
       };
     };
 }
diff --git a/fortran-src.cabal b/fortran-src.cabal
@@ -190,9 +190,9 @@ library
     , array ==0.5.*
     , base >=4.6 && <5
     , binary >=0.8.3.0 && <0.11
-    , bytestring >=0.10 && <0.12
+    , bytestring >=0.10 && <0.13
     , containers >=0.5 && <0.7
-    , deepseq ==1.4.*
+    , deepseq >=1.4 && <1.6
     , directory >=1.2 && <2
     , either >=5.0.1.1 && <5.1
     , fgl ==5.*
@@ -201,10 +201,10 @@ library
     , pretty >=1.1 && <2
     , process >=1.2.0.0
     , singletons ==3.0.*
-    , singletons-base >=3.0 && <3.3
-    , singletons-th >=3.0 && <3.3
+    , singletons-base >=3.0 && <3.4
+    , singletons-th >=3.0 && <3.4
     , temporary >=1.2 && <1.4
-    , text >=1.2 && <2.1
+    , text >=1.2 && <2.2
     , uniplate >=1.6 && <2
   default-language: Haskell2010
   if os(windows)
@@ -253,9 +253,9 @@ executable fortran-src
     , array ==0.5.*
     , base >=4.6 && <5
     , binary >=0.8.3.0 && <0.11
-    , bytestring >=0.10 && <0.12
+    , bytestring >=0.10 && <0.13
     , containers >=0.5 && <0.7
-    , deepseq ==1.4.*
+    , deepseq >=1.4 && <1.6
     , directory >=1.2 && <2
     , either >=5.0.1.1 && <5.1
     , fgl ==5.*
@@ -265,10 +265,10 @@ executable fortran-src
     , pretty >=1.1 && <2
     , process >=1.2.0.0
     , singletons ==3.0.*
-    , singletons-base >=3.0 && <3.3
-    , singletons-th >=3.0 && <3.3
+    , singletons-base >=3.0 && <3.4
+    , singletons-th >=3.0 && <3.4
     , temporary >=1.2 && <1.4
-    , text >=1.2 && <2.1
+    , text >=1.2 && <2.2
     , uniplate >=1.6 && <2
   default-language: Haskell2010
   if os(windows)
@@ -351,9 +351,9 @@ test-suite spec
     , array ==0.5.*
     , base >=4.6 && <5
     , binary >=0.8.3.0 && <0.11
-    , bytestring >=0.10 && <0.12
+    , bytestring >=0.10 && <0.13
     , containers >=0.5 && <0.7
-    , deepseq ==1.4.*
+    , deepseq >=1.4 && <1.6
     , directory >=1.2 && <2
     , either >=5.0.1.1 && <5.1
     , fgl ==5.*
@@ -364,10 +364,10 @@ test-suite spec
     , pretty >=1.1 && <2
     , process >=1.2.0.0
     , singletons ==3.0.*
-    , singletons-base >=3.0 && <3.3
-    , singletons-th >=3.0 && <3.3
+    , singletons-base >=3.0 && <3.4
+    , singletons-th >=3.0 && <3.4
     , temporary >=1.2 && <1.4
-    , text >=1.2 && <2.1
+    , text >=1.2 && <2.2
     , uniplate >=1.6 && <2
   default-language: Haskell2010
   if os(windows)

diff --git a/package.yaml b/package.yaml
@@ -87,23 +87,23 @@ dependencies:
 - GenericPretty >=1.2.2 && <2
 - pretty >=1.1 && <2
 - containers >=0.5 && <0.7
-- text >=1.2 && <2.1
-- bytestring >=0.10 && <0.12
+- text >=1.2 && <2.2
+- bytestring >=0.10 && <0.13
 - binary >=0.8.3.0 && <0.11
 - filepath >=1.4 && <2
 - directory >=1.2 && <2
 - fgl >=5 && <6
-- deepseq >=1.4 && <1.5
+- deepseq >=1.4 && <1.6
 - filepath >=1.4 && <1.5
 - temporary >=1.2 && <1.4
 - either ^>=5.0.1.1
 - process >= 1.2.0.0
 
 - singletons      >= 3.0 && < 3.1
 
-# 3.0 = GHC 9.0, 3.1 = GHC 9.2, 3.1.1 = GHC 9.4, 3.2 = GHC 9.6
-- singletons-th   >= 3.0 && < 3.3
-- singletons-base >= 3.0 && < 3.3
+# 3.0 = GHC 9.0, 3.1 = GHC 9.2, 3.1.1 = GHC 9.4, 3.2 = GHC 9.6, 3.3 = GHC 9.8
+- singletons-th   >= 3.0 && < 3.4
+- singletons-base >= 3.0 && < 3.4
 
 library:
   source-dirs: src
@@ -128,7 +128,7 @@ tests:
     - hspec-discover
     dependencies:
     - fortran-src
-    - deepseq >=1.4 && <1.5
+    - deepseq >=1.4 && <1.6
     - hspec >=2.2 && <3
     - QuickCheck >=2.10 && <2.15