Skip to content

Commit 45350c7

Browse files
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 9 additions & 9 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 10 additions & 10 deletions
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.

0 commit comments

Comments
 (0)