Nix example switched to using `crate_universe_dependencies(bootstrap …

…= True)`.
bazelbuild · Dec 10, 2023 · 1f78b0e · 1f78b0e
1 parent 0a4c4df
commit 1f78b0e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 102 deletions.
diff --git a/crate_universe/flake.lock b/crate_universe/flake.lock
diff --git a/crate_universe/flake.nix b/crate_universe/flake.nix
diff --git a/examples/nix_cross_compiling/WORKSPACE.bazel b/examples/nix_cross_compiling/WORKSPACE.bazel
@@ -26,6 +26,14 @@ load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies")
 
 rules_rust_dependencies()
 
+load("@rules_rust//crate_universe:repositories.bzl", "crate_universe_dependencies")
+
+crate_universe_dependencies(
+    bootstrap = True,
+    rust_toolchain_cargo_template = "@nix_rust//:bin/{tool}",
+    rust_toolchain_rustc_template = "@nix_rust//:bin/{tool}",
+)
+
 load("@rules_rust//crate_universe:defs.bzl", "crates_repository", "render_config", "splicing_config")
 load("//bazel/cargo:crates_repository.bzl", CARGO_ANNOTATIONS = "ANNOTATIONS", CARGO_PACKAGES = "PACKAGES")
 
@@ -34,7 +42,7 @@ crates_repository(
     annotations = CARGO_ANNOTATIONS,
     cargo_lockfile = "//bazel/cargo:Cargo.lock",
     generate_build_scripts = False,
-    generator = "@cargo-bazel//:bin/cargo-bazel",
+    generator = "@cargo_bazel_bootstrap//:cargo-bazel",
     lockfile = "//bazel/cargo:cargo-bazel-lock.json",
     packages = CARGO_PACKAGES,
     render_config = render_config(

diff --git a/examples/nix_cross_compiling/bazel/nix_repositories.bzl b/examples/nix_cross_compiling/bazel/nix_repositories.bzl
@@ -201,12 +201,6 @@ rust_stdlib_filegroup(
 )
 """
 
-_CARGO_BAZEL_BUILD_FILE_CONTENT = """
-package(default_visibility = ["//visibility:public"])
-
-exports_files(["bin/cargo-bazel"])
-"""
-
 def nix_repositories():
     nixpkgs_flake_package(
         name = "nix_config",
@@ -223,11 +217,3 @@ def nix_repositories():
         package = "bazel.rust",
         build_file_content = _RUST_BUILD_FILE_CONTENT,
     )
-
-    nixpkgs_flake_package(
-        name = "cargo-bazel",
-        nix_flake_file = "@rules_rust//crate_universe:flake.nix",
-        nix_flake_lock_file = "@rules_rust//crate_universe:flake.lock",
-        package = "cargo-bazel",
-        build_file_content = _CARGO_BAZEL_BUILD_FILE_CONTENT,
-    )