Updating from trunk. I resolved simple conflicts.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25061

1 files changed, 25 insertions, 0 deletions

diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix
new file mode 100644
index 000000000000..766419aada7c
--- /dev/null
+++ b/pkgs/development/ocaml-modules/lwt/default.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchurl, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl}:
+
+let
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+  version = "2.1.1";
+in
+
+stdenv.mkDerivation {
+  name = "ocaml-lwt-${version}";
+
+  src = fetchurl {
+    url = "http://ocsigen.org/download/lwt-${version}.tar.gz";
+    sha256 = "1zjn0sgihryshancn4kna1xslhc8gifliny1qd3a85f72xxxnw0w";
+  };
+
+  buildInputs = [which cryptopp ocaml findlib ocaml_react ocaml_ssl];
+
+  configurePhase = "true";
+
+  meta = {
+    homepage = http://ocsigen.org/lwt;
+    description = "Lightweight thread library for Objective Caml";
+    license = "LGPL";
+  };
+}