vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'consolidate-deps' into 'main'

Browse Source 
consolidate several dependencies into the workspace

See merge request redox-os/base!195
This commit is contained in:
Jeremy Soller
2026-03-22 09:24:23 -06:00
parent 12034cf7b0 557a3d1954
commit 1a045bb752
24 changed files with 42 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
-1
View File
@@ -1327,7 +1327,6 @@ checksum = "6aa2c4e539b869820a2b82e1aef6ff40aa85e65decdd5185e83fb4b1249cd00f"
name = "nvmed"
version = "0.1.0"
dependencies = [
"arrayvec",
"bitflags 2.11.0",
"common",
"daemon",
Cargo.toml
+11
View File
@@ -78,10 +78,16 @@ bitflags = "2"
clap = "4"
drm = "0.14.2"
drm-sys = "0.8.1"
edid = "0.3.0" #TODO: edid is abandoned, fork it and maintain?
fdt = "0.1.5"
libc = "0.2.181"
log = "0.4"
libredox = "0.1.14"
orbclient = "0.3.51"
parking_lot = "0.12"
pico-args = "0.5"
plain = "0.2.3"
ransid = "0.4"
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" }
@@ -89,7 +95,12 @@ redox-rt = { git = "https://gitlab.redox-os.org/redox-os/relibc.git", default-fe
redox-scheme = "0.11.0"
redox_syscall = "0.7.3"
redox_termios = "0.1.3"
ron = "0.8.1"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
slab = "0.4.9"
smallvec = "1"
static_assertions = "1.1.0"
toml = "1"
[workspace.lints.clippy]
drivers/acpid/Cargo.toml
+4 -4
View File
@@ -9,17 +9,17 @@ edition = "2018"
[dependencies]
acpi = { git = "https://github.com/jackpot51/acpi.git" }
arrayvec = "0.7.6"
log.workspace = true
num-derive = "0.3"
num-traits = "0.2"
parking_lot = "0.12"
plain = "0.2.3"
parking_lot.workspace = true
plain.workspace = true
redox_syscall.workspace = true
redox_event.workspace = true
rustc-hash = "1.1.0"
thiserror = "1"
ron = "0.8.1"
arrayvec = "0.7.6"
ron.workspace = true
serde.workspace = true
amlserde = { path = "../amlserde" }
drivers/executor/Cargo.toml
+1 -1
View File
@@ -9,7 +9,7 @@ license = "MIT"
[dependencies]
log.workspace = true
redox_event.workspace = true
slab = "0.4.9"
slab.workspace = true
[lints]
workspace = true
drivers/graphics/console-draw/Cargo.toml
+1 -1
View File
@@ -7,7 +7,7 @@ edition = "2021"
[dependencies]
drm.workspace = true
orbclient.workspace = true
ransid = "0.4"
ransid.workspace = true
graphics-ipc = { path = "../graphics-ipc" }
drivers/graphics/driver-graphics/Cargo.toml
+1 -2
View File
@@ -7,8 +7,7 @@ edition = "2021"
[dependencies]
drm-fourcc = "2.2.0"
drm-sys.workspace = true
#TODO: edid is abandoned, fork it an maintain?
edid = "0.3.0"
edid.workspace = true #TODO: edid is abandoned, fork it and maintain?
log.workspace = true
redox-ioctl.workspace = true
redox-scheme.workspace = true
drivers/graphics/fbbootlogd/Cargo.toml
+1 -1
View File
@@ -7,7 +7,7 @@ edition = "2021"
[dependencies]
drm.workspace = true
orbclient.workspace = true
ransid = "0.4"
ransid.workspace = true
redox_event.workspace = true
redox_syscall.workspace = true
redox-scheme.workspace = true
drivers/graphics/fbcond/Cargo.toml
+1 -1
View File
@@ -8,7 +8,7 @@ edition = "2021"
drm.workspace = true
log.workspace = true
orbclient.workspace = true
ransid = "0.4"
ransid.workspace = true
redox_event.workspace = true
redox_syscall.workspace = true
redox-scheme.workspace = true
drivers/graphics/ihdgd/Cargo.toml
+1 -2
View File
@@ -7,8 +7,7 @@ edition = "2021"
[dependencies]
bitbang-hal = "0.3"
drm-sys.workspace = true
#TODO: edid is abandoned, fork it an maintain?
edid = "0.3.0"
edid.workspace = true #TODO: edid is abandoned, fork it and maintain?
#TODO: waiting for bitbang-hal to update to embedded-hal 1.0
embedded-hal = { version = "0.2.7", features = ["unproven"] }
log.workspace = true
drivers/graphics/vesad/Cargo.toml
+1 -1
View File
@@ -7,7 +7,7 @@ edition = "2021"
[dependencies]
drm-sys.workspace = true
orbclient.workspace = true
ransid = "0.4"
ransid.workspace = true
redox_syscall.workspace = true
redox_event.workspace = true
drivers/graphics/virtio-gpud/Cargo.toml
+1 -1
View File
@@ -8,7 +8,7 @@ authors = ["Anhad Singh <andypython@protonmail.com>"]
[dependencies]
drm-sys.workspace = true
log.workspace = true
static_assertions = "1.1.0"
static_assertions.workspace = true
futures = { version = "0.3.28", features = ["executor"] }
anyhow.workspace = true
drivers/hwd/Cargo.toml
+2 -2
View File
@@ -5,9 +5,9 @@ version = "0.1.0"
edition = "2018"
[dependencies]
fdt = "0.1.5"
fdt.workspace = true
log.workspace = true
ron = "0.8.1"
ron.workspace = true
libredox = { workspace = true, default-features = false, features = ["std", "call"] }
amlserde = { path = "../amlserde" }
drivers/net/virtio-netd/Cargo.toml
+1 -1
View File
@@ -6,7 +6,7 @@ edition = "2021"
[dependencies]
log.workspace = true
static_assertions = "1.1.0"
static_assertions.workspace = true
futures = { version = "0.3.28", features = ["executor"] }
virtio-core = { path = "../../virtio-core" }
drivers/pcid-spawner/Cargo.toml
+1 -1
View File
@@ -9,7 +9,7 @@ license = "MIT"
[dependencies]
anyhow.workspace = true
log.workspace = true
pico-args = "0.5"
pico-args.workspace = true
redox_syscall.workspace = true
serde.workspace = true
toml.workspace = true
drivers/pcid/Cargo.toml
+3 -3
View File
@@ -14,12 +14,12 @@ path = "src/lib.rs"
[dependencies]
bincode = "1.2"
fdt = "0.1.5"
fdt.workspace = true
libc.workspace = true
log.workspace = true
pci_types = "0.10.1"
pico-args = { version = "0.5", features = ["combined-flags"] }
plain = "0.2"
pico-args = { workspace = true, features = ["combined-flags"] }
plain.workspace = true
redox-scheme.workspace = true
redox_syscall.workspace = true
serde.workspace = true
drivers/storage/nvmed/Cargo.toml
+2 -3
View File
@@ -5,15 +5,14 @@ version = "0.1.0"
edition = "2021"
[dependencies]
arrayvec = "0.7"
bitflags.workspace = true
futures = "0.3"
libredox.workspace = true
log.workspace = true
parking_lot = "0.12.1"
parking_lot.workspace = true
redox_event.workspace = true
redox_syscall = { workspace = true, features = ["std"] }
smallvec = "1"
smallvec.workspace = true
executor = { path = "../../executor" }
common = { path = "../../common" }
drivers/storage/usbscsid/Cargo.toml
+1 -1
View File
@@ -11,7 +11,7 @@ license = "MIT"
[dependencies]
base64 = "0.11" # Only for debugging
libredox.workspace = true
plain = "0.2"
plain.workspace = true
driver-block = { path = "../driver-block" }
daemon = { path = "../../../daemon" }
redox_event.workspace = true
drivers/storage/virtio-blkd/Cargo.toml
+1 -1
View File
@@ -9,7 +9,7 @@ authors = ["Anhad Singh <andypython@protonmail.com>"]
anyhow.workspace = true
log.workspace = true
thiserror = "1.0.40"
static_assertions = "1.1.0"
static_assertions.workspace = true
futures = { version = "0.3.28", features = ["executor"] }
spin = "*"
drivers/usb/xhcid/Cargo.toml
+3 -3
View File
@@ -17,15 +17,15 @@ bitflags.workspace = true
chashmap = "2.2.2"
crossbeam-channel = "0.4"
futures = "0.3"
plain = "0.2"
plain.workspace = true
lazy_static = "1.4"
log.workspace = true
redox_event.workspace = true
redox-scheme.workspace = true
redox_syscall.workspace = true
serde.workspace = true
serde_json = "1"
smallvec = { version = "1", features = ["serde"] }
serde_json.workspace = true
smallvec = { workspace = true, features = ["serde"] }
thiserror = "1"
toml.workspace = true
drivers/virtio-core/Cargo.toml
+1 -1
View File
@@ -6,7 +6,7 @@ edition = "2021"
authors = ["Anhad Singh <andypython@protonmail.com>"]
[dependencies]
static_assertions = "1.1.0"
static_assertions.workspace = true
bitflags.workspace = true
redox_syscall.workspace = true
libredox.workspace = true
init/Cargo.toml
+1 -1
View File
@@ -8,7 +8,7 @@ license = "MIT"
[dependencies]
libredox.workspace = true
serde.workspace = true
serde_json = "1"
serde_json.workspace = true
toml.workspace = true
config = { path = "../config" }
initfs/Cargo.toml
+1 -1
View File
@@ -9,7 +9,7 @@ license = "MIT"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
plain = "0.2"
plain.workspace = true
[lints]
workspace = true
initfs/tools/Cargo.toml
+1 -1
View File
@@ -22,7 +22,7 @@ clap = {workspace = true, features = ["cargo"]}
env_logger = "0.8"
log.workspace = true
pathdiff = "0.2.1"
plain = "0.2"
plain.workspace = true
twox-hash = "1.6"
redox-initfs = {path = ".."}
ramfs/Cargo.toml
+1 -1
View File
@@ -14,7 +14,7 @@ redox_syscall.workspace = true
redox-scheme.workspace = true
libredox = { workspace = true, features = ["call"] }
indexmap = "2.5.0"
slab = "0.4.9"
slab.workspace = true
[lints]
workspace = true