Merge branch 'master' into stdenv-updates

Conflicts:
	pkgs/development/compilers/ghc/with-packages.nix

pkgs/tools/filesystems/btrfsprogs/default.nix

@@ -1,14 +1,14 @@
 { stdenv, fetchgit, zlib, libuuid, acl, attr, e2fsprogs, lzo }:
 
-let version = "0.20pre20130509"; in
+let version = "0.20pre20130705"; in
 
 stdenv.mkDerivation {
   name = "btrfs-progs-${version}";
 
   src = fetchgit {
     url = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git";
-    rev = "650e656a8b9c1fbe4ec5cd8c48ae285b8abd3b69";
-    sha256 = "e50e8ce9d24505711ed855f69a73d639dc5e401692a7d1c300753de3472abb21";
+    rev = "194aa4a1bd6447bb545286d0bcb0b0be8204d79f";
+    sha256 = "07c6762c9873cdcc1b9b3be0b412ba14b83457d8f5608d3dd945953b5e06f0f2";
   };
 
   buildInputs = [ zlib libuuid acl attr e2fsprogs lzo ];

pkgs/tools/filesystems/nixpart/default.nix

@@ -9,11 +9,11 @@ let
   };
 in buildPythonPackage rec {
   name = "nixpart-${version}";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchurl {
     url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz";
-    sha256 = "1kgiyqh7gndr0zs3qgi6r0dpy5p71d32c2k9kbd8pjf2xyyb6fk6";
+    sha256 = "0avwd8p47xy9cydlbjxk8pj8q75zyl68gw2w6fnkk78dcb1a3swp";
   };
 
   propagatedBuildInputs = [ (blivet.override blivetOverrides) ];