From 0b53d63dad1ea50512dde126c3c3b46de59c4cce Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 25 Mar 2018 18:26:39 +0000 Subject: ocamlPackages.lwt3: 3.0.0 -> 3.3.0 --- pkgs/top-level/ocaml-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/top-level/ocaml-packages.nix') diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 65d3de2d9e2..5c2ec39ade7 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -366,12 +366,10 @@ let lru = callPackage ../development/ocaml-modules/lru { }; - lwt2 = callPackage ../development/ocaml-modules/lwt { }; + lwt2 = callPackage ../development/ocaml-modules/lwt/legacy.nix { }; lwt3 = if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/lwt { - version = "3.0.0"; - } + then callPackage ../development/ocaml-modules/lwt { } else throw "lwt3 is not available for OCaml ${ocaml.version}"; ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt3 else lwt2; @@ -650,7 +648,9 @@ let ssl = callPackage ../development/ocaml-modules/ssl { }; - stog = callPackage ../applications/misc/stog { }; + stog = callPackage ../applications/misc/stog { + ocaml_lwt = lwt2; + }; stringext = callPackage ../development/ocaml-modules/stringext { }; -- cgit 1.4.1