From c7245d0382da9f983f0d67128e0a17298a22d50a Mon Sep 17 00:00:00 2001
From: thomasjm <tom@codedown.io>
Date: Wed, 26 Aug 2026 17:23:44 -0700
Subject: [PATCH 1/3] Build the testing packages from the stable Nixpkgs

---
 codedown.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/codedown.nix b/codedown.nix
index 5aded89..16ef1cf 100644
--- a/codedown.nix
+++ b/codedown.nix
@@ -19,8 +19,8 @@ rec {
   spellchecker = pkgsMaster.callPackage ./modules/language_servers/markdown-spellcheck-lsp {};
 
   testing = {
-    builds-forever = pkgsMaster.callPackage ./modules/testing/builds-forever/default.nix {};
-    builder-uid = pkgsMaster.callPackage ./modules/testing/builder-uid/default.nix {};
+    builds-forever = callPackage ./modules/testing/builds-forever/default.nix {};
+    builder-uid = callPackage ./modules/testing/builder-uid/default.nix {};
   };
 
   # Exported so clients can build searchers for other package sets, like "codedown.searcher nixpkgs"

From 4de3b0f642fd5a0b815f0b023067655700cb870c Mon Sep 17 00:00:00 2001
From: thomasjm <tom@codedown.io>
Date: Wed, 26 Aug 2026 17:26:12 -0700
Subject: [PATCH 2/3] Build the spellchecker language servers from the stable
 Nixpkgs

---
 codedown.nix                                     | 2 +-
 modules/language_servers/spellchecker/module.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/codedown.nix b/codedown.nix
index 16ef1cf..5a0fdfc 100644
--- a/codedown.nix
+++ b/codedown.nix
@@ -16,7 +16,7 @@ let
 in
 
 rec {
-  spellchecker = pkgsMaster.callPackage ./modules/language_servers/markdown-spellcheck-lsp {};
+  spellchecker = callPackage ./modules/language_servers/markdown-spellcheck-lsp {};
 
   testing = {
     builds-forever = callPackage ./modules/testing/builds-forever/default.nix {};
diff --git a/modules/language_servers/spellchecker/module.nix b/modules/language_servers/spellchecker/module.nix
index bc238b0..55cece6 100644
--- a/modules/language_servers/spellchecker/module.nix
+++ b/modules/language_servers/spellchecker/module.nix
@@ -3,7 +3,7 @@
 with lib;
 
 let
-  pkgsToUse = config.pkgsMaster;
+  pkgsToUse = config.pkgs;
 
   cfg = config.language-servers.spellchecker;
 

From 0e699928219e0abd6c74d10b57f8ccd36b16594d Mon Sep 17 00:00:00 2001
From: thomasjm <tom@codedown.io>
Date: Wed, 26 Aug 2026 18:05:08 -0700
Subject: [PATCH 3/3] Build the Bash kernel from the stable Nixpkgs

---
 modules/kernels/bash/kernel.nix | 3 ---
 modules/kernels/bash/module.nix | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/modules/kernels/bash/kernel.nix b/modules/kernels/bash/kernel.nix
index 01b1264..d6e2a95 100644
--- a/modules/kernels/bash/kernel.nix
+++ b/modules/kernels/bash/kernel.nix
@@ -26,9 +26,6 @@ let
 
   python = python3.withPackages (ps: [bash-kernel]);
 
-  # Checks failed on macOS on release-25.05. Disabling them is one option:
-  # python = python3.withPackages (ps: [(ps.bash-kernel.overrideAttrs (_oldAttrs: { doCheck = false; }))]);
-
   # bash_kernel submits a cell to bash one line at a time over a PTY (~50ms/line),
   # so inlining the ~150-line inspector made the first run take ~10s. Source the
   # script from a one-line loader instead
diff --git a/modules/kernels/bash/module.nix b/modules/kernels/bash/module.nix
index fa823af..da71fc4 100644
--- a/modules/kernels/bash/module.nix
+++ b/modules/kernels/bash/module.nix
@@ -3,7 +3,7 @@
 with lib;
 
 let
-  pkgsToUse = config.pkgsMaster;
+  pkgsToUse = config.pkgs;
 
 in