* Sync with the trunk once more.

* Turn on everything in Hydra.

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

pkgs/misc/bleeding-edge-fetch-infos.nix

@@ -127,9 +127,9 @@
     url = http://mawercer.de/~nix/repos/syb_with_class.tar.gz;
     sha256 = "f67c979bb980e69856f26f89b9bdcb5cf962e4db0b1fb859f53928c2d6b45f5b";
   };
-  synergy = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/synergy.tar.gz;
-    sha256 = "c86dde2f10e7071d823cff542ea6c98a7e29a45e4909034edbd7605caa775a47";
+  synergy = args: with args; fetchurl { # Mon Mar 30 10:08:36 CEST 2009
+    url = "http://mawercer.de/~nix/repos/synergy-F_10-08-35.tar.gz";
+    sha256 = "764b88b69f342017094380f62099f4a0dfdcddb6a289abb6b646f7ac2f37d675";
   };
   takusen = args: with args; fetchurl {
     url = http://mawercer.de/~nix/repos/takusen.tar.gz;

pkgs/misc/maven/maven-2.nix

@@ -1,13 +1,15 @@
 args: with args;
 stdenv.mkDerivation {
-  name = "maven-2.0.8-bin";
+  name = "maven-2.1.0-bin";
 
   src = fetchurl {
     # TODO mirrors 
-    url = http://apache.linux-mirror.org/maven/binaries/apache-maven-2.0.8-bin.tar.bz2;
-    sha256 = "1wasvqplw7xk04j38vsq94zbrlpdg2k4348bg8730snr6zgaasai";
+    url = http://apache.mirroring.de/maven/binaries/apache-maven-2.1.0-bin.zip;
+    sha256 = "13xda2l05pqs7x8ig85i9dqbdbv970zfgqif4wgjz8nn36jbxpvd";
   };
 
+  buildInputs = [ unzip ];
+
   phases = "unpackPhase installPhase";
 
   installPhase = "

pkgs/misc/ntfs-3g/default.nix

@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "ntfs-3g";
-  version = "2009.1.1";
+  version = "2009.2.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/${name}.tgz";
-    sha256 = "0e02ff891645658c1801ba7d665c0ff3a4231e5570b974a803ffc2974ef68e45";
+    sha256 = "1c3qhn0i5hlyk9dky5a4jnbfkyz73d3qpymblc8mhhx642nigbj7";
   };
 
   preConfigure = ''

pkgs/misc/ntfsprogs/default.nix

@@ -1,16 +1,23 @@
-args: with args;
-args.stdenv.mkDerivation {
+{stdenv, fetchurl, libuuid}:
+
+stdenv.mkDerivation rec {
   name = "ntfsprogs-2.0.0";
 
   src = fetchurl {
-    name = "ntfsprogs-2.0.0.tar.bz2";
-    url = "http://garr.dl.sourceforge.net/sourceforge/linux-ntfs/ntfsprogs-2.0.0.tar.bz2";
+    url = "mirror://sourceforge/linux-ntfs/${name}.tar.bz2";
     sha256 = "ad36e19706c7303b10aa0a9bf2c2dd0309b91cd0171f1c9eb361d94a85017432";
   };
 
+  buildInputs = [libuuid];
+
+  preConfigure =
+    ''
+      substituteInPlace ntfsprogs/Makefile.in --replace /sbin $out/sbin
+    '';
+
   meta = {
-      description = "ntfs utilities";
-      homepage = http://sourceforge.net/projects/linux-ntfs;
-      license = "GPL";
+    description = "Utilities for the NTFS filesystem";
+    homepage = http://sourceforge.net/projects/linux-ntfs;
+    license = "GPL";
   };
 }