Skip to content

Commit

Permalink
Update flake (TraceMachina#765)
Browse files Browse the repository at this point in the history
Fixes an issue where Nix uses the wrong cargo version on MacOS.
  • Loading branch information
aaronmondal authored Mar 15, 2024
1 parent e979e31 commit 63a01c5
Show file tree
Hide file tree
Showing 7 changed files with 2,718 additions and 2,718 deletions.
36 changes: 18 additions & 18 deletions flake.lock

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

38 changes: 19 additions & 19 deletions local-remote-execution/generated/cc/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -111,26 +111,26 @@ cc_toolchain_config(
coverage_link_flags = ["--coverage"],
cpu = "k8",
cxx_builtin_include_directories = [
"/nix/store/flk5h48wz96bs21y6dmrl2mj06bwn9vj-clang-wrapper-17.0.6/resource-root/include",
"/nix/store/b0s2lkf593r3585038ws4jd3lylf2wdx-glibc-2.38-44-dev/include",
"/nix/store/flk5h48wz96bs21y6dmrl2mj06bwn9vj-clang-wrapper-17.0.6/resource-root/share",
"/nix/store/xbfjfxh1vn0r3kkkjg8vb1cx9k6wn7kh-libcxx-17.0.6-dev/include/c++/v1",
"/nix/store/x3rf334c0vyyav3v3hn4n9si8bpap10d-libcxxabi-17.0.6-dev/include/c++/v1",
"/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",
"/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/d26sh1qib07cwb68zgqg0c9qg4hlphfq-customClang/bin",
"-B/nix/store/lq13hr5ljc61j6pf6ng8ip1g9j8p42x0-binutils-wrapper-2.40/bin",
"-B/nix/store/m92gymzm3qanxhx305kc9rm0ipbwmzk9-customClang/bin",
"-B/nix/store/szfgx11qy95a7dxps3nxla227xrlb1dl-binutils-wrapper-2.41/bin",
"-Wl,-no-as-needed",
"-Wl,-z,relro,-z,now",
"-L/nix/store/2ihfbfxbbvldj4vcj9c7yab0f29hdvq5-libcxx-17.0.6/lib",
"-L/nix/store/2iwlsp46wk2xyybw4sbn6fmvrwlv00nz-libcxxabi-17.0.6/lib",
"-L/nix/store/i9pz978lmlgkkq8gj0m2194jrl83r93r-libunwind-17.0.6/lib",
"-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",
"-lc++",
"-Wl,-rpath,/nix/store/2ihfbfxbbvldj4vcj9c7yab0f29hdvq5-libcxx-17.0.6/lib,-rpath,/nix/store/2iwlsp46wk2xyybw4sbn6fmvrwlv00nz-libcxxabi-17.0.6/lib,-rpath,/nix/store/i9pz978lmlgkkq8gj0m2194jrl83r93r-libunwind-17.0.6/lib,-rpath,/nix/store/8mc30d49ghc8m5z96yz39srlhg5s9sjj-glibc-2.38-44/lib",
"-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",
],
link_libs = [
"-Wl,--push-state,-as-needed",
Expand All @@ -153,18 +153,18 @@ cc_toolchain_config(
target_libc = "glibc_2.35",
target_system_name = "local",
tool_paths = {
"ar": "/nix/store/lq13hr5ljc61j6pf6ng8ip1g9j8p42x0-binutils-wrapper-2.40/bin/ar",
"ld": "/nix/store/lq13hr5ljc61j6pf6ng8ip1g9j8p42x0-binutils-wrapper-2.40/bin/ld",
"ar": "/nix/store/szfgx11qy95a7dxps3nxla227xrlb1dl-binutils-wrapper-2.41/bin/ar",
"ld": "/nix/store/szfgx11qy95a7dxps3nxla227xrlb1dl-binutils-wrapper-2.41/bin/ld",
"llvm-cov": "None",
"llvm-profdata": "None",
"cpp": "/usr/bin/cpp",
"gcc": "/nix/store/d26sh1qib07cwb68zgqg0c9qg4hlphfq-customClang/bin/customClang",
"dwp": "/nix/store/lq13hr5ljc61j6pf6ng8ip1g9j8p42x0-binutils-wrapper-2.40/bin/dwp",
"gcc": "/nix/store/m92gymzm3qanxhx305kc9rm0ipbwmzk9-customClang/bin/customClang",
"dwp": "/nix/store/szfgx11qy95a7dxps3nxla227xrlb1dl-binutils-wrapper-2.41/bin/dwp",
"gcov": "None",
"nm": "/nix/store/lq13hr5ljc61j6pf6ng8ip1g9j8p42x0-binutils-wrapper-2.40/bin/nm",
"objcopy": "/nix/store/lq13hr5ljc61j6pf6ng8ip1g9j8p42x0-binutils-wrapper-2.40/bin/objcopy",
"objdump": "/nix/store/lq13hr5ljc61j6pf6ng8ip1g9j8p42x0-binutils-wrapper-2.40/bin/objdump",
"strip": "/nix/store/lq13hr5ljc61j6pf6ng8ip1g9j8p42x0-binutils-wrapper-2.40/bin/strip",
"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",
},
toolchain_identifier = "local",
unfiltered_compile_flags = [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
This file is generated by cc_configure and contains builtin include directories
that /nix/store/d26sh1qib07cwb68zgqg0c9qg4hlphfq-customClang/bin/customClang reported. This file is a dependency of every compilation action and
that /nix/store/m92gymzm3qanxhx305kc9rm0ipbwmzk9-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/flk5h48wz96bs21y6dmrl2mj06bwn9vj-clang-wrapper-17.0.6/resource-root/include
/nix/store/b0s2lkf593r3585038ws4jd3lylf2wdx-glibc-2.38-44-dev/include
/nix/store/flk5h48wz96bs21y6dmrl2mj06bwn9vj-clang-wrapper-17.0.6/resource-root/share
/nix/store/xbfjfxh1vn0r3kkkjg8vb1cx9k6wn7kh-libcxx-17.0.6-dev/include/c++/v1
/nix/store/x3rf334c0vyyav3v3hn4n9si8bpap10d-libcxxabi-17.0.6-dev/include/c++/v1
/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
/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
4 changes: 2 additions & 2 deletions local-remote-execution/generated/cc/cc_wrapper.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/nix/store/xqi8qarda5vwn2zcp2yapqchnsi7mmax-bash/bin/bash
#!/nix/store/mqc7dqwp046lh41dhs7r7q7192zbliwd-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/d26sh1qib07cwb68zgqg0c9qg4hlphfq-customClang/bin/customClang "$@"
/nix/store/m92gymzm3qanxhx305kc9rm0ipbwmzk9-customClang/bin/customClang "$@"
Loading

0 comments on commit 63a01c5

Please sign in to comment.