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

bazel_{5,6,7}: use new apple sdk pattern (#370672)

Browse Source
This commit is contained in:
Weijia Wang
2025-01-04 00:10:41 +01:00
committed by GitHub
parent 7f5756b006 ff65ee04a6
commit 80893e00da
6 changed files with 10 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/python-modules/jaxopt/default.nix
+1
View File
@@ -94,6 +94,7 @@ buildPythonPackage rec {
# AssertionError (flaky numerical tests)
"test_logreg_with_intercept_manual_loop3"
"test_binary_logit_log_likelihood"
"test_inv_hessian_product_pytree3"
];
meta = {
pkgs/development/python-modules/keras/default.nix
+2
View File
@@ -92,6 +92,8 @@ buildPythonPackage rec {
"test_min_max_norm"
]
++ lib.optionals stdenv.isDarwin [
# TypeError: Cannot convert a MPS Tensor to float64 dtype as the MPS framework doesn't support float64. Please use float32 instead.
"test_dynamic_backend_torch"
# AttributeError: module 'numpy' has no attribute 'float128'. Did you mean: 'float16'?
"test_spectrogram_error"
];
pkgs/development/tools/build-managers/bazel/bazel_5/default.nix
-10
View File
@@ -30,9 +30,6 @@
cctools,
libcxx,
sigtool,
CoreFoundation,
CoreServices,
Foundation,
# Allow to independently override the jdks used to build and run respectively
buildJdk,
runJdk,
@@ -455,10 +452,6 @@ stdenv.mkDerivation rec {
# Explicitly configure gcov since we don't have it on Darwin, so autodetection fails
export GCOV=${coreutils}/bin/false
# Framework search paths aren't added by bintools hook
# https://github.com/NixOS/nixpkgs/pull/41914
export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks"
# libcxx includes aren't added by libcxx hook
# https://github.com/NixOS/nixpkgs/pull/41589
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getDev libcxx}/include/c++/v1"
@@ -633,9 +626,6 @@ stdenv.mkDerivation rec {
++ lib.optionals (stdenv.hostPlatform.isDarwin) [
cctools
libcxx
CoreFoundation
CoreServices
Foundation
];
# Bazel makes extensive use of symlinks in the WORKSPACE.
pkgs/development/tools/build-managers/bazel/bazel_6/default.nix
+2 -6
View File
@@ -8,7 +8,7 @@
# updater
, python3, writeScript
# Apple dependencies
, cctools, libcxx, CoreFoundation, CoreServices, Foundation, sigtool
, cctools, libcxx, sigtool
# Allow to independently override the jdks used to build and run respectively
, buildJdk, runJdk
, runtimeShell
@@ -415,10 +415,6 @@ stdenv.mkDerivation rec {
# Explicitly configure gcov since we don't have it on Darwin, so autodetection fails
export GCOV=${coreutils}/bin/false
# Framework search paths aren't added by bintools hook
# https://github.com/NixOS/nixpkgs/pull/41914
export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks"
# libcxx includes aren't added by libcxx hook
# https://github.com/NixOS/nixpkgs/pull/41589
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getDev libcxx}/include/c++/v1"
@@ -583,7 +579,7 @@ stdenv.mkDerivation rec {
which
zip
python3.pkgs.absl-py # Needed to build fish completion
] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ cctools libcxx sigtool CoreFoundation CoreServices Foundation ];
] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ cctools libcxx sigtool ];
# Bazel makes extensive use of symlinks in the WORKSPACE.
# This causes problems with infinite symlinks if the build output is in the same location as the
pkgs/development/tools/build-managers/bazel/bazel_7/default.nix
-11
View File
@@ -37,10 +37,6 @@
libcxx,
libtool,
sigtool,
CoreFoundation,
CoreServices,
Foundation,
IOKit,
# Allow to independently override the jdks used to build and run respectively
buildJdk,
runJdk,
@@ -410,10 +406,6 @@ stdenv.mkDerivation rec {
# Explicitly configure gcov since we don't have it on Darwin, so autodetection fails
export GCOV=${coreutils}/bin/false
# Framework search paths aren't added by bintools hook
# https://github.com/NixOS/nixpkgs/pull/41914
export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks -F${IOKit}/Library/Frameworks"
# libcxx includes aren't added by libcxx hook
# https://github.com/NixOS/nixpkgs/pull/41589
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getDev libcxx}/include/c++/v1"
@@ -564,9 +556,6 @@ stdenv.mkDerivation rec {
++ lib.optionals (stdenv.hostPlatform.isDarwin) [
cctools
libcxx
Foundation
CoreFoundation
CoreServices
];
# Bazel makes extensive use of symlinks in the WORKSPACE.
pkgs/top-level/all-packages.nix
+5 -10
View File
@@ -7720,34 +7720,29 @@ with pkgs;
bazel_5 = callPackage ../development/tools/build-managers/bazel/bazel_5 {
inherit (darwin) sigtool;
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
buildJdk = jdk11_headless;
runJdk = jdk11_headless;
stdenv = if stdenv.cc.isClang then llvmPackages.stdenv
stdenv = if stdenv.cc.isClang then llvmPackages_17.stdenv
else if stdenv.cc.isGNU then gcc12Stdenv
else stdenv;
bazel_self = bazel_5;
};
bazel_6 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_6 {
bazel_6 = callPackage ../development/tools/build-managers/bazel/bazel_6 {
inherit (darwin) sigtool;
inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation;
buildJdk = jdk11_headless;
runJdk = jdk11_headless;
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv
else if stdenv.cc.isClang then llvmPackages.stdenv
stdenv = if stdenv.cc.isClang then llvmPackages_17.stdenv
else if stdenv.cc.isGNU then gcc12Stdenv
else stdenv;
bazel_self = bazel_6;
};
bazel_7 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_7 {
bazel_7 = callPackage ../development/tools/build-managers/bazel/bazel_7 {
inherit (darwin) sigtool;
inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation IOKit;
buildJdk = jdk21_headless;
runJdk = jdk21_headless;
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv
else if stdenv.cc.isClang then llvmPackages.stdenv
stdenv = if stdenv.cc.isClang then llvmPackages_17.stdenv
else stdenv;
bazel_self = bazel_7;
};