Skip to content

Commit 0d06786

Browse files
authored
Use latest GHC 9.2 and 9.4 in flake.nix (#3354)
1 parent bc18ced commit 0d06786

5 files changed

+40
-302
lines changed

configuration-ghc-90.nix

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ let
1818
# https://github.com/nikita-volkov/ptr-poker/issues/11
1919
ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { };
2020

21-
ghc-lib = hself.ghc-lib_9_2_2_20220307;
21+
ghc-lib = hself.ghc-lib_9_2_4_20220729;
2222
ghc-lib-parser = hself.ghc-lib-parser_9_2_4_20220729;
23-
ghc-lib-parser-ex = hself.ghc-lib-parser-ex_9_2_0_4;
23+
ghc-lib-parser-ex = hself.ghc-lib-parser-ex_9_2_1_1;
2424

2525
Cabal = hself.Cabal_3_6_3_0;
2626
ormolu = hself.ormolu_0_5_0_1;
27-
fourmolu = hself.fourmolu_0_6_0_0;
27+
2828
# Hlint is still broken
2929
hlint = doJailbreak (hself.callCabal2nix "hlint" inputs.hlint-34 { });
3030

configuration-ghc-92.nix

-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ let
2424
# https://github.com/nikita-volkov/ptr-poker/issues/11
2525
ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { };
2626

27-
ghc-exactprint =
28-
hself.callCabal2nix "ghc-exactprint" inputs.ghc-exactprint-150 { };
2927
# Hlint is still broken
3028
hlint = doJailbreak (hself.callCabal2nix "hlint" inputs.hlint { });
3129

configuration-ghc-94.nix

-13
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,6 @@ let
3131

3232
stylish-haskell = appendConfigureFlag hsuper.stylish-haskell "-fghc-lib";
3333

34-
cereal = hsuper.callHackage "cereal" "0.5.8.3" {};
35-
base-compat = hsuper.callHackage "base-compat" "0.12.2" {};
36-
base-compat-batteries = hsuper.callHackage "base-compat-batteries" "0.12.2" {};
37-
hashable = hsuper.callHackage "hashable" "1.4.1.0" {};
38-
primitive = hsuper.callHackage "primitive" "0.7.4.0" {};
39-
ghc-check = hsuper.callHackage "ghc-check" "0.5.0.8" {};
40-
lens = hsuper.callHackage "lens" "5.2" {};
41-
integer-logarithms = hsuper.callHackage "integer-logarithms" "1.0.3.1" {};
42-
hiedb = hsuper.callHackage "hiedb" "0.4.2.0" {};
43-
hie-bios = hsuper.callHackage "hie-bios" "0.11.0" {};
44-
lsp = hsuper.callCabal2nix "lsp" inputs.lsp {};
45-
lsp-types = hsuper.callCabal2nix "lsp-types" inputs.lsp-types {};
46-
4734
# Re-generate HLS drv excluding some plugins
4835
haskell-language-server =
4936
hself.callCabal2nixWithOptions "haskell-language-server" ./.

flake.lock

+19-201
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)