pyrox.dev
lol
Merge pull request #295229 from vbgl/ocaml-linol-0.5
ligo: 1.0.0 → 1.4.0; ocamlPackages.linol: 2023-08-04 → 0.5
authored by
Ulrik Strid
and committed by
GitHub
93f5edbe
ac9bea36
+12
-28
+3
-17
pkgs/development/compilers/ligo/default.nix
+3
-17
pkgs/development/compilers/ligo/default.nix
···
15
15
16
16
ocamlPackages.buildDunePackage rec {
17
17
pname = "ligo";
18
-
version = "1.0.0";
18
+
version = "1.4.0";
19
19
src = fetchFromGitLab {
20
20
owner = "ligolang";
21
21
repo = "ligo";
22
22
rev = version;
23
-
sha256 = "sha256-tHIIA1JE7mzDIf2v9IEZt1pjVQEA89zjTsmqhzTn3Wc=";
23
+
sha256 = "sha256-N2RkeKJ+lEyNJwpmF5sORmOkDhNmTYRYAgvyR7Pc5EI=";
24
24
fetchSubmodules = true;
25
25
};
26
-
27
-
postPatch = ''
28
-
substituteInPlace "vendors/tezos-ligo/dune-project" \
29
-
--replace \
30
-
"(using ctypes 0.1)" \
31
-
"(using ctypes 0.3)" \
32
-
--replace \
33
-
"(lang dune 3.0)" \
34
-
"(lang dune 3.7)"
35
-
36
-
substituteInPlace "src/coq/dune" \
37
-
--replace \
38
-
"(name ligo_coq)" \
39
-
"(name ligo_coq)(mode vo)"
40
-
'';
41
26
42
27
# The build picks this up for ligo --version
43
28
LIGO_VERSION = version;
···
68
53
ocamlgraph
69
54
bisect_ppx
70
55
decompress
56
+
fileutils
71
57
ppx_deriving
72
58
ppx_deriving_yojson
73
59
ppx_yojson_conv
+9
-9
pkgs/development/ocaml-modules/linol/default.nix
+9
-9
pkgs/development/ocaml-modules/linol/default.nix
···
1
-
{ lib, fetchFromGitHub, buildDunePackage, yojson, logs, lsp, ppx_yojson_conv_lib }:
1
+
{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, yojson, logs, lsp, ppx_yojson_conv_lib, trace }:
2
2
3
3
buildDunePackage
4
4
rec {
5
5
pname = "linol";
6
-
version = "2023-08-04";
6
+
version = "0.5";
7
7
8
8
minimalOCamlVersion = "4.14";
9
-
duneVersion = "3";
10
9
11
10
src = fetchFromGitHub {
12
11
owner = "c-cube";
13
12
repo = "linol";
14
-
# Brings support for newer LSP
15
-
rev = "09311ae258c55c53c62cb5eda3641682e61fe191";
16
-
sha256 = "sha256-51k+Eo3buzby9cWtbl+/0wbAxa2QSS+Oq0aEao0VBCM=";
13
+
rev = "v${version}";
14
+
hash = "sha256-ULPOB/hb+2VXDB/eK66WDDh/wj0bOwUt0tZsiIXqndo=";
17
15
};
18
16
19
-
lsp_v = lsp.override {
20
-
version = "1.14.2";
17
+
patches = fetchpatch {
18
+
url = "https://github.com/c-cube/linol/commit/d8ebcf9a60f1e7251d14cdcd0b2ebd5b7f8eec6d.patch";
19
+
hash = "sha256-JHR0P0X3ep5HvDWW43dMb452/WsFKS4e+5Qhk4MzaxQ=";
21
20
};
22
-
propagatedBuildInputs = [ yojson logs lsp_v ppx_yojson_conv_lib ];
21
+
22
+
propagatedBuildInputs = [ yojson logs lsp ppx_yojson_conv_lib trace ];
23
23
24
24
meta = with lib; {
25
25
description = "LSP server library";