From 585ce706842192aef319ff3ccd83c2b3887fead6 Mon Sep 17 00:00:00 2001
From: joshp123 <joshp123@users.noreply.github.com>
Date: Sat, 14 Feb 2026 22:05:23 -0800
Subject: [PATCH] chore: add nix fmt formatter + switch to fetchPnpmDeps

---
 flake.nix                              | 62 +++++++++++++++++---------
 nix/checks/openclaw-config-options.nix |  4 +-
 nix/checks/openclaw-gateway-tests.nix  |  4 +-
 nix/packages/openclaw-gateway.nix      |  4 +-
 4 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/flake.nix b/flake.nix
index ca07280..11829a4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,21 +16,34 @@
     nix-steipete-tools.url = "github:openclaw/nix-steipete-tools";
   };
 
-  outputs = { self, nixpkgs, flake-utils, home-manager, nix-steipete-tools }:
+  outputs =
+    {
+      self,
+      nixpkgs,
+      flake-utils,
+      home-manager,
+      nix-steipete-tools,
+    }:
     let
       overlay = import ./nix/overlay.nix;
       sourceInfoStable = import ./nix/sources/openclaw-source.nix;
-      systems = [ "x86_64-linux" "aarch64-darwin" ];
+      systems = [
+        "x86_64-linux"
+        "aarch64-darwin"
+      ];
     in
-    flake-utils.lib.eachSystem systems (system:
+    flake-utils.lib.eachSystem systems (
+      system:
       let
         pkgs = import nixpkgs {
           inherit system;
           overlays = [ overlay ];
         };
-        steipetePkgs = if nix-steipete-tools ? packages && builtins.hasAttr system nix-steipete-tools.packages
-          then nix-steipete-tools.packages.${system}
-          else {};
+        steipetePkgs =
+          if nix-steipete-tools ? packages && builtins.hasAttr system nix-steipete-tools.packages then
+            nix-steipete-tools.packages.${system}
+          else
+            { };
         packageSetStable = import ./nix/packages {
           pkgs = pkgs;
           sourceInfo = sourceInfoStable;
@@ -38,6 +51,8 @@
         };
       in
       {
+        formatter = pkgs.nixfmt-tree;
+
         packages = packageSetStable // {
           default = packageSetStable.openclaw;
         };
@@ -54,28 +69,35 @@
           config-validity = pkgs.callPackage ./nix/checks/openclaw-config-validity.nix {
             openclawGateway = packageSetStable.openclaw-gateway;
           };
-        } // (if pkgs.stdenv.hostPlatform.isLinux then {
-          gateway-tests = pkgs.callPackage ./nix/checks/openclaw-gateway-tests.nix {
-            sourceInfo = sourceInfoStable;
-          };
-          config-options = pkgs.callPackage ./nix/checks/openclaw-config-options.nix {
-            sourceInfo = sourceInfoStable;
-          };
-          default-instance = pkgs.callPackage ./nix/checks/openclaw-default-instance.nix {};
-          hm-activation = import ./nix/checks/openclaw-hm-activation.nix {
-            inherit pkgs home-manager;
-          };
-        } else {});
+        }
+        // (
+          if pkgs.stdenv.hostPlatform.isLinux then
+            {
+              gateway-tests = pkgs.callPackage ./nix/checks/openclaw-gateway-tests.nix {
+                sourceInfo = sourceInfoStable;
+              };
+              config-options = pkgs.callPackage ./nix/checks/openclaw-config-options.nix {
+                sourceInfo = sourceInfoStable;
+              };
+              default-instance = pkgs.callPackage ./nix/checks/openclaw-default-instance.nix { };
+              hm-activation = import ./nix/checks/openclaw-hm-activation.nix {
+                inherit pkgs home-manager;
+              };
+            }
+          else
+            { }
+        );
 
         devShells.default = pkgs.mkShell {
           packages = [
             pkgs.git
-            pkgs.nixfmt-rfc-style
+            pkgs.nixfmt-tree
             pkgs.nil
           ];
         };
       }
-    ) // {
+    )
+    // {
       overlays.default = overlay;
       homeManagerModules.openclaw = import ./nix/modules/home-manager/openclaw.nix;
       darwinModules.openclaw = import ./nix/modules/darwin/openclaw.nix;
diff --git a/nix/checks/openclaw-config-options.nix b/nix/checks/openclaw-config-options.nix
index 1376e9d..0e50087 100644
--- a/nix/checks/openclaw-config-options.nix
+++ b/nix/checks/openclaw-config-options.nix
@@ -5,6 +5,7 @@
 , fetchurl
 , nodejs_22
 , pnpm_10
+, fetchPnpmDeps
 , pkg-config
 , jq
 , python3
@@ -114,8 +115,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchFromGitHub sourceFetch;
 
-  pnpmDeps = pnpm_10.fetchDeps {
+  pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
+    pnpm = pnpm_10;
     hash = if pnpmDepsHash != null
       then pnpmDepsHash
       else lib.fakeHash;
diff --git a/nix/checks/openclaw-gateway-tests.nix b/nix/checks/openclaw-gateway-tests.nix
index 147a1e1..4b3c75a 100644
--- a/nix/checks/openclaw-gateway-tests.nix
+++ b/nix/checks/openclaw-gateway-tests.nix
@@ -4,6 +4,7 @@
 , fetchurl
 , nodejs_22
 , pnpm_10
+, fetchPnpmDeps
 , bun
 , pkg-config
 , jq
@@ -30,8 +31,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchFromGitHub sourceFetch;
 
-  pnpmDeps = pnpm_10.fetchDeps {
+  pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
+    pnpm = pnpm_10;
     hash = if pnpmDepsHash != null
       then pnpmDepsHash
       else lib.fakeHash;
diff --git a/nix/packages/openclaw-gateway.nix b/nix/packages/openclaw-gateway.nix
index 50411d0..2ba9d68 100644
--- a/nix/packages/openclaw-gateway.nix
+++ b/nix/packages/openclaw-gateway.nix
@@ -4,6 +4,7 @@
 , fetchurl
 , nodejs_22
 , pnpm_10
+, fetchPnpmDeps
 , pkg-config
 , jq
 , python3
@@ -34,8 +35,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = if gatewaySrc != null then gatewaySrc else fetchFromGitHub sourceFetch;
 
-  pnpmDeps = pnpm_10.fetchDeps {
+  pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
+    pnpm = pnpm_10;
     hash = if pnpmDepsHash != null
       then pnpmDepsHash
       else lib.fakeHash;