ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-29 08:38:18 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #295229 from vbgl/ocaml-linol-0.5

Browse Source 
ligo: 1.0.0 → 1.4.0; ocamlPackages.linol: 2023-08-04 → 0.5
This commit is contained in:
Ulrik Strid 2024-03-12 08:52:41 +01:00 committed by GitHub
commit 93f5edbe13
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/compilers/ligo/default.nix
View File

@ -15,30 +15,15 @@
ocamlPackages.buildDunePackage rec { ocamlPackages.buildDunePackage rec {
pname = "ligo"; pname = "ligo";
version = "1.0.0"; version = "1.4.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "ligolang"; owner = "ligolang";
repo = "ligo"; repo = "ligo";
rev = version; rev = version;
sha256 = "sha256-tHIIA1JE7mzDIf2v9IEZt1pjVQEA89zjTsmqhzTn3Wc="; sha256 = "sha256-N2RkeKJ+lEyNJwpmF5sORmOkDhNmTYRYAgvyR7Pc5EI=";
fetchSubmodules = true; 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 # The build picks this up for ligo --version
LIGO_VERSION = version; LIGO_VERSION = version;
@ -68,6 +53,7 @@ ocamlPackages.buildDunePackage rec {
ocamlgraph ocamlgraph
bisect_ppx bisect_ppx
decompress decompress
fileutils
ppx_deriving ppx_deriving
ppx_deriving_yojson ppx_deriving_yojson
ppx_yojson_conv ppx_yojson_conv

18
pkgs/development/ocaml-modules/linol/default.nix
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 buildDunePackage
rec { rec {
pname = "linol"; pname = "linol";
version = "2023-08-04"; version = "0.5";
minimalOCamlVersion = "4.14"; minimalOCamlVersion = "4.14";
duneVersion = "3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "c-cube"; owner = "c-cube";
repo = "linol"; repo = "linol";
# Brings support for newer LSP rev = "v${version}";
rev = "09311ae258c55c53c62cb5eda3641682e61fe191"; hash = "sha256-ULPOB/hb+2VXDB/eK66WDDh/wj0bOwUt0tZsiIXqndo=";
sha256 = "sha256-51k+Eo3buzby9cWtbl+/0wbAxa2QSS+Oq0aEao0VBCM=";
}; };
lsp_v = lsp.override { patches = fetchpatch {
version = "1.14.2"; 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; { meta = with lib; {
description = "LSP server library"; description = "LSP server library";

2
pkgs/development/ocaml-modules/linol/lwt.nix
View File

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