fix(base): bump redox-scheme 0.11.0->0.11.1 and redox_syscall 0.7.4->0.8.1
Base build was failing with: error[E0277]: the trait `From<libredox::error::Error>` is not implemented for `syscall::Error` error: could not compile `scheme-utils` (lib) due to 13 previous errors error: could not compile `daemon` (lib) due to 6 previous errors because the workspace pinned redox-scheme 0.11.0 (libredox 0.1.12) and redox_syscall 0.7.4. The newer libredox 0.1.16/0.1.17 has a different Error API. Bump both to versions compatible with libredox 0.1.17: redox-scheme 0.11.0 -> 0.11.1 (requires libredox 0.1.17) redox_syscall 0.7.4 -> 0.8.1 (requires libredox 0.1.17) This matches the Red Bear base fork at local/sources/base.
This commit is contained in:
@@ -0,0 +1,12 @@
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -93,8 +93,8 @@ redox_event = "0.4.6"
|
||||
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 = { version = "0.7.4", features = ["std"] }
|
||||
+redox-scheme = "0.11.1"
|
||||
+redox_syscall = { version = "0.8.1", features = ["std"] }
|
||||
redox_termios = "0.1.3"
|
||||
ron = "0.8.1"
|
||||
@@ -3,6 +3,7 @@ git = "https://gitlab.redox-os.org/redox-os/base.git"
|
||||
rev = "463f76b9608a896e6f6c9f63457f57f6409873c7"
|
||||
patches = [
|
||||
"P0-daemon-fix-init-notify-unwrap.patch",
|
||||
"P0-redox-scheme-bump-0.11.1.patch",
|
||||
"P0-workspace-add-bootstrap.patch",
|
||||
"P0-init-continuous-scheduling.patch",
|
||||
"P0-dhcpd-auto-iface.patch",
|
||||
|
||||
Reference in New Issue
Block a user