Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nix: Bump seL4 and Microkit #76

Merged
merged 2 commits into from
Feb 5, 2024
Merged

nix: Bump seL4 and Microkit #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ede377e
Address unused import warning
nspin Feb 5, 2024
636a3fa
nix: Bump seL4 and microkit revs
nspin Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion crates/sel4-externally-shared/src/ops/unordered_atomic_ops.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ use core::mem;
use core::intrinsics;

use cfg_if::cfg_if;
use volatile::ops::{BulkOps, Ops, UnitaryOps};
use volatile::ops::{BulkOps, Ops};

#[cfg(feature = "unstable")]
use volatile::ops::UnitaryOps;

#[derive(Default, Copy, Clone)]
pub struct UnorderedAtomicOps(());
Expand Down
9 changes: 4 additions & 5 deletions hacking/nix/scope/sources.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,28 +49,27 @@ in rec {
seL4 = {
rust = fetchGit {
url = "https://github.com/coliasgroup/seL4.git";
rev = "360030019e45adf559c13a98400a7be4e7fb0ab9"; # branch "rust"
rev = "2404473ed2e68c8e627cb4d6588bd57633038109"; # branch "rust"
local = localRoot + "/seL4";
};

rust-microkit = fetchGit {
url = "https://github.com/coliasgroup/seL4.git";
rev = "7b8c552b36fe13b8a846b06a659c23697b7df926"; # branch "rust-microkit"
rev = "5f71dc4a5cd90b823876bec10265da92eae486ab"; # branch "rust-microkit"
local = localRoot + "/seL4";
};

rust-sel4test = fetchGit {
url = "https://github.com/coliasgroup/seL4.git";
rev = "85e36760bd158cf12a170450685eb7b0b05d2076"; # rust-sel4test
rev = "e1b3a2bfc5f9d122f3cebc5b6f2751b83f0e97ac"; # rust-sel4test
local = localRoot + "/seL4";
};
};

microkit = fetchGit {
url = "https://github.com/coliasgroup/microkit.git";
rev = "1e561e5b11970a3b61167225ebcaf11aa7ad4959"; # branch "rust-nix"
rev = "5f7b2da0a6233b4cc763d3dff4451532958a8877"; # branch "rust-nix"
local = localRoot + "/microkit";
# useLocal = true;
};

capdlTool = fetchGit (capdlCommon // {
Expand Down
Loading