ligo: 1.0.0 → 1.4.0

ocamlPackages.linol: 2023-08-04 → 0.5
This commit is contained in:
Vincent Laporte 2024-02-16 06:20:02 +01:00
parent 6e72ac6e54
commit 7d926d1f73
No known key found for this signature in database
GPG key ID: EBD582ADDDB1F81F
3 changed files with 12 additions and 28 deletions

View file

@ -15,30 +15,15 @@
ocamlPackages.buildDunePackage rec {
pname = "ligo";
version = "1.0.0";
version = "1.4.0";
src = fetchFromGitLab {
owner = "ligolang";
repo = "ligo";
rev = version;
sha256 = "sha256-tHIIA1JE7mzDIf2v9IEZt1pjVQEA89zjTsmqhzTn3Wc=";
sha256 = "sha256-N2RkeKJ+lEyNJwpmF5sORmOkDhNmTYRYAgvyR7Pc5EI=";
fetchSubmodules = true;
};
postPatch = ''
substituteInPlace "vendors/tezos-ligo/dune-project" \
--replace \
"(using ctypes 0.1)" \
"(using ctypes 0.3)" \
--replace \
"(lang dune 3.0)" \
"(lang dune 3.7)"
substituteInPlace "src/coq/dune" \
--replace \
"(name ligo_coq)" \
"(name ligo_coq)(mode vo)"
'';
# The build picks this up for ligo --version
LIGO_VERSION = version;
@ -68,6 +53,7 @@ ocamlPackages.buildDunePackage rec {
ocamlgraph
bisect_ppx
decompress
fileutils
ppx_deriving
ppx_deriving_yojson
ppx_yojson_conv

View file

@ -1,25 +1,25 @@
{ lib, fetchFromGitHub, buildDunePackage, yojson, logs, lsp, ppx_yojson_conv_lib }:
{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, yojson, logs, lsp, ppx_yojson_conv_lib, trace }:
buildDunePackage
rec {
pname = "linol";
version = "2023-08-04";
version = "0.5";
minimalOCamlVersion = "4.14";
duneVersion = "3";
src = fetchFromGitHub {
owner = "c-cube";
repo = "linol";
# Brings support for newer LSP
rev = "09311ae258c55c53c62cb5eda3641682e61fe191";
sha256 = "sha256-51k+Eo3buzby9cWtbl+/0wbAxa2QSS+Oq0aEao0VBCM=";
rev = "v${version}";
hash = "sha256-ULPOB/hb+2VXDB/eK66WDDh/wj0bOwUt0tZsiIXqndo=";
};
lsp_v = lsp.override {
version = "1.14.2";
patches = fetchpatch {
url = "https://github.com/c-cube/linol/commit/d8ebcf9a60f1e7251d14cdcd0b2ebd5b7f8eec6d.patch";
hash = "sha256-JHR0P0X3ep5HvDWW43dMb452/WsFKS4e+5Qhk4MzaxQ=";
};
propagatedBuildInputs = [ yojson logs lsp_v ppx_yojson_conv_lib ];
propagatedBuildInputs = [ yojson logs lsp ppx_yojson_conv_lib trace ];
meta = with lib; {
description = "LSP server library";

View file

@ -4,8 +4,6 @@ buildDunePackage {
pname = "linol-lwt";
inherit (linol) version src;
duneVersion = "3";
propagatedBuildInputs = [
linol
jsonrpc