diff --git a/‎.github/workflows/nix-changes.yml‎
Lines changed: 4 additions & 3 deletions b/‎.github/workflows/nix-changes.yml‎
Lines changed: 4 additions & 3 deletions
diff --git a/‎shell.nix‎
Lines changed: 8 additions & 0 deletions b/‎shell.nix‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎tools/nix/devTools.nix‎
Lines changed: 1 addition & 0 deletions b/‎tools/nix/devTools.nix‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎tools/nix/list-requisites.sh‎
Lines changed: 1 addition & 1 deletion b/‎tools/nix/list-requisites.sh‎
Lines changed: 1 addition & 1 deletion
@@ -111,9 +111,10 @@ jobs:
       - uses: cachix/install-nix-action@13d8dd58da0234aa297dedd986986ccb8e7f3e24  # v31.11.1
       - name: Lint Nix files
         run: |
-          nix-shell -I nixpkgs=./tools/nix/pkgs.nix -p 'nixfmt-tree' --run '
-            treefmt --quiet --ci
-          ' && EXIT_CODE="$?" || EXIT_CODE="$?"
+          NIX_LINTER=$(nix-instantiate --eval --raw -E '(import ./shell.nix {}).NIX_LINTER')
+          # Attempt to get it from cache, and fallback to building `devTools.nix` otherwise.
+          nix-store --realise "${NIX_LINTER%/bin/*}" || nix-build -I nixpkgs=tools/nix/pkgs.nix ./tools/nix/devTools.nix --no-out-link
+          "$NIX_LINTER" --quiet --ci && EXIT_CODE="$?" || EXIT_CODE="$?"
           if [ "$EXIT_CODE" != "0" ]
           then
             git --no-pager diff || true
 
@@ -167,6 +167,14 @@ pkgs.mkShell {
       YAMLLINT = pkgs.lib.getExe yamllint;
     }
   )
+  // (
+    let
+      treefmt = pkgs.lib.lists.findFirst (p: p.meta.mainProgram == "treefmt") null devTools;
+    in
+    pkgs.lib.optionalAttrs (treefmt != null) {
+      NIX_LINTER = pkgs.lib.getExe treefmt;
+    }
+  )
   // pkgs.lib.optionalAttrs (!withSQLite) {
     NOSQLITE = "1";
   }
 
@@ -7,6 +7,7 @@
   pkgs.gh
   pkgs.git
   pkgs.jq
+  pkgs.nixfmt-tree
   pkgs.ruff
   pkgs.shellcheck
   pkgs.yamllint
 
@@ -58,7 +58,7 @@ DRV=$(
       ++ builtins.attrValues (
         {
           # Additional packages we are using across the codebase
-          inherit (pkgs) nixfmt-tree sccache;
+          inherit (pkgs) sccache;
         }
         // import ./tools/nix/openssl-matrix.nix { }
         // sharedLibDepsFn (
Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,14 @@ pkgs.mkShell {`
`167`	`167`	`YAMLLINT = pkgs.lib.getExe yamllint;`
`168`	`168`	`}`
`169`	`169`	`)`
	`170`	`+ // (`
	`171`	`+ let`
	`172`	`+ treefmt = pkgs.lib.lists.findFirst (p: p.meta.mainProgram == "treefmt") null devTools;`
	`173`	`+ in`
	`174`	`+ pkgs.lib.optionalAttrs (treefmt != null) {`
	`175`	`+ NIX_LINTER = pkgs.lib.getExe treefmt;`
	`176`	`+ }`
	`177`	`+ )`
`170`	`178`	`// pkgs.lib.optionalAttrs (!withSQLite) {`
`171`	`179`	`NOSQLITE = "1";`
`172`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ DRV=$(`
`58`	`58`	`++ builtins.attrValues (`
`59`	`59`	`{`
`60`	`60`	`# Additional packages we are using across the codebase`
`61`		`- inherit (pkgs) nixfmt-tree sccache;`
	`61`	`+ inherit (pkgs) sccache;`
`62`	`62`	`}`
`63`	`63`	`// import ./tools/nix/openssl-matrix.nix { }`
`64`	`64`	`// sharedLibDepsFn (`