Skip to content

Commit c3ddf43

Browse files
smunixmichaelpjmergify[bot]
authored
update flakes to compile with ghc928 and ghc962 (#3641)
* update flakes, fix implicit-hie-cradle * bump apply-refact, 0.12 -> 0.13 * use 'implicit-hie-cradle-0.5.0.1' instead of '0.4.0.2' (there doesn't appear to be any functional changes) --------- Co-authored-by: Michael Peyton Jones <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
1 parent 7882822 commit c3ddf43

5 files changed

+74
-31
lines changed

configuration-ghc-92.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ let
1919
doCheck = false;
2020
});
2121
} // (builtins.mapAttrs (_: drv: disableLibraryProfiling drv) {
22-
apply-refact = hsuper.apply-refact_0_12_0_0;
22+
apply-refact = hsuper.apply-refact_0_13_0_0;
2323

2424
# ptr-poker breaks on MacOS without SSE2 optimizations
2525
# https://github.com/nikita-volkov/ptr-poker/issues/11
@@ -39,6 +39,8 @@ let
3939

4040
hie-bios = hself.callCabal2nix "hie-bios" inputs.haskell-hie-bios { };
4141

42+
implicit-hie-cradle = hself.callCabal2nix "implicit-hie-cradle" inputs.haskell-implicit-hie-cradle { };
43+
4244
# Re-generate HLS drv excluding some plugins
4345
haskell-language-server =
4446
hself.callCabal2nixWithOptions "haskell-language-server" ./.

configuration-ghc-94.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ let
1313
{
1414
hlsDisabledPlugins = disabledPlugins;
1515
} // (builtins.mapAttrs (_: drv: disableLibraryProfiling drv) {
16-
apply-refact = hsuper.apply-refact_0_12_0_0;
16+
apply-refact = hsuper.apply-refact_0_13_0_0;
1717

1818
stylish-haskell = appendConfigureFlag hsuper.stylish-haskell "-fghc-lib";
1919

configuration-ghc-96.nix

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,29 @@ let
2828
broken = false;
2929
doCheck = false;
3030
});
31-
apply-refact = hsuper.apply-refact_0_12_0_0;
31+
apply-refact = hsuper.apply-refact_0_13_0_0;
3232
tagged = hself.callHackage "tagged" "0.8.7" { };
3333
primitive = hself.callHackage "primitive" "0.8.0.0" { };
3434
unix-compat = hself.callCabal2nix "unix-compat" inputs.haskell-unix-compat { };
3535
MonadRandom = hself.callHackage "MonadRandom" "0.6" { };
3636
hiedb = hself.callCabal2nix "hiedb" inputs.haskell-hiedb { };
3737
hie-bios = hself.callCabal2nix "hie-bios" inputs.haskell-hie-bios { };
38+
implicit-hie-cradle = hself.callCabal2nix "implicit-hie-cradle" inputs.haskell-implicit-hie-cradle { };
3839
ghc-exactprint = hself.callCabal2nix "ghc-exactprint" inputs.haskell-ghc-exactprint { };
3940

4041
# ptr-poker breaks on MacOS without SSE2 optimizations
4142
# https://github.com/nikita-volkov/ptr-poker/issues/11
4243
ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { };
4344

4445
ormolu = hself.ormolu_0_5_3_0;
45-
fourmolu = hself.callCabal2nix "fourmolu" inputs.fourmolu-012 { };
46+
47+
# TODO: smunix: nix fails to build fourmolu-0.13 from Hackage with these errors:
48+
# tar: */fourmolu/0.13.0.0/fourmolu.json: Not found in archive
49+
# tar: */fourmolu/0.13.0.0/fourmolu.cabal: Not found in archive
50+
# tar: Exiting with failure status due to previous errors
51+
# As an alternative, we could build directly from github:fourmolu. How do people
52+
# feel about this?
53+
fourmolu = hself.callHackage "fourmolu" "0.12.0.0" {};
4654

4755
stylish-haskell = appendConfigureFlag hsuper.stylish-haskell "-fghc-lib";
4856

flake.lock

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

flake.nix

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
};
5252

5353
haskell-hie-bios = {
54-
url = "github:mpickering/hie-bios";
54+
url = "github:haskell/hie-bios";
5555
flake = false;
5656
};
5757

@@ -60,8 +60,18 @@
6060
flake = false;
6161
};
6262

63-
fourmolu-012 = {
64-
url = "https://hackage.haskell.org/package/fourmolu-0.12.0.0/fourmolu-0.12.0.0.tar.gz";
63+
# smunix: github:haskell/hie-bios defines
64+
# 'CabalType :: Maybe String -> Maybe FilePath -> CabalType'
65+
# while the original githcom:Avi-D-coder/hie-bios still has this:
66+
# 'CabalType :: Maybe String -> CabalType'
67+
# We need a patched version of implicit-hie-cradle that works with hls, so I've created
68+
# the repository below. Obviously, this is not sustainable as it adds more technical debt.
69+
# We need a better strategy to streamline changes required by HLS from other hie-bios related
70+
# packages.
71+
# See details here: https://github.com/Avi-D-coder/implicit-hie-cradle/compare/master...smunix:implicit-hie-cradle:smunix-patch-hls-1?expand=1
72+
#
73+
haskell-implicit-hie-cradle = {
74+
url = "github:smunix/implicit-hie-cradle?ref=smunix-patch-hls-0.5-1";
6575
flake = false;
6676
};
6777
};

0 commit comments

Comments
 (0)