Merge master into stdenv-updates

Conflicts (simple):
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/tools/package-management/disnix/default.nix
	pkgs/top-level/all-packages.nix

pkgs/tools/text/kdiff3/default.nix

@@ -1,10 +1,10 @@
 { stdenv, fetchurl, cmake, kdelibs, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "kdiff3-0.9.96";
+  name = "kdiff3-0.9.97";
   src = fetchurl {
     url = "mirror://sourceforge/kdiff3/${name}.tar.gz";
-    sha256 = "14fnflp5ansi7b59h8vn81mb8pdqpbanz0qzyw9sxk2pgp24xrqh";
+    sha256 = "0ajsnzfr0aqzdiv5wqssxsgfv87v4g5c2zl16264v0cw8jxiddz3";
   };
 
   buildInputs = [ kdelibs ];

pkgs/tools/text/xml/xpf/default.nix

@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "xpf-0.2";
   
   src = fetchurl {
-    url = http://nixos.org/tarballs/xpf-0.2.tar.gz;
+    url = http://tarballs.nixos.org/xpf-0.2.tar.gz;
     md5 = "d92658828139e1495e052d0cfe25d312";
   };