From 4413788d322c563cbc70a23e9b97713f3601cd3c Mon Sep 17 00:00:00 2001
From: Hugo McNally <hugo.mcnally@gmail.com>
Date: Wed, 20 Mar 2024 14:01:58 +0000
Subject: [PATCH 1/2] Updated CHERIoT LLVM

---
 pkgs/llvm_cheriot.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/llvm_cheriot.nix b/pkgs/llvm_cheriot.nix
index 7d10f4f..8a6a2de 100644
--- a/pkgs/llvm_cheriot.nix
+++ b/pkgs/llvm_cheriot.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "CHERIoT-Platform";
     repo = "llvm-project";
-    rev = "dfbd2b1fdd33746ca9e615feb7852013e8f3966a";
-    hash = "sha256-L0ska5LVv5bUQuA4B8JW5xL156xyJw+2asDR8VA31Fw=";
+    rev = "08a91532cb502a4b575b77d8eb62b1d1862b0c4b";
+    hash = "sha256-kEhX6WsHNV+yvM278hTkssGROw9i4KlbDgi5epw7Ns0=";
   };
   sourceRoot = "${src.name}/llvm";
   nativeBuildInputs = [cmake ninja lld python3];

From 5936feac27fa310fea5d2f35a4c924196594205d Mon Sep 17 00:00:00 2001
From: Hugo McNally <hugo.mcnally@gmail.com>
Date: Wed, 20 Mar 2024 14:04:29 +0000
Subject: [PATCH 2/2] Added CHERIoT environment

This can be used for building the CHERIoT RTOS
or the test software for the sonata-system.
---
 flake.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/flake.nix b/flake.nix
index 3da4221..b0a5bd9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -59,6 +59,16 @@
         opentitan = pkgs.callPackage ./dev/opentitan.nix {
           inherit (lowrisc_pkgs) ncurses5-fhs bazel_ot verilator_ot python_ot;
         };
+        cheriot = pkgs.mkShell {
+          name = "cheriot";
+          packages =
+            (with lowrisc_pkgs; [llvm_cheriot xmake])
+            ++ (with pkgs; [
+              gnumake
+              magic-enum
+              srecord
+            ]);
+        };
       };
       formatter = pkgs.alejandra;
     });