Skip to content

Commit 07bd27a

Browse files
authored
Bump flake (#1632)
Notably, this removes our custom override for pulumi which should improve CI times.
1 parent 403a71c commit 07bd27a

17 files changed

+2801
-2840
lines changed

BUILD.bazel

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
load("@rules_rust//rust:defs.bzl", "rust_binary")
2+
load("@rules_shell//shell:sh_test.bzl", "sh_test")
23

34
exports_files(
45
[

MODULE.bazel

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ bazel_dep(name = "rules_cc", version = "0.1.1")
88
bazel_dep(name = "platforms", version = "0.0.11")
99
bazel_dep(name = "bazel_skylib", version = "1.7.1")
1010
bazel_dep(name = "rules_python", version = "1.2.0")
11+
bazel_dep(name = "rules_shell", version = "0.4.0")
1112

1213
python = use_extension("@rules_python//python/extensions:python.bzl", "python")
1314
python.toolchain(

flake.lock

+24-21
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

-1
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,6 @@
299299
inherit system;
300300
overlays = [
301301
self.overlays.lre
302-
(import ./tools/nixpkgs-disable-ratehammering-pulumi-tests.nix)
303302
self.overlays.tools
304303
(import rust-overlay)
305304
(import ./tools/rust-overlay-cut-libsecret.nix)

local-remote-execution/generated-cc/cc/BUILD

+16-15
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
# This becomes the BUILD file for @local_config_cc// under non-BSD unixes.
1616

17+
load("@rules_cc//cc:cc_library.bzl", "cc_library")
1718
load("@rules_cc//cc:defs.bzl", "cc_toolchain", "cc_toolchain_suite")
1819
load(":armeabi_cc_toolchain_config.bzl", "armeabi_cc_toolchain_config")
1920
load(":cc_toolchain_config.bzl", "cc_toolchain_config")
@@ -121,10 +122,10 @@ cc_toolchain_config(
121122
coverage_link_flags = ["--coverage"],
122123
cpu = "k8",
123124
cxx_builtin_include_directories = [
124-
"/nix/store/pcknhp59jx07gclcx5pgpckk75zz0q2p-clang-wrapper-19.1.7/resource-root/include",
125-
"/nix/store/6aci60gk5wj4bjj1rygzbkc6ximmsm17-glibc-2.40-66-dev/include",
126-
"/nix/store/pcknhp59jx07gclcx5pgpckk75zz0q2p-clang-wrapper-19.1.7/resource-root/share",
127-
"/nix/store/hvska22z27wrdhwv5ciraamghmyqvbby-libcxx-19.1.7-dev/include/c++/v1",
125+
"/nix/store/i45c42749c7rkbv4idawbr9m4phi2c6h-clang-wrapper-19.1.7/resource-root/include",
126+
"/nix/store/5djq7mrpqv8kzn2xi22y5d8ww7rsix82-glibc-2.40-66-dev/include",
127+
"/nix/store/i45c42749c7rkbv4idawbr9m4phi2c6h-clang-wrapper-19.1.7/resource-root/share",
128+
"/nix/store/47jmi5pvn8xh447nz99n3nicy9fi831v-libcxx-19.1.7-dev/include/c++/v1",
128129
"/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk",
129130
],
130131
cxx_flags = ["-std=c++14"],
@@ -135,8 +136,8 @@ cc_toolchain_config(
135136
]},
136137
host_system_name = "x86_64-unknown-linux-gnu",
137138
link_flags = [
138-
"-fuse-ld=/nix/store/2v3virr5293gp2xgfb7nvzz0dljg8i9m-llvm-binutils-wrapper-19.1.7/bin/ld.mold",
139-
"-B/nix/store/yrw9cinlqgg9hfd22n0a5z596ir27v10-customClang/bin",
139+
"-fuse-ld=/nix/store/fj1xilxbnb4bll73hw273vx999n22rwi-llvm-binutils-wrapper-19.1.7/bin/ld.mold",
140+
"-B/nix/store/6dysvsc6y6yq3dii7lbixbkan6pmi58x-customClang/bin",
140141
"-Wl,-no-as-needed",
141142
"-Wl,-z,relro,-z,now",
142143
],
@@ -161,19 +162,19 @@ cc_toolchain_config(
161162
target_libc = "glibc_2.35",
162163
target_system_name = "local",
163164
tool_paths = {
164-
"ar": "/nix/store/2v3virr5293gp2xgfb7nvzz0dljg8i9m-llvm-binutils-wrapper-19.1.7/bin/ar",
165-
"ld": "/nix/store/2v3virr5293gp2xgfb7nvzz0dljg8i9m-llvm-binutils-wrapper-19.1.7/bin/ld",
165+
"ar": "/nix/store/fj1xilxbnb4bll73hw273vx999n22rwi-llvm-binutils-wrapper-19.1.7/bin/ar",
166+
"ld": "/nix/store/fj1xilxbnb4bll73hw273vx999n22rwi-llvm-binutils-wrapper-19.1.7/bin/ld",
166167
"llvm-cov": "None",
167168
"llvm-profdata": "None",
168169
"cpp": "/usr/bin/cpp",
169-
"gcc": "/nix/store/yrw9cinlqgg9hfd22n0a5z596ir27v10-customClang/bin/customClang",
170-
"dwp": "/nix/store/2v3virr5293gp2xgfb7nvzz0dljg8i9m-llvm-binutils-wrapper-19.1.7/bin/dwp",
170+
"gcc": "/nix/store/6dysvsc6y6yq3dii7lbixbkan6pmi58x-customClang/bin/customClang",
171+
"dwp": "/nix/store/fj1xilxbnb4bll73hw273vx999n22rwi-llvm-binutils-wrapper-19.1.7/bin/dwp",
171172
"gcov": "None",
172-
"nm": "/nix/store/2v3virr5293gp2xgfb7nvzz0dljg8i9m-llvm-binutils-wrapper-19.1.7/bin/nm",
173-
"objcopy": "/nix/store/2v3virr5293gp2xgfb7nvzz0dljg8i9m-llvm-binutils-wrapper-19.1.7/bin/objcopy",
174-
"objdump": "/nix/store/2v3virr5293gp2xgfb7nvzz0dljg8i9m-llvm-binutils-wrapper-19.1.7/bin/objdump",
175-
"strip": "/nix/store/2v3virr5293gp2xgfb7nvzz0dljg8i9m-llvm-binutils-wrapper-19.1.7/bin/strip",
176-
"c++filt": "/nix/store/2v3virr5293gp2xgfb7nvzz0dljg8i9m-llvm-binutils-wrapper-19.1.7/bin/c++filt",
173+
"nm": "/nix/store/fj1xilxbnb4bll73hw273vx999n22rwi-llvm-binutils-wrapper-19.1.7/bin/nm",
174+
"objcopy": "/nix/store/fj1xilxbnb4bll73hw273vx999n22rwi-llvm-binutils-wrapper-19.1.7/bin/objcopy",
175+
"objdump": "/nix/store/fj1xilxbnb4bll73hw273vx999n22rwi-llvm-binutils-wrapper-19.1.7/bin/objdump",
176+
"strip": "/nix/store/fj1xilxbnb4bll73hw273vx999n22rwi-llvm-binutils-wrapper-19.1.7/bin/strip",
177+
"c++filt": "/nix/store/fj1xilxbnb4bll73hw273vx999n22rwi-llvm-binutils-wrapper-19.1.7/bin/c++filt",
177178
"parse_headers": "cc_wrapper.sh",
178179
"validate_static_library": "validate_static_library.sh",
179180
},

local-remote-execution/generated-cc/cc/armeabi_cc_toolchain_config.bzl

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ load(
1919
"feature",
2020
"tool_path",
2121
)
22+
load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
2223

2324
def _impl(ctx):
2425
toolchain_identifier = "stub_armeabi-v7a"
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
This file is generated by cc_configure and contains builtin include directories
2-
that /nix/store/yrw9cinlqgg9hfd22n0a5z596ir27v10-customClang/bin/customClang reported. This file is a dependency of every compilation action and
2+
that /nix/store/6dysvsc6y6yq3dii7lbixbkan6pmi58x-customClang/bin/customClang reported. This file is a dependency of every compilation action and
33
changes to it will be reflected in the action cache key. When some of these
44
paths change, Bazel will make sure to rerun the action, even though none of
55
declared action inputs or the action commandline changes.
66

7-
/nix/store/pcknhp59jx07gclcx5pgpckk75zz0q2p-clang-wrapper-19.1.7/resource-root/include
8-
/nix/store/6aci60gk5wj4bjj1rygzbkc6ximmsm17-glibc-2.40-66-dev/include
9-
/nix/store/pcknhp59jx07gclcx5pgpckk75zz0q2p-clang-wrapper-19.1.7/resource-root/share
10-
/nix/store/hvska22z27wrdhwv5ciraamghmyqvbby-libcxx-19.1.7-dev/include/c++/v1
7+
/nix/store/i45c42749c7rkbv4idawbr9m4phi2c6h-clang-wrapper-19.1.7/resource-root/include
8+
/nix/store/5djq7mrpqv8kzn2xi22y5d8ww7rsix82-glibc-2.40-66-dev/include
9+
/nix/store/i45c42749c7rkbv4idawbr9m4phi2c6h-clang-wrapper-19.1.7/resource-root/share
10+
/nix/store/47jmi5pvn8xh447nz99n3nicy9fi831v-libcxx-19.1.7-dev/include/c++/v1
1111
/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk

local-remote-execution/generated-cc/cc/cc_toolchain_config.bzl

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ load(
3030
"variable_with_value",
3131
"with_feature_set",
3232
)
33+
load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
3334

3435
def _target_os_version(ctx):
3536
platform_type = ctx.fragments.apple.single_arch_platform.platform_type

local-remote-execution/generated-cc/cc/cc_wrapper.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/nix/store/b0szb1r3cyih06nlzip0ywrxk33lqdsm-bash/bin/bash
1+
#!/nix/store/9qqbpbs3rkkiifi3yfq4ghcbc4p2n906-bash/bin/bash
22
#
33
# Copyright 2015 The Bazel Authors. All rights reserved.
44
#
@@ -46,7 +46,7 @@ done
4646

4747

4848
# Call the C++ compiler
49-
/nix/store/yrw9cinlqgg9hfd22n0a5z596ir27v10-customClang/bin/customClang "$@"
49+
/nix/store/6dysvsc6y6yq3dii7lbixbkan6pmi58x-customClang/bin/customClang "$@"
5050

5151
# Generate an empty file if header processing succeeded.
5252
if [[ "${OUTPUT}" == *.h.processed ]]; then

0 commit comments

Comments
 (0)