From f740b61774543f418585a81ffa00df60eb63f16e Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 20 Jan 2026 10:12:08 -0700 Subject: [PATCH 1/3] Use workspace dependencies for many common crates --- Cargo.lock | 163 ++++++++++---------- Cargo.toml | 18 ++- audiod/Cargo.toml | 8 +- bootstrap/Cargo.lock | 25 +-- bootstrap/Cargo.toml | 4 +- daemon/Cargo.toml | 2 +- drivers/acpid/Cargo.toml | 10 +- drivers/audio/ac97d/Cargo.toml | 10 +- drivers/audio/ihdad/Cargo.toml | 10 +- drivers/audio/sb16d/Cargo.toml | 10 +- drivers/common/Cargo.toml | 8 +- drivers/executor/Cargo.toml | 4 +- drivers/graphics/bgad/Cargo.toml | 10 +- drivers/graphics/console-draw/Cargo.toml | 2 +- drivers/graphics/driver-graphics/Cargo.toml | 8 +- drivers/graphics/fbbootlogd/Cargo.toml | 10 +- drivers/graphics/fbcond/Cargo.toml | 12 +- drivers/graphics/graphics-ipc/Cargo.toml | 8 +- drivers/graphics/ihdgd/Cargo.toml | 10 +- drivers/graphics/vesad/Cargo.toml | 8 +- drivers/graphics/virtio-gpud/Cargo.toml | 10 +- drivers/hwd/Cargo.toml | 2 +- drivers/input/ps2d/Cargo.toml | 12 +- drivers/input/usbhidd/Cargo.toml | 6 +- drivers/inputd/Cargo.toml | 10 +- drivers/net/alxd/Cargo.toml | 8 +- drivers/net/driver-network/Cargo.toml | 6 +- drivers/net/e1000d/Cargo.toml | 8 +- drivers/net/ixgbed/Cargo.toml | 6 +- drivers/net/rtl8139d/Cargo.toml | 8 +- drivers/net/rtl8168d/Cargo.toml | 8 +- drivers/net/virtio-netd/Cargo.toml | 6 +- drivers/pcid-spawner/Cargo.toml | 4 +- drivers/pcid/Cargo.toml | 10 +- drivers/redoxerd/Cargo.toml | 8 +- drivers/storage/ahcid/Cargo.toml | 8 +- drivers/storage/bcm2835-sdhcid/Cargo.toml | 6 +- drivers/storage/driver-block/Cargo.toml | 8 +- drivers/storage/ided/Cargo.toml | 8 +- drivers/storage/lived/Cargo.toml | 6 +- drivers/storage/nvmed/Cargo.toml | 8 +- drivers/storage/usbscsid/Cargo.toml | 6 +- drivers/storage/virtio-blkd/Cargo.toml | 8 +- drivers/usb/usbhubd/Cargo.toml | 4 +- drivers/usb/xhcid/Cargo.toml | 10 +- drivers/vboxd/Cargo.toml | 8 +- drivers/virtio-core/Cargo.toml | 8 +- init/Cargo.toml | 2 +- initfs/Cargo.toml | 2 +- initfs/archive-common/Cargo.toml | 2 +- initfs/tools/Cargo.toml | 2 +- ipcd/Cargo.toml | 12 +- logd/Cargo.toml | 6 +- netstack/Cargo.toml | 12 +- ptyd/Cargo.toml | 10 +- ramfs/Cargo.toml | 6 +- randd/Cargo.toml | 6 +- zerod/Cargo.toml | 6 +- 58 files changed, 310 insertions(+), 296 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 49b26b9965..db233ef898 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -326,9 +326,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.19.0" +version = "3.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" +checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" [[package]] name = "byte-tools" @@ -353,7 +353,7 @@ checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.114", ] [[package]] @@ -364,9 +364,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.2.49" +version = "1.2.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90583009037521a116abf44494efecd645ba48b6622457080f080b85544e2215" +checksum = "755d2fce177175ffca841e9a06afdb2c4ab0f593d53b4dee48147dfaade85932" dependencies = [ "find-msvc-tools", "shlex", @@ -396,9 +396,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" +checksum = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118" dependencies = [ "iana-time-zone", "js-sys", @@ -424,18 +424,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.53" +version = "4.5.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8" +checksum = "c6e6ff9dcd79cff5cd969a17a545d79e84ab086e444102a591e288a8aa3ce394" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.53" +version = "4.5.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00" +checksum = "fa42cf4d2b7a41bc8f663a7cab4031ebafa1bf3875705bfaf8466dc60ab52c00" dependencies = [ "anstream", "anstyle", @@ -445,9 +445,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d" +checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32" [[package]] name = "colorchoice" @@ -568,7 +568,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.114", ] [[package]] @@ -577,7 +577,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e" dependencies = [ - "thiserror 2.0.17", + "thiserror 2.0.18", ] [[package]] @@ -788,13 +788,13 @@ checksum = "784a4df722dc6267a04af36895398f59d21d07dce47232adf31ec0ff2fa45e67" [[package]] name = "fdt" version = "0.2.0-alpha1" -source = "git+https://github.com/repnop/fdt.git#059bb2383873f8001959456e36ec123228f67642" +source = "git+https://github.com/repnop/fdt.git#124145d5a069f7fe7426fc73f0696aa3c3ef0cae" [[package]] name = "find-msvc-tools" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" +checksum = "8591b0bcc8a98a64310a2fae1bb3e9b8564dd10e381e6e28010fde8e8e8568db" [[package]] name = "fuchsia-cprng" @@ -858,7 +858,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.114", ] [[package]] @@ -903,13 +903,13 @@ dependencies = [ [[package]] name = "generic-rt" version = "0.1.0" -source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#b17df4daf5e72838d1afb2be83564e527adfe910" +source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#5d378c146078a58c025ad9c857402c983e5e8b37" [[package]] name = "getrandom" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" dependencies = [ "cfg-if 1.0.4", "libc", @@ -1103,9 +1103,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.12.1" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2" +checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" dependencies = [ "equivalent", "hashbrown", @@ -1165,9 +1165,9 @@ checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" [[package]] name = "itoa" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" [[package]] name = "ixgbed" @@ -1185,9 +1185,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.83" +version = "0.3.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8" +checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3" dependencies = [ "once_cell", "wasm-bindgen", @@ -1201,8 +1201,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.177" -source = "git+https://gitlab.redox-os.org/redox-os/liblibc.git?branch=redox-0.2#d795af0cee4d200c549a7134d50ce394ff4a74d5" +version = "0.2.180" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" [[package]] name = "libredox" @@ -1384,7 +1385,7 @@ checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" [[package]] name = "orbclient" version = "0.3.50" -source = "git+https://gitlab.redox-os.org/redox-os/orbclient.git#77c28e88fcb180c750175f2dcf5c7342d357ab26" +source = "git+https://gitlab.redox-os.org/redox-os/orbclient#77c28e88fcb180c750175f2dcf5c7342d357ab26" dependencies = [ "libc", "libredox", @@ -1555,14 +1556,14 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.114", ] [[package]] name = "proc-macro2" -version = "1.0.103" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" +checksum = "535d180e0ecab6268a3e718bb9fd44db66bbbc256257165fc699dadf70d16fe7" dependencies = [ "unicode-ident", ] @@ -1603,9 +1604,9 @@ checksum = "8bb0fd6580eeed0103c054e3fba2c2618ff476943762f28a645b63b8692b21c9" [[package]] name = "quote" -version = "1.0.42" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" +checksum = "dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a" dependencies = [ "proc-macro2", ] @@ -1699,7 +1700,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.16", + "getrandom 0.2.17", ] [[package]] @@ -1766,7 +1767,7 @@ version = "0.2.0" dependencies = [ "anyhow", "archive-common", - "clap 4.5.53", + "clap 4.5.54", "env_logger", "log", "plain", @@ -1777,7 +1778,7 @@ dependencies = [ [[package]] name = "redox-ioctl" version = "0.1.0" -source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#99e8cd93e0d125010130d8e3aee7d343735d8b5c" +source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#5d378c146078a58c025ad9c857402c983e5e8b37" dependencies = [ "drm-sys", "redox_syscall 0.6.0", @@ -1804,7 +1805,7 @@ checksum = "436d45c2b6a5b159d43da708e62b25be3a4a3d5550d654b72216ade4c4bfd717" [[package]] name = "redox-rt" version = "0.1.0" -source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#b17df4daf5e72838d1afb2be83564e527adfe910" +source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#5d378c146078a58c025ad9c857402c983e5e8b37" dependencies = [ "bitflags 2.10.0", "generic-rt", @@ -1999,12 +2000,6 @@ version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" -[[package]] -name = "ryu" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" - [[package]] name = "sb16d" version = "0.1.0" @@ -2063,7 +2058,7 @@ checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.114", ] [[package]] @@ -2116,20 +2111,20 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.114", ] [[package]] name = "serde_json" -version = "1.0.145" +version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" +checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ "itoa", "memchr 2.7.6", - "ryu", "serde", "serde_core", + "zmij", ] [[package]] @@ -2262,9 +2257,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.111" +version = "2.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" +checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" dependencies = [ "proc-macro2", "quote", @@ -2310,11 +2305,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.17" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" +checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" dependencies = [ - "thiserror-impl 2.0.17", + "thiserror-impl 2.0.18", ] [[package]] @@ -2325,18 +2320,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.114", ] [[package]] name = "thiserror-impl" -version = "2.0.17" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" +checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.114", ] [[package]] @@ -2388,7 +2383,7 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.4", "rand 0.8.5", "static_assertions", ] @@ -2623,18 +2618,18 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasip2" -version = "1.0.1+wasi-0.2.4" +version = "1.0.2+wasi-0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" dependencies = [ "wit-bindgen", ] [[package]] name = "wasm-bindgen" -version = "0.2.106" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd" +checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566" dependencies = [ "cfg-if 1.0.4", "once_cell", @@ -2645,9 +2640,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.106" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3" +checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2655,22 +2650,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.106" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40" +checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55" dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.114", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.106" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4" +checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12" dependencies = [ "unicode-ident", ] @@ -2727,7 +2722,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.114", ] [[package]] @@ -2738,7 +2733,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.114", ] [[package]] @@ -2785,9 +2780,9 @@ dependencies = [ [[package]] name = "wit-bindgen" -version = "0.46.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" +checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" [[package]] name = "xhcid" @@ -2817,22 +2812,22 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.31" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3" +checksum = "668f5168d10b9ee831de31933dc111a459c97ec93225beb307aed970d1372dfd" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.31" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a" +checksum = "2c7962b26b0a8685668b671ee4b54d007a67d4eaf05fda79ac0ecf41e32270f1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.114", ] [[package]] @@ -2844,3 +2839,9 @@ dependencies = [ "redox-scheme", "redox_syscall 0.6.0", ] + +[[package]] +name = "zmij" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfcd145825aace48cff44a8844de64bf75feec3080e0aa5cdbde72961ae51a65" diff --git a/Cargo.toml b/Cargo.toml index 167ce4a827..651ad56140 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -72,14 +72,24 @@ members = [ # Bootstrap needs it's own profile configuration exclude = ["bootstrap"] +# Low-level Redox OS crates should be kept in sync using workspace dependencies +# Remember to also update bootstrap dependencies, those are not in the workspace [workspace.dependencies] +libc = "0.2.180" +log = "0.4" +# libredox 0.1.12 uses redox_syscall 0.7, wait until that is supported +libredox = "=0.1.11" orbclient = { git = "https://gitlab.redox-os.org/redox-os/orbclient" } +# redox_event 0.4.3 uses redox_syscall 0.7, wait until that is supported +redox_event = "=0.4.2" +redox-ioctl = { git = "https://gitlab.redox-os.org/redox-os/relibc.git" } +redox-log = "0.1.4" +redox-rt = { git = "https://gitlab.redox-os.org/redox-os/relibc.git", default-features = false } +redox-scheme = "0.8.3" +redox_syscall = "0.6" +redox_termios = "0.1.3" [patch.crates-io] -# Needs libc 0.2 backport of https://github.com/rust-lang/libc/pull/4825 -libc = { git = "https://gitlab.redox-os.org/redox-os/liblibc.git", branch = "redox-0.2" } -orbclient = { git = "https://gitlab.redox-os.org/redox-os/orbclient.git", version = "0.3.44" } - # Rustix doesn't support ioctls on Redox OS rustix = { git = "https://github.com/jackpot51/rustix.git", branch = "redox-ioctl" } drm = { git = "https://github.com/Smithay/drm-rs.git" } diff --git a/audiod/Cargo.toml b/audiod/Cargo.toml index 70e3f038d4..915a385051 100644 --- a/audiod/Cargo.toml +++ b/audiod/Cargo.toml @@ -6,9 +6,9 @@ edition = "2021" [dependencies] daemon = { path = "../daemon" } -redox_syscall = { version = "0.6", features = ["std"] } -libc = "0.2" -libredox = { version = "0.1.10", features = ["mkns"] } -redox-scheme = "0.8.3" +redox_syscall = { workspace = true, features = ["std"] } +libc.workspace = true +libredox = { workspace = true, features = ["mkns"] } +redox-scheme.workspace = true anyhow = "1.0.97" ioslice = "0.6.0" diff --git a/bootstrap/Cargo.lock b/bootstrap/Cargo.lock index 0eb90899c6..3ec912b073 100644 --- a/bootstrap/Cargo.lock +++ b/bootstrap/Cargo.lock @@ -20,6 +20,7 @@ version = "0.0.0" dependencies = [ "arrayvec", "hashbrown", + "libredox", "linked_list_allocator", "log", "plain", @@ -40,7 +41,7 @@ checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" [[package]] name = "generic-rt" version = "0.1.0" -source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#a88ce5116a57cef347a87dbc1a4dd2949867110c" +source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#5d378c146078a58c025ad9c857402c983e5e8b37" [[package]] name = "goblin" @@ -64,9 +65,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.177" +version = "0.2.180" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" +checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" [[package]] name = "libredox" @@ -99,9 +100,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.28" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "plain" @@ -111,18 +112,18 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] name = "proc-macro2" -version = "1.0.103" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" +checksum = "535d180e0ecab6268a3e718bb9fd44db66bbbc256257165fc699dadf70d16fe7" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.42" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" +checksum = "dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a" dependencies = [ "proc-macro2", ] @@ -143,7 +144,7 @@ checksum = "436d45c2b6a5b159d43da708e62b25be3a4a3d5550d654b72216ade4c4bfd717" [[package]] name = "redox-rt" version = "0.1.0" -source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#a88ce5116a57cef347a87dbc1a4dd2949867110c" +source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#5d378c146078a58c025ad9c857402c983e5e8b37" dependencies = [ "bitflags", "generic-rt", @@ -215,9 +216,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.110" +version = "2.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea" +checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" dependencies = [ "proc-macro2", "quote", diff --git a/bootstrap/Cargo.toml b/bootstrap/Cargo.toml index 2ebbe71d5e..c6696c1257 100644 --- a/bootstrap/Cargo.toml +++ b/bootstrap/Cargo.toml @@ -15,10 +15,12 @@ hashbrown = { version = "0.15", default-features = false, features = [ "default-hasher", ] } linked_list_allocator = "0.10" +# libredox 0.1.12 uses redox_syscall 0.7, wait until that is supported +libredox = { version = "=0.1.11", default-features = false } log = { version = "0.4", default-features = false } plain = "0.2" redox-initfs = { path = "../initfs", default-features = false } -redox_syscall = { version = "0.6.0", default-features = false } +redox_syscall = { version = "0.6", default-features = false } redox-scheme = { version = "0.8.3", default-features = false } redox-path = "0.3.1" slab = { version = "0.4.9", default-features = false } diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml index b15ee92f7e..3dba6f6671 100644 --- a/daemon/Cargo.toml +++ b/daemon/Cargo.toml @@ -4,4 +4,4 @@ version = "0.0.0" edition = "2024" [dependencies] -libc = "0.2.177" +libc.workspace = true diff --git a/drivers/acpid/Cargo.toml b/drivers/acpid/Cargo.toml index 9c774fbfab..d3bf9c5a42 100644 --- a/drivers/acpid/Cargo.toml +++ b/drivers/acpid/Cargo.toml @@ -8,13 +8,13 @@ edition = "2018" [dependencies] acpi = { git = "https://github.com/jackpot51/acpi.git" } -log = "0.4" +log.workspace = true num-derive = "0.3" num-traits = "0.2" parking_lot = "0.12" plain = "0.2.3" -redox_syscall = "0.6" -redox_event = "0.4.1" +redox_syscall.workspace = true +redox_event.workspace = true rustc-hash = "1.1.0" thiserror = "1" ron = "0.8.1" @@ -22,7 +22,7 @@ ron = "0.8.1" amlserde = { path = "../amlserde" } common = { path = "../common" } daemon = { path = "../../daemon" } -libredox = "0.1.3" -redox-scheme = "0.8.3" +libredox.workspace = true +redox-scheme.workspace = true arrayvec = "0.7.6" serde = { version = "1.0.228", features = ["derive"] } diff --git a/drivers/audio/ac97d/Cargo.toml b/drivers/audio/ac97d/Cargo.toml index 8b8957a8e0..0adac3b61e 100644 --- a/drivers/audio/ac97d/Cargo.toml +++ b/drivers/audio/ac97d/Cargo.toml @@ -6,12 +6,12 @@ edition = "2021" [dependencies] bitflags = "1" common = { path = "../../common" } -libredox = "0.1.3" -log = "0.4" -redox_event = "0.4.1" -redox_syscall = "0.6" +libredox.workspace = true +log.workspace = true +redox_event.workspace = true +redox_syscall.workspace = true spin = "0.9" daemon = { path = "../../../daemon" } pcid = { path = "../../pcid" } -redox-scheme = "0.8.3" +redox-scheme.workspace = true diff --git a/drivers/audio/ihdad/Cargo.toml b/drivers/audio/ihdad/Cargo.toml index d8791c510c..eacf604d85 100644 --- a/drivers/audio/ihdad/Cargo.toml +++ b/drivers/audio/ihdad/Cargo.toml @@ -5,13 +5,13 @@ edition = "2021" [dependencies] bitflags = "2" -libredox = "0.1.3" -log = "0.4" -redox_event = "0.4.1" -redox_syscall = "0.6" +libredox.workspace = true +log.workspace = true +redox_event.workspace = true +redox_syscall.workspace = true spin = "0.9" common = { path = "../../common" } daemon = { path = "../../../daemon" } pcid = { path = "../../pcid" } -redox-scheme = "0.8.3" +redox-scheme.workspace = true diff --git a/drivers/audio/sb16d/Cargo.toml b/drivers/audio/sb16d/Cargo.toml index 17e60eb9f4..aa15378def 100644 --- a/drivers/audio/sb16d/Cargo.toml +++ b/drivers/audio/sb16d/Cargo.toml @@ -6,10 +6,10 @@ edition = "2021" [dependencies] bitflags = "2" common = { path = "../../common" } -libredox = "0.1.3" -log = "0.4" +libredox.workspace = true +log.workspace = true daemon = { path = "../../../daemon" } -redox_event = "0.4.1" -redox_syscall = "0.6" +redox_event.workspace = true +redox_syscall.workspace = true spin = "0.9" -redox-scheme = "0.8.3" +redox-scheme.workspace = true diff --git a/drivers/common/Cargo.toml b/drivers/common/Cargo.toml index 96c4551924..a9ed708f8d 100644 --- a/drivers/common/Cargo.toml +++ b/drivers/common/Cargo.toml @@ -8,7 +8,7 @@ license = "MIT" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -libredox = "0.1.3" -log = "0.4" -redox_syscall = { version = "0.6", features = ["std"] } -redox-log = "0.1.2" +libredox.workspace = true +log.workspace = true +redox_syscall = { workspace = true, features = ["std"] } +redox-log.workspace = true diff --git a/drivers/executor/Cargo.toml b/drivers/executor/Cargo.toml index 0d5b12f070..ec76a58128 100644 --- a/drivers/executor/Cargo.toml +++ b/drivers/executor/Cargo.toml @@ -7,6 +7,6 @@ license = "MIT" description = "Async framework for queue-based HW interfaces" [dependencies] -log = "0.4" -redox_event = "0.4.1" +log.workspace = true +redox_event.workspace = true slab = "0.4.9" diff --git a/drivers/graphics/bgad/Cargo.toml b/drivers/graphics/bgad/Cargo.toml index 2494f8fa4f..2219e4cff5 100644 --- a/drivers/graphics/bgad/Cargo.toml +++ b/drivers/graphics/bgad/Cargo.toml @@ -4,13 +4,13 @@ version = "0.1.0" edition = "2021" [dependencies] -orbclient = "0.3.47" -log = "0.4" -redox-scheme = "0.8.3" -redox_syscall = "0.6" +orbclient.workspace = true +log.workspace = true +redox-scheme.workspace = true +redox_syscall.workspace = true common = { path = "../../common" } daemon = { path = "../../../daemon" } inputd = { path = "../../inputd" } pcid = { path = "../../pcid" } -libredox = "0.1.3" +libredox.workspace = true diff --git a/drivers/graphics/console-draw/Cargo.toml b/drivers/graphics/console-draw/Cargo.toml index 80496fb250..0b2d52787d 100644 --- a/drivers/graphics/console-draw/Cargo.toml +++ b/drivers/graphics/console-draw/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] drm = "0.14" -orbclient = "0.3.27" +orbclient.workspace = true ransid = "0.4" graphics-ipc = { path = "../graphics-ipc" } diff --git a/drivers/graphics/driver-graphics/Cargo.toml b/drivers/graphics/driver-graphics/Cargo.toml index 66ddfc54b5..64bd3a5c89 100644 --- a/drivers/graphics/driver-graphics/Cargo.toml +++ b/drivers/graphics/driver-graphics/Cargo.toml @@ -5,10 +5,10 @@ edition = "2021" [dependencies] drm-sys = "0.8.0" -log = "0.4" -redox-scheme = "0.8.3" -redox_syscall = "0.6" -libredox = "0.1.3" +log.workspace = true +redox-scheme.workspace = true +redox_syscall.workspace = true +libredox.workspace = true common = { path = "../../common" } graphics-ipc = { path = "../graphics-ipc" } diff --git a/drivers/graphics/fbbootlogd/Cargo.toml b/drivers/graphics/fbbootlogd/Cargo.toml index 0df28673a6..e3f6767a82 100644 --- a/drivers/graphics/fbbootlogd/Cargo.toml +++ b/drivers/graphics/fbbootlogd/Cargo.toml @@ -5,17 +5,17 @@ edition = "2021" [dependencies] drm = "0.14.1" -orbclient = "0.3.27" +orbclient.workspace = true ransid = "0.4" -redox_event = "0.4" -redox_syscall = "0.6" -redox-scheme = "0.8.3" +redox_event.workspace = true +redox_syscall.workspace = true +redox-scheme.workspace = true console-draw = { path = "../console-draw" } daemon = { path = "../../../daemon" } graphics-ipc = { path = "../graphics-ipc" } inputd = { path = "../../inputd" } -libredox = "0.1.3" +libredox.workspace = true [features] default = [] diff --git a/drivers/graphics/fbcond/Cargo.toml b/drivers/graphics/fbcond/Cargo.toml index 6aed8031e7..b5f555f285 100644 --- a/drivers/graphics/fbcond/Cargo.toml +++ b/drivers/graphics/fbcond/Cargo.toml @@ -5,19 +5,19 @@ edition = "2021" [dependencies] drm = "0.14.1" -log = "0.4" -orbclient = "0.3.27" +log.workspace = true +orbclient.workspace = true ransid = "0.4" -redox_event = "0.4" -redox_syscall = "0.6" -redox-scheme = "0.8.3" +redox_event.workspace = true +redox_syscall.workspace = true +redox-scheme.workspace = true common = { path = "../../common" } console-draw = { path = "../console-draw" } daemon = { path = "../../../daemon" } graphics-ipc = { path = "../graphics-ipc" } inputd = { path = "../../inputd" } -libredox = "0.1.11" +libredox.workspace = true [features] default = [] diff --git a/drivers/graphics/graphics-ipc/Cargo.toml b/drivers/graphics/graphics-ipc/Cargo.toml index 5ad5afd9a0..f1584f9bea 100644 --- a/drivers/graphics/graphics-ipc/Cargo.toml +++ b/drivers/graphics/graphics-ipc/Cargo.toml @@ -5,9 +5,9 @@ edition = "2021" [dependencies] drm = "0.14" -log = "0.4" -libredox = "0.1.3" -redox-ioctl = { git = "https://gitlab.redox-os.org/redox-os/relibc.git" } -redox_syscall = "0.6" +log.workspace = true +libredox.workspace = true +redox-ioctl.workspace = true +redox_syscall.workspace = true common = { path = "../../common" } diff --git a/drivers/graphics/ihdgd/Cargo.toml b/drivers/graphics/ihdgd/Cargo.toml index f6b6bed1ca..d73bf7c134 100644 --- a/drivers/graphics/ihdgd/Cargo.toml +++ b/drivers/graphics/ihdgd/Cargo.toml @@ -10,7 +10,7 @@ drm-sys = "0.8.0" edid = "0.3.0" #TODO: waiting for bitbang-hal to update to embedded-hal 1.0 embedded-hal = "0.2.7" -log = "0.4" +log.workspace = true nb = "1.0" # Patched to allow for exact range allocation range-alloc = { git = "https://github.com/jackpot51/range-alloc.git" } @@ -23,7 +23,7 @@ graphics-ipc = { path = "../graphics-ipc" } inputd = { path = "../../inputd" } pcid = { path = "../../pcid" } -libredox = "0.1.3" -redox-scheme = "0.8" -redox_event = "0.4.1" -redox_syscall = "0.6" +libredox.workspace = true +redox-scheme.workspace = true +redox_event.workspace = true +redox_syscall.workspace = true diff --git a/drivers/graphics/vesad/Cargo.toml b/drivers/graphics/vesad/Cargo.toml index 474a324c58..f085993ac9 100644 --- a/drivers/graphics/vesad/Cargo.toml +++ b/drivers/graphics/vesad/Cargo.toml @@ -5,17 +5,17 @@ edition = "2021" [dependencies] drm-sys = "0.8.0" -orbclient = "0.3.27" +orbclient.workspace = true ransid = "0.4" -redox_syscall = "0.6" -redox_event = "0.4.1" +redox_syscall.workspace = true +redox_event.workspace = true common = { path = "../../common" } daemon = { path = "../../../daemon" } driver-graphics = { path = "../driver-graphics" } graphics-ipc = { path = "../graphics-ipc" } inputd = { path = "../../inputd" } -libredox = "0.1.3" +libredox.workspace = true [features] default = [] diff --git a/drivers/graphics/virtio-gpud/Cargo.toml b/drivers/graphics/virtio-gpud/Cargo.toml index ab34a0a258..9a30d0a57b 100644 --- a/drivers/graphics/virtio-gpud/Cargo.toml +++ b/drivers/graphics/virtio-gpud/Cargo.toml @@ -8,7 +8,7 @@ authors = ["Anhad Singh "] drm-sys = "0.8.0" #TODO: edid is abandoned, fork it an maintain? edid = "0.3.0" -log = "0.4" +log.workspace = true static_assertions = "1.1.0" futures = { version = "0.3.28", features = ["executor"] } anyhow = "1.0.71" @@ -21,8 +21,8 @@ virtio-core = { path = "../../virtio-core" } pcid = { path = "../../pcid" } inputd = { path = "../../inputd" } -redox_event = "0.4.1" -redox_syscall = "0.6" -orbclient = "0.3.27" +redox_event.workspace = true +redox_syscall.workspace = true +orbclient.workspace = true spin = "0.9.8" -libredox = "0.1.3" +libredox.workspace = true diff --git a/drivers/hwd/Cargo.toml b/drivers/hwd/Cargo.toml index e079f81259..8ca6d9c04a 100644 --- a/drivers/hwd/Cargo.toml +++ b/drivers/hwd/Cargo.toml @@ -5,7 +5,7 @@ edition = "2018" [dependencies] fdt = "0.1.5" -log = "0.4" +log.workspace = true ron = "0.8.1" amlserde = { path = "../amlserde" } diff --git a/drivers/input/ps2d/Cargo.toml b/drivers/input/ps2d/Cargo.toml index 9173c05624..21c9b887d1 100644 --- a/drivers/input/ps2d/Cargo.toml +++ b/drivers/input/ps2d/Cargo.toml @@ -5,12 +5,12 @@ edition = "2018" [dependencies] bitflags = "1" -log = "0.4" -orbclient = { workspace = true } -redox_event = "0.4.1" -redox_syscall = "0.6" -redox-scheme = "0.8.3" -libredox = "0.1.3" +log.workspace = true +orbclient.workspace = true +redox_event.workspace = true +redox_syscall.workspace = true +redox-scheme.workspace = true +libredox.workspace = true common = { path = "../../common" } daemon = { path = "../../../daemon" } diff --git a/drivers/input/usbhidd/Cargo.toml b/drivers/input/usbhidd/Cargo.toml index 028f7a0ab1..989b5cf55d 100644 --- a/drivers/input/usbhidd/Cargo.toml +++ b/drivers/input/usbhidd/Cargo.toml @@ -9,9 +9,9 @@ license = "MIT" [dependencies] bitflags = "2" -log = "0.4" -orbclient = { workspace = true } -redox_syscall = "0.6" +log.workspace = true +orbclient.workspace = true +redox_syscall.workspace = true rehid = { git = "https://gitlab.redox-os.org/redox-os/rehid.git" } xhcid = { path = "../../usb/xhcid" } diff --git a/drivers/inputd/Cargo.toml b/drivers/inputd/Cargo.toml index 0da4b03275..79a349e6ca 100644 --- a/drivers/inputd/Cargo.toml +++ b/drivers/inputd/Cargo.toml @@ -6,11 +6,11 @@ authors = ["Anhad Singh "] [dependencies] anyhow = "1.0.71" -log = "0.4.19" -redox_syscall = { version = "0.6", features = ["std"] } -orbclient = { workspace = true } -libredox = "0.1.3" +log.workspace = true +redox_syscall = { workspace = true, features = ["std"] } +orbclient.workspace = true +libredox.workspace = true common = { path = "../common" } daemon = { path = "../../daemon" } -redox-scheme = "0.8.3" +redox-scheme.workspace = true diff --git a/drivers/net/alxd/Cargo.toml b/drivers/net/alxd/Cargo.toml index 95e96e2491..d4351ccab2 100644 --- a/drivers/net/alxd/Cargo.toml +++ b/drivers/net/alxd/Cargo.toml @@ -5,10 +5,10 @@ edition = "2018" [dependencies] bitflags = "2" -redox_event = "0.4.1" -redox_syscall = "0.6" +redox_event.workspace = true +redox_syscall.workspace = true common = { path = "../../common" } daemon = { path = "../../../daemon" } -libredox = "0.1.3" -redox-scheme = "0.8.3" +libredox.workspace = true +redox-scheme.workspace = true diff --git a/drivers/net/driver-network/Cargo.toml b/drivers/net/driver-network/Cargo.toml index 559b8e8e27..e9b7ea5051 100644 --- a/drivers/net/driver-network/Cargo.toml +++ b/drivers/net/driver-network/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -libredox = "0.1.11" +libredox.workspace = true daemon = { path = "../../../daemon" } -redox-scheme = "0.8.3" -redox_syscall = { version = "0.6", features = ["std"] } +redox-scheme.workspace = true +redox_syscall = { workspace = true, features = ["std"] } diff --git a/drivers/net/e1000d/Cargo.toml b/drivers/net/e1000d/Cargo.toml index d2eb47da22..4a23e8412a 100644 --- a/drivers/net/e1000d/Cargo.toml +++ b/drivers/net/e1000d/Cargo.toml @@ -5,10 +5,10 @@ edition = "2018" [dependencies] bitflags = "2" -log = "0.4" -libredox = "0.1.11" -redox_event = "0.4.2" -redox_syscall = "0.6" +log.workspace = true +libredox.workspace = true +redox_event.workspace = true +redox_syscall.workspace = true common = { path = "../../common" } daemon = { path = "../../../daemon" } diff --git a/drivers/net/ixgbed/Cargo.toml b/drivers/net/ixgbed/Cargo.toml index 83bf1d4b27..7855c393c6 100644 --- a/drivers/net/ixgbed/Cargo.toml +++ b/drivers/net/ixgbed/Cargo.toml @@ -5,9 +5,9 @@ edition = "2021" [dependencies] bitflags = "2" -libredox = "0.1.11" -redox_event = "0.4.2" -redox_syscall = "0.6" +libredox.workspace = true +redox_event.workspace = true +redox_syscall.workspace = true common = { path = "../../common" } daemon = { path = "../../../daemon" } diff --git a/drivers/net/rtl8139d/Cargo.toml b/drivers/net/rtl8139d/Cargo.toml index b14f1acdfe..c6ad1fe31d 100644 --- a/drivers/net/rtl8139d/Cargo.toml +++ b/drivers/net/rtl8139d/Cargo.toml @@ -5,10 +5,10 @@ edition = "2018" [dependencies] bitflags = "2" -libredox = "0.1.11" -log = "0.4" -redox_event = "0.4.2" -redox_syscall = "0.6" +libredox.workspace = true +log.workspace = true +redox_event.workspace = true +redox_syscall.workspace = true common = { path = "../../common" } daemon = { path = "../../../daemon" } diff --git a/drivers/net/rtl8168d/Cargo.toml b/drivers/net/rtl8168d/Cargo.toml index 01d5edb53d..f292399451 100644 --- a/drivers/net/rtl8168d/Cargo.toml +++ b/drivers/net/rtl8168d/Cargo.toml @@ -5,10 +5,10 @@ edition = "2018" [dependencies] bitflags = "2" -libredox = "0.1.11" -log = "0.4" -redox_event = "0.4.2" -redox_syscall = "0.6" +libredox.workspace = true +log.workspace = true +redox_event.workspace = true +redox_syscall.workspace = true common = { path = "../../common" } daemon = { path = "../../../daemon" } diff --git a/drivers/net/virtio-netd/Cargo.toml b/drivers/net/virtio-netd/Cargo.toml index a2588e6de1..dd8dd0b119 100644 --- a/drivers/net/virtio-netd/Cargo.toml +++ b/drivers/net/virtio-netd/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -log = "0.4" +log.workspace = true static_assertions = "1.1.0" futures = { version = "0.3.28", features = ["executor"] } @@ -14,5 +14,5 @@ common = { path = "../../common" } daemon = { path = "../../../daemon" } driver-network = { path = "../driver-network" } -redox_syscall = "0.6" -libredox = "0.1.11" +redox_syscall.workspace = true +libredox.workspace = true diff --git a/drivers/pcid-spawner/Cargo.toml b/drivers/pcid-spawner/Cargo.toml index 32f6856eb8..a180426a7f 100644 --- a/drivers/pcid-spawner/Cargo.toml +++ b/drivers/pcid-spawner/Cargo.toml @@ -7,9 +7,9 @@ license = "MIT" [dependencies] anyhow = "1" -log = "0.4" +log.workspace = true pico-args = "0.5" -redox_syscall = "0.6" +redox_syscall.workspace = true serde = { version = "1", features = ["derive"] } toml = "0.5" diff --git a/drivers/pcid/Cargo.toml b/drivers/pcid/Cargo.toml index aead23096e..98d5006cbd 100644 --- a/drivers/pcid/Cargo.toml +++ b/drivers/pcid/Cargo.toml @@ -14,15 +14,15 @@ path = "src/lib.rs" [dependencies] bincode = "1.2" fdt = "0.1.5" -libc = "0.2" -log = "0.4" +libc.workspace = true +log.workspace = true pci_types = "0.10" pico-args = { version = "0.5", features = ["combined-flags"] } plain = "0.2" -redox-scheme = "0.8.3" -redox_syscall = "0.6" +redox-scheme.workspace = true +redox_syscall.workspace = true serde = { version = "1", features = ["derive"] } common = { path = "../common" } daemon = { path = "../../daemon" } -libredox = "0.1.3" +libredox.workspace = true diff --git a/drivers/redoxerd/Cargo.toml b/drivers/redoxerd/Cargo.toml index e9eb2599fb..b8bd8afadf 100644 --- a/drivers/redoxerd/Cargo.toml +++ b/drivers/redoxerd/Cargo.toml @@ -6,9 +6,9 @@ edition = "2018" [dependencies] anyhow = "1.0" -libredox = "0.1" -redox_event = "0.4.1" -redox_syscall = "0.6" -redox_termios = "0.1" +libredox.workspace = true +redox_event.workspace = true +redox_syscall.workspace = true +redox_termios.workspace = true common = { path = "../common" } qemu-exit = "3.0.2" diff --git a/drivers/storage/ahcid/Cargo.toml b/drivers/storage/ahcid/Cargo.toml index 2ed160c342..e1daa26407 100644 --- a/drivers/storage/ahcid/Cargo.toml +++ b/drivers/storage/ahcid/Cargo.toml @@ -6,12 +6,12 @@ edition = "2021" [dependencies] bitflags = "1.2" byteorder = "1.2" -log = "0.4" -redox_syscall = { version = "0.6", features = ["std"] } +log.workspace = true +redox_syscall = { workspace = true, features = ["std"] } common = { path = "../../common" } daemon = { path = "../../../daemon" } driver-block = { path = "../driver-block" } pcid = { path = "../../pcid" } -libredox = "0.1.3" -redox_event = "0.4" +libredox.workspace = true +redox_event.workspace = true diff --git a/drivers/storage/bcm2835-sdhcid/Cargo.toml b/drivers/storage/bcm2835-sdhcid/Cargo.toml index 25db1243df..5c74af3649 100644 --- a/drivers/storage/bcm2835-sdhcid/Cargo.toml +++ b/drivers/storage/bcm2835-sdhcid/Cargo.toml @@ -11,6 +11,6 @@ common = { path = "../../common" } daemon = { path = "../../../daemon" } driver-block = { path = "../driver-block" } -libredox = "0.1.3" -redox_syscall = { version = "0.6", features = ["std"] } -redox_event = "0.4" +libredox.workspace = true +redox_syscall = { workspace = true, features = ["std"] } +redox_event.workspace = true diff --git a/drivers/storage/driver-block/Cargo.toml b/drivers/storage/driver-block/Cargo.toml index 5a6c4a03d6..66733a09db 100644 --- a/drivers/storage/driver-block/Cargo.toml +++ b/drivers/storage/driver-block/Cargo.toml @@ -8,11 +8,11 @@ daemon = { path = "../../../daemon" } executor = { path = "../../executor" } partitionlib = { path = "../partitionlib" } -libredox = "0.1.3" -log = "0.4" +libredox.workspace = true +log.workspace = true # TODO: migrate virtio to our executor futures = { version = "0.3.28", features = ["executor"] } -redox_syscall = { version = "0.6", features = ["std"] } -redox-scheme = "0.8.3" +redox_syscall = { workspace = true, features = ["std"] } +redox-scheme.workspace = true diff --git a/drivers/storage/ided/Cargo.toml b/drivers/storage/ided/Cargo.toml index bd163e2348..a5cb959400 100644 --- a/drivers/storage/ided/Cargo.toml +++ b/drivers/storage/ided/Cargo.toml @@ -6,9 +6,9 @@ edition = "2021" [dependencies] common = { path = "../../common" } driver-block = { path = "../driver-block" } -libredox = "0.1.3" -log = "0.4" +libredox.workspace = true +log.workspace = true pcid = { path = "../../pcid" } daemon = { path = "../../../daemon" } -redox_syscall = { version = "0.6", features = ["std"] } -redox_event = "0.4" +redox_syscall = { workspace = true, features = ["std"] } +redox_event.workspace = true diff --git a/drivers/storage/lived/Cargo.toml b/drivers/storage/lived/Cargo.toml index 4b89ba2748..61ed7e8649 100644 --- a/drivers/storage/lived/Cargo.toml +++ b/drivers/storage/lived/Cargo.toml @@ -9,8 +9,8 @@ license = "MIT" [dependencies] anyhow = "1" -libredox = "0.1.3" +libredox.workspace = true daemon = { path = "../../../daemon" } -redox_syscall = { version = "0.6", features = ["std"] } -redox_event = "0.4" +redox_syscall = { workspace = true, features = ["std"] } +redox_event.workspace = true driver-block = { path = "../driver-block" } diff --git a/drivers/storage/nvmed/Cargo.toml b/drivers/storage/nvmed/Cargo.toml index c874e053e4..f91da7a4b0 100644 --- a/drivers/storage/nvmed/Cargo.toml +++ b/drivers/storage/nvmed/Cargo.toml @@ -7,11 +7,11 @@ edition = "2021" arrayvec = "0.7" bitflags = "2" futures = "0.3" -libredox = "0.1.3" -log = "0.4" +libredox.workspace = true +log.workspace = true parking_lot = "0.12.1" -redox_event = "0.4.1" -redox_syscall = { version = "0.6", features = ["std"] } +redox_event.workspace = true +redox_syscall = { workspace = true, features = ["std"] } smallvec = "1" executor = { path = "../../executor" } diff --git a/drivers/storage/usbscsid/Cargo.toml b/drivers/storage/usbscsid/Cargo.toml index 9d01dc8d74..b43a3bd9fb 100644 --- a/drivers/storage/usbscsid/Cargo.toml +++ b/drivers/storage/usbscsid/Cargo.toml @@ -9,11 +9,11 @@ license = "MIT" [dependencies] base64 = "0.11" # Only for debugging -libredox = "0.1.3" +libredox.workspace = true plain = "0.2" driver-block = { path = "../driver-block" } daemon = { path = "../../../daemon" } -redox_event = "0.4" -redox_syscall = { version = "0.6", features = ["std"] } +redox_event.workspace = true +redox_syscall = { workspace = true, features = ["std"] } thiserror = "1" xhcid = { path = "../../usb/xhcid" } diff --git a/drivers/storage/virtio-blkd/Cargo.toml b/drivers/storage/virtio-blkd/Cargo.toml index 282844f65a..100a33ec31 100644 --- a/drivers/storage/virtio-blkd/Cargo.toml +++ b/drivers/storage/virtio-blkd/Cargo.toml @@ -6,18 +6,18 @@ authors = ["Anhad Singh "] [dependencies] anyhow = "1.0.71" -log = "0.4" +log.workspace = true thiserror = "1.0.40" static_assertions = "1.1.0" futures = { version = "0.3.28", features = ["executor"] } spin = "*" -redox_event = "0.4" -redox_syscall = { version = "0.6", features = ["std"] } +redox_event.workspace = true +redox_syscall = { workspace = true, features = ["std"] } common = { path = "../../common" } daemon = { path = "../../../daemon" } driver-block = { path = "../driver-block" } pcid = { path = "../../pcid" } virtio-core = { path = "../../virtio-core" } -libredox = "0.1.3" +libredox.workspace = true diff --git a/drivers/usb/usbhubd/Cargo.toml b/drivers/usb/usbhubd/Cargo.toml index bd3d0a5aa4..cfe8963f9f 100644 --- a/drivers/usb/usbhubd/Cargo.toml +++ b/drivers/usb/usbhubd/Cargo.toml @@ -7,8 +7,8 @@ license = "MIT" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -log = "0.4" -redox_syscall = "0.6" +log.workspace = true +redox_syscall.workspace = true xhcid = { path = "../xhcid" } common = { path = "../../common" } diff --git a/drivers/usb/xhcid/Cargo.toml b/drivers/usb/xhcid/Cargo.toml index 722a6435ae..a42f73183b 100644 --- a/drivers/usb/xhcid/Cargo.toml +++ b/drivers/usb/xhcid/Cargo.toml @@ -18,10 +18,10 @@ crossbeam-channel = "0.4" futures = "0.3" plain = "0.2" lazy_static = "1.4" -log = "0.4" -redox_event = "0.4.1" -redox-scheme = "0.8.3" -redox_syscall = "0.6" +log.workspace = true +redox_event.workspace = true +redox-scheme.workspace = true +redox_syscall.workspace = true serde = { version = "1", features = ["derive"] } serde_json = "1" smallvec = { version = "1", features = ["serde"] } @@ -31,5 +31,5 @@ toml = "0.5" common = { path = "../../common" } daemon = { path = "../../../daemon" } pcid = { path = "../../pcid" } -libredox = "0.1.3" +libredox.workspace = true regex = "1.10.6" diff --git a/drivers/vboxd/Cargo.toml b/drivers/vboxd/Cargo.toml index 639eccbd5f..b904646801 100644 --- a/drivers/vboxd/Cargo.toml +++ b/drivers/vboxd/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2018" [dependencies] -libredox = "0.1.3" -orbclient = "0.3.47" -redox_event = "0.4.1" -redox_syscall = "0.6" +libredox.workspace = true +orbclient.workspace = true +redox_event.workspace = true +redox_syscall.workspace = true common = { path = "../common" } daemon = { path = "../../daemon" } diff --git a/drivers/virtio-core/Cargo.toml b/drivers/virtio-core/Cargo.toml index 09a623d042..03fb52ba6e 100644 --- a/drivers/virtio-core/Cargo.toml +++ b/drivers/virtio-core/Cargo.toml @@ -7,14 +7,14 @@ authors = ["Anhad Singh "] [dependencies] static_assertions = "1.1.0" bitflags = "2.3.2" -redox_syscall = "0.6" -libredox = "0.1.3" -log = "0.4" +redox_syscall.workspace = true +libredox.workspace = true +log.workspace = true thiserror = "1.0.40" futures = { version = "0.3.28", features = ["executor"] } crossbeam-queue = "0.3.8" -redox_event = "0.4.1" +redox_event.workspace = true common = { path = "../common" } pcid = { path = "../pcid" } diff --git a/init/Cargo.toml b/init/Cargo.toml index 8362f047a1..e053e8dae4 100644 --- a/init/Cargo.toml +++ b/init/Cargo.toml @@ -5,4 +5,4 @@ edition = "2024" license = "MIT" [dependencies] -libredox = "0.1" +libredox.workspace = true diff --git a/initfs/Cargo.toml b/initfs/Cargo.toml index 7fd8f3c4cc..36c522d7b5 100644 --- a/initfs/Cargo.toml +++ b/initfs/Cargo.toml @@ -20,4 +20,4 @@ std = [] anyhow = "1" archive-common = {path = "archive-common"} env_logger = "0.8" -log = "0.4" +log.workspace = true diff --git a/initfs/archive-common/Cargo.toml b/initfs/archive-common/Cargo.toml index cb40b568b6..f4a17224c0 100644 --- a/initfs/archive-common/Cargo.toml +++ b/initfs/archive-common/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] anyhow = "1" -log = "0.4" +log.workspace = true pathdiff = "0.2.1" plain = "0.2" redox-initfs = {path = ".."} diff --git a/initfs/tools/Cargo.toml b/initfs/tools/Cargo.toml index e201f04c1a..4b01bd06d5 100644 --- a/initfs/tools/Cargo.toml +++ b/initfs/tools/Cargo.toml @@ -20,7 +20,7 @@ path = "src/bin/dump.rs" anyhow = "1" clap = {version = "4", features = ["cargo"]} env_logger = "0.8" -log = "0.4" +log.workspace = true plain = "0.2" twox-hash = "1.6" diff --git a/ipcd/Cargo.toml b/ipcd/Cargo.toml index 6c9b61bff6..235712f4ad 100644 --- a/ipcd/Cargo.toml +++ b/ipcd/Cargo.toml @@ -4,14 +4,14 @@ name = "ipcd" version = "0.1.0" [dependencies] -libredox = { version = "0.1.8", features = ["call"]} +libredox = { workspace = true, features = ["call"]} daemon = { path = "../daemon" } -redox_syscall = "0.6" -redox-scheme = "0.8.3" -redox_event = "0.4.0" +redox_syscall.workspace = true +redox-scheme.workspace = true +redox_event.workspace = true anyhow = "1.0.97" -libc = "0.2" +libc.workspace = true rand = { version = "0.8", features = ["small_rng"] } [target.'cfg(target_os = "redox")'.dependencies] -redox-rt = { git = "https://gitlab.redox-os.org/redox-os/relibc.git", default-features = false } +redox-rt = { workspace = true, default-features = false } diff --git a/logd/Cargo.toml b/logd/Cargo.toml index bb8c7db3eb..4b43e7a2ce 100644 --- a/logd/Cargo.toml +++ b/logd/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Jeremy Soller "] edition = "2021" [dependencies] -redox_syscall = "0.6" +redox_syscall.workspace = true daemon = { path = "../daemon" } -libredox = "0.1.3" -redox-scheme = "0.8.3" +libredox.workspace = true +redox-scheme.workspace = true diff --git a/netstack/Cargo.toml b/netstack/Cargo.toml index 20ded16276..e3bbd27932 100644 --- a/netstack/Cargo.toml +++ b/netstack/Cargo.toml @@ -8,13 +8,13 @@ name = "smolnetd" path = "src/main.rs" [dependencies] -redox_event = "0.4.1" +redox_event.workspace = true daemon = { path = "../daemon" } -redox_syscall = { version = "0.6", features = ["std"] } -redox-log = "0.1" -libredox = { version = "0.1.3", features = ["mkns"] } +redox_syscall = { workspace = true, features = ["std"] } +redox-log.workspace = true +libredox = { workspace = true, features = ["mkns"] } anyhow = "1.0.81" -redox-scheme = "0.8.3" +redox-scheme.workspace = true [dependencies.log] version = "0.4" @@ -35,4 +35,4 @@ features = [ #For debugging: "log", "verbose" [target.'cfg(target_os = "redox")'.dependencies] -redox-rt = { git = "https://gitlab.redox-os.org/redox-os/relibc.git", default-features = false } +redox-rt = { workspace = true, default-features = false } diff --git a/ptyd/Cargo.toml b/ptyd/Cargo.toml index 782318855c..e8a7bf673f 100644 --- a/ptyd/Cargo.toml +++ b/ptyd/Cargo.toml @@ -4,9 +4,9 @@ version = "0.1.0" edition = "2021" [dependencies] -libredox = "0.1.3" +libredox.workspace = true daemon = { path = "../daemon" } -redox-scheme = "0.8.3" -redox_event = "0.4.0" -redox_syscall = "0.6" -redox_termios = "0.1.3" +redox-scheme.workspace = true +redox_event.workspace = true +redox_syscall.workspace = true +redox_termios.workspace = true diff --git a/ramfs/Cargo.toml b/ramfs/Cargo.toml index c715732482..7557ded26c 100644 --- a/ramfs/Cargo.toml +++ b/ramfs/Cargo.toml @@ -10,8 +10,8 @@ description = "In-memory filesystem for Redox, which is useful for early logging [dependencies] daemon = { path = "../daemon" } -redox_syscall = "0.6.0" -redox-scheme = "0.8.3" -libredox = { version = "0.1.11", features = ["call"] } +redox_syscall.workspace = true +redox-scheme.workspace = true +libredox = { workspace = true, features = ["call"] } indexmap = "2.5.0" slab = "0.4.9" diff --git a/randd/Cargo.toml b/randd/Cargo.toml index 52327b0edd..363f08df55 100644 --- a/randd/Cargo.toml +++ b/randd/Cargo.toml @@ -7,10 +7,10 @@ edition = "2021" rand_chacha = "0.2" rand_core = "0.5" daemon = { path = "../daemon" } -redox_syscall = "0.6" -libredox = "0.1.3" +redox_syscall.workspace = true +libredox.workspace = true sha2 = "0.8" -redox-scheme = "0.8.3" +redox-scheme.workspace = true [target.'cfg(target_arch = "x86_64")'.dependencies] raw-cpuid = "11.0.1" diff --git a/zerod/Cargo.toml b/zerod/Cargo.toml index d0ab36dd72..fb2b36a448 100644 --- a/zerod/Cargo.toml +++ b/zerod/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Alex Lyon "] edition = "2021" [dependencies] -redox_syscall = "0.6" -redox-scheme = "0.8.3" +redox_syscall.workspace = true +redox-scheme.workspace = true daemon = { path = "../daemon" } -libredox = "0.1.3" +libredox.workspace = true From 9b2b0d493001b4064c017cc78a6d044b03061188 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 20 Jan 2026 10:38:12 -0700 Subject: [PATCH 2/3] Downgrade fdt to fix CI failure --- Cargo.lock | 8 ++++---- drivers/storage/bcm2835-sdhcid/Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index db233ef898..a1f6fd1476 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -788,7 +788,7 @@ checksum = "784a4df722dc6267a04af36895398f59d21d07dce47232adf31ec0ff2fa45e67" [[package]] name = "fdt" version = "0.2.0-alpha1" -source = "git+https://github.com/repnop/fdt.git#124145d5a069f7fe7426fc73f0696aa3c3ef0cae" +source = "git+https://github.com/repnop/fdt.git?rev=059bb23#059bb2383873f8001959456e36ec123228f67642" [[package]] name = "find-msvc-tools" @@ -903,7 +903,7 @@ dependencies = [ [[package]] name = "generic-rt" version = "0.1.0" -source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#5d378c146078a58c025ad9c857402c983e5e8b37" +source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#3362ca356a9dafdfd7d74fc88d97609f400f7329" [[package]] name = "getrandom" @@ -1778,7 +1778,7 @@ dependencies = [ [[package]] name = "redox-ioctl" version = "0.1.0" -source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#5d378c146078a58c025ad9c857402c983e5e8b37" +source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#3362ca356a9dafdfd7d74fc88d97609f400f7329" dependencies = [ "drm-sys", "redox_syscall 0.6.0", @@ -1805,7 +1805,7 @@ checksum = "436d45c2b6a5b159d43da708e62b25be3a4a3d5550d654b72216ade4c4bfd717" [[package]] name = "redox-rt" version = "0.1.0" -source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#5d378c146078a58c025ad9c857402c983e5e8b37" +source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#3362ca356a9dafdfd7d74fc88d97609f400f7329" dependencies = [ "bitflags 2.10.0", "generic-rt", diff --git a/drivers/storage/bcm2835-sdhcid/Cargo.toml b/drivers/storage/bcm2835-sdhcid/Cargo.toml index 5c74af3649..1060164ace 100644 --- a/drivers/storage/bcm2835-sdhcid/Cargo.toml +++ b/drivers/storage/bcm2835-sdhcid/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -fdt = { git = "https://github.com/repnop/fdt.git" } +fdt = { git = "https://github.com/repnop/fdt.git", rev = "059bb23" } common = { path = "../../common" } daemon = { path = "../../../daemon" } driver-block = { path = "../driver-block" } From ceebc93762f9a86010d7f1602b36652c33181b4a Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 20 Jan 2026 10:47:08 -0700 Subject: [PATCH 3/3] Set log dependency to workspace in netstack --- netstack/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netstack/Cargo.toml b/netstack/Cargo.toml index e3bbd27932..77e2d17d99 100644 --- a/netstack/Cargo.toml +++ b/netstack/Cargo.toml @@ -17,7 +17,7 @@ anyhow = "1.0.81" redox-scheme.workspace = true [dependencies.log] -version = "0.4" +workspace = true default-features = false features = ["release_max_level_warn"]