From 74562a214ef5052e475baf29db5f92f0ae891093 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 8 Jun 2022 17:12:16 +0000
Subject: [PATCH 1/2] lib.systems.amd64-netbsd: remove

This has been deprecated for a long time, and it's doubtful it had any
users to start with.  And having an undisablable warning when
enumarating platforms is not good.
---
 lib/systems/examples.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index e41290864ed1..b26407117c85 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -306,8 +306,6 @@ rec {
 
   # BSDs
 
-  amd64-netbsd = lib.warn "The amd64-netbsd system example is deprecated. Use x86_64-netbsd instead." x86_64-netbsd;
-
   x86_64-netbsd = {
     config = "x86_64-unknown-netbsd";
     libc = "nblibc";

From 5dfe7f928e43d6e493f3bec504fa94b6c38ee0c4 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 8 Jun 2022 13:23:00 +0000
Subject: [PATCH 2/2] release-cross.nix: fix cross bootstrap tools eval

In 5643714dea5, I changed pkgs/stdenv/linux/make-bootstrap-tools.nix
to take a package set instead of system and localSystem arguments, but
I forgot to update make-bootstrap-tools-cross.nix.

Fixes: 5643714dea5 ("stdenvBootstrapTools: inherit {cross,local}System")
---
 pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 02eb112451bd..2665330206e1 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -1,11 +1,16 @@
 {system ? builtins.currentSystem}:
 
 let
-  make = crossSystem: import ./make-bootstrap-tools.nix {
-    localSystem = { inherit system; };
-    inherit crossSystem;
+  inherit (releaseLib) lib;
+  releaseLib = import ../../top-level/release-lib.nix {
+    # We're not using any functions from release-lib.nix that look at
+    # supportedSystems.
+    supportedSystems = [];
+  };
+
+  make = crossSystem: import ./make-bootstrap-tools.nix {
+    pkgs = releaseLib.pkgsForCross crossSystem system;
   };
-  lib = import ../../../lib;
 in lib.mapAttrs (n: make) (with lib.systems.examples; {
   armv5tel   = sheevaplug;
   pogoplug4  = pogoplug4;