GNU Parted 2.1.

svn path=/nixpkgs/trunk/; revision=19308

pkgs/tools/misc/parted/default.nix

@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline }:
+{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline, utillinuxng }:
 
 stdenv.mkDerivation rec {
-  name = "parted-1.9.0";
+  name = "parted-2.1";
 
   src = fetchurl {
     url = "mirror://gnu/parted/${name}.tar.gz";
-    sha256 = "02amqpzl8lgk247cjsbaz1nsiz9i1pbj0adx0z109h94p90i48sk";
+    sha256 = "1jc49lv0mglqdvrrh06vfqqmpa0cxczzmd2by6mlpxpblpgrb22a";
   };
 
   buildInputs = [ libuuid gettext readline libuuid devicemapper ];
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  patches = [ ./t7000-scripting.patch ];
+  # The `t0400-loop-clobber-infloop.sh' test wants `mkswap'.
+  preCheck = "export PATH=\"${utillinuxng}/sbin:$PATH\"";
 
   meta = {
     description = "GNU Parted, a tool to create, destroy, resize, check, and copy partitions";

pkgs/tools/misc/parted/t7000-scripting.patch

@@ -1,15 +0,0 @@
-This patch fixes the `t7000-scripting' test.  See
-http://lists.alioth.debian.org/pipermail/parted-devel/2009-June/thread.html#2887
-for details.
-
---- parted-1.9.0/tests/t7000-scripting.sh	2009-07-23 19:52:08.000000000 +0200
-+++ parted-1.9.0/tests/t7000-scripting.sh	2009-07-26 14:20:28.000000000 +0200
-@@ -28,7 +28,7 @@ EOF
- 
- { emit_superuser_warning
-   sed s/Error/Warning/ errS
--  printf 'Is this still acceptable to you?\nYes/No?'; } >> errI || fail=1
-+  printf 'Is this still acceptable to you?\nYes/No? n\n'; } >> errI || fail=1
- 
- for mkpart in mkpart mkpartfs; do
- 

pkgs/top-level/all-packages.nix

@@ -1183,7 +1183,8 @@ let
   };
 
   parted = import ../tools/misc/parted {
-    inherit fetchurl stdenv devicemapper libuuid gettext readline;
+    inherit fetchurl stdenv devicemapper libuuid gettext readline
+      utillinuxng;
   };
 
   patch = gnupatch;