diff --git a/crates/sel4-async/network/rustls/utils/Cargo.toml b/crates/sel4-async/network/rustls/utils/Cargo.toml index 80bda85c5..4a08abf0d 100644 --- a/crates/sel4-async/network/rustls/utils/Cargo.toml +++ b/crates/sel4-async/network/rustls/utils/Cargo.toml @@ -19,7 +19,7 @@ license = "BSD-2-Clause" [dependencies] getrandom = { version = "0.2.10", features = ["custom"] } rand = { version = "0.8.5", default-features = false, features = ["small_rng"] } -ring = { version = "0.17.7", features = ["less-safe-getrandom-custom-or-rdrand"] } +ring = { version = "=0.17.7", features = ["less-safe-getrandom-custom-or-rdrand"] } sel4-async-time = { path = "../../../time" } [dependencies.rustls] diff --git a/hacking/cargo-manifest-management/manifest-scope.nix b/hacking/cargo-manifest-management/manifest-scope.nix index 11d334ff0..412aa85d1 100644 --- a/hacking/cargo-manifest-management/manifest-scope.nix +++ b/hacking/cargo-manifest-management/manifest-scope.nix @@ -186,7 +186,7 @@ in rec { }; ringWith = features: { - version = "0.17.7"; + version = "=0.17.7"; features = [ "less-safe-getrandom-custom-or-rdrand" ] ++ features; }; diff --git a/hacking/nix/scope/world/instances/default.nix b/hacking/nix/scope/world/instances/default.nix index 581c741d4..559e0af36 100644 --- a/hacking/nix/scope/world/instances/default.nix +++ b/hacking/nix/scope/world/instances/default.nix @@ -78,8 +78,9 @@ in rec { tests.root-task.panicking.byConfig.abort.withoutAlloc tests.root-task.panicking.byConfig.unwind.withAlloc tests.root-task.panicking.byConfig.unwind.withoutAlloc - tests.root-task.default-test-harness tests.root-task.c + tests.root-task.default-test-harness + # tests.root-task.ring tests.capdl.threads tests.capdl.utcover microkit.examples.hello @@ -212,7 +213,7 @@ in rec { }; }); - ring = maybe (haveFullRuntime && haveUnwindingSupport) ( + ring = maybe (haveFullRuntime && haveUnwindingSupport && !hostPlatform.isRiscV32) ( let rootTask = lib.makeOverridable mkTask { rootCrate = crates.ring; @@ -256,7 +257,7 @@ in rec { in { inherit byElf; - all = mkRunTests "run-all-ring-test" (lib.flip lib.mapAttrsToList byElf (k: v: lib.nameValuePair k v.automate)); + automate = mkRunTests "run-all-ring-test" (lib.flip lib.mapAttrsToList byElf (k: v: lib.nameValuePair k v.automate)); } );