Bug 1684261 - Fix build with rust nightly. r=jrmuizel
authorEmilio Cobos Álvarez <emilio@crisal.io>
Sat, 26 Dec 2020 18:16:05 +0000
changeset 561762 48f46a7eada94d51d8bd508b5122642865ddef3d
parent 561761 f1bc2b9069ab9b6a246c10501782c0af267c77d7
child 561763 8a273e648899b02b4c5400f61f7162ed2609ffa4
push id133364
push userealvarez@mozilla.com
push dateSat, 26 Dec 2020 18:42:36 +0000
treeherderautoland@48f46a7eada9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel
bugs1684261
milestone86.0a1
first release with
nightly linux32
48f46a7eada9 / 86.0a1 / 20201226213351 / files
nightly linux64
48f46a7eada9 / 86.0a1 / 20201226213351 / files
nightly mac
48f46a7eada9 / 86.0a1 / 20201226213351 / files
nightly win32
48f46a7eada9 / 86.0a1 / 20201226213351 / files
nightly win64
48f46a7eada9 / 86.0a1 / 20201226213351 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1684261 - Fix build with rust nightly. r=jrmuizel Fixes errors like: dependency (nix) specification is ambiguous. Only one of `branch`, `tag` or `rev` is allowed. I've left the most specific dependency, but for wgpu the rev is not right, so I've kept the branch which effectively preserves behavior. Differential Revision: https://phabricator.services.mozilla.com/D100485
.cargo/config.in
Cargo.lock
Cargo.toml
--- a/.cargo/config.in
+++ b/.cargo/config.in
@@ -8,19 +8,19 @@ replace-with = "vendored-sources"
 rev = "831460c4b5120d9a74744d542f39a95b9816b5ab"
 
 [source."https://github.com/zakarumych/gpu-alloc"]
 git = "https://github.com/zakarumych/gpu-alloc"
 replace-with = "vendored-sources"
 rev = "d07be73f9439a37c89f5b72f2500cbf0eb4ff613"
 
 [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/neqo"]
 git = "https://github.com/mozilla/neqo"
 replace-with = "vendored-sources"
 tag = "v0.4.19"
 
 [source."https://github.com/mozilla/mp4parse-rust"]
 git = "https://github.com/mozilla/mp4parse-rust"
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3447,17 +3447,17 @@ source = "registry+https://github.com/ru
 checksum = "0cdc457076c78ab54d5e0d6fa7c47981757f1e34dc39ff92787f217dede586c4"
 dependencies = [
  "unreachable",
 ]
 
 [[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",
  "cfg-if 0.1.10",
  "libc",
  "void",
 ]
 
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -70,18 +70,18 @@ opt-level = 1
 [profile.release.build-override]
 opt-level = 1
 
 [patch.crates-io]
 chardetng = { git = "https://github.com/hsivonen/chardetng", rev="7d5e0608d3e012bdfea3bd199111e3546607dd31" }
 libudev-sys = { path = "dom/webauthn/libudev-sys" }
 packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="0917fe780032a6bbb23d71be545f9c1834128d75" }
 rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="f3cace4fb8b53db0849c62af4fa62bade5a620f7" }
-nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
-spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu4", rev = "e9eff10f964957e7a001c5f712effe17ce09aa99" }
+nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
+spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu4" }
 # 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" }
 
 [patch.crates-io.cranelift-codegen]
 git = "https://github.com/mozilla-spidermonkey/wasmtime"
 rev = "3334d92350da40b90d2529c147db3ea44918b558"