mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-12 20:55:31 +03:00
treewide: drop support for 32‐bit Darwin
It’s dead, Jim.
This commit is contained in:
parent
235ddf16a6
commit
1e6ab3434f
8 changed files with 3 additions and 34 deletions
|
@ -81,6 +81,8 @@
|
||||||
|
|
||||||
- `i3status-rust`-package no longer enables `notmuch` by default. It can be enabled via `withNotmuch`.
|
- `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
|
- 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
|
- Apache Kafka was updated to `>= 4.0.0`. Please note that this is the first release which operates
|
||||||
|
|
|
@ -12,9 +12,7 @@ let
|
||||||
|
|
||||||
# Darwin
|
# Darwin
|
||||||
"x86_64-darwin"
|
"x86_64-darwin"
|
||||||
"i686-darwin"
|
|
||||||
"aarch64-darwin"
|
"aarch64-darwin"
|
||||||
"armv7a-darwin"
|
|
||||||
|
|
||||||
# FreeBSD
|
# FreeBSD
|
||||||
"i686-freebsd"
|
"i686-freebsd"
|
||||||
|
|
|
@ -284,15 +284,6 @@ rec {
|
||||||
useiOSPrebuilt = true;
|
useiOSPrebuilt = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
iphone32 = {
|
|
||||||
config = "armv7a-apple-ios";
|
|
||||||
# config = "arm-apple-darwin10";
|
|
||||||
darwinSdkVersion = "14.3";
|
|
||||||
xcodeVer = "12.3";
|
|
||||||
xcodePlatform = "iPhoneOS";
|
|
||||||
useiOSPrebuilt = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
iphone64-simulator = {
|
iphone64-simulator = {
|
||||||
config = "x86_64-apple-ios";
|
config = "x86_64-apple-ios";
|
||||||
# config = "x86_64-apple-darwin14";
|
# config = "x86_64-apple-darwin14";
|
||||||
|
@ -303,16 +294,6 @@ rec {
|
||||||
useiOSPrebuilt = true;
|
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 = {
|
aarch64-darwin = {
|
||||||
config = "aarch64-apple-darwin";
|
config = "aarch64-apple-darwin";
|
||||||
xcodePlatform = "MacOSX";
|
xcodePlatform = "MacOSX";
|
||||||
|
|
|
@ -66,10 +66,8 @@ lib.runTests (
|
||||||
"armv7l-linux"
|
"armv7l-linux"
|
||||||
"armv7l-netbsd"
|
"armv7l-netbsd"
|
||||||
"arm-none"
|
"arm-none"
|
||||||
"armv7a-darwin"
|
|
||||||
];
|
];
|
||||||
testarmv7 = mseteq armv7 [
|
testarmv7 = mseteq armv7 [
|
||||||
"armv7a-darwin"
|
|
||||||
"armv7a-linux"
|
"armv7a-linux"
|
||||||
"armv7l-linux"
|
"armv7l-linux"
|
||||||
"armv7a-netbsd"
|
"armv7a-netbsd"
|
||||||
|
@ -84,7 +82,6 @@ lib.runTests (
|
||||||
"i686-cygwin"
|
"i686-cygwin"
|
||||||
"i686-windows"
|
"i686-windows"
|
||||||
"i686-none"
|
"i686-none"
|
||||||
"i686-darwin"
|
|
||||||
];
|
];
|
||||||
testmips = mseteq mips [
|
testmips = mseteq mips [
|
||||||
"mips-none"
|
"mips-none"
|
||||||
|
@ -145,9 +142,7 @@ lib.runTests (
|
||||||
];
|
];
|
||||||
testdarwin = mseteq darwin [
|
testdarwin = mseteq darwin [
|
||||||
"x86_64-darwin"
|
"x86_64-darwin"
|
||||||
"i686-darwin"
|
|
||||||
"aarch64-darwin"
|
"aarch64-darwin"
|
||||||
"armv7a-darwin"
|
|
||||||
];
|
];
|
||||||
testfreebsd = mseteq freebsd [
|
testfreebsd = mseteq freebsd [
|
||||||
"aarch64-freebsd"
|
"aarch64-freebsd"
|
||||||
|
|
|
@ -82,7 +82,6 @@ rec {
|
||||||
# Platforms with host tools from
|
# Platforms with host tools from
|
||||||
# https://doc.rust-lang.org/nightly/rustc/platform-support.html
|
# https://doc.rust-lang.org/nightly/rustc/platform-support.html
|
||||||
"x86_64-darwin"
|
"x86_64-darwin"
|
||||||
"i686-darwin"
|
|
||||||
"aarch64-darwin"
|
"aarch64-darwin"
|
||||||
"i686-freebsd"
|
"i686-freebsd"
|
||||||
"x86_64-freebsd"
|
"x86_64-freebsd"
|
||||||
|
@ -110,7 +109,6 @@ rec {
|
||||||
targetPlatforms = tier1TargetPlatforms ++ [
|
targetPlatforms = tier1TargetPlatforms ++ [
|
||||||
# Platforms without host tools from
|
# Platforms without host tools from
|
||||||
# https://doc.rust-lang.org/nightly/rustc/platform-support.html
|
# https://doc.rust-lang.org/nightly/rustc/platform-support.html
|
||||||
"armv7a-darwin"
|
|
||||||
"armv5tel-linux"
|
"armv5tel-linux"
|
||||||
"armv7a-linux"
|
"armv7a-linux"
|
||||||
"m68k-linux"
|
"m68k-linux"
|
||||||
|
|
|
@ -54,9 +54,7 @@ stdenv.mkDerivation rec {
|
||||||
else if stdenv.hostPlatform.system == "aarch64-darwin" then
|
else if stdenv.hostPlatform.system == "aarch64-darwin" then
|
||||||
"macosx"
|
"macosx"
|
||||||
else if stdenv.hostPlatform.system == "x86_64-darwin" then
|
else if stdenv.hostPlatform.system == "x86_64-darwin" then
|
||||||
"macosx-thr"
|
"macosx-x86-64-thr"
|
||||||
else if stdenv.hostPlatform.system == "i686-darwin" then
|
|
||||||
"macosx-64-thr"
|
|
||||||
else if stdenv.hostPlatform.system == "i686-cygwin" then
|
else if stdenv.hostPlatform.system == "i686-cygwin" then
|
||||||
"win32"
|
"win32"
|
||||||
else if stdenv.hostPlatform.system == "x86_64-freebsd" then
|
else if stdenv.hostPlatform.system == "x86_64-freebsd" then
|
||||||
|
|
|
@ -84,7 +84,6 @@ buildPythonPackage rec {
|
||||||
"i686-linux" = "-shared -o attach_linux_x86.so";
|
"i686-linux" = "-shared -o attach_linux_x86.so";
|
||||||
"aarch64-linux" = "-shared -o attach_linux_arm64.so";
|
"aarch64-linux" = "-shared -o attach_linux_arm64.so";
|
||||||
"x86_64-darwin" = "-D_REENTRANT -dynamiclib -lc -o attach_x86_64.dylib";
|
"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";
|
"aarch64-darwin" = "-D_REENTRANT -dynamiclib -lc -o attach_arm64.dylib";
|
||||||
}
|
}
|
||||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
|
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
|
||||||
|
@ -147,7 +146,6 @@ buildPythonPackage rec {
|
||||||
"i686-linux"
|
"i686-linux"
|
||||||
"aarch64-linux"
|
"aarch64-linux"
|
||||||
"x86_64-darwin"
|
"x86_64-darwin"
|
||||||
"i686-darwin"
|
|
||||||
"aarch64-darwin"
|
"aarch64-darwin"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
|
@ -41,7 +41,6 @@ let
|
||||||
x86_64-linux = "linux";
|
x86_64-linux = "linux";
|
||||||
i686-linux = "linux32";
|
i686-linux = "linux32";
|
||||||
x86_64-darwin = "osx";
|
x86_64-darwin = "osx";
|
||||||
i686-darwin = "osx32";
|
|
||||||
x86_64-cygwin = "win";
|
x86_64-cygwin = "win";
|
||||||
i686-cygwin = "win32";
|
i686-cygwin = "win32";
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue