Skip to content

Commit 79374d5

Browse files
authored
Update various Nix things (#333)
- Update HLS to 2.2.0.0 and cabal-fmt to 0.1.7 - Bump flake inputs and update some references - Includes fix for input-output-hk/haskell.nix#2042 which @jorisdral recently ran into
2 parents b9d0fff + 3c3091a commit 79374d5

File tree

4 files changed

+121
-56
lines changed

4 files changed

+121
-56
lines changed

flake.lock

Lines changed: 116 additions & 51 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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
};
1111
inputs = {
1212
nixpkgs.follows = "haskellNix/nixpkgs-unstable";
13-
flake-utils.follows = "haskellNix/flake-utils";
13+
flake-utils.url = "github:numtide/flake-utils";
1414
haskellNix = {
1515
url = "github:input-output-hk/haskell.nix";
1616
inputs.hackage.follows = "hackageNix";
@@ -28,7 +28,7 @@
2828
inputs.nixpkgs.follows = "nixpkgs";
2929
};
3030
flake-compat = {
31-
url = "github:edolstra/flake-compat";
31+
url = "github:nix-community/flake-compat";
3232
flake = false;
3333
};
3434
};

nix/shell.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ hsPkgs.shellFor {
2121
# This is the place for tools that are required to be built with the same GHC
2222
# version as used in hsPkgs.
2323
tools = lib.mapAttrs (_: t: t // { index-state = pkgs.tool-index-state; }) {
24-
haskell-language-server = { version = "2.0.0.1"; };
24+
haskell-language-server = { version = "2.2.0.0"; };
2525
};
2626

2727
shellHook = ''

nix/tools.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
inputs: final: prev:
22

33
let
4-
tool-index-state = "2023-07-05T00:00:00Z";
4+
tool-index-state = "2023-09-04T00:00:00Z";
55
tool = name: version: other:
66
final.haskell-nix.tool final.hsPkgs.args.compiler-nix-name name ({
77
version = version;
@@ -37,7 +37,7 @@ in
3737

3838
stylish-haskell = tool "stylish-haskell" "0.14.4.0" { };
3939

40-
cabal-fmt = tool "cabal-fmt" "0.1.6" { };
40+
cabal-fmt = tool "cabal-fmt" "0.1.7" { };
4141

4242
scriv = prev.scriv.overrideAttrs (_: {
4343
version = "1.2.0-custom-iog";

0 commit comments

Comments
 (0)