merge: #3975

3975: build(deps): update Nix & Buck2 dependencies (2024-W24) r=fnichol a=fnichol This was last done in December 2023, however despite a *lot* of Buck2/prelude upstream changes, there was not a lot of local changes required. Note that this change updates all Nix software so there may be changes in build timings etc. (nothing that I've found to date to be of concern on both Linux and macOS). <img src="https://media1.giphy.com/media/Fn7EouKtFLHXhWKgFI/giphy.gif"/> Co-authored-by: Fletcher Nichol <[email protected]>
systeminit · Jun 12, 2024 · df52eb0 · df52eb0
2 parents cff0a48 + d9ddc59
commit df52eb0
Show file tree

Hide file tree

Showing 555 changed files with 21,545 additions and 9,140 deletions.
diff --git a/.buckconfig b/.buckconfig
@@ -1,12 +1,12 @@
-[repositories]
+[cells]
 root = .
 bxl = bxl
 prelude = prelude
 prelude-si = prelude-si
 toolchains = toolchains
 none = none
 
-[repository_aliases]
+[cell_aliases]
 buck = none
 config = prelude
 fbcode = none

diff --git a/flake.lock b/flake.lock
diff --git a/prelude-si/cargo.bzl b/prelude-si/cargo.bzl
@@ -8,7 +8,7 @@ load(
 )
 load(
     "@prelude//tests:re_utils.bzl",
-    "get_re_executor_from_props",
+    "get_re_executors_from_props",
 )
 load(
     "@prelude-si//:test.bzl",
@@ -34,7 +34,7 @@ def cargo_clippy_impl(ctx: AnalysisContext) -> list[[
     args_file = ctx.actions.write("cargo-clippy-args.txt", run_cmd_args)
 
     # Setup a RE executor based on the `remote_execution` param.
-    re_executor = get_re_executor_from_props(ctx)
+    re_executor, executor_overrides = get_re_executors_from_props(ctx)
 
     # We implicitly make the target run from the project root if remote
     # excution options were specified
@@ -51,6 +51,7 @@ def cargo_clippy_impl(ctx: AnalysisContext) -> list[[
             labels = ctx.attrs.labels,
             contacts = ctx.attrs.contacts,
             default_executor = re_executor,
+            executor_overrides = executor_overrides,
             run_from_project_root = run_from_project_root,
             use_project_relative_paths = run_from_project_root,
         ),
@@ -126,7 +127,7 @@ def cargo_check_impl(ctx: AnalysisContext) -> list[[
     args_file = ctx.actions.write("cargo-check-args.txt", run_cmd_args)
 
     # Setup a RE executor based on the `remote_execution` param.
-    re_executor = get_re_executor_from_props(ctx)
+    re_executor, executor_overrides = get_re_executors_from_props(ctx)
 
     # We implicitly make the target run from the project root if remote
     # excution options were specified
@@ -143,6 +144,7 @@ def cargo_check_impl(ctx: AnalysisContext) -> list[[
             labels = ctx.attrs.labels,
             contacts = ctx.attrs.contacts,
             default_executor = re_executor,
+            executor_overrides = executor_overrides,
             run_from_project_root = run_from_project_root,
             use_project_relative_paths = run_from_project_root,
         ),
@@ -225,7 +227,7 @@ def cargo_doc_check_impl(ctx: AnalysisContext) -> list[[
     run_cmd_args = cmd_args([script]).hidden(ctx.attrs.srcs)
 
     # Setup a RE executor based on the `remote_execution` param.
-    re_executor = get_re_executor_from_props(ctx)
+    re_executor, executor_overrides = get_re_executors_from_props(ctx)
 
     # We implicitly make the target run from the project root if remote
     # excution options were specified
@@ -242,6 +244,7 @@ def cargo_doc_check_impl(ctx: AnalysisContext) -> list[[
             labels = ctx.attrs.labels,
             contacts = ctx.attrs.contacts,
             default_executor = re_executor,
+            executor_overrides = executor_overrides,
             run_from_project_root = run_from_project_root,
             use_project_relative_paths = run_from_project_root,
         ),
@@ -312,7 +315,7 @@ def cargo_fmt_check_impl(ctx: AnalysisContext) -> list[[
     args_file = ctx.actions.write("cargo-fmt-args.txt", run_cmd_args)
 
     # Setup a RE executor based on the `remote_execution` param.
-    re_executor = get_re_executor_from_props(ctx)
+    re_executor, executor_overrides = get_re_executors_from_props(ctx)
 
     # We implicitly make the target run from the project root if remote
     # excution options were specified
@@ -329,6 +332,7 @@ def cargo_fmt_check_impl(ctx: AnalysisContext) -> list[[
             labels = ctx.attrs.labels,
             contacts = ctx.attrs.contacts,
             default_executor = re_executor,
+            executor_overrides = executor_overrides,
             run_from_project_root = run_from_project_root,
             use_project_relative_paths = run_from_project_root,
         ),

diff --git a/prelude-si/pnpm.bzl b/prelude-si/pnpm.bzl
@@ -20,7 +20,7 @@ load(
 )
 load(
     "@prelude//tests:re_utils.bzl",
-    "get_re_executor_from_props",
+    "get_re_executors_from_props",
 )
 load(
     "@prelude-si//:test.bzl",
@@ -74,7 +74,7 @@ def _npm_test_impl(
     args_file = ctx.actions.write("args.txt", run_cmd_args)
 
     # Setup a RE executor based on the `remote_execution` param.
-    re_executor = get_re_executor_from_props(ctx)
+    re_executor, executor_overrides = get_re_executors_from_props(ctx)
 
     # We implicitly make the target run from the project root if remote
     # excution options were specified
@@ -91,6 +91,7 @@ def _npm_test_impl(
             labels = ctx.attrs.labels,
             contacts = ctx.attrs.contacts,
             default_executor = re_executor,
+            executor_overrides = executor_overrides,
             run_from_project_root = run_from_project_root,
             use_project_relative_paths = run_from_project_root,
         ),
@@ -504,11 +505,11 @@ package_node_modules = rule(
     attrs = {
         "turbo": attrs.dep(
             providers = [RunInfo],
-            default = "//third-party/node/turbo:turbo",
+            default = "root//third-party/node/turbo:turbo",
             doc = """Turbo dependency.""",
         ),
         "pnpm_lock": attrs.source(
-            default = "//:pnpm-lock.yaml",
+            default = "root//:pnpm-lock.yaml",
             doc = """Workspace Pnpm lock file""",
         ),
         "package_name": attrs.option(
@@ -548,7 +549,7 @@ pnpm_lock = rule(
             doc = """pnpm-lock.yaml source.""",
         ),
         "pnpm_workspace": attrs.dep(
-            default = "//:pnpm-workspace.yaml",
+            default = "root//:pnpm-workspace.yaml",
             doc = """Pnpm Workspace dependency.""",
         ),
     },
@@ -880,7 +881,7 @@ workspace_node_modules = rule(
     impl = workspace_node_modules_impl,
     attrs = {
         "pnpm_lock": attrs.source(
-            default = "//:pnpm-lock.yaml",
+            default = "root//:pnpm-lock.yaml",
             doc = """Workspace Pnpm lock file""",
         ),
         "root_workspace": attrs.bool(

diff --git a/prelude-si/python.bzl b/prelude-si/python.bzl
@@ -20,7 +20,7 @@ load(
 )
 load(
     "@prelude//tests:re_utils.bzl",
-    "get_re_executor_from_props",
+    "get_re_executors_from_props",
 )
 load(
     "@prelude-si//:test.bzl",
@@ -59,7 +59,7 @@ def yapf_check_impl(ctx: AnalysisContext) -> list[[
     args_file = ctx.actions.write("args.txt", run_cmd_args)
 
     # Setup a RE executor based on the `remote_execution` param.
-    re_executor = get_re_executor_from_props(ctx)
+    re_executor, executor_overrides = get_re_executors_from_props(ctx)
 
     # We implicitly make the target run from the project root if remote
     # excution options were specified
@@ -76,6 +76,7 @@ def yapf_check_impl(ctx: AnalysisContext) -> list[[
             labels = ctx.attrs.labels,
             contacts = ctx.attrs.contacts,
             default_executor = re_executor,
+            executor_overrides = executor_overrides,
             run_from_project_root = run_from_project_root,
             use_project_relative_paths = run_from_project_root,
         ),

diff --git a/prelude-si/rust.bzl b/prelude-si/rust.bzl
@@ -16,7 +16,7 @@ load(
 )
 load(
     "@prelude//tests:re_utils.bzl",
-    "get_re_executor_from_props",
+    "get_re_executors_from_props",
 )
 load(
     "@prelude-si//:test.bzl",
@@ -41,7 +41,7 @@ def clippy_check_impl(ctx: AnalysisContext) -> list[[
     args_file = ctx.actions.write("args.txt", run_cmd_args)
 
     # Setup a RE executor based on the `remote_execution` param.
-    re_executor = get_re_executor_from_props(ctx)
+    re_executor, executor_overrides = get_re_executors_from_props(ctx)
 
     # We implicitly make the target run from the project root if remote
     # excution options were specified
@@ -58,6 +58,7 @@ def clippy_check_impl(ctx: AnalysisContext) -> list[[
             labels = ctx.attrs.labels,
             contacts = ctx.attrs.contacts,
             default_executor = re_executor,
+            executor_overrides = executor_overrides,
             run_from_project_root = run_from_project_root,
             use_project_relative_paths = run_from_project_root,
         ),
@@ -105,7 +106,7 @@ def rustfmt_check_impl(ctx: AnalysisContext) -> list[[
     args_file = ctx.actions.write("args.txt", run_cmd_args)
 
     # Setup a RE executor based on the `remote_execution` param.
-    re_executor = get_re_executor_from_props(ctx)
+    re_executor, executor_overrides = get_re_executors_from_props(ctx)
 
     # We implicitly make the target run from the project root if remote
     # excution options were specified
@@ -122,6 +123,7 @@ def rustfmt_check_impl(ctx: AnalysisContext) -> list[[
             labels = ctx.attrs.labels,
             contacts = ctx.attrs.contacts,
             default_executor = re_executor,
+            executor_overrides = executor_overrides,
             run_from_project_root = run_from_project_root,
             use_project_relative_paths = run_from_project_root,
         ),

diff --git a/prelude-si/shell.bzl b/prelude-si/shell.bzl
@@ -16,7 +16,7 @@ load(
 )
 load(
     "@prelude//tests:re_utils.bzl",
-    "get_re_executor_from_props",
+    "get_re_executors_from_props",
 )
 load(
     "@prelude-si//:test.bzl",
@@ -40,7 +40,7 @@ def shellcheck_impl(ctx: AnalysisContext) -> list[[
     args_file = ctx.actions.write("args.txt", run_cmd_args)
 
     # Setup a RE executor based on the `remote_execution` param.
-    re_executor = get_re_executor_from_props(ctx)
+    re_executor, executor_overrides = get_re_executors_from_props(ctx)
 
     # We implicitly make the target run from the project root if remote
     # excution options were specified
@@ -57,6 +57,7 @@ def shellcheck_impl(ctx: AnalysisContext) -> list[[
             labels = ctx.attrs.labels,
             contacts = ctx.attrs.contacts,
             default_executor = re_executor,
+            executor_overrides = executor_overrides,
             run_from_project_root = run_from_project_root,
             use_project_relative_paths = run_from_project_root,
         ),
@@ -100,7 +101,7 @@ def shfmt_check_impl(ctx: AnalysisContext) -> list[[
     args_file = ctx.actions.write("args.txt", run_cmd_args)
 
     # Setup a RE executor based on the `remote_execution` param.
-    re_executor = get_re_executor_from_props(ctx)
+    re_executor, executor_overrides = get_re_executors_from_props(ctx)
 
     # We implicitly make the target run from the project root if remote
     # excution options were specified
@@ -117,6 +118,7 @@ def shfmt_check_impl(ctx: AnalysisContext) -> list[[
             labels = ctx.attrs.labels,
             contacts = ctx.attrs.contacts,
             default_executor = re_executor,
+            executor_overrides = executor_overrides,
             run_from_project_root = run_from_project_root,
             use_project_relative_paths = run_from_project_root,
         ),

diff --git a/prelude/.buckconfig b/prelude/.buckconfig
@@ -5,17 +5,6 @@ prelude = .
 # but our custom config format (yuk) doesn't accept inline comments.
 # Therefore, we hide the name of the group when not open source.
 
-[not_repositories] # @oss-enable
-fbcode = ../..
-fbsource = ../../..
-ovr_config = ../../../arvr/tools/build_defs/config
-bazel_skylib = ../../../third-party/bazel-skylib
-fbcode_macros = ../../../tools/build_defs/fbcode_macros
-fbobjc_dylibs = ../../../tools/build_defs/fbobjc_dylibs
-buck = ../../../xplat/build_infra/buck_client
-buck_bazel_skylib = ../../../xplat/build_infra/buck_client/third-party/skylark/bazel-skylib
-toolchains = ../toolchains
-
 [repository_aliases]
 [not_repository_aliases] # @oss-enable
 config = ovr_config

diff --git a/prelude/BUCK b/prelude/BUCK
@@ -1,7 +1,10 @@
+load("@prelude//utils:source_listing.bzl", "source_listing")
 load(":native.bzl", prelude = "native")
 
 oncall("build_infra")
 
+source_listing()
+
 # Done to avoid triggering a lint rule that replaces glob with an fbcode macro
 globby = glob
 

diff --git a/prelude/CHANGELOG.md b/prelude/CHANGELOG.md
@@ -1,3 +1,3 @@
 # Buck2 Prelude
 
-* Initial version.
+- Initial version.
diff --git a/prelude/CONTRIBUTING.md b/prelude/CONTRIBUTING.md
@@ -1,15 +1,16 @@
 # Contributing to Buck2 Prelude
 
-This repository is a subset of <https://github.com/facebook/buck2>.
-You can contribute to either that repo, or this repo - changes will be mirrored to both.
+This repository is a subset of <https://github.com/facebook/buck2>. You can
+contribute to either that repo, or this repo - changes will be mirrored to both.
 
-We want to make contributing to this project as easy and transparent as possible.
+We want to make contributing to this project as easy and transparent as
+possible.
 
 ## Our Development Process
 
-Buck2 Prelude is currently developed in Facebook's internal repositories and then exported
-out to GitHub by a Facebook team member; however, we invite you to submit pull
-requests as described below.
+Buck2 Prelude is currently developed in Facebook's internal repositories and
+then exported out to GitHub by a Facebook team member; however, we invite you to
+submit pull requests as described below.
 
 ## Pull Requests
 
@@ -45,5 +46,6 @@ We use several Python formatters.
 ## License
 
 By contributing to Buck2 Prelude, you agree that your contributions will be
-licensed under both the [LICENSE-MIT](LICENSE-MIT) and [LICENSE-APACHE](LICENSE-APACHE)
-files in the root directory of this source tree.
+licensed under both the [LICENSE-MIT](LICENSE-MIT) and
+[LICENSE-APACHE](LICENSE-APACHE) files in the root directory of this source
+tree.
diff --git a/prelude/README.md b/prelude/README.md
@@ -1,12 +1,16 @@
 # Buck2 Prelude
 
-This repo contains a copy of the Buck2 Prelude, which is often included as a submodule with a Buck2 project.
-To obtain a copy of this repo, and set up other details of a Buck2, you should usually run `buck2 init --git`.
-Most information can be found on the main [Buck2 GitHub project](https://github.com/facebook/buck2).
+This repo contains a copy of the Buck2 Prelude, which is often included as a
+submodule with a Buck2 project. To obtain a copy of this repo, and set up other
+details of a Buck2, you should usually run `buck2 init --git`. Most information
+can be found on the main
+[Buck2 GitHub project](https://github.com/facebook/buck2).
 
-Pull requests and issues should be raised at [facebook/buck2](https://github.com/facebook/buck2) as that project
-is more closely monitored and contains CI checks.
+Pull requests and issues should be raised at
+[facebook/buck2](https://github.com/facebook/buck2) as that project is more
+closely monitored and contains CI checks.
 
 ## License
 
-Buck2 Prelude is both MIT and Apache License, Version 2.0 licensed, as found in the [LICENSE-MIT](LICENSE-MIT) and [LICENSE-APACHE](LICENSE-APACHE) files.
+Buck2 Prelude is both MIT and Apache License, Version 2.0 licensed, as found in
+the [LICENSE-MIT](LICENSE-MIT) and [LICENSE-APACHE](LICENSE-APACHE) files.