diff options
Diffstat (limited to 'pkgs/development/ocaml-modules')
5 files changed, 15 insertions, 17 deletions
diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix index 6627ac75a86e..115bc5b2c55c 100644 --- a/pkgs/development/ocaml-modules/camlpdf/default.nix +++ b/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -5,14 +5,14 @@ then throw "camlpdf is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - version = "2.6"; + version = "2.7"; pname = "ocaml${ocaml.version}-camlpdf"; src = fetchFromGitHub { owner = "johnwhitington"; repo = "camlpdf"; rev = "v${version}"; - hash = "sha256-CJWVvZSbvSzG3PIr7w0vmbmY6tH59AgBAWRfDpQ9MCk="; + hash = "sha256-SVmLWffB7GF+Bu0tj5fIvQVMRh6uV3u2G3rC4cVH2Gw="; }; nativeBuildInputs = [ which ocaml findlib ]; diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index 3660182df370..30167f1c2ae2 100644 --- a/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/pkgs/development/ocaml-modules/cpdf/default.nix @@ -6,13 +6,13 @@ else stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-cpdf"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "johnwhitington"; repo = "cpdf-source"; rev = "v${version}"; - hash = "sha256-5gEv/lmca3FR16m4uxbCJ3y/XtTSBvoIojeKszc24ss="; + hash = "sha256-Tm+xvL2HNdQsD04I9eR9tLL0bs5Ls2q+IndLV/p9sHs="; }; nativeBuildInputs = [ ocaml findlib ]; 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 diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix index 7923a24f0401..3b26c28f5341 100644 --- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-ocsigen-start"; - version = "6.1.2"; + version = "6.2.0"; nativeBuildInputs = [ ocaml findlib eliom ]; buildInputs = [ ocsigen-ppx-rpc ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "ocsigen"; repo = "ocsigen-start"; rev = version; - hash = "sha256-GhuH3rNdauJztEhygct6jCf+EmAtbSeyYP45stMzGFU="; + hash = "sha256-i2nj/m1Ihb/bprtHvZh47/oK0v+aFNVH+A2CB4rrrPk="; }; preInstall = '' |