Skip to content

Commit 72b9d0a

Browse files
committed
Fix unnamed-macro warnings
1 parent 3fe8bbf commit 72b9d0a

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

haskell/asterius/asterius_dependencies.bzl

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ npm_repositories()
6767
def asterius_dependencies_nix(
6868
nix_repository,
6969
nixpkgs_package_rule,
70+
name = "rules_haskell",
7071
nixpkgs_nodejs = DEFAULT_NIXPKGS_NODEJS,
7172
register = True):
7273
"""Install asterius dependencies based on nix.
@@ -87,22 +88,23 @@ npm_repositories()
8788

8889
_nixpkgs_nodejs(nixpkgs_nodejs, nix_repository, nixpkgs_package_rule)
8990

91+
node_toolchain_name = name + "_nix_node_toolchain"
9092
_declare_nix_node_toolchain(
91-
name = "rules_haskell_nix_node_toolchain",
93+
name = node_toolchain_name,
9294
nixpkgs_nodejs = nixpkgs_nodejs,
9395
)
9496
if register:
95-
native.register_toolchains("@rules_haskell_nix_node_toolchain//:node_nixpkgs_toolchain")
97+
native.register_toolchains("@{}//:node_nixpkgs_toolchain".format(node_toolchain_name))
9698
npm_translate_lock(
97-
name = "rules_haskell_npm",
99+
name = name + "_npm",
98100
pnpm_lock = DEFAULT_PNPM_LOCK,
99101
verify_node_modules_ignored = "@rules_haskell//:.bazelignore",
100102
link_workspace = "rules_haskell",
101103
)
102-
_ahc_target_build_setting(name = "rules_haskell_asterius_build_setting")
104+
_ahc_target_build_setting(name = name + "_asterius_build_setting")
103105

104106
_declare_webpack(
105-
name = "rules_haskell_asterius_webpack",
107+
name = name + "_asterius_webpack",
106108
)
107109

108110
def asterius_dependencies_custom(webpack_cli_package_json_bzl):

haskell/asterius/repositories.bzl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ def rules_haskell_asterius_toolchain(
274274
native.register_toolchains("@{}//:wasm_cc_toolchain".format(toolchain_name))
275275

276276
def rules_haskell_asterius_toolchains(
277+
name = "asterius",
277278
version = AHC_DEFAULT_VERSION,
278279
ghcopts = [],
279280
cabalopts = [],
@@ -297,7 +298,7 @@ def rules_haskell_asterius_toolchains(
297298
fail("Binary distribution of Asterius {} not available.".format(version))
298299
for platform in AHC_BINDIST[version]:
299300
# Download the asterius bundle.
300-
bundle_repo_name = "asterius_bundle_{}".format(platform)
301+
bundle_repo_name = "{}_bundle_{}".format(name, platform)
301302
_asterius_bundle(
302303
name = bundle_repo_name,
303304
version = version,
@@ -319,7 +320,7 @@ def rules_haskell_asterius_toolchains(
319320
(asterius_lib_setting_file, ahc_pkg, asterius_binaries, full_bundle, wasm_cc_toolchain) = _labels_from_bundle_name(bundle_repo_name, version)
320321

321322
rules_haskell_asterius_toolchain(
322-
"{}_asterius".format(platform),
323+
"{}_{}".format(platform, name),
323324
version,
324325
exec_constraints,
325326
asterius_lib_setting_file,

haskell/platforms/list.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ARCH = {
3131
"x86_64": "x86_64",
3232
}
3333

34-
def declare_config_settings():
34+
def declare_config_settings(name = None):
3535
for os, constraint_value in OS.items():
3636
if constraint_value:
3737
native.config_setting(

0 commit comments

Comments
 (0)