|
5 | 5 | nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
|
6 | 6 | flake-utils.url = "github:numtide/flake-utils";
|
7 | 7 | zig.url = "github:mitchellh/zig-overlay";
|
8 |
| - zls.url = "github:zigtools/zls"; |
| 8 | + zls.url = "github:zigtools/zls/a26718049a8657d4da04c331aeced1697bc7652b"; |
9 | 9 |
|
10 | 10 | # Used for shell.nix
|
11 | 11 | flake-compat = {
|
|
14 | 14 | };
|
15 | 15 | };
|
16 | 16 |
|
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; }; |
37 | 31 | in rec {
|
38 |
| - commonInputs = with pkgs; [ |
39 |
| - zigpkgs."0.13.0" |
40 |
| - ] ++ darwinInputs; |
| 32 | + commonInputs = with pkgs; [ zigpkgs."0.13.0" ] ++ darwinInputs; |
41 | 33 |
|
42 | 34 | darwinInputs = pkgs.lib.optionals pkgs.stdenv.isDarwin (with pkgs; [
|
43 | 35 | darwin.apple_sdk.frameworks.Security
|
|
62 | 54 | };
|
63 | 55 |
|
64 | 56 | devShells.default = pkgs.mkShell {
|
65 |
| - buildInputs = commonInputs ++ (with pkgs; [ |
66 |
| - zlspkgs.default |
67 |
| - ]); |
| 57 | + buildInputs = commonInputs ++ (with pkgs; [ zlspkgs.default ]); |
68 | 58 | };
|
69 | 59 |
|
70 | 60 | # For compatibility with older versions of the `nix` binary
|
71 | 61 | devShell = self.devShells.${system}.default;
|
72 |
| - } |
73 |
| - ); |
| 62 | + }); |
74 | 63 | }
|
0 commit comments