Merge pull request #2187 from tweag/renovate/com_github_bazelbuild_bu…

…ildtools-7.x chore(deps): update dependency com_github_bazelbuild_buildtools to v7
tweag · May 8, 2024 · 45350c7 · 45350c7
2 parents a952c7b + 6d0d822
commit 45350c7
Show file tree

Hide file tree

Showing 70 changed files with 273 additions and 281 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -59,14 +59,15 @@ load("//extensions:rules_haskell_dependencies.bzl", _repositories_3 = "repositor
 
 _repositories_3(bzlmod = False)
 
-load("@rules_haskell_ghc_version//:ghc_version.bzl", "GHC_VERSION")
 load(
     "@rules_haskell//haskell:ghc_bindist.bzl",
     "haskell_register_ghc_bindists",
 )
+load("@rules_haskell_ghc_version//:ghc_version.bzl", "GHC_VERSION")
 
 haskell_register_ghc_bindists(version = GHC_VERSION)
 
+load("@os_info//:os_info.bzl", "is_nix_shell", "is_windows")
 load(
     "@rules_haskell//haskell/asterius:repositories.bzl",
     "asterius_dependencies_bindist",
@@ -76,7 +77,6 @@ load(
     "@rules_nixpkgs_core//:nixpkgs.bzl",
     "nixpkgs_package",
 )
-load("@os_info//:os_info.bzl", "is_nix_shell", "is_windows")
 
 asterius_dependencies_nix(
     nix_repository = "@nixpkgs_default",

diff --git a/docs/BUILD.bazel b/docs/BUILD.bazel
@@ -1,8 +1,8 @@
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
 load("@io_bazel_stardoc//stardoc:stardoc.bzl", "stardoc")
-load("@rules_python//python:defs.bzl", "py_binary")
 load("@rules_haskell//docs/pandoc:pandoc.bzl", "set_site_end_location")
-load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
+load("@rules_python//python:defs.bzl", "py_binary")
 
 bool_flag(
     name = "render_dev_website",

diff --git a/examples/arm/BUILD.bazel b/examples/arm/BUILD.bazel
@@ -1,12 +1,12 @@
-package(default_visibility = ["//visibility:public"])
-
 load(
     "@rules_haskell//haskell:defs.bzl",
     "haskell_binary",
     "haskell_library",
     "haskell_toolchain_library",
 )
 
+package(default_visibility = ["//visibility:public"])
+
 haskell_toolchain_library(name = "base")
 
 haskell_toolchain_library(name = "template-haskell")

diff --git a/examples/arm/WORKSPACE b/examples/arm/WORKSPACE
@@ -20,12 +20,12 @@ load(
     "@rules_haskell//haskell:cabal.bzl",
     "stack_snapshot",
 )
+load("@rules_nixpkgs_cc//:cc.bzl", "nixpkgs_cc_configure")
 load(
     "@rules_nixpkgs_core//:nixpkgs.bzl",
     "nixpkgs_git_repository",
     "nixpkgs_package",
 )
-load("@rules_nixpkgs_cc//:cc.bzl", "nixpkgs_cc_configure")
 load("@rules_nixpkgs_python//:python.bzl", "nixpkgs_python_configure")
 
 nixpkgs_git_repository(

diff --git a/examples/non_module_deps.bzl b/examples/non_module_deps.bzl
@@ -1,7 +1,7 @@
 """ External repositories for the CI that need to be shared between WORKSPACE and MODULE.bazel files """
 
-load("@rules_haskell//tools:os_info.bzl", "os_info")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("@rules_haskell//tools:os_info.bzl", "os_info")
 
 def repositories(*, bzlmod):
     # Some helpers for platform-dependent configuration

diff --git a/extensions/rules_haskell_dependencies.bzl b/extensions/rules_haskell_dependencies.bzl
@@ -1,12 +1,12 @@
 """ This module extension contains rules_haskell dependencies that are not available as modules """
 
-load("@rules_haskell//haskell:repositories.bzl", "rules_haskell_dependencies_bzlmod")
-load("@rules_haskell//tools:repositories.bzl", "rules_haskell_worker_dependencies")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
+load("@rules_haskell//haskell:private/versions.bzl", "is_at_least")
+load("@rules_haskell//haskell:repositories.bzl", "rules_haskell_dependencies_bzlmod")
 load("@rules_haskell//tools:os_info.bzl", "os_info")
+load("@rules_haskell//tools:repositories.bzl", "rules_haskell_worker_dependencies")
 load("@rules_haskell_ghc_version//:ghc_version.bzl", "GHC_VERSION")
-load("@rules_haskell//haskell:private/versions.bzl", "is_at_least")
 
 def _empty_repo_impl(rctx):
     fail(rctx.attr.error_msg)

diff --git a/extensions/stack_snapshot.bzl b/extensions/stack_snapshot.bzl
@@ -2,17 +2,17 @@
 This module extension gathers packages and configuration from all the modules that use it,
 in order to make a unique call to `stack_snapshot` to generate a "stackage" shared repository.
 
-Most of the configuration can only be made by the root module, and 
+Most of the configuration can only be made by the root module, and
 other modules can declare the packages they want installed.
 
 The rules_haskell module itself has more permissions, so that it can
 set default configurations for packages as well as set the default
 snapshot to use.
 """
 
-load("@rules_haskell//haskell:cabal.bzl", _stack_snapshot = "stack_snapshot")
 load("@bazel_skylib//lib:new_sets.bzl", "sets")
 load("@os_info//:os_info.bzl", "cpu_value", "is_darwin", "is_linux", "is_windows")
+load("@rules_haskell//haskell:cabal.bzl", _stack_snapshot = "stack_snapshot")
 
 _snapshot_tag = tag_class(
     doc = "The stack snapshot to use.",

diff --git a/haskell/BUILD.bazel b/haskell/BUILD.bazel
@@ -1,20 +1,15 @@
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
-load("@rules_python//python:defs.bzl", "py_binary", "py_library")
-load(
-    "@rules_haskell//haskell:private/cc_wrapper.bzl",
-    "cc_wrapper",
-)
 load(
     "@rules_haskell//haskell:cabal_wrapper.bzl",
     "cabal_wrapper",
 )
 load(
-    "@rules_haskell//haskell:private/runghc.bzl",
-    "runghc",
+    "@rules_haskell//haskell:private/cc_wrapper.bzl",
+    "cc_wrapper",
 )
 load(
-    "@rules_haskell//haskell:toolchain_info.bzl",
-    "haskell_toolchain_info",
+    "@rules_haskell//haskell:private/runghc.bzl",
+    "runghc",
 )
 load(
     "@rules_haskell//haskell:toolchain.bzl",
@@ -23,6 +18,11 @@ load(
     "get_nodejs_toolchain",
     "get_posix_toolchain",
 )
+load(
+    "@rules_haskell//haskell:toolchain_info.bzl",
+    "haskell_toolchain_info",
+)
+load("@rules_python//python:defs.bzl", "py_binary", "py_library")
 
 exports_files(
     glob(["*.bzl"]) + [

diff --git a/haskell/asterius/defs.bzl b/haskell/asterius/defs.bzl
@@ -4,8 +4,8 @@
 # And for now stardoc always try to explore third party dependencies
 # https://github.com/bazelbuild/stardoc/issues/93.
 
-load("@bazel_skylib//lib:paths.bzl", "paths")
 load("@aspect_rules_js//js:defs.bzl", "js_binary", "js_test")
+load("@bazel_skylib//lib:paths.bzl", "paths")
 load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
 load("@rules_haskell_asterius_webpack//:package_json.bzl", "bin")
 

diff --git a/haskell/asterius/repositories.bzl b/haskell/asterius/repositories.bzl
@@ -1,18 +1,14 @@
 load("@bazel_skylib//lib:paths.bzl", "paths")
-load(
-    "//haskell:private/workspace_utils.bzl",
-    "define_rule",
-    "execute_or_fail_loudly",
-    "resolve_labels",
-)
+load("@rules_cc//cc:find_cc_toolchain.bzl", "CC_TOOLCHAIN_TYPE")
 load(
     "//haskell:private/pkgdb_to_bzl.bzl",
     "pkgdb_to_bzl",
 )
 load(
-    "//haskell/platforms:list.bzl",
-    "os_of_constraints",
-    "platform_of_constraints",
+    "//haskell:private/workspace_utils.bzl",
+    "define_rule",
+    "execute_or_fail_loudly",
+    "resolve_labels",
 )
 load("//haskell/asterius:asterius_config.bzl", "asterius_cabalopts")
 load(
@@ -21,7 +17,11 @@ load(
     _asterius_dependencies_custom = "asterius_dependencies_custom",
     _asterius_dependencies_nix = "asterius_dependencies_nix",
 )
-load("@rules_cc//cc:find_cc_toolchain.bzl", "CC_TOOLCHAIN_TYPE")
+load(
+    "//haskell/platforms:list.bzl",
+    "os_of_constraints",
+    "platform_of_constraints",
+)
 
 # For now the asterius bundle is built and uploaded manually for linux.
 # When the asterius build works inside the ci we will be able to download the artifacts from there.

diff --git a/haskell/c2hs.bzl b/haskell/c2hs.bzl
@@ -1,11 +1,8 @@
 """Support for c2hs"""
 
 load("@bazel_skylib//lib:paths.bzl", "paths")
+load("@bazel_skylib//lib:sets.bzl", "sets")
 load("@rules_cc//cc:find_cc_toolchain.bzl", "use_cc_toolchain")
-load(
-    ":providers.bzl",
-    "C2hsLibraryInfo",
-)
 load(":cc.bzl", "cc_interop_info")
 load(
     ":private/cc_libraries.bzl",
@@ -19,8 +16,11 @@ load(
     "target_unique_name",
 )
 load(":private/set.bzl", "set")
-load("@bazel_skylib//lib:sets.bzl", "sets")
 load(":private/version_macros.bzl", "version_macro_includes")
+load(
+    ":providers.bzl",
+    "C2hsLibraryInfo",
+)
 
 def _c2hs_library_impl(ctx):
     hs = haskell_context(ctx)

diff --git a/haskell/cabal.bzl b/haskell/cabal.bzl
@@ -2,13 +2,22 @@
 
 load("@bazel_skylib//lib:dicts.bzl", "dicts")
 load("@bazel_skylib//lib:paths.bzl", "paths")
+load("@bazel_skylib//lib:sets.bzl", "sets")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe", "read_netrc", "use_netrc")
-load("//vendor/bazel_json/lib:json_parser.bzl", "json_parse")
 load("@bazel_tools//tools/cpp:lib_cc_configure.bzl", "get_cpu_value")
 load("@rules_cc//cc:find_cc_toolchain.bzl", "find_cc_toolchain", "use_cc_toolchain")
+load("//vendor/bazel_json/lib:json_parser.bzl", "json_parse")
 load(":cc.bzl", "cc_interop_info", "ghc_cc_program_args")
+load(":haddock.bzl", "generate_unified_haddock_info")
 load(":private/actions/info.bzl", "library_info_output_groups")
 load(":private/actions/link.bzl", "darwin_flags_for_linking_indirect_cc_deps")
+load(
+    ":private/cc_libraries.bzl",
+    "get_cc_libraries",
+    "get_ghci_library_files",
+    "get_library_files",
+    "haskell_cc_libraries_aspect",
+)
 load(":private/context.bzl", "haskell_context")
 load(":private/dependencies.bzl", "gather_dep_info")
 load(":private/expansions.bzl", "expand_make_variables")
@@ -20,9 +29,8 @@ load(
     "relative_rpath_prefix",
     "truly_relativize",
 )
-load("@bazel_skylib//lib:sets.bzl", "sets")
 load(":private/validate_attrs.bzl", "typecheck_stackage_extradeps")
-load(":haddock.bzl", "generate_unified_haddock_info")
+load(":private/versions.bzl", "check_bazel_version")
 load(
     ":private/workspace_utils.bzl",
     _execute_or_fail_loudly = "execute_or_fail_loudly",
@@ -34,14 +42,6 @@ load(
     "HaskellLibraryInfo",
     "all_dependencies_package_ids",
 )
-load(
-    ":private/cc_libraries.bzl",
-    "get_cc_libraries",
-    "get_ghci_library_files",
-    "get_library_files",
-    "haskell_cc_libraries_aspect",
-)
-load(":private/versions.bzl", "check_bazel_version")
 
 def _get_auth(ctx, urls):
     """Find the .netrc file and obtain the auth dict for the required URLs.

diff --git a/haskell/cc.bzl b/haskell/cc.bzl
@@ -3,13 +3,13 @@
 These rules are deprecated.
 """
 
+load("@bazel_skylib//lib:paths.bzl", "paths")
 load(
     "@rules_cc//cc:action_names.bzl",
     "CPP_LINK_EXECUTABLE_ACTION_NAME",
     "C_COMPILE_ACTION_NAME",
 )
 load("@rules_cc//cc:find_cc_toolchain.bzl", "find_cc_toolchain")
-load("@bazel_skylib//lib:paths.bzl", "paths")
 load(
     "//haskell:providers.bzl",
     "GhcPluginInfo",

diff --git a/haskell/defs.bzl b/haskell/defs.bzl
@@ -1,11 +1,21 @@
 """Core Haskell rules"""
 
+load("@bazel_skylib//rules:expand_template.bzl", "expand_template")
 load("@rules_cc//cc:find_cc_toolchain.bzl", "use_cc_toolchain")
+load(
+    "//haskell/experimental:providers.bzl",
+    "HaskellModuleInfo",
+)
 load(
     ":haddock.bzl",
     _haskell_doc = "haskell_doc",
     _haskell_doc_aspect = "haskell_doc_aspect",
 )
+load(
+    ":plugins.bzl",
+    _ghc_plugin = "ghc_plugin",
+)
+load(":private/cc_libraries.bzl", "haskell_cc_libraries_aspect")
 load(
     ":private/haskell_impl.bzl",
     _haskell_binary_impl = "haskell_binary_impl",
@@ -19,23 +29,13 @@ load(
     _haskell_repl = "haskell_repl",
     _haskell_repl_aspect = "haskell_repl_aspect",
 )
-load(":private/cc_libraries.bzl", "haskell_cc_libraries_aspect")
 
 # For re-exports:
 load(
     ":toolchain.bzl",
     _haskell_register_toolchains = "rules_haskell_toolchains",
     _haskell_toolchain = "haskell_toolchain",
 )
-load(
-    ":plugins.bzl",
-    _ghc_plugin = "ghc_plugin",
-)
-load(
-    "//haskell/experimental:providers.bzl",
-    "HaskellModuleInfo",
-)
-load("@bazel_skylib//rules:expand_template.bzl", "expand_template")
 
 # NOTE: Documentation needs to be added to the wrapper macros below.
 #   Currently it is not possible to automatically inherit rule documentation in

diff --git a/haskell/doctest.bzl b/haskell/doctest.bzl
@@ -1,21 +1,21 @@
 """Doctest support"""
 
 load("@bazel_skylib//lib:dicts.bzl", "dicts")
-load("@rules_cc//cc:find_cc_toolchain.bzl", "use_cc_toolchain")
-load(":cc.bzl", "cc_interop_info", "ghc_cc_program_args")
-load(":private/context.bzl", "haskell_context", "render_env")
 load("@bazel_skylib//lib:sets.bzl", "sets")
-load(
-    "@rules_haskell//haskell:providers.bzl",
-    "HaskellCcLibrariesInfo",
-    "HaskellInfo",
-)
+load("@rules_cc//cc:find_cc_toolchain.bzl", "use_cc_toolchain")
 load(
     "@rules_haskell//haskell:private/cc_libraries.bzl",
     "get_ghci_library_files",
     "haskell_cc_libraries_aspect",
     "link_libraries",
 )
+load(
+    "@rules_haskell//haskell:providers.bzl",
+    "HaskellCcLibrariesInfo",
+    "HaskellInfo",
+)
+load(":cc.bzl", "cc_interop_info", "ghc_cc_program_args")
+load(":private/context.bzl", "haskell_context", "render_env")
 
 def _doctest_toolchain_impl(ctx):
     return platform_common.ToolchainInfo(

diff --git a/haskell/experimental/defs.bzl b/haskell/experimental/defs.bzl
@@ -1,11 +1,11 @@
 """Experimental Haskell rules"""
 
 load("@rules_cc//cc:find_cc_toolchain.bzl", "use_cc_toolchain")
+load("//haskell:private/cc_libraries.bzl", "haskell_cc_libraries_aspect")
 load(
     "//haskell/experimental/private:module.bzl",
     _haskell_module_impl = "haskell_module_impl",
 )
-load("//haskell:private/cc_libraries.bzl", "haskell_cc_libraries_aspect")
 
 # TODO[GL] should we have repl_ghci_args here?
 _haskell_module = rule(