diff --git a/Cargo.lock b/Cargo.lock index adb78aa..5634132 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -58,7 +58,7 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ - "getrandom", + "getrandom 0.2.11", "once_cell", "version_check", ] @@ -979,7 +979,7 @@ dependencies = [ "tracing-appender", "tracing-subscriber", "url", - "uuid 1.5.0", + "uuid 1.16.0", "xmlwriter", "xtra", "zip", @@ -1079,7 +1079,7 @@ dependencies = [ "tracing", "tracing-appender", "tracing-subscriber", - "uuid 1.5.0", + "uuid 1.16.0", ] [[package]] @@ -1411,6 +1411,18 @@ dependencies = [ "wasi 0.11.0+wasi-snapshot-preview1", ] +[[package]] +name = "getrandom" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasi 0.14.2+wasi-0.2.4", +] + [[package]] name = "ghash" version = "0.4.4" @@ -1874,9 +1886,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.150" +version = "0.2.172" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" [[package]] name = "libsqlite3-sys" @@ -2049,14 +2061,14 @@ dependencies = [ [[package]] name = "nightfall" version = "0.3.12-rc4" -source = "git+https://github.com/Dusk-Labs/nightfall?tag=0.3.12-rc4#147ea96146b4cae6f666741020cef0622a90d46c" +source = "git+https://github.com/Dusk-Labs/nightfall?rev=878f07edd5d2c71261c5ae02fe3a6db7cda18be7#878f07edd5d2c71261c5ae02fe3a6db7cda18be7" dependencies = [ "async-trait", "cfg-if", "err-derive", "lazy_static", "mp4", - "nix 0.20.0", + "nix 0.27.1", "ntapi", "once_cell", "psutil", @@ -2067,7 +2079,7 @@ dependencies = [ "tokio", "tokio-stream", "tracing", - "uuid 0.8.2", + "uuid 1.16.0", "winapi", "xtra", "xtra_proc", @@ -2075,27 +2087,26 @@ dependencies = [ [[package]] name = "nix" -version = "0.20.0" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" +checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" dependencies = [ "bitflags 1.3.2", "cc", "cfg-if", "libc", + "memoffset 0.6.5", ] [[package]] name = "nix" -version = "0.23.2" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 1.3.2", - "cc", + "bitflags 2.4.1", "cfg-if", "libc", - "memoffset 0.6.5", ] [[package]] @@ -2140,9 +2151,9 @@ dependencies = [ [[package]] name = "ntapi" -version = "0.3.7" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" dependencies = [ "winapi", ] @@ -2481,6 +2492,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" + [[package]] name = "rand" version = "0.8.5" @@ -2508,7 +2525,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.11", ] [[package]] @@ -2689,7 +2706,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" dependencies = [ "cc", - "getrandom", + "getrandom 0.2.11", "libc", "spin 0.9.8", "untrusted 0.9.0", @@ -3505,7 +3522,7 @@ dependencies = [ "tower-layer", "tower-service", "tracing", - "uuid 1.5.0", + "uuid 1.16.0", ] [[package]] @@ -3742,16 +3759,16 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom", + "getrandom 0.2.11", ] [[package]] name = "uuid" -version = "1.5.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" dependencies = [ - "getrandom", + "getrandom 0.3.3", ] [[package]] @@ -3803,6 +3820,15 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasi" +version = "0.14.2+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +dependencies = [ + "wit-bindgen-rt", +] + [[package]] name = "wasm-bindgen" version = "0.2.88" @@ -4092,6 +4118,15 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "wit-bindgen-rt" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" +dependencies = [ + "bitflags 2.4.1", +] + [[package]] name = "xmlwriter" version = "0.1.0" diff --git a/dim-core/Cargo.toml b/dim-core/Cargo.toml index b311b7c..ffc5d85 100644 --- a/dim-core/Cargo.toml +++ b/dim-core/Cargo.toml @@ -11,7 +11,7 @@ vaapi = ["nightfall/vaapi"] [dependencies] # git dependencies -nightfall = { git = "https://github.com/Dusk-Labs/nightfall", tag = "0.3.12-rc4", default-features = false, features = [ +nightfall = { git = "https://github.com/Dusk-Labs/nightfall", rev = "878f07edd5d2c71261c5ae02fe3a6db7cda18be7", default-features = false, features = [ "cuda", "ssa_transmux", ] } @@ -72,7 +72,7 @@ tracing-subscriber = { version = "^0.3.10", features = [ "json", ] } url = "2.2.2" -uuid = { version = "1.2.2", features = ["v4"] } +uuid = { version = "1.6.1", features = ["v4"] } xmlwriter = "0.1.0" xtra = { version = "0.5.1", features = ["tokio", "with-tokio-1"] } diff --git a/dim-web/Cargo.toml b/dim-web/Cargo.toml index 2da5764..4c7574c 100644 --- a/dim-web/Cargo.toml +++ b/dim-web/Cargo.toml @@ -14,7 +14,7 @@ dim-utils = { path = "../dim-utils" } dim-events = { path = "../dim-events" } dim-core = { path = "../dim-core" } -nightfall = { git = "https://github.com/Dusk-Labs/nightfall", tag = "0.3.12-rc4", default-features = false, features = [ +nightfall = { git = "https://github.com/Dusk-Labs/nightfall", rev = "878f07edd5d2c71261c5ae02fe3a6db7cda18be7", default-features = false, features = [ "cuda", "ssa_transmux", ] } diff --git a/dim/Cargo.toml b/dim/Cargo.toml index b7c8106..38518ba 100644 --- a/dim/Cargo.toml +++ b/dim/Cargo.toml @@ -15,7 +15,7 @@ xtra = { version = "0.5.1", features = ["tokio", "with-tokio-1"] } fdlimit = "0.2.1" # git dependencies -nightfall = { git = "https://github.com/Dusk-Labs/nightfall", tag = "0.3.12-rc4", default-features = false, features = [ +nightfall = { git = "https://github.com/Dusk-Labs/nightfall", rev = "878f07edd5d2c71261c5ae02fe3a6db7cda18be7", default-features = false, features = [ "cuda", "ssa_transmux", ] }