ocamlPackages.menhirLib: 20220210 -> 20230608

Diff: 20220210...20230608

pkgs/development/compilers/ligo/2706.diff

@@ -0,0 +1,58 @@
+--- a/src/passes/02-parsing/cameligo/dune
++++ b/src/passes/02-parsing/cameligo/dune
+@@ -20,7 +20,9 @@
+  (action
+   (with-stdout-to
+    %{targets}
+-   (run menhir-recover --external-tokens Lexing_cameligo.Token Parser.cmly))))
++   (run menhir-recover
++      --external-tokens Lexing_cameligo.Token.MenhirInterpreter
++      Parser.cmly))))
+ 
+ ;; Build of the CameLIGO parser as a library
+ 
+diff --git a/src/passes/02-parsing/jsligo/dune b/src/passes/02-parsing/jsligo/dune
+index d691ab0af0fe6ae87119405c19e49e2b5c2d1a23..3b13a06e69737037df0df12aa087506f402d8430 100644
+--- a/src/passes/02-parsing/jsligo/dune
++++ b/src/passes/02-parsing/jsligo/dune
+@@ -20,7 +20,9 @@
+  (action
+   (with-stdout-to
+    %{targets}
+-   (run menhir-recover --external-tokens Lexing_jsligo.Token Parser.cmly))))
++   (run menhir-recover
++      --external-tokens Lexing_jsligo.Token.MenhirInterpreter
++      Parser.cmly))))
+ 
+ ;; Build of the JsLIGO parser as a library
+ 
+diff --git a/src/passes/02-parsing/pascaligo/dune b/src/passes/02-parsing/pascaligo/dune
+index 0516a8b790d2eb3ebdb833051bd66241ca44832c..e650decc7ba9907551e1016fee1a53b806fb593e 100644
+--- a/src/passes/02-parsing/pascaligo/dune
++++ b/src/passes/02-parsing/pascaligo/dune
+@@ -20,7 +20,9 @@
+  (action
+   (with-stdout-to
+    %{targets}
+-   (run menhir-recover --external-tokens Lexing_pascaligo.Token Parser.cmly))))
++   (run menhir-recover
++      --external-tokens Lexing_pascaligo.Token.MenhirInterpreter
++      Parser.cmly))))
+ 
+ ;; Build of the PascaLIGO parser as a library
+ 
+diff --git a/src/passes/02-parsing/pyligo/dune b/src/passes/02-parsing/pyligo/dune
+index abb0165f6f185d21ea4a52a152cef188ae9dde4b..5930d86ab721e9dd683e5c4f2873b196ac5859b4 100644
+--- a/src/passes/02-parsing/pyligo/dune
++++ b/src/passes/02-parsing/pyligo/dune
+@@ -20,7 +20,9 @@
+  (action
+   (with-stdout-to
+    %{targets}
+-   (run menhir-recover --external-tokens Lexing_pyligo.Token Parser.cmly))))
++   (run menhir-recover
++      --external-tokens Lexing_pyligo.Token.MenhirInterpreter
++      Parser.cmly))))
+ 
+ ;; Build of the PyLIGO parser as a library
+ 

pkgs/development/compilers/ligo/default.nix

@@ -24,6 +24,9 @@ ocamlPackages.buildDunePackage rec {
     fetchSubmodules = true;
   };
 
+  # https://gitlab.com/ligolang/ligo/-/merge_requests/2706.diff
+  patches = [ ./2706.diff ];
+
   postPatch = ''
     substituteInPlace "vendors/tezos-ligo/src/lib_hacl/hacl.ml" \
       --replace \

pkgs/development/ocaml-modules/menhir/lib.nix

@@ -2,14 +2,14 @@
 
 buildDunePackage rec {
   pname = "menhirLib";
-  version = "20220210";
+  version = "20230608";
 
   src = fetchFromGitLab {
     domain = "gitlab.inria.fr";
     owner = "fpottier";
     repo = "menhir";
     rev = version;
-    sha256 = "sha256:0f31isr3cyiishflz6qr4xc3gp9xwf32r3vxdvm5wnr2my1fnn1n";
+    sha256 = "sha256-dUPoIUVr3gqvE5bniyQh/b37tNfRsZN8X3e99GFkyLY=";
   };
 
   meta = with lib; {