From edef4868982e5a1ca3226231fb1a7eb292b4c96a Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Tue, 4 Jul 2023 20:46:42 +1000 Subject: darwin.linux-builder: rename from `darwin.builder` --- pkgs/top-level/darwin-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pkgs/top-level/darwin-packages.nix') diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index a583b84b430d6..f1d48814ebe22 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -3,6 +3,7 @@ , generateSplicesForMkScope, makeScopeWithSplicing , stdenv , preLibcCrossHeaders +, config }: let @@ -229,7 +230,7 @@ impure-cmds // appleSourcePackages // chooseLibs // { discrete-scroll = callPackage ../os-specific/darwin/discrete-scroll { }; # See doc/builders/special/darwin-builder.section.md - builder = lib.makeOverridable ({ modules }: + linux-builder = lib.makeOverridable ({ modules }: let toGuest = builtins.replaceStrings [ "darwin" ] [ "linux" ]; @@ -247,4 +248,7 @@ impure-cmds // appleSourcePackages // chooseLibs // { in nixos.config.system.build.macos-builder-installer) { modules = [ ]; }; + +} // lib.optionalAttrs config.allowAliases { + builder = throw "'darwin.builder' has been changed and renamed to 'darwin.linux-builder'. The default ssh port is now 31022. Please update your configuration or override the port back to 22. See https://nixos.org/manual/nixpkgs/unstable/#sec-darwin-builder"; # added 2023-07-06 }) -- cgit 1.4.1