Merge remote-tracking branch 'master' into stdenv-updates.

Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix

pkgs/tools/filesystems/dosfstools/default.nix

@@ -1,14 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dosfstools-3.0.11";
+  name = "dosfstools-3.0.21";
 
   src = fetchurl {
-    urls = [
-      "http://www.daniel-baumann.ch/software/dosfstools/${name}.tar.bz2"
-      "http://pkgs.fedoraproject.org/repo/pkgs/dosfstools/${name}.tar.bz2/8d2211d5bd813164e20740e7c852aa06/${name}.tar.bz2"
-    ];
-    sha256 = "1a6rzjy82f6579ywaln33g1wc7k8gbgjdss9q2q8daplac7pmcll";
+    url = "http://daniel-baumann.ch/files/software/dosfstools/${name}.tar.xz";
+    sha256 = "12c9ilcpknm7hg3czkc50azndd0yjdj4jjnvizhwqxy3g0gm2960";
   };
 
   makeFlags = "PREFIX=$(out)";

pkgs/tools/filesystems/extundelete/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, e2fsprogs }:
+
+stdenv.mkDerivation rec {
+  version = "0.2.4";
+  name = "extundelete-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/extundelete/extundelete-0.2.4.tar.bz2";
+    sha256 = "1x0r7ylxlp9lbj3d7sqf6j2a222dwy2nfpff05jd6mkh4ihxvyd1";
+  };
+
+  buildInputs = [ e2fsprogs ];
+
+  meta = with stdenv.lib; {
+    description = "utility that can recover deleted files from an ext3 or ext4 partition";
+    homepage = http://extundelete.sourceforge.net/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.iElectric ];
+  };
+}

pkgs/tools/filesystems/jfsrec/default.nix

@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "jfsrec-pre-svn-7";
   
   src = fetchurl {
-    url = http://downloads.sourceforge.net/jfsrec/jfsrec-svn-7.tar.gz;
+    url = mirror://sourceforge/jfsrec/jfsrec-svn-7.tar.gz;
     sha256 = "163z6ljr05vw2k5mj4fim2nlg4khjyibrii95370pvn474mg28vg";
   };
 

pkgs/tools/filesystems/nixpart/default.nix

@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, buildPythonPackage, blivet
+# Propagated to blivet
+, useNixUdev ? null, udevSoMajor ? null
+}:
+
+let
+  blivetOverrides = stdenv.lib.filterAttrs (k: v: v != null) {
+    inherit useNixUdev udevSoMajor;
+  };
+in buildPythonPackage rec {
+  name = "nixpart-${version}";
+  version = "0.4.0";
+
+  src = fetchurl {
+    url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz";
+    sha256 = "1kgiyqh7gndr0zs3qgi6r0dpy5p71d32c2k9kbd8pjf2xyyb6fk6";
+  };
+
+  propagatedBuildInputs = [ (blivet.override blivetOverrides) ];
+
+  doCheck = false;
+
+  meta = {
+    description = "NixOS storage manager/partitioner";
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = [ stdenv.lib.maintainers.aszlig ];
+  };
+}