From cf45eef8ecf8fe50b44aab0b8b4f651a85de02aa Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 21 Apr 2025 18:51:52 -0400 Subject: [PATCH 01/61] lib.systems.darwinSdkVersion: 11.3 -> 14.4 --- lib/systems/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 7e78ceb4827a..ee3ad9c0e649 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -360,7 +360,7 @@ let null; # The canonical name for this attribute is darwinSdkVersion, but some # platforms define the old name "sdkVer". - darwinSdkVersion = final.sdkVer or "11.3"; + darwinSdkVersion = final.sdkVer or "14.4"; darwinMinVersion = final.darwinSdkVersion; darwinMinVersionVariable = if final.isMacOS then From 2ab175889abbb1a8cff9f5ff4a23f33e8eefdf19 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 21 Apr 2025 18:51:52 -0400 Subject: [PATCH 02/61] lib.systems.darwinMinVersion: 11.3 -> 14.0 --- lib/systems/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/systems/default.nix b/lib/systems/default.nix index ee3ad9c0e649..513f9250a1ac 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -361,7 +361,7 @@ let # The canonical name for this attribute is darwinSdkVersion, but some # platforms define the old name "sdkVer". darwinSdkVersion = final.sdkVer or "14.4"; - darwinMinVersion = final.darwinSdkVersion; + darwinMinVersion = "14.0"; darwinMinVersionVariable = if final.isMacOS then "MACOSX_DEPLOYMENT_TARGET" From 56ac9bffa3b56b30fe01cd177bf04372dbf907c8 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 9 Oct 2025 18:00:10 -0400 Subject: [PATCH 03/61] doc/stdenv/platform-notes: update Xcode version to SDK version table --- doc/stdenv/platform-notes.chapter.md | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/doc/stdenv/platform-notes.chapter.md b/doc/stdenv/platform-notes.chapter.md index a6174b3e2008..99d7cf33fa48 100644 --- a/doc/stdenv/platform-notes.chapter.md +++ b/doc/stdenv/platform-notes.chapter.md @@ -117,13 +117,10 @@ The following is a list of Xcode versions, the SDK version in Nixpkgs, and the a Check your package’s documentation (platform support or installation instructions) to find which Xcode or SDK version to use. Generally, only the last SDK release for a major version is packaged. -| Xcode version | SDK version | Nixpkgs attribute | -|--------------------|--------------------|------------------------------| -| 12.0–12.5.1 | 11.3 | `apple-sdk_11` / `apple-sdk` | -| 13.0–13.4.1 | 12.3 | `apple-sdk_12` | -| 14.0–14.3.1 | 13.3 | `apple-sdk_13` | -| 15.0–15.4 | 14.4 | `apple-sdk_14` | -| 16.0 | 15.0 | `apple-sdk_15` | +| Xcode version | SDK version | Nixpkgs attribute | +|--------------------|--------------------|-------------------------------| +| 15.0–15.4 | 14.4 | `apple-sdk_14` / `apple-sdk` | +| 16.0 | 15.0 | `apple-sdk_15` | #### Darwin Default SDK versions {#sec-darwin-troubleshooting-darwin-defaults} From c422ce6874c303100d6b80f862a31329a12d0dc9 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 29 Sep 2025 21:39:09 -0400 Subject: [PATCH 04/61] doc/release-notes-25.11: add note about Darwin platform updates --- doc/release-notes/rl-2511.section.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 1d32eabf6ea8..21ffab0b5009 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -16,6 +16,11 @@ If a newer C++ library feature is not available on the default deployment target, you will need to increase the deployment target. See the Darwin platform documentation for more details. +- **This release of Nixpkgs requires macOS Sonoma 14.0 or newer, as announced in the 25.05 release notes.** + The default SDK is now 14.4, but the minimum version is 14.0. + cc-wrapper will enforce that availability annotations are used or an appropriate deployment target is set. + See the Darwin platform notes for details. + - LLVM has been updated from 19 to 21. ## Backward Incompatibilities {#sec-nixpkgs-release-25.11-incompatibilities} From e99a7321592fb8111513a6e1422f04e470f46c5d Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 05/61] _1fps: use default SDK on Darwin (14.4) --- pkgs/by-name/_1/_1fps/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/_1/_1fps/package.nix b/pkgs/by-name/_1/_1fps/package.nix index 305b2f3ae821..90fef1a29cbb 100644 --- a/pkgs/by-name/_1/_1fps/package.nix +++ b/pkgs/by-name/_1/_1fps/package.nix @@ -4,7 +4,6 @@ buildGoModule, xorg, stdenv, - apple-sdk_14, }: buildGoModule rec { pname = "1fps"; @@ -25,8 +24,7 @@ buildGoModule rec { xorg.libX11 xorg.libXtst xorg.libXi - ] - ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_14; + ]; meta = { description = "Encrypted Screen Sharing"; From b572ad29440e7742a57e79157ba2b3c5aaa4b291 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 06/61] ares: use default SDK on Darwin (14.4) --- pkgs/by-name/ar/ares/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ar/ares/package.nix b/pkgs/by-name/ar/ares/package.nix index 39d4bb316fba..de25382b4cbc 100644 --- a/pkgs/by-name/ar/ares/package.nix +++ b/pkgs/by-name/ar/ares/package.nix @@ -1,7 +1,7 @@ { lib, alsa-lib, - apple-sdk_14, + apple-sdk, cmake, fetchFromGitHub, gtk3, @@ -55,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: { zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_14 moltenvk ] ++ lib.optionals stdenv.hostPlatform.isLinux [ @@ -73,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ (replaceVars ./darwin-build-fixes.patch { - sdkVersion = apple-sdk_14.version; + sdkVersion = apple-sdk.version; }) ]; From 8e6ef95a4bdcc1019b4d9e7bb53670ae209692e4 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 07/61] azahar: use default SDK on Darwin (14.4) --- pkgs/by-name/az/azahar/package.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix index 4b79ea2a4a9f..ca9c4a46a59c 100644 --- a/pkgs/by-name/az/azahar/package.nix +++ b/pkgs/by-name/az/azahar/package.nix @@ -42,8 +42,6 @@ gamemode, enableGamemode ? lib.meta.availableOn stdenv.hostPlatform gamemode, nix-update-script, - darwinMinVersionHook, - apple-sdk_12, }: let inherit (lib) @@ -122,10 +120,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ optionals stdenv.hostPlatform.isDarwin [ moltenvk - - # error: 'lowPowerModeEnabled' is unavailable: not available on macOS - apple-sdk_12 - (darwinMinVersionHook "12.0") ]; postPatch = '' From 7dffcb50385a7212d70837d9b52c88c4544a9ed5 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 08/61] balena-cli: use default SDK on Darwin (14.4) --- pkgs/by-name/ba/balena-cli/package.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix index be730490549b..745f493d19cf 100644 --- a/pkgs/by-name/ba/balena-cli/package.nix +++ b/pkgs/by-name/ba/balena-cli/package.nix @@ -9,7 +9,6 @@ python3, udev, cctools, - apple-sdk_12, }: let @@ -44,13 +43,9 @@ buildNpmPackage' rec { cctools ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - udev - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_12 - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + udev + ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/balena"; From 1fd0904a41466d7672fb500652bc2f883c2390bb Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 09/61] bespokesynth: use default SDK on Darwin (14.4) --- pkgs/by-name/be/bespokesynth/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/be/bespokesynth/package.nix b/pkgs/by-name/be/bespokesynth/package.nix index 38c057312fb1..ee2b22f4817f 100644 --- a/pkgs/by-name/be/bespokesynth/package.nix +++ b/pkgs/by-name/be/bespokesynth/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, gitUpdater, - apple-sdk_11, cmake, pkg-config, ninja, @@ -120,9 +119,6 @@ stdenv.mkDerivation (finalAttrs: { xcb-util-cursor pcre mount - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 ]; postInstall = From e001ae3c6346e20dd64e43635c913cf022db410a Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 10/61] bitwarden-desktop: use default SDK on Darwin (14.4) --- pkgs/by-name/bi/bitwarden-desktop/package.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index c71124bd9ce4..c9c9bba63e7a 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -1,6 +1,5 @@ { lib, - apple-sdk_14, buildNpmPackage, cargo, copyDesktopItems, @@ -124,10 +123,6 @@ buildNpmPackage' rec { darwin.autoSignDarwinBinariesHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_14 - ]; - preBuild = '' if [[ $(jq --raw-output '.devDependencies.electron' < package.json | grep -E --only-matching '^[0-9]+') != ${lib.escapeShellArg (lib.versions.major electron.version)} ]]; then echo 'ERROR: electron version mismatch' From f2895523473dab52d67d77779511177d288fab61 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 11/61] build-support/build-mozzila-mach: drop SDK version workaround patch The 15.5 SDK is available in nixpkgs, so this patch is no longer needed. --- .../build-mozilla-mach/142-relax-apple-sdk.patch | 13 ------------- pkgs/build-support/build-mozilla-mach/default.nix | 9 --------- 2 files changed, 22 deletions(-) delete mode 100644 pkgs/build-support/build-mozilla-mach/142-relax-apple-sdk.patch diff --git a/pkgs/build-support/build-mozilla-mach/142-relax-apple-sdk.patch b/pkgs/build-support/build-mozilla-mach/142-relax-apple-sdk.patch deleted file mode 100644 index c6e28f11be2f..000000000000 --- a/pkgs/build-support/build-mozilla-mach/142-relax-apple-sdk.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure -index 37c00230c853..dd89bea24392 100644 ---- a/build/moz.configure/toolchain.configure -+++ b/build/moz.configure/toolchain.configure -@@ -233,7 +233,7 @@ with only_when(host_is_osx | target_is_osx): - ) - - def mac_sdk_min_version(): -- return "15.5" -+ return "15.2" - - @depends( - "--with-macos-sdk", diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix index 834654bee746..75948f8779cd 100644 --- a/pkgs/build-support/build-mozilla-mach/default.nix +++ b/pkgs/build-support/build-mozilla-mach/default.nix @@ -315,15 +315,6 @@ buildStdenv.mkDerivation { # https://hg-edge.mozilla.org/mozilla-central/rev/aa8a29bd1fb9 ./139-wayland-drag-animation.patch ] - ++ - lib.optionals - ( - lib.versionAtLeast version "141.0.2" - || (lib.versionAtLeast version "140.2.0" && lib.versionOlder version "141.0") - ) - [ - ./142-relax-apple-sdk.patch - ] ++ extraPatches; postPatch = '' From e5fd8d4c6164ef92ce5f3af460626de96a36992e Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 12/61] choose-gui: use default SDK on Darwin (14.4) --- pkgs/by-name/ch/choose-gui/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/ch/choose-gui/package.nix b/pkgs/by-name/ch/choose-gui/package.nix index 04a74c40d901..7a36bdfd60f8 100644 --- a/pkgs/by-name/ch/choose-gui/package.nix +++ b/pkgs/by-name/ch/choose-gui/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, xcbuild, - apple-sdk_11, }: stdenv.mkDerivation rec { @@ -19,8 +18,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ xcbuild ]; - buildInputs = [ apple-sdk_11 ]; - buildPhase = '' runHook preBuild xcodebuild -configuration Release SYMROOT="./output" HOME="$(mktemp -d)" build From 7b4d6379222bfaf613b1b0a85d842d8a36fe2c21 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 13/61] darwin.PowerManagement: fix build with 14.4 SDK --- .../darwin/apple-source-releases/PowerManagement/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix index 231d0ffb562f..02dfecec7b9e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix @@ -13,7 +13,8 @@ let buildCommand = '' install -D -t "$out/include/IOKit/pwr_mgt" \ - '${iokitUser}/pwr_mgt.subproj/IOPMLibPrivate.h' + '${iokitUser}/pwr_mgt.subproj/IOPMLibPrivate.h' \ + '${iokitUser}/pwr_mgt.subproj/IOPMAssertionCategories.h' ''; }; in From b68b26b3ba6e3c0f6e9d2e54b11e6317a8880948 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 14/61] darwin.bootstrap_cmds: use default SDK on Darwin (14.4) --- .../darwin/apple-source-releases/bootstrap_cmds/package.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/package.nix index 0f5e1f77dd1a..ca416bc65934 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/package.nix @@ -1,7 +1,6 @@ { lib, apple-sdk, - apple-sdk_12, bison, buildPackages, flex, @@ -14,10 +13,7 @@ let Libc = apple-sdk.sourceRelease "Libc"; - - # Older versions of xnu are missing required headers. The one for the 11.3 SDK doesn’t define a needed function - # that was added in 11.3. This version of xnu has everything that’s needed. - xnu = apple-sdk_12.sourceRelease "xnu"; + xnu = apple-sdk.sourceRelease "xnu"; privateHeaders = stdenvNoCC.mkDerivation { name = "adv_cmds-deps-private-headers"; From 29b634dd2c7c70fb0f83537aef6c677be7060122 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 15/61] darwin.copyfile: drop workaround for older Clang versions --- .../darwin/apple-source-releases/copyfile/package.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix b/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix index b2c02c05e624..413e6532b3a6 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix @@ -71,15 +71,6 @@ mkAppleDerivation { xcodeHash = "sha256-SYW6pBlCQkcbkBqCq+W/mDYZZ7/co2HlPZwXzgh/LnI="; - postPatch = '' - # Disable experimental bounds safety stuff that’s not available in LLVM 16. - for header in copyfile.h xattr_flags.h; do - substituteInPlace "$header" \ - --replace-fail '__ptrcheck_abi_assume_single()' "" \ - --replace-fail '__unsafe_indexable' "" - done - ''; - env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include"; meta.description = "Darwin file copying library"; From 674bfaab7038d1d28d5f1a9151c02cdedaddaa49 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 16/61] darwin.dyld: work around lack of LLVM 21 support in Meson --- pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix b/pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix index 869d4b3ea9da..b034abb7d01f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix @@ -6,6 +6,7 @@ cmake, llvmPackages, openssl, + pkgsBuildHost, pkg-config, stdenvNoCC, fetchurl, @@ -162,6 +163,7 @@ mkAppleDerivation { nativeBuildInputs = [ cmake # CMake is required for Meson to find LLVM as a dependency. + (lib.getDev pkgsBuildHost.llvm) # Workaround Meson limitations with LLVM 21. pkg-config ]; From 55f32f567c1e8e9e1ac3adb56467cce6687756ce Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 17/61] darwin.dyld: use default SDK on Darwin (14.4) --- .../apple-source-releases/dyld/package.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix b/pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix index b034abb7d01f..c2e50c4f8a2d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix @@ -1,10 +1,10 @@ { lib, - apple-sdk_12, + apple-sdk, ld64, mkAppleDerivation, cmake, - llvmPackages, + llvm, openssl, pkgsBuildHost, pkg-config, @@ -20,11 +20,11 @@ let hash = "sha256-0ybVcwHuGEdThv0PPjYQc3SW0YVOyrM3/L9zG/l1Vtk="; }; - launchd = apple-sdk_12.sourceRelease "launchd"; - Libc = apple-sdk_12.sourceRelease "Libc"; - libplatform = apple-sdk_12.sourceRelease "libplatform"; - libpthread = apple-sdk_12.sourceRelease "libpthread"; - xnu = apple-sdk_12.sourceRelease "xnu"; + launchd = apple-sdk.sourceRelease "launchd"; + Libc = apple-sdk.sourceRelease "Libc"; + libplatform = apple-sdk.sourceRelease "libplatform"; + libpthread = apple-sdk.sourceRelease "libpthread"; + xnu = apple-sdk.sourceRelease "xnu"; privateHeaders = stdenvNoCC.mkDerivation { name = "dyld-deps-private-headers"; @@ -156,8 +156,7 @@ mkAppleDerivation { env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include"; buildInputs = [ - apple-sdk_12 # Needed for `PLATFORM_FIRMWARE` and `PLATFORM_SEPOS` defines in `mach-o/loader.h`. - llvmPackages.llvm + llvm openssl ]; From c8a5838007a96c18ac113e7a98519c3fec1303ac Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 18/61] darwin.file_cmds: update build for the 14.4 SDK --- .../darwin/apple-source-releases/file_cmds/meson.build.in | 3 +++ .../darwin/apple-source-releases/file_cmds/package.nix | 2 ++ 2 files changed, 5 insertions(+) diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/meson.build.in index 638742f978c2..9919a3d90b3a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/meson.build.in +++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/meson.build.in @@ -4,7 +4,10 @@ # Project settings project('file_cmds', 'c', version : '@version@') add_global_arguments( + # These are not defined automatically by Clang. Not having them defined causes compilation failures. '-DTARGET_OS_BRIDGE=0', + '-DTARGET_OS_EXCLAVECORE=0', + '-DTARGET_OS_EXCLAVEKIT=0', language : 'c', ) diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix index 584d2a312a60..7961a0125ae5 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix @@ -53,6 +53,8 @@ let uint64_t xdi_xdtream_obj_id; }; #define APFS_CLEAR_PURGEABLE 0 + #define APFS_PURGEABLE_FLAGS_MASK 0xFFFF + #define APFSIOC_GET_PURGEABLE_FILE_FLAGS _IOR('J', 71, uint64_t) #define APFSIOC_MARK_PURGEABLE _IOWR('J', 68, uint64_t) #define APFSIOC_XDSTREAM_OBJ_ID _IOWR('J', 53, struct xdstream_obj_id) EOF From 006f7e4234429230409904dcc60afa87c3dc589f Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 19/61] darwin.libresolv: update build for the 14.4 SDK --- .../libresolv/meson.build.in | 8 +++++ .../libresolv/package.nix | 34 ++++++++++++++----- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libresolv/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/libresolv/meson.build.in index 6a7c523a164c..2d96b556bbc8 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libresolv/meson.build.in +++ b/pkgs/os-specific/darwin/apple-source-releases/libresolv/meson.build.in @@ -3,6 +3,12 @@ # Project settings project('libresolv', 'c', version : '@version@') +add_project_arguments( + '-DCOMMON_DIGEST_FOR_RFC_1321', # To enable legacy `MD5` APIs in CommonCrypto. + # This is not defined automatically by Clang. Not having them defined causes compilation failures. + '-DTARGET_OS_BRIDGE=0', + language : 'c', +) # Dependencies @@ -46,10 +52,12 @@ libresolv = library( soversion : '9' ) install_headers( + 'arpa/nameser_compat.h', 'dns.h', 'dns_util.h', 'nameser.h', 'resolv.h', + preserve_path : true, ) install_man( 'resolver.3', diff --git a/pkgs/os-specific/darwin/apple-source-releases/libresolv/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libresolv/package.nix index 158317c22c80..9e63efb55228 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libresolv/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libresolv/package.nix @@ -2,14 +2,31 @@ lib, apple-sdk, mkAppleDerivation, + stdenvNoCC, }: let configd = apple-sdk.sourceRelease "configd"; + dyld = apple-sdk.sourceRelease "dyld"; Libinfo = apple-sdk.sourceRelease "Libinfo"; + Libnotify = apple-sdk.sourceRelease "Libnotify"; + xnu = apple-sdk.sourceRelease "xnu"; # `arpa/nameser_compat.h` is included in the Libc source release instead of libresolv. Libc = apple-sdk.sourceRelease "Libc"; + + privateHeaders = stdenvNoCC.mkDerivation { + name = "libresolv-deps-private-headers"; + + buildCommand = '' + install -D -t "$out/include/mach-o" \ + '${dyld}/include/mach-o/dyld_priv.h' + + substituteInPlace "$out/include/mach-o/dyld_priv.h" \ + --replace-fail ', bridgeos(3.0)' "" \ + --replace-fail '//@VERSION_DEFS@' 'const dyld_build_version_t dyld_2024_SU_E_os_versions = { 1 /* macOS */, 150400 };' + ''; + }; in mkAppleDerivation { releaseName = "libresolv"; @@ -20,19 +37,18 @@ mkAppleDerivation { "man" ]; - xcodeHash = "sha256-yHNa6cpI3T4R/iakeHmL6S/c9p+VpYR4fudv2UXUpnY="; - - postUnpack = '' - mkdir -p "$sourceRoot/arpa" - ln -s "$NIX_BUILD_TOP/$sourceRoot/nameser.h" "$sourceRoot/arpa/nameser.h" + postPatch = '' + mkdir arpa + cp ${Libc}/include/arpa/nameser_compat.h arpa/nameser_compat.h + cp nameser.h arpa ''; - env.NIX_CFLAGS_COMPILE = "-I${configd}/dnsinfo -I${Libinfo}/lookup.subproj"; + xcodeHash = "sha256-yHNa6cpI3T4R/iakeHmL6S/c9p+VpYR4fudv2UXUpnY="; + + env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include -I${configd}/dnsinfo -I${Libinfo}/lookup.subproj -I${Libnotify}"; postInstall = '' - mkdir -p "$out/include/arpa" - ln -s ../nameser.h "$out/include/arpa" - cp ${Libc}/include/arpa/nameser_compat.h "$out/include/arpa" + ln -s ../nameser.h "''${!outputDev}/include/arpa" ''; meta = { From 4d961ec1504fb112c76b8fe7f684d739fe5ffe03 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 20/61] darwin.libutil: use default SDK on Darwin (14.4) --- .../apple-source-releases/libutil/package.nix | 7 ----- .../0001-Conditionally-pre-condition.patch | 26 ------------------- 2 files changed, 33 deletions(-) delete mode 100644 pkgs/os-specific/darwin/apple-source-releases/libutil/patches/0001-Conditionally-pre-condition.patch diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libutil/package.nix index 95f35054e026..a0afe4511d53 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libutil/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libutil/package.nix @@ -1,5 +1,4 @@ { - apple-sdk_14, copyfile, mkAppleDerivation, }: @@ -15,13 +14,7 @@ mkAppleDerivation { xcodeHash = "sha256-LwR9fmvcdJ/QYlOx+7ffhV4mKvjkwN3rX3+yHSCovKQ="; - patches = [ - # The only change from macOS 13 to 14 was setting this flag. Check at runtime and only set if supported. - ./patches/0001-Conditionally-pre-condition.patch - ]; - buildInputs = [ - (apple-sdk_14.override { enableBootstrap = true; }) copyfile ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/patches/0001-Conditionally-pre-condition.patch b/pkgs/os-specific/darwin/apple-source-releases/libutil/patches/0001-Conditionally-pre-condition.patch deleted file mode 100644 index 27f5faee7cda..000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/libutil/patches/0001-Conditionally-pre-condition.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ca796729722da704e8a9c64c7a201cbe0a9cb9be Mon Sep 17 00:00:00 2001 -From: Randy Eckenrode -Date: Mon, 5 Aug 2024 22:21:47 -0400 -Subject: [PATCH] Conditionally pre-condition - ---- - wipefs.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/wipefs.cpp b/wipefs.cpp -index d8e6339..6cb7963 100644 ---- a/wipefs.cpp -+++ b/wipefs.cpp -@@ -391,7 +391,9 @@ wipefs_wipe(wipefs_ctx handle) - // Since we always issue a a single extent, set the kIOStorageUnmapOptionWhole - // option flag for drive pre-conditioning. - // -- unmap.options = kIOStorageUnmapOptionWhole; -+ if (__builtin_available(macOS 14.0, *)) { -+ unmap.options = kIOStorageUnmapOptionWhole; -+ } - - // - // Don't bother to check the return value since this is mostly --- -2.44.1 From 0ba2bde18f3ad4441a7e72bb552394619c8d10dc Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 21/61] darwin.network_cmds: use default SDK on Darwin (14.4) --- .../network_cmds/meson.build.in | 56 +++--- .../network_cmds/package.nix | 159 ++++++++---------- 2 files changed, 98 insertions(+), 117 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in index f0dc469eb142..926175715775 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in @@ -14,6 +14,10 @@ add_global_arguments( '-DUSE_RFC2292BIS=1', '-D__APPLE_USE_RFC_3542=1', '-D__APPLE_API_OBSOLETE=1', + # Define flexible array member attribute macros as nothing. Unfortunately, Apple’s usage does not work with + # the C23 attributes supported by Clang. + '-D__counted_by_or_null(N)=', + '-D__sized_by_or_null(N)=', language : 'c', ) @@ -23,6 +27,8 @@ cc = meson.get_compiler('c') libipsec = cc.find_library('ipsec') libresolv = cc.find_library('resolv') +libutil = cc.find_library('util') + libpcap = dependency('pcap') openssl = dependency('openssl') @@ -200,7 +206,7 @@ executable( dependencies : [ libnetwork_cmds ], install : true, sources : [ - # 'netstat.tproj/bpf.c', + 'netstat.tproj/bpf.c', 'netstat.tproj/data.c', 'netstat.tproj/if.c', 'netstat.tproj/inet.c', @@ -276,29 +282,31 @@ executable( ) install_man('route.tproj/route.8') -# Depends on a bunch of IPv6 stuff from later SDKs (>11.3). Package once those become the default. -# executable( -# 'rtadvd', -# c_args : [ -# '-DINET6', -# '-DHAVE_GETIFADDRS', -# ], -# install : true, -# sources : [ -# 'rtadvd.tproj/advcap.c', -# 'rtadvd.tproj/config.c', -# 'rtadvd.tproj/dump.c', -# 'rtadvd.tproj/if.c', -# 'rtadvd.tproj/rrenum.c', -# 'rtadvd.tproj/rtadvd.c', -# 'rtadvd.tproj/rtadvd_logging.c', -# 'rtadvd.tproj/timer.c', -# ], -# ) -# install_man( -# 'rtadvd.tproj/rtadvd.8', -# 'rtadvd.tproj/rtadvd.conf.5', -# ) +executable( + 'rtadvd', + c_args : [ + '-DINET6', + '-DHAVE_GETIFADDRS', + # Required for `_COMM_PAGE_CPU_CAPABILITIES` in + '-DPRIVATE', + ], + dependencies : libutil, + install : true, + sources : [ + 'rtadvd.tproj/advcap.c', + 'rtadvd.tproj/config.c', + 'rtadvd.tproj/dump.c', + 'rtadvd.tproj/if.c', + 'rtadvd.tproj/rrenum.c', + 'rtadvd.tproj/rtadvd.c', + 'rtadvd.tproj/rtadvd_logging.c', + 'rtadvd.tproj/timer.c', + ], +) +install_man( + 'rtadvd.tproj/rtadvd.8', + 'rtadvd.tproj/rtadvd.conf.5', +) executable( 'rtsol', diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix index f6bb8f551c9b..a89dd162d3cc 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix @@ -1,9 +1,10 @@ { lib, - apple-sdk, + apple-sdk_15, fetchurl, libpcap, libresolv, + libutil, mkAppleDerivation, openssl, pkg-config, @@ -12,61 +13,7 @@ }: let - # Newer releases of ifconfig use `ioctls` and undocumented APIs newer than 11.x. - # Use files from an older release for now. - old_ifconfig = { - ifconfig = fetchurl { - url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/ifconfig.tproj/ifconfig.c"; - hash = "sha256-yuUpdRHRwYLnivuaQuh8HJdLj/8ppq+K1NFqA8Bg+1k="; - }; - af_inet = fetchurl { - url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/ifconfig.tproj/af_inet.c"; - hash = "sha256-sqcCEzhTur43DG6Ac/1Rt8Kx0umWhDzlV58t+6FlzNU="; - }; - af_inet6 = fetchurl { - url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/ifconfig.tproj/af_inet6.c"; - hash = "sha256-jp0R0Ncwvp9G/lIzKW6wBTAiO8yNyII5c49feTanbIo="; - }; - af_link = fetchurl { - url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/ifconfig.tproj/af_link.c"; - hash = "sha256-5rXJg5azy9SjK675Djt4K1PaczsoVjQ/Lls/u5Kk1+A="; - }; - }; - - # Newer releases of netstat use struct members that aren’t present with the 11.x headers. - # Use files from an older release for now. - old_netstat = { - "if.c" = fetchurl { - url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/netstat.tproj/if.c"; - hash = "sha256-P87rexLkoV1BCyUghVrkGoG6r9rAoWynfpvlwIj7A40="; - }; - "main.c" = fetchurl { - url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/netstat.tproj/main.c"; - hash = "sha256-e3n54l6Wo+G5koMhGMfOTo8+QIkJRurr2fBOjg/nFgI="; - }; - "inet.c" = fetchurl { - url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/netstat.tproj/inet.c"; - hash = "sha256-X1+dz+D6xR2Xqoxypjmy65pKBCh4iGVfByJGI0wVGO0="; - }; - "inet6.c" = fetchurl { - url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/netstat.tproj/inet6.c"; - hash = "sha256-av5K1UQE3edUbzKN9FIn/DOeibsJaTZc0xJzDu9VZ5Q="; - }; - "netstat.h" = fetchurl { - url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/netstat.tproj/netstat.h"; - hash = "sha256-UYi3lmA8G0wRJqVA2NYyMj0yCBUlxu0gMoMYW7NauJg="; - }; - "unix.c" = fetchurl { - url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/netstat.tproj/unix.c"; - hash = "sha256-txs/mnR4WK8JAUN3PtqZsp6q2h+nx5VFKxI/itCTBNo="; - }; - "systm.c" = fetchurl { - url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/netstat.tproj/systm.c"; - hash = "sha256-bISSIsA6OYfkHNOKB4dj9KNLBHfcelGVzwGiYiVqnRM="; - }; - }; - - xnu = apple-sdk.sourceRelease "xnu"; + xnu = apple-sdk_15.sourceRelease "xnu"; privateHeaders = stdenvNoCC.mkDerivation { name = "network_cmds-deps-private-headers"; @@ -84,27 +31,51 @@ let install -D -t "$out/include" \ '${xnu}/osfmk/kern/cs_blobs.h' - install -D -t "$out/firehose" \ + install -D -t "$out/include/firehose" \ + '${xnu}/libkern/firehose/firehose_types_private.h' \ '${xnu}/libkern/firehose/tracepoint_private.h' + for dir in arm i386 machine; do + mkdir -p "$out/include/$dir" + for file in '${xnu}/osfmk/'$dir/*; do + name=$(basename "$file") + # Skip copying `endian.h` because it conflicts with the SDK, breaking the build on x86_64-darwin. + test "$name" != endian.h && cp -r "$file" "$out/include/$dir/$name" + done + done + install -D -t "$out/include/net" \ + '${xnu}/bsd/net/droptap.h' \ '${xnu}/bsd/net/if_bond_internal.h' \ '${xnu}/bsd/net/if_bond_var.h' \ '${xnu}/bsd/net/if_fake_var.h' \ + '${xnu}/bsd/net/if_mib_private.h' \ + '${xnu}/bsd/net/if_var_private.h' \ '${xnu}/bsd/net/if_vlan_var.h' \ '${xnu}/bsd/net/lacp.h' \ '${xnu}/bsd/net/net_perf.h' mkdir -p "$out/include/net/classq" "$out/include/net/pktsched" + cat < "$out/include/net/bpf.h" + #pragma once + #include_next + #include + $(sed -n \ + -e '/^#define BPF_D_/p' \ + -e '/^struct xbpf_d\s*{/,/^};/p' \ + '${xnu}/bsd/net/bpf.h') + EOF + # IFNET constants are defined as enums, so they have to be pre-processed and grepped from the file. cat < "$out/include/net/if.h" #pragma once #include $(sed \ -e 's/^\s*\(IFNET_[^=]*\)=\s*\([^,]*\),*/#define \1\2/' \ - '${xnu}/bsd/net/if.h' | grep '^#define IFNET_') + '${xnu}/bsd/net/if_private.h' | grep '^#define IFNET_') #include_next #include + typedef void* ifnet_t; #define ifreq ifreq_private $(sed -n \ -e '/^#define IFEF_TXSTART/p' \ @@ -130,10 +101,9 @@ let -e '/^struct if_throttlereq\s*{/,/^};/p' \ -e '/^struct ipv6_prefix\s*{/,/^};/p' \ -e '/^struct ifreq\s*{/,/^};/p' \ - '${xnu}/bsd/net/if.h') + '${xnu}/bsd/net/if_private.h') #undef ifreq EOF - unifdef -x 1 -DPRIVATE -m "$out/include/net/if.h" cat < "$out/include/net/content_filter.h" #pragma once @@ -143,21 +113,10 @@ let cat < "$out/include/net/if_var.h" #pragma once + #include + #define IF_NETEM_MODEL_IOD 2 + #define IF_NETEM_MODEL_FPD 3 #include_next - $(sed -n \ - -e '/^#define IFNAMSIZ\s/p' \ - -e '/^#define IF_NETEM/p' \ - -e '/^struct if_bandwidths\s*{/,/^};/p' \ - -e '/^struct if_data_extended\s*{/,/^};/p' \ - -e '/^struct if_interface_state\s*{/,/^};/p' \ - -e '/^struct if_latencies\s*{/,/^};/p' \ - -e '/^struct if_linkparamsreq\s*{/,/^};/p' \ - -e '/^struct if_netem_params\s*{/,/^};/p' \ - -e '/^struct if_netif_stats\s*{/,/^};/p' \ - -e '/^struct if_packet_stats\s*{/,/^};/p' \ - -e '/^struct if_rxpoll_stats\s*{/,/^};/p' \ - -e '/^struct if_traffic_class\s*{/,/^};/p' \ - '${xnu}/bsd/net/if_var.h') EOF cat < "$out/include/net/route.h" @@ -166,11 +125,13 @@ let $(sed -n \ -e '/^struct rt_msghdr_ext\s*{/,/^};/p' \ -e '/^struct rt_reach_info\s*{/,/^};/p' \ - '${xnu}/bsd/net/route.h') + -e '/^struct rtstat_64\s*{/,/^};/p' \ + '${xnu}/bsd/net/route_private.h') EOF ln -s "$out/include/net/route.h" "$out/include/net/route_private.h" install -D -t "$out/include/netinet" \ + '${xnu}/bsd/netinet/icmp6.h' \ '${xnu}/bsd/netinet/ip_flowid.h' cat < "$out/include/netinet/in.h" @@ -180,7 +141,7 @@ let -e '/^#define _DSCP/p' \ -e '/^#define IP_NO/p' \ -e '/^union sockaddr_in_4_6\s*{/,/^};/p' \ - '${xnu}/bsd/netinet/in.h') + '${xnu}/bsd/netinet/in_private.h') #include EOF @@ -190,7 +151,7 @@ let -e '/^struct tcp_info\s*{/,/^};/p' \ -e '/^struct tcp_conn_status\s*{/,/^};/p' \ -e '/^typedef struct conninfo_tcp\s*{/,/} conninfo_tcp_t;/p' \ - '${xnu}/bsd/netinet/tcp.h') + '${xnu}/bsd/netinet/tcp_private.h') #include_next EOF @@ -202,7 +163,7 @@ let #pragma once $(sed -n \ -e '/^#define IPV6_/p' \ - '${xnu}/bsd/netinet6/in6.h') + '${xnu}/bsd/netinet6/in6_private.h') #include_next EOF @@ -228,6 +189,9 @@ let EOF install -D -t "$out/include/os" \ + '${xnu}/libkern/os/atomic_private.h' \ + '${xnu}/libkern/os/atomic_private_arch.h' \ + '${xnu}/libkern/os/atomic_private_impl.h' \ '${xnu}/libkern/os/log_private.h' declare -a privateHeaders=( @@ -286,25 +250,28 @@ let #pragma once #include #include + $(sed -n \ + -e '/^typedef.*sae_associd_t/p' \ + -e '/^typedef.*sae_connid_t/p' \ + '${xnu}/bsd/sys/socket.h') $(sed -n \ -e '/^#define AF_MULTIPATH\s/p' \ -e '/^#define CIAUX_TCP\s/p' \ -e '/^#define NET_RT_/p' \ -e '/^#define SO_RECV/p' \ -e '/^#define SO_TRAFFIC_CLASS\s/,/^#define SO_TC_MAX/p' \ - -e '/^typedef.*sae_associd_t/p' \ - -e '/^typedef.*sae_connid_t/p' \ -e '/^struct so_aidreq\s*{/,/^};/p' \ -e '/^struct so_cidreq\s*{/,/^};/p' \ -e '/^struct so_cinforeq\s*{/,/^};/p' \ -e '/^struct so_cordreq\s*{/,/^};/p' \ - '${xnu}/bsd/sys/socket.h') + '${xnu}/bsd/sys/socket_private.h') #include_next EOF cat < "$out/include/sys/socketvar.h" #pragma once $(sed -n \ + -e '/^#define SO_STATS_/p' \ -e '/^#define SO_TC_STATS_MAX\s/p' \ -e '/^#define XSO_/p' \ -e '/^struct data_stats\s*{/,/^};/p' \ @@ -312,6 +279,7 @@ let -e '/^struct xsocket_n\s*{/,/^};/p' \ -e '/^struct xsockbuf_n\s*{/,/^};/p' \ -e '/^struct xsockstat_n\s*{/,/^};/p' \ + -e '/^typedef.*so_gen_t;/p' \ '${xnu}/bsd/sys/socketvar.h') #include_next EOF @@ -343,12 +311,15 @@ let -e '/^#define SIOCGIFTIMESTAMPENABLED\s/p' \ -e '/^#define SIOCGIFTYPE\s/p' \ -e '/^#define SIOCGIFXFLAGS\s/p' \ + -e '/^#define SIOCGQOSMARKINGENABLED\s/p' \ + -e '/^#define SIOCGQOSMARKINGMODE\s/p' \ -e '/^#define SIOCGSTARTDELAY\s/p' \ -e '/^#define SIOCSECNMODE\s/p' \ -e '/^#define SIOCSETROUTERMODE\s/p' \ -e '/^#define SIOCSFASTLANECAPABLE\s/p' \ -e '/^#define SIOCSFASTLEENABLED\s/p' \ -e '/^#define SIOCSIF2KCL\s/p' \ + -e '/^#define SIOCSIFCONSTRAINED\s/p' \ -e '/^#define SIOCSIFDESC\s/p' \ -e '/^#define SIOCSIFDISABLEOUTPUT\s/p' \ -e '/^#define SIOCSIFEXPENSIVE\s/p' \ @@ -356,7 +327,11 @@ let -e '/^#define SIOCSIFLINKPARAMS\s/p' \ -e '/^#define SIOCSIFLOG\s/p' \ -e '/^#define SIOCSIFLOWPOWER\s/p' \ + -e '/^#define SIOCSIFMARKWAKEPKT\s/p' \ -e '/^#define SIOCSIFMPKLOG\s/p' \ + -e '/^#define SIOCSIFNOACKPRIO\s/p' \ + -e '/^#define SIOCSIFNOTRAFFICSHAPING\s/p' \ + -e '/^#define SIOCSIFDISABLEINPUT\s/p' \ -e '/^#define SIOCSIFPROBECONNECTIVITY\s/p' \ -e '/^#define SIOCSIFSUBFAMILY\s/p' \ -e '/^#define SIOCSIFTHROTTLE\s/p' \ @@ -364,7 +339,7 @@ let -e '/^#define SIOCSIFTIMESTAMPENABLE\s/p' \ -e '/^#define SIOCSQOSMARKINGENABLED\s/p' \ -e '/^#define SIOCSQOSMARKINGMODE\s/p' \ - '${xnu}/bsd/sys/sockio.h') + '${xnu}/bsd/sys/sockio_private.h') #undef ifreq #include_next EOF @@ -388,10 +363,16 @@ let cat < "$out/include/sys/unpcb.h" #pragma once #include_next + #define KERNEL + #ifdef KERNEL + $(sed -n \ + -e '/^struct unpcb_compat\s*{/,/^};/p' \ + '${xnu}/bsd/sys/unpcb.h') + #undef KERNEL $(sed -n \ -e '/^#define xu_addr/p' \ - -e '/^struct xunpcb64_list_entry\s*{/,/^};/p' \ - -e '/^struct xunpcb64\s*{/,/^};/p' \ + -e '/^struct *xunpcb\(64\|_n\)_list_entry\s*{/,/^};/p' \ + -e '/^struct *xunpcb\(64\|_n\)\s*{/,/^};/p' \ '${xnu}/bsd/sys/unpcb.h') ''; }; @@ -416,15 +397,6 @@ mkAppleDerivation { # Fix invalid pointer conversion error from trying to pass `NULL` to a `size_t`. substituteInPlace ndp.tproj/ndp.c --replace-fail 'NULL, NULL);' 'NULL, 0);' - # Copy older files that are more compatible with the current SDK. - ${lib.concatLines ( - lib.mapAttrsToList (name: path: "cp '${path}' 'ifconfig.tproj/${name}.c'") old_ifconfig - )} - - ${lib.concatLines ( - lib.mapAttrsToList (name: path: "cp '${path}' 'netstat.tproj/${name}'") old_netstat - )} - # Use private struct ifreq instead of the one defined in the system header. substituteInPlace ifconfig.tproj/ifconfig.c \ --replace-fail $'struct\tifreq' 'struct ifreq' \ @@ -449,6 +421,7 @@ mkAppleDerivation { buildInputs = [ libpcap libresolv + libutil openssl ]; From 8010c610db660c8e607fc09348c80711b497ac6b Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 22/61] darwin.removefile: drop workaround for older Clang versions --- .../darwin/apple-source-releases/removefile/package.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/removefile/package.nix b/pkgs/os-specific/darwin/apple-source-releases/removefile/package.nix index ab9f28605b5a..24cd68ead681 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/removefile/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/removefile/package.nix @@ -39,13 +39,6 @@ mkAppleDerivation { xcodeHash = "sha256-pE92mVI0KTHOVKBA4T5R1rHy5//uipOimas7DaTVe0U="; - postPatch = '' - # Disable experimental bounds safety stuff that’s not available in LLVM 16. - substituteInPlace removefile.h \ - --replace-fail '__ptrcheck_abi_assume_single()' "" \ - --replace-fail '__unsafe_indexable' "" - ''; - env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include"; meta.description = "Darwin file removing library"; From 13be5191fb933f9ca8b773a7e9ed4ff352cc0cb5 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 23/61] darwin.system_cmds: use default SDK on Darwin (14.4) --- .../system_cmds/meson.build.in | 47 ++++++------------- .../system_cmds/meson.options | 1 - .../system_cmds/package.nix | 38 +++++++++++---- 3 files changed, 44 insertions(+), 42 deletions(-) delete mode 100644 pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.options diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build.in index f12b3fe41b92..3263cdb2837c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build.in +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build.in @@ -15,9 +15,11 @@ add_project_arguments( '-DPRIVATE=1', # From bsd/sys/private_event.h in xnu '-Dkqueue_id_t=uint64_t', + # These are not defined automatically by Clang. Not having them defined causes compilation failures. + '-DTARGET_OS_EXCLAVECORE=0', + '-DTARGET_OS_EXCLAVEKIT=0', language : 'c', ) -sdk_version = get_option('sdk_version') # Dependencies @@ -39,15 +41,7 @@ dbm = cc.find_library('dbm') ncurses = dependency('ncurses') openbsm = cc.find_library('bsm') pam = cc.find_library('pam') - -# Feature Tests -if sdk_version.version_compare('<12') - add_project_arguments( - '-DIOMainPort=IOMasterPort', - '-DkIOMainPortDefault=kIOMasterPortDefault', - language : 'c' - ) -endif +util = cc.find_library('util') # Generators @@ -278,14 +272,11 @@ executable( executable( 'latency', - build_by_default : sdk_version.version_compare('>=12'), - dependencies : [ ncurses ], - install : sdk_version.version_compare('>=12'), + dependencies : [ util, ncurses ], + install : true, sources : 'latency/latency.c', ) -if sdk_version.version_compare('>=12') - install_man('latency/latency.1') -endif +install_man('latency/latency.1') executable( 'login', @@ -303,27 +294,21 @@ executable( executable( 'lskq', - build_by_default : sdk_version.version_compare('>=12'), - install : sdk_version.version_compare('>=12'), + install : true, sources : 'lskq/lskq.c', ) -if sdk_version.version_compare('>=12') - install_man('lskq/lskq.1') -endif +install_man('lskq/lskq.1') executable( 'lsmp', - build_by_default : sdk_version.version_compare('>=12'), - install : sdk_version.version_compare('>=12'), + install : true, sources : [ 'lsmp/lsmp.c', 'lsmp/port_details.c', 'lsmp/task_details.c' ] ) -if sdk_version.version_compare('>=12') - install_man('lsmp/lsmp.1') -endif +install_man('lsmp/lsmp.1') executable( 'ltop', @@ -469,14 +454,11 @@ install_man('sa/sa.8') executable( 'sc_usage', - build_by_default : sdk_version.version_compare('>=12'), - dependencies : ncurses, - install : sdk_version.version_compare('>=12'), + dependencies : [ncurses, util], + install : true, sources : 'sc_usage/sc_usage.c', ) -if sdk_version.version_compare('>=12') - install_man('sc_usage/sc_usage.1') -endif +install_man('sc_usage/sc_usage.1') executable('shutdown', # Requires IOKitUser kext APIs @@ -599,4 +581,3 @@ executable( sources : 'zprint/zprint.c', ) # install_man('zprint/zprint.1') - diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.options b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.options deleted file mode 100644 index 8c4ce874c64c..000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.options +++ /dev/null @@ -1 +0,0 @@ -option('sdk_version', type : 'string') diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix index 5e2b5ea0f834..a300bd1534ef 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix @@ -1,7 +1,7 @@ { lib, apple-sdk, - apple-sdk_12, + libutil, mkAppleDerivation, ncurses, openpam, @@ -13,12 +13,12 @@ let libdispatch = apple-sdk.sourceRelease "libdispatch"; # Has to match the version of the SDK - Libc = apple-sdk_12.sourceRelease "Libc"; - libmalloc = apple-sdk_12.sourceRelease "libmalloc"; - OpenDirectory = apple-sdk_12.sourceRelease "OpenDirectory"; + Libc = apple-sdk.sourceRelease "Libc"; + libmalloc = apple-sdk.sourceRelease "libmalloc"; + OpenDirectory = apple-sdk.sourceRelease "OpenDirectory"; - libplatform = apple-sdk_12.sourceRelease "libplatform"; - xnu = apple-sdk_12.sourceRelease "xnu"; + libplatform = apple-sdk.sourceRelease "libplatform"; + xnu = apple-sdk.sourceRelease "xnu"; privateHeaders = stdenvNoCC.mkDerivation { name = "system_cmds-deps-private-headers"; @@ -43,6 +43,7 @@ let install -D -t "$out/include" \ '${libmalloc}/private/stack_logging.h' \ '${libplatform}/private/_simple.h' \ + '${xnu}/libsyscall/wrappers/libproc/libproc_private.h' \ '${xnu}/libsyscall/wrappers/spawn/spawn_private.h' touch "$out/include/btm.h" @@ -71,13 +72,29 @@ let install -D -t "$out/include/sys" \ '${xnu}/bsd/sys/csr.h' \ + '${xnu}/bsd/sys/event_private.h' \ '${xnu}/bsd/sys/pgo.h' \ + '${xnu}/bsd/sys/kdebug_private.h' \ '${xnu}/bsd/sys/kern_memorystatus.h' \ + '${xnu}/bsd/sys/proc_info_private.h' \ '${xnu}/bsd/sys/reason.h' \ '${xnu}/bsd/sys/resource.h' \ + '${xnu}/bsd/sys/resource_private.h' \ '${xnu}/bsd/sys/spawn_internal.h' \ '${xnu}/bsd/sys/stackshot.h' + cat < "$out/include/sys/kdebug.h" + #pragma once + #include_next + #include + EOF + + cat < "$out/include/sys/proc_info.h" + #pragma once + #include_next + #include + EOF + # Older source releases depend on CrashReporterClient.h, but it’s not publicly available. touch "$out/include/CrashReporterClient.h" ''; @@ -94,6 +111,12 @@ mkAppleDerivation { # Requires BackgroundTaskManagement.framework headers. sed -e '/ if (os_feature_enabled(cronBTMToggle, cronBTMCheck))/,/ }/d' -i atrun/atrun.c + + # Fix format security errors + for src in latency/latency.c sc_usage/sc_usage.c; do + substituteInPlace $src \ + --replace-fail 'printw(tbuf)' 'printw("%s", tbuf);' + done ''; preConfigure = '' @@ -104,13 +127,12 @@ mkAppleDerivation { buildInputs = [ apple-sdk.privateFrameworksHook + libutil ncurses openpam ]; nativeBuildInputs = [ pkg-config ]; - mesonFlags = [ (lib.mesonOption "sdk_version" stdenv.hostPlatform.darwinSdkVersion) ]; - meta.description = "System commands for Darwin"; } From ea758132a153f61df781c98ef0929fd5370a86a0 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 24/61] darwin.text_cmds: use default SDK on Darwin (14.4) --- .../apple-source-releases/text_cmds/package.nix | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/package.nix index b640edb096b8..b4b31530895d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/package.nix @@ -1,7 +1,6 @@ { lib, apple-sdk, - apple-sdk_13, bzip2, libmd, libresolv, @@ -18,7 +17,6 @@ let Libc = apple-sdk.sourceRelease "Libc"; - Libc_13 = apple-sdk_13.sourceRelease "Libc"; CommonCrypto = apple-sdk.sourceRelease "CommonCrypto"; libplatform = apple-sdk.sourceRelease "libplatform"; @@ -30,7 +28,7 @@ let buildCommand = '' install -D -t "$out/include" \ '${libplatform}/private/_simple.h' \ - '${Libc_13}/include/vis.h' + '${Libc}/include/vis.h' install -D -t "$out/include/os" \ '${Libc}/os/assumes.h' \ '${xnu}/libkern/os/base_private.h' @@ -60,18 +58,6 @@ mkAppleDerivation { --replace-fail SHA224_CTX SHA2_CTX \ --replace-fail '' '' \ --replace-fail 'const void *, unsigned int, char *' 'const uint8_t *, size_t, char *' - '' - + lib.optionalString (lib.versionOlder (lib.getVersion apple-sdk) "13.0") '' - # Backport vis APIs from the 13.3 SDK (needed by vis). - cp '${Libc_13}/gen/FreeBSD/vis.c' vis/vis-libc.c - # Backport errx APIs from the 13.3 SDK (needed by lots of things). - mkdir sys - cp '${Libc_13}/gen/FreeBSD/err.c' err-libc.c - cp '${Libc_13}/include/err.h' err.h - cp '${Libc_13}/fbsdcompat/sys/cdefs.h' sys/cdefs.h - substituteInPlace err.h \ - --replace-fail '__cold' "" - touch namespace.h un-namespace.h libc_private.h ''; env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include"; From 2fbd3f4aab2e22a468704feef1d4a65c7761972e Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 25/61] dotnetCorePackages.dotnet_{8,9,10}.vmr: use default SDK on Darwin (14.4) --- pkgs/development/compilers/dotnet/vmr.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix index 5f1882e777eb..04562acd3120 100644 --- a/pkgs/development/compilers/dotnet/vmr.nix +++ b/pkgs/development/compilers/dotnet/vmr.nix @@ -18,7 +18,6 @@ darwin, xcbuild, swiftPackages, - apple-sdk_13, openssl, getconf, python3, @@ -112,15 +111,12 @@ stdenv.mkDerivation rec { krb5 lttng-ust_2_12 ] - ++ lib.optionals isDarwin ( - [ - xcbuild - swift - krb5 - sigtool - ] - ++ lib.optional (lib.versionAtLeast version "10") apple-sdk_13 - ); + ++ lib.optionals isDarwin [ + xcbuild + swift + krb5 + sigtool + ]; # This is required to fix the error: # > CSSM_ModuleLoad(): One or more parameters passed to a function were not valid. From 20e89e336ebc3ffca4abdd59e01cc387c133f717 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 26/61] drawterm: use default SDK on Darwin (14.4) --- pkgs/by-name/dr/drawterm/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/dr/drawterm/package.nix b/pkgs/by-name/dr/drawterm/package.nix index ea7893024b3c..4e1411206978 100644 --- a/pkgs/by-name/dr/drawterm/package.nix +++ b/pkgs/by-name/dr/drawterm/package.nix @@ -5,7 +5,6 @@ unstableGitUpdater, installShellFiles, makeWrapper, - apple-sdk_13, xorg, pkg-config, wayland-scanner, @@ -54,8 +53,7 @@ stdenv.mkDerivation { ++ lib.optionals withXorg [ xorg.libX11 xorg.libXt - ] - ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_13; + ]; makeFlags = lib.optional withWayland "CONF=linux" From 72289dfaa66cff3c7d42f25b41e1abb2ffbf6695 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 27/61] ghostunnel: use default SDK on Darwin (14.4) --- pkgs/by-name/gh/ghostunnel/package.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/by-name/gh/ghostunnel/package.nix b/pkgs/by-name/gh/ghostunnel/package.nix index ed4cc9f9c7a5..6b90c1acb688 100644 --- a/pkgs/by-name/gh/ghostunnel/package.nix +++ b/pkgs/by-name/gh/ghostunnel/package.nix @@ -5,8 +5,6 @@ lib, nixosTests, ghostunnel, - apple-sdk_12, - darwinMinVersionHook, writeScript, runtimeShell, }: @@ -26,11 +24,6 @@ buildGoModule rec { deleteVendor = true; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_12 - (darwinMinVersionHook "12.0") - ]; - # These tests don't exist for Linux, and on Darwin they attempt to use the macOS Keychain # which doesn't work from a nix build. Presumably other platform implementations of the # certstore would have similar issues, so it probably makes sense to skip them in From 7da765f439b2a8f03e07b094503cb0bc3a0b7d1d Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 28/61] go: use default SDK on Darwin (14.4) --- pkgs/development/compilers/go/1.25.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/compilers/go/1.25.nix b/pkgs/development/compilers/go/1.25.nix index db50761a4bbc..d7eff664fa04 100644 --- a/pkgs/development/compilers/go/1.25.nix +++ b/pkgs/development/compilers/go/1.25.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - apple-sdk_12, tzdata, replaceVars, iana-etc, @@ -70,10 +69,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.libc.out ] ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ - apple-sdk_12 - ]; - depsBuildTarget = lib.optional isCross targetCC; depsTargetTarget = lib.optional stdenv.targetPlatform.isMinGW targetPackages.threads.package; From 1557189e93c847e74c0d4eb271cff5eed790ff68 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 29/61] gopass: use default SDK on Darwin (14.4) --- pkgs/tools/security/gopass/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 5028d1096e32..c10aabed38aa 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -10,7 +10,6 @@ xclip, wl-clipboard, passAlias ? false, - apple-sdk_14, nix-update-script, versionCheckHook, }: @@ -36,11 +35,6 @@ buildGoModule (finalAttrs: { makeBinaryWrapper ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - # For ScreenCaptureKit.h, see https://github.com/NixOS/nixpkgs/pull/358760#discussion_r1858327365 - apple-sdk_14 - ]; - src = fetchFromGitHub { owner = "gopasspw"; repo = "gopass"; From a148418ba6a611637ac4b483853c184900736237 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 30/61] gopass-jsonapi: use default SDK on Darwin (14.4) --- pkgs/by-name/go/gopass-jsonapi/package.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/by-name/go/gopass-jsonapi/package.nix b/pkgs/by-name/go/gopass-jsonapi/package.nix index 91a8baccd8a1..b3f594155695 100644 --- a/pkgs/by-name/go/gopass-jsonapi/package.nix +++ b/pkgs/by-name/go/gopass-jsonapi/package.nix @@ -8,7 +8,6 @@ jq, gnupg, gopass, - apple-sdk_14, }: let @@ -45,11 +44,6 @@ buildGoModule rec { makeWrapper ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - # For ScreenCaptureKit.h, see https://github.com/NixOS/nixpkgs/pull/358760#discussion_r1858327365 - apple-sdk_14 - ]; - ldflags = [ "-s" "-w" From 4c07c99f2b30aecbe150d6af3a948ce09c867f5b Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 31/61] gst_all_1: use default SDK on Darwin (14.4) --- pkgs/development/libraries/gstreamer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 760ec0610dee..a33b23e18275 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -4,11 +4,11 @@ callPackage, ipu6ep-camera-hal, ipu6epmtl-camera-hal, - apple-sdk_13, + apple-sdk, }: let - apple-sdk_gstreamer = apple-sdk_13; + apple-sdk_gstreamer = apple-sdk; in { inherit apple-sdk_gstreamer; From 8d2b795e205e61af108559c526a2dae2f040a328 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 32/61] kanata: use default SDK on Darwin (14.4) --- pkgs/by-name/ka/kanata/package.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/by-name/ka/kanata/package.nix b/pkgs/by-name/ka/kanata/package.nix index 509fc4cd0a21..73f0b9eeeb64 100644 --- a/pkgs/by-name/ka/kanata/package.nix +++ b/pkgs/by-name/ka/kanata/package.nix @@ -1,8 +1,6 @@ { stdenv, lib, - apple-sdk_13, - darwinMinVersionHook, rustPlatform, fetchFromGitHub, versionCheckHook, @@ -23,14 +21,9 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-LfjuQHR3vVUr2e0efVymnfCnyYkFRx7ZiNdSIjBZc5s="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_13 - (darwinMinVersionHook "13.0") - ]; - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ (writeShellScriptBin "sw_vers" '' - echo 'ProductVersion: 13.0' + echo 'ProductVersion: ${stdenv.hostPlatform.darwinMinVersion}' '') ]; From b9eab368aff3a451cbbf0f189b05de04ecb26046 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 33/61] koboldcpp: use default SDK on Darwin (14.4) --- pkgs/by-name/ko/koboldcpp/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index 8069cd12f86e..a617042d71a0 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -7,8 +7,6 @@ tk, addDriverRunpath, - apple-sdk_12, - koboldLiteSupport ? true, config, @@ -63,7 +61,6 @@ effectiveStdenv.mkDerivation (finalAttrs: { tk ] ++ finalAttrs.pythonInputs - ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_12 ] ++ lib.optionals cublasSupport [ cudaPackages.libcublas cudaPackages.cuda_nvcc From 58a2ab47bea9fd9ed7345074d8c7c44370f25a0d Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 34/61] ladybird: use default SDK on Darwin (14.4) --- pkgs/by-name/la/ladybird/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix index 5c558f5eea40..e671ade25980 100644 --- a/pkgs/by-name/la/ladybird/package.nix +++ b/pkgs/by-name/la/ladybird/package.nix @@ -27,7 +27,6 @@ skia, nixosTests, unstableGitUpdater, - apple-sdk_14, libtommath, sdl3, }: @@ -107,9 +106,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional stdenv.hostPlatform.isLinux [ libpulseaudio.dev qt6Packages.qtwayland - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_14 ]; cmakeFlags = [ From 5f5b7dc7d2ec2eb9c4c4e0c9d1f6a1fc0d0ed5bf Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 35/61] livkit-webrtc: use default SDK on Darwin (14.4) --- pkgs/by-name/li/livekit-libwebrtc/package.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/li/livekit-libwebrtc/package.nix b/pkgs/by-name/li/livekit-libwebrtc/package.nix index fe5235d5b492..89fbc8ec6f11 100644 --- a/pkgs/by-name/li/livekit-libwebrtc/package.nix +++ b/pkgs/by-name/li/livekit-libwebrtc/package.nix @@ -9,7 +9,6 @@ xcbuild, python3, ninja, - apple-sdk_14, darwinMinVersionHook, git, cpio, @@ -191,11 +190,7 @@ stdenv.mkDerivation { glib alsa-lib pulseaudio - ]) - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_14 - (darwinMinVersionHook "12.3") - ]; + ]); preConfigure = '' echo "generate_location_tags = true" >> build/config/gclient_args.gni @@ -234,7 +229,7 @@ stdenv.mkDerivation { "is_clang=false" ]) ++ (lib.optionals stdenv.hostPlatform.isDarwin [ - ''mac_deployment_target="12.3"'' + ''mac_deployment_target="${stdenv.hostPlatform.darwinMinVersion}"'' "rtc_enable_symbol_export=true" "rtc_enable_objc_symbol_export=true" "rtc_include_dav1d_in_internal_decoder_factory=true" From 51370732ee2db2cb3abea953eb74edf31a2b7a67 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 36/61] llama-cpp: use default SDK on Darwin (14.4) --- pkgs/by-name/ll/llama-cpp/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 626336395493..548a03c70233 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -30,7 +30,6 @@ metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && !openclSupport, vulkanSupport ? false, rpcSupport ? false, - apple-sdk_14, curl, llama-cpp, shaderc, @@ -121,7 +120,6 @@ effectiveStdenv.mkDerivation (finalAttrs: { ++ optionals rocmSupport rocmBuildInputs ++ optionals blasSupport [ blas ] ++ optionals vulkanSupport vulkanBuildInputs - ++ optionals metalSupport [ apple-sdk_14 ] ++ [ curl ]; preConfigure = '' From d068cfff50fcb0833879d1d75e6380397685a216 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 9 Oct 2025 17:57:13 -0400 Subject: [PATCH 37/61] nchat: use default SDK on Darwin (14.4) --- pkgs/by-name/nc/nchat/package.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/by-name/nc/nchat/package.nix b/pkgs/by-name/nc/nchat/package.nix index 8ee45785f8cd..8f544f0d79a5 100644 --- a/pkgs/by-name/nc/nchat/package.nix +++ b/pkgs/by-name/nc/nchat/package.nix @@ -13,7 +13,6 @@ gperf, nix-update-script, withWhatsApp ? true, - apple-sdk_12, }: let @@ -88,10 +87,6 @@ stdenv.mkDerivation rec { readline sqlite zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # For SecTrustCopyCertificateChain, see https://github.com/NixOS/nixpkgs/pull/445063#pullrequestreview-3261846621 - apple-sdk_12 ]; cmakeFlags = [ From a0686081fe12cdbdf3260c0ade2cb391a03a5d73 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 38/61] nvtopPackages.apple: use default SDK on Darwin (14.4) --- pkgs/tools/system/nvtop/build-nvtop.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/system/nvtop/build-nvtop.nix b/pkgs/tools/system/nvtop/build-nvtop.nix index 79721da656b4..df66ef58e24a 100644 --- a/pkgs/tools/system/nvtop/build-nvtop.nix +++ b/pkgs/tools/system/nvtop/build-nvtop.nix @@ -9,7 +9,6 @@ ncurses, testers, udev, - apple-sdk_12, addDriverRunpath, amd ? false, intel ? false, @@ -77,7 +76,6 @@ stdenv.mkDerivation (finalAttrs: { ncurses ] ++ lib.optional stdenv.hostPlatform.isLinux udev - ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_12 ++ lib.optional nvidia cudatoolkit ++ lib.optional needDrm libdrm; From f02b8cf7b9c10e652b55dc2f4b322e657759ee84 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 39/61] ponyc: use default SDK on Darwin (14.4) --- pkgs/by-name/po/ponyc/package.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/po/ponyc/package.nix b/pkgs/by-name/po/ponyc/package.nix index d2c126c78aae..cad3e1446b8e 100644 --- a/pkgs/by-name/po/ponyc/package.nix +++ b/pkgs/by-name/po/ponyc/package.nix @@ -2,10 +2,9 @@ lib, stdenv, fetchFromGitHub, - apple-sdk_13, + apple-sdk, cmake, coreutils, - darwinMinVersionHook, libxml2, lto ? true, makeWrapper, @@ -58,9 +57,6 @@ stdenv.mkDerivation rec { git ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Keep in sync with `PONY_OSX_PLATFORM`. - apple-sdk_13 - (darwinMinVersionHook "13.0") cctools.libtool ]; @@ -76,7 +72,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (replaceVars ./fix-darwin-build.patch { - apple-sdk = apple-sdk_13; + inherit apple-sdk; }) ]; From ccd7288e2604d32f6c535405fe1f0f992aa2f7bb Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 40/61] python3Packages.materialx: use default SDK on Darwin (14.4) --- pkgs/development/python-modules/materialx/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/materialx/default.nix b/pkgs/development/python-modules/materialx/default.nix index 5d9a744079c3..96d3995259cd 100644 --- a/pkgs/development/python-modules/materialx/default.nix +++ b/pkgs/development/python-modules/materialx/default.nix @@ -11,7 +11,6 @@ openimageio, imath, python, - apple-sdk_14, }: buildPythonPackage rec { @@ -36,9 +35,6 @@ buildPythonPackage rec { openimageio imath ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_14 - ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libX11 libXt @@ -46,6 +42,7 @@ buildPythonPackage rec { ]; cmakeFlags = [ + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" (lib.cmakeBool "MATERIALX_BUILD_OIIO" true) (lib.cmakeBool "MATERIALX_BUILD_SHARED_LIBS" true) (lib.cmakeBool "MATERIALX_BUILD_PYTHON" true) From e2f070607421f89eb89b095a3e8faf5a75e3f25d Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 41/61] python3Packages.mlx: use default SDK on Darwin (14.4) --- pkgs/development/python-modules/mlx/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix index 1816bc34f7ed..9aec1b175c76 100644 --- a/pkgs/development/python-modules/mlx/default.nix +++ b/pkgs/development/python-modules/mlx/default.nix @@ -12,7 +12,7 @@ cmake, # buildInputs - apple-sdk_14, + apple-sdk, fmt, nanobind, nlohmann_json, @@ -48,7 +48,7 @@ let patches = [ (replaceVars ./darwin-build-fixes.patch { - sdkVersion = apple-sdk_14.version; + sdkVersion = apple-sdk.version; }) ]; @@ -95,7 +95,6 @@ let ]; buildInputs = [ - apple-sdk_14 fmt gguf-tools nanobind From ca24684803ea7c2a8ab7c80a17c12bce26fac04b Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 42/61] python3Packages.torch: use default SDK on Darwin (14.4) --- pkgs/development/python-modules/torch/source/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix index 61caaf420b57..345ab9866ae6 100644 --- a/pkgs/development/python-modules/torch/source/default.nix +++ b/pkgs/development/python-modules/torch/source/default.nix @@ -42,7 +42,6 @@ removeReferencesTo, # Build inputs - apple-sdk_13, openssl, numactl, llvmPackages, @@ -589,9 +588,6 @@ buildPythonPackage rec { ++ lib.optionals rocmSupport [ rocmPackages.llvm.openmp ] ++ lib.optionals (cudaSupport || rocmSupport) [ effectiveMagma ] ++ lib.optionals stdenv.hostPlatform.isLinux [ numactl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_13 - ] ++ lib.optionals tritonSupport [ _tritonEffective ] ++ lib.optionals MPISupport [ mpi ] ++ lib.optionals rocmSupport [ From 28f33de7dd9e92a21cc754b0187b1375d4edb209 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 43/61] python3Packages.torchvision: use default SDK on Darwin (14.4) --- pkgs/development/python-modules/torchvision/default.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index bec58361183e..50997ca76193 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -2,7 +2,6 @@ lib, stdenv, torch, - apple-sdk_13, buildPythonPackage, darwinMinVersionHook, fetchFromGitHub, @@ -55,14 +54,6 @@ buildPythonPackage { libjpeg_turbo libpng torch.cxxdev - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # This should match the SDK used by `torch` above - apple-sdk_13 - - # error: unknown type name 'MPSGraphCompilationDescriptor'; did you mean 'MPSGraphExecutionDescriptor'? - # https://developer.apple.com/documentation/metalperformanceshadersgraph/mpsgraphcompilationdescriptor/ - (darwinMinVersionHook "12.0") ]; dependencies = [ From 968bc7dfb4ef40bd4a825818c4a3c19c7aaffe55 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 44/61] qemu: use default SDK on Darwin (14.4) --- pkgs/applications/virtualization/qemu/default.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 00521e0feb27..ec4acef94d96 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -32,8 +32,6 @@ socat, libslirp, libcbor, - apple-sdk_13, - darwinMinVersionHook, guestAgentSupport ? (with stdenv.hostPlatform; isLinux || isNetBSD || isOpenBSD || isSunOS || isWindows) && !minimal, numaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32 && !minimal, @@ -128,14 +126,6 @@ assert lib.assertMsg ( let hexagonSupport = hostCpuTargets == null || lib.elem "hexagon" hostCpuTargets; - - # needed in buildInputs and depsBuildBuild - # check log for warnings eg: `warning: 'hv_vm_config_get_max_ipa_size' is only available on macOS 13.0` - # to indicate if min version needs to get bumped. - darwinSDK = [ - apple-sdk_13 - (darwinMinVersionHook "13") - ]; in stdenv.mkDerivation (finalAttrs: { @@ -156,7 +146,6 @@ stdenv.mkDerivation (finalAttrs: { depsBuildBuild = [ buildPackages.stdenv.cc ] - ++ lib.optionals stdenv.buildPlatform.isDarwin darwinSDK ++ lib.optionals hexagonSupport [ pkg-config ]; nativeBuildInputs = [ @@ -205,7 +194,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (!userOnly) [ curl ] ++ lib.optionals ncursesSupport [ ncurses ] - ++ lib.optionals stdenv.hostPlatform.isDarwin darwinSDK ++ lib.optionals seccompSupport [ libseccomp ] ++ lib.optionals numaSupport [ numactl ] ++ lib.optionals alsaSupport [ alsa-lib ] From f6b75da2d534b87464c25b5572c44fadb3231495 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 45/61] qt5.*: use default SDK on Darwin (14.4) --- pkgs/development/libraries/qt-5/modules/qtbase.nix | 7 ------- pkgs/development/libraries/qt-5/qtModule.nix | 8 +------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 57f77518ed55..4974937053ca 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -17,7 +17,6 @@ python3, which, # darwin support - apple-sdk_14, xcbuild, dbus, @@ -86,11 +85,6 @@ let "linux-generic-g++" else throw "Please add a qtPlatformCross entry for ${plat.config}"; - - # Per https://doc.qt.io/qt-5/macos.html#supported-versions: build SDK = 13.x or 14.x. - darwinVersionInputs = [ - apple-sdk_14 - ]; in stdenv.mkDerivation ( @@ -153,7 +147,6 @@ stdenv.mkDerivation ( ++ lib.optionals (!stdenv.hostPlatform.isDarwin) ( lib.optional withLibinput libinput ++ lib.optional withGtk3 gtk3 ) - ++ lib.optional stdenv.hostPlatform.isDarwin darwinVersionInputs ++ lib.optional developerBuild gdb ++ lib.optional (cups != null) cups ++ lib.optional mysqlSupport libmysqlclient diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix index 165b4271c077..fa21bb05c864 100644 --- a/pkgs/development/libraries/qt-5/qtModule.nix +++ b/pkgs/development/libraries/qt-5/qtModule.nix @@ -3,7 +3,6 @@ stdenv, buildPackages, mkDerivation, - apple-sdk_14, perl, qmake, patches, @@ -29,12 +28,7 @@ mkDerivation ( inherit pname version src; patches = (args.patches or [ ]) ++ (patches.${pname} or [ ]); - buildInputs = - args.buildInputs or [ ] - # Per https://doc.qt.io/qt-5/macos.html#supported-versions - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_14 - ]; + buildInputs = args.buildInputs or [ ]; nativeBuildInputs = (args.nativeBuildInputs or [ ]) From 46efd7786aead34e49ed60d5eb2f604ed232b0bd Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 46/61] rpm: use default SDK on Darwin (14.4) --- pkgs/tools/package-management/rpm/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 49f144d390ba..343004ddc324 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -19,7 +19,6 @@ sqlite, zstd, libcap, - apple-sdk_13, darwinMinVersionHook, openssl, #, libselinux @@ -90,10 +89,6 @@ stdenv.mkDerivation rec { libcap audit systemd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_13 - (darwinMinVersionHook "13.0") ]; patches = lib.optionals stdenv.hostPlatform.isDarwin [ From 1a0918ae778491fa891720d9d1a705eaac6aecc6 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 47/61] rstudio: use default SDK on Darwin (14.4) --- pkgs/by-name/rs/rstudio/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/rs/rstudio/package.nix b/pkgs/by-name/rs/rstudio/package.nix index 94ee478ea25f..510a1a39eebb 100644 --- a/pkgs/by-name/rs/rstudio/package.nix +++ b/pkgs/by-name/rs/rstudio/package.nix @@ -24,7 +24,6 @@ yarnConfigHook, zip, - apple-sdk_11, boost187, electron_37, fontconfig, @@ -160,9 +159,6 @@ stdenv.mkDerivation rec { soci sqlite.dev ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - ] ++ lib.optionals (!server) [ fontconfig ] From f86b1e9a0fad00a5d3dcc008ddba0e3c5d5f013f Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 48/61] screen-pipe: use default SDK on Darwin (14.4) --- pkgs/by-name/sc/screen-pipe/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/sc/screen-pipe/package.nix b/pkgs/by-name/sc/screen-pipe/package.nix index a54576c598a1..c26a380f77f5 100644 --- a/pkgs/by-name/sc/screen-pipe/package.nix +++ b/pkgs/by-name/sc/screen-pipe/package.nix @@ -11,7 +11,6 @@ stdenv, alsa-lib, xorg, - apple-sdk_12, }: rustPlatform.buildRustPackage rec { pname = "screen-pipe"; @@ -48,9 +47,6 @@ rustPlatform.buildRustPackage rec { openssl sqlite ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_12 - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib xorg.libxcb From 619a93bc87cc10a6f89302e4cd5d0bf98243cb29 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 49/61] sdl3: use default SDK on Darwin (14.4) --- pkgs/by-name/sd/sdl3/package.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix index 8488b5345258..5237c94c40ab 100644 --- a/pkgs/by-name/sd/sdl3/package.nix +++ b/pkgs/by-name/sd/sdl3/package.nix @@ -3,7 +3,6 @@ stdenv, config, alsa-lib, - apple-sdk_11, cmake, darwinMinVersionHook, dbus, @@ -144,12 +143,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional (openglSupport && !stdenv.hostPlatform.isDarwin) libGL ++ lib.optional x11Support xorg.libX11 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # error: 'MTLPixelFormatASTC_4x4_LDR' is unavailable: not available on macOS - (darwinMinVersionHook "11.0") - - apple-sdk_11 - ] ++ lib.optionals ibusSupport [ # sdl3 only uses some constants of the ibus headers # it never actually loads the library From e963c19b5f47b29844d0c1c9ec88064c18b5dc35 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 50/61] sdrangel: use default SDK on Darwin (14.4) --- pkgs/by-name/sd/sdrangel/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/sd/sdrangel/package.nix b/pkgs/by-name/sd/sdrangel/package.nix index 08538523beb2..eea36612c8a9 100644 --- a/pkgs/by-name/sd/sdrangel/package.nix +++ b/pkgs/by-name/sd/sdrangel/package.nix @@ -3,7 +3,6 @@ stdenv, airspy, airspyhf, - apple-sdk_12, aptdec, boost, cm256cc, @@ -102,7 +101,6 @@ stdenv.mkDerivation (finalAttrs: { zlib ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6Packages.qtwayland ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_12 ] ++ lib.optionals withSDRplay [ sdrplay ]; cmakeFlags = [ From da7a8d12f02337f7d9f3c66f7076f516d62daf88 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 51/61] servo: use default SDK on Darwin (14.4) --- pkgs/by-name/se/servo/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix index c6b69dc98503..257e3234347a 100644 --- a/pkgs/by-name/se/servo/package.nix +++ b/pkgs/by-name/se/servo/package.nix @@ -24,7 +24,6 @@ zlib, # runtime deps - apple-sdk_14, fontconfig, freetype, gst_all_1, @@ -131,9 +130,6 @@ rustPlatform.buildRustPackage { xorg.libxcb udev vulkan-loader - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_14 ]; # Builds with additional features for aarch64, see https://github.com/servo/servo/issues/36819 From 6ab924b0c2e1fbc11bb1952e5910521f144acb9a Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 52/61] shipwright: use default SDK on Darwin (14.4) --- pkgs/by-name/sh/shipwright/package.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/by-name/sh/shipwright/package.nix b/pkgs/by-name/sh/shipwright/package.nix index c3fd3e73c0c8..d1de64a45036 100644 --- a/pkgs/by-name/sh/shipwright/package.nix +++ b/pkgs/by-name/sh/shipwright/package.nix @@ -1,5 +1,4 @@ { - apple-sdk_13, stdenv, cmake, lsb-release, @@ -165,10 +164,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio zenity - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Metal.hpp requires macOS 13.x min. - apple-sdk_13 ]; cmakeFlags = [ From 109017913fe23f26b00257728e39ab318fd770bc Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 53/61] spacebar: use default SDK on Darwin (14.4) --- pkgs/by-name/sp/spacebar/package.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/by-name/sp/spacebar/package.nix b/pkgs/by-name/sp/spacebar/package.nix index dec0ec5dc6ac..2fcb62b97851 100644 --- a/pkgs/by-name/sp/spacebar/package.nix +++ b/pkgs/by-name/sp/spacebar/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - apple-sdk_12, }: stdenv.mkDerivation rec { @@ -16,10 +15,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-4LiG43kPZtsm7SQ/28RaGMpYsDshCaGvc1mouPG3jFM="; }; - buildInputs = [ - apple-sdk_12 - ]; - installPhase = '' mkdir -p $out/bin mkdir -p $out/share/man/man1/ From ec30ce8c6530a5f4d965766f2e9206c719468953 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 54/61] spidermonkey: drop SDK version workaround patch --- .../spidermonkey/140-relax-apple-sdk.patch | 13 ------------- .../interpreters/spidermonkey/common.nix | 2 -- 2 files changed, 15 deletions(-) delete mode 100644 pkgs/development/interpreters/spidermonkey/140-relax-apple-sdk.patch diff --git a/pkgs/development/interpreters/spidermonkey/140-relax-apple-sdk.patch b/pkgs/development/interpreters/spidermonkey/140-relax-apple-sdk.patch deleted file mode 100644 index c6e28f11be2f..000000000000 --- a/pkgs/development/interpreters/spidermonkey/140-relax-apple-sdk.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure -index 37c00230c853..dd89bea24392 100644 ---- a/build/moz.configure/toolchain.configure -+++ b/build/moz.configure/toolchain.configure -@@ -233,7 +233,7 @@ with only_when(host_is_osx | target_is_osx): - ) - - def mac_sdk_min_version(): -- return "15.5" -+ return "15.2" - - @depends( - "--with-macos-sdk", diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix index d2e542899540..4462bb085472 100644 --- a/pkgs/development/interpreters/spidermonkey/common.nix +++ b/pkgs/development/interpreters/spidermonkey/common.nix @@ -68,8 +68,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://src.fedoraproject.org/rpms/mozjs140/raw/49492baa47bc1d7b7d5bc738c4c81b4661302f27/f/9aa8b4b051dd539e0fbd5e08040870b3c712a846.patch"; hash = "sha256-SsyO5g7wlrxE7y2+VTHfmUDamofeZVqge8fv2y0ZhuU="; }) - # SDK 15.5 is not available in nixpkgs yet - ./140-relax-apple-sdk.patch ]; nativeBuildInputs = [ From 7cc243d3d52e62eb67ddb0e9f3f3dcb967c6ea86 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 55/61] spotifyd: use default SDK on Darwin (14.4) --- pkgs/by-name/sp/spotifyd/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/sp/spotifyd/package.nix b/pkgs/by-name/sp/spotifyd/package.nix index e76e0950d852..639c448b9a78 100644 --- a/pkgs/by-name/sp/spotifyd/package.nix +++ b/pkgs/by-name/sp/spotifyd/package.nix @@ -3,7 +3,6 @@ stdenv, config, alsa-lib, - apple-sdk_11, cmake, dbus, fetchFromGitHub, @@ -42,8 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; buildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + lib.optionals stdenv.hostPlatform.isLinux [ openssl ] # The `dbus_mpris` feature works on other platforms, but only requires `dbus` on Linux ++ lib.optional (withMpris && stdenv.hostPlatform.isLinux) dbus ++ lib.optional (withALSA || withJack) alsa-lib From e61f6d162f213b705866e7edb65de8cb90bc0c7b Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 56/61] swift: mark broken until the 5.10.1 update can be done --- pkgs/development/compilers/swift/compiler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix index 25d7f37c4089..96d410972bf2 100644 --- a/pkgs/development/compilers/swift/compiler/default.nix +++ b/pkgs/development/compilers/swift/compiler/default.nix @@ -35,12 +35,11 @@ cctools, # libtool sigtool, DarwinTools, - apple-sdk_13, darwinMinVersionHook, }: let - apple-sdk_swift = apple-sdk_13; # Use the SDK that was available when Swift shipped. + apple-sdk_swift = builtins.throw "Swift 5.8 requires the 13.3 SDK, which has been removed"; deploymentVersion = if lib.versionOlder (targetPlatform.darwinMinVersion or "0") "10.15" then @@ -824,5 +823,6 @@ stdenv.mkDerivation { # Swift doesn't support 32-bit Linux, unknown on other platforms. badPlatforms = lib.platforms.i686; timeout = 86400; # 24 hours. + broken = true; # Needs updated to 5.10.1 to build with the 14.4 SDK. }; } From 3c201e0f0e9e2f3d568218b37ee2535ea0002e9c Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 57/61] whisper-cpp: use default SDK on Darwin (14.4) --- pkgs/by-name/wh/whisper-cpp/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/wh/whisper-cpp/package.nix b/pkgs/by-name/wh/whisper-cpp/package.nix index bd24a2f1e976..e8f72715cad8 100644 --- a/pkgs/by-name/wh/whisper-cpp/package.nix +++ b/pkgs/by-name/wh/whisper-cpp/package.nix @@ -3,7 +3,6 @@ stdenv, cmake, git, - apple-sdk_13, ninja, fetchFromGitHub, SDL2, @@ -47,8 +46,6 @@ let optionals ; - darwinBuildInputs = [ apple-sdk_13 ]; - cudaBuildInputs = with cudaPackages; [ cuda_cccl # @@ -111,7 +108,6 @@ effectiveStdenv.mkDerivation (finalAttrs: { buildInputs = optional withSDL SDL2 - ++ optionals effectiveStdenv.hostPlatform.isDarwin darwinBuildInputs ++ optionals cudaSupport cudaBuildInputs ++ optionals rocmSupport rocmBuildInputs ++ optionals vulkanSupport vulkanBuildInputs; From 9d540d1b8c7764f09d57c76113d562f23d8f6845 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 58/61] wine: use default SDK on Darwin (14.4) --- pkgs/applications/emulators/wine/base.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 9ac68c4ffcea..4665547f501d 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -40,12 +40,6 @@ let }; } ./setup-hook-darwin.sh; - # Using the 14.4 SDK allows Wine to use `os_sync_wait_on_address` for its futex implementation on Darwin. - # It does an availability check, so older systems will still work. - darwinFrameworks = lib.optionals stdenv.hostPlatform.isDarwin ( - toBuildInputs pkgArches (pkgs: [ pkgs.apple-sdk_14 ]) - ); - # Building Wine with these flags isn’t supported on Darwin. Using any of them will result in an evaluation failures # because they will put Darwin in `meta.badPlatforms`. darwinUnsupportedFlags = [ @@ -168,7 +162,6 @@ stdenv.mkDerivation ( pkgs.libGL pkgs.libdrm ] - ++ lib.optionals stdenv.hostPlatform.isDarwin darwinFrameworks ++ lib.optionals x11Support ( with pkgs.xorg; [ @@ -213,11 +206,7 @@ stdenv.mkDerivation ( # LD_LIBRARY_PATH. NIX_LDFLAGS = toString ( map (path: "-rpath " + path) ( - map (x: "${lib.getLib x}/lib") ( - [ stdenv.cc.cc ] - # Avoid adding rpath references to non-existent framework `lib` paths. - ++ lib.subtractLists darwinFrameworks finalAttrs.buildInputs - ) + map (x: "${lib.getLib x}/lib") [ stdenv.cc.cc ] # libpulsecommon.so is linked but not found otherwise ++ lib.optionals supportFlags.pulseaudioSupport ( map (x: "${lib.getLib x}/lib/pulseaudio") (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ])) From 9b456509dc6e24ce3c72e352e55508ed41d5767c Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 9 Oct 2025 17:58:27 -0400 Subject: [PATCH 59/61] xemu: use default SDK on Darwin (14.4) --- pkgs/by-name/xe/xemu/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/xe/xemu/package.nix b/pkgs/by-name/xe/xemu/package.nix index 223d1c696451..54847fe83e09 100644 --- a/pkgs/by-name/xe/xemu/package.nix +++ b/pkgs/by-name/xe/xemu/package.nix @@ -29,7 +29,6 @@ wrapGAppsHook3, cacert, darwin, - apple-sdk_12, desktopToDarwinBundle, }: @@ -98,9 +97,6 @@ stdenv.mkDerivation (finalAttrs: { libdrm libgbm vte - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_12 ]; configureFlags = [ From 0f6b88a896e6b2c1ebadd528f75e75d631db227b Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 21 Apr 2025 18:51:52 -0400 Subject: [PATCH 60/61] apple-sdk_{11,12,13}: drop The minimum supported version for 25.11 is 14.0. Drop the old SDKs because they are for versions prior to that. --- .../metadata/apple-oss-lockfile.json | 534 ------------------ .../ap/apple-sdk/metadata/versions.json | 24 - 2 files changed, 558 deletions(-) diff --git a/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json b/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json index 2dc99f12620d..fd77eec04584 100644 --- a/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json +++ b/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json @@ -1,538 +1,4 @@ { - "11.3": { - "CarbonHeaders": { - "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=", - "version": "18.1" - }, - "CommonCrypto": { - "hash": "sha256-92v9tuNLqvalwYV4AqQllA8yN9fqGjSpc4MNAmFPrbk=", - "version": "60178.100.1" - }, - "IOAudioFamily": { - "hash": "sha256-dSSbt9ZoL/Tq2xXwvvXsDmD3Xru7igzdK1MxGL1K+Aw=", - "version": "300.6.1" - }, - "IOBDStorageFamily": { - "hash": "sha256-UgLMsQBe1QLzlbScmPmASBN7VH4YBmNOUX2CEDezjmE=", - "version": "20.100.1" - }, - "IOCDStorageFamily": { - "hash": "sha256-w0YhZ38RBfnxSc74Q8r5UdK+WiWOSAX46r5hahHLnSg=", - "version": "59" - }, - "IODVDStorageFamily": { - "hash": "sha256-1Sa8aZBGNtqJBNHva+YXxET6Wcdm2PgVrTzYT/8qrN4=", - "version": "43" - }, - "IOFWDVComponents": { - "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=", - "version": "208" - }, - "IOFireWireAVC": { - "hash": "sha256-7H3WcZC/HuS9xsTNDWRqt+1JzUNK4ndvd4u2ru0GGRE=", - "version": "428" - }, - "IOFireWireFamily": { - "hash": "sha256-2xppN8RJ9cxrHWjPQ4bUIjtupPbzfmrm3rXnT/9QVfc=", - "version": "483" - }, - "IOFireWireSBP2": { - "hash": "sha256-kfhmZy8veqI3/XHDtOTKmKj6P7s+j0B+BiAbcjhGq0M=", - "version": "442" - }, - "IOFireWireSerialBusProtocolTransport": { - "hash": "sha256-WDq2Ak72Jw6gYNIKgZkiexA6LzccrPn1kpSbW5U50ek=", - "version": "257.40.1" - }, - "IOGraphics": { - "hash": "sha256-kEP4RWIZwu3ZPIq9IAPUKM0gIXHr8xD50SnGNFCQRcI=", - "version": "585.1" - }, - "IOHIDFamily": { - "hash": "sha256-QASfvttke+AUx55In4DD4vsQGzC3nbe+MugQQ4ddXGU=", - "version": "1633.100.36" - }, - "IOKitUser": { - "hash": "sha256-NQCRrufElx00B7CqqslBi5BTxf5Zs4lcMcJig4Eab0k=", - "version": "1845.100.19" - }, - "IONetworkingFamily": { - "hash": "sha256-HqTKzrX75mMFYYbxNKwPdXmI7h7t/QWuO3W1Qo//zIo=", - "version": "151.40.1" - }, - "IOSerialFamily": { - "hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=", - "version": "93" - }, - "IOStorageFamily": { - "hash": "sha256-dy6CYz/z6SwPw0YfC6GLZO2u62Xy8otMDUNrZ5JhTDY=", - "version": "260.100.1" - }, - "IOUSBFamily": { - "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=", - "version": "630.4.5" - }, - "Libc": { - "hash": "sha256-v01g/EtMW/STZQ1neKDMyUGL7sgaCzlwXN0VDaj/Mf0=", - "version": "1439.100.3" - }, - "Libinfo": { - "hash": "sha256-T7KO6zfswjyTIKSdZJCbvfsdqQfPMLj5nheX9iSIl9o=", - "version": "542.40.3" - }, - "Libm": { - "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=", - "version": "2026" - }, - "Libnotify": { - "hash": "sha256-vcDjdwB5OiTEUdl8ISezzpoHeFttkdvkulY/YbUOZjk=", - "version": "279.40.4" - }, - "Librpcsvc": { - "hash": "sha256-8e8E9TkRTAep3/miyqhF/mSkNdlym12W+AVhXF94+Bg=", - "version": "26" - }, - "Libsystem": { - "hash": "sha256-24T9aD4W71prcpr3MnnaU3pfxIzIwkOz39OyhCwPO/E=", - "version": "1292.100.5" - }, - "OpenDirectory": { - "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=", - "version": "146" - }, - "Security": { - "hash": "sha256-o5MyyqDpERvNPvbEfXNgqMIq0YpQV0+ju72C9g/9OdI=", - "version": "59754.100.106" - }, - "architecture": { - "hash": "sha256-pIX9pEXE1Xjll9qwiWrMRwqw6G4g0isto/ALHsmkUSc=", - "version": "279" - }, - "configd": { - "hash": "sha256-WEorIW5Vl8E9/aB0RBTY2bhkfVOF3tckjNztGDOOueA=", - "version": "1109.101.1" - }, - "copyfile": { - "hash": "sha256-3BHFM67dvwUpinzF0pSX3QiUbIsqtLo77WzB3tMbTW4=", - "version": "173.40.2" - }, - "dtrace": { - "hash": "sha256-FfyaYjEMDeL9wGdUyZ4eJdkbkp/WpdTGyBvaorwKSi8=", - "version": "370.40.1" - }, - "dyld": { - "hash": "sha256-dtDTh6YqubBI4Z+QeytwGgUmU6tutvonIWHqzw6zuxo=", - "version": "851.27" - }, - "eap8021x": { - "hash": "sha256-Ap7qumn/oKYe424n2NW6QkuivgDyLoJgDfl30Q5O7Jo=", - "version": "304.100.1" - }, - "hfs": { - "hash": "sha256-MSnc1pB8DcB+mn308snTD1uRQ7Ro4aWyFuLdWjHtAG4=", - "version": "556.100.11" - }, - "launchd": { - "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=", - "version": "842.1.4" - }, - "libclosure": { - "hash": "sha256-UgmMnDUosaC2yI7IyQ7mkNwZ6/oft77ay+SmGSoycIw=", - "version": "79" - }, - "libdispatch": { - "hash": "sha256-K8QL9NfjGsj8c0jbocKegmKBqydimpKu8yRXnQQqdH8=", - "version": "1271.100.5" - }, - "libmalloc": { - "hash": "sha256-k3dJk7S0Lom3B28vRI9QxIuo0AOkd9OHzWO7MandfUw=", - "version": "317.100.9" - }, - "libplatform": { - "hash": "sha256-BSIGgKj5B6Dr0KQiIl2LSA3+ZEhzk/snQeCauErcq6k=", - "version": "254.80.2" - }, - "libpthread": { - "hash": "sha256-cGaDXLTztUYppbMvv41qj5RqONXfhfdHpt9dqY6+5Lc=", - "version": "454.100.8" - }, - "mDNSResponder": { - "hash": "sha256-eqcv174vIwWYXrIhzph+KO1zG8TdK5jRFVgsaAlV9es=", - "version": "1310.100.10" - }, - "objc4": { - "hash": "sha256-rqOPyN9S4KbMhCCVvtyEmGxTWzy+tsh0kfu3k47szXo=", - "version": "818.2" - }, - "ppp": { - "hash": "sha256-pSOlu/yXQhopCHDLnmhUnQeU89MkXhkQB0ZrN9r3qyk=", - "version": "877.40.2" - }, - "removefile": { - "hash": "sha256-B79A9AQ1/cB+zlmVKWcEXVOJHW6rOrX40S/hrMuWqXU=", - "version": "49.101.1" - }, - "xnu": { - "hash": "sha256-M1XWippH55VUJu4aosRFX8j9aOm/PONYVjPZOPufD80=", - "version": "7195.101.1" - } - }, - "12.3": { - "CarbonHeaders": { - "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=", - "version": "18.1" - }, - "CommonCrypto": { - "hash": "sha256-HTGBUE6vHjS80CFTiIQ8F17m8Yd2ZRHccvFu2CA2P9U=", - "version": "60191.100.1" - }, - "IOAudioFamily": { - "hash": "sha256-CuBFZeX2JTKIab2xpp+Yvn66bCl4+aKOv9TvzJef20c=", - "version": "340.2" - }, - "IOBDStorageFamily": { - "hash": "sha256-UgLMsQBe1QLzlbScmPmASBN7VH4YBmNOUX2CEDezjmE=", - "version": "22" - }, - "IOCDStorageFamily": { - "hash": "sha256-p/2qM5zjXFDRb/DISpEHxQEdvmuLlRGt/Ygc71Yu2rI=", - "version": "61" - }, - "IODVDStorageFamily": { - "hash": "sha256-1Sa8aZBGNtqJBNHva+YXxET6Wcdm2PgVrTzYT/8qrN4=", - "version": "43" - }, - "IOFWDVComponents": { - "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=", - "version": "208" - }, - "IOFireWireAVC": { - "hash": "sha256-ruAomp5Lv7zuPu9vHsNKoPtDvD1AIrRARsPMpcx/fh0=", - "version": "430" - }, - "IOFireWireFamily": { - "hash": "sha256-W0KOF4hkA7kFOnL1ThAeFU/YlhFVqoqk9uzGjcBppX8=", - "version": "487" - }, - "IOFireWireSBP2": { - "hash": "sha256-bItnRQIaGUxMyiU0q+4N8e5+jYiDEOUPmsrKhBFXvok=", - "version": "445" - }, - "IOFireWireSerialBusProtocolTransport": { - "hash": "sha256-P7egeaD9SSa+YyrIRzM44gILKbIL7vezXK3M6q3MBOI=", - "version": "260" - }, - "IOGraphics": { - "hash": "sha256-lzxBrPLlF01+2jFKRJtSnwpf0r05C0H3tM7Q0N1RUPA=", - "version": "594" - }, - "IOHIDFamily": { - "hash": "sha256-EQQHAS8WKUoTxZscixylc2ZMoD4UYBlHRUj2O7Ikgac=", - "version": "1787.100.13" - }, - "IOKitUser": { - "hash": "sha256-Cdfa/YXM0W4O15femcU0G1Xcpbm+iADWIBWIdzoeuTE=", - "version": "1955.100.5" - }, - "IONetworkingFamily": { - "hash": "sha256-odUZJQq8lb3UYk7F8dBi1Hds00M+kwdlyGwZkVkSwTg=", - "version": "160.100.2" - }, - "IOSerialFamily": { - "hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=", - "version": "93" - }, - "IOStorageFamily": { - "hash": "sha256-2b32qe1z7Z+Od1dVlAGdM142DdF8cBaRC+ElysSuAQ4=", - "version": "290.100.6" - }, - "IOUSBFamily": { - "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=", - "version": "630.4.5" - }, - "Libc": { - "hash": "sha256-obalDxsbE+7gm7YwznUbfxL7MCriamQFP3DrXleNwU4=", - "version": "1507.100.9" - }, - "Libinfo": { - "hash": "sha256-OjnnSHEcifcWarVyXiHvYg/9jbCQy5/lzaq6fJRriy0=", - "version": "554" - }, - "Libm": { - "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=", - "version": "2026" - }, - "Libnotify": { - "hash": "sha256-JXG0kHEdoIs6krVZ4+KsRVES4AuNjnQi8qF+XKSp5jE=", - "version": "301" - }, - "Librpcsvc": { - "hash": "sha256-8e8E9TkRTAep3/miyqhF/mSkNdlym12W+AVhXF94+Bg=", - "version": "26" - }, - "Libsystem": { - "hash": "sha256-mPPAxo67wWLtemO+PuKg1Ui0zKEfjnYVj/qX1/0kNBs=", - "version": "1311.100.3" - }, - "OpenDirectory": { - "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=", - "version": "146" - }, - "Security": { - "hash": "sha256-cIqfXcfQOZonxaKndH80xC5YmmveHw+TxHOxqvc9u8I=", - "version": "60158.100.133" - }, - "architecture": { - "hash": "sha256-PRNUrhzSOrwmxSPkKmV0LV7yEIik65sdkfKdBqcwFhU=", - "version": "280.100.2" - }, - "configd": { - "hash": "sha256-X34mjXdil4HeBLyqY4tyBWdmpjsOFTJDdDE81UQf708=", - "version": "1163.100.19.0.2" - }, - "copyfile": { - "hash": "sha256-3/zI3j/m9b13hebjCsOLry3Mf8ADdWJgrtQOdD0huG0=", - "version": "180.100.3" - }, - "dtrace": { - "hash": "sha256-q8H6slCN4RwJ5TxC5s3og6cIbjALySP5ODfVw6a/a+M=", - "version": "375" - }, - "dyld": { - "hash": "sha256-v1kk/Z3eI2sufNm2rx3FRbA/f9BeKJ3t9i9W7tTksXg=", - "version": "955" - }, - "eap8021x": { - "hash": "sha256-SayP1d2KWoRShykBA/NrQCuRnPoxlTiaLwifoqm0Gkg=", - "version": "315.100.2" - }, - "hfs": { - "hash": "sha256-q1yOIei98oudGAoBMNPRTV5EOYpXFL7iYmlCYsKsG0o=", - "version": "583.100.10" - }, - "launchd": { - "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=", - "version": "842.1.4" - }, - "libclosure": { - "hash": "sha256-Ez75a0m+fJas7mGqFeDjjpc7sFDnyirRbtLMTYQDVxw=", - "version": "79.1" - }, - "libdispatch": { - "hash": "sha256-/VbSUtnWyToWOUyAAg/3wImbJ2w5k1tbJkt827x2lIE=", - "version": "1325.100.36" - }, - "libmalloc": { - "hash": "sha256-tyYce5nk0N923MbzoGzkGqunoKwArbTiZl8PCppYpso=", - "version": "374.100.5" - }, - "libplatform": { - "hash": "sha256-JUD2NdS310OhZ0F8gnOvoD8AgEtWRtPahKDw5iE2QJU=", - "version": "273.100.5" - }, - "libpthread": { - "hash": "sha256-al8QumtH7/D04oJ4LUSYW+6OdX0Ko3S3rwYU53n9/54=", - "version": "486.100.11" - }, - "mDNSResponder": { - "hash": "sha256-hsV0VYTPoO5YpaxrUXpXFy97LxlERzrQT0FRfCMOwic=", - "version": "1557.101.2" - }, - "objc4": { - "hash": "sha256-MKXnfZL46VtmAQMolqd7ATF9fYjCNstapGQfcH4uVwo=", - "version": "841.13" - }, - "ppp": { - "hash": "sha256-YyCE19T3rcM1G5jdXuYXuBXblJgR/nelvjpq+9maMhw=", - "version": "884" - }, - "removefile": { - "hash": "sha256-xF1VtTUhoiGsFQsvuFnFYemwiCdsKeriFJv51vRLqmw=", - "version": "60" - }, - "xnu": { - "hash": "sha256-bfFmDfRBSvoWMdQYVstsJRbcq+15lDjVFqk+0XYWpy8=", - "version": "8020.101.4" - } - }, - "13.3": { - "CarbonHeaders": { - "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=", - "version": "18.1" - }, - "CommonCrypto": { - "hash": "sha256-tftAQbs5xIOc5VZLVAKXAUvle9WO/i33/pQ3D64l/yI=", - "version": "600016.100.4" - }, - "IOAudioFamily": { - "hash": "sha256-CuBFZeX2JTKIab2xpp+Yvn66bCl4+aKOv9TvzJef20c=", - "version": "440.2" - }, - "IOBDStorageFamily": { - "hash": "sha256-UgLMsQBe1QLzlbScmPmASBN7VH4YBmNOUX2CEDezjmE=", - "version": "22" - }, - "IOCDStorageFamily": { - "hash": "sha256-p/2qM5zjXFDRb/DISpEHxQEdvmuLlRGt/Ygc71Yu2rI=", - "version": "61" - }, - "IODVDStorageFamily": { - "hash": "sha256-1Sa8aZBGNtqJBNHva+YXxET6Wcdm2PgVrTzYT/8qrN4=", - "version": "43" - }, - "IOFWDVComponents": { - "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=", - "version": "208" - }, - "IOFireWireAVC": { - "hash": "sha256-IUytBKhhCgg0vtI+7q8d5kxpOUgO3tQD7TMy++jrorc=", - "version": "431" - }, - "IOFireWireFamily": { - "hash": "sha256-W0KOF4hkA7kFOnL1ThAeFU/YlhFVqoqk9uzGjcBppX8=", - "version": "487" - }, - "IOFireWireSBP2": { - "hash": "sha256-bItnRQIaGUxMyiU0q+4N8e5+jYiDEOUPmsrKhBFXvok=", - "version": "445" - }, - "IOFireWireSerialBusProtocolTransport": { - "hash": "sha256-P7egeaD9SSa+YyrIRzM44gILKbIL7vezXK3M6q3MBOI=", - "version": "260" - }, - "IOGraphics": { - "hash": "sha256-KubCz8DNwf1WuF7LrtARM2VJugFDP0wfHoUhnIz/faQ=", - "version": "596.1" - }, - "IOHIDFamily": { - "hash": "sha256-7UFMBdF5k9aVFVuoL2riozzKmn8uOt87Aitt8j6XkN8=", - "version": "1915.100.21" - }, - "IOKitUser": { - "hash": "sha256-hgFRHPAuoqSf6aRUBUyfU2y2+dBUA34DKwLHLwhPNms=", - "version": "2022.100.19" - }, - "IONetworkingFamily": { - "hash": "sha256-SwZvXLSB9cMHssZU4dCogGVoV64qYdGN1CGYV3FZ6tk=", - "version": "170" - }, - "IOSerialFamily": { - "hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=", - "version": "93" - }, - "IOStorageFamily": { - "hash": "sha256-g4oCrxM5VtHm8h1M+zM81Ar1LsaaiJZLej5fT8EHPG4=", - "version": "302.100.1" - }, - "IOUSBFamily": { - "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=", - "version": "630.4.5" - }, - "Libc": { - "hash": "sha256-dqbdWtBuaRq3IHnSUPH2aj8h/X4zCwUNSOeSdwfKvN8=", - "version": "1534.100.14" - }, - "Libinfo": { - "hash": "sha256-iUyndeUXx7FFZ/jgJ6jRwda3IChOaMs4dZW/ISuAJ1E=", - "version": "564.101.1" - }, - "Libm": { - "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=", - "version": "2026" - }, - "Libnotify": { - "hash": "sha256-7AwTfogvCUMdoabxf413ENWXtFTOM6AUldccoPQ89sU=", - "version": "312" - }, - "Librpcsvc": { - "hash": "sha256-UWYdCQ9QsBqwM01bWr+igINAHSdSluB/FrOclC5AjTI=", - "version": "31" - }, - "Libsystem": { - "hash": "sha256-IIksf0yCg3GdME3HofYzD1MRC+ofsPhHcxddmNd7V2M=", - "version": "1319.100.3" - }, - "OpenDirectory": { - "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=", - "version": "146" - }, - "Security": { - "hash": "sha256-lPq58QIx+H9DouTXAUJSMf1X7dj9V6xu3c8VWr2R1IY=", - "version": "60420.101.4" - }, - "architecture": { - "hash": "sha256-PRNUrhzSOrwmxSPkKmV0LV7yEIik65sdkfKdBqcwFhU=", - "version": "282" - }, - "configd": { - "hash": "sha256-M/fRAnUw2wObhCQp9a6zQbCGhACCQHpju4/1+KGlkjg=", - "version": "1241.100.11" - }, - "copyfile": { - "hash": "sha256-te3WcQudrXPqnTM1s/AtsTdu7VIXf5dIASy+IGnIxv0=", - "version": "191.100.3" - }, - "dtrace": { - "hash": "sha256-7jAG66hG9qmqpRbECazMD1Pyi53CWTOGNnZca1NpcxE=", - "version": "397" - }, - "dyld": { - "hash": "sha256-OkDOTV86EB44LxsqwTD4ZncMcr7iqSHXxw+6U+AP7oU=", - "version": "1066.8" - }, - "eap8021x": { - "hash": "sha256-FMG+IGVPpcwrRe2/OKpFycrY/EFPZkge2vX61NgorGg=", - "version": "336.100.6" - }, - "hfs": { - "hash": "sha256-Au5VDrYRBerI1I6rjC0lVDwB5IBwGARrAdcTI4M+Fx0=", - "version": "627.100.6" - }, - "launchd": { - "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=", - "version": "842.1.4" - }, - "libclosure": { - "hash": "sha256-V1tpp/XG6baETunJt029rI6wp6moYSnFprt+bNGaQ40=", - "version": "87" - }, - "libdispatch": { - "hash": "sha256-d1VObN11bNdtNJlZQqp2y8yP4lit5Wbj+4/aN3StsPc=", - "version": "1415.100.11" - }, - "libmalloc": { - "hash": "sha256-jcR1AO/chcZzfAvELkC+U3q9tzxqPdwgLcHrnkQmN4M=", - "version": "425.100.7" - }, - "libplatform": { - "hash": "sha256-+BB23YGGT0hA326Dh+3k2UvAqBdEJ84A6yGA/ccrihg=", - "version": "292.100.1" - }, - "libpthread": { - "hash": "sha256-/l17vMWhfAs0YhIHi+l84vGVxpGFOzocvxxii7B+WUk=", - "version": "514.100.2" - }, - "mDNSResponder": { - "hash": "sha256-M4yfQsdlKwes5M2QOEEfjv7ldSVZw7oGXLISaDcObjs=", - "version": "1807.101.2" - }, - "objc4": { - "hash": "sha256-qOV9YfP59WP8Izp+IvM/aiYTW8fCoq21uxU64OcIHk8=", - "version": "876" - }, - "ppp": { - "hash": "sha256-Sg5c5qOSk5TaS4pgXZ+eAy/iuGBa1oFML0dkj463DcE=", - "version": "1010" - }, - "removefile": { - "hash": "sha256-oQorWHlJ0ctekCTUsLXHko8k1aCKBJ00A2FHkRd4B3E=", - "version": "68" - }, - "xnu": { - "hash": "sha256-w9/lDZ/E54YzYQkOWptNpX5GomgI/fvZLAy7NY3O+IQ=", - "version": "8796.101.5" - } - }, "14.4": { "CarbonHeaders": { "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=", diff --git a/pkgs/by-name/ap/apple-sdk/metadata/versions.json b/pkgs/by-name/ap/apple-sdk/metadata/versions.json index 6c0b1ecabf46..75fd132b8b2b 100644 --- a/pkgs/by-name/ap/apple-sdk/metadata/versions.json +++ b/pkgs/by-name/ap/apple-sdk/metadata/versions.json @@ -1,28 +1,4 @@ { - "11": { - "urls": [ - "https://swcdn.apple.com/content/downloads/02/62/071-54303-A_EU2CL1YVT7/943i95dpeyi2ghlnj2mgyq3t202t5gf18b/CLTools_macOSNMOS_SDK.pkg", - "https://web.archive.org/web/20250210235110/https://swcdn.apple.com/content/downloads/02/62/071-54303-A_EU2CL1YVT7/943i95dpeyi2ghlnj2mgyq3t202t5gf18b/CLTools_macOSNMOS_SDK.pkg" - ], - "version": "11.3", - "hash": "sha256-/go8utcx3jprf6c8V/DUbXwsmNYSFchOAai1OaJs3Bg=" - }, - "12": { - "urls": [ - "https://swcdn.apple.com/content/downloads/24/42/002-83793-A_74JRE8GVAT/rlnkct919wgc5c0pjq986z5bb9h62uvni2/CLTools_macOSNMOS_SDK.pkg", - "https://web.archive.org/web/20250210235341/https://swcdn.apple.com/content/downloads/24/42/002-83793-A_74JRE8GVAT/rlnkct919wgc5c0pjq986z5bb9h62uvni2/CLTools_macOSNMOS_SDK.pkg" - ], - "version": "12.3", - "hash": "sha256-qG21ssNUmkqxPLTXALGP2N/RBHu8NMlI1dWvGlV+Wm8=" - }, - "13": { - "urls": [ - "https://swcdn.apple.com/content/downloads/15/62/032-84673-A_7A1TG1RF8Z/xpc8q44ggn2pkn82iwr0fi1zeb9cxi8ath/CLTools_macOSNMOS_SDK.pkg", - "https://web.archive.org/web/20250210235949/https://swcdn.apple.com/content/downloads/15/62/032-84673-A_7A1TG1RF8Z/xpc8q44ggn2pkn82iwr0fi1zeb9cxi8ath/CLTools_macOSNMOS_SDK.pkg" - ], - "version": "13.3", - "hash": "sha256-zZ4pbgoXunLGwdYDemxOfyH4CE5WGfMy2s5jN+0q4B4=" - }, "14": { "urls": [ "https://swcdn.apple.com/content/downloads/14/48/052-59890-A_I0F5YGAY0Y/p9n40hio7892gou31o1v031ng6fnm9sb3c/CLTools_macOSNMOS_SDK.pkg", From d37154c920e397639525853c7b288750abe1fd53 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 21 Apr 2025 18:51:52 -0400 Subject: [PATCH 61/61] apple-sdk_{11,12,13}: add to aliases.nix --- pkgs/top-level/aliases.nix | 3 +++ pkgs/top-level/all-packages.nix | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3b9996ca8dfe..ccbc90bfd001 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -464,6 +464,9 @@ mapAliases { apple-sdk_10_13 = throw "apple-sdk_10_13 was removed as Nixpkgs no longer supports macOS 10.13; see the 25.05 release notes"; # Added 2024-10-27 apple-sdk_10_14 = throw "apple-sdk_10_14 was removed as Nixpkgs no longer supprots macOS 10.14; see the 25.05 release notes"; # Added 2024-10-27 apple-sdk_10_15 = throw "apple-sdk_10_15 was removed as Nixpkgs no longer supports macOS 10.15; see the 25.05 release notes"; # Added 2024-10-27 + apple-sdk_11 = throw "apple-sdk_11 was removed as Nixpkgs no longer supports macOS 11; see the 25.11 release notes"; # Added 2025-05-10 + apple-sdk_12 = throw "apple-sdk_12 was removed as Nixpkgs no longer supports macOS 12; see the 25.11 release notes"; # Added 2025-05-10 + apple-sdk_13 = throw "apple-sdk_13 was removed as Nixpkgs no longer supports macOS 13; see the 25.11 release notes"; # Added 2025-05-10 appthreat-depscan = dep-scan; # Added 2024-04-10 arangodb = throw "arangodb has been removed, as it was unmaintained and the packaged version does not build with supported GCC versions"; # Added 2025-08-12 arb = throw "'arb' has been removed as it has been merged into 'flint3'"; # Added 2025-03-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84c6e70421d1..086a2741c4a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8908,9 +8908,6 @@ with pkgs; ### DEVELOPMENT / LIBRARIES / DARWIN SDKS - apple-sdk_11 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "11"; }; - apple-sdk_12 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "12"; }; - apple-sdk_13 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "13"; }; apple-sdk_14 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "14"; }; apple-sdk_15 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "15"; };