aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Leitch <jleitch@consumingchaos.com>2024-01-09 11:46:39 -0700
committerGitHub <noreply@github.com>2024-01-09 18:46:39 +0000
commitfb0393d203b38e45c169d5a053b472a38424cf47 (patch)
tree96c2a925f05908fd30f51279d4de59cbf26f85e3
parent90e4505c19e8276311cd5ad7d9d894aa659105dd (diff)
downloadbazelbuild-rules_rust-fb0393d203b38e45c169d5a053b472a38424cf47.tar.gz
Nix Example updated `rules_nixpkgs` version and removed CI workaround. (#2409)
-rw-r--r--.bazelci/presubmit.yml2
-rw-r--r--examples/nix_cross_compiling/WORKSPACE.bazel6
2 files changed, 3 insertions, 5 deletions
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 1e4dbb2a..9bef3980 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -620,8 +620,6 @@ tasks:
setup:
- curl -L https://nixos.org/nix/install | bash
- sudo cp ~/.nix-profile/bin/nix* /usr/local/bin/
- - sudo mkdir /etc/nix
- - echo "experimental-features = nix-command flakes" | sudo tee --append /etc/nix/nix.conf
build_targets:
# Root `build_test` target is called directly to catch missing platforms
# that would otherwise be quietly skipped due to `target_compatible_with`.
diff --git a/examples/nix_cross_compiling/WORKSPACE.bazel b/examples/nix_cross_compiling/WORKSPACE.bazel
index 5452b181..bde11548 100644
--- a/examples/nix_cross_compiling/WORKSPACE.bazel
+++ b/examples/nix_cross_compiling/WORKSPACE.bazel
@@ -3,9 +3,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
# Nix
http_archive(
name = "io_tweag_rules_nixpkgs",
- sha256 = "54946958c311f48c17c9b2e70683b621fec135258b75173f3900f901d52d8115",
- strip_prefix = "rules_nixpkgs-2b4702c8a0d1d7ea474ea0913344e8add2759f9c",
- urls = ["https://github.com/tweag/rules_nixpkgs/archive/2b4702c8a0d1d7ea474ea0913344e8add2759f9c.tar.gz"],
+ sha256 = "532634d78c35a42745bc1ceb02193c1505e676ed55746947061c2b6bb37b85fb",
+ strip_prefix = "rules_nixpkgs-c871abcedf5734513f7ab731ea6ba541636f4df6",
+ urls = ["https://github.com/tweag/rules_nixpkgs/archive/c871abcedf5734513f7ab731ea6ba541636f4df6.tar.gz"],
)
load("@io_tweag_rules_nixpkgs//nixpkgs:repositories.bzl", "rules_nixpkgs_dependencies")