summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorFlorent Becker <florent.becker@ens-lyon.org>2016-01-01 17:37:36 +0100
committerFlorent Becker <florent.becker@ens-lyon.org>2016-01-01 19:04:32 +0100
commitf4c6f769f411e59101a1301f0b45c89e4625da6d (patch)
tree1768f7f302e7ddecc282b3f9d29af799c4920a8a /pkgs
parenta1fdc48d7eb6026d8b8a585264ca512a7ee5195d (diff)
downloadnixpkgs-f4c6f769f411e59101a1301f0b45c89e4625da6d.tar
nixpkgs-f4c6f769f411e59101a1301f0b45c89e4625da6d.tar.gz
nixpkgs-f4c6f769f411e59101a1301f0b45c89e4625da6d.tar.bz2
nixpkgs-f4c6f769f411e59101a1301f0b45c89e4625da6d.tar.lz
nixpkgs-f4c6f769f411e59101a1301f0b45c89e4625da6d.tar.xz
nixpkgs-f4c6f769f411e59101a1301f0b45c89e4625da6d.tar.zst
nixpkgs-f4c6f769f411e59101a1301f0b45c89e4625da6d.zip
lwt: 2.4.6 -> 2.5.0
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/ocaml-modules/lwt/default.nix9
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix
index 0c73ff6521f..a018194a2ac 100644
--- a/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/pkgs/development/ocaml-modules/lwt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib, camlp4, ppx_tools }:
 
 let
-  version = "2.4.6";
+  version = "2.5.0";
   inherit (stdenv.lib) optional getVersion versionAtLeast;
   ocaml_version = getVersion ocaml;
 in
@@ -13,16 +13,15 @@ stdenv.mkDerivation {
 
   src = fetchzip {
     url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz";
-    sha256 = "0idci0zadpb8hmblszsrvg6yf36w5a9y6rsdwjc3jww71dgrw5d9";
+    sha256 = "0jgg51aqbnia33l7bhgirnfpqybjwzpd85qzzd9znnc1a27gv8vr";
   };
 
   buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib glib ncurses camlp4 ppx_tools ];
 
   propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text libev ];
 
-  configureFlags = [ "--enable-react" "--enable-glib" "--enable-ssl" "--enable-text" ]
-  ++ [ (if versionAtLeast ocaml_version "4.02" then "--enable-ppx" else "--disable-ppx") ]
-  ++ optional (versionAtLeast ocaml_version "4.0" && ! versionAtLeast ocaml_version "4.02") "--enable-toplevel";
+  configureFlags = [ "--enable-glib" "--enable-ssl" "--enable-react" "--enable-camlp4"]
+  ++ [ (if versionAtLeast ocaml_version "4.02" then "--enable-ppx" else "--disable-ppx") ];
 
   createFindlibDestdir = true;