Skip to content

Commit

Permalink
Update nix environment (TraceMachina#830)
Browse files Browse the repository at this point in the history
- Rebuild LRE toolchains
- libcxxabi has been merged into libcxx
- Fix an issue where nix2container wasn't compatible with new nixpkgs
  versions due to the use of outdated `vendorSha256` in a go module
- Bump pre-commit python version from 3.11 to 3.12
- Migrate outdated vale config from flake.nix to pre-commit-hooks.nix
- Migrate outdated rustfmt pre-commit overrides to a cleaner new
  implementation
  • Loading branch information
aaronmondal authored Apr 4, 2024
1 parent b61142d commit 6b9e68e
Show file tree
Hide file tree
Showing 11 changed files with 2,751 additions and 2,749 deletions.
54 changes: 27 additions & 27 deletions flake.lock

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

12 changes: 2 additions & 10 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
cargoExtraArgs = "--features enable_tokio_console";
});

hooks = import ./tools/pre-commit-hooks.nix {inherit pkgs;};
hooks = import ./tools/pre-commit-hooks.nix {inherit pkgs nightly-rust;};

publish-ghcr = import ./tools/publish-ghcr.nix {inherit pkgs;};

Expand Down Expand Up @@ -203,15 +203,7 @@
# partitionType = "count";
# });
};
pre-commit.settings = {
inherit hooks;
settings.vale.configPath = ".vale.ini";
tools = let
mkOverrideTools = pkgs.lib.mkOverride (pkgs.lib.modules.defaultOverridePriority - 1);
in {
rustfmt = mkOverrideTools nightly-rust.rustfmt;
};
};
pre-commit.settings = {inherit hooks;};
devShells.default = pkgs.mkShell {
nativeBuildInputs =
[
Expand Down
36 changes: 17 additions & 19 deletions local-remote-execution/generated-cc/cc/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -111,26 +111,24 @@ cc_toolchain_config(
coverage_link_flags = ["--coverage"],
cpu = "k8",
cxx_builtin_include_directories = [
"/nix/store/igy281mahis4jlc2igx99sbgmpnlgl2y-clang-wrapper-17.0.6/resource-root/include",
"/nix/store/p8h8p3ybvhd0j4yanmyr5ypzgqwg6z2n-glibc-2.38-44-dev/include",
"/nix/store/igy281mahis4jlc2igx99sbgmpnlgl2y-clang-wrapper-17.0.6/resource-root/share",
"/nix/store/n0h6pfvk0i85bv93931ic5sx39hssysq-libcxx-17.0.6-dev/include/c++/v1",
"/nix/store/7v16n13r9vgiwnwj23qz56npg63mgy4l-libcxxabi-17.0.6-dev/include/c++/v1",
"/nix/store/cpi0yf4yzc3sbzp9811r2m2kq4x5r505-clang-wrapper-17.0.6/resource-root/include",
"/nix/store/gzxqm8dyfirbysqjhh78ivam62ll0m87-glibc-2.39-5-dev/include",
"/nix/store/cpi0yf4yzc3sbzp9811r2m2kq4x5r505-clang-wrapper-17.0.6/resource-root/share",
"/nix/store/2f8iy8mibi3iiia3hc0n5js7q3qgn507-libcxx-17.0.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 = [
"-B/nix/store/m92gymzm3qanxhx305kc9rm0ipbwmzk9-customClang/bin",
"-B/nix/store/szfgx11qy95a7dxps3nxla227xrlb1dl-binutils-wrapper-2.41/bin",
"-B/nix/store/qlc1ljb5gahlb35j9ih849qhzivz884j-customClang/bin",
"-B/nix/store/5jml72v19dbbh6as05ivqxr6wpz8sxaf-binutils-wrapper-2.41/bin",
"-Wl,-no-as-needed",
"-Wl,-z,relro,-z,now",
"-L/nix/store/k71dkm5c0z3mrl928q93npb1zh14yzbk-libcxx-17.0.6/lib",
"-L/nix/store/adbx0ayl8r9ccghksf8dmq2aiq391cab-libcxxabi-17.0.6/lib",
"-L/nix/store/w3fpiryzpl7gdfskr754c5gkk3sm8qki-libunwind-17.0.6/lib",
"-L/nix/store/q28x84h4npmmwycq44481sir5m9jnv96-libcxx-17.0.6/lib",
"-L/nix/store/m5zjncsr1nb8c9wwvbg4d7lhhph94l9a-libunwind-17.0.6/lib",
"-lc++",
"-Wl,-rpath,/nix/store/k71dkm5c0z3mrl928q93npb1zh14yzbk-libcxx-17.0.6/lib,-rpath,/nix/store/adbx0ayl8r9ccghksf8dmq2aiq391cab-libcxxabi-17.0.6/lib,-rpath,/nix/store/w3fpiryzpl7gdfskr754c5gkk3sm8qki-libunwind-17.0.6/lib,-rpath,/nix/store/ksk3rnb0ljx8gngzk19jlmbjyvac4hw6-glibc-2.38-44/lib",
"-Wl,-rpath,/nix/store/q28x84h4npmmwycq44481sir5m9jnv96-libcxx-17.0.6/lib,-rpath,/nix/store/m5zjncsr1nb8c9wwvbg4d7lhhph94l9a-libunwind-17.0.6/lib,-rpath,/nix/store/ddwyrxif62r8n6xclvskjyy6szdhvj60-glibc-2.39-5/lib",
],
link_libs = [
"-Wl,--push-state,-as-needed",
Expand All @@ -153,18 +151,18 @@ cc_toolchain_config(
target_libc = "glibc_2.35",
target_system_name = "local",
tool_paths = {
"ar": "/nix/store/szfgx11qy95a7dxps3nxla227xrlb1dl-binutils-wrapper-2.41/bin/ar",
"ld": "/nix/store/szfgx11qy95a7dxps3nxla227xrlb1dl-binutils-wrapper-2.41/bin/ld",
"ar": "/nix/store/5jml72v19dbbh6as05ivqxr6wpz8sxaf-binutils-wrapper-2.41/bin/ar",
"ld": "/nix/store/5jml72v19dbbh6as05ivqxr6wpz8sxaf-binutils-wrapper-2.41/bin/ld",
"llvm-cov": "None",
"llvm-profdata": "None",
"cpp": "/usr/bin/cpp",
"gcc": "/nix/store/m92gymzm3qanxhx305kc9rm0ipbwmzk9-customClang/bin/customClang",
"dwp": "/nix/store/szfgx11qy95a7dxps3nxla227xrlb1dl-binutils-wrapper-2.41/bin/dwp",
"gcc": "/nix/store/qlc1ljb5gahlb35j9ih849qhzivz884j-customClang/bin/customClang",
"dwp": "/nix/store/5jml72v19dbbh6as05ivqxr6wpz8sxaf-binutils-wrapper-2.41/bin/dwp",
"gcov": "None",
"nm": "/nix/store/szfgx11qy95a7dxps3nxla227xrlb1dl-binutils-wrapper-2.41/bin/nm",
"objcopy": "/nix/store/szfgx11qy95a7dxps3nxla227xrlb1dl-binutils-wrapper-2.41/bin/objcopy",
"objdump": "/nix/store/szfgx11qy95a7dxps3nxla227xrlb1dl-binutils-wrapper-2.41/bin/objdump",
"strip": "/nix/store/szfgx11qy95a7dxps3nxla227xrlb1dl-binutils-wrapper-2.41/bin/strip",
"nm": "/nix/store/5jml72v19dbbh6as05ivqxr6wpz8sxaf-binutils-wrapper-2.41/bin/nm",
"objcopy": "/nix/store/5jml72v19dbbh6as05ivqxr6wpz8sxaf-binutils-wrapper-2.41/bin/objcopy",
"objdump": "/nix/store/5jml72v19dbbh6as05ivqxr6wpz8sxaf-binutils-wrapper-2.41/bin/objdump",
"strip": "/nix/store/5jml72v19dbbh6as05ivqxr6wpz8sxaf-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,12 +1,11 @@
This file is generated by cc_configure and contains builtin include directories
that /nix/store/m92gymzm3qanxhx305kc9rm0ipbwmzk9-customClang/bin/customClang reported. This file is a dependency of every compilation action and
that /nix/store/qlc1ljb5gahlb35j9ih849qhzivz884j-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/igy281mahis4jlc2igx99sbgmpnlgl2y-clang-wrapper-17.0.6/resource-root/include
/nix/store/p8h8p3ybvhd0j4yanmyr5ypzgqwg6z2n-glibc-2.38-44-dev/include
/nix/store/igy281mahis4jlc2igx99sbgmpnlgl2y-clang-wrapper-17.0.6/resource-root/share
/nix/store/n0h6pfvk0i85bv93931ic5sx39hssysq-libcxx-17.0.6-dev/include/c++/v1
/nix/store/7v16n13r9vgiwnwj23qz56npg63mgy4l-libcxxabi-17.0.6-dev/include/c++/v1
/nix/store/cpi0yf4yzc3sbzp9811r2m2kq4x5r505-clang-wrapper-17.0.6/resource-root/include
/nix/store/gzxqm8dyfirbysqjhh78ivam62ll0m87-glibc-2.39-5-dev/include
/nix/store/cpi0yf4yzc3sbzp9811r2m2kq4x5r505-clang-wrapper-17.0.6/resource-root/share
/nix/store/2f8iy8mibi3iiia3hc0n5js7q3qgn507-libcxx-17.0.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/mqc7dqwp046lh41dhs7r7q7192zbliwd-bash/bin/bash
#!/nix/store/d6whrqnkcsqkb2lz21cp5lpc1k15i5j0-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/m92gymzm3qanxhx305kc9rm0ipbwmzk9-customClang/bin/customClang "$@"
/nix/store/qlc1ljb5gahlb35j9ih849qhzivz884j-customClang/bin/customClang "$@"
Loading

0 comments on commit 6b9e68e

Please sign in to comment.