GHC minor bump in CI (#1084)

IntersectMBO · Jun 1, 2024 · e52e9f7 · e52e9f7
2 parents 18f43bd + ee2b68a
commit e52e9f7
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 52 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,8 +20,8 @@ jobs:
     strategy:
        fail-fast: false
        matrix:
-         ghc: ["8.10.7", "9.6.4", "9.8.1"]
-         cabal: ["3.10.2.1"]
+         ghc: ["8.10.7", "9.6.5", "9.8.2"]
+         cabal: ["3.10.3.0"]
          os: [ubuntu-latest]
     env:
       # Modify this value to "invalidate" the Cabal cache.

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -35,7 +35,7 @@
     };
     # for cabal-docspec
     cabal-extras = {
-      url = "github:phadej/cabal-extras/cabal-docspec-0.0.0.20231219";
+      url = "github:phadej/cabal-extras/cabal-docspec-0.0.0.20240414";
       flake = false;
     };
     gentle-introduction = {

diff --git a/nix/haskell.nix b/nix/haskell.nix
@@ -14,10 +14,10 @@ let
   };
   hsPkgs = haskell-nix.cabalProject {
     src = ./..;
-    compiler-nix-name = "ghc964";
+    compiler-nix-name = "ghc965";
     flake.variants = {
       ghc810 = { compiler-nix-name = lib.mkForce "ghc8107"; };
-      ghc98 = { compiler-nix-name = lib.mkForce "ghc981"; };
+      ghc98 = { compiler-nix-name = lib.mkForce "ghc982"; };
     };
     inputMap = {
       "https://chap.intersectmbo.org/" = inputs.CHaP;

diff --git a/nix/shell.nix b/nix/shell.nix
@@ -24,14 +24,8 @@ hsPkgs.shellFor {
   # version as used in hsPkgs.
   tools = {
     haskell-language-server = {
-      src = inputs.haskellNix.inputs."hls-2.6";
+      src = inputs.haskellNix.inputs."hls-2.8";
       configureArgs = "--disable-benchmarks --disable-tests";
-      modules = [{
-        packages.ghcide.patches = [
-          # https://github.com/haskell/haskell-language-server/issues/4046#issuecomment-1926242056
-          ./ghcide-workaround.diff
-        ];
-      }];
     };
   };
 

diff --git a/nix/tools.nix b/nix/tools.nix
@@ -2,7 +2,7 @@ inputs: final: prev:
 
 let
   inherit (final) lib;
-  tool-index-state = "2024-04-01T00:00:00Z";
+  tool-index-state = "2024-05-31T00:00:00Z";
   tool = name: version: other:
     final.haskell-nix.tool final.hsPkgs.args.compiler-nix-name name ({
       version = version;
@@ -37,34 +37,25 @@ in
   }).cabal-install.components.exes.cabal;
 
   cabal-docspec = tool "cabal-docspec" "git" {
+    compiler-nix-name = "ghc98";
     src = inputs.cabal-extras;
     cabalProject = ''
-      packages: peura cabal-docspec ${inputs.gentle-introduction}
-    '';
-    cabalProjectLocal = ''
-      allow-newer: cabal-docspec:*
-                 , gentle-introduction:*
-                 , peura:*
-                 , paths:*
-      constraints: directory <1.3.8.0
+      packages: peura cabal-docspec ${inputs.gentle-introduction} paths-0.2.0.0
     '';
   };
 
   cabal-hoogle = tool "cabal-hoogle" "git" {
     src = final.fetchFromGitHub {
       owner = "kokobd";
       repo = "cabal-hoogle";
-      rev = "7452c2b1dbdae4eb675d280ed99ec135293adc13";
-      hash = "sha256-w7PkNZfHJw1291c2nfviENSXykYpNV+4i3FmbMJqSMs=";
+      rev = "f3a230de36a08920f8ad47766b0528b9229b3ce6";
+      hash = "sha256-WiSq1uBjuSCEW7vp/81a1PVdo/7pf86dqy+R7lDCOdY=";
     };
-    cabalProjectLocal = ''
-      allow-newer: cabal-hoogle:*
-    '';
   };
 
   stylish-haskell = tool "stylish-haskell" "0.14.6.0" { };
 
-  cabal-gild = tool "cabal-gild" "1.3.0.1" { };
+  cabal-gild = tool "cabal-gild" "1.3.1.2" { };
 
   haskellBuildUtils = prev.haskellBuildUtils.override {
     inherit (final.hsPkgs.args) compiler-nix-name;

diff --git a/scripts/docs/haddocks.sh b/scripts/docs/haddocks.sh
@@ -25,7 +25,7 @@ GHC_VERSION=$(ghc --numeric-version)
 if ! command -v cabal-docspec &> /dev/null
 then
   # cabal-docspec. Download binary
-  curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20231219/cabal-docspec-0.0.0.20231219-x86_64-linux.xz > cabal-docspec.xz
+  curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20240414/cabal-docspec-0.0.0.20240414-x86_64-linux.xz > cabal-docspec.xz
   # this doesn't seem to exist in GH runners?
   mkdir -p "$HOME"/.local/bin
   xz -d < cabal-docspec.xz > "$HOME"/.local/bin/cabal-docspec