Merge branch 'master' into mpj/tidy-test-run

Author: michaelpj

.github/workflows/caching.yml

@@ -80,8 +80,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # This list of GHC versions must fit to the list of GHC versions
-        # specified in 'test.yml'
+        # This list of GHC (including the "exclude" list) versions must match
+        # to the list of GHC versions specified in 'test.yml'
         ghc: [ "9.4.3"
              , "9.4.2"
              , "9.2.5"
@@ -94,12 +94,12 @@ jobs:
             , "windows-latest"
             ]
         exclude:
-          - os: windows-latest
-            ghc: '9.4.1'
-          # Exclude until https://github.com/haskell/actions/issues/129
-          # is resolved.
-          - os: windows-latest
-            ghc: '9.2.5'
+           # Exclude until https://github.com/haskell/actions/issues/129
+           # is resolved.
+           - os: windows-latest
+             ghc: '9.4.3' # Excluded because github action cannot install it
+           - os: windows-latest
+             ghc: '9.2.5'
 
     steps:
       - uses: actions/checkout@v3

.github/workflows/nix.yml

@@ -89,8 +89,6 @@ jobs:
 
     - uses: cachix/install-nix-action@v18
       with:
-        install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install
-        install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve'
         extra_nix_config: |
           experimental-features = nix-command flakes
         nix_path: nixpkgs=channel:nixos-unstable

.github/workflows/test.yml

@@ -76,8 +76,6 @@ jobs:
         # they are broken for good reasons, e.g. compiler is bugged
         # on that platform.
         exclude:
-           - os: windows-latest
-             ghc: '9.4.1'
            # Exclude until https://github.com/haskell/actions/issues/129
            # is resolved.
            - os: windows-latest

flake.lock

@@ -59,6 +59,10 @@
       url = "https://hackage.haskell.org/package/hiedb-0.4.2.0/hiedb-0.4.2.0.tar.gz";
       flake = false;
     };
+    implicit-hie = {
+      url = "https://hackage.haskell.org/package/implicit-hie-0.1.2.7/implicit-hie-0.1.2.7.tar.gz";
+      flake = false;
+    };
   };
   outputs =
     inputs@{ self, nixpkgs, flake-compat, flake-utils, gitignore, all-cabal-hashes-unpacked, ... }:
@@ -122,14 +126,20 @@
               # Patches don't apply
               github = overrideCabal hsuper.github (drv: { patches = []; });
               hiedb = hsuper.callCabal2nix "hiedb" inputs.hiedb {};
+              implicit-hie = hsuper.callCabal2nix "implicit-hie" inputs.implicit-hie {};
 
               # https://github.com/NixOS/nixpkgs/issues/140774
               ormolu =
                 if final.system == "aarch64-darwin"
                 then overrideCabal hsuper.ormolu (_: { enableSeparateBinOutput = false; })
                 else hsuper.ormolu;
 
-              fourmolu = hself.callCabal2nix "fourmolu" inputs.fourmolu {};
+              # Due to the following issue, fixity-th should be disabled, especially for darwin.
+              # https://github.com/fourmolu/fourmolu/issues/238
+              fourmolu =
+                addBuildDepend
+                  (appendConfigureFlag (hself.callCabal2nix "fourmolu" inputs.fourmolu {}) "-f-fixity-th")
+                  hself.file-embed;
             };
 
           hlsSources =

flake.nix

@@ -104,6 +104,11 @@ library
         ghc-paths,
         cryptohash-sha1 >=0.11.100 && <0.12,
         hie-bios ^>= 0.11.0,
+        -- implicit-hie 0.1.3.0 introduced an unexpected behavioral change.
+        -- https://github.com/Avi-D-coder/implicit-hie/issues/50
+        -- to make sure ghcide behaves in a desirable way, we put implicit-hie
+        -- fake dependency here.
+        implicit-hie < 0.1.3,
         implicit-hie-cradle ^>= 0.3.0.5 || ^>= 0.5,
         base16-bytestring >=0.1.1 && <1.1
     if os(windows)

ghcide/ghcide.cabal

@@ -45,7 +45,6 @@ library
     -- This is a lot of work for almost zero benefit, so we just allow more versions here
     -- and we eventually completely drop support for building HLS with stack.
     , Cabal                 ^>=3.2 || ^>=3.4 || ^>=3.6 || ^>= 3.8
-    , Cabal-syntax          ^>= 3.6
     , deepseq
     , directory
     , extra                 >=1.7.4