From e97f26c7632b1033ca062199db5633f3236821ed Mon Sep 17 00:00:00 2001 From: 4lDO2 <4lDO2@protonmail.com> Date: Mon, 15 Jul 2024 17:31:12 +0200 Subject: [PATCH] Use crates.io syscall dependency. --- Cargo.lock | 19 ++++++------------- Cargo.toml | 5 +---- redox-rt/Cargo.toml | 2 +- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 70d18d453..1710b7ff4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -369,7 +369,7 @@ dependencies = [ "generic-rt", "goblin", "plain", - "redox_syscall 0.5.2 (git+https://gitlab.redox-os.org/redox-os/syscall.git)", + "redox_syscall", ] [[package]] @@ -379,21 +379,14 @@ source = "git+https://gitlab.redox-os.org/redox-os/event.git#36ac5a57a8573f7546d dependencies = [ "bitflags", "libredox", - "redox_syscall 0.5.2 (git+https://gitlab.redox-os.org/redox-os/syscall.git?rev=387f1c3)", + "redox_syscall", ] [[package]] name = "redox_syscall" -version = "0.5.2" -source = "git+https://gitlab.redox-os.org/redox-os/syscall.git?rev=387f1c3#387f1c332681a3cabe04294bce801e9c8c433df5" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_syscall" -version = "0.5.2" -source = "git+https://gitlab.redox-os.org/redox-os/syscall.git#387f1c332681a3cabe04294bce801e9c8c433df5" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ "bitflags", ] @@ -422,7 +415,7 @@ dependencies = [ "redox-path", "redox-rt", "redox_event", - "redox_syscall 0.5.2 (git+https://gitlab.redox-os.org/redox-os/syscall.git?rev=387f1c3)", + "redox_syscall", "sc", "scrypt", "sha-crypt", diff --git a/Cargo.toml b/Cargo.toml index 159262b0a..e3ebeb48a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -59,7 +59,7 @@ features = ["c_api"] sc = "0.2.3" [target.'cfg(target_os = "redox")'.dependencies] -redox_syscall = "0.5.2" +redox_syscall = "0.5.3" redox-rt = { path = "redox-rt" } redox-path = "0.2" redox_event = { git = "https://gitlab.redox-os.org/redox-os/event.git", default-features = false, features = ["redox_syscall"] } @@ -74,6 +74,3 @@ panic = "abort" [profile.release] panic = "abort" - -[patch.crates-io] -redox_syscall = { git = "https://gitlab.redox-os.org/redox-os/syscall.git", rev = "387f1c3" } diff --git a/redox-rt/Cargo.toml b/redox-rt/Cargo.toml index 00d6d3c20..33502bb75 100644 --- a/redox-rt/Cargo.toml +++ b/redox-rt/Cargo.toml @@ -12,6 +12,6 @@ description = "Libc-independent runtime for Redox" bitflags = "2" goblin = { version = "0.7", default-features = false, features = ["elf32", "elf64", "endian_fd"] } plain = "0.2" -redox_syscall = "0.5.2" +redox_syscall = "0.5.3" generic-rt = { path = "../generic-rt" } -- GitLab