Merging from trunk. I solved some trivial merge conflicts.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25188
2010-12-17 20:39:58 +00:00
parent e60ba9135a a6f1f87697
commit b48b2a7bb4
137 changed files with 1155 additions and 478 deletions
--- a/pkgs/development/compilers/eql/default.nix
+++ b/pkgs/development/compilers/eql/default.nix
@@ -47,6 +47,7 @@ rec {
    TMP=.
    TMPDIR=.
    XKB_BINDIR="${xkbcomp}/bin" Xvfb -once -reset -terminate :2 -xkbdir ${xkeyboard_config}/etc/X11/xkb &
+    sleep 10;
    DISPLAY=:2 ./first_metatype_id
  '') ["doUnpack" "addInputs"];

--- a/pkgs/development/compilers/ocaml/3.11.1.nix
+++ b/pkgs/development/compilers/ocaml/3.11.1.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
         documentation generator (ocamldoc).
       '';

-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
    maintainers = [
      stdenv.lib.maintainers.z77z
    ];