Skip to content

Commit 45350c7

Browse files
mergify[bot]mergify[bot]
authored
Merge pull request #2187 from tweag/renovate/com_github_bazelbuild_buildtools-7.x
chore(deps): update dependency com_github_bazelbuild_buildtools to v7
2 parents a952c7b + 6d0d822 commit 45350c7

File tree

70 files changed

+273
-281
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+273
-281
lines changed

‎WORKSPACE

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,15 @@ load("//extensions:rules_haskell_dependencies.bzl", _repositories_3 = "repositor
5959

6060
_repositories_3(bzlmod = False)
6161

62-
load("@rules_haskell_ghc_version//:ghc_version.bzl", "GHC_VERSION")
6362
load(
6463
"@rules_haskell//haskell:ghc_bindist.bzl",
6564
"haskell_register_ghc_bindists",
6665
)
66+
load("@rules_haskell_ghc_version//:ghc_version.bzl", "GHC_VERSION")
6767

6868
haskell_register_ghc_bindists(version = GHC_VERSION)
6969

70+
load("@os_info//:os_info.bzl", "is_nix_shell", "is_windows")
7071
load(
7172
"@rules_haskell//haskell/asterius:repositories.bzl",
7273
"asterius_dependencies_bindist",
@@ -76,7 +77,6 @@ load(
7677
"@rules_nixpkgs_core//:nixpkgs.bzl",
7778
"nixpkgs_package",
7879
)
79-
load("@os_info//:os_info.bzl", "is_nix_shell", "is_windows")
8080

8181
asterius_dependencies_nix(
8282
nix_repository = "@nixpkgs_default",

‎docs/BUILD.bazel

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
2+
load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
23
load("@io_bazel_stardoc//stardoc:stardoc.bzl", "stardoc")
3-
load("@rules_python//python:defs.bzl", "py_binary")
44
load("@rules_haskell//docs/pandoc:pandoc.bzl", "set_site_end_location")
5-
load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
5+
load("@rules_python//python:defs.bzl", "py_binary")
66

77
bool_flag(
88
name = "render_dev_website",

‎examples/arm/BUILD.bazel

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package(default_visibility = ["//visibility:public"])
2-
31
load(
42
"@rules_haskell//haskell:defs.bzl",
53
"haskell_binary",
64
"haskell_library",
75
"haskell_toolchain_library",
86
)
97

8+
package(default_visibility = ["//visibility:public"])
9+
1010
haskell_toolchain_library(name = "base")
1111

1212
haskell_toolchain_library(name = "template-haskell")

‎examples/arm/WORKSPACE

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ load(
2020
"@rules_haskell//haskell:cabal.bzl",
2121
"stack_snapshot",
2222
)
23+
load("@rules_nixpkgs_cc//:cc.bzl", "nixpkgs_cc_configure")
2324
load(
2425
"@rules_nixpkgs_core//:nixpkgs.bzl",
2526
"nixpkgs_git_repository",
2627
"nixpkgs_package",
2728
)
28-
load("@rules_nixpkgs_cc//:cc.bzl", "nixpkgs_cc_configure")
2929
load("@rules_nixpkgs_python//:python.bzl", "nixpkgs_python_configure")
3030

3131
nixpkgs_git_repository(

‎examples/non_module_deps.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
""" External repositories for the CI that need to be shared between WORKSPACE and MODULE.bazel files """
22

3-
load("@rules_haskell//tools:os_info.bzl", "os_info")
43
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
4+
load("@rules_haskell//tools:os_info.bzl", "os_info")
55

66
def repositories(*, bzlmod):
77
# Some helpers for platform-dependent configuration

‎extensions/rules_haskell_dependencies.bzl

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
""" This module extension contains rules_haskell dependencies that are not available as modules """
22

3-
load("@rules_haskell//haskell:repositories.bzl", "rules_haskell_dependencies_bzlmod")
4-
load("@rules_haskell//tools:repositories.bzl", "rules_haskell_worker_dependencies")
53
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
64
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
5+
load("@rules_haskell//haskell:private/versions.bzl", "is_at_least")
6+
load("@rules_haskell//haskell:repositories.bzl", "rules_haskell_dependencies_bzlmod")
77
load("@rules_haskell//tools:os_info.bzl", "os_info")
8+
load("@rules_haskell//tools:repositories.bzl", "rules_haskell_worker_dependencies")
89
load("@rules_haskell_ghc_version//:ghc_version.bzl", "GHC_VERSION")
9-
load("@rules_haskell//haskell:private/versions.bzl", "is_at_least")
1010

1111
def _empty_repo_impl(rctx):
1212
fail(rctx.attr.error_msg)

‎extensions/stack_snapshot.bzl

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
This module extension gathers packages and configuration from all the modules that use it,
33
in order to make a unique call to `stack_snapshot` to generate a "stackage" shared repository.
44
5-
Most of the configuration can only be made by the root module, and
5+
Most of the configuration can only be made by the root module, and
66
other modules can declare the packages they want installed.
77
88
The rules_haskell module itself has more permissions, so that it can
99
set default configurations for packages as well as set the default
1010
snapshot to use.
1111
"""
1212

13-
load("@rules_haskell//haskell:cabal.bzl", _stack_snapshot = "stack_snapshot")
1413
load("@bazel_skylib//lib:new_sets.bzl", "sets")
1514
load("@os_info//:os_info.bzl", "cpu_value", "is_darwin", "is_linux", "is_windows")
15+
load("@rules_haskell//haskell:cabal.bzl", _stack_snapshot = "stack_snapshot")
1616

1717
_snapshot_tag = tag_class(
1818
doc = "The stack snapshot to use.",

‎haskell/BUILD.bazel

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
2-
load("@rules_python//python:defs.bzl", "py_binary", "py_library")
3-
load(
4-
"@rules_haskell//haskell:private/cc_wrapper.bzl",
5-
"cc_wrapper",
6-
)
72
load(
83
"@rules_haskell//haskell:cabal_wrapper.bzl",
94
"cabal_wrapper",
105
)
116
load(
12-
"@rules_haskell//haskell:private/runghc.bzl",
13-
"runghc",
7+
"@rules_haskell//haskell:private/cc_wrapper.bzl",
8+
"cc_wrapper",
149
)
1510
load(
16-
"@rules_haskell//haskell:toolchain_info.bzl",
17-
"haskell_toolchain_info",
11+
"@rules_haskell//haskell:private/runghc.bzl",
12+
"runghc",
1813
)
1914
load(
2015
"@rules_haskell//haskell:toolchain.bzl",
@@ -23,6 +18,11 @@ load(
2318
"get_nodejs_toolchain",
2419
"get_posix_toolchain",
2520
)
21+
load(
22+
"@rules_haskell//haskell:toolchain_info.bzl",
23+
"haskell_toolchain_info",
24+
)
25+
load("@rules_python//python:defs.bzl", "py_binary", "py_library")
2626

2727
exports_files(
2828
glob(["*.bzl"]) + [

‎haskell/asterius/defs.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
# And for now stardoc always try to explore third party dependencies
55
# https://github.com/bazelbuild/stardoc/issues/93.
66

7-
load("@bazel_skylib//lib:paths.bzl", "paths")
87
load("@aspect_rules_js//js:defs.bzl", "js_binary", "js_test")
8+
load("@bazel_skylib//lib:paths.bzl", "paths")
99
load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
1010
load("@rules_haskell_asterius_webpack//:package_json.bzl", "bin")
1111

‎haskell/asterius/repositories.bzl

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
load("@bazel_skylib//lib:paths.bzl", "paths")
2-
load(
3-
"//haskell:private/workspace_utils.bzl",
4-
"define_rule",
5-
"execute_or_fail_loudly",
6-
"resolve_labels",
7-
)
2+
load("@rules_cc//cc:find_cc_toolchain.bzl", "CC_TOOLCHAIN_TYPE")
83
load(
94
"//haskell:private/pkgdb_to_bzl.bzl",
105
"pkgdb_to_bzl",
116
)
127
load(
13-
"//haskell/platforms:list.bzl",
14-
"os_of_constraints",
15-
"platform_of_constraints",
8+
"//haskell:private/workspace_utils.bzl",
9+
"define_rule",
10+
"execute_or_fail_loudly",
11+
"resolve_labels",
1612
)
1713
load("//haskell/asterius:asterius_config.bzl", "asterius_cabalopts")
1814
load(
@@ -21,7 +17,11 @@ load(
2117
_asterius_dependencies_custom = "asterius_dependencies_custom",
2218
_asterius_dependencies_nix = "asterius_dependencies_nix",
2319
)
24-
load("@rules_cc//cc:find_cc_toolchain.bzl", "CC_TOOLCHAIN_TYPE")
20+
load(
21+
"//haskell/platforms:list.bzl",
22+
"os_of_constraints",
23+
"platform_of_constraints",
24+
)
2525

2626
# For now the asterius bundle is built and uploaded manually for linux.
2727
# When the asterius build works inside the ci we will be able to download the artifacts from there.

‎haskell/c2hs.bzl

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
"""Support for c2hs"""
22

33
load("@bazel_skylib//lib:paths.bzl", "paths")
4+
load("@bazel_skylib//lib:sets.bzl", "sets")
45
load("@rules_cc//cc:find_cc_toolchain.bzl", "use_cc_toolchain")
5-
load(
6-
":providers.bzl",
7-
"C2hsLibraryInfo",
8-
)
96
load(":cc.bzl", "cc_interop_info")
107
load(
118
":private/cc_libraries.bzl",
@@ -19,8 +16,11 @@ load(
1916
"target_unique_name",
2017
)
2118
load(":private/set.bzl", "set")
22-
load("@bazel_skylib//lib:sets.bzl", "sets")
2319
load(":private/version_macros.bzl", "version_macro_includes")
20+
load(
21+
":providers.bzl",
22+
"C2hsLibraryInfo",
23+
)
2424

2525
def _c2hs_library_impl(ctx):
2626
hs = haskell_context(ctx)

‎haskell/cabal.bzl

+11-11
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,22 @@
22

33
load("@bazel_skylib//lib:dicts.bzl", "dicts")
44
load("@bazel_skylib//lib:paths.bzl", "paths")
5+
load("@bazel_skylib//lib:sets.bzl", "sets")
56
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe", "read_netrc", "use_netrc")
6-
load("//vendor/bazel_json/lib:json_parser.bzl", "json_parse")
77
load("@bazel_tools//tools/cpp:lib_cc_configure.bzl", "get_cpu_value")
88
load("@rules_cc//cc:find_cc_toolchain.bzl", "find_cc_toolchain", "use_cc_toolchain")
9+
load("//vendor/bazel_json/lib:json_parser.bzl", "json_parse")
910
load(":cc.bzl", "cc_interop_info", "ghc_cc_program_args")
11+
load(":haddock.bzl", "generate_unified_haddock_info")
1012
load(":private/actions/info.bzl", "library_info_output_groups")
1113
load(":private/actions/link.bzl", "darwin_flags_for_linking_indirect_cc_deps")
14+
load(
15+
":private/cc_libraries.bzl",
16+
"get_cc_libraries",
17+
"get_ghci_library_files",
18+
"get_library_files",
19+
"haskell_cc_libraries_aspect",
20+
)
1221
load(":private/context.bzl", "haskell_context")
1322
load(":private/dependencies.bzl", "gather_dep_info")
1423
load(":private/expansions.bzl", "expand_make_variables")
@@ -20,9 +29,8 @@ load(
2029
"relative_rpath_prefix",
2130
"truly_relativize",
2231
)
23-
load("@bazel_skylib//lib:sets.bzl", "sets")
2432
load(":private/validate_attrs.bzl", "typecheck_stackage_extradeps")
25-
load(":haddock.bzl", "generate_unified_haddock_info")
33+
load(":private/versions.bzl", "check_bazel_version")
2634
load(
2735
":private/workspace_utils.bzl",
2836
_execute_or_fail_loudly = "execute_or_fail_loudly",
@@ -34,14 +42,6 @@ load(
3442
"HaskellLibraryInfo",
3543
"all_dependencies_package_ids",
3644
)
37-
load(
38-
":private/cc_libraries.bzl",
39-
"get_cc_libraries",
40-
"get_ghci_library_files",
41-
"get_library_files",
42-
"haskell_cc_libraries_aspect",
43-
)
44-
load(":private/versions.bzl", "check_bazel_version")
4545

4646
def _get_auth(ctx, urls):
4747
"""Find the .netrc file and obtain the auth dict for the required URLs.

‎haskell/cc.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
These rules are deprecated.
44
"""
55

6+
load("@bazel_skylib//lib:paths.bzl", "paths")
67
load(
78
"@rules_cc//cc:action_names.bzl",
89
"CPP_LINK_EXECUTABLE_ACTION_NAME",
910
"C_COMPILE_ACTION_NAME",
1011
)
1112
load("@rules_cc//cc:find_cc_toolchain.bzl", "find_cc_toolchain")
12-
load("@bazel_skylib//lib:paths.bzl", "paths")
1313
load(
1414
"//haskell:providers.bzl",
1515
"GhcPluginInfo",

‎haskell/defs.bzl

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
11
"""Core Haskell rules"""
22

3+
load("@bazel_skylib//rules:expand_template.bzl", "expand_template")
34
load("@rules_cc//cc:find_cc_toolchain.bzl", "use_cc_toolchain")
5+
load(
6+
"//haskell/experimental:providers.bzl",
7+
"HaskellModuleInfo",
8+
)
49
load(
510
":haddock.bzl",
611
_haskell_doc = "haskell_doc",
712
_haskell_doc_aspect = "haskell_doc_aspect",
813
)
14+
load(
15+
":plugins.bzl",
16+
_ghc_plugin = "ghc_plugin",
17+
)
18+
load(":private/cc_libraries.bzl", "haskell_cc_libraries_aspect")
919
load(
1020
":private/haskell_impl.bzl",
1121
_haskell_binary_impl = "haskell_binary_impl",
@@ -19,23 +29,13 @@ load(
1929
_haskell_repl = "haskell_repl",
2030
_haskell_repl_aspect = "haskell_repl_aspect",
2131
)
22-
load(":private/cc_libraries.bzl", "haskell_cc_libraries_aspect")
2332

2433
# For re-exports:
2534
load(
2635
":toolchain.bzl",
2736
_haskell_register_toolchains = "rules_haskell_toolchains",
2837
_haskell_toolchain = "haskell_toolchain",
2938
)
30-
load(
31-
":plugins.bzl",
32-
_ghc_plugin = "ghc_plugin",
33-
)
34-
load(
35-
"//haskell/experimental:providers.bzl",
36-
"HaskellModuleInfo",
37-
)
38-
load("@bazel_skylib//rules:expand_template.bzl", "expand_template")
3939

4040
# NOTE: Documentation needs to be added to the wrapper macros below.
4141
# Currently it is not possible to automatically inherit rule documentation in

‎haskell/doctest.bzl

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
"""Doctest support"""
22

33
load("@bazel_skylib//lib:dicts.bzl", "dicts")
4-
load("@rules_cc//cc:find_cc_toolchain.bzl", "use_cc_toolchain")
5-
load(":cc.bzl", "cc_interop_info", "ghc_cc_program_args")
6-
load(":private/context.bzl", "haskell_context", "render_env")
74
load("@bazel_skylib//lib:sets.bzl", "sets")
8-
load(
9-
"@rules_haskell//haskell:providers.bzl",
10-
"HaskellCcLibrariesInfo",
11-
"HaskellInfo",
12-
)
5+
load("@rules_cc//cc:find_cc_toolchain.bzl", "use_cc_toolchain")
136
load(
147
"@rules_haskell//haskell:private/cc_libraries.bzl",
158
"get_ghci_library_files",
169
"haskell_cc_libraries_aspect",
1710
"link_libraries",
1811
)
12+
load(
13+
"@rules_haskell//haskell:providers.bzl",
14+
"HaskellCcLibrariesInfo",
15+
"HaskellInfo",
16+
)
17+
load(":cc.bzl", "cc_interop_info", "ghc_cc_program_args")
18+
load(":private/context.bzl", "haskell_context", "render_env")
1919

2020
def _doctest_toolchain_impl(ctx):
2121
return platform_common.ToolchainInfo(

‎haskell/experimental/defs.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
"""Experimental Haskell rules"""
22

33
load("@rules_cc//cc:find_cc_toolchain.bzl", "use_cc_toolchain")
4+
load("//haskell:private/cc_libraries.bzl", "haskell_cc_libraries_aspect")
45
load(
56
"//haskell/experimental/private:module.bzl",
67
_haskell_module_impl = "haskell_module_impl",
78
)
8-
load("//haskell:private/cc_libraries.bzl", "haskell_cc_libraries_aspect")
99

1010
# TODO[GL] should we have repl_ghci_args here?
1111
_haskell_module = rule(

0 commit comments

Comments
 (0)