summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2017-07-05 17:41:21 +0200
committerLinus Färnstrand <linus@mullvad.net>2017-07-05 17:41:21 +0200
commit2c59ffec99458f16c93aa2621670e802804e2f59 (patch)
tree159d5e412652fe7d279aed2233e4199a61ed9df7
parent0e52a9b1ae4890946e3d04b13a07bd6696be3efb (diff)
downloadmullvadvpn-2c59ffec99458f16c93aa2621670e802804e2f59.tar.xz
mullvadvpn-2c59ffec99458f16c93aa2621670e802804e2f59.zip
Change jsonrpc-* crates to upstream git
-rw-r--r--mullvad_daemon/Cargo.toml8
-rw-r--r--talpid_core/Cargo.toml4
-rw-r--r--talpid_ipc/Cargo.toml6
3 files changed, 9 insertions, 9 deletions
diff --git a/mullvad_daemon/Cargo.toml b/mullvad_daemon/Cargo.toml
index 2df00ca25e..417d831347 100644
--- a/mullvad_daemon/Cargo.toml
+++ b/mullvad_daemon/Cargo.toml
@@ -10,10 +10,10 @@ serde = "1.0"
serde_derive = "1.0"
log = "0.3"
env_logger = "0.4"
-jsonrpc-core = { git = "https://github.com/faern/jsonrpc", branch = "ws-close-handle" }
-jsonrpc-macros = { git = "https://github.com/faern/jsonrpc", branch = "ws-close-handle" }
-jsonrpc-pubsub = { git = "https://github.com/faern/jsonrpc", branch = "ws-close-handle" }
-jsonrpc-ws-server = { git = "https://github.com/faern/jsonrpc", branch = "ws-close-handle" }
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc" }
+jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc" }
+jsonrpc-pubsub = { git = "https://github.com/paritytech/jsonrpc" }
+jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc" }
uuid = { version = "0.5", features = ["v4"] }
lazy_static = "0.2"
diff --git a/talpid_core/Cargo.toml b/talpid_core/Cargo.toml
index 4538630f39..4b22bf38bf 100644
--- a/talpid_core/Cargo.toml
+++ b/talpid_core/Cargo.toml
@@ -10,8 +10,8 @@ error-chain = "0.10"
log = "0.3"
lazy_static = "0.2"
mktemp = "0.3"
-jsonrpc-core = { git = "https://github.com/faern/jsonrpc", branch = "ws-close-handle" }
-jsonrpc-macros = { git = "https://github.com/faern/jsonrpc", branch = "ws-close-handle" }
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc" }
+jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc" }
[target.'cfg(unix)'.dependencies]
libc = "0.2.20"
diff --git a/talpid_ipc/Cargo.toml b/talpid_ipc/Cargo.toml
index 630cb1ced1..5d2a99233d 100644
--- a/talpid_ipc/Cargo.toml
+++ b/talpid_ipc/Cargo.toml
@@ -9,12 +9,12 @@ error-chain = "0.10"
serde = "1.0"
serde_json = "1.0"
log = "0.3"
-jsonrpc-core = { git = "https://github.com/faern/jsonrpc", branch = "ws-close-handle" }
-jsonrpc-ws-server = { git = "https://github.com/faern/jsonrpc", branch = "ws-close-handle" }
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc" }
+jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc" }
ws = { git = "https://github.com/tomusdrw/ws-rs" }
url = "1.4"
[dev-dependencies]
assert_matches = "1.0"
env_logger = "0.4"
-jsonrpc-macros = { git = "https://github.com/faern/jsonrpc", branch = "ws-close-handle" }
+jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc" }