diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-03-25 18:26:39 +0000 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2018-03-27 22:32:55 +0200 |
| commit | 0b53d63dad1ea50512dde126c3c3b46de59c4cce (patch) | |
| tree | e003fdb301bc712acfc9db48cf0b5a7a4b0a5195 /pkgs/top-level/ocaml-packages.nix | |
| parent | 73a7d67795654d35647d217d6d1d3cb0f9cf0899 (diff) | |
| download | nixpkgs-0b53d63dad1ea50512dde126c3c3b46de59c4cce.tar nixpkgs-0b53d63dad1ea50512dde126c3c3b46de59c4cce.tar.gz nixpkgs-0b53d63dad1ea50512dde126c3c3b46de59c4cce.tar.bz2 nixpkgs-0b53d63dad1ea50512dde126c3c3b46de59c4cce.tar.lz nixpkgs-0b53d63dad1ea50512dde126c3c3b46de59c4cce.tar.xz nixpkgs-0b53d63dad1ea50512dde126c3c3b46de59c4cce.tar.zst nixpkgs-0b53d63dad1ea50512dde126c3c3b46de59c4cce.zip | |
ocamlPackages.lwt3: 3.0.0 -> 3.3.0
Diffstat (limited to 'pkgs/top-level/ocaml-packages.nix')
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 10 |
1 files changed, 5 insertions, 5 deletions
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 { }; |