Update ring dependency

Signed-off-by: Nick Spinale <[email protected]>

Cargo.nix

@@ -24,9 +24,9 @@
     members = lib.naturalSort (lib.mapAttrsToList (_: v: v.path) localCrates);
   };
   patch.crates-io = {
-    ring = {
+    ring = localCrates.ring or  {
       git = "https://github.com/coliasgroup/ring.git";
-      rev = "0e644b7837cffcd53a3ff67d7f478801b4e9e0ed";
+      rev = "c5880ee6ae56bb684f5bb2499f1c05cef8943745"; # branch sel4
     };
   };
 }

Cargo.toml

@@ -148,4 +148,4 @@ members = [
 
 [patch.crates-io.ring]
 git = "https://github.com/coliasgroup/ring.git"
-rev = "0e644b7837cffcd53a3ff67d7f478801b4e9e0ed"
+rev = "c5880ee6ae56bb684f5bb2499f1c05cef8943745"

crates/examples/microkit/http-server/pds/server/Cargo.nix

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-2-Clause
 #
 
-{ mk, localCrates, versions, serdeWith, smoltcpWith, ringWith }:
+{ mk, localCrates, versions, serdeWith, smoltcpWith }:
 
 mk {
   package.name = "microkit-http-server-example-server";

crates/sel4-async/network/rustls/utils/Cargo.toml

@@ -19,6 +19,9 @@ 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.8", features = ["less-safe-getrandom-custom-or-rdrand"] }
 rustls = { version = "0.23.5", default-features = false, features = ["logging", "ring", "tls12"] }
 sel4-async-time = { path = "../../../time" }
+
+[dependencies.ring]
+version = "=0.17.8"
+features = ["less-safe-getrandom-custom-or-rdrand", "less-correct-none-os-has-linux-abi"]

hacking/cargo-manifest-management/manifest-scope.nix

@@ -196,7 +196,10 @@ in rec {
 
   ringWith = features: {
     version = "=0.17.8";
-    features = [ "less-safe-getrandom-custom-or-rdrand" ] ++ features;
+    features = [
+      "less-safe-getrandom-custom-or-rdrand"
+      "less-correct-none-os-has-linux-abi"
+    ] ++ features;
   };
 
   rustlsWith = features: {

hacking/nix/scope/world/instances/default.nix

@@ -92,7 +92,6 @@ in rec {
     tests.root-task.verus
     tests.root-task.dafny
     tests.root-task.default-test-harness
-    # tests.root-task.ring
     tests.capdl.threads
     tests.capdl.utcover
     microkit.examples.hello
@@ -105,6 +104,8 @@ in rec {
     examples.root-task.spawn-thread
     examples.root-task.spawn-task
     examples.root-task.serial-device
+
+    # tests.root-task.ring
   ];
 
   allAutomationScripts = map
@@ -237,6 +238,7 @@ in rec {
         };
       });
 
+      # ring at 8c665d20ed7621b81d8f4ad564cb7f43a02d42ad (sel4-testing)
       ring = maybe (haveFullRuntime && haveUnwindingSupport && !hostPlatform.isRiscV32 && !hostPlatform.isx86) (
         let
           rootTask = lib.makeOverridable mkTask {
@@ -245,6 +247,7 @@ in rec {
             justBuildTests = true;
             features = [
               "less-safe-getrandom-custom-or-rdrand"
+              "less-correct-none-os-has-linux-abi"
               # "slow_tests"
             ];
             release = true;