use inputs attrset

tweag · Dec 10, 2024 · 9971d47 · 9971d47
1 parent dcf63bf
commit 9971d47
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/flake.lock b/flake.lock
diff --git 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;
+          inherit craneLib tree-sitter-nickel;
         };
         binPkgs = pkgs.callPackage ./bin/default.nix { };
       in