diff options
| author | Armijn Hemel <armijn@gpl-violations.org> | 2007-05-13 22:43:15 +0000 |
|---|---|---|
| committer | Armijn Hemel <armijn@gpl-violations.org> | 2007-05-13 22:43:15 +0000 |
| commit | aee37f4c04118e08512e1ad0fb8563d66a00dc22 (patch) | |
| tree | 84d4e5cc526def1e034f47205ea8f72b2d92daa8 /pkgs/tools/misc/parted | |
| parent | 2560ded6e2c253754f67f52aa59c31b6e3c2b203 (diff) | |
update to 1.8.7:
* remove patch (no longer needed) * disable readline support svn path=/nixpkgs/trunk/; revision=8672
Diffstat (limited to 'pkgs/tools/misc/parted')
| -rw-r--r-- | pkgs/tools/misc/parted/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/tools/misc/parted/parted-trailingcomma.patch | 21 |
2 files changed, 7 insertions, 27 deletions
diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index d8cef7a786381..169d541e39229 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -1,11 +1,12 @@ -{stdenv, fetchurl, e2fsprogs, ncurses, readline}: +{stdenv, fetchurl, e2fsprogs, readline}: stdenv.mkDerivation { - name = "parted-1.8.1"; + name = "parted-1.8.7"; src = fetchurl { - url = ftp://ftp.nluug.nl/pub/gnu/parted/parted-1.8.1.tar.bz2; - md5 = "c430b38fd5f3c7530e2c3a3bdf605a29"; + url = ftp://ftp.nluug.nl/pub/gnu/parted/parted-1.8.7.tar.bz2; + sha256 = "0njabfinn1kbkdx80gayqanpammnl28pklli34bymhx1sxn82kk3"; }; - buildInputs = [e2fsprogs ncurses readline]; - patches = [./parted-trailingcomma.patch]; + buildInputs = [e2fsprogs readline]; + + configureFlags = "--without-readline"; } diff --git a/pkgs/tools/misc/parted/parted-trailingcomma.patch b/pkgs/tools/misc/parted/parted-trailingcomma.patch deleted file mode 100644 index 9016eb81fc9ef..0000000000000 --- a/pkgs/tools/misc/parted/parted-trailingcomma.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ruN parted-1.6.23/include/parted/exception.h parted-1.6.23.new/include/parted/exception.h ---- parted-1.6.23/include/parted/exception.h 2001-12-27 01:26:09.000000000 +0100 -+++ parted-1.6.23.new/include/parted/exception.h 2005-08-01 11:28:38.000000000 +0200 -@@ -28,7 +28,7 @@ - PED_EXCEPTION_ERROR=3, - PED_EXCEPTION_FATAL=4, - PED_EXCEPTION_BUG=5, -- PED_EXCEPTION_NO_FEATURE=6, -+ PED_EXCEPTION_NO_FEATURE=6 - }; - typedef enum _PedExceptionType PedExceptionType; - -@@ -40,7 +40,7 @@ - PED_EXCEPTION_OK=8, - PED_EXCEPTION_RETRY=16, - PED_EXCEPTION_IGNORE=32, -- PED_EXCEPTION_CANCEL=64, -+ PED_EXCEPTION_CANCEL=64 - }; - typedef enum _PedExceptionOption PedExceptionOption; - #define PED_EXCEPTION_OK_CANCEL (PED_EXCEPTION_OK + PED_EXCEPTION_CANCEL) |