From ff88e57803b885ebdcf88a2f2a1fb7172204d29d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 1 Mar 2010 13:12:48 +0000
Subject: [PATCH] GNU Parted 2.2.

svn path=/nixpkgs/trunk/; revision=20304
---
 pkgs/tools/misc/parted/default.nix | 20 +++++++-------------
 pkgs/top-level/all-packages.nix    |  2 +-
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix
index 55469357122..7e91873b46a 100644
--- a/pkgs/tools/misc/parted/default.nix
+++ b/pkgs/tools/misc/parted/default.nix
@@ -1,22 +1,16 @@
-{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline, utillinuxng }:
+{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline
+, utillinuxng, xz }:
 
 stdenv.mkDerivation rec {
-  name = "parted-2.1";
+  name = "parted-2.2";
 
   src = fetchurl {
-    url = "mirror://gnu/parted/${name}.tar.gz";
-    sha256 = "1jc49lv0mglqdvrrh06vfqqmpa0cxczzmd2by6mlpxpblpgrb22a";
+    url = "mirror://gnu/parted/${name}.tar.xz";
+    sha256 = "13gxq542lsm5jfq0kmrwgk4h61pcxy8s6rkqlw9qirqazsk9q9ik";
   };
 
-  buildInputs = [ libuuid gettext readline libuuid devicemapper ];
+  buildInputs = [ xz libuuid gettext readline libuuid devicemapper ];
 
-  # XXX: For some reason our libreadline.so doesn't have libncurses as
-  # NEEDED and `configure' links with `-Wl,--as-needed' so when
-  # `AC_CHECK_LIB' tries to link with `-lreadline -lncurses' the latter is
-  # removed, leaving `libreadline' with unresolved references.
-  #
-  # Remove the `preConfigure' hack below when Readline is fixed.
-  preConfigure = ''export gl_cv_ignore_unused_libraries=""'';
   configureFlags = "--with-readline";
 
   doCheck = true;
@@ -45,7 +39,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.ludo
     ];
 
-    # GNU Parted requires libuuid, which is part of e2fsprogs.
+    # GNU Parted requires libuuid, which is part of util-linux-ng.
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba1431d28b4..39c7a75725a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1287,7 +1287,7 @@ let
 
   parted = import ../tools/misc/parted {
     inherit fetchurl stdenv devicemapper libuuid gettext readline
-      utillinuxng;
+      utillinuxng xz;
   };
 
   patch = gnupatch;