diff --git a/flake.lock b/flake.lock index 47ecac5e..b452c80f 100644 --- a/flake.lock +++ b/flake.lock @@ -109,7 +109,7 @@ "nix-filter": "nix-filter", "nixpkgs": "nixpkgs", "rust-overlay": "rust-overlay", - "tree-sitter-nickel-input": "tree-sitter-nickel-input" + "tree-sitter-nickel": "tree-sitter-nickel" } }, "rust-overlay": { @@ -145,7 +145,7 @@ "type": "github" } }, - "tree-sitter-nickel-input": { + "tree-sitter-nickel": { "inputs": { "flake-utils": [ "flake-utils" diff --git a/flake.nix b/flake.nix index ba3c7582..36b057e6 100644 --- a/flake.nix +++ b/flake.nix @@ -28,16 +28,15 @@ flake-utils.url = "github:numtide/flake-utils"; nix-filter.url = "github:numtide/nix-filter"; - tree-sitter-nickel-input = { + tree-sitter-nickel = { url = "github:nickel-lang/tree-sitter-nickel"; inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; }; }; - outputs = inputs: - with inputs; - flake-utils.lib.eachDefaultSystem ( + outputs = { self, nixpkgs, ... }@inputs: + inputs.flake-utils.lib.eachDefaultSystem ( system: let wasm-bindgen-cli-overlay = final: prev: @@ -56,15 +55,16 @@ pkgs = import nixpkgs { inherit system; - overlays = [ rust-overlay.overlays.default wasm-bindgen-cli-overlay ]; + overlays = [ inputs.rust-overlay.overlays.default wasm-bindgen-cli-overlay ]; }; - craneLib = crane.mkLib pkgs; + craneLib = inputs.crane.mkLib pkgs; - tree-sitter-nickel = tree-sitter-nickel-input.packages.${system}.default; + tree-sitter-nickel = inputs.tree-sitter-nickel.packages.${system}.default; topiaryPkgs = pkgs.callPackage ./default.nix { - inherit advisory-db crane rust-overlay nix-filter craneLib tree-sitter-nickel; + inherit (inputs) advisory-db crane rust-overlay nix-filter tree-sitter-nickel; + inherit craneLib; }; binPkgs = pkgs.callPackage ./bin/default.nix { }; in