Unverified Commit 15d73fb5 authored by Randy Eckenrode's avatar Randy Eckenrode Committed by GitHub
Browse files

apple-sdk: update darwinMinVersion to 14.0 and darwinSdkVersion to 14.4 (#447364)

parents 31cf83ad d37154c9

doc/release-notes/rl-2511.section.md

+5 −0
Original line number Diff line number Diff line
@@ -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}

doc/stdenv/platform-notes.chapter.md

+4 −7
Original line number Diff line number Diff line
@@ -118,11 +118,8 @@ Check your package’s documentation (platform support or installation instructi 
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`               |

|--------------------|--------------------|-------------------------------|

| 15.0–15.4          | 14.4               | `apple-sdk_14` / `apple-sdk`  |

| 16.0               | 15.0               | `apple-sdk_15`                |

lib/systems/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -360,8 +360,8 @@ let 
            null;

        # The canonical name for this attribute is darwinSdkVersion, but some

        # platforms define the old name "sdkVer".

        darwinSdkVersion = final.sdkVer or "11.3";

        darwinMinVersion = final.darwinSdkVersion;

        darwinSdkVersion = final.sdkVer or "14.4";

        darwinMinVersion = "14.0";

        darwinMinVersionVariable =

          if final.isMacOS then

            "MACOSX_DEPLOYMENT_TARGET"

pkgs/applications/emulators/wine/base.nix

+1 −12
Original line number Diff line number Diff line
@@ -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 ]))

pkgs/applications/virtualization/qemu/default.nix

+0 −12
Original line number Diff line number Diff line
@@ -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 ]