Merge pull request NixOS#247985 from ligolang/ligo--0_71_1

ligo: 0.69.0 -> 0.71.1
shlevy · Aug 14, 2023 · 07e3955 · 07e3955
2 parents 3278e72 + 552bddf
commit 07e3955
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 66 deletions.
diff --git a/pkgs/development/compilers/ligo/2706.diff b/pkgs/development/compilers/ligo/2706.diff
diff --git 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 \

diff --git 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 ];