public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocamlPackages.lambda-term: 1.10 -> 1.11

This commit is contained in:
Vincent Laporte 2017-07-02 12:22:53 +00:00
parent ca15a36d0e
commit 8ad273d4f0
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/ocaml-modules/lambda-term/default.nix
View File

@ -1,21 +1,24 @@
{ stdenv, buildOcaml, fetchurl, libev, ocaml, findlib, ocamlbuild, ocaml_lwt, ocaml_react, zed }: { stdenv, buildOcaml, fetchurl, libev, ocaml, findlib, jbuilder, opam, zed, lwt_react }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; assert stdenv.lib.versionAtLeast ocaml.version "4.02";
buildOcaml rec { buildOcaml rec {
version = "1.10"; version = "1.11";
name = "lambda-term"; name = "lambda-term";
src = fetchurl { src = fetchurl {
url = "https://github.com/diml/lambda-term/archive/${version}.tar.gz"; url = "https://github.com/diml/lambda-term/archive/${version}.tar.gz";
sha256 = "1kwpsqds51xmy3z3ddkam92hkl7arlzy9awhzsq62ysxcl91fb8m"; sha256 = "10lx1jqgmmfwwlv64di4a8nia9l53v7179z70n9fx6aq5l7r8nba";
}; };
buildInputs = [ libev ocaml findlib ocamlbuild ocaml_react ]; buildInputs = [ libev ocaml findlib jbuilder opam ];
propagatedBuildInputs = [ zed ocaml_lwt ]; propagatedBuildInputs = [ zed lwt_react ];
createFindlibDestdir = true; installPhase = ''
${jbuilder.installPhase}
mv $out/lib/ocaml/${ocaml.version}/site-lib/{stubslibs,lambda-term}/dlllambda_term_stubs.so
'';
hasSharedObjects = true; hasSharedObjects = true;

4
pkgs/development/tools/ocaml/utop/default.nix
View File

@ -2,6 +2,10 @@
, lambdaTerm, ocaml_lwt, camomile, zed, cppo, ppx_tools, makeWrapper , lambdaTerm, ocaml_lwt, camomile, zed, cppo, ppx_tools, makeWrapper
}: }:
if !stdenv.lib.versionAtLeast ocaml.version "4.02"
then throw "utop is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.19.3"; version = "1.19.3";
name = "utop-${version}"; name = "utop-${version}";

2
pkgs/top-level/ocaml-packages.nix
View File

@ -290,7 +290,7 @@ let
lambdaTerm-1_6 = callPackage ../development/ocaml-modules/lambda-term/1.6.nix { }; lambdaTerm-1_6 = callPackage ../development/ocaml-modules/lambda-term/1.6.nix { };
lambdaTerm = lambdaTerm =
if lib.versionOlder "4.01" ocaml.version if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/lambda-term { } then callPackage ../development/ocaml-modules/lambda-term { }
else lambdaTerm-1_6; else lambdaTerm-1_6;