Skip to content

Commit 3ea4430

Browse files
committed
Add flake support for older versions of zls
1 parent 9272d3d commit 3ea4430

File tree

2 files changed

+49
-14
lines changed

2 files changed

+49
-14
lines changed

flake.lock

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

flake.nix

Lines changed: 44 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,68 @@
22
inputs = {
33
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
44

5-
zig.url = "github:silversquirl/zig-flake";
6-
zig.inputs.nixpkgs.follows = "nixpkgs";
5+
zig-flake.url = "github:silversquirl/zig-flake";
6+
zig-flake.inputs.nixpkgs.follows = "nixpkgs";
77

88
gitignore.url = "github:hercules-ci/gitignore.nix";
99
gitignore.inputs.nixpkgs.follows = "nixpkgs";
1010
};
1111

1212
outputs = {
1313
nixpkgs,
14-
zig,
14+
zig-flake,
1515
gitignore,
1616
...
1717
}: let
1818
forAllSystems = f: builtins.mapAttrs f nixpkgs.legacyPackages;
19-
in {
20-
formatter = forAllSystems (system: pkgs: pkgs.alejandra);
2119

22-
packages = forAllSystems (system: pkgs: {
23-
default = zig.packages.${system}.zig_0_15_1.makePackage {
20+
mkPackage = {
21+
zig,
22+
version,
23+
src,
24+
depsHash ? nixpkgs.lib.fakeHash,
25+
}:
26+
zig.makePackage {
27+
inherit version src depsHash;
2428
pname = "zls";
25-
version = "0.15.1";
2629
meta.mainProgram = "zls";
27-
src = gitignore.lib.gitignoreSource ./.;
2830
doCheck = true;
2931
zigReleaseMode = "safe";
32+
};
33+
in {
34+
formatter = forAllSystems (system: pkgs: pkgs.alejandra);
35+
36+
packages = forAllSystems (system: pkgs: rec {
37+
default = master;
38+
zls = master; # compat
39+
master = mkPackage {
40+
zig = zig-flake.packages.${system}.nightly;
41+
version = "master";
42+
src = gitignore.lib.gitignoreSource ./.;
3043
depsHash = "sha256-ji4qpx3WEEIaW8/Ps5uNJHvMEA+tl6wWj3dZx0RWQpo=";
3144
};
45+
zls_0_15_0 = mkPackage {
46+
zig = zig-flake.packages.${system}.zig_0_15_1;
47+
version = "0.15.0";
48+
src = pkgs.fetchFromGitHub system {
49+
owner = "zigtools";
50+
repo = "zls";
51+
rev = "0.15.0";
52+
hash = "sha256-GFzSHUljcxy7sM1PaabbkQUdUnLwpherekPWJFxXtnk=";
53+
};
54+
depsHash = "sha256-ji4qpx3WEEIaW8/Ps5uNJHvMEA+tl6wWj3dZx0RWQpo=";
55+
};
56+
zls_0_14_0 = mkPackage {
57+
zig = zig-flake.packages.${system}.zig_0_14_1;
58+
version = "0.14.0";
59+
src = pkgs.fetchFromGitHub {
60+
owner = "zigtools";
61+
repo = "zls";
62+
rev = "0.14.0";
63+
hash = "sha256-A5Mn+mfIefOsX+eNBRHrDVkqFDVrD3iXDNsUL4TPhKo=";
64+
};
65+
depsHash = "sha256-5ub+AA2PYuHrzPfouii/zfuFmQfn6mlMw4yOUDCw3zI=";
66+
};
3267
});
3368
};
3469
}

0 commit comments

Comments
 (0)