movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 19:13:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

treewide: remove uses of deprecated Darwin overrideSDK

Browse source 
All remaining users set 11.3, which is already the default.
This commit is contained in:
Emily 2025-04-20 18:40:34 +01:00
parent 96d8375d81
commit 9e8100fba0
16 changed files with 78 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkgs/by-name/aw/aws-lc/package.nix
View file

@ -1,7 +1,6 @@
{
lib,
stdenv,
overrideSDK,
cmakeMinimal,
fetchFromGitHub,
ninja,
@ -9,10 +8,7 @@
aws-lc,
useSharedLibraries ? !stdenv.hostPlatform.isStatic,
}:
let
awsStdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
in
awsStdenv.mkDerivation (finalAttrs: {
stdenv.mkDerivation (finalAttrs: {
pname = "aws-lc";
version = "1.49.1";

7
pkgs/by-name/cz/czkawka/package.nix
View file

@ -8,7 +8,6 @@
glib,
gobject-introspection,
gtk4,
overrideSDK,
pango,
pkg-config,
rustPlatform,
@ -20,11 +19,7 @@
}:
let
buildRustPackage' = rustPlatform.buildRustPackage.override {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
};
self = buildRustPackage' {
self = rustPlatform.buildRustPackage {
pname = "czkawka";
version = "9.0.0";

9
pkgs/by-name/do/docfd/package.nix
View file

@ -2,7 +2,6 @@
lib,
ocamlPackages,
stdenv,
overrideSDK,
fetchFromGitHub,
python3,
dune_3,
@ -13,13 +12,7 @@
docfd,
}:
let
# Needed for x86_64-darwin
buildDunePackage' = ocamlPackages.buildDunePackage.override {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
};
in
buildDunePackage' rec {
ocamlPackages.buildDunePackage rec {
pname = "docfd";
version = "10.1.3";

8
pkgs/by-name/es/eslint/package.nix
View file

@ -3,14 +3,8 @@
buildNpmPackage,
fetchFromGitHub,
stdenv,
overrideSDK,
}:
let
buildNpmPackage' = buildNpmPackage.override {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
};
in
buildNpmPackage' rec {
buildNpmPackage rec {
pname = "eslint";
version = "9.20.0";

7
pkgs/by-name/fl/flameshot/package.nix
View file

@ -1,7 +1,6 @@
{
stdenv,
lib,
overrideSDK,
fetchFromGitHub,
fetchpatch,
cmake,
@ -17,11 +16,7 @@
assert stdenv.hostPlatform.isDarwin -> (!enableWlrSupport);
let
stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
in
stdenv'.mkDerivation {
stdenv.mkDerivation {
pname = "flameshot";
# wlr screenshotting is currently only available on unstable version (>12.1.0)
version = "12.1.0-unstable-2025-03-10";

9
pkgs/by-name/ju/juce/package.nix
View file

@ -1,7 +1,6 @@
{
lib,
stdenv,
overrideSDK,
fetchFromGitHub,
# Native build inputs
@ -33,14 +32,6 @@
nix-update-script,
}:
let
# Rebind this in a separate let-binding so that we can then rebind stdenv without infrec below
stdenv' = stdenv;
in
let
stdenv = if stdenv'.hostPlatform.isDarwin then overrideSDK stdenv' "11.0" else stdenv';
in
stdenv.mkDerivation (finalAttrs: {
pname = "juce";
version = "8.0.7";

115
pkgs/by-name/ma/maa-assistant-arknights/package.nix
View file

@ -3,7 +3,6 @@
config,
callPackage,
stdenv,
overrideSDK,
fetchFromGitHub,
asio,
cmake,
@ -19,72 +18,70 @@ let
fastdeploy = callPackage ./fastdeploy-ppocr.nix { };
sources = lib.importJSON ./pin.json;
in
# https://github.com/NixOS/nixpkgs/issues/314160
(if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv).mkDerivation
(finalAttr: {
pname = "maa-assistant-arknights" + lib.optionalString isBeta "-beta";
version = if isBeta then sources.beta.version else sources.stable.version;
stdenv.mkDerivation (finalAttr: {
pname = "maa-assistant-arknights" + lib.optionalString isBeta "-beta";
version = if isBeta then sources.beta.version else sources.stable.version;
src = fetchFromGitHub {
owner = "MaaAssistantArknights";
repo = "MaaAssistantArknights";
rev = "v${finalAttr.version}";
hash = if isBeta then sources.beta.hash else sources.stable.hash;
};
src = fetchFromGitHub {
owner = "MaaAssistantArknights";
repo = "MaaAssistantArknights";
rev = "v${finalAttr.version}";
hash = if isBeta then sources.beta.hash else sources.stable.hash;
};
nativeBuildInputs = [
asio
cmake
fastdeploy.cmake
] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];
nativeBuildInputs = [
asio
cmake
fastdeploy.cmake
] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];
buildInputs =
buildInputs =
[
fastdeploy
libcpr
onnxruntime
opencv
]
++ lib.optionals cudaSupport (
with cudaPackages;
[
fastdeploy
libcpr
onnxruntime
opencv
cuda_cccl # cub/cub.cuh
libcublas # cublas_v2.h
libcurand # curand.h
libcusparse # cusparse.h
libcufft # cufft.h
cudnn # cudnn.h
cuda_cudart
]
++ lib.optionals cudaSupport (
with cudaPackages;
[
cuda_cccl # cub/cub.cuh
libcublas # cublas_v2.h
libcurand # curand.h
libcusparse # cusparse.h
libcufft # cufft.h
cudnn # cudnn.h
cuda_cudart
]
);
);
cmakeBuildType = "None";
cmakeBuildType = "None";
cmakeFlags = [
(lib.cmakeBool "BUILD_SHARED_LIBS" true)
(lib.cmakeBool "INSTALL_FLATTEN" false)
(lib.cmakeBool "INSTALL_PYTHON" true)
(lib.cmakeBool "INSTALL_RESOURCE" true)
(lib.cmakeBool "USE_MAADEPS" false)
(lib.cmakeFeature "MAA_VERSION" "v${finalAttr.version}")
];
cmakeFlags = [
(lib.cmakeBool "BUILD_SHARED_LIBS" true)
(lib.cmakeBool "INSTALL_FLATTEN" false)
(lib.cmakeBool "INSTALL_PYTHON" true)
(lib.cmakeBool "INSTALL_RESOURCE" true)
(lib.cmakeBool "USE_MAADEPS" false)
(lib.cmakeFeature "MAA_VERSION" "v${finalAttr.version}")
];
passthru.updateScript = ./update.sh;
passthru.updateScript = ./update.sh;
postPatch = ''
cp -v ${fastdeploy.cmake}/Findonnxruntime.cmake cmake/
'';
postPatch = ''
cp -v ${fastdeploy.cmake}/Findonnxruntime.cmake cmake/
'';
postInstall = ''
mkdir -p $out/share/${finalAttr.pname}
mv $out/{Python,resource} $out/share/${finalAttr.pname}
'';
postInstall = ''
mkdir -p $out/share/${finalAttr.pname}
mv $out/{Python,resource} $out/share/${finalAttr.pname}
'';
meta = with lib; {
description = "Arknights assistant";
homepage = "https://github.com/MaaAssistantArknights/MaaAssistantArknights";
license = licenses.agpl3Only;
maintainers = with maintainers; [ Cryolitia ];
platforms = platforms.linux ++ platforms.darwin;
};
})
meta = with lib; {
description = "Arknights assistant";
homepage = "https://github.com/MaaAssistantArknights/MaaAssistantArknights";
license = licenses.agpl3Only;
maintainers = with maintainers; [ Cryolitia ];
platforms = platforms.linux ++ platforms.darwin;
};
})

6
pkgs/by-name/no/notes/package.nix
View file

@ -4,12 +4,8 @@
fetchFromGitHub,
cmake,
qt6,
overrideSDK,
}:
let
stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
in
stdenv'.mkDerivation (finalAttrs: {
stdenv.mkDerivation (finalAttrs: {
pname = "notes";
version = "2.3.1";

1
pkgs/development/libraries/qt-5/5.15/default.nix
View file

@ -27,7 +27,6 @@
gtk3,
dconf,
llvmPackages_15,
overrideSDK,
overrideLibcxx,
darwin,

7
pkgs/development/python-modules/sourmash/default.nix
View file

@ -4,7 +4,6 @@
buildPythonPackage,
stdenv,
pythonOlder,
overrideSDK,
rustPlatform,
bitstring,
cachetools,
@ -20,18 +19,12 @@
pyyaml,
pytestCheckHook,
}:
let
stdenv' =
if stdenv.hostPlatform.isDarwin then overrideSDK stdenv { darwinMinVersion = "10.14"; } else stdenv;
in
buildPythonPackage rec {
pname = "sourmash";
version = "4.8.14";
pyproject = true;
disabled = pythonOlder "3.9";
stdenv = stdenv';
src = fetchPypi {
inherit pname version;
hash = "sha256-no99VjO1KVE+/JUOJcl0xOz3yZtMr70A8vE1rQVjMH8=";

17
pkgs/tools/package-management/nix/dependencies.nix
View file

@ -4,27 +4,10 @@ regular@{
aws-sdk-cpp,
fetchFromGitHub,
pkgs,
stdenv,
}:
let
stdenv =
if regular.stdenv.isDarwin && regular.stdenv.isx86_64 then darwinStdenv else regular.stdenv;
# Fix the following error with the default x86_64-darwin SDK:
#
# error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer
#
# Despite the use of the 10.13 deployment target here, the aligned
# allocation function Clang uses with this setting actually works
# all the way back to 10.6.
darwinStdenv = regular.pkgs.overrideSDK regular.stdenv { darwinMinVersion = "10.13"; };
in
{
scopeFunction = scope: {
inherit stdenv;
boehmgc = regular.boehmgc.override { enableLargeConfig = true; };
# old nix fails to build with newer aws-sdk-cpp and the patch doesn't apply

6
pkgs/tools/system/netdata/default.nix
View file

@ -28,7 +28,6 @@
ninja,
nixosTests,
openssl,
overrideSDK,
pkg-config,
protobuf,
snappy,
@ -49,10 +48,7 @@
zlib,
withNdsudo ? false,
}:
let
stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
in
stdenv'.mkDerivation (finalAttrs: {
stdenv.mkDerivation (finalAttrs: {
version = "1.47.5";
pname = "netdata";

92
pkgs/top-level/all-packages.nix
View file

@ -2890,9 +2890,7 @@ with pkgs;
ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { };
clamav = callPackage ../tools/security/clamav {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
};
clamav = callPackage ../tools/security/clamav { };
cmdpack = callPackages ../tools/misc/cmdpack { };
@ -5122,7 +5120,7 @@ with pkgs;
wast-refmt = nodePackages."@webassemblyjs/wast-refmt-1.11.1";
wasmedge = callPackage ../development/tools/wasmedge {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else llvmPackages.stdenv;
stdenv = clangStdenv;
};
whatweb = callPackage ../tools/security/whatweb { };
@ -6507,12 +6505,7 @@ with pkgs;
cargo-audit = callPackage ../development/tools/rust/cargo-audit { };
cargo-c = callPackage ../development/tools/rust/cargo-c { };
cargo-clone = callPackage ../development/tools/rust/cargo-clone { };
cargo-codspeed = callPackage ../development/tools/rust/cargo-codspeed {
rustPlatform = makeRustPlatform {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
inherit rustc cargo;
};
};
cargo-codspeed = callPackage ../development/tools/rust/cargo-codspeed { };
cargo-cyclonedx = callPackage ../development/tools/rust/cargo-cyclonedx { };
cargo-edit = callPackage ../development/tools/rust/cargo-edit { };
inherit (callPackages ../development/tools/rust/cargo-pgrx { })
@ -7982,7 +7975,6 @@ with pkgs;
mkdocs = with python3Packages; toPythonApplication mkdocs;
mold = callPackage ../by-name/mo/mold/package.nix {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
tbb = tbb_2021_11;
};
@ -8337,38 +8329,10 @@ with pkgs;
### DEVELOPMENT / LIBRARIES
abseil-cpp_202103 = callPackage ../development/libraries/abseil-cpp/202103.nix {
# If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib.
stdenv =
if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then
overrideSDK stdenv { darwinMinVersion = "10.13"; }
else
stdenv;
};
abseil-cpp_202301 = callPackage ../development/libraries/abseil-cpp/202301.nix {
# If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib.
stdenv =
if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then
overrideSDK stdenv { darwinMinVersion = "10.13"; }
else
stdenv;
};
abseil-cpp_202401 = callPackage ../development/libraries/abseil-cpp/202401.nix {
# If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib.
stdenv =
if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then
overrideSDK stdenv { darwinMinVersion = "10.13"; }
else
stdenv;
};
abseil-cpp_202407 = callPackage ../development/libraries/abseil-cpp/202407.nix {
# If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib.
stdenv =
if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then
overrideSDK stdenv { darwinMinVersion = "10.13"; }
else
stdenv;
};
abseil-cpp_202103 = callPackage ../development/libraries/abseil-cpp/202103.nix { };
abseil-cpp_202301 = callPackage ../development/libraries/abseil-cpp/202301.nix { };
abseil-cpp_202401 = callPackage ../development/libraries/abseil-cpp/202401.nix { };
abseil-cpp_202407 = callPackage ../development/libraries/abseil-cpp/202407.nix { };
abseil-cpp = abseil-cpp_202501;
acl = callPackage ../development/libraries/acl { };
@ -8546,7 +8510,6 @@ with pkgs;
ustream-ssl-mbedtls = callPackage ../development/libraries/ustream-ssl {
ssl_implementation = mbedtls_2;
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
};
cxxtest = python3Packages.callPackage ../development/libraries/cxxtest { };
@ -8961,13 +8924,6 @@ with pkgs;
goocanvas = callPackage ../development/libraries/goocanvas { };
goocanvas2 = callPackage ../development/libraries/goocanvas/2.x.nix { };
goocanvas3 = callPackage ../development/libraries/goocanvas/3.x.nix { };
grpc = callPackage ../by-name/gr/grpc/package.nix {
stdenv =
if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then
overrideSDK stdenv { darwinMinVersion = "10.13"; }
else
stdenv;
};
gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { };
@ -9159,9 +9115,7 @@ with pkgs;
idasen = with python3Packages; toPythonApplication idasen;
imgui = callPackage ../development/libraries/imgui {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
};
imgui = callPackage ../development/libraries/imgui { };
imlib2Full = imlib2.override {
# Compilation error on Darwin with librsvg. For more information see:
@ -9398,7 +9352,6 @@ with pkgs;
};
libfive = libsForQt5.callPackage ../development/libraries/libfive {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
python = python3;
};
@ -10162,6 +10115,7 @@ with pkgs;
makeScopeWithSplicing'
generateSplicesForMkScope
lib
stdenv
fetchurl
fetchpatch
fetchgit
@ -10177,13 +10131,11 @@ with pkgs;
gtk3
python3
llvmPackages_15
overrideSDK
overrideLibcxx
darwin
;
inherit (__splicedPackages.gst_all_1) gstreamer gst-plugins-base;
inherit config;
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
}
);
@ -12726,9 +12678,7 @@ with pkgs;
### APPLICATIONS / GIS
grass = callPackage ../applications/gis/grass {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
};
grass = callPackage ../applications/gis/grass { };
qgis-ltr = callPackage ../applications/gis/qgis/ltr.nix { };
@ -13009,14 +12959,6 @@ with pkgs;
darktable = callPackage ../by-name/da/darktable/package.nix {
lua = lua5_4;
pugixml = pugixml.override { shared = true; };
stdenv =
if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then
overrideSDK llvmPackages_18.stdenv {
darwinMinVersion = "10.14";
darwinSdkVersion = "11.0";
}
else
stdenv;
};
datadog-agent = callPackage ../tools/networking/dd-agent/datadog-agent.nix {
@ -15024,11 +14966,7 @@ with pkgs;
# Build with clang even on Linux, because GCC uses absolutely obscene amounts of memory
# on this particular code base (OOM with 32GB memory and --cores 16 on GCC, succeeds
# with --cores 32 on clang).
stdenv =
if stdenv.hostPlatform.isDarwin then
overrideSDK llvmPackages.stdenv "11.0"
else
llvmPackages.stdenv;
stdenv = clangStdenv;
};
super-slicer = callPackage ../applications/misc/prusa-slicer/super-slicer.nix { };
@ -15299,10 +15237,6 @@ with pkgs;
ueberzug = with python3Packages; toPythonApplication ueberzug;
ueberzugpp = callPackage ../by-name/ue/ueberzugpp/package.nix {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
};
uefitoolPackages = recurseIntoAttrs (callPackage ../tools/system/uefitool/variants.nix { });
uefitool = uefitoolPackages.new-engine;
@ -15969,9 +15903,7 @@ with pkgs;
beancount-share = callPackage ../applications/office/beancount/beancount_share.nix { };
bugdom = callPackage ../games/bugdom {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
};
bugdom = callPackage ../games/bugdom { };
cataclysmDDA = callPackage ../games/cataclysm-dda { };

7
pkgs/top-level/php-packages.nix
View file

@ -31,7 +31,6 @@
openldap,
openssl_1_1,
openssl,
overrideSDK,
pam,
pcre2,
bison,
@ -284,11 +283,7 @@ lib.makeScope pkgs.newScope (
couchbase = callPackage ../development/php-packages/couchbase { };
datadog_trace = callPackage ../development/php-packages/datadog_trace {
buildPecl = buildPecl.override {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
};
};
datadog_trace = callPackage ../development/php-packages/datadog_trace { };
decimal = callPackage ../development/php-packages/decimal { };

5
pkgs/top-level/python-packages.nix
View file

@ -11490,10 +11490,7 @@ self: super: with self; {
psrpcore = callPackage ../development/python-modules/psrpcore { };
psutil = callPackage ../development/python-modules/psutil {
stdenv =
if pkgs.stdenv.hostPlatform.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv;
};
psutil = callPackage ../development/python-modules/psutil { };
psutil-home-assistant = callPackage ../development/python-modules/psutil-home-assistant { };

9
pkgs/top-level/qt5-packages.nix
View file

@ -191,8 +191,6 @@ makeScopeWithSplicing' {
liblastfm = callPackage ../development/libraries/liblastfm { };
libopenshot = callPackage ../development/libraries/libopenshot {
stdenv =
if pkgs.stdenv.hostPlatform.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv;
python3 = pkgs.python311;
};
@ -243,8 +241,6 @@ makeScopeWithSplicing' {
pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { };
qca = callPackage ../development/libraries/qca {
stdenv =
if pkgs.stdenv.hostPlatform.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv;
inherit (libsForQt5) qtbase;
};
qca-qt5 = self.qca;
@ -273,10 +269,7 @@ makeScopeWithSplicing' {
qtinstaller = callPackage ../development/libraries/qtinstaller { };
qtkeychain = callPackage ../development/libraries/qtkeychain {
stdenv =
if pkgs.stdenv.hostPlatform.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv;
};
qtkeychain = callPackage ../development/libraries/qtkeychain { };
qtmpris = callPackage ../development/libraries/qtmpris { };