From da6f4f59bd170ccd1a2e23570d35d7a50ceaea8c Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Fri, 3 Apr 2026 18:38:49 -0400
Subject: [PATCH 1/2] Reapply "ci: update pinned"

This reverts commit fd925917b825c58ac1b7afe92347a9741e6ad5f3, reversing
changes made to 1d8a939046244fc63f47a314c1d364bc7c2b2b18.
---
 .github/zizmor.yml |  2 ++
 ci/pinned.json     | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/zizmor.yml b/.github/zizmor.yml
index f1b71580ebca..b8bd704b9ff4 100644
--- a/.github/zizmor.yml
+++ b/.github/zizmor.yml
@@ -10,3 +10,5 @@
 rules:
   dangerous-triggers:
     disable: true
+  secrets-outside-env:
+    disable: true
diff --git a/ci/pinned.json b/ci/pinned.json
index 9e039136a160..5f4203d1ffa2 100644
--- a/ci/pinned.json
+++ b/ci/pinned.json
@@ -9,9 +9,9 @@
       },
       "branch": "nixpkgs-unstable",
       "submodules": false,
-      "revision": "bde09022887110deb780067364a0818e89258968",
-      "url": "https://github.com/NixOS/nixpkgs/archive/bde09022887110deb780067364a0818e89258968.tar.gz",
-      "hash": "13mi187zpa4rw680qbwp7pmykjia8cra3nwvjqmsjba3qhlzif5l"
+      "revision": "106eb93cbb9d4e4726bf6bc367a3114f7ed6b32f",
+      "url": "https://github.com/NixOS/nixpkgs/archive/106eb93cbb9d4e4726bf6bc367a3114f7ed6b32f.tar.gz",
+      "hash": "0wyyhddz2mqhmq938d337223675jpd83dd5lsks2nhz0hs4r3jha"
     },
     "treefmt-nix": {
       "type": "Git",
@@ -22,9 +22,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca",
-      "url": "https://github.com/numtide/treefmt-nix/archive/e96d59dff5c0d7fddb9d113ba108f03c3ef99eca.tar.gz",
-      "hash": "02gqyxila3ghw8gifq3mns639x86jcq079kvfvjm42mibx7z5fzb"
+      "revision": "75925962939880974e3ab417879daffcba36c4a3",
+      "url": "https://github.com/numtide/treefmt-nix/archive/75925962939880974e3ab417879daffcba36c4a3.tar.gz",
+      "hash": "118zlbyzmh21x6rad2vrxjkdfyicd8lx3s0if8b791n51hz1r9ns"
     }
   },
   "version": 5

From 8adaa85a7c56da9e1d3fa28075f9c827300f677e Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Fri, 3 Apr 2026 19:16:19 -0400
Subject: [PATCH 2/2] actions/checkout: log disk usage after checkout, don't
 use tmpfs on MacOS

We run out of disk on the latest pinned version on MacOS only, because by
default this allocates 50% of memory for the tmpfs, which is 3.5GB on MacOS
(and 4GB on Linux).

We can't increase to 4GB, though, because we get the error
"Desired memsize 4294967296 too large - defaulting to 3758096384 bytes"
if we do.

The logging I add would have saved me a lot of trouble figuring this out.
---
 .github/actions/checkout/action.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/actions/checkout/action.yml b/.github/actions/checkout/action.yml
index ec878ba389f9..1c0ca74cc31a 100644
--- a/.github/actions/checkout/action.yml
+++ b/.github/actions/checkout/action.yml
@@ -95,15 +95,12 @@ runs:
           // This would fail without --refetch, because the we had a partial clone before, but changed it above.
           await run('git', 'fetch', '--depth=1', '--refetch', 'origin', ...(commits.map(({ sha }) => sha)))
 
-          // Checking out onto tmpfs takes 1s and is faster by at least factor 10x.
+          // On Linux, checking out onto tmpfs takes 1s and is faster by at least 10x.
+          // Currently, on Darwin we can only allocate 3.5GB, which isn't enough.
+          // See https://github.com/NixOS/nixpkgs/pull/506437
           await run('mkdir', 'nixpkgs')
-          switch (process.env.RUNNER_OS) {
-            case 'macOS':
-              await run('sudo', 'mount_tmpfs', 'nixpkgs')
-              break
-            case 'Linux':
-              await run('sudo', 'mount', '-t', 'tmpfs', 'tmpfs', 'nixpkgs')
-              break
+          if (process.env.RUNNER_OS === 'Linux') {
+            await run('sudo', 'mount', '-t', 'tmpfs', 'tmpfs', 'nixpkgs')
           }
 
           // Create all worktrees in parallel.
@@ -134,3 +131,6 @@ runs:
               await rm('pin-bump.patch')
             }
           }
+
+          console.log('final disk usage:')
+          await run('df', '-h')