Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 5 commits into from
Jan 3, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1fac09c
bazel_5: use new apple sdk pattern
wegank Jan 3, 2025
2e4aa2b
bazel_6: use new apple sdk pattern
wegank Jan 3, 2025
79660b4
bazel_7: use new apple sdk pattern
wegank Jan 3, 2025
325c094
python312Packages.keras: disable float64 test on darwin
wegank Jan 3, 2025
ff65ee0
python312Packages.jaxopt: disable more flaky test on darwin
wegank Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkgs/development/python-modules/jaxopt/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 2 additions & 0 deletions pkgs/development/python-modules/keras/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
];
Expand Down
10 changes: 0 additions & 10 deletions pkgs/development/tools/build-managers/bazel/bazel_5/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@
cctools,
libcxx,
sigtool,
CoreFoundation,
CoreServices,
Foundation,
# Allow to independently override the jdks used to build and run respectively
buildJdk,
runJdk,
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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.
Expand Down
8 changes: 2 additions & 6 deletions pkgs/development/tools/build-managers/bazel/bazel_6/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
11 changes: 0 additions & 11 deletions pkgs/development/tools/build-managers/bazel/bazel_7/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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.
Expand Down
15 changes: 5 additions & 10 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7724,34 +7724,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;
};
Expand Down
Loading