Skip to content

Commit 1124137

Browse files
authored
Update flake to use fourmolu plugin in GHC 9 (#2482)
* Update nixpkgs to add fourmolu plugin to GHC 9 * Fix GHCIDE build in nix
1 parent ae6f707 commit 1124137

File tree

4 files changed

+9
-15
lines changed

4 files changed

+9
-15
lines changed

configuration-ghc-901.nix

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,19 @@ let
66
"hls-tactics-plugin"
77
"hls-brittany-plugin"
88
"hls-stylish-haskell-plugin"
9-
"hls-fourmolu-plugin"
109
];
1110

1211
hpkgsOverride = hself: hsuper:
1312
with pkgs.haskell.lib;
1413
{
15-
16-
# Released on hackage, but not in nixpkgs yet
17-
primitive-extras = hself.callCabal2nix "primitive-extras" (pkgs.fetchFromGitHub {
18-
owner = "metrix-ai";
19-
repo = "primitive-extras";
20-
rev = "c758d7366b99d85889cb13425fc0140879f8b936";
21-
sha256 = "sha256-vTT7svbM7IkhyxYx2xQ8p1ptoYe+ndcMN5+j9qx++7E=";
22-
}) { };
14+
fourmolu = hself.fourmolu_0_4_0_0;
15+
primitive-extras = hself.primitive-extras_0_10_1_2;
2316

2417
# Re-generate HLS drv excluding some plugins
2518
haskell-language-server =
2619
hself.callCabal2nixWithOptions "haskell-language-server" ./.
2720
(pkgs.lib.concatStringsSep " " [
2821
"-f-brittany"
29-
"-f-fourmolu"
3022
"-f-stylishhaskell"
3123
"-f-tactic"
3224
]) { };

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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@
7070
with haskell.lib; {
7171
# Patches don't apply
7272
github = overrideCabal hsuper.github (drv: { patches = []; });
73+
# GHCIDE requires hie-bios >=0.8 && <0.9.0
74+
hie-bios = hself.hie-bios_0_8_0;
7375
# We need an older version
7476
hiedb = hself.hiedb_0_4_1_0;
7577

myst-parser.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010

1111
buildPythonPackage rec {
1212
pname = "myst-parser";
13-
version = "0.15.1";
13+
version = "0.16.0";
1414

1515
src = fetchPypi {
1616
inherit pname version;
17-
sha256 = "00qnpkfjrn7bqbazm20n3zcci05803cfncvrlvk0rhsbdjiphg3w";
17+
sha256 = "14lzbhciw7ksi219lrcy9afglmg5mx0rmfvrr2x8ssghv4kf8cdy";
1818
};
1919

2020
propagatedBuildInputs = [

0 commit comments

Comments
 (0)