From 5917a9cf360d246c4d28eb13857adbf1ca9217af Mon Sep 17 00:00:00 2001
From: rina <k@rina.fyi>
Date: Fri, 20 Dec 2024 10:54:27 +1000
Subject: [PATCH 1/2] ocaml-protoc-plugin: update to 6.1.0 and update omd too

---
 gtirb/overlay.nix | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/gtirb/overlay.nix b/gtirb/overlay.nix
index 51a6e25..6cd20c0 100644
--- a/gtirb/overlay.nix
+++ b/gtirb/overlay.nix
@@ -18,15 +18,42 @@ final: prev:
     ocaml-hexstring = ofinal.callPackage ./ocaml-hexstring.nix { };
     gtirb-semantics = ofinal.callPackage ./gtirb-semantics.nix {
       python3Packages = final.python311Packages;
+      ocaml-protoc-plugin = ofinal.ocaml-protoc-plugin-6-1-0;
     };
-  };
 
-  inherit (final.ocamlPackages_pac) gtirb-semantics;
+    omd-2-0-0 = oprev.omd.overrideAttrs (p: {
+      version = "2.0.0.alpha4";
+      src = prev.fetchFromGitHub {
+        owner = "ocaml-community";
+        repo = "omd";
+        rev = "2.0.0.alpha4";
+        hash = "sha256-5eZitDaNKSkLOsyPf5g5v9wdZZ3iVQGu8Ot4FHZZ3AI=";
+      };
+      buildInputs = (p.buildInputs or []) ++ (with ofinal; [ uutf uucp uunf dune-build-info ]);
+    });
+
+    # XXX: upstream this + omd!!
+    ocaml-protoc-plugin-6-1-0 = oprev.ocaml-protoc-plugin.overrideAttrs (p: {
+      version = "6.1.0";
+      src = prev.fetchFromGitHub {
+        owner = "andersfugmann";
+        repo = "ocaml-protoc-plugin";
+        rev = "6.1.0";
+        hash = "sha256-d7ZpXRL/d6/MY9/wqrDAKsalRqSuQseGLLzA+E3m24o=";
+      };
+      buildInputs = p.buildInputs ++ (with ofinal; [ dune-configurator omd-2-0-0 ptime base64 final.protobuf ]);
+      propagatedBuildInputs = (p.propagatedBuildInputs or []) ++ [ ofinal.ppx_expect ];
+      postPatch = ''
+        substituteInPlace test/config/discover.ml --replace-fail 'conf.cflags;' '(["-std=c++17"] @ conf.cflags);';
+      '';
+    });
 
-  proto-json = prev.callPackage ./proto-json.nix {
-    inherit (final.ocamlPackages_pac) gtirb-semantics;
   };
 
+  inherit (final.ocamlPackages_pac_5) gtirb-semantics;
+
+  proto-json = prev.callPackage ./proto-json.nix { };
+
   unrandom = prev.callPackage ./unrandom.nix { };
 
 }

From 09c0536f527f25c64be06aee8b5f2521cb0facac Mon Sep 17 00:00:00 2001
From: rina <k@rina.fyi>
Date: Fri, 20 Dec 2024 10:56:11 +1000
Subject: [PATCH 2/2] gtirb-semantics: 0-unstable-2024-12-05 ->
 0-unstable-2024-12-19

Diff: https://github.com/UQ-PAC/gtirb-semantics/compare/b2a4e4465e05ab43d7a0d5f07b1dd5dabb616d92...3044b50fadf54d441e80d68d8fb1f15b28906fb3
---
 gtirb/gtirb-semantics.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gtirb/gtirb-semantics.nix b/gtirb/gtirb-semantics.nix
index 4cf1669..f7ac428 100644
--- a/gtirb/gtirb-semantics.nix
+++ b/gtirb/gtirb-semantics.nix
@@ -32,13 +32,13 @@ let
 in
 buildDunePackage {
   pname = "gtirb_semantics";
-  version = "0-unstable-2024-12-05";
+  version = "0-unstable-2024-12-19";
 
   src = fetchFromGitHub {
     owner = "UQ-PAC";
     repo = "gtirb-semantics";
-    rev = "b2a4e4465e05ab43d7a0d5f07b1dd5dabb616d92";
-    sha256 = "sha256-6c5xQFn9O1yRVXS0XpuWIrOMjgw5jAaqXFW4RFrPN4s=";
+    rev = "3044b50fadf54d441e80d68d8fb1f15b28906fb3";
+    sha256 = "sha256-zCP9oQ1T9SUiHLoDDPyyzjGGVTOGpJMoosOunc5EK+g=";
   };
 
   buildInputs = [ python' asli ocaml-hexstring ocaml-protoc-plugin yojson ];