Skip to content

Commit

Permalink
Bump flake and Bazel modules (TraceMachina#947)
Browse files Browse the repository at this point in the history
  • Loading branch information
aaronmondal authored May 31, 2024
1 parent 80af57f commit 0eed759
Show file tree
Hide file tree
Showing 12 changed files with 2,796 additions and 2,788 deletions.
10 changes: 0 additions & 10 deletions .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,6 @@ linters:
enable-all: true
disable:
# Deprecated.
- nosnakecase
- interfacer
- exhaustivestruct
- ifshort
- deadcode
- varcheck
- golint
- maligned
- scopelint
- structcheck
- execinquery
- gomnd

Expand Down
6 changes: 3 additions & 3 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module(

bazel_dep(name = "rules_cc", version = "0.0.9")
bazel_dep(name = "platforms", version = "0.0.10")
bazel_dep(name = "rules_python", version = "0.32.1")
bazel_dep(name = "rules_python", version = "0.32.2")

python = use_extension("@rules_python//python/extensions:python.bzl", "python")
python.toolchain(
Expand All @@ -18,7 +18,7 @@ python.toolchain(
)
use_repo(python, python = "python_versions")

bazel_dep(name = "rules_rust", version = "0.44.0")
bazel_dep(name = "rules_rust", version = "0.45.1")

rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
rust.toolchain(
Expand Down Expand Up @@ -69,7 +69,7 @@ crate.from_cargo(
)
use_repo(crate, "crates")

bazel_dep(name = "protobuf", version = "26.0.bcr.1")
bazel_dep(name = "protobuf", version = "27.0")

# Local remote execution.
bazel_dep(name = "local-remote-execution", version = "0.0.0")
Expand Down
82 changes: 40 additions & 42 deletions flake.lock

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

13 changes: 8 additions & 5 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-parts.url = "github:hercules-ci/flake-parts";
flake-utils.url = "github:numtide/flake-utils";
pre-commit-hooks = {
url = "github:cachix/pre-commit-hooks.nix";
git-hooks = {
url = "github:cachix/git-hooks.nix";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
rust-overlay = {
url = "github:oxalica/rust-overlay";
Expand Down Expand Up @@ -40,7 +40,7 @@
"aarch64-darwin"
];
imports = [
inputs.pre-commit-hooks.flakeModule
inputs.git-hooks.flakeModule
./local-remote-execution/flake-module.nix
];
perSystem = {
Expand Down Expand Up @@ -164,7 +164,10 @@
nixpkgs-patched = (import self.inputs.nixpkgs {inherit system;}).applyPatches {
name = "nixpkgs-patched";
src = self.inputs.nixpkgs;
patches = [./tools/nixpkgs_link_libunwind_and_libcxx.diff];
patches = [
./tools/nixpkgs_link_libunwind_and_libcxx.diff
./tools/nixpkgs_disable_ratehammering_pulumi_tests.diff
];
};
in
import nixpkgs-patched {
Expand Down
28 changes: 14 additions & 14 deletions local-remote-execution/generated-cc/cc/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -111,18 +111,18 @@ cc_toolchain_config(
coverage_link_flags = ["--coverage"],
cpu = "k8",
cxx_builtin_include_directories = [
"/nix/store/5ark5p94q2nwni9rkq9zqnfsyfv9y50w-clang-wrapper-18.1.5/resource-root/include",
"/nix/store/s3pvsv4as7mc8i2nwnk2hnsyi2qdj4bq-glibc-2.39-31-dev/include",
"/nix/store/5ark5p94q2nwni9rkq9zqnfsyfv9y50w-clang-wrapper-18.1.5/resource-root/share",
"/nix/store/csml9b5w7z51yc7hxgd2ax4m6vj36iyq-libcxx-18.1.5-dev/include/c++/v1",
"/nix/store/ac2b2xv1mcry27sqyrx2468k08csk86j-clang-wrapper-18.1.6/resource-root/include",
"/nix/store/fwh4fxd747m0py3ib3s5abamia9nrf90-glibc-2.39-52-dev/include",
"/nix/store/ac2b2xv1mcry27sqyrx2468k08csk86j-clang-wrapper-18.1.6/resource-root/share",
"/nix/store/y2rz9qcspn84m0sca923z5v110y7xh8m-libcxx-18.1.6-dev/include/c++/v1",
"/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk",
],
cxx_flags = ["-std=c++14"],
dbg_compile_flags = ["-g"],
host_system_name = "x86_64-unknown-linux-gnu",
link_flags = [
"-fuse-ld=/nix/store/5ark5p94q2nwni9rkq9zqnfsyfv9y50w-clang-wrapper-18.1.5/bin/ld.mold",
"-B/nix/store/d6x389rgl2x9b6dkwxc71grbzgmkr28c-customClang/bin",
"-fuse-ld=/nix/store/ac2b2xv1mcry27sqyrx2468k08csk86j-clang-wrapper-18.1.6/bin/ld.mold",
"-B/nix/store/vh8mhqfkwjxs1n24xxzwpz0wjd3lyn8c-customClang/bin",
"-Wl,-no-as-needed",
"-Wl,-z,relro,-z,now",
],
Expand All @@ -147,18 +147,18 @@ cc_toolchain_config(
target_libc = "glibc_2.35",
target_system_name = "local",
tool_paths = {
"ar": "/nix/store/bmmczrsfycv4rradx0cy95vw0fwx9sm7-binutils-wrapper-2.41/bin/ar",
"ld": "/nix/store/bmmczrsfycv4rradx0cy95vw0fwx9sm7-binutils-wrapper-2.41/bin/ld",
"ar": "/nix/store/y2psnv2l882cpskmgg8g1rw1580wyjv4-binutils-wrapper-2.41/bin/ar",
"ld": "/nix/store/y2psnv2l882cpskmgg8g1rw1580wyjv4-binutils-wrapper-2.41/bin/ld",
"llvm-cov": "None",
"llvm-profdata": "None",
"cpp": "/usr/bin/cpp",
"gcc": "/nix/store/d6x389rgl2x9b6dkwxc71grbzgmkr28c-customClang/bin/customClang",
"dwp": "/nix/store/bmmczrsfycv4rradx0cy95vw0fwx9sm7-binutils-wrapper-2.41/bin/dwp",
"gcc": "/nix/store/vh8mhqfkwjxs1n24xxzwpz0wjd3lyn8c-customClang/bin/customClang",
"dwp": "/nix/store/y2psnv2l882cpskmgg8g1rw1580wyjv4-binutils-wrapper-2.41/bin/dwp",
"gcov": "None",
"nm": "/nix/store/bmmczrsfycv4rradx0cy95vw0fwx9sm7-binutils-wrapper-2.41/bin/nm",
"objcopy": "/nix/store/bmmczrsfycv4rradx0cy95vw0fwx9sm7-binutils-wrapper-2.41/bin/objcopy",
"objdump": "/nix/store/bmmczrsfycv4rradx0cy95vw0fwx9sm7-binutils-wrapper-2.41/bin/objdump",
"strip": "/nix/store/bmmczrsfycv4rradx0cy95vw0fwx9sm7-binutils-wrapper-2.41/bin/strip",
"nm": "/nix/store/y2psnv2l882cpskmgg8g1rw1580wyjv4-binutils-wrapper-2.41/bin/nm",
"objcopy": "/nix/store/y2psnv2l882cpskmgg8g1rw1580wyjv4-binutils-wrapper-2.41/bin/objcopy",
"objdump": "/nix/store/y2psnv2l882cpskmgg8g1rw1580wyjv4-binutils-wrapper-2.41/bin/objdump",
"strip": "/nix/store/y2psnv2l882cpskmgg8g1rw1580wyjv4-binutils-wrapper-2.41/bin/strip",
},
toolchain_identifier = "local",
unfiltered_compile_flags = [
Expand Down
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/d6x389rgl2x9b6dkwxc71grbzgmkr28c-customClang/bin/customClang reported. This file is a dependency of every compilation action and
that /nix/store/vh8mhqfkwjxs1n24xxzwpz0wjd3lyn8c-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/5ark5p94q2nwni9rkq9zqnfsyfv9y50w-clang-wrapper-18.1.5/resource-root/include
/nix/store/s3pvsv4as7mc8i2nwnk2hnsyi2qdj4bq-glibc-2.39-31-dev/include
/nix/store/5ark5p94q2nwni9rkq9zqnfsyfv9y50w-clang-wrapper-18.1.5/resource-root/share
/nix/store/csml9b5w7z51yc7hxgd2ax4m6vj36iyq-libcxx-18.1.5-dev/include/c++/v1
/nix/store/ac2b2xv1mcry27sqyrx2468k08csk86j-clang-wrapper-18.1.6/resource-root/include
/nix/store/fwh4fxd747m0py3ib3s5abamia9nrf90-glibc-2.39-52-dev/include
/nix/store/ac2b2xv1mcry27sqyrx2468k08csk86j-clang-wrapper-18.1.6/resource-root/share
/nix/store/y2rz9qcspn84m0sca923z5v110y7xh8m-libcxx-18.1.6-dev/include/c++/v1
/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
4 changes: 2 additions & 2 deletions local-remote-execution/generated-cc/cc/cc_wrapper.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/nix/store/2qcpw337ayl2fgx0yylcb70gyr4751ri-bash/bin/bash
#!/nix/store/rrvpd603w99rkcpg6rg71yqypycwkk6n-bash/bin/bash
#
# Copyright 2015 The Bazel Authors. All rights reserved.
#
Expand All @@ -22,4 +22,4 @@ set -eu


# Call the C++ compiler
/nix/store/d6x389rgl2x9b6dkwxc71grbzgmkr28c-customClang/bin/customClang "$@"
/nix/store/vh8mhqfkwjxs1n24xxzwpz0wjd3lyn8c-customClang/bin/customClang "$@"
Loading

0 comments on commit 0eed759

Please sign in to comment.