Merge pull request #132 from guibou/ghc98

fix: small changes for GHC 9.8
guibou · Oct 25, 2023 · c5b7338 · c5b7338
2 parents 2f41e80 + fab56cd
commit c5b7338
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 21 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -31,8 +31,12 @@ jobs:
       run: sudo apt-get install haskell-stack
 
     # Build stack
+    - name: Stack 9.6
+      run: stack --resolver nightly-2023-10-24 test
+    - name: Stack 9.4
+      run: stack --resolver lts-21.17 test
     - name: Stack 9.2
-      run: stack --resolver nightly-2022-03-28 test
+      run: stack --resolver lts-20.26 test
     - name: Stack 9.0
       run: stack --resolver lts-19.1 test
     - name: Stack 8.10

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,9 @@
 # Revision history for PyF
 
+## 0.11.2.1
+
+- Final version for GHC 9.8
+
 ## 0.11.2.0
 
 - Fix for the neovim treesitter syntax highlighter for `fmt` and `fmtTrim` quasiquotes

diff --git a/PyF.cabal b/PyF.cabal
@@ -27,11 +27,11 @@ library
                   PyF.Internal.ParserEx
                   PyF.Internal.Parser
 
-  build-depends:       base >= 4.12 && < 4.19
-                     , bytestring >= 0.10.8 && < 0.12
-                     , template-haskell >= 2.14.0 && < 2.21
-                     , text >= 1.2.3 && <= 2.1
-                     , time >= 1.8.0 && < 1.13
+  build-depends:       base >= 4.12 && < 4.20
+                     , bytestring >= 0.10.8 && < 0.13
+                     , template-haskell >= 2.14.0 && < 2.22
+                     , text >= 1.2.3 && < 2.2
+                     , time >= 1.8.0 && < 1.14
                      , parsec >= 3.1.13 && < 3.2
                      , mtl >= 2.2.2 && < 2.4
                      , ghc >= 8.6.1

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,7 +2,7 @@
   description = "PyF";
 
   inputs.flake-utils.url = "github:numtide/flake-utils";
-  inputs.nixpkgs.url = "github:nixos/nixpkgs/haskell-updates";
+  inputs.nixpkgs.url = "github:nixos/nixpkgs";
 
   # Broken: see https://github.com/NixOS/nix/issues/5621
   #nixConfig.allow-import-from-derivation = true;
@@ -82,7 +82,10 @@
 
           # The current version for debug
           pyf_current = pyfBuilder (haskellPackages.override {
-            overrides = self: super: with haskell.lib; rec { };
+            overrides = self: super: with haskell.lib; rec {
+              hls-floskell-plugin = doJailbreak super.hls-floskell-plugin;
+              hls-formolu-plugin = doJailbreak super.hls-formolu-plugin;
+            };
           });
 
           # GHC 9.4
@@ -97,17 +100,20 @@
             };
           });
 
-          pyf_98 = pyfBuilder ((haskell.packages.ghcHEAD.override {
+          pyf_98 = pyfBuilder ((haskell.packages.ghc98.override {
             overrides = self: super:
               with haskell.lib; {
                 # Bump hspec (and dependencies)
-                hspec-core = super.callHackage "hspec-core" "2.11.4" {};
-                hspec-meta = super.callHackage "hspec-meta" "2.11.4" {};
-                hspec = super.callHackage "hspec" "2.11.4" {};
-                hspec-discover = super.callHackage "hspec-discover" "2.11.4" {};
+                hspec-core = super.callHackage "hspec-core" "2.11.6" {};
+                hspec-meta = super.callHackage "hspec-meta" "2.11.6" {};
+                hspec = super.callHackage "hspec" "2.11.6" {};
+                hspec-discover = super.callHackage "hspec-discover" "2.11.6" {};
                 hspec-expectations = super.callHackage "hspec-expectations" "0.8.4" {};
+                tagged = doJailbreak super.tagged;
+
                 # Disabling tests breaks the loop with hspec
                 base-orphans = dontCheck super.base-orphans;
+                splitmix = doJailbreak super.splitmix;
 
               };
           }));
@@ -120,7 +126,10 @@
             pyf_92
             pyf_94
             pyf_96
-            pyf_98
+
+            # Nix build of the different component for testing in 98 are not working
+            # But building with cabal works
+            # pyf_98
           ];
 
           # Only the current build is built with python3 support