Support Hex packages with name different from application2020.02.11

Properly fixes partisan.

2 files changed, 24 insertions, 18 deletions

diff --git a/core/deps.mk b/core/deps.mk
index 56c1d1c..6bbb05b 100644
--- a/core/deps.mk
+++ b/core/deps.mk
@@ -323,7 +323,7 @@ define dep_autopatch_rebar.erl
 		end,
 		Write("\n")
 	end(),
-	GetHexVsn = fun(N) ->
+	GetHexVsn = fun(N, NP) ->
 		case file:consult("$(call core_native_path,$(DEPS_DIR)/$1/rebar.lock)") of
 			{ok, Lock} ->
 				io:format("~p~n", [Lock]),
@@ -333,7 +333,7 @@ define dep_autopatch_rebar.erl
 						case lists:keyfind(atom_to_binary(N, latin1), 1, LockPkgs) of
 							{_, {pkg, _, Vsn}, _} ->
 								io:format("~p~n", [Vsn]),
-								{N, {hex, binary_to_list(Vsn)}};
+								{N, {hex, NP, binary_to_list(Vsn)}};
 							_ ->
 								false
 						end;
@@ -362,10 +362,10 @@ define dep_autopatch_rebar.erl
 			false -> [];
 			{_, Deps} ->
 				[begin case case Dep of
-							N when is_atom(N) -> GetHexVsn(N);
-							{N, S} when is_atom(N), is_list(S) -> {N, {hex, SemVsn(S)}};
-							{_, {pkg, N}} when is_atom(N) -> GetHexVsn(N);
-							{_, S, {pkg, N}} -> {N, {hex, S}};
+							N when is_atom(N) -> GetHexVsn(N, N);
+							{N, S} when is_atom(N), is_list(S) -> {N, {hex, N, SemVsn(S)}};
+							{N, {pkg, NP}} when is_atom(N) -> GetHexVsn(N, NP);
+							{N, S, {pkg, NP}} -> {N, {hex, NP, S}};
 							{N, S} when is_tuple(S) -> {N, S};
 							{N, _, S} -> {N, S};
 							{N, _, S, _} -> {N, S};
@@ -374,7 +374,7 @@ define dep_autopatch_rebar.erl
 					false -> ok;
 					{Name, Source} ->
 						{Method, Repo, Commit} = case Source of
-							{hex, V} -> {hex, V, undefined};
+							{hex, NPV, V} -> {hex, V, NPV};
 							{git, R} -> {git, R, master};
 							{M, R, {branch, C}} -> {M, R, C};
 							{M, R, {ref, C}} -> {M, R, C};
@@ -655,7 +655,7 @@ endef
 define dep_fetch_hex
 	mkdir -p $(ERLANG_MK_TMP)/hex $(DEPS_DIR)/$1; \
 	$(call core_http_get,$(ERLANG_MK_TMP)/hex/$1.tar,\
-		https://repo.hex.pm/tarballs/$1-$(strip $(word 2,$(dep_$1))).tar); \
+		https://repo.hex.pm/tarballs/$(if $(word 3,$(dep_$1)),$(word 3,$(dep_$1)),$1)-$(strip $(word 2,$(dep_$1))).tar); \
 	tar -xOf $(ERLANG_MK_TMP)/hex/$1.tar contents.tar.gz | tar -C $(DEPS_DIR)/$1 -xzf -;
 endef
 
diff --git a/doc/src/guide/deps.asciidoc b/doc/src/guide/deps.asciidoc
index 913fa24..11f09fa 100644
--- a/doc/src/guide/deps.asciidoc
+++ b/doc/src/guide/deps.asciidoc
@@ -169,17 +169,17 @@ The following table lists all existing methods:
 
 [cols="<,2*^",options="header"]
 |===
-| Name           | Format          | Description
-| git            | git repo commit | Clone the Git repository and checkout the given version
+| Name           | Format            | Description
+| git            | git repo commit   | Clone the Git repository and checkout the given version
 | git-subfolder  | git repo commit subfolder | Clone the Git repository, checkout the given version and use one of its subfolders as a dependency
-| git-submodule  | git-submodule   | Initialize and update the Git submodule
-| hg             | hg repo commit  | Clone the Mercurial repository and update to the given version
-| svn            | svn repo        | Checkout the given SVN repository
-| cp             | cp path/to/repo | Recursively copy a local directory
-| ln             | ln path/to/repo | Symbolically link a local directory
-| hex            | hex version     | Download the given project version from hex.pm
-| fail           | N/A             | Always fail, reserved for internal use
-| legacy         | N/A             | Legacy Erlang.mk fetcher, reserved for internal use
+| git-submodule  | git-submodule     | Initialize and update the Git submodule
+| hg             | hg repo commit    | Clone the Mercurial repository and update to the given version
+| svn            | svn repo          | Checkout the given SVN repository
+| cp             | cp path/to/repo   | Recursively copy a local directory
+| ln             | ln path/to/repo   | Symbolically link a local directory
+| hex            | hex version [pkg] | Download the given project version from hex.pm
+| fail           | N/A               | Always fail, reserved for internal use
+| legacy         | N/A               | Legacy Erlang.mk fetcher, reserved for internal use
 |===
 
 The `git` and `hg` methods both have a repository and commit.
@@ -230,6 +230,12 @@ link:https://hex.pm/[Hex repository]:
 [source,make]
 dep_cowboy = hex 1.0.3
 
+If the package on Hex has a different name than the application,
+you can provide it after the version:
+
+[source,make]
+dep_uuid = hex 1.7.5 uuid_erl
+
 ==== Custom fetch methods
 
 If none of the existing methods fit your use, you can simply