Merge from trunk

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

pkgs/applications/version-management/subversion/default.nix

@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
     ${if httpServer then "--with-apxs=${httpd}/bin/apxs" else "--without-apxs"}
     ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"}
     ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""}
+    ${if stdenv.isDarwin then "--enable-keychain" else ""}
     --with-zlib=${zlib}
     --with-sqlite=${sqlite}
   '';

pkgs/development/compilers/strategoxt/0.18.nix

@@ -73,11 +73,11 @@ rec {
   };
 
   javafront = stdenv.mkDerivation (rec {
-    name = "java-front-0.9";
+    name = "java-front-0.9.1";
 
     src = fetchurl {
-      url = "http://hydra.nixos.org/build/79602/download/1/java-front-0.9.1pre19993.tar.gz";
-      sha256 = "e07e7d9ecc4a57c24d7af309d576d6eda75cb07a9d3d06594edfded366863c9c";
+      url = "http://hydra.nixos.org/build/766286/download/1/java-front-0.9.1pre20122.tar.gz";
+      sha256 = "ef85d3af962fcd54e028ea501e64220b86af335a49143f2819bd3f4789bef7e6";
     };
 
     buildInputs = [pkgconfig aterm sdf strategoxt];

pkgs/development/eclipse/ecj/default.nix

@@ -1,8 +1,8 @@
 { stdenv, fetchurl, unzip, ant, gcj }:
 
 let
-  version = "3.5.1";
-  date    = "200909170800";
+  version = "3.6.1";
+  date    = "201009090800";
   isGCJ   = stdenv.lib.strings.substring 0 3 gcj.name == "gcj";
   javaExec  = if isGCJ then "gij" else "java";
   javaFlags = if isGCJ then "--cp" else "-cp";
@@ -12,7 +12,7 @@ in
 
     src = fetchurl {
       url = "http://eclipse.ialto.org/eclipse/downloads/drops/R-${version}-${date}/ecjsrc-${version}.zip";
-      sha256 = "1vnl2mavisc567bip736xzsvvbjif5279wc4a7pbdik5wlir8qr7";
+      sha256 = "0xfsig2pzd9wy524wp11s7pc7cj81s28g1485995b44d9qbi17h8";
     };
 
     buildInputs = [ unzip ant gcj ];

pkgs/development/libraries/haskell/multiplate/default.nix

@@ -0,0 +1,14 @@
+{cabal, transformers}:
+
+cabal.mkDerivation (self : {
+  pname = "multiplate";
+  version = "0.0.1";
+  sha256 = "06bdj0r83arxxl6vqif9dmna140qcgvjizcyhvyqymsid605hrp4";
+  propagatedBuildInputs = [transformers];
+  meta = {
+    description = "Lightweight generic library for mutually recursive datatypes";
+    license = "MIT";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+

pkgs/development/libraries/qt-4.x/4.6/default.nix

@@ -96,6 +96,6 @@ stdenv.mkDerivation rec {
     description = "A cross-platform application framework for C++";
     license = "GPL/LGPL";
     maintainers = with stdenv.lib.maintainers; [ sander urkud ];
-    platforms = stdenv.lib.platforms.mesaPlatforms;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/development/libraries/v8/default.nix

@@ -0,0 +1,35 @@
+{ stdenv, fetchsvn, python, scons, makeWrapper }:
+
+let
+  system = stdenv.system;
+  arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" then "x64" else ""; 
+in
+assert system == "i686-linux" || system == "x86_64-linux";
+stdenv.mkDerivation rec {
+    name = "v8-r${toString src.rev}";
+    src = fetchsvn {
+      url = http://v8.googlecode.com/svn/trunk ;
+      sha256 = "1p51zh1l9c2gq3g4qk713n6qki9by3llx4p46inncvqfrimgshxb";
+      rev = 5865;
+    };
+    
+    buildInputs = [python scons makeWrapper];
+    
+    buildPhase = ''
+      export CXX=`type -p g++`
+      scons snapshot=on importenv=PATH arch=${arch}
+      scons snapshot=on library=shared importenv=PATH arch=${arch}
+      scons sample=shell snapshot=on importenv=PATH arch=${arch} 
+    '';
+    
+    installPhase = ''
+      ensureDir $out/bin
+      ensureDir $out/lib
+      
+      cp -v libv8.* $out/lib
+      cp -v shell $out/bin/v8-shell
+      cp -vR include $out/
+      wrapProgram $out/bin/v8-shell --set LD_LIBRARY_PATH $out/lib  
+     
+    '';
+}

pkgs/development/tools/analysis/valkyrie/default.nix

@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, qt4 }:
+
+stdenv.mkDerivation rec {
+  name = "valkyrie-2.0.0";
+
+  src = fetchurl {
+    url = "http://valgrind.org/downloads/${name}.tar.bz2";
+    sha256 = "0hwvsncf62mdkahwj9c8hpmm94c1wr5jn89370k6rj894kxry2x7";
+  };
+
+  buildInputs = [ qt4 ];
+
+  configurePhase = "qmake PREFIX=$out";
+
+  meta = {
+    homepage = http://www.valgrind.org/;
+    description = "Qt4-based GUI for the Valgrind 3.6.x series";
+
+    license = "GPLv2";
+
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/os-specific/linux/iotop/default.nix

@@ -0,0 +1,46 @@
+x@{builderDefsPackage
+  , python, makeWrapper
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="iotop";
+    version="0.4.1";
+    name="${baseName}-${version}";
+    url="http://guichaz.free.fr/${baseName}/files/${name}.tar.bz2";
+    hash="1dfvw3khr2rvqllvs9wad9ca3ld4i7szqf0ibq87rn36ickrf3ll";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  phaseNames = ["installPythonPackage" "wrapBinContentsPython"];
+      
+  meta = {
+    description = "A tool to find out the processes doing the most IO";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://guichaz.free.fr/iotop/";
+    };
+  };
+}) x
+

pkgs/os-specific/linux/untie/default.nix

@@ -0,0 +1,46 @@
+x@{builderDefsPackage
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="untie";
+    version="0.3";
+    name="${baseName}-${version}";
+    url="http://guichaz.free.fr/${baseName}/files/${name}.tar.bz2";
+    hash="154c3550af3d3513022a15381bbc2693f5dd7789bf0a4320635991b8f6b3648c";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  phaseNames = ["doMakeInstall"];
+  makeFlags=["PREFIX=$out"];
+      
+  meta = {
+    description = "A tool to run processes untied from some of the namespaces";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://guichaz.free.fr/untie";
+    };
+  };
+}) x
+

pkgs/top-level/all-packages.nix

@@ -2576,6 +2576,8 @@ let
 
   valgrind = callPackage ../development/tools/analysis/valgrind { };
 
+  valkyrie = callPackage ../development/tools/analysis/valkyrie { };
+
   xxdiff = builderDefsPackage (import ../development/tools/misc/xxdiff/3.2.nix) {
     flex = flex2535;
     qt = qt3;
@@ -4084,6 +4086,8 @@ let
 
   swt = callPackage ../development/libraries/java/swt { };
 
+  v8 = callPackage ../development/libraries/v8 { };
+
   xalanj = xalanJava;
   xalanJava = callPackage ../development/libraries/java/xalanj {
     ant    = apacheAntGcj;  # for bootstrap purposes
@@ -4543,6 +4547,10 @@ let
 
   ifplugd = callPackage ../os-specific/linux/ifplugd { };
 
+  iotop = callPackage ../os-specific/linux/iotop {
+    python = pythonFull;
+  };
+
   iproute = callPackage ../os-specific/linux/iproute { };
 
   iputils = (
@@ -5101,6 +5109,8 @@ let
     tunctl = true; mconsole = true;
   };
 
+  untie = callPackage ../os-specific/linux/untie {};
+
   upstart = callPackage ../os-specific/linux/upstart { };
 
   usbutils = callPackage ../os-specific/linux/usbutils { };

pkgs/top-level/haskell-packages.nix

@@ -445,6 +445,8 @@ rec {
 
   mtl = callPackage ../development/libraries/haskell/mtl {};
 
+  multiplate = callPackage ../development/libraries/haskell/multiplate {};
+
   multirec = callPackage ../development/libraries/haskell/multirec {};
 
   multiset = callPackage ../development/libraries/haskell/multiset {};