diff options
| author | Emīls <emils@mullvad.net> | 2020-02-28 10:42:37 +0000 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2020-02-28 16:48:10 +0000 |
| commit | 8f04095a0bcf25991b362f07d8c8e6efe7ab2958 (patch) | |
| tree | d690e6d64bdbd24f9b7a14ff6d2cc221b3fac03e | |
| parent | 970186d44b9dc98bd38d98b73fed9229b3f67259 (diff) | |
| download | mullvadvpn-8f04095a0bcf25991b362f07d8c8e6efe7ab2958.tar.xz mullvadvpn-8f04095a0bcf25991b362f07d8c8e6efe7ab2958.zip | |
Use newer version of nix
| -rw-r--r-- | Cargo.lock | 16 | ||||
| -rw-r--r-- | mullvad-daemon/Cargo.toml | 1 | ||||
| -rw-r--r-- | talpid-core/Cargo.toml | 2 |
3 files changed, 17 insertions, 2 deletions
diff --git a/Cargo.lock b/Cargo.lock index 8c49e13408..1341249e2d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1272,6 +1272,7 @@ dependencies = [ "mullvad-paths 0.1.0", "mullvad-rpc 0.1.0", "mullvad-types 0.1.0", + "nix 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1525,6 +1526,18 @@ dependencies = [ ] [[package]] +name = "nix" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "nodrop" version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2443,7 +2456,7 @@ dependencies = [ "netlink-proto 0.1.1 (git+https://github.com/mullvad/netlink?rev=f768adfcc8c6b064ef7ae3c792c4c21d0d96d0b5)", "netlink-sys 0.1.0 (git+https://github.com/mullvad/netlink?rev=f768adfcc8c6b064ef7ae3c792c4c21d0d96d0b5)", "nftnl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "nix 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", "notify 4.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "openvpn-plugin 0.3.0 (git+https://github.com/mullvad/openvpn-plugin-rs?branch=auth-failed-event)", "os_pipe 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3313,6 +3326,7 @@ dependencies = [ "checksum nftnl-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d559148c09433fa20478524cb97ee3af7b6391d8edf19c709e9eb86a53f2bab" "checksum nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" "checksum nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3b2e0b4f3320ed72aaedb9a5ac838690a8047c7b275da22711fddff4f8a14229" +"checksum nix 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" "checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" "checksum notify 4.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1191efa2b8fe041decb55c238a125b7a1aeb6fad7a525133a02be5ec949ff3cb" "checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml index ddd41ff074..c2f934e716 100644 --- a/mullvad-daemon/Cargo.toml +++ b/mullvad-daemon/Cargo.toml @@ -45,6 +45,7 @@ android_logger = "0.8" [target.'cfg(unix)'.dependencies] libc = "0.2" +nix = "0.17" simple-signal = "1.1" [target.'cfg(windows)'.dependencies] diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml index 607c02349c..6221b14d8f 100644 --- a/talpid-core/Cargo.toml +++ b/talpid-core/Cargo.toml @@ -35,7 +35,7 @@ chrono = "0.4" [target.'cfg(unix)'.dependencies] -nix = "0.15" +nix = "0.17" tokio-process = "0.2" tokio-io = "0.1" |