Skip to content

Commit da0b1f9

Browse files
authored
Merge pull request #102 from rabbitmq/hex-package-aliasing
Allow hex packages with a different package name than app name
2 parents 883ea21 + 82287a9 commit da0b1f9

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

bzlmod/erlang_package.bzl

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ load(
1515
HexPackage = provider(fields = [
1616
"module",
1717
"name",
18+
"pkg",
1819
"version",
1920
"sha256",
2021
"build_file_content",
@@ -45,6 +46,7 @@ def hex_tree(
4546
ctx,
4647
module = None,
4748
name = None,
49+
pkg = None,
4850
version = None):
4951
log(ctx, "Fetching release info for {}@{} from hex.pm".format(name, version))
5052
release_info = hex_release_info(ctx, name, version)
@@ -61,6 +63,7 @@ def hex_tree(
6163
return HexPackage(
6264
module = module,
6365
name = name,
66+
pkg = pkg,
6467
version = version,
6568
sha256 = sha256,
6669
build_file_content = "",
@@ -74,13 +77,15 @@ def hex_package(
7477
ctx,
7578
module = None,
7679
name = None,
80+
pkg = None,
7781
version = None,
7882
sha256 = None,
7983
build_file_content = None,
8084
patch_cmds = None):
8185
return HexPackage(
8286
module = module,
8387
name = name,
88+
pkg = pkg,
8489
version = version,
8590
sha256 = sha256,
8691
build_file_content = build_file_content,
@@ -165,7 +170,7 @@ def _hex_package_repo(ctx, hex_package):
165170
if hex_package.build_file_content != "":
166171
hex_archive(
167172
name = hex_package.name,
168-
package_name = hex_package.name,
173+
package_name = hex_package.pkg if hex_package.pkg != "" else hex_package.name,
169174
version = hex_package.version,
170175
sha256 = hex_package.sha256,
171176
build_file_content = hex_package.build_file_content,
@@ -179,7 +184,7 @@ def _hex_package_repo(ctx, hex_package):
179184

180185
hex_archive(
181186
name = hex_package.name,
182-
package_name = hex_package.name,
187+
package_name = hex_package.pkg if hex_package.pkg != "" else hex_package.name,
183188
version = hex_package.version,
184189
sha256 = hex_package.sha256,
185190
patch_cmds = hex_package.patch_cmds + [PATCH_AUTO_BUILD_BAZEL.format(

bzlmod/extensions.bzl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,13 +239,15 @@ def _erlang_package(ctx):
239239
ctx,
240240
module = mod,
241241
name = dep.name,
242+
pkg = dep.pkg,
242243
version = dep.version,
243244
))
244245
for dep in mod.tags.hex_package:
245246
packages.append(hex_package(
246247
ctx,
247248
module = mod,
248249
name = dep.name,
250+
pkg = dep.pkg,
249251
version = dep.version,
250252
sha256 = dep.sha256,
251253
build_file_content = dep.build_file_content,
@@ -272,11 +274,13 @@ def _erlang_package(ctx):
272274

273275
hex_package_tree_tag = tag_class(attrs = {
274276
"name": attr.string(mandatory = True),
277+
"pkg": attr.string(),
275278
"version": attr.string(mandatory = True),
276279
})
277280

278281
hex_package_tag = tag_class(attrs = {
279282
"name": attr.string(mandatory = True),
283+
"pkg": attr.string(),
280284
"version": attr.string(mandatory = True),
281285
"sha256": attr.string(),
282286
"build_file_content": attr.string(),

0 commit comments

Comments
 (0)