From dbd936d32f705bd0a75b970de292667b73776a43 Mon Sep 17 00:00:00 2001
From: Jake Hamilton <jake.hamilton@hey.com>
Date: Sun, 14 Sep 2025 09:35:05 -0700
Subject: [PATCH] refactor: remove unused code

---
 .../foundation/bash/versions/5.2.15-bootstrap.nix         | 6 +++---
 .../bash/versions/5.2.15-stage1-passthrough.nix           | 5 +----
 .../packages/foundation/bash/versions/5.2.15-stage1.nix   | 4 +---
 .../foundation/binutils/versions/2.41-bootstrap.nix       | 4 ++--
 .../binutils/versions/2.41-stage1-passthrough.nix         | 2 --
 .../packages/foundation/binutils/versions/2.41-stage1.nix | 1 -
 .../foundation/bison/versions/3.8.2-bootstrap.nix         | 4 ++--
 .../bison/versions/3.8.2-stage1-passthrough.nix           | 2 --
 .../packages/foundation/bison/versions/3.8.2-stage1.nix   | 1 -
 .../foundation/busybox/versions/1.36.1-bootstrap.nix      | 6 +++---
 .../foundation/bzip2/versions/1.0.8-bootstrap.nix         | 4 ++--
 .../bzip2/versions/1.0.8-stage1-passthrough.nix           | 2 --
 .../packages/foundation/bzip2/versions/1.0.8-stage1.nix   | 2 --
 .../foundation/coreutils/versions/9.4-bootstrap.nix       | 4 ++--
 .../coreutils/versions/9.4-stage1-passthrough.nix         | 2 --
 .../packages/foundation/coreutils/versions/9.4-stage1.nix | 6 ------
 .../foundation/diffutils/versions/3.10-bootstrap.nix      | 4 ++--
 .../diffutils/versions/3.10-stage1-passthrough.nix        | 2 --
 .../foundation/diffutils/versions/3.10-stage1.nix         | 1 -
 .../foundation/findutils/versions/4.9.0-bootstrap.nix     | 4 ++--
 .../findutils/versions/4.9.0-stage1-passthrough.nix       | 2 --
 .../foundation/findutils/versions/4.9.0-stage1.nix        | 1 -
 .../packages/foundation/gawk/versions/5.2.2-bootstrap.nix | 4 ++--
 .../foundation/gawk/versions/5.2.2-stage1-passthrough.nix | 2 --
 .../packages/foundation/gawk/versions/5.2.2-stage1.nix    | 1 -
 .../packages/foundation/gcc/versions/13.2.0-bootstrap.nix | 4 +---
 .../packages/foundation/gcc/versions/13.2.0-stage0.nix    | 1 -
 .../packages/foundation/gcc/versions/13.2.0-stage1.nix    | 1 -
 .../packages/foundation/gcc/versions/13.2.0-stage2.nix    | 1 -
 .../foundation/gcc/versions/13.2.0-stage3-passthrough.nix | 2 --
 .../packages/foundation/gcc/versions/13.2.0-stage3.nix    | 1 -
 .../packages/foundation/gcc/versions/13.2.0-stage4.nix    | 1 -
 .../packages/foundation/gcc/versions/13.2.0-stage5.nix    | 2 --
 .../packages/foundation/glibc/versions/2.38-bootstrap.nix | 1 -
 .../foundation/glibc/versions/2.38-stage1-passthrough.nix | 2 --
 .../packages/foundation/glibc/versions/2.38-stage1.nix    | 1 -
 .../foundation/gnugrep/versions/3.11-bootstrap.nix        | 4 ++--
 .../gnugrep/versions/3.11-stage1-passthrough.nix          | 2 --
 .../packages/foundation/gnugrep/versions/3.11-stage1.nix  | 1 -
 .../foundation/gnum4/versions/1.4.19-bootstrap.nix        | 4 ++--
 .../gnum4/versions/1.4.19-stage1-passthrough.nix          | 2 --
 .../packages/foundation/gnum4/versions/1.4.19-stage1.nix  | 1 -
 .../foundation/gnumake/versions/4.4.1-bootstrap.nix       | 4 ++--
 .../gnumake/versions/4.4.1-stage1-passthrough.nix         | 2 --
 .../packages/foundation/gnumake/versions/4.4.1-stage1.nix | 1 -
 .../foundation/gnupatch/versions/2.7-bootstrap.nix        | 4 ++--
 .../gnupatch/versions/2.7-stage1-passthrough.nix          | 2 --
 .../packages/foundation/gnupatch/versions/2.7-stage1.nix  | 1 -
 .../packages/foundation/gnused/versions/4.9-bootstrap.nix | 4 ++--
 .../foundation/gnused/versions/4.9-stage1-passthrough.nix | 2 --
 .../packages/foundation/gnused/versions/4.9-stage1.nix    | 1 -
 .../foundation/gnutar/versions/1.35-bootstrap.nix         | 4 ++--
 .../gnutar/versions/1.35-stage1-passthrough.nix           | 2 --
 .../packages/foundation/gnutar/versions/1.35-stage1.nix   | 1 -
 .../packages/foundation/gzip/versions/1.13-bootstrap.nix  | 4 ++--
 .../foundation/gzip/versions/1.13-stage1-passthrough.nix  | 2 --
 .../src/packages/foundation/gzip/versions/1.13-stage1.nix | 1 -
 .../foundation/linux-headers/versions/6.5.6-bootstrap.nix | 4 ++--
 .../linux-headers/versions/6.5.6-stage1-passthrough.nix   | 1 -
 .../foundation/linux-headers/versions/6.5.6-stage1.nix    | 1 -
 .../packages/foundation/musl/versions/1.2.4-bootstrap.nix | 4 ++--
 tidepool/src/packages/foundation/musl/versions/1.2.4.nix  | 1 -
 .../foundation/patchelf/versions/0.18.0-bootstrap.nix     | 4 ++--
 .../foundation/python/versions/3.12.0-bootstrap.nix       | 4 ++--
 .../packages/foundation/python/versions/3.12.0-stage1.nix | 2 --
 .../packages/foundation/xz/versions/5.4.3-bootstrap.nix   | 4 ++--
 .../foundation/xz/versions/5.4.3-stage1-passthrough.nix   | 2 --
 .../src/packages/foundation/xz/versions/5.4.3-stage1.nix  | 2 --
 .../packages/foundation/zlib/versions/1.3-bootstrap.nix   | 4 ++--
 .../src/packages/foundation/zlib/versions/1.3-stage1.nix  | 8 --------
 70 files changed, 49 insertions(+), 134 deletions(-)

diff --git a/tidepool/src/packages/foundation/bash/versions/5.2.15-bootstrap.nix b/tidepool/src/packages/foundation/bash/versions/5.2.15-bootstrap.nix
index 39a9742..038bc41 100644
--- a/tidepool/src/packages/foundation/bash/versions/5.2.15-bootstrap.nix
+++ b/tidepool/src/packages/foundation/bash/versions/5.2.15-bootstrap.nix
@@ -1,7 +1,7 @@
-{ config, global }:
+{ global }:
 
 let
-  inherit (global) lib packages builders;
+  inherit (global) lib builders;
   inherit (global.internal.packages) foundation;
 in
 {
@@ -19,7 +19,7 @@ in
       target = "i686-linux";
     };
 
-    builder = builders.passthrough.extend {
+    builder = builders.foundation.passthrough.extend {
       settings = {
         derivation = foundation.stage2-bash;
       };
diff --git a/tidepool/src/packages/foundation/bash/versions/5.2.15-stage1-passthrough.nix b/tidepool/src/packages/foundation/bash/versions/5.2.15-stage1-passthrough.nix
index 2ed0355..df8fc09 100644
--- a/tidepool/src/packages/foundation/bash/versions/5.2.15-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/bash/versions/5.2.15-stage1-passthrough.nix
@@ -4,10 +4,7 @@ let
   inherit (global)
     lib
     packages
-    builders
-    mirrors
-    ;
-  inherit (global.internal.packages) foundation;
+    builders;
 
   package = packages.foundation.bash.versions."5.2.15-stage1".extend {
     platform = {
diff --git a/tidepool/src/packages/foundation/bash/versions/5.2.15-stage1.nix b/tidepool/src/packages/foundation/bash/versions/5.2.15-stage1.nix
index df58636..5f51924 100644
--- a/tidepool/src/packages/foundation/bash/versions/5.2.15-stage1.nix
+++ b/tidepool/src/packages/foundation/bash/versions/5.2.15-stage1.nix
@@ -5,9 +5,7 @@ let
     lib
     packages
     builders
-    mirrors
-    ;
-  inherit (global.internal.packages) foundation;
+    mirrors;
 
   version = lib.strings.removeSuffix "-stage1" config.version;
 
diff --git a/tidepool/src/packages/foundation/binutils/versions/2.41-bootstrap.nix b/tidepool/src/packages/foundation/binutils/versions/2.41-bootstrap.nix
index 598a16e..a7ffd4b 100644
--- a/tidepool/src/packages/foundation/binutils/versions/2.41-bootstrap.nix
+++ b/tidepool/src/packages/foundation/binutils/versions/2.41-bootstrap.nix
@@ -1,7 +1,7 @@
-{ config, global }:
+{ global }:
 
 let
-  inherit (global) lib packages builders;
+  inherit (global) lib builders;
   inherit (global.internal.packages) foundation;
 in
 {
diff --git a/tidepool/src/packages/foundation/binutils/versions/2.41-stage1-passthrough.nix b/tidepool/src/packages/foundation/binutils/versions/2.41-stage1-passthrough.nix
index bbe45e6..9da4e3f 100644
--- a/tidepool/src/packages/foundation/binutils/versions/2.41-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/binutils/versions/2.41-stage1-passthrough.nix
@@ -5,9 +5,7 @@ let
     lib
     packages
     builders
-    mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   package = packages.foundation.binutils.versions."2.41-stage1".extend {
     platform = {
diff --git a/tidepool/src/packages/foundation/binutils/versions/2.41-stage1.nix b/tidepool/src/packages/foundation/binutils/versions/2.41-stage1.nix
index 4bf1022..7af5e22 100644
--- a/tidepool/src/packages/foundation/binutils/versions/2.41-stage1.nix
+++ b/tidepool/src/packages/foundation/binutils/versions/2.41-stage1.nix
@@ -7,7 +7,6 @@ let
     builders
     mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   platform = {
     build = lib.systems.withBuildInfo config.platform.build;
diff --git a/tidepool/src/packages/foundation/bison/versions/3.8.2-bootstrap.nix b/tidepool/src/packages/foundation/bison/versions/3.8.2-bootstrap.nix
index 2a9dce7..ba4e9f9 100644
--- a/tidepool/src/packages/foundation/bison/versions/3.8.2-bootstrap.nix
+++ b/tidepool/src/packages/foundation/bison/versions/3.8.2-bootstrap.nix
@@ -1,7 +1,7 @@
-{ config, global }:
+{ global }:
 
 let
-  inherit (global) lib packages builders;
+  inherit (global) lib builders;
   inherit (global.internal.packages) foundation;
 in
 {
diff --git a/tidepool/src/packages/foundation/bison/versions/3.8.2-stage1-passthrough.nix b/tidepool/src/packages/foundation/bison/versions/3.8.2-stage1-passthrough.nix
index e50e6ad..d89dd31 100644
--- a/tidepool/src/packages/foundation/bison/versions/3.8.2-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/bison/versions/3.8.2-stage1-passthrough.nix
@@ -5,9 +5,7 @@ let
     lib
     packages
     builders
-    mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   package = packages.foundation.bison.versions."3.8.2-stage1".extend {
     platform = {
diff --git a/tidepool/src/packages/foundation/bison/versions/3.8.2-stage1.nix b/tidepool/src/packages/foundation/bison/versions/3.8.2-stage1.nix
index f08a07f..73807fd 100644
--- a/tidepool/src/packages/foundation/bison/versions/3.8.2-stage1.nix
+++ b/tidepool/src/packages/foundation/bison/versions/3.8.2-stage1.nix
@@ -7,7 +7,6 @@ let
     builders
     mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   version = lib.strings.removeSuffix "-stage1" config.version;
 
diff --git a/tidepool/src/packages/foundation/busybox/versions/1.36.1-bootstrap.nix b/tidepool/src/packages/foundation/busybox/versions/1.36.1-bootstrap.nix
index 28e7bad..850b041 100644
--- a/tidepool/src/packages/foundation/busybox/versions/1.36.1-bootstrap.nix
+++ b/tidepool/src/packages/foundation/busybox/versions/1.36.1-bootstrap.nix
@@ -1,8 +1,8 @@
-{ config, global }:
+{ global }:
 
 let
-  inherit (global) lib packages builders. foundation.
-  inherit ( global. internal. packages) foundation;
+  inherit (global) lib builders;
+  inherit (global.internal.packages) foundation;
 in
 {
   config = {
diff --git a/tidepool/src/packages/foundation/bzip2/versions/1.0.8-bootstrap.nix b/tidepool/src/packages/foundation/bzip2/versions/1.0.8-bootstrap.nix
index f5d85dc..958d967 100644
--- a/tidepool/src/packages/foundation/bzip2/versions/1.0.8-bootstrap.nix
+++ b/tidepool/src/packages/foundation/bzip2/versions/1.0.8-bootstrap.nix
@@ -1,7 +1,7 @@
-{ config, global }:
+{ global }:
 
 let
-  inherit (global) lib packages builders;
+  inherit (global) lib builders;
   inherit (global.internal.packages) foundation;
 in
 {
diff --git a/tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1-passthrough.nix b/tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1-passthrough.nix
index f23c4f1..c6ee36f 100644
--- a/tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1-passthrough.nix
@@ -5,9 +5,7 @@ let
     lib
     packages
     builders
-    mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   package = packages.foundation.bzip2.versions."1.0.8-stage1".extend {
     platform = {
diff --git a/tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1.nix b/tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1.nix
index 1601dee..fa22912 100644
--- a/tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1.nix
+++ b/tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1.nix
@@ -5,9 +5,7 @@ let
     lib
     packages
     builders
-    mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   version = lib.strings.removeSuffix "-stage1" config.version;
 
diff --git a/tidepool/src/packages/foundation/coreutils/versions/9.4-bootstrap.nix b/tidepool/src/packages/foundation/coreutils/versions/9.4-bootstrap.nix
index e5aa3c4..cab88c4 100644
--- a/tidepool/src/packages/foundation/coreutils/versions/9.4-bootstrap.nix
+++ b/tidepool/src/packages/foundation/coreutils/versions/9.4-bootstrap.nix
@@ -1,7 +1,7 @@
-{ config, global }:
+{ global }:
 
 let
-  inherit (global) lib packages builders;
+  inherit (global) lib builders;
   inherit (global.internal.packages) foundation;
 in
 {
diff --git a/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1-passthrough.nix b/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1-passthrough.nix
index 634ea94..68d1629 100644
--- a/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1-passthrough.nix
@@ -5,9 +5,7 @@ let
     lib
     packages
     builders
-    mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   package = packages.foundation.coreutils.versions."9.4-stage1".extend {
     platform = {
diff --git a/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1.nix b/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1.nix
index 0fe7c00..42b2609 100644
--- a/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1.nix
+++ b/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1.nix
@@ -7,7 +7,6 @@ let
     builders
     mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   version = lib.strings.removeSuffix "-stage1" config.version;
 
@@ -17,11 +16,6 @@ let
     target = lib.systems.withBuildInfo config.platform.target;
   };
 
-  prefix = lib.strings.when
-    (
-      platform.build.triple != platform.host.triple
-    ) "${platform.host.triple}-";
-
   configureFlags = [
     "--prefix=${builtins.placeholder "out"}"
     "--build=${platform.build.triple}"
diff --git a/tidepool/src/packages/foundation/diffutils/versions/3.10-bootstrap.nix b/tidepool/src/packages/foundation/diffutils/versions/3.10-bootstrap.nix
index 705ddd9..70761f5 100644
--- a/tidepool/src/packages/foundation/diffutils/versions/3.10-bootstrap.nix
+++ b/tidepool/src/packages/foundation/diffutils/versions/3.10-bootstrap.nix
@@ -1,7 +1,7 @@
-{ config, global }:
+{ global }:
 
 let
-  inherit (global) lib packages builders;
+  inherit (global) lib builders;
   inherit (global.internal.packages) foundation;
 in
 {
diff --git a/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1-passthrough.nix b/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1-passthrough.nix
index e487f25..1a65121 100644
--- a/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1-passthrough.nix
@@ -5,9 +5,7 @@ let
     lib
     packages
     builders
-    mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   package = packages.foundation.diffutils.versions."3.10-stage1".extend {
     platform = {
diff --git a/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1.nix b/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1.nix
index ab2b2a2..41ea582 100644
--- a/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1.nix
+++ b/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1.nix
@@ -7,7 +7,6 @@ let
     builders
     mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   version = lib.strings.removeSuffix "-stage1" config.version;
 
diff --git a/tidepool/src/packages/foundation/findutils/versions/4.9.0-bootstrap.nix b/tidepool/src/packages/foundation/findutils/versions/4.9.0-bootstrap.nix
index d46c126..28459cf 100644
--- a/tidepool/src/packages/foundation/findutils/versions/4.9.0-bootstrap.nix
+++ b/tidepool/src/packages/foundation/findutils/versions/4.9.0-bootstrap.nix
@@ -1,7 +1,7 @@
-{ config, global }:
+{ global }:
 
 let
-  inherit (global) lib packages builders;
+  inherit (global) lib builders;
   inherit (global.internal.packages) foundation;
 in
 {
diff --git a/tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1-passthrough.nix b/tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1-passthrough.nix
index 30e3b39..0b5f6ae 100644
--- a/tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1-passthrough.nix
@@ -5,9 +5,7 @@ let
     lib
     packages
     builders
-    mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   package = packages.foundation.findutils.versions."4.9.0-stage1".extend {
     platform = {
diff --git a/tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1.nix b/tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1.nix
index 8e8c014..37b10e4 100644
--- a/tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1.nix
+++ b/tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1.nix
@@ -7,7 +7,6 @@ let
     builders
     mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   version = lib.strings.removeSuffix "-stage1" config.version;
 
diff --git a/tidepool/src/packages/foundation/gawk/versions/5.2.2-bootstrap.nix b/tidepool/src/packages/foundation/gawk/versions/5.2.2-bootstrap.nix
index 14caf8c..a0ba4b5 100644
--- a/tidepool/src/packages/foundation/gawk/versions/5.2.2-bootstrap.nix
+++ b/tidepool/src/packages/foundation/gawk/versions/5.2.2-bootstrap.nix
@@ -1,7 +1,7 @@
-{ config, global }:
+{ global }:
 
 let
-  inherit (global) lib packages builders;
+  inherit (global) lib builders;
   inherit (global.internal.packages) foundation;
 in
 {
diff --git a/tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1-passthrough.nix b/tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1-passthrough.nix
index 4274595..c9678dd 100644
--- a/tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1-passthrough.nix
@@ -5,9 +5,7 @@ let
     lib
     packages
     builders
-    mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   package = packages.foundation.gawk.versions."5.2.2-stage1".extend {
     platform = {
diff --git a/tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1.nix b/tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1.nix
index 5771201..94acfe8 100644
--- a/tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1.nix
+++ b/tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1.nix
@@ -7,7 +7,6 @@ let
     builders
     mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   version = lib.strings.removeSuffix "-stage1" config.version;
 
diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-bootstrap.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-bootstrap.nix
index c5136d6..1a9ffd5 100644
--- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-bootstrap.nix
+++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-bootstrap.nix
@@ -1,11 +1,9 @@
-{ config, global }:
+{ global }:
 
 let
   inherit (global)
     lib
-    packages
     builders
-    mirrors
     ;
   inherit (global.internal.packages) foundation;
 in
diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage0.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage0.nix
index 5e51d7f..813dbab 100644
--- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage0.nix
+++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage0.nix
@@ -8,7 +8,6 @@ let
     builders
     mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   version = lib.strings.removeSuffix "-stage0" config.version;
 
diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage1.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage1.nix
index a3cbaf8..1dca2b8 100644
--- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage1.nix
+++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage1.nix
@@ -8,7 +8,6 @@ let
     builders
     mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   version = lib.strings.removeSuffix "-stage1" config.version;
 
diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage2.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage2.nix
index 7c401d3..5fc0d32 100644
--- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage2.nix
+++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage2.nix
@@ -8,7 +8,6 @@ let
     builders
     mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   version = lib.strings.removeSuffix "-stage2" config.version;
 
diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3-passthrough.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3-passthrough.nix
index cecf89a..95d7210 100644
--- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3-passthrough.nix
+++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3-passthrough.nix
@@ -6,9 +6,7 @@ let
     lib
     packages
     builders
-    mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   package = packages.foundation.gcc.versions."13.2.0-stage3".extend {
     platform = {
diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3.nix
index 4636e39..11d37e7 100644
--- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3.nix
+++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3.nix
@@ -8,7 +8,6 @@ let
     builders
     mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   version = lib.strings.removeSuffix "-stage3" config.version;
 
diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage4.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage4.nix
index aa49378..d3f0f89 100644
--- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage4.nix
+++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage4.nix
@@ -8,7 +8,6 @@ let
     builders
     mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   version = lib.strings.removeSuffix "-stage4" config.version;
 
diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage5.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage5.nix
index a2420c6..498fc02 100644
--- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage5.nix
+++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage5.nix
@@ -5,9 +5,7 @@ let
     lib
     packages
     builders
-    mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   package =
     if
diff --git a/tidepool/src/packages/foundation/glibc/versions/2.38-bootstrap.nix b/tidepool/src/packages/foundation/glibc/versions/2.38-bootstrap.nix
index a20e30d..a0e86a7 100644
--- a/tidepool/src/packages/foundation/glibc/versions/2.38-bootstrap.nix
+++ b/tidepool/src/packages/foundation/glibc/versions/2.38-bootstrap.nix
@@ -7,7 +7,6 @@ let
     builders
     mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   version = lib.strings.removeSuffix "-bootstrap" config.version;
 
diff --git a/tidepool/src/packages/foundation/glibc/versions/2.38-stage1-passthrough.nix b/tidepool/src/packages/foundation/glibc/versions/2.38-stage1-passthrough.nix
index 3e127e1..a766f71 100644
--- a/tidepool/src/packages/foundation/glibc/versions/2.38-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/glibc/versions/2.38-stage1-passthrough.nix
@@ -5,9 +5,7 @@ let
     lib
     packages
     builders
-    mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   package = packages.foundation.glibc.versions."2.38-stage1".extend {
     platform = {
diff --git a/tidepool/src/packages/foundation/glibc/versions/2.38-stage1.nix b/tidepool/src/packages/foundation/glibc/versions/2.38-stage1.nix
index ad01412..56d0bb7 100644
--- a/tidepool/src/packages/foundation/glibc/versions/2.38-stage1.nix
+++ b/tidepool/src/packages/foundation/glibc/versions/2.38-stage1.nix
@@ -7,7 +7,6 @@ let
     builders
     mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   version = lib.strings.removeSuffix "-stage1" config.version;
 
diff --git a/tidepool/src/packages/foundation/gnugrep/versions/3.11-bootstrap.nix b/tidepool/src/packages/foundation/gnugrep/versions/3.11-bootstrap.nix
index 747e3ab..be4b61a 100644
--- a/tidepool/src/packages/foundation/gnugrep/versions/3.11-bootstrap.nix
+++ b/tidepool/src/packages/foundation/gnugrep/versions/3.11-bootstrap.nix
@@ -1,7 +1,7 @@
-{ config, global }:
+{ global }:
 
 let
-  inherit (global) lib packages builders;
+  inherit (global) lib builders;
   inherit (global.internal.packages) foundation;
 in
 {
diff --git a/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1-passthrough.nix b/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1-passthrough.nix
index 276a917..1b3ef9c 100644
--- a/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1-passthrough.nix
@@ -5,9 +5,7 @@ let
     lib
     packages
     builders
-    mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   package = packages.foundation.gnugrep.versions."3.11-stage1".extend {
     platform = {
diff --git a/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1.nix b/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1.nix
index 450b1c0..b274787 100644
--- a/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1.nix
+++ b/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1.nix
@@ -7,7 +7,6 @@ let
     builders
     mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   version = lib.strings.removeSuffix "-stage1" config.version;
 
diff --git a/tidepool/src/packages/foundation/gnum4/versions/1.4.19-bootstrap.nix b/tidepool/src/packages/foundation/gnum4/versions/1.4.19-bootstrap.nix
index 99a923f..2628d99 100644
--- a/tidepool/src/packages/foundation/gnum4/versions/1.4.19-bootstrap.nix
+++ b/tidepool/src/packages/foundation/gnum4/versions/1.4.19-bootstrap.nix
@@ -1,7 +1,7 @@
-{ config, global }:
+{ global }:
 
 let
-  inherit (global) lib packages builders;
+  inherit (global) lib builders;
   inherit (global.internal.packages) foundation;
 in
 {
diff --git a/tidepool/src/packages/foundation/gnum4/versions/1.4.19-stage1-passthrough.nix b/tidepool/src/packages/foundation/gnum4/versions/1.4.19-stage1-passthrough.nix
index c79fdcd..d678ae4 100644
--- a/tidepool/src/packages/foundation/gnum4/versions/1.4.19-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/gnum4/versions/1.4.19-stage1-passthrough.nix
@@ -5,9 +5,7 @@ let
     lib
     packages
     builders
-    mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   package = packages.foundation.gnum4.versions."1.4.19-stage1".extend {
     platform = {
diff --git a/tidepool/src/packages/foundation/gnum4/versions/1.4.19-stage1.nix b/tidepool/src/packages/foundation/gnum4/versions/1.4.19-stage1.nix
index 42b9919..69181fc 100644
--- a/tidepool/src/packages/foundation/gnum4/versions/1.4.19-stage1.nix
+++ b/tidepool/src/packages/foundation/gnum4/versions/1.4.19-stage1.nix
@@ -7,7 +7,6 @@ let
     builders
     mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   version = lib.strings.removeSuffix "-stage1" config.version;
 
diff --git a/tidepool/src/packages/foundation/gnumake/versions/4.4.1-bootstrap.nix b/tidepool/src/packages/foundation/gnumake/versions/4.4.1-bootstrap.nix
index 12eab6b..1bd28b6 100644
--- a/tidepool/src/packages/foundation/gnumake/versions/4.4.1-bootstrap.nix
+++ b/tidepool/src/packages/foundation/gnumake/versions/4.4.1-bootstrap.nix
@@ -1,7 +1,7 @@
-{ config, global }:
+{ global }:
 
 let
-  inherit (global) lib packages builders;
+  inherit (global) lib builders;
   inherit (global.internal.packages) foundation;
 in
 {
diff --git a/tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1-passthrough.nix b/tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1-passthrough.nix
index 262631f..fc24360 100644
--- a/tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1-passthrough.nix
@@ -5,9 +5,7 @@ let
     lib
     packages
     builders
-    mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   package = packages.foundation.gnumake.versions."4.4.1-stage1".extend {
     platform = {
diff --git a/tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1.nix b/tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1.nix
index 3f3ee3c..b51af13 100644
--- a/tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1.nix
+++ b/tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1.nix
@@ -7,7 +7,6 @@ let
     builders
     mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   version = lib.strings.removeSuffix "-stage1" config.version;
 
diff --git a/tidepool/src/packages/foundation/gnupatch/versions/2.7-bootstrap.nix b/tidepool/src/packages/foundation/gnupatch/versions/2.7-bootstrap.nix
index 00cf2ee..d4c3f13 100644
--- a/tidepool/src/packages/foundation/gnupatch/versions/2.7-bootstrap.nix
+++ b/tidepool/src/packages/foundation/gnupatch/versions/2.7-bootstrap.nix
@@ -1,7 +1,7 @@
-{ config, global }:
+{ global }:
 
 let
-  inherit (global) lib packages builders;
+  inherit (global) lib builders;
   inherit (global.internal.packages) foundation;
 in
 {
diff --git a/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1-passthrough.nix b/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1-passthrough.nix
index 36b9a78..3a9089a 100644
--- a/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1-passthrough.nix
@@ -5,9 +5,7 @@ let
     lib
     packages
     builders
-    mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   package = packages.foundation.gnupatch.versions."2.7-stage1".extend {
     platform = {
diff --git a/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1.nix b/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1.nix
index 5504ad8..70c07a9 100644
--- a/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1.nix
+++ b/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1.nix
@@ -7,7 +7,6 @@ let
     builders
     mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   version = lib.strings.removeSuffix "-stage1" config.version;
 
diff --git a/tidepool/src/packages/foundation/gnused/versions/4.9-bootstrap.nix b/tidepool/src/packages/foundation/gnused/versions/4.9-bootstrap.nix
index 1e3c3a8..b49080d 100644
--- a/tidepool/src/packages/foundation/gnused/versions/4.9-bootstrap.nix
+++ b/tidepool/src/packages/foundation/gnused/versions/4.9-bootstrap.nix
@@ -1,7 +1,7 @@
-{ config, global }:
+{ global }:
 
 let
-  inherit (global) lib packages builders;
+  inherit (global) lib builders;
   inherit (global.internal.packages) foundation;
 in
 {
diff --git a/tidepool/src/packages/foundation/gnused/versions/4.9-stage1-passthrough.nix b/tidepool/src/packages/foundation/gnused/versions/4.9-stage1-passthrough.nix
index aea89b7..9e778bc 100644
--- a/tidepool/src/packages/foundation/gnused/versions/4.9-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/gnused/versions/4.9-stage1-passthrough.nix
@@ -5,9 +5,7 @@ let
     lib
     packages
     builders
-    mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   package = packages.foundation.gnused.versions."4.9-stage1".extend {
     platform = {
diff --git a/tidepool/src/packages/foundation/gnused/versions/4.9-stage1.nix b/tidepool/src/packages/foundation/gnused/versions/4.9-stage1.nix
index f508005..f893802 100644
--- a/tidepool/src/packages/foundation/gnused/versions/4.9-stage1.nix
+++ b/tidepool/src/packages/foundation/gnused/versions/4.9-stage1.nix
@@ -7,7 +7,6 @@ let
     builders
     mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   version = lib.strings.removeSuffix "-stage1" config.version;
 
diff --git a/tidepool/src/packages/foundation/gnutar/versions/1.35-bootstrap.nix b/tidepool/src/packages/foundation/gnutar/versions/1.35-bootstrap.nix
index 2776d8c..20452dc 100644
--- a/tidepool/src/packages/foundation/gnutar/versions/1.35-bootstrap.nix
+++ b/tidepool/src/packages/foundation/gnutar/versions/1.35-bootstrap.nix
@@ -1,7 +1,7 @@
-{ config, global }:
+{ global }:
 
 let
-  inherit (global) lib packages builders;
+  inherit (global) lib builders;
   inherit (global.internal.packages) foundation;
 in
 {
diff --git a/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1-passthrough.nix b/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1-passthrough.nix
index 2d04064..7a6c351 100644
--- a/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1-passthrough.nix
@@ -5,9 +5,7 @@ let
     lib
     packages
     builders
-    mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   package = packages.foundation.gnutar.versions."1.35-stage1".extend {
     platform = {
diff --git a/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1.nix b/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1.nix
index a0d9720..e79a457 100644
--- a/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1.nix
+++ b/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1.nix
@@ -7,7 +7,6 @@ let
     builders
     mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   version = lib.strings.removeSuffix "-stage1" config.version;
 
diff --git a/tidepool/src/packages/foundation/gzip/versions/1.13-bootstrap.nix b/tidepool/src/packages/foundation/gzip/versions/1.13-bootstrap.nix
index e477dee..4f11cf0 100644
--- a/tidepool/src/packages/foundation/gzip/versions/1.13-bootstrap.nix
+++ b/tidepool/src/packages/foundation/gzip/versions/1.13-bootstrap.nix
@@ -1,7 +1,7 @@
-{ config, global }:
+{ global }:
 
 let
-  inherit (global) lib packages builders;
+  inherit (global) lib builders;
   inherit (global.internal.packages) foundation;
 in
 {
diff --git a/tidepool/src/packages/foundation/gzip/versions/1.13-stage1-passthrough.nix b/tidepool/src/packages/foundation/gzip/versions/1.13-stage1-passthrough.nix
index 98e30a9..77a91ea 100644
--- a/tidepool/src/packages/foundation/gzip/versions/1.13-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/gzip/versions/1.13-stage1-passthrough.nix
@@ -5,9 +5,7 @@ let
     lib
     packages
     builders
-    mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   package = packages.foundation.gzip.versions."1.13-stage1".extend {
     platform = {
diff --git a/tidepool/src/packages/foundation/gzip/versions/1.13-stage1.nix b/tidepool/src/packages/foundation/gzip/versions/1.13-stage1.nix
index 3fb7fce..6cfa33c 100644
--- a/tidepool/src/packages/foundation/gzip/versions/1.13-stage1.nix
+++ b/tidepool/src/packages/foundation/gzip/versions/1.13-stage1.nix
@@ -7,7 +7,6 @@ let
     builders
     mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   version = lib.strings.removeSuffix "-stage1" config.version;
 
diff --git a/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-bootstrap.nix b/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-bootstrap.nix
index 0ddb70a..d78ed84 100644
--- a/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-bootstrap.nix
+++ b/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-bootstrap.nix
@@ -1,7 +1,7 @@
-{ config, global }:
+{ global }:
 
 let
-  inherit (global) lib packages builders;
+  inherit (global) lib builders;
   inherit (global.internal.packages) foundation;
 in
 {
diff --git a/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1-passthrough.nix b/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1-passthrough.nix
index 903743a..edb5912 100644
--- a/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1-passthrough.nix
@@ -2,7 +2,6 @@
 
 let
   inherit (global) lib packages builders;
-  inherit (global.internal.packages) foundation;
 
   package = packages.foundation.linux-headers.versions."6.5.6-stage1".extend {
     platform = {
diff --git a/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1.nix b/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1.nix
index 334fdd5..5896953 100644
--- a/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1.nix
+++ b/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1.nix
@@ -2,7 +2,6 @@
 
 let
   inherit (global) lib packages builders;
-  inherit (global.internal.packages) foundation;
 
   version = lib.strings.removeSuffix "-stage1" config.version;
 
diff --git a/tidepool/src/packages/foundation/musl/versions/1.2.4-bootstrap.nix b/tidepool/src/packages/foundation/musl/versions/1.2.4-bootstrap.nix
index 5082598..30f4358 100644
--- a/tidepool/src/packages/foundation/musl/versions/1.2.4-bootstrap.nix
+++ b/tidepool/src/packages/foundation/musl/versions/1.2.4-bootstrap.nix
@@ -1,7 +1,7 @@
-{ config, global }:
+{ global }:
 
 let
-  inherit (global) lib packages builders;
+  inherit (global) lib builders;
   inherit (global.internal.packages) foundation;
 in
 {
diff --git a/tidepool/src/packages/foundation/musl/versions/1.2.4.nix b/tidepool/src/packages/foundation/musl/versions/1.2.4.nix
index 3fb614e..8e59566 100644
--- a/tidepool/src/packages/foundation/musl/versions/1.2.4.nix
+++ b/tidepool/src/packages/foundation/musl/versions/1.2.4.nix
@@ -2,7 +2,6 @@
 
 let
   inherit (global) lib packages builders;
-  inherit (global.internal.packages) foundation;
 
   platform = {
     build = lib.systems.withBuildInfo config.platform.build;
diff --git a/tidepool/src/packages/foundation/patchelf/versions/0.18.0-bootstrap.nix b/tidepool/src/packages/foundation/patchelf/versions/0.18.0-bootstrap.nix
index e0019bd..e6c13e9 100644
--- a/tidepool/src/packages/foundation/patchelf/versions/0.18.0-bootstrap.nix
+++ b/tidepool/src/packages/foundation/patchelf/versions/0.18.0-bootstrap.nix
@@ -1,7 +1,7 @@
-{ config, global }:
+{ global }:
 
 let
-  inherit (global) lib packages builders;
+  inherit (global) lib builders;
   inherit (global.internal.packages) foundation;
 in
 {
diff --git a/tidepool/src/packages/foundation/python/versions/3.12.0-bootstrap.nix b/tidepool/src/packages/foundation/python/versions/3.12.0-bootstrap.nix
index 20f75ff..0ff9fce 100644
--- a/tidepool/src/packages/foundation/python/versions/3.12.0-bootstrap.nix
+++ b/tidepool/src/packages/foundation/python/versions/3.12.0-bootstrap.nix
@@ -1,7 +1,7 @@
-{ config, global }:
+{ global }:
 
 let
-  inherit (global) lib packages builders;
+  inherit (global) lib builders;
   inherit (global.internal.packages) foundation;
 in
 {
diff --git a/tidepool/src/packages/foundation/python/versions/3.12.0-stage1.nix b/tidepool/src/packages/foundation/python/versions/3.12.0-stage1.nix
index 00e39c1..cc519af 100644
--- a/tidepool/src/packages/foundation/python/versions/3.12.0-stage1.nix
+++ b/tidepool/src/packages/foundation/python/versions/3.12.0-stage1.nix
@@ -5,9 +5,7 @@ let
     lib
     packages
     builders
-    mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   version = lib.strings.removeSuffix "-stage1" config.version;
 
diff --git a/tidepool/src/packages/foundation/xz/versions/5.4.3-bootstrap.nix b/tidepool/src/packages/foundation/xz/versions/5.4.3-bootstrap.nix
index db7674a..9bfe2d5 100644
--- a/tidepool/src/packages/foundation/xz/versions/5.4.3-bootstrap.nix
+++ b/tidepool/src/packages/foundation/xz/versions/5.4.3-bootstrap.nix
@@ -1,7 +1,7 @@
-{ config, global }:
+{ global }:
 
 let
-  inherit (global) lib packages builders;
+  inherit (global) lib builders;
   inherit (global.internal.packages) foundation;
 in
 {
diff --git a/tidepool/src/packages/foundation/xz/versions/5.4.3-stage1-passthrough.nix b/tidepool/src/packages/foundation/xz/versions/5.4.3-stage1-passthrough.nix
index 14d11ca..ef1931a 100644
--- a/tidepool/src/packages/foundation/xz/versions/5.4.3-stage1-passthrough.nix
+++ b/tidepool/src/packages/foundation/xz/versions/5.4.3-stage1-passthrough.nix
@@ -5,9 +5,7 @@ let
     lib
     packages
     builders
-    mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   package = packages.foundation.xz.versions."5.4.3-stage1".extend {
     platform = {
diff --git a/tidepool/src/packages/foundation/xz/versions/5.4.3-stage1.nix b/tidepool/src/packages/foundation/xz/versions/5.4.3-stage1.nix
index 3f72a81..d12f20a 100644
--- a/tidepool/src/packages/foundation/xz/versions/5.4.3-stage1.nix
+++ b/tidepool/src/packages/foundation/xz/versions/5.4.3-stage1.nix
@@ -5,9 +5,7 @@ let
     lib
     packages
     builders
-    mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   version = lib.strings.removeSuffix "-stage1" config.version;
 
diff --git a/tidepool/src/packages/foundation/zlib/versions/1.3-bootstrap.nix b/tidepool/src/packages/foundation/zlib/versions/1.3-bootstrap.nix
index 71e2642..3a96bfe 100644
--- a/tidepool/src/packages/foundation/zlib/versions/1.3-bootstrap.nix
+++ b/tidepool/src/packages/foundation/zlib/versions/1.3-bootstrap.nix
@@ -1,7 +1,7 @@
-{ config, global }:
+{ global }:
 
 let
-  inherit (global) lib packages builders;
+  inherit (global) lib builders;
   inherit (global.internal.packages) foundation;
 in
 {
diff --git a/tidepool/src/packages/foundation/zlib/versions/1.3-stage1.nix b/tidepool/src/packages/foundation/zlib/versions/1.3-stage1.nix
index e5fbb53..48d6917 100644
--- a/tidepool/src/packages/foundation/zlib/versions/1.3-stage1.nix
+++ b/tidepool/src/packages/foundation/zlib/versions/1.3-stage1.nix
@@ -5,17 +5,9 @@ let
     lib
     packages
     builders
-    mirrors
     ;
-  inherit (global.internal.packages) foundation;
 
   version = lib.strings.removeSuffix "-stage1" config.version;
-
-  platform = {
-    build = lib.systems.withBuildInfo config.platform.build;
-    host = lib.systems.withBuildInfo config.platform.host;
-    target = lib.systems.withBuildInfo config.platform.target;
-  };
 in
 {
   config = {