Update OCaml 3.12.0 to 3.12.1

svn path=/nixpkgs/trunk/; revision=30923

pkgs/development/compilers/ocaml/3.12.0.nix

@@ -1,59 +0,0 @@
-{ stdenv, fetchurl, ncurses, x11 }:
-
-let
-   useX11 = stdenv.system != "armv5tel-linux";
-   useNativeCompilers = stdenv.system != "armv5tel-linux";
-   inherit (stdenv.lib) optionals optionalString;
-in
-
-stdenv.mkDerivation rec {
-  
-  name = "ocaml-3.12.0";
-  
-  src = fetchurl {
-    url = "http://caml.inria.fr/pub/distrib/ocaml-3.12/${name}.tar.bz2";
-    sha256 = "0fzczy1s38ihlvghngn4l4n7gnyywnwd7c172276bjcy41b1g08p";
-  };
-
-  prefixKey = "-prefix ";
-  configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ];
-  buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
-  buildInputs = [ncurses] ++ optionals useX11 [ x11 ];
-  installTargets = "install" + optionalString useNativeCompilers " installopt";
-  patchPhase = ''
-    CAT=$(type -tp cat)
-    sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
-  '';
-  postBuild = ''
-    ensureDir $out/include
-    ln -sv $out/lib/ocaml/caml $out/include/caml
-  '';
-
-  meta = {
-    homepage = http://caml.inria.fr/ocaml;
-    licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
-    description = "Objective Caml, the most popular variant of the Caml language";
-
-    longDescription =
-      '' Objective Caml is the most popular variant of the Caml language.
-         From a language standpoint, it extends the core Caml language with a
-         fully-fledged object-oriented layer, as well as a powerful module
-         system, all connected by a sound, polymorphic type system featuring
-         type inference.
-
-         The Objective Caml system is an industrial-strength implementation
-         of this language, featuring a high-performance native-code compiler
-         (ocamlopt) for 9 processor architectures (IA32, PowerPC, AMD64,
-         Alpha, Sparc, Mips, IA64, HPPA, StrongArm), as well as a bytecode
-         compiler (ocamlc) and an interactive read-eval-print loop (ocaml)
-         for quick development and portability.  The Objective Caml
-         distribution includes a comprehensive standard library, a replay
-         debugger (ocamldebug), lexer (ocamllex) and parser (ocamlyacc)
-         generators, a pre-processor pretty-printer (camlp4) and a
-         documentation generator (ocamldoc).
-       '';
-
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-  };
-
-}

pkgs/development/compilers/ocaml/3.12.1.nix

@@ -0,0 +1,59 @@
+{ stdenv, fetchurl, ncurses, x11 }:
+
+let
+   useX11 = stdenv.system != "armv5tel-linux";
+   useNativeCompilers = stdenv.system != "armv5tel-linux";
+   inherit (stdenv.lib) optionals optionalString;
+in
+
+stdenv.mkDerivation rec {
+  
+  name = "ocaml-3.12.1";
+  
+  src = fetchurl {
+    url = "http://caml.inria.fr/pub/distrib/ocaml-3.12/${name}.tar.bz2";
+    sha256 = "13cmhkh7s6srnlvhg3s9qzh3a5dbk2m9qr35jzq922sylwymdkzd";
+  };
+
+  prefixKey = "-prefix ";
+  configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ];
+  buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
+  buildInputs = [ncurses] ++ optionals useX11 [ x11 ];
+  installTargets = "install" + optionalString useNativeCompilers " installopt";
+  patchPhase = ''
+    CAT=$(type -tp cat)
+    sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
+  '';
+  postBuild = ''
+    ensureDir $out/include
+    ln -sv $out/lib/ocaml/caml $out/include/caml
+  '';
+
+  meta = {
+    homepage = http://caml.inria.fr/ocaml;
+    licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
+    description = "OCaml, the most popular variant of the Caml language";
+
+    longDescription =
+      ''
+        OCaml is the most popular variant of the Caml language.  From a
+        language standpoint, it extends the core Caml language with a
+        fully-fledged object-oriented layer, as well as a powerful module
+        system, all connected by a sound, polymorphic type system featuring
+        type inference.
+
+        The OCaml system is an industrial-strength implementation of this
+        language, featuring a high-performance native-code compiler (ocamlopt)
+        for 9 processor architectures (IA32, PowerPC, AMD64, Alpha, Sparc,
+        Mips, IA64, HPPA, StrongArm), as well as a bytecode compiler (ocamlc)
+        and an interactive read-eval-print loop (ocaml) for quick development
+        and portability.  The OCaml distribution includes a comprehensive
+        standard library, a replay debugger (ocamldebug), lexer (ocamllex) and
+        parser (ocamlyacc) generators, a pre-processor pretty-printer (camlp4)
+        and a documentation generator (ocamldoc).
+      '';
+
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+  };
+
+}

pkgs/top-level/all-packages.nix

@@ -2333,7 +2333,7 @@ let
 
   ocaml_3_11_1 = callPackage ../development/compilers/ocaml/3.11.1.nix { };
 
-  ocaml_3_12_0 = lowPrio (callPackage ../development/compilers/ocaml/3.12.0.nix { });
+  ocaml_3_12_1 = lowPrio (callPackage ../development/compilers/ocaml/3.12.1.nix { });
 
   mkOcamlPackages = ocaml: self: let callPackage = newScope self; in rec {
     inherit ocaml;