From 6eb97ebbf9faf6faa52890b6dd11fee2ad3c032f Mon Sep 17 00:00:00 2001
From: Ulrik Strid <ulrik.strid@outlook.com>
Date: Mon, 14 Aug 2023 12:45:00 +0200
Subject: [PATCH 1/2] ocamlPackages.linol: 2023-04-25 -> 2023-08-04

---
 pkgs/development/ocaml-modules/linol/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/linol/default.nix b/pkgs/development/ocaml-modules/linol/default.nix
index 34f32cf4f7bf5..9b53cd82eb974 100644
--- a/pkgs/development/ocaml-modules/linol/default.nix
+++ b/pkgs/development/ocaml-modules/linol/default.nix
@@ -3,7 +3,7 @@
 buildDunePackage
 rec {
   pname = "linol";
-  version = "2023-04-25";
+  version = "2023-08-04";
 
   minimalOCamlVersion = "4.14";
   duneVersion = "3";
@@ -12,8 +12,8 @@ rec {
     owner = "c-cube";
     repo = "linol";
     # Brings support for newer LSP
-    rev = "439534e0c5b7a3fbf93ba05fae7d171426153763";
-    sha256 = "sha256-EW35T7KUc/L1Zy4+oaJOC6mlVpbvhTfnU3NNFGoZAJg=";
+    rev = "09311ae258c55c53c62cb5eda3641682e61fe191";
+    sha256 = "sha256-51k+Eo3buzby9cWtbl+/0wbAxa2QSS+Oq0aEao0VBCM=";
   };
 
   propagatedBuildInputs = [ yojson logs lsp ppx_yojson_conv_lib ];

From 552bddf3ed68ca474419ab1c93105429333b1fd8 Mon Sep 17 00:00:00 2001
From: Laurent CaniBot <laurent@marigold.dev>
Date: Tue, 8 Aug 2023 18:35:17 +0000
Subject: [PATCH 2/2] ligo: 0.69.0 -> 0.71.1

---
 pkgs/development/compilers/ligo/2706.diff   | 58 ---------------------
 pkgs/development/compilers/ligo/default.nix |  7 +--
 2 files changed, 2 insertions(+), 63 deletions(-)
 delete mode 100644 pkgs/development/compilers/ligo/2706.diff

diff --git a/pkgs/development/compilers/ligo/2706.diff b/pkgs/development/compilers/ligo/2706.diff
deleted file mode 100644
index 8eab82e1461ec..0000000000000
--- a/pkgs/development/compilers/ligo/2706.diff
+++ /dev/null
@@ -1,58 +0,0 @@
---- 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
- 
diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix
index 05fea9caddbb6..ff601131bd23f 100644
--- a/pkgs/development/compilers/ligo/default.nix
+++ b/pkgs/development/compilers/ligo/default.nix
@@ -15,18 +15,15 @@
 
 ocamlPackages.buildDunePackage rec {
   pname = "ligo";
-  version = "0.69.0";
+  version = "0.71.1";
   src = fetchFromGitLab {
     owner = "ligolang";
     repo = "ligo";
     rev = version;
-    sha256 = "sha256-Swt4uihsAtHVMkc0DxATwB8FvgxwtSJTN3E5cBtyXf8=";
+    sha256 = "sha256-E28/bRtYS57vB3WguUDGmR2ZhXhh/taiZTLa07Hu88g=";
     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 \