From 26d247b462d671a06d20945dea99a061bc460574 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 2 Jan 2025 21:31:56 -0600 Subject: [PATCH] treewide: unpin apple-sdk_11 t-z --- pkgs/by-name/ta/taterclient-ddnet/package.nix | 1 - pkgs/by-name/td/tdb/package.nix | 3 -- pkgs/by-name/te/tealdeer/package.nix | 4 --- pkgs/by-name/to/ton/package.nix | 28 +++++++------------ pkgs/by-name/tu/turbo-unwrapped/package.nix | 3 +- pkgs/by-name/vc/vcpkg-tool/package.nix | 3 +- pkgs/by-name/vi/vimv-rs/package.nix | 4 --- pkgs/by-name/ws/wstunnel/package.nix | 6 ---- pkgs/by-name/zl/zls/package.nix | 3 -- pkgs/by-name/zo/zon2nix/package.nix | 3 -- pkgs/by-name/zt/ztags/package.nix | 3 -- 11 files changed, 12 insertions(+), 49 deletions(-) diff --git a/pkgs/by-name/ta/taterclient-ddnet/package.nix b/pkgs/by-name/ta/taterclient-ddnet/package.nix index 6fb16457c466..abe38207bf90 100644 --- a/pkgs/by-name/ta/taterclient-ddnet/package.nix +++ b/pkgs/by-name/ta/taterclient-ddnet/package.nix @@ -28,7 +28,6 @@ spirv-tools, gtest, glew, - apple-sdk_11, }: let clientExecutable = "TaterClient-DDNet"; diff --git a/pkgs/by-name/td/tdb/package.nix b/pkgs/by-name/td/tdb/package.nix index 81e663908d1d..3cf8aabc948e 100644 --- a/pkgs/by-name/td/tdb/package.nix +++ b/pkgs/by-name/td/tdb/package.nix @@ -7,7 +7,6 @@ , readline , libxslt , libxcrypt -, apple-sdk_11 , docbook-xsl-nons , docbook_xml_dtd_45 }: @@ -34,8 +33,6 @@ stdenv.mkDerivation rec { python3 readline # required to build python libxcrypt - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 ]; # otherwise the configure script fails with diff --git a/pkgs/by-name/te/tealdeer/package.nix b/pkgs/by-name/te/tealdeer/package.nix index b6e634fd005f..3d029f8e8ece 100644 --- a/pkgs/by-name/te/tealdeer/package.nix +++ b/pkgs/by-name/te/tealdeer/package.nix @@ -1,10 +1,8 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, installShellFiles, - apple-sdk_11, }: rustPlatform.buildRustPackage rec { @@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-ZKaq/JqH/Y2Cs9LLnlt1Gawe4R+kvS3vpUcNK95uujk="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; - nativeBuildInputs = [ installShellFiles ]; postInstall = '' diff --git a/pkgs/by-name/to/ton/package.nix b/pkgs/by-name/to/ton/package.nix index 22a34bdcc200..4423a274ddff 100644 --- a/pkgs/by-name/to/ton/package.nix +++ b/pkgs/by-name/to/ton/package.nix @@ -14,8 +14,6 @@ secp256k1, zlib, nix-update-script, - darwinMinVersionHook, - apple-sdk_11, }: stdenv.mkDerivation rec { @@ -41,22 +39,16 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = - [ - gperf - libmicrohttpd - libsodium - lz4 - openssl - readline - secp256k1 - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer - (darwinMinVersionHook "10.13") - apple-sdk_11 - ]; + buildInputs = [ + gperf + libmicrohttpd + libsodium + lz4 + openssl + readline + secp256k1 + zlib + ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix index e91fb9a2603e..2d2d42bf3087 100644 --- a/pkgs/by-name/tu/turbo-unwrapped/package.nix +++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - apple-sdk_11, capnproto, extra-cmake-modules, fetchFromGitHub, @@ -45,7 +44,7 @@ rustPlatform.buildRustPackage rec { openssl rust-jemalloc-sys zlib - ] ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; + ]; cargoBuildFlags = [ "--package" diff --git a/pkgs/by-name/vc/vcpkg-tool/package.nix b/pkgs/by-name/vc/vcpkg-tool/package.nix index 2f776cb3c3af..d67d50871d11 100644 --- a/pkgs/by-name/vc/vcpkg-tool/package.nix +++ b/pkgs/by-name/vc/vcpkg-tool/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, runtimeShell, - apple-sdk_11, cacert, cmake, cmakerc, @@ -42,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cmakerc fmt - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; + ]; patches = [ ./change-lock-location.patch diff --git a/pkgs/by-name/vi/vimv-rs/package.nix b/pkgs/by-name/vi/vimv-rs/package.nix index ec0a0c3d4c3b..bff4c550b940 100644 --- a/pkgs/by-name/vi/vimv-rs/package.nix +++ b/pkgs/by-name/vi/vimv-rs/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - apple-sdk_11, }: rustPlatform.buildRustPackage rec { @@ -18,8 +16,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-rYQxIttuGBGEkYkFtSBl8ce1I/Akm6FxeITJcaIeP6M="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; - meta = with lib; { description = "Command line utility for batch-renaming files"; homepage = "https://www.dmulholl.com/dev/vimv.html"; diff --git a/pkgs/by-name/ws/wstunnel/package.nix b/pkgs/by-name/ws/wstunnel/package.nix index bfc3c7135e89..316e88117602 100644 --- a/pkgs/by-name/ws/wstunnel/package.nix +++ b/pkgs/by-name/ws/wstunnel/package.nix @@ -2,11 +2,9 @@ lib, fetchFromGitHub, rustPlatform, - stdenv, nixosTests, nix-update-script, versionCheckHook, - apple-sdk_11, }: let @@ -29,10 +27,6 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ versionCheckHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - ]; - doInstallCheck = true; checkFlags = [ diff --git a/pkgs/by-name/zl/zls/package.nix b/pkgs/by-name/zl/zls/package.nix index 8c6c3a90310f..55d0c5a7a57d 100644 --- a/pkgs/by-name/zl/zls/package.nix +++ b/pkgs/by-name/zl/zls/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, zig_0_13, callPackage, - apple-sdk_11, }: stdenv.mkDerivation (finalAttrs: { @@ -25,8 +24,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ zig_0_13.hook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; - postPatch = '' ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p ''; diff --git a/pkgs/by-name/zo/zon2nix/package.nix b/pkgs/by-name/zo/zon2nix/package.nix index 953ee8eece32..82135e9ddd2b 100644 --- a/pkgs/by-name/zo/zon2nix/package.nix +++ b/pkgs/by-name/zo/zon2nix/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, zig_0_11, nix, - apple-sdk_11, }: stdenv.mkDerivation rec { @@ -22,8 +21,6 @@ stdenv.mkDerivation rec { zig_0_11.hook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; - zigBuildFlags = [ "-Dnix=${lib.getExe nix}" ]; diff --git a/pkgs/by-name/zt/ztags/package.nix b/pkgs/by-name/zt/ztags/package.nix index c2529025ff8d..5640918d8c55 100644 --- a/pkgs/by-name/zt/ztags/package.nix +++ b/pkgs/by-name/zt/ztags/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, scdoc, zig_0_13, - apple-sdk_11, }: let @@ -26,8 +25,6 @@ stdenv.mkDerivation (finalAttrs: { zig.hook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; - postInstall = '' zig build docs --prefix $out '';