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

Bump flake #1632

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bump flake #1632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
load("@rules_rust//rust:defs.bzl", "rust_binary")
load("@rules_shell//shell:sh_test.bzl", "sh_test")

exports_files(
[
Expand Down
1 change: 1 addition & 0 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ bazel_dep(name = "rules_cc", version = "0.1.1")
bazel_dep(name = "platforms", version = "0.0.11")
bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "rules_python", version = "1.2.0")
bazel_dep(name = "rules_shell", version = "0.4.0")

python = use_extension("@rules_python//python/extensions:python.bzl", "python")
python.toolchain(
Expand Down
45 changes: 24 additions & 21 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,6 @@
inherit system;
overlays = [
self.overlays.lre
(import ./tools/nixpkgs-disable-ratehammering-pulumi-tests.nix)
self.overlays.tools
(import rust-overlay)
(import ./tools/rust-overlay-cut-libsecret.nix)
Expand Down
31 changes: 16 additions & 15 deletions local-remote-execution/generated-cc/cc/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

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

load("@rules_cc//cc:cc_library.bzl", "cc_library")
load("@rules_cc//cc:defs.bzl", "cc_toolchain", "cc_toolchain_suite")
load(":armeabi_cc_toolchain_config.bzl", "armeabi_cc_toolchain_config")
load(":cc_toolchain_config.bzl", "cc_toolchain_config")
Expand Down Expand Up @@ -121,10 +122,10 @@ cc_toolchain_config(
coverage_link_flags = ["--coverage"],
cpu = "k8",
cxx_builtin_include_directories = [
"/nix/store/pcknhp59jx07gclcx5pgpckk75zz0q2p-clang-wrapper-19.1.7/resource-root/include",
"/nix/store/6aci60gk5wj4bjj1rygzbkc6ximmsm17-glibc-2.40-66-dev/include",
"/nix/store/pcknhp59jx07gclcx5pgpckk75zz0q2p-clang-wrapper-19.1.7/resource-root/share",
"/nix/store/hvska22z27wrdhwv5ciraamghmyqvbby-libcxx-19.1.7-dev/include/c++/v1",
"/nix/store/i45c42749c7rkbv4idawbr9m4phi2c6h-clang-wrapper-19.1.7/resource-root/include",
"/nix/store/5djq7mrpqv8kzn2xi22y5d8ww7rsix82-glibc-2.40-66-dev/include",
"/nix/store/i45c42749c7rkbv4idawbr9m4phi2c6h-clang-wrapper-19.1.7/resource-root/share",
"/nix/store/47jmi5pvn8xh447nz99n3nicy9fi831v-libcxx-19.1.7-dev/include/c++/v1",
"/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk",
],
cxx_flags = ["-std=c++14"],
Expand All @@ -135,8 +136,8 @@ cc_toolchain_config(
]},
host_system_name = "x86_64-unknown-linux-gnu",
link_flags = [
"-fuse-ld=/nix/store/2v3virr5293gp2xgfb7nvzz0dljg8i9m-llvm-binutils-wrapper-19.1.7/bin/ld.mold",
"-B/nix/store/yrw9cinlqgg9hfd22n0a5z596ir27v10-customClang/bin",
"-fuse-ld=/nix/store/fj1xilxbnb4bll73hw273vx999n22rwi-llvm-binutils-wrapper-19.1.7/bin/ld.mold",
"-B/nix/store/6dysvsc6y6yq3dii7lbixbkan6pmi58x-customClang/bin",
"-Wl,-no-as-needed",
"-Wl,-z,relro,-z,now",
],
Expand All @@ -161,19 +162,19 @@ cc_toolchain_config(
target_libc = "glibc_2.35",
target_system_name = "local",
tool_paths = {
"ar": "/nix/store/2v3virr5293gp2xgfb7nvzz0dljg8i9m-llvm-binutils-wrapper-19.1.7/bin/ar",
"ld": "/nix/store/2v3virr5293gp2xgfb7nvzz0dljg8i9m-llvm-binutils-wrapper-19.1.7/bin/ld",
"ar": "/nix/store/fj1xilxbnb4bll73hw273vx999n22rwi-llvm-binutils-wrapper-19.1.7/bin/ar",
"ld": "/nix/store/fj1xilxbnb4bll73hw273vx999n22rwi-llvm-binutils-wrapper-19.1.7/bin/ld",
"llvm-cov": "None",
"llvm-profdata": "None",
"cpp": "/usr/bin/cpp",
"gcc": "/nix/store/yrw9cinlqgg9hfd22n0a5z596ir27v10-customClang/bin/customClang",
"dwp": "/nix/store/2v3virr5293gp2xgfb7nvzz0dljg8i9m-llvm-binutils-wrapper-19.1.7/bin/dwp",
"gcc": "/nix/store/6dysvsc6y6yq3dii7lbixbkan6pmi58x-customClang/bin/customClang",
"dwp": "/nix/store/fj1xilxbnb4bll73hw273vx999n22rwi-llvm-binutils-wrapper-19.1.7/bin/dwp",
"gcov": "None",
"nm": "/nix/store/2v3virr5293gp2xgfb7nvzz0dljg8i9m-llvm-binutils-wrapper-19.1.7/bin/nm",
"objcopy": "/nix/store/2v3virr5293gp2xgfb7nvzz0dljg8i9m-llvm-binutils-wrapper-19.1.7/bin/objcopy",
"objdump": "/nix/store/2v3virr5293gp2xgfb7nvzz0dljg8i9m-llvm-binutils-wrapper-19.1.7/bin/objdump",
"strip": "/nix/store/2v3virr5293gp2xgfb7nvzz0dljg8i9m-llvm-binutils-wrapper-19.1.7/bin/strip",
"c++filt": "/nix/store/2v3virr5293gp2xgfb7nvzz0dljg8i9m-llvm-binutils-wrapper-19.1.7/bin/c++filt",
"nm": "/nix/store/fj1xilxbnb4bll73hw273vx999n22rwi-llvm-binutils-wrapper-19.1.7/bin/nm",
"objcopy": "/nix/store/fj1xilxbnb4bll73hw273vx999n22rwi-llvm-binutils-wrapper-19.1.7/bin/objcopy",
"objdump": "/nix/store/fj1xilxbnb4bll73hw273vx999n22rwi-llvm-binutils-wrapper-19.1.7/bin/objdump",
"strip": "/nix/store/fj1xilxbnb4bll73hw273vx999n22rwi-llvm-binutils-wrapper-19.1.7/bin/strip",
"c++filt": "/nix/store/fj1xilxbnb4bll73hw273vx999n22rwi-llvm-binutils-wrapper-19.1.7/bin/c++filt",
"parse_headers": "cc_wrapper.sh",
"validate_static_library": "validate_static_library.sh",
},
Expand Down
1 change: 1 addition & 0 deletions local-remote-execution/generated-cc/cc/armeabi_cc_toolchain_config.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ load(
"feature",
"tool_path",
)
load("@rules_cc//cc/common:cc_common.bzl", "cc_common")

def _impl(ctx):
toolchain_identifier = "stub_armeabi-v7a"
Expand Down
10 changes: 5 additions & 5 deletions local-remote-execution/generated-cc/cc/builtin_include_directory_paths
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
This file is generated by cc_configure and contains builtin include directories
that /nix/store/yrw9cinlqgg9hfd22n0a5z596ir27v10-customClang/bin/customClang reported. This file is a dependency of every compilation action and
that /nix/store/6dysvsc6y6yq3dii7lbixbkan6pmi58x-customClang/bin/customClang reported. This file is a dependency of every compilation action and
changes to it will be reflected in the action cache key. When some of these
paths change, Bazel will make sure to rerun the action, even though none of
declared action inputs or the action commandline changes.

/nix/store/pcknhp59jx07gclcx5pgpckk75zz0q2p-clang-wrapper-19.1.7/resource-root/include
/nix/store/6aci60gk5wj4bjj1rygzbkc6ximmsm17-glibc-2.40-66-dev/include
/nix/store/pcknhp59jx07gclcx5pgpckk75zz0q2p-clang-wrapper-19.1.7/resource-root/share
/nix/store/hvska22z27wrdhwv5ciraamghmyqvbby-libcxx-19.1.7-dev/include/c++/v1
/nix/store/i45c42749c7rkbv4idawbr9m4phi2c6h-clang-wrapper-19.1.7/resource-root/include
/nix/store/5djq7mrpqv8kzn2xi22y5d8ww7rsix82-glibc-2.40-66-dev/include
/nix/store/i45c42749c7rkbv4idawbr9m4phi2c6h-clang-wrapper-19.1.7/resource-root/share
/nix/store/47jmi5pvn8xh447nz99n3nicy9fi831v-libcxx-19.1.7-dev/include/c++/v1
/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
1 change: 1 addition & 0 deletions local-remote-execution/generated-cc/cc/cc_toolchain_config.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ load(
"variable_with_value",
"with_feature_set",
)
load("@rules_cc//cc/common:cc_common.bzl", "cc_common")

def _target_os_version(ctx):
platform_type = ctx.fragments.apple.single_arch_platform.platform_type
Expand Down
4 changes: 2 additions & 2 deletions local-remote-execution/generated-cc/cc/cc_wrapper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/nix/store/b0szb1r3cyih06nlzip0ywrxk33lqdsm-bash/bin/bash
#!/nix/store/9qqbpbs3rkkiifi3yfq4ghcbc4p2n906-bash/bin/bash
#
# Copyright 2015 The Bazel Authors. All rights reserved.
#
Expand Down Expand Up @@ -46,7 +46,7 @@ done


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

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