diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-01-08 14:33:14 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2010-01-08 14:33:14 +0000 |
| commit | b80132502d6006b6b2cf6a4d7b38695bd6b0e48c (patch) | |
| tree | 8ab115b0e1031b779b4b1fafeb4cf745c702478a /pkgs/tools/misc/parted | |
| parent | ed8858f9c0c398c1db1a6963f74280c0522d71c0 (diff) | |
GNU Parted 2.1.
svn path=/nixpkgs/trunk/; revision=19308
Diffstat (limited to 'pkgs/tools/misc/parted')
| -rw-r--r-- | pkgs/tools/misc/parted/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/tools/misc/parted/t7000-scripting.patch | 15 |
2 files changed, 5 insertions, 19 deletions
diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index f66e44b3a3148..554693571229b 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/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"; diff --git a/pkgs/tools/misc/parted/t7000-scripting.patch b/pkgs/tools/misc/parted/t7000-scripting.patch deleted file mode 100644 index 9290e5cd16f5f..0000000000000 --- a/pkgs/tools/misc/parted/t7000-scripting.patch +++ /dev/null @@ -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 - |