129 lines
8.2 KiB
Plaintext
129 lines
8.2 KiB
Plaintext
From 2d73065e47d30dcab54155493388f06e1fd69db6 Mon Sep 17 00:00:00 2001
|
|
From: Niels Sascha Reedijk <niels.reedijk@gmail.com>
|
|
Date: Mon, 16 Oct 2017 06:42:09 +0000
|
|
Subject: [PATCH] Haiku: fix dependencies
|
|
|
|
---
|
|
Cargo.lock | 26 +++++++++++++-------------
|
|
Cargo.toml | 2 +-
|
|
2 files changed, 14 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/Cargo.lock b/Cargo.lock
|
|
index fd03cdd..40ae3ca 100644
|
|
--- a/Cargo.lock
|
|
+++ b/Cargo.lock
|
|
@@ -1,8 +1,8 @@
|
|
[root]
|
|
name = "cargo-vendor"
|
|
-version = "0.1.5"
|
|
+version = "0.1.6"
|
|
dependencies = [
|
|
- "cargo 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
+ "cargo 0.17.0 (git+https://github.com/nielx/cargo?branch=cargo-haiku-0.17.0)",
|
|
"env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"rustc-serialize 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
]
|
|
@@ -40,17 +40,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
[[package]]
|
|
name = "cargo"
|
|
version = "0.17.0"
|
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
+source = "git+https://github.com/nielx/cargo?branch=cargo-haiku-0.17.0#ee129f92b11a54d127c33ae7498c6ceecb54d654"
|
|
dependencies = [
|
|
"advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
- "crates-io 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
+ "crates-io 0.6.0 (git+https://github.com/nielx/cargo?branch=cargo-haiku-0.17.0)",
|
|
"crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"curl 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"docopt 0.6.86 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"flate2 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
- "fs2 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
+ "fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"git2 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"git2-curl 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
@@ -59,7 +59,7 @@ dependencies = [
|
|
"libgit2-sys 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"miow 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
- "num_cpus 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
+ "num_cpus 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"openssl 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"psapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
@@ -90,7 +90,7 @@ dependencies = [
|
|
[[package]]
|
|
name = "crates-io"
|
|
version = "0.6.0"
|
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
+source = "git+https://github.com/nielx/cargo?branch=cargo-haiku-0.17.0#ee129f92b11a54d127c33ae7498c6ceecb54d654"
|
|
dependencies = [
|
|
"curl 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"rustc-serialize 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
@@ -180,7 +180,7 @@ dependencies = [
|
|
|
|
[[package]]
|
|
name = "fs2"
|
|
-version = "0.3.0"
|
|
+version = "0.4.2"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
dependencies = [
|
|
"kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
@@ -367,7 +367,7 @@ dependencies = [
|
|
|
|
[[package]]
|
|
name = "num_cpus"
|
|
-version = "1.2.1"
|
|
+version = "1.4.0"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
dependencies = [
|
|
"libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
@@ -635,10 +635,10 @@ dependencies = [
|
|
"checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66"
|
|
"checksum aho-corasick 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "500909c4f87a9e52355b26626d890833e9e1d53ac566db76c36faa984b889699"
|
|
"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
|
|
-"checksum cargo 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d743b5e0ae7ef24e1053780bce3dc5ac47a923dfafe5759244980607716571a"
|
|
+"checksum cargo 0.17.0 (git+https://github.com/nielx/cargo?branch=cargo-haiku-0.17.0)" = "<none>"
|
|
"checksum cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de1e760d7b6535af4241fca8bd8adf68e2e7edacc6b29f5d399050c5e48cf88c"
|
|
"checksum cmake 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "a3a6805df695087e7c1bcd9a82e03ad6fb864c8e67ac41b1348229ce5b7f0407"
|
|
-"checksum crates-io 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "14982f07738e88d42b575b67b8a902da50473efdcb30b9c43a27e08f399a1943"
|
|
+"checksum crates-io 0.6.0 (git+https://github.com/nielx/cargo?branch=cargo-haiku-0.17.0)" = "<none>"
|
|
"checksum crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97"
|
|
"checksum curl 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "52f97f136f098f09c5d377e150afde7b29f43690cd1d80edb71409fda11c904e"
|
|
"checksum curl-sys 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ec50c305e9de46198e8911556355f4aea46f2002cb25d2388d421404e91b60d9"
|
|
@@ -648,7 +648,7 @@ dependencies = [
|
|
"checksum error-chain 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "318cb3c71ee4cdea69fdc9e15c173b245ed6063e1709029e8fd32525a881120f"
|
|
"checksum filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "5363ab8e4139b8568a6237db5248646e5a8a2f89bd5ccb02092182b11fd3e922"
|
|
"checksum flate2 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "d4e4d0c15ef829cbc1b7cda651746be19cceeb238be7b1049227b14891df9e25"
|
|
-"checksum fs2 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "640001e1bd865c7c32806292822445af576a6866175b5225aa2087ca5e3de551"
|
|
+"checksum fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9ab76cfd2aaa59b7bf6688ad9ba15bbae64bff97f04ea02144cfd3443e5c2866"
|
|
"checksum gcc 0.3.43 (registry+https://github.com/rust-lang/crates.io-index)" = "c07c758b972368e703a562686adb39125707cc1ef3399da8c019fc6c2498a75d"
|
|
"checksum gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0912515a8ff24ba900422ecda800b52f4016a56251922d397c576bf92c690518"
|
|
"checksum git2 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "046ae03385257040b2a35e56d9669d950dd911ba2bf48202fbef73ee6aab27b2"
|
|
@@ -669,7 +669,7 @@ dependencies = [
|
|
"checksum miniz-sys 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "28eaee17666671fa872e567547e8428e83308ebe5808cdf6a0e28397dbe2c726"
|
|
"checksum miow 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3e690c5df6b2f60acd45d56378981e827ff8295562fc8d34f573deb267a59cd1"
|
|
"checksum net2 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)" = "5edf9cb6be97212423aed9413dd4729d62b370b5e1c571750e882cebbbc1e3e2"
|
|
-"checksum num_cpus 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a225d1e2717567599c24f88e49f00856c6e825a12125181ee42c4257e3688d39"
|
|
+"checksum num_cpus 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca313f1862c7ec3e0dfe8ace9fa91b1d9cb5c84ace3d00f5ec4216238e93c167"
|
|
"checksum openssl 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0c00da69323449142e00a5410f0e022b39e8bbb7dc569cee8fc6af279279483c"
|
|
"checksum openssl-probe 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "756d49c8424483a3df3b5d735112b4da22109ced9a8294f1f5cdf80fb3810919"
|
|
"checksum openssl-sys 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b1482f9a06f56c906007e17ea14d73d102210b5d27bc948bf5e175f493f3f7c3"
|
|
diff --git a/Cargo.toml b/Cargo.toml
|
|
index d9f2992..8afd80a 100644
|
|
--- a/Cargo.toml
|
|
+++ b/Cargo.toml
|
|
@@ -12,6 +12,6 @@ filesystem.
|
|
"""
|
|
|
|
[dependencies]
|
|
-cargo = "0.17"
|
|
+cargo = { git = "https://github.com/nielx/cargo", branch = "cargo-haiku-0.17.0" }
|
|
rustc-serialize = "0.3"
|
|
env_logger = "0.4"
|
|
--
|
|
2.7.0
|
|
|