From 680d0749f6d7cd8a2079b793d6d5966d57cb3582 Mon Sep 17 00:00:00 2001 From: Nick Spinale Date: Tue, 25 Jun 2024 22:37:50 +0000 Subject: [PATCH 1/2] nix: Fix shell expression Signed-off-by: Nick Spinale --- hacking/nix/scope/world/shell.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hacking/nix/scope/world/shell.nix b/hacking/nix/scope/world/shell.nix index 13f16e3f5..91c5b8909 100644 --- a/hacking/nix/scope/world/shell.nix +++ b/hacking/nix/scope/world/shell.nix @@ -31,8 +31,8 @@ let }; capdlEnvVars = lib.optionalAttrs (!worldConfig.isMicrokit) { - CAPDL_SPEC_FILE = serializeCapDLSpec { inherit (dummyCapDLSpec.passthru) spec; }; - CAPDL_FILL_DIR = dummyCapDLSpec.passthru.fill; + CAPDL_SPEC_FILE = serializeCapDLSpec { inherit (dummyCapDLSpec) cdl; }; + CAPDL_FILL_DIR = dummyCapDLSpec.fill; }; libcDir = "${stdenv.cc.libc}/${hostPlatform.config}"; From 64c62d82a39fc2317b965696c46002b3626faac7 Mon Sep 17 00:00:00 2001 From: Nick Spinale Date: Tue, 25 Jun 2024 22:40:38 +0000 Subject: [PATCH 2/2] Update ring dependency Signed-off-by: Nick Spinale --- Cargo.lock | 10 +++++----- Cargo.nix | 4 ++-- Cargo.toml | 2 +- .../examples/microkit/http-server/pds/server/Cargo.nix | 2 +- crates/sel4-async/network/rustls/utils/Cargo.toml | 5 ++++- hacking/cargo-manifest-management/manifest-scope.nix | 5 ++++- hacking/nix/scope/world/instances/default.nix | 5 ++++- 7 files changed, 21 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b57570fa9..ea33a238a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -340,9 +340,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.0.90" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "c891175c3fb232128f48de6590095e59198bbeb8620c310be349bfc3afd12c7b" [[package]] name = "cexpr" @@ -990,9 +990,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" @@ -1724,7 +1724,7 @@ dependencies = [ [[package]] name = "ring" version = "0.17.8" -source = "git+https://github.com/coliasgroup/ring.git?rev=0e644b7837cffcd53a3ff67d7f478801b4e9e0ed#0e644b7837cffcd53a3ff67d7f478801b4e9e0ed" +source = "git+https://github.com/coliasgroup/ring.git?rev=c5880ee6ae56bb684f5bb2499f1c05cef8943745#c5880ee6ae56bb684f5bb2499f1c05cef8943745" dependencies = [ "cc", "cfg-if", diff --git a/Cargo.nix b/Cargo.nix index 22c734ced..7f75f3e13 100644 --- a/Cargo.nix +++ b/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 }; }; } diff --git a/Cargo.toml b/Cargo.toml index b11ff850a..5a91d89eb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -148,4 +148,4 @@ members = [ [patch.crates-io.ring] git = "https://github.com/coliasgroup/ring.git" -rev = "0e644b7837cffcd53a3ff67d7f478801b4e9e0ed" +rev = "c5880ee6ae56bb684f5bb2499f1c05cef8943745" diff --git a/crates/examples/microkit/http-server/pds/server/Cargo.nix b/crates/examples/microkit/http-server/pds/server/Cargo.nix index 67d71ad03..82b93b499 100644 --- a/crates/examples/microkit/http-server/pds/server/Cargo.nix +++ b/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"; diff --git a/crates/sel4-async/network/rustls/utils/Cargo.toml b/crates/sel4-async/network/rustls/utils/Cargo.toml index c658d5a61..6e17a8023 100644 --- a/crates/sel4-async/network/rustls/utils/Cargo.toml +++ b/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"] diff --git a/hacking/cargo-manifest-management/manifest-scope.nix b/hacking/cargo-manifest-management/manifest-scope.nix index e273684ab..181d42737 100644 --- a/hacking/cargo-manifest-management/manifest-scope.nix +++ b/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: { diff --git a/hacking/nix/scope/world/instances/default.nix b/hacking/nix/scope/world/instances/default.nix index 02052531d..e70005ed0 100644 --- a/hacking/nix/scope/world/instances/default.nix +++ b/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;