From 62b67805d44412fa4c7248487d4379553ff8d4d5 Mon Sep 17 00:00:00 2001 From: ash Date: Sat, 17 May 2025 11:52:16 +0100 Subject: [PATCH 1/2] darwin: reduce `nix search` warning spam --- .../darwin/apple-sdk-11.0/default.nix | 33 +++++++++++-------- .../darwin/apple-sdk-12.3/default.nix | 2 +- pkgs/os-specific/darwin/apple-sdk/mk-stub.nix | 26 ++++++++------- pkgs/top-level/darwin-aliases.nix | 15 ++------- 4 files changed, 39 insertions(+), 37 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix index 59a764db18e5..7e9a5b483ffd 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix @@ -6,7 +6,7 @@ }: let - mkStub = callPackage ../apple-sdk/mk-stub.nix { } "11.0"; + mkStub = callPackage ../apple-sdk/mk-stub.nix { } "darwin.apple_sdk_11_0" "11.0"; in lib.genAttrs [ "CLTools_Executables" @@ -249,17 +249,24 @@ lib.genAttrs [ "simd" ] mkStub; - inherit (pkgs) - callPackage - stdenv - llvmPackages_12 - llvmPackages_13 - llvmPackages_14 - llvmPackages_15 - llvmPackages_16 - rustPlatform - xcodebuild - ; - version = "11.0"; } +// + lib.genAttrs + [ + "callPackage" + "stdenv" + "llvmPackages_12" + "llvmPackages_13" + "llvmPackages_14" + "llvmPackages_15" + "llvmPackages_16" + "rustPlatform" + "xcodebuild" + ] + ( + name: + lib.warn + "darwin.apple_sdk_11_0.${name}: deprecated and will be removed in Nixpkgs 25.11; see for documentation and migration instructions" + pkgs.${name} + ) diff --git a/pkgs/os-specific/darwin/apple-sdk-12.3/default.nix b/pkgs/os-specific/darwin/apple-sdk-12.3/default.nix index 65b7c30f65c5..245cb2b64740 100644 --- a/pkgs/os-specific/darwin/apple-sdk-12.3/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk-12.3/default.nix @@ -6,7 +6,7 @@ }: let - mkStub = callPackage ../apple-sdk/mk-stub.nix { } "12.3"; + mkStub = callPackage ../apple-sdk/mk-stub.nix { } "darwin.apple_sdk_12_3" "12.3"; in lib.genAttrs [ "CLTools_Executables" diff --git a/pkgs/os-specific/darwin/apple-sdk/mk-stub.nix b/pkgs/os-specific/darwin/apple-sdk/mk-stub.nix index 0a0b258998e3..f2eed9965cf0 100644 --- a/pkgs/os-specific/darwin/apple-sdk/mk-stub.nix +++ b/pkgs/os-specific/darwin/apple-sdk/mk-stub.nix @@ -1,14 +1,18 @@ -{ stdenvNoCC }: +{ lib, stdenvNoCC }: -version: pname: -stdenvNoCC.mkDerivation { - inherit pname version; +prefix: version: pname: +lib.warnOnInstantiate + "${prefix}.${pname}: these stubs do nothing and will be removed in Nixpkgs 25.11; see for documentation and migration instructions." + ( + stdenvNoCC.mkDerivation { + inherit pname version; - buildCommand = '' - mkdir -p "$out" - echo "Individual frameworks have been deprecated. See the stdenv documentation for how to use `apple-sdk`" \ - > "$out/README" - ''; + buildCommand = '' + mkdir -p "$out" + echo "Individual frameworks have been deprecated. See the stdenv documentation for how to use `apple-sdk`" \ + > "$out/README" + ''; - passthru.isDarwinCompatStub = true; -} + passthru.isDarwinCompatStub = true; + } + ) diff --git a/pkgs/top-level/darwin-aliases.nix b/pkgs/top-level/darwin-aliases.nix index ceec048d845f..b3fece55c663 100644 --- a/pkgs/top-level/darwin-aliases.nix +++ b/pkgs/top-level/darwin-aliases.nix @@ -49,18 +49,9 @@ let mkStub = pkgs.callPackage ../os-specific/darwin/apple-sdk/mk-stub.nix { }; - warnStub = - prefix: - lib.warn "${prefix} these stubs do nothing and will be removed in Nixpkgs 25.11; see for documentation and migration instructions"; + apple_sdk_11_0 = pkgs.callPackage ../os-specific/darwin/apple-sdk-11.0 { }; - apple_sdk_11_0 = warnStub "darwin.apple_sdk_11_0.*:" ( - pkgs.callPackage ../os-specific/darwin/apple-sdk-11.0 { } - ); - - apple_sdk_12_3 = - warnStub - "darwin.apple_sdk_12_3.*: add `apple-sdk_12` to build inputs instead to use the macOS 12 SDK." - (pkgs.callPackage ../os-specific/darwin/apple-sdk-12.3 { }); + apple_sdk_12_3 = pkgs.callPackage ../os-specific/darwin/apple-sdk-12.3 { }; apple_sdk = apple_sdk_11_0; @@ -102,7 +93,7 @@ let "objc4" "ppp" "xnu" - ] (name: warnStub "darwin.${name}:" (mkStub "11.0" name)); + ] (mkStub "darwin" "11.0"); in stubs From a249cd2ea279a07dc9a09018a608b9fc008b13b8 Mon Sep 17 00:00:00 2001 From: ash Date: Sat, 17 May 2025 12:40:34 +0100 Subject: [PATCH 2/2] darwin: lib.warn -> lib.warnOnInstantiate --- pkgs/top-level/darwin-aliases.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/darwin-aliases.nix b/pkgs/top-level/darwin-aliases.nix index b3fece55c663..2e7849c2fefd 100644 --- a/pkgs/top-level/darwin-aliases.nix +++ b/pkgs/top-level/darwin-aliases.nix @@ -127,11 +127,11 @@ stubs ### L ### libauto = throw "'darwin.libauto' has been removed, as it was broken and unmaintained"; # added 2024-05-10 - libresolvHeaders = lib.warn "darwin.libresolvHeaders: use `lib.getInclude darwin.libresolv`; this will be removed in 25.11" ( + libresolvHeaders = lib.warnOnInstantiate "darwin.libresolvHeaders: use `lib.getInclude darwin.libresolv`; this will be removed in 25.11" ( lib.getDev self.libresolv ); # added 2025-04-20 libtapi = pkgs.libtapi; # 2024-08-16 - libutilHeaders = lib.warn "darwin.libutilHeaders: use `lib.getInclude darwin.libutil`; this will be removed in 25.11" ( + libutilHeaders = lib.warnOnInstantiate "darwin.libutilHeaders: use `lib.getInclude darwin.libutil`; this will be removed in 25.11" ( lib.getDev self.libutil ); # added 2025-04-20 @@ -154,7 +154,8 @@ stubs ### S ### stdenvNoCF = - lib.warn "darwin.stdenvNoCF: use `stdenv` or `stdenvNoCC`; this will be removed in 25.11" + lib.warnOnInstantiate + "darwin.stdenvNoCF: use `stdenv` or `stdenvNoCC`; this will be removed in 25.11" ( pkgs.stdenv.override { extraBuildInputs = [ ];