talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

darwin: reduce nix search warning spam

Browse Source
This commit is contained in:
ash 2025-05-17 11:52:16 +01:00
parent 0f2f4519e1
commit 62b67805d4
4 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/os-specific/darwin/apple-sdk-11.0/default.nix
View File

@ -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}
)

2
pkgs/os-specific/darwin/apple-sdk-12.3/default.nix
View File

@ -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"

26
pkgs/os-specific/darwin/apple-sdk/mk-stub.nix
View File

@ -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 <https://nixos.org/manual/nixpkgs/stable/#sec-darwin> 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;
}
)

15
pkgs/top-level/darwin-aliases.nix
View File

@ -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