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.

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: Update dependencies #132

Merged
merged 3 commits into from
May 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 7 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,14 @@ Microkit](https://github.com/seL4/microkit). In particular, this project works w
following versions of those related projects:

- seL4, when used without Microkit:
[`a58480425c5b4c7a3d5000c797f083bc7d5fd532`](https://github.com/seL4/seL4/tree/a58480425c5b4c7a3d5000c797f083bc7d5fd532)
[`0260fba168b74dd2504c9447f2fa8da1161ead87`](https://github.com/seL4/seL4/tree/0260fba168b74dd2504c9447f2fa8da1161ead87)
(on [github.com/seL4/seL4:master](https://github.com/seL4/seL4/tree/master))
- seL4, when used with Microkit:
[`1daabe63fd34ae3d348b8e4a4057bd1a36d48ef6`](https://github.com/coliasgroup/seL4/tree/1daabe63fd34ae3d348b8e4a4057bd1a36d48ef6)
([github.com/coliasgroup/seL4:rust-microkit](https://github.com/coliasgroup/seL4/tree/rust-microkit),
not an ancestor of [github.com/seL4/seL4:master](https://github.com/seL4/seL4/tree/master)). For
now, Microkit requires [a
patch](https://github.com/seL4/seL4/commit/1daabe63fd34ae3d348b8e4a4057bd1a36d48ef6) on top of
upstream seL4 trunk.
[`57975d485397ce1744f7163644dd530560d0b7ec`](https://github.com/coliasgroup/seL4/tree/57975d485397ce1744f7163644dd530560d0b7ec)
(on [github.com/seL4/seL4:microkit](https://github.com/seL4/seL4/tree/microkit))
- seL4 Microkit:
[`35978315953532d3d2aca3faa82eda54d2a9172f`](https://github.com/seL4/microkit/tree/35978315953532d3d2aca3faa82eda54d2a9172f)
[`f0939852c62c629346cd3eddbe7d8922eca8530a`](https://github.com/seL4/microkit/tree/f0939852c62c629346cd3eddbe7d8922eca8530a)
(on [github.com/seL4/microkit:main](https://github.com/seL4/microkit/tree/main))

### Demos

Expand Down Expand Up @@ -72,7 +70,7 @@ following versions of those related projects:
- [`sel4-externally-shared`](./crates/sel4-externally-shared): Abstractions for interacting with
data in shared memory.
- [`sel4-shared-ring-buffer`](./crates/sel4-shared-ring-buffer): Implementation of shared data
structures used in the [seL4 Device Driver Framework](https://github.com/lucypa/sDDF).
structures used in the [seL4 Device Driver Framework](https://github.com/au-ts/sddf).
- [`sel4-async-*`](./crates/sel4-async): Crates for leveraging async Rust in seL4 userspace.

##### Runtime crates
Expand Down
2 changes: 1 addition & 1 deletion crates/private/meta/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
//! - [`sel4_logging`]: [`Log`](log::Log) implementation for the [`log`] crate.
//! - [`sel4_externally_shared`]: Abstractions for interacting with data in shared memory.
//! - [`sel4_shared_ring_buffer`]: Implementation of shared data structures used in the [seL4 Device
//! Driver Framework](https://github.com/lucypa/sDDF).
//! Driver Framework](https://github.com/au-ts/sddf).
//! - `sel4_async_*`: Crates for leveraging async Rust in seL4 userspace.
//!
//! ### Runtime crates
Expand Down
6 changes: 3 additions & 3 deletions hacking/nix/scope/sources.nix
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,20 @@ in rec {
seL4 = {
rust = fetchGit {
url = "https://github.com/coliasgroup/seL4.git";
rev = "0f849f294625c7c4f52a50ce841afc0a3317544d"; # branch "rust-testing"
rev = "e3af7631cb78d036d4b0f974599334e8b0615b65"; # branch "rust-testing"
local = localRoot + "/seL4";
};

rust-microkit = fetchGit {
url = "https://github.com/coliasgroup/seL4.git";
rev = "1daabe63fd34ae3d348b8e4a4057bd1a36d48ef6"; # branch "rust-microkit"
rev = "57975d485397ce1744f7163644dd530560d0b7ec"; # branch "rust-microkit"
local = localRoot + "/seL4";
};
};

microkit = fetchGit {
url = "https://github.com/coliasgroup/microkit.git";
rev = "46a655a45ddcf24832e8725cbd57da968fda44bc"; # branch "rust-nix"
rev = "e1bdee9946cf0344e300b6d720d2815ac72df29e"; # branch "rust-nix"
local = localRoot + "/microkit";
};

Expand Down
Loading