diff --git a/.github/workflows/examples.yaml b/.github/workflows/examples.yaml index b54488f47..4e38d9290 100644 --- a/.github/workflows/examples.yaml +++ b/.github/workflows/examples.yaml @@ -12,7 +12,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_examples_linux_x86_64: diff --git a/dep/libvmm b/dep/libvmm index 3c4ede7e1..148e1af18 160000 --- a/dep/libvmm +++ b/dep/libvmm @@ -1 +1 @@ -Subproject commit 3c4ede7e17b3f5a60f682bd3f760fded40cb3467 +Subproject commit 148e1af18de5415e6b6aa23e1b2a06ea9bcc3011 diff --git a/dep/sddf b/dep/sddf index 8aaf00dc1..a15355c7c 160000 --- a/dep/sddf +++ b/dep/sddf @@ -1 +1 @@ -Subproject commit 8aaf00dc152af84de56f04cff82b558073a9b389 +Subproject commit a15355c7ce65ed94e91716ec348b8273188ecf16 diff --git a/examples/fileio/meta.py b/examples/fileio/meta.py index 1ace00f5a..85ae915d5 100644 --- a/examples/fileio/meta.py +++ b/examples/fileio/meta.py @@ -9,7 +9,7 @@ from importlib.metadata import version from board import BOARDS -assert version('sdfgen').split(".")[1] == "33", "Unexpected sdfgen version" +assert version('sdfgen').split(".")[1] == "35", "Unexpected sdfgen version" ProtectionDomain = SystemDescription.ProtectionDomain MemoryRegion = SystemDescription.MemoryRegion diff --git a/examples/firewall/meta.py b/examples/firewall/meta.py index 6a371ba10..e1049c040 100644 --- a/examples/firewall/meta.py +++ b/examples/firewall/meta.py @@ -8,7 +8,7 @@ from sdfgen import SystemDescription, Sddf, DeviceTree -assert version("sdfgen").split(".")[1] == "33", "Unexpected sdfgen version" +assert version("sdfgen").split(".")[1] == "35", "Unexpected sdfgen version" from typing import List from pyfw.memory_layout import ( diff --git a/examples/kitty/meta.py b/examples/kitty/meta.py index cd6bbe910..7b6fb808f 100644 --- a/examples/kitty/meta.py +++ b/examples/kitty/meta.py @@ -9,7 +9,7 @@ from importlib.metadata import version from board import BOARDS -assert version('sdfgen').split(".")[1] == "33", "Unexpected sdfgen version" +assert version('sdfgen').split(".")[1] == "35", "Unexpected sdfgen version" ProtectionDomain = SystemDescription.ProtectionDomain VirtualMachine = SystemDescription.VirtualMachine diff --git a/examples/posix_test/meta.py b/examples/posix_test/meta.py index f8f2d3093..278324474 100644 --- a/examples/posix_test/meta.py +++ b/examples/posix_test/meta.py @@ -7,7 +7,7 @@ from importlib.metadata import version from board import BOARDS -assert version("sdfgen").split(".")[1] == "33", "Unexpected sdfgen version" +assert version("sdfgen").split(".")[1] == "35", "Unexpected sdfgen version" ProtectionDomain = SystemDescription.ProtectionDomain MemoryRegion = SystemDescription.MemoryRegion diff --git a/examples/wasm_test/meta.py b/examples/wasm_test/meta.py index 475441979..6314f4a13 100644 --- a/examples/wasm_test/meta.py +++ b/examples/wasm_test/meta.py @@ -7,7 +7,7 @@ from importlib.metadata import version from board import BOARDS -assert version("sdfgen").split(".")[1] == "33", "Unexpected sdfgen version" +assert version("sdfgen").split(".")[1] == "35", "Unexpected sdfgen version" ProtectionDomain = SystemDescription.ProtectionDomain MemoryRegion = SystemDescription.MemoryRegion diff --git a/examples/webserver/meta.py b/examples/webserver/meta.py index 74b07a4d3..667d9e8e4 100644 --- a/examples/webserver/meta.py +++ b/examples/webserver/meta.py @@ -9,7 +9,7 @@ from importlib.metadata import version from board import BOARDS -assert version('sdfgen').split(".")[1] == "33", "Unexpected sdfgen version" +assert version('sdfgen').split(".")[1] == "35", "Unexpected sdfgen version" ProtectionDomain = SystemDescription.ProtectionDomain MemoryRegion = SystemDescription.MemoryRegion diff --git a/flake.nix b/flake.nix index 33856c79e..5f0e481a2 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; zig-overlay.url = "github:mitchellh/zig-overlay"; - 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"; };