Skip to content

Update nixpkgs so we can drop our patched renovate #2537

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

Merged
palfrey merged 1 commit into from
Jul 13, 2026
Merged

Update nixpkgs so we can drop our patched renovate #2537

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
18 changes: 9 additions & 9 deletions MODULE.bazel.lock
View file
Open in desktop

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

6 changes: 3 additions & 3 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.

3 changes: 1 addition & 2 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,6 @@
hooks = import ./tools/pre-commit-hooks.nix {
inherit pkgs;
inherit (packages) generate-bazel-rc generate-stores-config;
renovate-patched = pkgs.callPackage ./tools/renovate.nix {};
nightly-rust = pkgs.rust-bin.nightly.${pkgs.lre.nightly-rust.meta.version};
};
};
Expand Down Expand Up @@ -606,7 +605,7 @@
export CC=clang
export PULUMI_K8S_AWAIT_ALL=true
export PLAYWRIGHT_BROWSERS_PATH=${pkgs.playwright-driver.browsers}
export PLAYWRIGHT_NODEJS_PATH=${pkgs.nodePackages_latest.nodejs}
export PLAYWRIGHT_NODEJS_PATH=${pkgs.nodejs}

@palfrey palfrey Jul 9, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because of NixOS/nixpkgs#489959

''
# TODO(palfrey): Generalize this.
+ pkgs.lib.optionalString (system == "x86_64-linux") ''
Expand Down
30 changes: 15 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 @@ -122,10 +122,10 @@ cc_toolchain_config(
coverage_link_flags = ["--coverage"],
cpu = "k8",
cxx_builtin_include_directories = [
"/nix/store/mg0lv9jhy5kr3ra9dya3yps5p8qd5mkn-clang-wrapper-22.1.0-rc3/resource-root/include",
"/nix/store/h0ip0h6qp7kc2wm7mwjaglkxxbzmjri4-glibc-2.42-51-dev/include",
"/nix/store/mg0lv9jhy5kr3ra9dya3yps5p8qd5mkn-clang-wrapper-22.1.0-rc3/resource-root/share",
"/nix/store/3vsjx6pixhgk4kl69yhwbjrm9khfr7zp-libcxx-22.1.0-rc3-dev/include/c++/v1",
"/nix/store/h590aa9zij6n1kimlnj9fyh038rmj396-clang-wrapper-22.1.8/resource-root/include",
"/nix/store/q5wv2ldpcv5w8yb2wmsngsygvlxb73fk-glibc-2.42-67-dev/include",
"/nix/store/h590aa9zij6n1kimlnj9fyh038rmj396-clang-wrapper-22.1.8/resource-root/share",
"/nix/store/pqgwpyp04mcvfd468imrcxwyagbklw03-libcxx-22.1.8-dev/include/c++/v1",
"/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk",
],
cxx_flags = ["-std=c++14"],
Expand All @@ -136,8 +136,8 @@ cc_toolchain_config(
]},
host_system_name = "x86_64-unknown-linux-gnu",
link_flags = [
"-fuse-ld=/nix/store/lrp069m8jb7gm0xaj8ww4gp37zwczc0z-llvm-binutils-wrapper-22.1.0-rc3/bin/ld.mold",
"-B/nix/store/5b69ajvn84dh0hyick8l3s0fl51kv776-customClang/bin",
"-fuse-ld=/nix/store/c5z0kxmshkd2j8bflq22ya45f7fssn0l-llvm-binutils-wrapper-22.1.8/bin/ld.mold",
"-B/nix/store/n4rzbc1y6z5dj0wr884rmn85lz0dfi1l-customClang/bin",
"-Wl,-no-as-needed",
"-Wl,-z,relro,-z,now",
],
Expand All @@ -162,19 +162,19 @@ cc_toolchain_config(
target_libc = "glibc_2.38",
target_system_name = "local",
tool_paths = {
"ar": "/nix/store/lrp069m8jb7gm0xaj8ww4gp37zwczc0z-llvm-binutils-wrapper-22.1.0-rc3/bin/ar",
"ld": "/nix/store/lrp069m8jb7gm0xaj8ww4gp37zwczc0z-llvm-binutils-wrapper-22.1.0-rc3/bin/ld",
"ar": "/nix/store/c5z0kxmshkd2j8bflq22ya45f7fssn0l-llvm-binutils-wrapper-22.1.8/bin/ar",
"ld": "/nix/store/c5z0kxmshkd2j8bflq22ya45f7fssn0l-llvm-binutils-wrapper-22.1.8/bin/ld",
"llvm-cov": "None",
"llvm-profdata": "None",
"cpp": "/usr/bin/cpp",
"gcc": "/nix/store/5b69ajvn84dh0hyick8l3s0fl51kv776-customClang/bin/customClang",
"dwp": "/nix/store/lrp069m8jb7gm0xaj8ww4gp37zwczc0z-llvm-binutils-wrapper-22.1.0-rc3/bin/dwp",
"gcc": "/nix/store/n4rzbc1y6z5dj0wr884rmn85lz0dfi1l-customClang/bin/customClang",
"dwp": "/nix/store/c5z0kxmshkd2j8bflq22ya45f7fssn0l-llvm-binutils-wrapper-22.1.8/bin/dwp",
"gcov": "None",
"nm": "/nix/store/lrp069m8jb7gm0xaj8ww4gp37zwczc0z-llvm-binutils-wrapper-22.1.0-rc3/bin/nm",
"objcopy": "/nix/store/lrp069m8jb7gm0xaj8ww4gp37zwczc0z-llvm-binutils-wrapper-22.1.0-rc3/bin/objcopy",
"objdump": "/nix/store/lrp069m8jb7gm0xaj8ww4gp37zwczc0z-llvm-binutils-wrapper-22.1.0-rc3/bin/objdump",
"strip": "/nix/store/lrp069m8jb7gm0xaj8ww4gp37zwczc0z-llvm-binutils-wrapper-22.1.0-rc3/bin/strip",
"c++filt": "/nix/store/lrp069m8jb7gm0xaj8ww4gp37zwczc0z-llvm-binutils-wrapper-22.1.0-rc3/bin/c++filt",
"nm": "/nix/store/c5z0kxmshkd2j8bflq22ya45f7fssn0l-llvm-binutils-wrapper-22.1.8/bin/nm",
"objcopy": "/nix/store/c5z0kxmshkd2j8bflq22ya45f7fssn0l-llvm-binutils-wrapper-22.1.8/bin/objcopy",
"objdump": "/nix/store/c5z0kxmshkd2j8bflq22ya45f7fssn0l-llvm-binutils-wrapper-22.1.8/bin/objdump",
"strip": "/nix/store/c5z0kxmshkd2j8bflq22ya45f7fssn0l-llvm-binutils-wrapper-22.1.8/bin/strip",
"c++filt": "/nix/store/c5z0kxmshkd2j8bflq22ya45f7fssn0l-llvm-binutils-wrapper-22.1.8/bin/c++filt",
"parse_headers": "cc_wrapper.sh",
"validate_static_library": "validate_static_library.sh",
},
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/5b69ajvn84dh0hyick8l3s0fl51kv776-customClang/bin/customClang reported. This file is a dependency of every compilation action and
that /nix/store/n4rzbc1y6z5dj0wr884rmn85lz0dfi1l-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/mg0lv9jhy5kr3ra9dya3yps5p8qd5mkn-clang-wrapper-22.1.0-rc3/resource-root/include
/nix/store/h0ip0h6qp7kc2wm7mwjaglkxxbzmjri4-glibc-2.42-51-dev/include
/nix/store/mg0lv9jhy5kr3ra9dya3yps5p8qd5mkn-clang-wrapper-22.1.0-rc3/resource-root/share
/nix/store/3vsjx6pixhgk4kl69yhwbjrm9khfr7zp-libcxx-22.1.0-rc3-dev/include/c++/v1
/nix/store/h590aa9zij6n1kimlnj9fyh038rmj396-clang-wrapper-22.1.8/resource-root/include
/nix/store/q5wv2ldpcv5w8yb2wmsngsygvlxb73fk-glibc-2.42-67-dev/include
/nix/store/h590aa9zij6n1kimlnj9fyh038rmj396-clang-wrapper-22.1.8/resource-root/share
/nix/store/pqgwpyp04mcvfd468imrcxwyagbklw03-libcxx-22.1.8-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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/nix/store/i7hwka78f6i34v4r211ynr6nnafcba7f-bash/bin/bash
#!/nix/store/x4xf1dbpn5q4lkx1a5c9mxy5300gacc1-bash/bin/bash
#
# Copyright 2015 The Bazel Authors. All rights reserved.
#
Expand Down Expand Up @@ -44,7 +44,7 @@ done
# Set-up the environment

# Call the C++ compiler
/nix/store/5b69ajvn84dh0hyick8l3s0fl51kv776-customClang/bin/customClang "$@"
/nix/store/n4rzbc1y6z5dj0wr884rmn85lz0dfi1l-customClang/bin/customClang "$@"

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