From 685ed87eccd31e58eceac312a9053c7a5314cfa8 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 26 Oct 2024 03:03:19 +0100 Subject: [PATCH] darwin.apple_sdk_10_12: drop --- pkgs/os-specific/darwin/apple-sdk/default.nix | 272 ------------------ pkgs/top-level/darwin-aliases.nix | 4 + pkgs/top-level/darwin-packages.nix | 5 +- 3 files changed, 5 insertions(+), 276 deletions(-) delete mode 100644 pkgs/os-specific/darwin/apple-sdk/default.nix diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix deleted file mode 100644 index 388de3730380..000000000000 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ /dev/null @@ -1,272 +0,0 @@ -# Compatibility stubs for packages that used the old SDK frameworks. -# TODO(@reckenrode) Make these stubs warn after framework usage has been cleaned up in nixpkgs. -{ lib, callPackage }: - -let - mkStub = callPackage ./mk-stub.nix { } "10.12"; - - frameworks = lib.genAttrs [ - "AGL" - "AVFoundation" - "AVKit" - "Accelerate" - "Accounts" - "AddressBook" - "AppKit" - "AppKitScripting" - "AppleScriptKit" - "AppleScriptObjC" - "ApplicationServices" - "AudioToolbox" - "AudioUnit" - "AudioVideoBridging" - "Automator" - "CFNetwork" - "CalendarStore" - "Carbon" - "Cocoa" - "Collaboration" - "ContactsPersistence" - "CoreAudio" - "CoreAudioKit" - "CoreBluetooth" - "CoreData" - "CoreFoundation" - "CoreGraphics" - "CoreImage" - "CoreLocation" - "CoreMIDI" - "CoreMIDIServer" - "CoreMedia" - "CoreMediaIO" - "CoreServices" - "CoreSymbolication" - "CoreText" - "CoreVideo" - "CoreWLAN" - "DVDPlayback" - "DebugSymbols" - "DirectoryService" - "DiscRecording" - "DiscRecordingUI" - "DiskArbitration" - "DisplayServices" - "EventKit" - "ExceptionHandling" - "FWAUserLib" - "ForceFeedback" - "Foundation" - "GLKit" - "GLUT" - "GSS" - "GameCenter" - "GameController" - "GameKit" - "GameplayKit" - "Hypervisor" - "ICADevices" - "IMServicePlugIn" - "IOBluetooth" - "IOBluetoothUI" - "IOKit" - "IOSurface" - "ImageCaptureCore" - "ImageIO" - "InputMethodKit" - "InstallerPlugins" - "InstantMessage" - "JavaFrameEmbedding" - "JavaNativeFoundation" - "JavaRuntimeSupport" - "JavaScriptCore" - "JavaVM" - "Kerberos" - "Kernel" - "LDAP" - "LatentSemanticMapping" - "LocalAuthentication" - "MapKit" - "MediaAccessibility" - "MediaPlayer" - "MediaToolbox" - "Metal" - "MetalKit" - "ModelIO" - "MultitouchSupport" - "NetFS" - "OSAKit" - "OpenAL" - "OpenCL" - "OpenDirectory" - "OpenGL" - "PCSC" - "PreferencePanes" - "PubSub" - "QTKit" - "Quartz" - "QuartzCore" - "QuickLook" - "QuickTime" - "SceneKit" - "ScreenSaver" - "Scripting" - "ScriptingBridge" - "Security" - "SecurityFoundation" - "SecurityInterface" - "ServiceManagement" - "SkyLight" - "Social" - "SpriteKit" - "StoreKit" - "SyncServices" - "System" - "SystemConfiguration" - "TWAIN" - "Tcl" - "UIFoundation" - "VideoDecodeAcceleration" - "VideoToolbox" - "WebKit" - "vmnet" - ] mkStub; - - bareFrameworks = lib.genAttrs [ - "AGL" - "AVFoundation" - "AVKit" - "Accelerate" - "Accounts" - "AddressBook" - "AppKit" - "AppKitScripting" - "AppleScriptKit" - "AppleScriptObjC" - "ApplicationServices" - "AudioToolbox" - "AudioUnit" - "AudioVideoBridging" - "Automator" - "CFNetwork" - "CalendarStore" - "Carbon" - "Cocoa" - "Collaboration" - "CoreAudio" - "CoreAudioKit" - "CoreBluetooth" - "CoreData" - "CoreFoundation" - "CoreGraphics" - "CoreImage" - "CoreLocation" - "CoreMIDI" - "CoreMIDIServer" - "CoreMedia" - "CoreMediaIO" - "CoreServices" - "CoreText" - "CoreVideo" - "CoreWLAN" - "DVDPlayback" - "DirectoryService" - "DiscRecording" - "DiscRecordingUI" - "DiskArbitration" - "EventKit" - "ExceptionHandling" - "FWAUserLib" - "ForceFeedback" - "Foundation" - "GLKit" - "GLUT" - "GSS" - "GameCenter" - "GameController" - "GameKit" - "GameplayKit" - "Hypervisor" - "ICADevices" - "IMServicePlugIn" - "IOBluetooth" - "IOBluetoothUI" - "IOKit" - "IOSurface" - "ImageCaptureCore" - "ImageIO" - "InputMethodKit" - "InstallerPlugins" - "InstantMessage" - "JavaFrameEmbedding" - "JavaNativeFoundation" - "JavaRuntimeSupport" - "JavaScriptCore" - "JavaVM" - "Kerberos" - "Kernel" - "LDAP" - "LatentSemanticMapping" - "LocalAuthentication" - "MapKit" - "MediaAccessibility" - "MediaPlayer" - "MediaToolbox" - "Metal" - "MetalKit" - "ModelIO" - "NetFS" - "OSAKit" - "OpenAL" - "OpenCL" - "OpenDirectory" - "OpenGL" - "PCSC" - "PreferencePanes" - "PubSub" - "QTKit" - "Quartz" - "QuartzCore" - "QuickLook" - "QuickTime" - "SceneKit" - "ScreenSaver" - "Scripting" - "ScriptingBridge" - "Security" - "SecurityFoundation" - "SecurityInterface" - "ServiceManagement" - "Social" - "SpriteKit" - "StoreKit" - "SyncServices" - "System" - "SystemConfiguration" - "TWAIN" - "Tcl" - "VideoDecodeAcceleration" - "VideoToolbox" - "WebKit" - "vmnet" - ] mkStub; -in -{ - inherit bareFrameworks frameworks; - - libs = lib.genAttrs [ - "Xplugin" - "sandbox" - "simd" - "utmp" - "xpc" - ] mkStub; - - version = "10.12"; -} -// lib.genAttrs [ - "darwin-stubs" - "Libsystem" - "objc4" - "sdk" - "sdkRoot" -] mkStub diff --git a/pkgs/top-level/darwin-aliases.nix b/pkgs/top-level/darwin-aliases.nix index 6fafa5f487c4..7f3ea2edd35e 100644 --- a/pkgs/top-level/darwin-aliases.nix +++ b/pkgs/top-level/darwin-aliases.nix @@ -47,6 +47,10 @@ let in mapAliases ({ + ### A ### + + 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 + ### B ### builder = throw "'darwin.builder' has been changed and renamed to 'darwin.linux-builder'. The default ssh port is now 31022. Please update your configuration or override the port back to 22. See https://nixos.org/manual/nixpkgs/unstable/#sec-darwin-builder"; # added 2023-07-06 diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 669e268b9001..5680bfee301a 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -57,9 +57,6 @@ makeScopeWithSplicing' { # Must use pkgs.callPackage to avoid infinite recursion. impure-cmds = pkgs.callPackage ../os-specific/darwin/impure-cmds { }; - # macOS 10.12 SDK - apple_sdk_10_12 = pkgs.callPackage ../os-specific/darwin/apple-sdk { }; - # macOS 11.0 SDK apple_sdk_11_0 = pkgs.callPackage ../os-specific/darwin/apple-sdk-11.0 { }; @@ -69,7 +66,7 @@ makeScopeWithSplicing' { apple_sdk = apple_sdk_11_0; stubs = { - inherit apple_sdk apple_sdk_10_12 apple_sdk_11_0 apple_sdk_12_3; + inherit apple_sdk apple_sdk_11_0 apple_sdk_12_3; libobjc = self.objc4; } // lib.genAttrs [ "CF"