Skip to content

Commit e75d94a

Browse files
committed
Update flake to GHC 9.2.6 and 9.4.4
1 parent 3c8fe25 commit e75d94a

5 files changed

+79
-259
lines changed

configuration-ghc-90.nix

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,32 @@ 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_5_20221107;
22-
ghc-lib-parser = hself.ghc-lib-parser_9_2_5_20221107;
23-
ghc-lib-parser-ex = hself.ghc-lib-parser-ex_9_2_1_1;
24-
2521
Cabal = hself.Cabal_3_6_3_0;
26-
ormolu = hself.ormolu_0_5_0_1;
27-
fourmolu = hself.fourmolu_0_9_0_0;
28-
hlint = appendConfigureFlag (hself.callCabal2nix "hlint" inputs.hlint-341 {}) "-fghc-lib";
22+
23+
Cabal-syntax = hself.Cabal-syntax_3_8_1_0;
24+
25+
ghc-lib-parser = hself.callCabal2nix "ghc-lib-parser" inputs.ghc-lib-parser-94 {};
26+
27+
hlint = appendConfigureFlag (hself.callCabal2nix "hlint" inputs.hlint-35 {}) "-fghc-lib";
2928

3029
hls-hlint-plugin = hself.callCabal2nixWithOptions "hls-hlint-plugin"
3130
./plugins/hls-hlint-plugin
3231
(pkgs.lib.concatStringsSep " " [ "-fhlint34" "-fghc-lib" ]) { };
3332

33+
OneTuple = overrideCabal hsuper.OneTuple (drv: {
34+
libraryHaskellDepends = drv.libraryHaskellDepends or [] ++ [
35+
hself.base-orphans
36+
];
37+
});
38+
39+
ormolu = hself.callCabal2nix "ormolu" inputs.ormolu-052 {};
40+
3441
# Re-generate HLS drv excluding some plugins
3542
haskell-language-server =
3643
hself.callCabal2nixWithOptions "haskell-language-server" ./.
3744
(pkgs.lib.concatStringsSep " " [ "-f-stylishhaskell" ])
3845
{ };
3946

40-
retrie = hself.retrie_1_1_0_0;
41-
apply-refact = hself.apply-refact_0_9_3_0;
42-
4347
});
4448
in {
4549
inherit disabledPlugins;

configuration-ghc-92.nix

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,13 @@ let
2323
# https://github.com/nikita-volkov/ptr-poker/issues/11
2424
ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { };
2525

26-
ghc-exactprint =
27-
hself.callCabal2nix "ghc-exactprint" inputs.ghc-exactprint-150 { };
28-
fourmolu = hself.fourmolu_0_9_0_0;
29-
hlint = appendConfigureFlag (hself.callCabal2nix "hlint" inputs.hlint-341 {}) "-fghc-lib";
26+
Cabal-syntax = hself.Cabal-syntax_3_8_1_0;
27+
28+
ghc-lib-parser = hself.callCabal2nix "ghc-lib-parser" inputs.ghc-lib-parser-94 {};
29+
30+
hlint = appendConfigureFlag (hself.callCabal2nix "hlint" inputs.hlint-35 {}) "-fghc-lib";
31+
32+
ormolu = hself.callCabal2nix "ormolu" inputs.ormolu-052 {};
3033

3134
stylish-haskell = appendConfigureFlag hsuper.stylish-haskell "-fghc-lib";
3235

configuration-ghc-94.nix

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ let
1717
# https://github.com/nikita-volkov/ptr-poker/issues/11
1818
ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { };
1919

20-
# Freezes in test for some reason.
21-
ghc-exactprint =
22-
dontCheck (hself.callCabal2nix "ghc-exactprint" inputs.ghc-exactprint-160 { });
23-
hlint = hsuper.callCabal2nix "hlint" inputs.hlint-35 {};
20+
ormolu = hself.ormolu_0_5_3_0;
2421

2522
stylish-haskell = appendConfigureFlag hsuper.stylish-haskell "-fghc-lib";
2623

flake.lock

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

0 commit comments

Comments
 (0)