diff --git a/.github/workflows/examples.yaml b/.github/workflows/examples.yaml index c49005ac3..54deab4e9 100644 --- a/.github/workflows/examples.yaml +++ b/.github/workflows/examples.yaml @@ -22,7 +22,7 @@ on: env: MICROKIT_VERSION: 2.3.0 MICROKIT_URL: https://github.com/seL4/microkit/releases/download/2.3.0/ - SDFGEN_VERSION: 0.33.0 + SDFGEN_VERSION: 0.35.0 jobs: build_linux_x86_64: diff --git a/README.md b/README.md index b46288c1f..d73b49a40 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ On apt based Linux distributions run the following commands: ```sh sudo apt install make clang llvm lld device-tree-compiler python3 python3-pip -pip3 install sdfgen==0.33.0 +pip3 install sdfgen==0.35.0 ``` If you get `error: externally-managed-environment` when installing via pip, @@ -54,7 +54,7 @@ instead run: ```sh # sdfgen is an isolated package and does not depend on anything # else so it will not break any system packages. -pip3 install --break-system-packages sdfgen==0.33.0 +pip3 install --break-system-packages sdfgen==0.35.0 ``` #### Microkit SDK @@ -69,7 +69,7 @@ tar xf microkit-sdk-2.3.0-linux-x86-64.tar.gz On macOS, you can install the dependencies via Homebrew: ```sh brew install llvm lld make dtc python3 -pip3 install sdfgen==0.33.0 +pip3 install sdfgen==0.35.0 ``` If you get `error: externally-managed-environment` when installing via pip, @@ -77,7 +77,7 @@ instead run: ```sh # sdfgen is an isolated package and does not depend on anything # else so it will not break any system packages. -pip3 install --break-system-packages sdfgen==0.33.0 +pip3 install --break-system-packages sdfgen==0.35.0 ``` #### Microkit SDK diff --git a/flake.lock b/flake.lock index 0ba4b32f0..5f4b875f7 100644 --- a/flake.lock +++ b/flake.lock @@ -82,16 +82,16 @@ "zig-overlay": "zig-overlay" }, "locked": { - "lastModified": 1780466957, - "narHash": "sha256-0TAopco8jgBFEErBuPJGqLHrYHy4yshmUfZIHureFE8=", + "lastModified": 1787026496, + "narHash": "sha256-NHl5gzx32nExiALlJ9RpbSB3AyTD/pOcGQBgt4jI0m8=", "owner": "au-ts", "repo": "microkit_sdf_gen", - "rev": "c7d4b7bb0861b3bf7f2accac57cf5b9905b449e4", + "rev": "0fdbd7429d2e8eceb599b6b4bca67cbccfaf1001", "type": "github" }, "original": { "owner": "au-ts", - "ref": "0.33.0", + "ref": "0.35.0", "repo": "microkit_sdf_gen", "type": "github" } diff --git a/flake.nix b/flake.nix index 7858a61fc..cd2364ad6 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; - sdfgen.url = "github:au-ts/microkit_sdf_gen/0.33.0"; + sdfgen.url = "github:au-ts/microkit_sdf_gen/0.35.0"; sdfgen.inputs.nixpkgs.follows = "nixpkgs"; systems-ci.url = "github:au-ts/systems-ci/main"; systems-ci.flake = false; diff --git a/tools/meta/board.py b/tools/meta/board.py index fba22a67a..eb233e29a 100644 --- a/tools/meta/board.py +++ b/tools/meta/board.py @@ -9,7 +9,7 @@ # This file is imported by most of our meta.py scripts, so add this check # here so that we can catch this error consistently. -assert version("sdfgen").split(".")[1] == "33", "Unexpected sdfgen version" +assert version("sdfgen").split(".")[1] == "35", "Unexpected sdfgen version" def add_x86_hpet(sdf: SystemDescription, timer_driver: ProtectionDomain):