Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ocamlPackages.{zed,lambdaTerm,utop}: update #67168

Merged
merged 2 commits into from
Aug 28, 2019
Merged

ocamlPackages.{zed,lambdaTerm,utop}: update #67168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
448b885
ocamlPackages.lambdaTerm: remove at 1.6
vbgl Aug 21, 2019
6e889c1
ocamlPackages.utop: 2.3.0 -> 2.4.1
vbgl Aug 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 0 additions & 42 deletions pkgs/development/ocaml-modules/lambda-term/1.6.nix
View file
Open in desktop

This file was deleted.

10 changes: 3 additions & 7 deletions pkgs/development/ocaml-modules/lambda-term/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 8 additions & 6 deletions pkgs/development/ocaml-modules/zed/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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";
Expand Down
8 changes: 4 additions & 4 deletions pkgs/development/tools/ocaml/utop/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, dune
{ stdenv, fetchurl, ocaml, findlib, dune
, lambdaTerm, cppo, makeWrapper
}:

Expand All @@ -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 ];

Expand Down
6 changes: 1 addition & 5 deletions pkgs/top-level/ocaml-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,11 +382,7 @@ let

lambdasoup = callPackage ../development/ocaml-modules/lambdasoup { };

lambdaTerm-1_6 = callPackage ../development/ocaml-modules/lambda-term/1.6.nix { lwt = lwt2; };
lambdaTerm =
if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/lambda-term { }
else lambdaTerm-1_6;
lambdaTerm = callPackage ../development/ocaml-modules/lambda-term { };

linenoise = callPackage ../development/ocaml-modules/linenoise { };

Expand Down