Skip to content

Commit 31ad908

Browse files
committed
Update nix flake
Doing a nixpkgs update gains ghc 8.10.6 support. lsp-types needed updating to satisfy bounds so I did that.
1 parent b1d3dce commit 31ad908

File tree

2 files changed

+17
-29
lines changed

2 files changed

+17
-29
lines changed

Diff for: flake.lock

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

Diff for: flake.nix

+8-20
Original file line numberDiff line numberDiff line change
@@ -79,23 +79,13 @@
7979
sha256 = "byehvdxQxhNk5ZQUXeFHjAZpAze4Ct9261ro4c5acZk=";
8080
}) { };
8181

82-
lsp = hself.callCabal2nix "lsp"
83-
(builtins.fetchTarball {
84-
url = "https://hackage.haskell.org/package/lsp-1.2.0.1/lsp-1.2.0.1.tar.gz";
85-
sha256 = "1lhzsraiw11ldxvxn8ax11hswpyzsvw2da2qmp3p6fc9rfpz4pj5";
86-
}) { };
82+
lsp = hself.lsp_1_2_0_1;
8783

88-
lsp-types = hself.callCabal2nix "lsp-types"
89-
(builtins.fetchTarball {
90-
url = "https://hackage.haskell.org/package/lsp-types-1.3.0.0/lsp-types-1.3.0.0.tar.gz";
91-
sha256 = "0qajyyj2d51daa4y0pqaa87n4nny0i920ivvzfnrk9gq9386iac7";
92-
}) { };
84+
lsp-types = hself.lsp-types_1_3_0_1;
9385

94-
lsp-test = hself.callCabal2nix "lsp-test"
95-
(builtins.fetchTarball {
96-
url = "https://hackage.haskell.org/package/lsp-test-0.14.0.1/lsp-test-0.14.0.1.tar.gz";
97-
sha256 = "10lnyg7nlbd3ymgvjjlrkfndyy7ay9cwnsk684p08k2gzlric4yq";
98-
}) { };
86+
lsp-test = hself.lsp-test_0_14_0_1;
87+
88+
ormolu = hself.ormolu_0_2_0_0;
9989
};
10090

10191
hlsSources =
@@ -177,7 +167,7 @@
177167
+ pkgs.lib.replaceStrings [ "." ] [ "" ]
178168
pkgs.haskellPackages.ghc.version);
179169
ghc884 = pkgs.hlsHpkgs "ghc884";
180-
ghc8104 = pkgs.hlsHpkgs "ghc8104";
170+
ghc8106 = pkgs.hlsHpkgs "ghc8106";
181171
ghc901 = ghc901Config.tweakHpkgs (pkgs.hlsHpkgs "ghc901");
182172

183173
# For markdown support
@@ -252,15 +242,13 @@
252242
# dev shell
253243
haskell-language-server-dev = mkDevShell ghcDefault;
254244
haskell-language-server-884-dev = mkDevShell ghc884;
255-
haskell-language-server-8104-dev = mkDevShell ghc8104;
256-
haskell-language-server-8105-dev = builtins.throw "GHC 8.10.5 is not available in nixpkgs";
245+
haskell-language-server-8106-dev = mkDevShell ghc8106;
257246
haskell-language-server-901-dev = mkDevShell ghc901;
258247

259248
# hls package
260249
haskell-language-server = mkExe ghcDefault;
261250
haskell-language-server-884 = mkExe ghc884;
262-
haskell-language-server-8104 = mkExe ghc8104;
263-
haskell-language-server-8105 = builtins.throw "GHC 8.10.5 is not available in nixpkgs";
251+
haskell-language-server-8106 = mkExe ghc8106;
264252
haskell-language-server-901 = mkExe ghc901;
265253

266254
# docs

0 commit comments

Comments
 (0)