Updating from trunk. I resolved simple conflicts.

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

1 files changed, 31 insertions, 0 deletions

diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/pkgs/development/ocaml-modules/ounit/default.nix
new file mode 100644
index 000000000000..af208dc5651c
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ounit/default.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchurl, ocaml, findlib}:
+
+let
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+  version = "1.0.3";
+in
+
+stdenv.mkDerivation {
+  name = "ounit-${version}";
+
+  src = fetchurl {
+    url = "http://www.xs4all.nl/~mmzeeman/ocaml/ounit-${version}.tar.gz";
+    sha256 = "1n7ylrbi2m00gn0kjg5zxnyzxki8v1dy31fcz3vh1xnwcx6hii97";
+  };
+
+  buildInputs = [ocaml findlib];
+
+  configurePhase = "true";  	# Skip configure
+
+  buildFlags = "all allopt";
+
+  doCheck = true;
+
+  checkTarget = "test";
+
+  meta = {
+    homepage = http://www.xs4all.nl/~mmzeeman/ocaml/;
+    description = "Unit test framework for OCaml";
+    license = "MIT/X11";
+  };
+}