diff --git a/flake.lock b/flake.lock index 0404252..3f95b08 100644 --- a/flake.lock +++ b/flake.lock @@ -16,6 +16,27 @@ "type": "github" } }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "zls-flake", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1762808025, + "narHash": "sha256-XmjITeZNMTQXGhhww6ed/Wacy2KzD6svioyCX7pkUu4=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "cb5e3fdca1de58ccbc3ef53de65bd372b48f567c", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1779536132, @@ -36,7 +57,8 @@ "inputs": { "nixpkgs": "nixpkgs", "utils": "utils", - "zig-overlay": "zig-overlay" + "zig-overlay": "zig-overlay", + "zls-flake": "zls-flake" } }, "systems": { @@ -111,6 +133,31 @@ "repo": "zig-overlay", "type": "github" } + }, + "zls-flake": { + "inputs": { + "gitignore": "gitignore", + "nixpkgs": [ + "nixpkgs" + ], + "zig-overlay": [ + "zig-overlay" + ] + }, + "locked": { + "lastModified": 1764896432, + "narHash": "sha256-6IkRtQkn+qUHDz00QvCV/rb2yuF6xWEXug41CD8LLw8=", + "owner": "zigtools", + "repo": "zls", + "rev": "f91b2e1e305e5d5bd3725aea90f9f9bfb3dce055", + "type": "github" + }, + "original": { + "owner": "zigtools", + "ref": "0.15.1", + "repo": "zls", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 1b6d85b..fa7f168 100644 --- a/flake.nix +++ b/flake.nix @@ -7,20 +7,27 @@ url = "github:mitchellh/zig-overlay/main"; inputs.nixpkgs.follows = "nixpkgs"; }; + + zls-flake = { + url = "github:zigtools/zls/0.15.1"; + inputs.zig-overlay.follows = "zig-overlay"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = { self, nixpkgs, utils, zig-overlay }: + outputs = { self, nixpkgs, utils, zig-overlay, zls-flake }: utils.lib.eachDefaultSystem(system: let - zig = zig-overlay.packages.${system}; + zls = zls-flake.packages.${system}.default; + zig = zig-overlay.packages.${system}."0.15.1"; pkgs = import nixpkgs { inherit system; }; cache = import ./nix/cache.nix { inherit pkgs; inherit zig; }; in { - devshells.default = pkgs.mkShell { - nativeBuildInputs = [ zig."0.15.1" pkgs.zls ]; + devShells.default = pkgs.mkShell { + nativeBuildInputs = [ zig zls ]; }; packages.default = pkgs.stdenv.mkDerivation { @@ -29,7 +36,7 @@ doCheck = false; src = ./.; - nativeBuildInputs = [ zig."0.15.1" ]; + nativeBuildInputs = [ zig ]; buildPhase = '' export ZIG_GLOBAL_CACHE_DIR=$(mktemp -d)