aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Romain <christophe.romain@process-one.net>2017-03-20 16:58:48 +0100
committerChristophe Romain <christophe.romain@process-one.net>2017-03-20 16:58:48 +0100
commit6017785e106c8e1801448210f1f611230afb2788 (patch)
tree2c0675048e721f695c96b71632456a8adec38009
parentUpdate mix deps (diff)
Fix compilation with mix (#1588)
-rw-r--r--mix.exs6
-rw-r--r--mix.lock7
2 files changed, 7 insertions, 6 deletions
diff --git a/mix.exs b/mix.exs
index 589ed2212..031022521 100644
--- a/mix.exs
+++ b/mix.exs
@@ -40,9 +40,9 @@ defmodule Ejabberd.Mixfile do
defp deps do
[{:lager, "~> 3.2"},
- {:fast_xml, git: "https://github.com/processone/fast_xml.git", tag: "1.1.22", override: true},
- {:xmpp, git: "https://github.com/processone/xmpp.git", tag: "1.1.9"},
- {:p1_utils, git: "https://github.com/processone/p1_utils.git", tag: "1.0.7"},
+ {:p1_utils, github: "processone/p1_utils", tag: "1.0.7", override: true},
+ {:fast_xml, github: "processone/fast_xml", tag: "1.1.22", override: true, manager: :rebar},
+ {:xmpp, github: "processone/xmpp", tag: "1.1.9", manager: :rebar},
{:cache_tab, "~> 1.0"},
{:stringprep, "~> 1.0"},
{:fast_yaml, "~> 1.0"},
diff --git a/mix.lock b/mix.lock
index a67bb0242..d43ddd5db 100644
--- a/mix.lock
+++ b/mix.lock
@@ -1,9 +1,10 @@
%{"cache_tab": {:hex, :cache_tab, "1.0.6", "d76643e614f310347b0a539543751f5ad950b0aecdabf7c82e2e1b901ef29df4", [:rebar3], [{:p1_utils, "1.0.6", [hex: :p1_utils, optional: false]}]},
- "distillery": {:hex, :distillery, "1.1.0", "e9943bd29557e9c252a051d8ac4b47e597cd9bf2a74332b8628eab4954eb51d7", [:mix], []},
- "earmark": {:hex, :earmark, "1.1.0", "8c2bf85d725050a92042bc1edf362621004d43ca6241c756f39612084e95487f", [:mix], []},
+ "distillery": {:hex, :distillery, "1.2.2", "d5a52920cbe2378c8a21dfc83b526b4225944b9dce7bf170fe5f5cddda81ffb3", [:mix], []},
+ "earmark": {:hex, :earmark, "1.2.0", "bf1ce17aea43ab62f6943b97bd6e3dc032ce45d4f787504e3adf738e54b42f3a", [:mix], []},
+ "elixir_make": {:hex, :elixir_make, "0.4.0", "992f38fabe705bb45821a728f20914c554b276838433349d4f2341f7a687cddf", [:mix], []},
"eredis": {:hex, :eredis, "1.0.8", "ab4fda1c4ba7fbe6c19c26c249dc13da916d762502c4b4fa2df401a8d51c5364", [:rebar], []},
"esip": {:hex, :esip, "1.0.10", "473856746df3136bce62973db8270c6811a366c7ce21c6139f725e29b359ef8e", [:rebar3], [{:fast_tls, "1.0.10", [hex: :fast_tls, optional: false]}, {:p1_utils, "1.0.6", [hex: :p1_utils, optional: false]}, {:stun, "1.0.9", [hex: :stun, optional: false]}]},
- "ex_doc": {:hex, :ex_doc, "0.14.5", "c0433c8117e948404d93ca69411dd575ec6be39b47802e81ca8d91017a0cf83c", [:mix], [{:earmark, "~> 1.0", [hex: :earmark, optional: false]}]},
+ "ex_doc": {:hex, :ex_doc, "0.15.0", "e73333785eef3488cf9144a6e847d3d647e67d02bd6fdac500687854dd5c599f", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, optional: false]}]},
"ezlib": {:hex, :ezlib, "1.0.2", "22004ecf553a7d831404394d5642712e2aede90522e22bd6ccc089ca410ee098", [:rebar3], []},
"fast_tls": {:hex, :fast_tls, "1.0.10", "d403f20978ec30814203191b33764c016a49c0fce09fc0540eb56c087d5167de", [:rebar3], [{:p1_utils, "1.0.6", [hex: :p1_utils, optional: false]}]},
"fast_xml": {:git, "https://github.com/processone/fast_xml.git", "984933e581dd4091f775f3b59dd76bfddfa8097e", [tag: "1.1.22"]},