Skip to content

Commit eebf3b2

Browse files
cydparsermichaelpj
andauthored
Use GHC 9.2.7 in flake (#3527)
* Assign all Nix dev shells to `all-nix-dev-shells` * Use GHC 9.2.7 in flake --------- Co-authored-by: Michael Peyton Jones <me@michaelpj.com>
1 parent 385f000 commit eebf3b2

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

.github/workflows/nix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
# We only build nix dev shell for current GHC version because some are
104104
# failing with different GHC version on darwin.
105105
- name: Build development shell with nix dependencies for current GHC version
106-
run: nix develop --print-build-logs .#all-nix-dev-shells --profile dev
106+
run: nix develop --print-build-logs .#haskell-language-server-dev-nix --profile dev
107107
- name: Push development shell
108108
if: ${{ env.HAS_TOKEN == 'true' }}
109109
run: cachix push haskell-language-server dev

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
};
173173

174174
ghc902Config = (import ./configuration-ghc-90.nix) { inherit pkgs inputs; };
175-
ghc926Config = (import ./configuration-ghc-92.nix) { inherit pkgs inputs; };
175+
ghc927Config = (import ./configuration-ghc-92.nix) { inherit pkgs inputs; };
176176
ghc944Config = (import ./configuration-ghc-94.nix) { inherit pkgs inputs; };
177177

178178
# GHC versions
@@ -182,13 +182,13 @@
182182
ghcVersion = "ghc" + (pkgs.lib.replaceStrings ["."] [""] pkgs.haskellPackages.ghc.version);
183183
cases = {
184184
ghc902 = ghc902Config.tweakHpkgs (pkgs.hlsHpkgs "ghc902");
185-
ghc926 = ghc926Config.tweakHpkgs (pkgs.hlsHpkgs "ghc926");
185+
ghc927 = ghc927Config.tweakHpkgs (pkgs.hlsHpkgs "ghc927");
186186
ghc944 = ghc944Config.tweakHpkgs (pkgs.hlsHpkgs "ghc944");
187187
};
188188
in { default = cases."${ghcVersion}"; } // cases;
189189

190190
ghc902 = supportedGHCs.ghc902;
191-
ghc926 = supportedGHCs.ghc926;
191+
ghc927 = supportedGHCs.ghc927;
192192
ghc944 = supportedGHCs.ghc944;
193193
ghcDefault = supportedGHCs.default;
194194

@@ -310,15 +310,15 @@
310310
simpleDevShells = {
311311
haskell-language-server-dev = mkDevShell ghcDefault "cabal.project";
312312
haskell-language-server-902-dev = mkDevShell ghc902 "cabal.project";
313-
haskell-language-server-926-dev = mkDevShell ghc926 "cabal.project";
313+
haskell-language-server-927-dev = mkDevShell ghc927 "cabal.project";
314314
haskell-language-server-944-dev = mkDevShell ghc944 "cabal.project";
315315
};
316316

317317
# Developement shell, haskell packages are also provided by nix
318318
nixDevShells = {
319319
haskell-language-server-dev-nix = mkDevShellWithNixDeps ghcDefault "cabal.project";
320320
haskell-language-server-902-dev-nix = mkDevShellWithNixDeps ghc902 "cabal.project";
321-
haskell-language-server-926-dev-nix = mkDevShellWithNixDeps ghc926 "cabal.project";
321+
haskell-language-server-927-dev-nix = mkDevShellWithNixDeps ghc927 "cabal.project";
322322
haskell-language-server-944-dev-nix = mkDevShellWithNixDeps ghc944 "cabal.project";
323323
};
324324

@@ -327,14 +327,14 @@
327327
envShells = {
328328
haskell-language-server-dev-env = mkEnvShell ghcDefault;
329329
haskell-language-server-902-dev-env = mkEnvShell ghc902;
330-
haskell-language-server-926-dev-env = mkEnvShell ghc926;
330+
haskell-language-server-927-dev-env = mkEnvShell ghc927;
331331
haskell-language-server-944-dev-env = mkEnvShell ghc944;
332332
};
333333

334334
allPackages = {
335335
haskell-language-server = mkExe ghcDefault;
336336
haskell-language-server-902 = mkExe ghc902;
337-
haskell-language-server-926 = mkExe ghc926;
337+
haskell-language-server-927 = mkExe ghc927;
338338
haskell-language-server-944 = mkExe ghc944;
339339
};
340340

@@ -354,9 +354,8 @@
354354
all-haskell-language-server = linkFarmFromDrvs "all-haskell-language-server" (lib.unique (builtins.attrValues allPackages));
355355

356356
# Same for all shells
357-
# We try to build as much as possible, but not much shells are
358-
# working (especially on darwing), so this list is limited.
359-
all-nix-dev-shells = linkFarmFromDrvs "all-dev-shells" (builtins.map (shell: shell.inputDerivation) (lib.unique [nixDevShells.haskell-language-server-dev-nix]));
357+
all-nix-dev-shells = linkFarmFromDrvs "all-dev-shells"
358+
(builtins.map (shell: shell.inputDerivation) (lib.unique (builtins.attrValues nixDevShells)));
360359

361360
all-simple-dev-shells = linkFarmFromDrvs "all-simple-dev-shells"
362361
(builtins.map (shell: shell.inputDerivation) (lib.unique (builtins.attrValues simpleDevShells)));

0 commit comments

Comments
 (0)