Skip to content

Commit 75c6f96

Browse files
cydparserlf-
authored andcommitted
Update flake to GHC 9.2.6 and 9.4.4 (#3503)
* configuration-ghc-94.nix: Don't yolo anymore since packages work now * Stop doing an extremely slow fetch of all-cabal-hashes * Export an overlay that does not override the package set * At least it works in nix on 9.4 * Allow ormolu-0.5.3 * Update flake to GHC 9.2.6 and 9.4.4 --------- Co-authored-by: Jade Lovelace <[email protected]>
1 parent 7523030 commit 75c6f96

File tree

7 files changed

+107
-339
lines changed

7 files changed

+107
-339
lines changed

Diff for: configuration-ghc-90.nix

+14-10
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;

Diff for: configuration-ghc-92.nix

+9-4
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,19 @@ let
1919
doCheck = false;
2020
});
2121
} // (builtins.mapAttrs (_: drv: disableLibraryProfiling drv) {
22+
apply-refact = hsuper.apply-refact_0_12_0_0;
23+
2224
# ptr-poker breaks on MacOS without SSE2 optimizations
2325
# https://github.com/nikita-volkov/ptr-poker/issues/11
2426
ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { };
2527

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";
28+
Cabal-syntax = hself.Cabal-syntax_3_8_1_0;
29+
30+
ghc-lib-parser = hself.callCabal2nix "ghc-lib-parser" inputs.ghc-lib-parser-94 {};
31+
32+
hlint = appendConfigureFlag (hself.callCabal2nix "hlint" inputs.hlint-35 {}) "-fghc-lib";
33+
34+
ormolu = hself.callCabal2nix "ormolu" inputs.ormolu-052 {};
3035

3136
stylish-haskell = appendConfigureFlag hsuper.stylish-haskell "-fghc-lib";
3237

Diff for: configuration-ghc-94.nix

+6-11
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,23 @@ let
1212
with pkgs.haskell.lib;
1313
{
1414
hlsDisabledPlugins = disabledPlugins;
15-
# YOLO
16-
mkDerivation = args:
17-
hsuper.mkDerivation (args // {
18-
jailbreak = true;
19-
doCheck = false;
20-
});
2115
} // (builtins.mapAttrs (_: drv: disableLibraryProfiling drv) {
16+
apply-refact = hsuper.apply-refact_0_12_0_0;
17+
2218
# ptr-poker breaks on MacOS without SSE2 optimizations
2319
# https://github.com/nikita-volkov/ptr-poker/issues/11
2420
ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { };
2521

26-
ghc-exactprint =
27-
hself.callCabal2nix "ghc-exactprint" inputs.ghc-exactprint-160 { };
28-
hlint = hsuper.callCabal2nix "hlint" inputs.hlint-35 {};
22+
ormolu = hself.ormolu_0_5_3_0;
2923

3024
stylish-haskell = appendConfigureFlag hsuper.stylish-haskell "-fghc-lib";
3125

3226
# Re-generate HLS drv excluding some plugins
3327
haskell-language-server =
3428
hself.callCabal2nixWithOptions "haskell-language-server" ./.
35-
(pkgs.lib.concatStringsSep " " [ "-fpedantic" "-f-hlint" ]) { };
36-
29+
# Pedantic cannot be used due to -Werror=unused-top-binds
30+
# Check must be disabled due to some missing required files
31+
(pkgs.lib.concatStringsSep " " [ "--no-check" "-f-pedantic" "-f-hlint" ]) { };
3732
});
3833
in {
3934
inherit disabledPlugins;

0 commit comments

Comments
 (0)