base: unify syscall dependency to local path source
Change [workspace.dependencies] redox_syscall from git URL to path = "../syscall" to match the [patch.crates-io] source. This eliminates the dual-source 0.8.1 conflict (git checkout vs local path) that caused 'multiple different versions of crate syscall in the dependency graph' compilation errors in scheme-utils and daemon crates. The local fork at local/sources/syscall/ is upstream 79cb6d9 (0.8.1). parking_lot_core 0.9.12 still pulls redox_syscall 0.5.18 from crates.io (semver prevents the path patch from satisfying ^0.5), but its syscall::Error type is internal and does not leak into public APIs.
This commit is contained in:
+1
-1
@@ -111,7 +111,7 @@ redox-ioctl = { git = "https://gitlab.redox-os.org/redox-os/relibc.git" }
|
||||
redox-log = { git = "https://gitlab.redox-os.org/redox-os/redox-log.git" }
|
||||
redox-rt = { git = "https://gitlab.redox-os.org/redox-os/relibc.git", default-features = false }
|
||||
redox-scheme = "0.11.0"
|
||||
redox_syscall = { git = "https://gitlab.redox-os.org/redox-os/syscall.git", features = ["std"] }
|
||||
redox_syscall = { path = "../syscall", features = ["std"] }
|
||||
redox_termios = "0.1.3"
|
||||
ron = "0.8.1"
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
|
||||
Reference in New Issue
Block a user