gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: unpin apple-sdk_11

Browse Source
This commit is contained in:
Austin Horstman
2025-01-03 10:20:01 -06:00
parent 1242fcea90
commit ce1f9eb417
17 changed files with 98 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/ed/edencommon/package.nix
+9 -16
View File
@@ -15,8 +15,6 @@
wangle,
fbthrift,
gtest,
apple-sdk_11,
darwinMinVersionHook,
nix-update-script,
}:
@@ -48,20 +46,15 @@ stdenv.mkDerivation (finalAttrs: {
removeReferencesTo
];
buildInputs =
[
glog
gflags
folly
fb303
wangle
fbthrift
gtest
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
(darwinMinVersionHook "11.0")
];
buildInputs = [
glog
gflags
folly
fb303
wangle
fbthrift
gtest
];
cmakeFlags = [
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
pkgs/by-name/fb/fb303/package.nix
+8 -15
View File
@@ -13,8 +13,6 @@
fbthrift,
fizz,
wangle,
apple-sdk_11,
darwinMinVersionHook,
nix-update-script,
}:
@@ -40,19 +38,14 @@ stdenv.mkDerivation (finalAttrs: {
ninja
];
buildInputs =
[
gflags
glog
folly
fbthrift
fizz
wangle
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
(darwinMinVersionHook "11.0")
];
buildInputs = [
gflags
glog
folly
fbthrift
fizz
wangle
];
cmakeFlags = [
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
pkgs/by-name/fb/fbthrift/package.nix
+11 -18
View File
@@ -17,8 +17,6 @@
zlib,
zstd,
xxHash,
apple-sdk_11,
darwinMinVersionHook,
mvfst,
@@ -56,22 +54,17 @@ stdenv.mkDerivation (finalAttrs: {
removeReferencesTo
];
buildInputs =
[
openssl
gflags
glog
folly
fizz
wangle
zlib
zstd
xxHash
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
(darwinMinVersionHook "11.0")
];
buildInputs = [
openssl
gflags
glog
folly
fizz
wangle
zlib
zstd
xxHash
];
propagatedBuildInputs = [
mvfst
pkgs/by-name/fi/fizz/package.nix
+8 -15
View File
@@ -14,8 +14,6 @@
zstd,
gflags,
libevent,
apple-sdk_11,
darwinMinVersionHook,
folly,
libsodium,
@@ -49,19 +47,14 @@ stdenv.mkDerivation (finalAttrs: {
removeReferencesTo
];
buildInputs =
[
openssl
glog
double-conversion
zstd
gflags
libevent
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
(darwinMinVersionHook "11.0")
];
buildInputs = [
openssl
glog
double-conversion
zstd
gflags
libevent
];
propagatedBuildInputs = [
folly
pkgs/by-name/fo/folly/package.nix
+15 -22
View File
@@ -21,8 +21,6 @@
zstd,
libiberty,
libunwind,
apple-sdk_11,
darwinMinVersionHook,
boost,
fmt_11,
@@ -64,26 +62,21 @@ stdenv.mkDerivation (finalAttrs: {
];
# See CMake/folly-deps.cmake in the Folly source tree.
buildInputs =
[
boost
double-conversion
fast-float
gflags
glog
libevent
zlib
openssl
xz
lz4
zstd
libiberty
libunwind
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
(darwinMinVersionHook "11.0")
];
buildInputs = [
boost
double-conversion
fast-float
gflags
glog
libevent
zlib
openssl
xz
lz4
zstd
libiberty
libunwind
];
propagatedBuildInputs =
[
pkgs/by-name/mv/mvfst/package.nix
+5 -12
View File
@@ -11,8 +11,6 @@
folly,
gflags,
glog,
apple-sdk_11,
darwinMinVersionHook,
fizz,
@@ -44,16 +42,11 @@ stdenv.mkDerivation (finalAttrs: {
removeReferencesTo
];
buildInputs =
[
folly
gflags
glog
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
(darwinMinVersionHook "11.0")
];
buildInputs = [
folly
gflags
glog
];
propagatedBuildInputs = [
fizz
pkgs/by-name/rc/rcodesign/package.nix
-3
View File
@@ -3,7 +3,6 @@
stdenv,
rustPlatform,
fetchFromGitHub,
apple-sdk_11,
uutils-coreutils,
}:
@@ -25,8 +24,6 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-xMhyKovXoBPZp6epWQ+CYODpyvHgpv6eZfdWPTuDnK8=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
cargoBuildFlags = [
# Only build the binary we want
"--bin"
pkgs/by-name/wa/wangle/package.nix
+9 -16
View File
@@ -15,8 +15,6 @@
gflags,
libevent,
double-conversion,
apple-sdk_11,
darwinMinVersionHook,
gtest,
@@ -45,20 +43,15 @@ stdenv.mkDerivation (finalAttrs: {
removeReferencesTo
];
buildInputs =
[
folly
fizz
openssl
glog
gflags
libevent
double-conversion
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
(darwinMinVersionHook "11.0")
];
buildInputs = [
folly
fizz
openssl
glog
gflags
libevent
double-conversion
];
checkInputs = [
gtest
pkgs/by-name/wa/watchman/package.nix
+14 -21
View File
@@ -26,8 +26,6 @@
fbthrift,
fb303,
cpptoml,
apple-sdk_11,
darwinMinVersionHook,
gtest,
@@ -58,25 +56,20 @@ stdenv.mkDerivation (finalAttrs: {
removeReferencesTo
];
buildInputs =
[
pcre2
openssl
gflags
glog
libevent
edencommon
folly
fizz
wangle
fbthrift
fb303
cpptoml
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
(darwinMinVersionHook "11.0")
];
buildInputs = [
pcre2
openssl
gflags
glog
libevent
edencommon
folly
fizz
wangle
fbthrift
fb303
cpptoml
];
checkInputs = [
gtest
pkgs/development/compilers/go/1.22.nix
-2
View File
@@ -5,7 +5,6 @@
tzdata,
substituteAll,
iana-etc,
apple-sdk_11,
xcbuild,
mailcap,
buildPackages,
@@ -64,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [
apple-sdk_11
xcbuild
];
pkgs/development/compilers/go/1.24.nix
-2
View File
@@ -5,7 +5,6 @@
tzdata,
substituteAll,
iana-etc,
apple-sdk_11,
xcbuild,
mailcap,
buildPackages,
@@ -64,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [
apple-sdk_11
xcbuild
];
pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix
+10 -18
View File
@@ -2,11 +2,9 @@
lib,
stdenv,
alsa-lib,
apple-sdk_11,
autoPatchelfHook,
cairo,
cups,
darwinMinVersionHook,
fontconfig,
glib,
glibc,
@@ -31,7 +29,6 @@ let
"lib"
"stdenv"
"alsa-lib"
"apple-sdk_11"
"autoPatchelfHook"
"cairo"
"cups"
@@ -127,21 +124,16 @@ let
zlib
];
buildInputs =
lib.optionals stdenv.hostPlatform.isLinux [
alsa-lib # libasound.so wanted by lib/libjsound.so
fontconfig
(lib.getLib stdenv.cc.cc) # libstdc++.so.6
xorg.libX11
xorg.libXext
xorg.libXi
xorg.libXrender
xorg.libXtst
]
++ (lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
(darwinMinVersionHook "11.0")
]);
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
alsa-lib # libasound.so wanted by lib/libjsound.so
fontconfig
(lib.getLib stdenv.cc.cc) # libstdc++.so.6
xorg.libX11
xorg.libXext
xorg.libXi
xorg.libXrender
xorg.libXtst
];
postInstall =
let
pkgs/development/libraries/ngtcp2/default.nix
-3
View File
@@ -1,7 +1,6 @@
{ lib, stdenv, fetchFromGitHub
, cmake
, brotli, libev, nghttp3, quictls
, apple-sdk_11
, withJemalloc ? false, jemalloc
, curlHTTP3
}:
@@ -26,8 +25,6 @@ stdenv.mkDerivation rec {
libev
nghttp3
quictls
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
] ++ lib.optional withJemalloc jemalloc;
cmakeFlags = [
pkgs/development/python-modules/llama-cpp-python/default.nix
+8 -15
View File
@@ -13,9 +13,6 @@
pyproject-metadata,
scikit-build-core,
# buildInputs
apple-sdk_11,
# dependencies
diskcache,
jinja2,
@@ -70,18 +67,14 @@ buildPythonPackage rec {
scikit-build-core
];
buildInputs =
lib.optionals cudaSupport (
with cudaPackages;
[
cuda_cudart # cuda_runtime.h
cuda_cccl # <thrust/*>
libcublas # cublas_v2.h
]
)
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
];
buildInputs = lib.optionals cudaSupport (
with cudaPackages;
[
cuda_cudart # cuda_runtime.h
cuda_cccl # <thrust/*>
libcublas # cublas_v2.h
]
);
dependencies = [
diskcache
pkgs/development/python-modules/nanobind/default.nix
-9
View File
@@ -1,9 +1,7 @@
{
lib,
stdenv,
apple-sdk_11,
buildPythonPackage,
darwinMinVersionHook,
fetchFromGitHub,
pythonOlder,
@@ -49,13 +47,6 @@ buildPythonPackage rec {
dependencies = [ eigen ];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
# error: aligned deallocation function of type 'void (void *, std::align_val_t) noexcept' is only available on macOS 10.13 or newer
(darwinMinVersionHook "10.13")
apple-sdk_11
];
dontUseCmakeBuildDir = true;
preCheck = ''
pkgs/development/python-modules/soxr/default.nix
+1 -9
View File
@@ -1,8 +1,6 @@
{
lib,
apple-sdk_11,
buildPythonPackage,
darwinMinVersionHook,
fetchFromGitHub,
pythonOlder,
stdenv,
@@ -63,13 +61,7 @@ buildPythonPackage rec {
typing-extensions
];
buildInputs =
[ libsoxr ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# error: aligned deallocation function of type 'void (void *, std::align_val_t) noexcept' is only available on macOS 10.13 or newer
(darwinMinVersionHook "10.13")
apple-sdk_11
];
buildInputs = [ libsoxr ];
dependencies = [ numpy ];
pkgs/development/python-modules/wandb/default.nix
-3
View File
@@ -1,7 +1,6 @@
{
lib,
stdenv,
apple-sdk_11,
fetchFromGitHub,
## wandb-core
@@ -179,8 +178,6 @@ buildPythonPackage rec {
hatchling
];
buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
dependencies =
[
click