diff options
| author | Uri Baghin <uri@canva.com> | 2023-01-12 09:09:55 +1100 |
|---|---|---|
| committer | Uri Baghin <uri@canva.com> | 2023-01-24 19:30:20 +1100 |
| commit | 619ba04b8752a8f14d583de6bceb76f7fb44cd5c (patch) | |
| tree | e4bc5ab65482cce153483778d18496f0df17e36d | |
| parent | f203bcdff14aca0aaeeedaf9b4438b3f3bcada2e (diff) | |
| download | nixpkgs-619ba04b8752a8f14d583de6bceb76f7fb44cd5c.tar nixpkgs-619ba04b8752a8f14d583de6bceb76f7fb44cd5c.tar.gz nixpkgs-619ba04b8752a8f14d583de6bceb76f7fb44cd5c.tar.bz2 nixpkgs-619ba04b8752a8f14d583de6bceb76f7fb44cd5c.tar.lz nixpkgs-619ba04b8752a8f14d583de6bceb76f7fb44cd5c.tar.xz nixpkgs-619ba04b8752a8f14d583de6bceb76f7fb44cd5c.tar.zst nixpkgs-619ba04b8752a8f14d583de6bceb76f7fb44cd5c.zip | |
buildBazelPackage: make bazel explicit
| -rw-r--r-- | pkgs/build-support/build-bazel-package/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/python-modules/tensorflow-probability/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 3 |
3 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 14f7ac38d3f..d1cd502e7e4 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -1,16 +1,11 @@ { stdenv -, bazel , cacert , lib }: -let - bazelPkg = bazel; -in - args@{ name ? "${args.pname}-${args.version}" -, bazel ? bazelPkg +, bazel , bazelFlags ? [] , bazelBuildFlags ? [] , bazelTestFlags ? [] diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index 819dc0634d4..6f820298ec1 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, bazel_3 , buildBazelPackage , buildPythonPackage , python @@ -45,6 +46,8 @@ let tensorflow ]; + bazel = bazel_3; + bazelTarget = ":pip_pkg"; fetchAttrs = { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e21a89c4d8b..b8c5b329e45 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4803,9 +4803,6 @@ self: super: with self; { jaxlib-build = callPackage ../development/python-modules/jaxlib rec { inherit (pkgs.darwin) cctools; - buildBazelPackage = pkgs.buildBazelPackage.override { - stdenv = if stdenv.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else stdenv; - }; # Some platforms don't have `cudaSupport` defined, hence the need for 'or false'. cudaSupport = pkgs.config.cudaSupport or false; IOKit = pkgs.darwin.apple_sdk_11_0.IOKit; |