diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-06-24 06:18:35 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-06-28 07:16:49 +0000 |
| commit | 9a7d6c2e3dc42993f46593846515e0debfb2da47 (patch) | |
| tree | a3c88220853acfdfbc3018574527cfcc99f4adff /pkgs/development/tools/ocaml/utop/default.nix | |
| parent | 1747ec308aaf1c196a5e8941780b8e64c30059c8 (diff) | |
| download | nixpkgs-9a7d6c2e3dc42993f46593846515e0debfb2da47.tar nixpkgs-9a7d6c2e3dc42993f46593846515e0debfb2da47.tar.gz nixpkgs-9a7d6c2e3dc42993f46593846515e0debfb2da47.tar.bz2 nixpkgs-9a7d6c2e3dc42993f46593846515e0debfb2da47.tar.lz nixpkgs-9a7d6c2e3dc42993f46593846515e0debfb2da47.tar.xz nixpkgs-9a7d6c2e3dc42993f46593846515e0debfb2da47.tar.zst nixpkgs-9a7d6c2e3dc42993f46593846515e0debfb2da47.zip | |
ocamlPackages.utop: 1.19.3 -> 2.1.0
Diffstat (limited to 'pkgs/development/tools/ocaml/utop/default.nix')
| -rw-r--r-- | pkgs/development/tools/ocaml/utop/default.nix | 24 |
1 files changed, 7 insertions, 17 deletions
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 |