Skip to content

Commit 70db3b7

Browse files
committed
nix: pin zls to a release tracking 0.13
1 parent f1a35be commit 70db3b7

File tree

2 files changed

+51
-48
lines changed

2 files changed

+51
-48
lines changed

flake.lock

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

flake.nix

+18-29
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
66
flake-utils.url = "github:numtide/flake-utils";
77
zig.url = "github:mitchellh/zig-overlay";
8-
zls.url = "github:zigtools/zls";
8+
zls.url = "github:zigtools/zls/a26718049a8657d4da04c331aeced1697bc7652b";
99

1010
# Used for shell.nix
1111
flake-compat = {
@@ -14,30 +14,22 @@
1414
};
1515
};
1616

17-
outputs = {
18-
self,
19-
nixpkgs,
20-
flake-utils,
21-
...
22-
} @ inputs: let
23-
overlays = [
24-
# Other overlays
25-
(final: prev: {
26-
zigpkgs = inputs.zig.packages.${prev.system};
27-
zlspkgs = inputs.zls.packages.${prev.system};
28-
})
29-
];
30-
31-
# Our supported systems are the same supported systems as the Zig binaries
32-
systems = builtins.attrNames inputs.zig.packages;
33-
in
34-
flake-utils.lib.eachSystem systems (
35-
system: let
36-
pkgs = import nixpkgs {inherit overlays system;};
17+
outputs = { self, nixpkgs, flake-utils, ... }@inputs:
18+
let
19+
overlays = [
20+
# Other overlays
21+
(final: prev: {
22+
zigpkgs = inputs.zig.packages.${prev.system};
23+
zlspkgs = inputs.zls.packages.${prev.system};
24+
})
25+
];
26+
27+
# Our supported systems are the same supported systems as the Zig binaries
28+
systems = builtins.attrNames inputs.zig.packages;
29+
in flake-utils.lib.eachSystem systems (system:
30+
let pkgs = import nixpkgs { inherit overlays system; };
3731
in rec {
38-
commonInputs = with pkgs; [
39-
zigpkgs."0.13.0"
40-
] ++ darwinInputs;
32+
commonInputs = with pkgs; [ zigpkgs."0.13.0" ] ++ darwinInputs;
4133

4234
darwinInputs = pkgs.lib.optionals pkgs.stdenv.isDarwin (with pkgs; [
4335
darwin.apple_sdk.frameworks.Security
@@ -62,13 +54,10 @@
6254
};
6355

6456
devShells.default = pkgs.mkShell {
65-
buildInputs = commonInputs ++ (with pkgs; [
66-
zlspkgs.default
67-
]);
57+
buildInputs = commonInputs ++ (with pkgs; [ zlspkgs.default ]);
6858
};
6959

7060
# For compatibility with older versions of the `nix` binary
7161
devShell = self.devShells.${system}.default;
72-
}
73-
);
62+
});
7463
}

0 commit comments

Comments
 (0)