From 1e6ab3434f9a0b08bf56a2fc147fdf721ce4cbaa Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 25 Mar 2025 22:45:40 +0000 Subject: [PATCH] =?UTF-8?q?treewide:=20drop=20support=20for=2032=E2=80=90b?= =?UTF-8?q?it=20Darwin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s dead, Jim. --- doc/release-notes/rl-2505.section.md | 2 ++ lib/systems/doubles.nix | 2 -- lib/systems/examples.nix | 19 ------------------- lib/tests/systems.nix | 5 ----- pkgs/development/compilers/rust/binary.nix | 2 -- .../development/libraries/tachyon/default.nix | 4 +--- .../python-modules/debugpy/default.nix | 2 -- pkgs/games/dwarf-fortress/game.nix | 1 - 8 files changed, 3 insertions(+), 34 deletions(-) diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index 4332e26511ba..13270084769f 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -81,6 +81,8 @@ - `i3status-rust`-package no longer enables `notmuch` by default. It can be enabled via `withNotmuch`. +- All support for 32‐bit Darwin systems has been dropped. + - Default ICU version updated from 74 to 76 - Apache Kafka was updated to `>= 4.0.0`. Please note that this is the first release which operates diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index b2a66021dfc9..90f67b3916fb 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -12,9 +12,7 @@ let # Darwin "x86_64-darwin" - "i686-darwin" "aarch64-darwin" - "armv7a-darwin" # FreeBSD "i686-freebsd" diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index cb54d8fd631a..f87162e83277 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -284,15 +284,6 @@ rec { useiOSPrebuilt = true; }; - iphone32 = { - config = "armv7a-apple-ios"; - # config = "arm-apple-darwin10"; - darwinSdkVersion = "14.3"; - xcodeVer = "12.3"; - xcodePlatform = "iPhoneOS"; - useiOSPrebuilt = true; - }; - iphone64-simulator = { config = "x86_64-apple-ios"; # config = "x86_64-apple-darwin14"; @@ -303,16 +294,6 @@ rec { useiOSPrebuilt = true; }; - iphone32-simulator = { - config = "i686-apple-ios"; - # config = "i386-apple-darwin11"; - darwinSdkVersion = "14.3"; - xcodeVer = "12.3"; - xcodePlatform = "iPhoneSimulator"; - darwinPlatform = "ios-simulator"; - useiOSPrebuilt = true; - }; - aarch64-darwin = { config = "aarch64-apple-darwin"; xcodePlatform = "MacOSX"; diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index 941f887304d3..236ee20727e6 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -66,10 +66,8 @@ lib.runTests ( "armv7l-linux" "armv7l-netbsd" "arm-none" - "armv7a-darwin" ]; testarmv7 = mseteq armv7 [ - "armv7a-darwin" "armv7a-linux" "armv7l-linux" "armv7a-netbsd" @@ -84,7 +82,6 @@ lib.runTests ( "i686-cygwin" "i686-windows" "i686-none" - "i686-darwin" ]; testmips = mseteq mips [ "mips-none" @@ -145,9 +142,7 @@ lib.runTests ( ]; testdarwin = mseteq darwin [ "x86_64-darwin" - "i686-darwin" "aarch64-darwin" - "armv7a-darwin" ]; testfreebsd = mseteq freebsd [ "aarch64-freebsd" diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index 89190a3a69f6..7d7f4423ccd8 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -82,7 +82,6 @@ rec { # Platforms with host tools from # https://doc.rust-lang.org/nightly/rustc/platform-support.html "x86_64-darwin" - "i686-darwin" "aarch64-darwin" "i686-freebsd" "x86_64-freebsd" @@ -110,7 +109,6 @@ rec { targetPlatforms = tier1TargetPlatforms ++ [ # Platforms without host tools from # https://doc.rust-lang.org/nightly/rustc/platform-support.html - "armv7a-darwin" "armv5tel-linux" "armv7a-linux" "m68k-linux" diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index e006abaef218..9fb40ddb259d 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -54,9 +54,7 @@ stdenv.mkDerivation rec { else if stdenv.hostPlatform.system == "aarch64-darwin" then "macosx" else if stdenv.hostPlatform.system == "x86_64-darwin" then - "macosx-thr" - else if stdenv.hostPlatform.system == "i686-darwin" then - "macosx-64-thr" + "macosx-x86-64-thr" else if stdenv.hostPlatform.system == "i686-cygwin" then "win32" else if stdenv.hostPlatform.system == "x86_64-freebsd" then diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 27b586407015..b671a5a5be62 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -84,7 +84,6 @@ buildPythonPackage rec { "i686-linux" = "-shared -o attach_linux_x86.so"; "aarch64-linux" = "-shared -o attach_linux_arm64.so"; "x86_64-darwin" = "-D_REENTRANT -dynamiclib -lc -o attach_x86_64.dylib"; - "i686-darwin" = "-D_REENTRANT -dynamiclib -lc -o attach_x86.dylib"; "aarch64-darwin" = "-D_REENTRANT -dynamiclib -lc -o attach_arm64.dylib"; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}") @@ -147,7 +146,6 @@ buildPythonPackage rec { "i686-linux" "aarch64-linux" "x86_64-darwin" - "i686-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 6d7b27120555..b394cd991635 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -41,7 +41,6 @@ let x86_64-linux = "linux"; i686-linux = "linux32"; x86_64-darwin = "osx"; - i686-darwin = "osx32"; x86_64-cygwin = "win"; i686-cygwin = "win32"; };