From 54fb7d578cc37ec586910875b912c74397dc6b2f Mon Sep 17 00:00:00 2001
From: rina <k@rina.fyi>
Date: Wed, 3 Jul 2024 11:50:00 +1000
Subject: [PATCH] aslp_web: update and build with ocaml5

---
 aslp/asli.nix     | 3 +--
 aslp/aslp_web.nix | 7 ++++---
 aslp/overlay.nix  | 7 ++++---
 overlay.nix       | 4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/aslp/asli.nix b/aslp/asli.nix
index b5d6022..51d329f 100644
--- a/aslp/asli.nix
+++ b/aslp/asli.nix
@@ -20,7 +20,6 @@
 , mlbdd
 , yojson
 , ppx_blob
-, zarith_stubs_js
 , asli
 , testers
 }:
@@ -42,7 +41,7 @@ buildDunePackage {
   nativeCheckInputs = [ jdk ];
   buildInputs = [ mlbdd linenoise ppx_blob ];
   nativeBuildInputs = [ ott menhir ];
-  propagatedBuildInputs = [ dune-site z3 pcre pprint zarith ocaml_z3 ocaml_pcre yojson cohttp-lwt-unix zarith_stubs_js ];
+  propagatedBuildInputs = [ dune-site z3 pcre pprint zarith ocaml_z3 ocaml_pcre yojson cohttp-lwt-unix ];
 
   preConfigure = ''
     mkdir -p $out/share/asli
diff --git a/aslp/aslp_web.nix b/aslp/aslp_web.nix
index a165012..e0f8268 100644
--- a/aslp/aslp_web.nix
+++ b/aslp/aslp_web.nix
@@ -6,6 +6,7 @@
 , js_of_ocaml
 , js_of_ocaml-ppx
 , js_of_ocaml-compiler
+, zarith_stubs_js 
 , nodejs-slim
 , python3
 }:
@@ -14,14 +15,14 @@ buildDunePackage rec {
   pname = "aslp_web";
   version = "unstable-2024-06-28";
 
-  buildInputs = [ asli js_of_ocaml js_of_ocaml-ppx ];
+  buildInputs = [ asli js_of_ocaml js_of_ocaml-ppx zarith_stubs_js ];
   nativeBuildInputs = [ python3 js_of_ocaml-compiler nodejs-slim ];
 
   src = fetchFromGitHub {
     owner = "katrinafyi";
     repo = "aslp-web";
-    rev = "46241099742be60f644d05be475c60166f944a55";
-    hash = "sha256-bOiYHpKYmPcvSlZ2kLT/X8xuNDYRJoS+PbkHUKykXKE=";
+    rev = "7361e110b1717a017fdc68aa3b568f1a27e291bb";
+    hash = "sha256-+WrDXoo911+MTKkeBg+fDezsyxspd4pKf7ZLsTW6pEc=";
   };
 
   postPatch = ''
diff --git a/aslp/overlay.nix b/aslp/overlay.nix
index 94730f6..c871bed 100644
--- a/aslp/overlay.nix
+++ b/aslp/overlay.nix
@@ -3,16 +3,17 @@ final: prev:
 
   aslp-cpp = prev.callPackage ./aslp-cpp.nix { };
 
-  inherit (final.ocamlPackages_pac) aslp asli aslp_web;
+  inherit (final.ocamlPackages_pac) aslp asli;
+  inherit (final.ocamlPackages_pac_5) aslp_web;
 
   overlay_ocamlPackages = ofinal: oprev: {
 
-    asli = ofinal.callPackage ./asli.nix { inherit (final) z3; ocaml_z3 = ofinal.z3; zarith_stubs_js = ofinal.zarith_stubs_js_0_17; };
+    asli = ofinal.callPackage ./asli.nix { inherit (final) z3; ocaml_z3 = ofinal.z3; };
     aslp = ofinal.asli;
     # .overrideAttrs { src = prev.lib.cleanSource ~/progs/aslp; }
 
     zarith_stubs_js_0_17 = ofinal.callPackage ./zarith_stubs_js.nix { };
-    aslp_web = ofinal.callPackage ./aslp_web.nix { };
+    aslp_web = ofinal.callPackage ./aslp_web.nix { zarith_stubs_js = ofinal.zarith_stubs_js_0_17; };
 
     mlbdd = ofinal.callPackage ./mlbdd.nix { };
 
diff --git a/overlay.nix b/overlay.nix
index a073b44..737971e 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -6,10 +6,10 @@ let
 
       update = prev.callPackage ./update.nix { };
 
-      # ocamlPackages_pac = final.ocamlPackages.overrideScope final.overlay_ocamlPackages
-      #   // { _overlay = final.overlay_ocamlPackages; };
       ocamlPackages_pac = final.ocaml-ng.ocamlPackages_4_14.overrideScope final.overlay_ocamlPackages
         // { _overlay = final.overlay_ocamlPackages; };
+      ocamlPackages_pac_5 = final.ocamlPackages.overrideScope final.overlay_ocamlPackages
+        // { _overlay = final.overlay_ocamlPackages; };
 
       # llvm-translator packages 
       overlay_ocamlPackages = ofinal: oprev: {