mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-09 19:13:26 +03:00
darwin: reduce nix search
warning spam
This commit is contained in:
parent
0f2f4519e1
commit
62b67805d4
4 changed files with 39 additions and 37 deletions
|
@ -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}
|
||||
)
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
)
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue