From fb8af36b34acbedd6e370dc3da65416a5c7a80f9 Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Thu, 20 Feb 2025 10:46:14 +0900 Subject: [PATCH 1/3] Update cabal-fmt.nix Move from 9.2 to 9.6. haskell.nix will drop support ghc < 9.6 in the future. And currently 9.2. doesn't even build on Darwin, as it requires 8.10 to bootstrap and that's broken, and will be removed from haskell.nix in the not too distant future. --- src/ext/cabal-fmt.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ext/cabal-fmt.nix b/src/ext/cabal-fmt.nix index be2c987..2376c7c 100644 --- a/src/ext/cabal-fmt.nix +++ b/src/ext/cabal-fmt.nix @@ -7,7 +7,7 @@ let version = "0.1.12"; - compiler-nix-name = "ghc92"; + compiler-nix-name = "ghc96"; # Cabal is a lib library, so haskell.nix would normally use the one coming # from the compiler-nix-name (currently 3.2). However cabal-fmt depends on From b7f1ab3688f2a10b175c3fc152088e0f23e3bd63 Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Thu, 20 Feb 2025 10:48:44 +0900 Subject: [PATCH 2/3] Update fourmolu.nix (drop patch specific version) --- src/ext/fourmolu.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ext/fourmolu.nix b/src/ext/fourmolu.nix index 4b559cd..d2201fb 100644 --- a/src/ext/fourmolu.nix +++ b/src/ext/fourmolu.nix @@ -7,7 +7,7 @@ let project = pkgs.haskell-nix.hackage-project { name = "fourmolu"; version = "0.16.2.0"; - compiler-nix-name = "ghc982"; + compiler-nix-name = "ghc98"; modules = [{ packages.fourmolu.components.exes.fourmolu.dontStrip = false; }]; From d72031a7ea03fdc4202d4fe36140668070af4054 Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Thu, 20 Feb 2025 10:50:33 +0900 Subject: [PATCH 3/3] Update mkShellWith.nix (default to ghc 9.6) --- src/core/mkShellWith.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/mkShellWith.nix b/src/core/mkShellWith.nix index ac2158b..e23570b 100644 --- a/src/core/mkShellWith.nix +++ b/src/core/mkShellWith.nix @@ -34,7 +34,7 @@ let }; ghc = if shell.tools.haskellCompilerVersion == null then - "ghc8107" + "ghc96" else shell.tools.haskellCompilerVersion;