Unverified Commit 6fe3802a authored by Emily's avatar Emily Committed by GitHub
Browse files

darwin: remove `nix search` warning spam (#407904)

parents 6bec43dc a249cd2e
Loading
Loading
Loading
Loading
+20 −13
Original line number Diff line number Diff line
@@ -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 <https://nixos.org/manual/nixpkgs/stable/#sec-darwin> for documentation and migration instructions"
        pkgs.${name}
    )
+1 −1
Original line number Diff line number Diff line
@@ -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"
+15 −11
Original line number Diff line number Diff line
{ stdenvNoCC }:
{ lib, stdenvNoCC }:

version: pname:
prefix: version: pname:
lib.warnOnInstantiate
  "${prefix}.${pname}: these stubs do nothing and will be removed in Nixpkgs 25.11; see <https://nixos.org/manual/nixpkgs/stable/#sec-darwin> for documentation and migration instructions."
  (
    stdenvNoCC.mkDerivation {
      inherit pname version;

@@ -12,3 +15,4 @@ stdenvNoCC.mkDerivation {

      passthru.isDarwinCompatStub = true;
    }
  )
+7 −15
Original line number Diff line number Diff line
@@ -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 <https://nixos.org/manual/nixpkgs/stable/#sec-darwin> 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
@@ -136,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

@@ -163,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 = [ ];