about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2016-06-05 21:18:23 +0200
committerVincent Laporte <Vincent.Laporte@gmail.com>2016-06-06 19:13:18 +0200
commit64674d24c38a4518d1a22cf81d79751bed158ac9 (patch)
treec75a0201652e10ff1b901b5b649526df89d98c56 /pkgs
parent354e58927588f39c1b1cbd572ee46b98eb2c47fa (diff)
downloadnixlib-64674d24c38a4518d1a22cf81d79751bed158ac9.tar
nixlib-64674d24c38a4518d1a22cf81d79751bed158ac9.tar.gz
nixlib-64674d24c38a4518d1a22cf81d79751bed158ac9.tar.bz2
nixlib-64674d24c38a4518d1a22cf81d79751bed158ac9.tar.lz
nixlib-64674d24c38a4518d1a22cf81d79751bed158ac9.tar.xz
nixlib-64674d24c38a4518d1a22cf81d79751bed158ac9.tar.zst
nixlib-64674d24c38a4518d1a22cf81d79751bed158ac9.zip
utop: 1.17 -> 1.19.2
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/tools/ocaml/utop/default.nix11
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
index b5de65b7c10f..45888924a2ef 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -1,23 +1,24 @@
 {stdenv, fetchurl, ocaml, findlib, lambdaTerm, ocaml_lwt, makeWrapper,
- ocaml_react, camomile, zed, cppo, camlp4
+ ocaml_react, camomile, zed, cppo, camlp4, ppx_tools
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.17";
+  version = "1.19.2";
   name = "utop-${version}";
 
   src = fetchurl {
     url = "https://github.com/diml/utop/archive/${version}.tar.gz";
-    sha256 = "0l9lz2nypl2ls3kqzmp738m02yvscabhsfpj70ckp0p98pimnnfd";
+    sha256 = "0hxybkqmrh0sz1yyyrgzdmxp46gda4vk22pv07s0qpfg2dpv56jh";
   };
 
-  buildInputs = [ ocaml findlib makeWrapper cppo camlp4 ];
+  buildInputs = [ ocaml findlib makeWrapper cppo camlp4 ppx_tools ];
 
   propagatedBuildInputs = [ lambdaTerm ocaml_lwt ];
 
   createFindlibDestdir = true;
 
-  configureFlags = "--enable-camlp4";
+  configureFlags = [ "--enable-camlp4" ]
+  ++ stdenv.lib.optional (ppx_tools != null) "--enable-interact";
 
   buildPhase = ''
     make