From 456a0ebd4ffff753a3a8d1a1bc55d35287487362 Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <me@michaelpj.com>
Date: Sat, 20 Jan 2024 20:37:05 +0000
Subject: [PATCH] Remove an allow-newer (#3989)

* Remove an allow-newer

* Cut down the nix workflow more
---
 .github/workflows/nix.yml |  6 ++++--
 cabal.project             |  8 ++++----
 flake.lock                | 18 +++++++++---------
 flake.nix                 |  1 +
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index 4a2c30ec3a..3217c83d98 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -58,9 +58,11 @@ jobs:
       with:
         name: haskell-language-server
         authToken: ${{ secrets.HLS_CACHIX_AUTH_TOKEN }}
+    # Don't try and run the build (although that would be a good
+    # test), it takes a long time and we have sometimes had
+    # glibc incompatibilities with the runners
     - run: |
-        nix develop --print-build-logs --command cabal update
-        nix develop --print-build-logs --command cabal build
+        nix develop --print-build-logs --command true
 
   nix_post_job:
     if: always()
diff --git a/cabal.project b/cabal.project
index b68ac3cade..752fceb238 100644
--- a/cabal.project
+++ b/cabal.project
@@ -36,7 +36,7 @@ packages:
          ./plugins/hls-overloaded-record-dot-plugin
          ./plugins/hls-semantic-tokens-plugin
 
-index-state: 2024-01-17T16:04:21Z
+index-state: 2024-01-19T00:00:00Z
 
 tests: True
 test-show-details: direct
@@ -89,10 +89,10 @@ if impl(ghc >= 9.1)
     ekg-core:ghc-prim
 
 if impl(ghc >= 9.7)
+  -- ekg packagess are old and unmaintained, but we
+  -- don't rely on them for the mainline build, so
+  -- this is okay
   allow-newer:
     ekg-core:text,
     -- https://github.com/haskell-primitive/primitive-unlifted/issues/39
     primitive-unlifted:bytestring,
-    -- https://github.com/obsidiansystems/commutative-semigroups/issues/13
-    commutative-semigroups:base,
-    commutative-semigroups:template-haskell,
diff --git a/flake.lock b/flake.lock
index dc8f1eb9ab..8711e8de4b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
         "type": "github"
       },
       "original": {
@@ -21,11 +21,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1685518550,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+        "lastModified": 1705309234,
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
         "type": "github"
       },
       "original": {
@@ -36,11 +36,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1694477507,
-        "narHash": "sha256-RtUmM5s6vnx1W+tnrGzXArVScJ/IoGmqCLM177k5O5A=",
+        "lastModified": 1705623190,
+        "narHash": "sha256-mKwUzDaqnZHO3MIfh6Vg2cT7H/5KVvy3mvTipiU1Jt0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ff303118b2ec262eb342eab88ae79318fac66d52",
+        "rev": "9a3af09826447de299cc31571b07c0ebb8bc37a0",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index f0f92aa476..949b1bde20 100644
--- a/flake.nix
+++ b/flake.nix
@@ -100,6 +100,7 @@
           shell-ghc92 = mkDevShell pkgs.haskell.packages.ghc92;
           shell-ghc94 = mkDevShell pkgs.haskell.packages.ghc94;
           shell-ghc96 = mkDevShell pkgs.haskell.packages.ghc96;
+          shell-ghc98 = mkDevShell pkgs.haskell.packages.ghc98;
         };
 
         packages = {