Merge pull request #42 from katrinafyi/gtirb_semantics_rpc

update gtirb_semantics to use separate rpc library

Author: ailrst

.github/workflows/update.yml

@@ -17,7 +17,7 @@ jobs:
       matrix:
         pkg: [asli, bap-asli-plugin, bap-primus, basil, gtirb-semantics,
               asl-translator, alive2-aslp, alive2-regehr, aslp_web, compiler-explorer,
-              aslp-cpp, aslp-server
+              aslp-cpp, aslp-server, aslp_client_server_ocaml
         ]
 
     runs-on: ubuntu-24.04

aslp/aslp_client_server_ocaml.nix

@@ -0,0 +1,40 @@
+{ lib
+, fetchFromGitHub
+, buildDunePackage
+  # ocamlPackages
+, lwt
+, mtime
+, aslp
+}:
+
+buildDunePackage {
+  pname = "aslp_client_server_ocaml";
+  version = "0-unstable-2025-02-03";
+
+  minimalOCamlVersion = "5.0";
+
+  src = fetchFromGitHub {
+    owner = "UQ-PAC";
+    repo = "aslp-rpc";
+    rev = "de0567e45af766e03795a757a5a6198efa59d3fe";
+    hash = "sha256-Qcn+UmB0SGXUDOCwHkipW857RfYxM6YMfSZJM7uFcF8=";
+  };
+
+  checkInputs = [ ];
+  nativeCheckInputs = [ ];
+  buildInputs = [ ];
+  nativeBuildInputs = [ ];
+  propagatedBuildInputs = [ aslp lwt mtime ];
+
+  doCheck = true;
+
+  outputs = [ "out" "dev" ];
+
+  passthru = { };
+
+  meta = {
+    homepage = "https://github.com/UQ-PAC/aslp-rpc";
+    description = "RPC connectors for aslp for OCaml and C++ (OCaml Unix socket server component)";
+    maintainers = with lib.maintainers; [ katrinafyi ];
+  };
+}

aslp/overlay.nix

@@ -6,6 +6,7 @@ final: prev:
   inherit (final.ocamlPackages_pac) aslp asli;
   inherit (final.ocamlPackages_pac_5) aslp_web;
   inherit (final.ocamlPackages_pac_5) aslp-server;
+  inherit (final.ocamlPackages_pac_5) aslp_client_server_ocaml;
 
   overlay_ocamlPackages = ofinal: oprev: {
     asli = ofinal.callPackage ./asli.nix { inherit (final) z3; ocaml_z3 = ofinal.z3; };
@@ -16,6 +17,7 @@ final: prev:
 
     zarith_stubs_js_0_17 = ofinal.callPackage ./zarith_stubs_js.nix { };
     aslp_web = ofinal.callPackage ./aslp_web.nix { zarith_stubs_js = ofinal.zarith_stubs_js_0_17; };
+    aslp_client_server_ocaml = ofinal.callPackage ./aslp_client_server_ocaml.nix { };
 
     mlbdd = ofinal.callPackage ./mlbdd.nix { };
     cohttp = oprev.cohttp.overrideAttrs (p: rec {

gtirb/gtirb-semantics.nix

@@ -14,6 +14,7 @@
 , python3Packages
 , python-gtirb
 , gtirb-semantics
+, aslp_client_server_ocaml
 }:
 
 let
@@ -34,16 +35,17 @@ buildDunePackage {
   pname = "gtirb_semantics";
   version = "0-unstable-2024-12-19";
 
-  src = fetchFromGitHub {
-    owner = "UQ-PAC";
+  src = 
+  fetchFromGitHub {
+    owner = "uq-pac";
     repo = "gtirb-semantics";
-    rev = "3044b50fadf54d441e80d68d8fb1f15b28906fb3";
-    sha256 = "sha256-zCP9oQ1T9SUiHLoDDPyyzjGGVTOGpJMoosOunc5EK+g=";
+    rev = "caching";
+    hash = "sha256-kyptRpD3D0ZyTGVI0To3gfdek7V+p/ZgtohEiSI0ZDk=";
   };
 
   buildInputs = [ python' asli ocaml-hexstring ocaml-protoc-plugin yojson ];
   nativeBuildInputs = [ protobuf ocaml-protoc-plugin ];
-  propagatedBuildInputs = [ base64 ];
+  propagatedBuildInputs = [ base64 aslp_client_server_ocaml];
 
   postInstall = ''
     ln -sv ${wrapper}/bin/* $out/bin/gtirb-semantics-nix

update.py

@@ -96,6 +96,7 @@ class Args:
   Package('compiler-explorer', 'ailrst/compiler-explorer', 'main'),
   Package('aslp-server', 'UQ-PAC/aslp-rpc'),
   Package('aslp-cpp', 'UQ-PAC/aslp-rpc'),
+  Package('aslp_client_server_ocaml', 'UQ-PAC/aslp-rpc'),
 ]
 # NOTE: also change files in ./.github/workflows/*.yml