darwin: move deprecated packages to aliases

Emily 09d5e1a7 6c5166e4

+74 -75
-5
pkgs/os-specific/darwin/apple-sdk-11.0/default.nix
··· 1 1 # Compatibility stubs for packages that used the old SDK frameworks. 2 - # TODO(@reckenrode) Make these stubs warn after framework usage has been cleaned up in nixpkgs. 3 2 { 4 3 lib, 5 4 callPackage, 6 - newScope, 7 - overrideSDK, 8 5 pkgs, 9 - stdenv, 10 - stdenvNoCC, 11 6 }: 12 7 13 8 let
-5
pkgs/os-specific/darwin/apple-sdk-12.3/default.nix
··· 1 1 # Compatibility stubs for packages that used the old SDK frameworks. 2 - # TODO(@reckenrode) Make these stubs warn after framework usage has been cleaned up in nixpkgs. 3 2 { 4 3 lib, 5 4 callPackage, 6 - newScope, 7 - overrideSDK, 8 5 pkgs, 9 - stdenv, 10 - stdenvNoCC, 11 6 }: 12 7 13 8 let
+74 -3
pkgs/top-level/darwin-aliases.nix
··· 44 44 mapAliases = lib.mapAttrs ( 45 45 n: alias: removeDistribute (removeRecurseForDerivations (checkInPkgs n alias)) 46 46 ); 47 + 48 + # Old Darwin pattern stubs; remove these by 25.11. 49 + 50 + mkStub = pkgs.callPackage ../os-specific/darwin/apple-sdk/mk-stub.nix { }; 51 + 52 + warnStub = 53 + prefix: 54 + 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"; 55 + 56 + apple_sdk_11_0 = warnStub "darwin.apple_sdk_11_0.*:" ( 57 + pkgs.callPackage ../os-specific/darwin/apple-sdk-11.0 { } 58 + ); 59 + 60 + apple_sdk_12_3 = 61 + warnStub 62 + "darwin.apple_sdk_12_3.*: add `apple-sdk_12` to build inputs instead to use the macOS 12 SDK." 63 + (pkgs.callPackage ../os-specific/darwin/apple-sdk-12.3 { }); 64 + 65 + apple_sdk = apple_sdk_11_0; 66 + 67 + stubs = 68 + { 69 + inherit apple_sdk apple_sdk_11_0 apple_sdk_12_3; 70 + } 71 + // lib.genAttrs [ 72 + "CF" 73 + "CarbonHeaders" 74 + "CommonCrypto" 75 + "CoreSymbolication" 76 + "IOKit" 77 + "Libc" 78 + "Libinfo" 79 + "Libm" 80 + "Libnotify" 81 + "Librpcsvc" 82 + "Libsystem" 83 + "LibsystemCross" 84 + "Security" 85 + "architecture" 86 + "cf-private" 87 + "configd" 88 + "configdHeaders" 89 + "darwin-stubs" 90 + "dtrace" 91 + "eap8021x" 92 + "hfs" 93 + "hfsHeaders" 94 + "launchd" 95 + "libclosure" 96 + "libdispatch" 97 + "libmalloc" 98 + "libobjc" 99 + "libplatform" 100 + "libpthread" 101 + "mDNSResponder" 102 + "objc4" 103 + "ppp" 104 + "xnu" 105 + ] (name: warnStub "darwin.${name}:" (mkStub "11.0" name)); 47 106 in 48 107 49 - mapAliases ({ 108 + stubs 109 + // mapAliases ({ 50 110 ### A ### 51 111 52 112 apple_sdk_10_12 = throw "darwin.apple_sdk_10_12 was removed as Nixpkgs no longer supports macOS 10.12; see the 25.05 release notes"; # Added 2024-10-27 ··· 63 123 cctools-llvm = pkgs.cctools; # added 2024-07-01 64 124 cctools-port = pkgs.cctools; # added 2024-07-17 65 125 66 - cf-private = throw "'cf-private' has been renamed to 'apple_sdk.frameworks.CoreFoundation'."; 67 - 68 126 ### D ### 69 127 70 128 discrete-scroll = pkgs.discrete-scroll; # added 2024-11-27 ··· 78 136 ### L ### 79 137 80 138 libauto = throw "'darwin.libauto' has been removed, as it was broken and unmaintained"; # added 2024-05-10 139 + libresolvHeaders = lib.warn "darwin.libresolvHeaders: use `lib.getInclude darwin.libresolv`; this will be removed in 25.11" ( 140 + lib.getDev self.libresolv 141 + ); # added 2025-04-20 81 142 libtapi = pkgs.libtapi; # 2024-08-16 143 + libutilHeaders = lib.warn "darwin.libutilHeaders: use `lib.getInclude darwin.libutil`; this will be removed in 25.11" ( 144 + lib.getDev self.libutil 145 + ); # added 2025-04-20 82 146 83 147 ### M ### 84 148 ··· 98 162 99 163 ### S ### 100 164 165 + stdenvNoCF = 166 + lib.warn "darwin.stdenvNoCF: use `stdenv` or `stdenvNoCC`; this will be removed in 25.11" 167 + ( 168 + pkgs.stdenv.override { 169 + extraBuildInputs = [ ]; 170 + } 171 + ); # added 2025-04-20 101 172 stubs = throw "'darwin.stubs.*' have been removed as they were unused"; # added 2025-04-20 102 173 swift-corelibs-foundation = throw "'darwin.swift-corelibs-foundation' has been removed, as it was broken and is no longer used"; # added 2025-04-20 103 174 })
-62
pkgs/top-level/darwin-packages.nix
··· 26 26 pkg 27 27 ) (old.extraBuildInputs or [ ]); 28 28 }); 29 - 30 - mkStub = pkgs.callPackage ../os-specific/darwin/apple-sdk/mk-stub.nix { }; 31 29 in 32 30 33 31 makeScopeWithSplicing' { 34 32 otherSplices = generateSplicesForMkScope "darwin"; 35 - extra = spliced: spliced.apple_sdk.frameworks; 36 33 f = lib.extends aliases ( 37 34 self: 38 35 let ··· 44 41 directory = ../os-specific/darwin/apple-source-releases; 45 42 }; 46 43 47 - # Compatibility packages that aren’t necessary anymore 48 - apple-source-headers = { 49 - libresolvHeaders = lib.getDev self.libresolv; 50 - libutilHeaders = lib.getDev self.libutil; 51 - }; 52 - 53 44 # Must use pkgs.callPackage to avoid infinite recursion. 54 45 impure-cmds = pkgs.callPackage ../os-specific/darwin/impure-cmds { }; 55 - 56 - # macOS 11.0 SDK 57 - apple_sdk_11_0 = pkgs.callPackage ../os-specific/darwin/apple-sdk-11.0 { }; 58 - 59 - # macOS 12.3 SDK 60 - apple_sdk_12_3 = pkgs.callPackage ../os-specific/darwin/apple-sdk-12.3 { }; 61 - 62 - apple_sdk = apple_sdk_11_0; 63 - 64 - stubs = 65 - { 66 - inherit apple_sdk apple_sdk_11_0 apple_sdk_12_3; 67 - libobjc = self.objc4; 68 - } 69 - // lib.genAttrs [ 70 - "CF" 71 - "CarbonHeaders" 72 - "CommonCrypto" 73 - "CoreSymbolication" 74 - "IOKit" 75 - "Libc" 76 - "Libinfo" 77 - "Libm" 78 - "Libnotify" 79 - "Librpcsvc" 80 - "Libsystem" 81 - "LibsystemCross" 82 - "Security" 83 - "architecture" 84 - "configd" 85 - "configdHeaders" 86 - "darwin-stubs" 87 - "dtrace" 88 - "eap8021x" 89 - "hfs" 90 - "hfsHeaders" 91 - "launchd" 92 - "libclosure" 93 - "libdispatch" 94 - "libmalloc" 95 - "libplatform" 96 - "libpthread" 97 - "mDNSResponder" 98 - "objc4" 99 - "ppp" 100 - "xnu" 101 - ] (mkStub apple_sdk.version); 102 46 in 103 47 104 48 impure-cmds 105 49 // apple-source-packages 106 - // apple-source-headers 107 - // stubs 108 50 // { 109 - 110 - stdenvNoCF = stdenv.override { 111 - extraBuildInputs = [ ]; 112 - }; 113 51 114 52 inherit (self.adv_cmds) ps; 115 53