parted: Update to new upstream version 3.2.
In order to properly run tests, we need to fix the unicode tests and after some search, I have found that Ludo (who is also the <nixpkgs> maintainer of parted) already reported this upstream and also provided a solution: http://lists.gnu.org/archive/html/bug-parted/2014-08/msg00003.html I'm updating parted to 3.2, because the latest blivet implementation relies on it for device geometry calculations. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
parent
6553845afc
commit
34ae3b7f77
@ -1,20 +1,26 @@
|
|||||||
{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline
|
{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline, perl, python
|
||||||
, utillinux, check, enableStatic ? false, hurd ? null }:
|
, utillinux, check, enableStatic ? false, hurd ? null }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "parted-3.1";
|
name = "parted-3.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnu/parted/${name}.tar.xz";
|
url = "mirror://gnu/parted/${name}.tar.xz";
|
||||||
sha256 = "05fa4m1bky9d13hqv91jlnngzlyn7y4rnnyq6d86w0dg3vww372y";
|
sha256 = "1r3qpg3bhz37mgvp9chsaa3k0csby3vayfvz8ggsqz194af5i2w5";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = stdenv.lib.optional doCheck ./gpt-unicode-test-fix.patch;
|
||||||
|
|
||||||
|
postPatch = stdenv.lib.optionalString doCheck ''
|
||||||
|
patchShebangs tests
|
||||||
|
'';
|
||||||
|
|
||||||
buildInputs = [ libuuid ]
|
buildInputs = [ libuuid ]
|
||||||
++ stdenv.lib.optional (readline != null) readline
|
++ stdenv.lib.optional (readline != null) readline
|
||||||
++ stdenv.lib.optional (gettext != null) gettext
|
++ stdenv.lib.optional (gettext != null) gettext
|
||||||
++ stdenv.lib.optional (devicemapper != null) devicemapper
|
++ stdenv.lib.optional (devicemapper != null) devicemapper
|
||||||
++ stdenv.lib.optional (hurd != null) hurd
|
++ stdenv.lib.optional (hurd != null) hurd
|
||||||
++ stdenv.lib.optional doCheck check;
|
++ stdenv.lib.optionals doCheck [ check perl python ];
|
||||||
|
|
||||||
configureFlags =
|
configureFlags =
|
||||||
(if (readline != null)
|
(if (readline != null)
|
||||||
|
38
pkgs/tools/misc/parted/gpt-unicode-test-fix.patch
Normal file
38
pkgs/tools/misc/parted/gpt-unicode-test-fix.patch
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
From Ludo's suggestion at:
|
||||||
|
|
||||||
|
http://debbugs.gnu.org/cgi/bugreport.cgi?msg=8;bug=18258
|
||||||
|
|
||||||
|
diff --git a/tests/.t0251-gpt-unicode.sh.swp b/tests/.t0251-gpt-unicode.sh.swp
|
||||||
|
deleted file mode 100644
|
||||||
|
index b41c337..0000000
|
||||||
|
Binary files a/tests/.t0251-gpt-unicode.sh.swp and /dev/null differ
|
||||||
|
diff --git a/tests/t0251-gpt-unicode.sh b/tests/t0251-gpt-unicode.sh
|
||||||
|
index c845950..fa63a72 100755
|
||||||
|
--- a/tests/t0251-gpt-unicode.sh
|
||||||
|
+++ b/tests/t0251-gpt-unicode.sh
|
||||||
|
@@ -22,7 +22,24 @@ dev=loop-file
|
||||||
|
# create zeroed device
|
||||||
|
truncate -s 10m $dev || fail=1
|
||||||
|
|
||||||
|
-export LC_ALL=C.UTF-8
|
||||||
|
+found_locale=no
|
||||||
|
+for locale in en_US de_DE fr_FR es_ES
|
||||||
|
+do
|
||||||
|
+ LC_ALL="$locale.UTF-8"
|
||||||
|
+ export LC_ALL
|
||||||
|
+
|
||||||
|
+ # In a UTF-8 locale, the string below prints as 4 characters.
|
||||||
|
+ if [ `printf 'foo\341\264\244' | wc -m` -eq 4 ]; then
|
||||||
|
+ found_locale=yes
|
||||||
|
+ break
|
||||||
|
+ fi
|
||||||
|
+done
|
||||||
|
+
|
||||||
|
+if [ "$found_locale" != "yes" ]; then
|
||||||
|
+ echo "no valid UTF-8 locale found; skipping" >&2
|
||||||
|
+ exit 77
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
# create gpt label with named partition
|
||||||
|
part_name=$(printf 'foo\341\264\244')
|
||||||
|
parted -s $dev mklabel gpt mkpart primary ext2 1MiB 2MiB name 1 $part_name > empty 2>&1 || fail=1
|
Loading…
x
Reference in New Issue
Block a user