diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-07-02 12:22:53 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-07-02 12:56:56 +0000 |
| commit | 8ad273d4f06004f31c2dc7e5eff87a9343376c47 (patch) | |
| tree | efb042dd1bc90b154f62234ed790ff6521aed9cc /pkgs | |
| parent | ca15a36d0ec2b8a3597efd5bc1a1694f9aa2ce7d (diff) | |
| download | nixpkgs-8ad273d4f06004f31c2dc7e5eff87a9343376c47.tar nixpkgs-8ad273d4f06004f31c2dc7e5eff87a9343376c47.tar.gz nixpkgs-8ad273d4f06004f31c2dc7e5eff87a9343376c47.tar.bz2 nixpkgs-8ad273d4f06004f31c2dc7e5eff87a9343376c47.tar.lz nixpkgs-8ad273d4f06004f31c2dc7e5eff87a9343376c47.tar.xz nixpkgs-8ad273d4f06004f31c2dc7e5eff87a9343376c47.tar.zst nixpkgs-8ad273d4f06004f31c2dc7e5eff87a9343376c47.zip | |
ocamlPackages.lambda-term: 1.10 -> 1.11
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/ocaml-modules/lambda-term/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/utop/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 |
3 files changed, 15 insertions, 8 deletions
diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix index 86e4ebccbae..86d03896ab1 100644 --- a/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -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 { - version = "1.10"; + version = "1.11"; name = "lambda-term"; src = fetchurl { 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; diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 9e394751761..0f73f4c54af 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -2,6 +2,10 @@ , 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 { version = "1.19.3"; name = "utop-${version}"; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 5537196d15c..2a111bca291 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -290,7 +290,7 @@ let lambdaTerm-1_6 = callPackage ../development/ocaml-modules/lambda-term/1.6.nix { }; lambdaTerm = - if lib.versionOlder "4.01" ocaml.version + if lib.versionOlder "4.02" ocaml.version then callPackage ../development/ocaml-modules/lambda-term { } else lambdaTerm-1_6; |