ocamlPackages.utop: 2.3.0 -> 2.4.1

ocamlPackages.zed: 1.6 -> 2.0.3

ocamlPackages.lambdaTerm: 1.13 -> 2.0.2
This commit is contained in:
Vincent Laporte 2019-08-21 05:10:15 +00:00 committed by Vincent Laporte
parent a86fe43558
commit f7387ad383
3 changed files with 15 additions and 17 deletions

View File

@ -2,20 +2,16 @@
buildDunePackage rec {
pname = "lambda-term";
version = "1.13";
minimumOCamlVersion = "4.02";
version = "2.0.2";
src = fetchurl {
url = "https://github.com/diml/${pname}/archive/${version}.tar.gz";
sha256 = "1hy5ryagqclgdm9lzh1qil5mrynlypv7mn6qm858hdcnmz9zzn0l";
url = "https://github.com/ocaml-community/lambda-term/releases/download/${version}/lambda-term-${version}.tbz";
sha256 = "1p9yczrx78pf5hvhcg1qiqb2vdlmw6bmhhjsm4wiqjq2cc6piaqw";
};
buildInputs = [ libev ];
propagatedBuildInputs = [ zed lwt_log lwt_react ];
hasSharedObjects = true;
meta = { description = "Terminal manipulation library for OCaml";
longDescription = ''
Lambda-term is a cross-platform library for

View File

@ -1,18 +1,20 @@
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, react, dune }:
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, react, dune, charInfo_width }:
let param =
if stdenv.lib.versionAtLeast ocaml.version "4.02" then
{
version = "1.6";
sha256 = "00hhxcjf3bj3w2qm8nzs9x6vrqkadf4i0277s5whzy2rmiknj63v";
version = "2.0.3";
sha256 = "0pa9awinqr0plp4b2az78dwpvh01pwaljnn5ydg8mc6hi7rmir55";
buildInputs = [ dune ];
propagatedBuildInputs = [ charInfo_width ];
extra = {
buildPhase = "dune build -p zed";
inherit (dune) installPhase; };
} else {
version = "1.4";
sha256 = "0d8qfy0qiydrrqi8qc9rcwgjigql6vx9gl4zp62jfz1lmjgb2a3w";
buildInputs = [];
buildInputs = [ ocamlbuild ];
propagatedBuildInputs = [ camomile ];
extra = { createFindlibDestdir = true; };
}
; in
@ -26,9 +28,9 @@ stdenv.mkDerivation (rec {
inherit (param) sha256;
};
buildInputs = [ ocaml findlib ocamlbuild ] ++ param.buildInputs;
buildInputs = [ ocaml findlib ] ++ param.buildInputs;
propagatedBuildInputs = [ react camomile ];
propagatedBuildInputs = [ react ] ++ param.propagatedBuildInputs;
meta = {
description = "Abstract engine for text edition in OCaml";

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, dune
{ stdenv, fetchurl, ocaml, findlib, dune
, lambdaTerm, cppo, makeWrapper
}:
@ -7,16 +7,16 @@ then throw "utop is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
version = "2.3.0";
version = "2.4.1";
name = "utop-${version}";
src = fetchurl {
url = "https://github.com/diml/utop/archive/${version}.tar.gz";
sha256 = "1g1xf19fhzwsikp33pv1wf6wb2qdc5y7dzqi46h8c4l850cwscjh";
sha256 = "0kbg7sfn7jaic7xcy7dm543yzsywirxbgpiv2rzwnp9ny2510f9g";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ ocaml findlib ocamlbuild cppo dune ];
buildInputs = [ ocaml findlib cppo dune ];
propagatedBuildInputs = [ lambdaTerm ];