treewide: unpin apple-sdk_11 pt 8 (#370654)

authored by Emily and committed by GitHub a3cc57a9 a748f4ce

+98 -199
+9 -16
pkgs/by-name/ed/edencommon/package.nix
··· 15 15 wangle, 16 16 fbthrift, 17 17 gtest, 18 - apple-sdk_11, 19 - darwinMinVersionHook, 20 18 21 19 nix-update-script, 22 20 }: ··· 48 46 removeReferencesTo 49 47 ]; 50 48 51 - buildInputs = 52 - [ 53 - glog 54 - gflags 55 - folly 56 - fb303 57 - wangle 58 - fbthrift 59 - gtest 60 - ] 61 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ 62 - apple-sdk_11 63 - (darwinMinVersionHook "11.0") 64 - ]; 49 + buildInputs = [ 50 + glog 51 + gflags 52 + folly 53 + fb303 54 + wangle 55 + fbthrift 56 + gtest 57 + ]; 65 58 66 59 cmakeFlags = [ 67 60 (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
+8 -15
pkgs/by-name/fb/fb303/package.nix
··· 13 13 fbthrift, 14 14 fizz, 15 15 wangle, 16 - apple-sdk_11, 17 - darwinMinVersionHook, 18 16 19 17 nix-update-script, 20 18 }: ··· 40 38 ninja 41 39 ]; 42 40 43 - buildInputs = 44 - [ 45 - gflags 46 - glog 47 - folly 48 - fbthrift 49 - fizz 50 - wangle 51 - ] 52 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ 53 - apple-sdk_11 54 - (darwinMinVersionHook "11.0") 55 - ]; 41 + buildInputs = [ 42 + gflags 43 + glog 44 + folly 45 + fbthrift 46 + fizz 47 + wangle 48 + ]; 56 49 57 50 cmakeFlags = [ 58 51 (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
+11 -18
pkgs/by-name/fb/fbthrift/package.nix
··· 17 17 zlib, 18 18 zstd, 19 19 xxHash, 20 - apple-sdk_11, 21 - darwinMinVersionHook, 22 20 23 21 mvfst, 24 22 ··· 56 54 removeReferencesTo 57 55 ]; 58 56 59 - buildInputs = 60 - [ 61 - openssl 62 - gflags 63 - glog 64 - folly 65 - fizz 66 - wangle 67 - zlib 68 - zstd 69 - xxHash 70 - ] 71 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ 72 - apple-sdk_11 73 - (darwinMinVersionHook "11.0") 74 - ]; 57 + buildInputs = [ 58 + openssl 59 + gflags 60 + glog 61 + folly 62 + fizz 63 + wangle 64 + zlib 65 + zstd 66 + xxHash 67 + ]; 75 68 76 69 propagatedBuildInputs = [ 77 70 mvfst
+8 -15
pkgs/by-name/fi/fizz/package.nix
··· 14 14 zstd, 15 15 gflags, 16 16 libevent, 17 - apple-sdk_11, 18 - darwinMinVersionHook, 19 17 20 18 folly, 21 19 libsodium, ··· 49 47 removeReferencesTo 50 48 ]; 51 49 52 - buildInputs = 53 - [ 54 - openssl 55 - glog 56 - double-conversion 57 - zstd 58 - gflags 59 - libevent 60 - ] 61 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ 62 - apple-sdk_11 63 - (darwinMinVersionHook "11.0") 64 - ]; 50 + buildInputs = [ 51 + openssl 52 + glog 53 + double-conversion 54 + zstd 55 + gflags 56 + libevent 57 + ]; 65 58 66 59 propagatedBuildInputs = [ 67 60 folly
+15 -22
pkgs/by-name/fo/folly/package.nix
··· 21 21 zstd, 22 22 libiberty, 23 23 libunwind, 24 - apple-sdk_11, 25 - darwinMinVersionHook, 26 24 27 25 boost, 28 26 fmt_11, ··· 64 62 ]; 65 63 66 64 # See CMake/folly-deps.cmake in the Folly source tree. 67 - buildInputs = 68 - [ 69 - boost 70 - double-conversion 71 - fast-float 72 - gflags 73 - glog 74 - libevent 75 - zlib 76 - openssl 77 - xz 78 - lz4 79 - zstd 80 - libiberty 81 - libunwind 82 - ] 83 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ 84 - apple-sdk_11 85 - (darwinMinVersionHook "11.0") 86 - ]; 65 + buildInputs = [ 66 + boost 67 + double-conversion 68 + fast-float 69 + gflags 70 + glog 71 + libevent 72 + zlib 73 + openssl 74 + xz 75 + lz4 76 + zstd 77 + libiberty 78 + libunwind 79 + ]; 87 80 88 81 propagatedBuildInputs = 89 82 [
+5 -12
pkgs/by-name/mv/mvfst/package.nix
··· 11 11 folly, 12 12 gflags, 13 13 glog, 14 - apple-sdk_11, 15 - darwinMinVersionHook, 16 14 17 15 fizz, 18 16 ··· 44 42 removeReferencesTo 45 43 ]; 46 44 47 - buildInputs = 48 - [ 49 - folly 50 - gflags 51 - glog 52 - ] 53 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ 54 - apple-sdk_11 55 - (darwinMinVersionHook "11.0") 56 - ]; 45 + buildInputs = [ 46 + folly 47 + gflags 48 + glog 49 + ]; 57 50 58 51 propagatedBuildInputs = [ 59 52 fizz
-3
pkgs/by-name/rc/rcodesign/package.nix
··· 3 3 stdenv, 4 4 rustPlatform, 5 5 fetchFromGitHub, 6 - apple-sdk_11, 7 6 uutils-coreutils, 8 7 }: 9 8 ··· 24 23 ]; 25 24 26 25 cargoHash = "sha256-xMhyKovXoBPZp6epWQ+CYODpyvHgpv6eZfdWPTuDnK8="; 27 - 28 - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; 29 26 30 27 cargoBuildFlags = [ 31 28 # Only build the binary we want
+9 -16
pkgs/by-name/wa/wangle/package.nix
··· 15 15 gflags, 16 16 libevent, 17 17 double-conversion, 18 - apple-sdk_11, 19 - darwinMinVersionHook, 20 18 21 19 gtest, 22 20 ··· 45 43 removeReferencesTo 46 44 ]; 47 45 48 - buildInputs = 49 - [ 50 - folly 51 - fizz 52 - openssl 53 - glog 54 - gflags 55 - libevent 56 - double-conversion 57 - ] 58 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ 59 - apple-sdk_11 60 - (darwinMinVersionHook "11.0") 61 - ]; 46 + buildInputs = [ 47 + folly 48 + fizz 49 + openssl 50 + glog 51 + gflags 52 + libevent 53 + double-conversion 54 + ]; 62 55 63 56 checkInputs = [ 64 57 gtest
+14 -21
pkgs/by-name/wa/watchman/package.nix
··· 26 26 fbthrift, 27 27 fb303, 28 28 cpptoml, 29 - apple-sdk_11, 30 - darwinMinVersionHook, 31 29 32 30 gtest, 33 31 ··· 58 56 removeReferencesTo 59 57 ]; 60 58 61 - buildInputs = 62 - [ 63 - pcre2 64 - openssl 65 - gflags 66 - glog 67 - libevent 68 - edencommon 69 - folly 70 - fizz 71 - wangle 72 - fbthrift 73 - fb303 74 - cpptoml 75 - ] 76 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ 77 - apple-sdk_11 78 - (darwinMinVersionHook "11.0") 79 - ]; 59 + buildInputs = [ 60 + pcre2 61 + openssl 62 + gflags 63 + glog 64 + libevent 65 + edencommon 66 + folly 67 + fizz 68 + wangle 69 + fbthrift 70 + fb303 71 + cpptoml 72 + ]; 80 73 81 74 checkInputs = [ 82 75 gtest
-2
pkgs/development/compilers/go/1.22.nix
··· 5 5 tzdata, 6 6 substituteAll, 7 7 iana-etc, 8 - apple-sdk_11, 9 8 xcbuild, 10 9 mailcap, 11 10 buildPackages, ··· 64 63 ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; 65 64 66 65 depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ 67 - apple-sdk_11 68 66 xcbuild 69 67 ]; 70 68
-2
pkgs/development/compilers/go/1.24.nix
··· 5 5 tzdata, 6 6 substituteAll, 7 7 iana-etc, 8 - apple-sdk_11, 9 8 xcbuild, 10 9 mailcap, 11 10 buildPackages, ··· 64 63 ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; 65 64 66 65 depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ 67 - apple-sdk_11 68 66 xcbuild 69 67 ]; 70 68
+10 -18
pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix
··· 2 2 lib, 3 3 stdenv, 4 4 alsa-lib, 5 - apple-sdk_11, 6 5 autoPatchelfHook, 7 6 cairo, 8 7 cups, 9 - darwinMinVersionHook, 10 8 fontconfig, 11 9 glib, 12 10 glibc, ··· 31 29 "lib" 32 30 "stdenv" 33 31 "alsa-lib" 34 - "apple-sdk_11" 35 32 "autoPatchelfHook" 36 33 "cairo" 37 34 "cups" ··· 127 124 zlib 128 125 ]; 129 126 130 - buildInputs = 131 - lib.optionals stdenv.hostPlatform.isLinux [ 132 - alsa-lib # libasound.so wanted by lib/libjsound.so 133 - fontconfig 134 - (lib.getLib stdenv.cc.cc) # libstdc++.so.6 135 - xorg.libX11 136 - xorg.libXext 137 - xorg.libXi 138 - xorg.libXrender 139 - xorg.libXtst 140 - ] 141 - ++ (lib.optionals stdenv.hostPlatform.isDarwin [ 142 - apple-sdk_11 143 - (darwinMinVersionHook "11.0") 144 - ]); 127 + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ 128 + alsa-lib # libasound.so wanted by lib/libjsound.so 129 + fontconfig 130 + (lib.getLib stdenv.cc.cc) # libstdc++.so.6 131 + xorg.libX11 132 + xorg.libXext 133 + xorg.libXi 134 + xorg.libXrender 135 + xorg.libXtst 136 + ]; 145 137 146 138 postInstall = 147 139 let
-3
pkgs/development/libraries/ngtcp2/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub 2 2 , cmake 3 3 , brotli, libev, nghttp3, quictls 4 - , apple-sdk_11 5 4 , withJemalloc ? false, jemalloc 6 5 , curlHTTP3 7 6 }: ··· 26 25 libev 27 26 nghttp3 28 27 quictls 29 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ 30 - apple-sdk_11 31 28 ] ++ lib.optional withJemalloc jemalloc; 32 29 33 30 cmakeFlags = [
+8 -15
pkgs/development/python-modules/llama-cpp-python/default.nix
··· 13 13 pyproject-metadata, 14 14 scikit-build-core, 15 15 16 - # buildInputs 17 - apple-sdk_11, 18 - 19 16 # dependencies 20 17 diskcache, 21 18 jinja2, ··· 70 67 scikit-build-core 71 68 ]; 72 69 73 - buildInputs = 74 - lib.optionals cudaSupport ( 75 - with cudaPackages; 76 - [ 77 - cuda_cudart # cuda_runtime.h 78 - cuda_cccl # <thrust/*> 79 - libcublas # cublas_v2.h 80 - ] 81 - ) 82 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ 83 - apple-sdk_11 84 - ]; 70 + buildInputs = lib.optionals cudaSupport ( 71 + with cudaPackages; 72 + [ 73 + cuda_cudart # cuda_runtime.h 74 + cuda_cccl # <thrust/*> 75 + libcublas # cublas_v2.h 76 + ] 77 + ); 85 78 86 79 dependencies = [ 87 80 diskcache
-9
pkgs/development/python-modules/nanobind/default.nix
··· 1 1 { 2 2 lib, 3 3 stdenv, 4 - apple-sdk_11, 5 4 buildPythonPackage, 6 - darwinMinVersionHook, 7 5 fetchFromGitHub, 8 6 pythonOlder, 9 7 ··· 48 46 ]; 49 47 50 48 dependencies = [ eigen ]; 51 - 52 - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ 53 - # error: aligned deallocation function of type 'void (void *, std::align_val_t) noexcept' is only available on macOS 10.13 or newer 54 - (darwinMinVersionHook "10.13") 55 - 56 - apple-sdk_11 57 - ]; 58 49 59 50 dontUseCmakeBuildDir = true; 60 51
+1 -9
pkgs/development/python-modules/soxr/default.nix
··· 1 1 { 2 2 lib, 3 - apple-sdk_11, 4 3 buildPythonPackage, 5 - darwinMinVersionHook, 6 4 fetchFromGitHub, 7 5 pythonOlder, 8 6 stdenv, ··· 63 61 typing-extensions 64 62 ]; 65 63 66 - buildInputs = 67 - [ libsoxr ] 68 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ 69 - # error: aligned deallocation function of type 'void (void *, std::align_val_t) noexcept' is only available on macOS 10.13 or newer 70 - (darwinMinVersionHook "10.13") 71 - apple-sdk_11 72 - ]; 64 + buildInputs = [ libsoxr ]; 73 65 74 66 dependencies = [ numpy ]; 75 67
-3
pkgs/development/python-modules/wandb/default.nix
··· 1 1 { 2 2 lib, 3 3 stdenv, 4 - apple-sdk_11, 5 4 fetchFromGitHub, 6 5 7 6 ## wandb-core ··· 178 177 build-system = [ 179 178 hatchling 180 179 ]; 181 - 182 - buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; 183 180 184 181 dependencies = 185 182 [