Unverified Commit 0a04c762 authored by Florian's avatar Florian Committed by GitHub
Browse files

Merge pull request #331337 from vbgl/ocaml-linol-0.6 

ocamlPackages.linol: 0.5 → 0.6
parents 744ee783 467d6e00

pkgs/development/compilers/ligo/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ ocamlPackages.buildDunePackage rec { 
    fetchSubmodules = true;

  };



  patches = [ ./make-compatible-with-linol-0_6.patch ];



  # The build picks this up for ligo --version

  LIGO_VERSION = version;

pkgs/development/compilers/ligo/make-compatible-with-linol-0_6.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
diff --git a/src/bin/cli.ml b/src/bin/cli.ml

index 36ee98cbec..960bfc85a0 100644

--- a/src/bin/cli.ml

+++ b/src/bin/cli.ml

@@ -3537,7 +3537,7 @@ module Lsp_server = struct

           ~session_id

           ~skip_analytics

       in

-      let server = Linol_lwt.Jsonrpc2.create_stdio (s :> Linol_lwt.Jsonrpc2.server) in

+      let server = Linol_lwt.Jsonrpc2.create_stdio ~env:() (s :> Linol_lwt.Jsonrpc2.server) in

       let shutdown () = Poly.(s#get_status = `ReceivedExit) in

       let task = Linol_lwt.Jsonrpc2.run ~shutdown server in

       let analytics_job =

pkgs/development/ocaml-modules/linol/default.nix

+5 −12
Original line number Diff line number Diff line 
{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, yojson, logs, lsp, ppx_yojson_conv_lib, trace }:

{ lib, fetchurl, buildDunePackage, yojson, logs, lsp, ppx_yojson_conv_lib, trace }:



buildDunePackage

rec {

  pname = "linol";

  version = "0.5";

  version = "0.6";



  minimalOCamlVersion = "4.14";



  src = fetchFromGitHub {

    owner = "c-cube";

    repo = "linol";

    rev = "v${version}";

    hash = "sha256-ULPOB/hb+2VXDB/eK66WDDh/wj0bOwUt0tZsiIXqndo=";

  };



  patches = fetchpatch {

    url = "https://github.com/c-cube/linol/commit/d8ebcf9a60f1e7251d14cdcd0b2ebd5b7f8eec6d.patch";

    hash = "sha256-JHR0P0X3ep5HvDWW43dMb452/WsFKS4e+5Qhk4MzaxQ=";

  src = fetchurl {

    url = "https://github.com/c-cube/linol/releases/download/v${version}/linol-${version}.tbz";

    hash = "sha256-MwEisPJdzZN1VRnssotvExNMYOQdffS+Y2B8ZSUDVfo=";

  };



  propagatedBuildInputs = [ yojson logs lsp ppx_yojson_conv_lib trace ];