about summary refs log tree commit diff
path: root/pkgs/development/tools/ocaml
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2017-02-24 19:21:29 +0000
committerVincent Laporte <Vincent.Laporte@gmail.com>2017-02-24 19:21:29 +0000
commit690968df54612b41c7104095cfa23fd40aaf30df (patch)
tree8c99cb89c2eb3fb22e9ecad8fd15a68739350910 /pkgs/development/tools/ocaml
parent9493ced9f7b03d7c5868c2f0442f9d91f232c226 (diff)
downloadnixlib-690968df54612b41c7104095cfa23fd40aaf30df.tar
nixlib-690968df54612b41c7104095cfa23fd40aaf30df.tar.gz
nixlib-690968df54612b41c7104095cfa23fd40aaf30df.tar.bz2
nixlib-690968df54612b41c7104095cfa23fd40aaf30df.tar.lz
nixlib-690968df54612b41c7104095cfa23fd40aaf30df.tar.xz
nixlib-690968df54612b41c7104095cfa23fd40aaf30df.tar.zst
nixlib-690968df54612b41c7104095cfa23fd40aaf30df.zip
ocamlPackages.utop: 1.19.2 -> 1.19.3
Diffstat (limited to 'pkgs/development/tools/ocaml')
-rw-r--r--pkgs/development/tools/ocaml/utop/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
index b8740bc37932..9b41a06c9355 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.19.2";
+  version = "1.19.3";
   name = "utop-${version}";
 
   src = fetchurl {
     url = "https://github.com/diml/utop/archive/${version}.tar.gz";
-    sha256 = "0hxybkqmrh0sz1yyyrgzdmxp46gda4vk22pv07s0qpfg2dpv56jh";
+    sha256 = "16z02vp9n97iax4fqpbi7v86r75vbabxvnd1rirh8w2miixs1g4x";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild makeWrapper cppo camlp4 ppx_tools ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   createFindlibDestdir = true;
 
   configureFlags = [ "--enable-camlp4" ]
-  ++ stdenv.lib.optional (ppx_tools != null) "--enable-interact";
+  ++ stdenv.lib.optional (ppx_tools != null && !stdenv.lib.versionAtLeast ocaml.version "4.04") "--enable-interact";
 
   buildPhase = ''
     make