about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarco Maggesi <maggesi@math.unifi.it>2011-12-16 09:35:13 +0000
committerMarco Maggesi <maggesi@math.unifi.it>2011-12-16 09:35:13 +0000
commitb41da3c8dff4f804485bd9bf411149c4048c25ca (patch)
tree369904dce8f281cce22bb7b2e6c4f55da650522b
parent82fabd62624d91f4ad39c6ec26427aa8a0e340d6 (diff)
Add ocamlnat (native toplevel for OCaml)
svn path=/nixpkgs/trunk/; revision=30926
-rw-r--r--pkgs/development/ocaml-modules/ocamlnat/default.nix40
-rw-r--r--pkgs/top-level/all-packages.nix6
2 files changed, 44 insertions, 2 deletions
diff --git a/pkgs/development/ocaml-modules/ocamlnat/default.nix b/pkgs/development/ocaml-modules/ocamlnat/default.nix
new file mode 100644
index 0000000000000..a8e0f28628a4e
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocamlnat/default.nix
@@ -0,0 +1,40 @@
+{stdenv, fetchurl, ocaml, findlib, ounit}:
+
+stdenv.mkDerivation {
+  name = "ocamlnat-0.1.1";
+
+  src = fetchurl {
+    url = http://benediktmeurer.de/files/source/ocamlnat-0.1.1.tar.bz2;
+    sha256 = "0dyvy0j6f47laxhnadvm71z1py9hz9zd49hamf6bij99cggb2ij1";
+  };
+
+  buildInputs = [ocaml findlib ounit];
+
+  prefixKey = "--prefix ";
+
+  doCheck = true;
+
+  checkTarget = "test";
+
+  createFindlibDestdir = true;
+
+  meta = {
+    description = "OCaml native toplevel";
+    homepage = http://benediktmeurer.de/ocamlnat/;
+    license = "QPL";
+    longDescription = ''
+      The ocamlnat project provides a new native code OCaml toplevel
+      ocamlnat, which is mostly compatible to the byte code toplevel ocaml,
+      but up to 100 times faster. It is based on the optimizing native code
+      compiler, the native runtime and an earlier prototype by Alain
+      Frisch. It is build upon Just-In-Time techniques and currently
+      supports Unix-like systems (i.e. Linux, BSD or Mac OS X) running on
+      x86 or x86-64 processors. Support for additional architectures and
+      operating systems is planned, but not yet available.
+    '';
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+      stdenv.lib.maintainers.z77z
+    ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15e4a859feb58..6c46ebdb6c079 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2417,9 +2417,11 @@ let
   ocamlPackages = recurseIntoAttrs ocamlPackages_3_11_1;
   ocamlPackages_3_10_0 = mkOcamlPackages ocaml_3_10_0 pkgs.ocamlPackages_3_10_0;
   ocamlPackages_3_11_1 = mkOcamlPackages ocaml_3_11_1 pkgs.ocamlPackages_3_11_1;
-  ocamlPackages_3_12_0 = mkOcamlPackages ocaml_3_12_0 pkgs.ocamlPackages_3_12_0;
+  ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1;
 
-  opa = let callPackage = newScope pkgs.ocamlPackages_3_12_0; in callPackage ../development/compilers/opa { };
+  opa = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/compilers/opa { };
+
+  ocamlnat = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/ocaml-modules/ocamlnat { };
 
   opencxx = callPackage ../development/compilers/opencxx {
     gcc = gcc33;