diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-06-29 00:34:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-29 00:34:11 +0200 |
| commit | 5c757847eb9c50c7bfe633350bed9cec57af675c (patch) | |
| tree | e48171c8cde87e32eb02ca3efc20c4cdf7bea6c9 /pkgs/development | |
| parent | d491292288d0b9d8fb58035262fc97ab41abbdae (diff) | |
| parent | 9a7d6c2e3dc42993f46593846515e0debfb2da47 (diff) | |
| download | nixpkgs-5c757847eb9c50c7bfe633350bed9cec57af675c.tar nixpkgs-5c757847eb9c50c7bfe633350bed9cec57af675c.tar.gz nixpkgs-5c757847eb9c50c7bfe633350bed9cec57af675c.tar.bz2 nixpkgs-5c757847eb9c50c7bfe633350bed9cec57af675c.tar.lz nixpkgs-5c757847eb9c50c7bfe633350bed9cec57af675c.tar.xz nixpkgs-5c757847eb9c50c7bfe633350bed9cec57af675c.tar.zst nixpkgs-5c757847eb9c50c7bfe633350bed9cec57af675c.zip | |
Merge pull request #42734 from vbgl/ocaml-utop-2.1.0
ocamlPackages.utop: 1.19.3 -> 2.1.0
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/ocaml-modules/lambda-term/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/utop/default.nix | 24 |
2 files changed, 10 insertions, 20 deletions
diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix index fdd30d28ed8..c1e268f686b 100644 --- a/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -1,10 +1,10 @@ -{ stdenv, buildOcaml, fetchurl, libev, ocaml, findlib, jbuilder, zed, lwt_react }: +{ stdenv, fetchurl, libev, ocaml, findlib, jbuilder, zed, lwt_react }: assert stdenv.lib.versionAtLeast ocaml.version "4.02"; -buildOcaml rec { +stdenv.mkDerivation rec { version = "1.12.0"; - name = "lambda-term"; + name = "ocaml${ocaml.version}-lambda-term-${version}"; src = fetchurl { url = "https://github.com/diml/lambda-term/archive/${version}.tar.gz"; diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 404bf08e74e..340c57f2817 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, bash, ocaml, findlib, ocamlbuild, camlp4 -, lambdaTerm, ocaml_lwt, camomile, zed, cppo, ppx_tools, makeWrapper +{ stdenv, fetchurl, bash, ocaml, findlib, ocamlbuild, jbuilder +, lambdaTerm, cppo, makeWrapper }: if !stdenv.lib.versionAtLeast ocaml.version "4.02" @@ -7,30 +7,20 @@ then throw "utop is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - version = "1.19.3"; + version = "2.1.0"; name = "utop-${version}"; src = fetchurl { url = "https://github.com/diml/utop/archive/${version}.tar.gz"; - sha256 = "16z02vp9n97iax4fqpbi7v86r75vbabxvnd1rirh8w2miixs1g4x"; + sha256 = "0lpfyhnm4v3xmcpac76g1px3x7na4p29w6xj2q8chqxhcw131n2y"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ocaml findlib ocamlbuild cppo camlp4 ppx_tools ]; + buildInputs = [ ocaml findlib ocamlbuild cppo jbuilder ]; - propagatedBuildInputs = [ lambdaTerm ocaml_lwt ]; + propagatedBuildInputs = [ lambdaTerm ]; - createFindlibDestdir = true; - - configureFlags = [ "--enable-camlp4" ] - ++ stdenv.lib.optional (ppx_tools != null && !stdenv.lib.versionAtLeast ocaml.version "4.04") "--enable-interact"; - - buildPhase = '' - make - make doc - ''; - - dontStrip = true; + inherit (jbuilder) installPhase; postFixup = let |