diff --git a/pkgs/by-name/nixpkgs-bootstrap/master.nix b/pkgs/by-name/nixpkgs-bootstrap/master.nix
index dad9ce0b1..24d5e3148 100644
--- a/pkgs/by-name/nixpkgs-bootstrap/master.nix
+++ b/pkgs/by-name/nixpkgs-bootstrap/master.nix
@@ -14,8 +14,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {},
 }:
 mkNixpkgs {
-  rev = "2421b36eb4cb5324e63bc9772310a0993adae88e";
-  sha256 = "sha256-1SQO12+uhAXrlJ8/KiSql04r+C73gPqLzBjeRhaUAic=";
-  version = "unstable-2025-07-23";
+  rev = "6027c30c8e9810896b92429f0092f624f7b1aace";
+  sha256 = "sha256-cnL5WWn/xkZoyH/03NNUS7QgW5vI7D1i74g48qplCvg=";
+  version = "unstable-2025-07-25";
   branch = "master";
 }
diff --git a/pkgs/by-name/nixpkgs-bootstrap/patches.nix b/pkgs/by-name/nixpkgs-bootstrap/patches.nix
index 36d81581a..fe405d86f 100644
--- a/pkgs/by-name/nixpkgs-bootstrap/patches.nix
+++ b/pkgs/by-name/nixpkgs-bootstrap/patches.nix
@@ -51,11 +51,33 @@ in
     hash = "sha256-5M6+FQElYRBNmqLdDosM88yaHzS5mTVwECy2wd/fKdo=";
   })
 
+  # (fetchpatch' {
+  #   # 2025-07-15: merged into staging
+  #   name = "treewide: populate arch and platform for more node packages";
+  #   prUrl = "https://github.com/NixOS/nixpkgs/pull/422938";
+  #   hash = "sha256-lN99K0k9dCUBFXc99XB97cZSVDu5A74pHL40vw9cobY=";
+  # })
+  # XXX(2025-07-25): master & staging have diverged that the above patch doesn't apply correctly;
+  # manually recreate the patches against master:
   (fetchpatch' {
-    # 2025-07-15: merged into staging
-    name = "treewide: populate arch and platform for more node packages";
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/422938";
-    hash = "sha256-lN99K0k9dCUBFXc99XB97cZSVDu5A74pHL40vw9cobY=";
+    name = "nodejs: split destCPU into stdenv.$platform.node";
+    saneCommit = "1fd1d40033deb51bc74ecf11b401cf2ffde5aae3";
+    hash = "sha256-LGp9HzUINI5iTQ3UtggUNWS4zaYhakUI3OqM6rPiYr0=";
+  })
+  (fetchpatch' {
+    name = "treewide: replace node platform mapping with stdenv.hostPlatform.node.{arch,platform}";
+    saneCommit = "57bac5daa19c55a547f60271a7b48c59337ec12f";
+    hash = "sha256-DBenl7O4KuQ1I6jmB66upufYSUdYHRkqRdqRT9stbys=";
+  })
+  (fetchpatch' {
+    name = "buildNpmPackage: push npm_config_* options into npmHooks.npmConfigHook";
+    saneCommit = "f84ef10710b6634f5bcc4c7bc4764ecfd6e8dec5";
+    hash = "sha256-BHwtNvSGaqBRzUj0mP3JqAfygxjiKoX3lh4z9+B4UWk=";
+  })
+  (fetchpatch' {
+    name = "pnpm.configHook: set npm_config_{arch,platform}";
+    saneCommit = "38d2a3d80502ad63686ca886f4438d2942fbddb6";
+    hash = "sha256-0grq9Os9XD+voupAQuB48WBptH5oM/qYX5iEdmuVqMQ=";
   })
 
   (fetchpatch' {
diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix
index 9549b4640..54059950b 100644
--- a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix
+++ b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix
@@ -2,8 +2,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {},
 }:
 mkNixpkgs {
-  rev = "d6717855051b3cdcd7fd47608f3a27a2c575e10d";
-  sha256 = "sha256-fv+P+9O89yUCaPCn2j/YdsQCxYAF0zrEzX65EJDelbo=";
-  version = "unstable-2025-07-23";
+  rev = "7f805faed5f55470e66fb25dced96955b68301a1";
+  sha256 = "sha256-nG5Xe8gUqTmtoXo6Z4imvJXYENUIZ5NbKGXVlZ39UlA=";
+  version = "unstable-2025-07-25";
   branch = "staging-next";
 }
diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging.nix b/pkgs/by-name/nixpkgs-bootstrap/staging.nix
index 72d6f1f48..b878db1ae 100644
--- a/pkgs/by-name/nixpkgs-bootstrap/staging.nix
+++ b/pkgs/by-name/nixpkgs-bootstrap/staging.nix
@@ -2,8 +2,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {},
 }:
 mkNixpkgs {
-  rev = "4e99205fd5108cd263e9b3e339bc99e50d82b557";
-  sha256 = "sha256-9qIXRU6M73Ec4pCwdbH+3uAnBwbUSMAAx9FlVTgBZFk=";
-  version = "unstable-2025-07-23";
+  rev = "19e54819f16faebb66b415aadc48d3404a361573";
+  sha256 = "sha256-lA4q92+e7Key+25fIU8K0CGu7gnEOB06kziq/y09t0Q=";
+  version = "unstable-2025-07-25";
   branch = "staging";
 }