diff options
| author | Ulrik Strid <ulrik.strid@outlook.com> | 2024-03-12 08:52:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-12 08:52:41 +0100 |
| commit | 93f5edbe13f441b5965e81d01ce41efe54673377 (patch) | |
| tree | 91714285539e620161980f2f6a8fd87d7bc8bb57 /pkgs/development/ocaml-modules | |
| parent | ac9bea36c60f26a6f38db0f5dd921c3309b489bb (diff) | |
| parent | 7d926d1f73ed14f0a174675f6227f6c4b474dee1 (diff) | |
| download | nixlib-93f5edbe13f441b5965e81d01ce41efe54673377.tar nixlib-93f5edbe13f441b5965e81d01ce41efe54673377.tar.gz nixlib-93f5edbe13f441b5965e81d01ce41efe54673377.tar.bz2 nixlib-93f5edbe13f441b5965e81d01ce41efe54673377.tar.lz nixlib-93f5edbe13f441b5965e81d01ce41efe54673377.tar.xz nixlib-93f5edbe13f441b5965e81d01ce41efe54673377.tar.zst nixlib-93f5edbe13f441b5965e81d01ce41efe54673377.zip | |
Merge pull request #295229 from vbgl/ocaml-linol-0.5
ligo: 1.0.0 → 1.4.0; ocamlPackages.linol: 2023-08-04 → 0.5
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/linol/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/linol/lwt.nix | 2 |
2 files changed, 9 insertions, 11 deletions
diff --git a/pkgs/development/ocaml-modules/linol/default.nix b/pkgs/development/ocaml-modules/linol/default.nix index eb6f9c11c611..28f2bc105d15 100644 --- a/pkgs/development/ocaml-modules/linol/default.nix +++ b/pkgs/development/ocaml-modules/linol/default.nix @@ -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"; diff --git a/pkgs/development/ocaml-modules/linol/lwt.nix b/pkgs/development/ocaml-modules/linol/lwt.nix index b40c3771b6c8..67b0b7b07fbc 100644 --- a/pkgs/development/ocaml-modules/linol/lwt.nix +++ b/pkgs/development/ocaml-modules/linol/lwt.nix @@ -4,8 +4,6 @@ buildDunePackage { pname = "linol-lwt"; inherit (linol) version src; - duneVersion = "3"; - propagatedBuildInputs = [ linol jsonrpc |