58 lines
2.4 KiB
Diff
58 lines
2.4 KiB
Diff
From 99c71d0db95b3626552a1375d5dfba22dc82ebfd Mon Sep 17 00:00:00 2001
|
|
From: lingsheng <lingsheng@huawei.com>
|
|
Date: Fri, 30 Apr 2021 17:11:51 +0800
|
|
Subject: [PATCH] Fix build with rust nightly
|
|
|
|
---
|
|
.cargo/config.in | 2 +-
|
|
Cargo.lock | 2 +-
|
|
Cargo.toml | 4 ++--
|
|
3 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/.cargo/config.in b/.cargo/config.in
|
|
index a40e667b5a..c95e6e016b 100644
|
|
--- a/.cargo/config.in
|
|
+++ b/.cargo/config.in
|
|
@@ -3,9 +3,9 @@
|
|
# Please do not edit.
|
|
|
|
[source."https://github.com/shravanrn/nix/"]
|
|
-branch = "r0.13.1"
|
|
git = "https://github.com/shravanrn/nix/"
|
|
replace-with = "vendored-sources"
|
|
+rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e"
|
|
|
|
[source."https://github.com/mozilla/rkv"]
|
|
git = "https://github.com/mozilla/rkv"
|
|
diff --git a/Cargo.lock b/Cargo.lock
|
|
index 0b61796d7d..e97e8d080b 100644
|
|
--- a/Cargo.lock
|
|
+++ b/Cargo.lock
|
|
@@ -3196,7 +3196,7 @@ dependencies = [
|
|
[[package]]
|
|
name = "nix"
|
|
version = "0.13.1"
|
|
-source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
|
|
+source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
|
|
dependencies = [
|
|
"bitflags",
|
|
"cc",
|
|
diff --git a/Cargo.toml b/Cargo.toml
|
|
index 0b7ec008b8..910a62ee57 100644
|
|
--- a/Cargo.toml
|
|
+++ b/Cargo.toml
|
|
@@ -67,8 +67,8 @@ panic = "abort"
|
|
libudev-sys = { path = "dom/webauthn/libudev-sys" }
|
|
packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" }
|
|
rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" }
|
|
-nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
|
|
-spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
|
|
+nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
|
|
+spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" }
|
|
# failure's backtrace feature might break our builds, see bug 1608157.
|
|
failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
|
|
failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
|
|
--
|
|
2.23.0
|
|
|