[PATCH] gnu: parted: Update to 3.2.

[PATCH] gnu: parted: Update to 3.2.

[Mathieu Lirzin]

[-- Attachment #1: 0001-gnu-parted-Update-to-3.2.patch --]
[-- Type: text/x-diff, Size: 4306 bytes --]

From a43f69d7f57df7ca2fb156ab75a845a68cc43d02 Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin <mthl@gnu.org>
Date: Sat, 21 Nov 2015 01:07:03 +0100
Subject: [PATCH] gnu: parted: Update to 3.2.

* gnu/packages/disk.scm (parted): Update to 3.2.
[inputs]: Add lvm2 and remove check.  Replace readline-6.2 with its
latest version.
[native-inputs]: Add perl and python for the tests.
[arguments]: Use `modify-phases' and adapt to the new tests.
[home-page]: Use https.
---
 gnu/packages/disk.scm | 61 +++++++++++++++++++++++----------------------------
 1 file changed, 28 insertions(+), 33 deletions(-)

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index a3ecab2..011342f 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013 Nikita Karetnikov <nikita@karetnikov.org>
+;;; Copyright © 2015 Mathieu Lirzin <mthl@gnu.org>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -22,9 +23,10 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
-  #:use-module (gnu packages check)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages guile)
   #:use-module ((gnu packages compression)
@@ -33,39 +35,32 @@
 (define-public parted
   (package
     (name "parted")
-    (version "3.1")
-    (source
-     (origin
-      (method url-fetch)
-      (uri (string-append "mirror://gnu/parted/parted-"
-                          version ".tar.xz"))
-      (sha256
-       (base32
-        "05fa4m1bky9d13hqv91jlnngzlyn7y4rnnyq6d86w0dg3vww372y"))))
+    (version "3.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnu/parted/parted-"
+                                  version ".tar.xz"))
+              (sha256
+               (base32
+                "1r3qpg3bhz37mgvp9chsaa3k0csby3vayfvz8ggsqz194af5i2w5"))))
     (build-system gnu-build-system)
-    (arguments `(#:configure-flags '("--disable-device-mapper")
-                 #:phases (alist-cons-before
-                           'configure 'fix-mkswap
-                           (lambda* (#:key inputs #:allow-other-keys)
-                             (let ((util-linux (assoc-ref inputs
-                                                          "util-linux")))
-                               (substitute*
-                                   "tests/t9050-partition-table-types.sh"
-                                 (("mkswap")
-                                  (string-append util-linux "/sbin/mkswap")))))
-                           %standard-phases)))
-    (inputs
-     ;; XXX: add 'lvm2'.
-     `(("check" ,check)
-
-       ;; With Readline 6.3, parted/ui.c fails to build because it uses the
-       ;; now undefined 'CPPFunction' type.
-       ("readline" ,readline-6.2)
-
-       ("util-linux" ,util-linux)))
-    (native-inputs
-     `(("gettext" ,gnu-gettext)))
-    (home-page "http://www.gnu.org/software/parted/")
+    (arguments `(#:phases
+                 (modify-phases %standard-phases
+                   (add-after
+                    'unpack 'fix-locales-and-python
+                    (lambda* (#:key inputs #:allow-other-keys)
+                      (substitute* "tests/t0251-gpt-unicode.sh"
+                        (("C.UTF-8") "en_US.UTF-8")) ;not in Glibc locales
+                      (substitute* "tests/msdos-overlap"
+                        (("/usr/bin/python") (which "python"))))))))
+    (inputs `(("lvm2"       ,lvm2)
+              ("readline"   ,readline)
+              ("util-linux" ,util-linux)))
+    (native-inputs `(("gettext" ,gnu-gettext)
+                     ;; For the tests.
+                     ("perl"    ,perl)
+                     ("python"  ,python-2)))
+    (home-page "https://www.gnu.org/software/parted/")
     (synopsis "Disk partition editor")
     (description
      "GNU Parted is a package for creating and manipulating disk partition
-- 
2.6.2

Re: [PATCH] gnu: parted: Update to 3.2.

[Ludovic Courtès]

Mathieu Lirzin <mthl@gnu.org> skribis:

> From a43f69d7f57df7ca2fb156ab75a845a68cc43d02 Mon Sep 17 00:00:00 2001
> From: Mathieu Lirzin <mthl@gnu.org>
> Date: Sat, 21 Nov 2015 01:07:03 +0100
> Subject: [PATCH] gnu: parted: Update to 3.2.
>
> * gnu/packages/disk.scm (parted): Update to 3.2.
> [inputs]: Add lvm2 and remove check.  Replace readline-6.2 with its
> latest version.
> [native-inputs]: Add perl and python for the tests.
> [arguments]: Use `modify-phases' and adapt to the new tests.
> [home-page]: Use https.

Thanks for tackling this.  I think the reason this wasn’t done before is
that there were various issues, notably:

  https://lists.gnu.org/archive/html/bug-parted/2014-08/msg00001.html
  https://lists.gnu.org/archive/html/bug-parted/2014-08/msg00002.html

and then I dropped the ball.  :-)

> +                      (substitute* "tests/t0251-gpt-unicode.sh"
> +                        (("C.UTF-8") "en_US.UTF-8")) ;not in Glibc locales

Rather “en_US.utf8”, because “utf8” is the “normalized codeset”.

> +    (inputs `(("lvm2"       ,lvm2)
> +              ("readline"   ,readline)
> +              ("util-linux" ,util-linux)))

I’d prefer to avoid this alignment style.  No big deal though.

OK with the above change, thank you!

Ludo’.

Re: [PATCH] gnu: parted: Update to 3.2.

[Mathieu Lirzin]

Hi,

ludo@gnu.org (Ludovic Courtès) writes:

> Mathieu Lirzin <mthl@gnu.org> skribis:
>
>> From a43f69d7f57df7ca2fb156ab75a845a68cc43d02 Mon Sep 17 00:00:00 2001
>> From: Mathieu Lirzin <mthl@gnu.org>
>> Date: Sat, 21 Nov 2015 01:07:03 +0100
>> Subject: [PATCH] gnu: parted: Update to 3.2.
>>
>> * gnu/packages/disk.scm (parted): Update to 3.2.
>> [inputs]: Add lvm2 and remove check.  Replace readline-6.2 with its
>> latest version.
>> [native-inputs]: Add perl and python for the tests.
>> [arguments]: Use `modify-phases' and adapt to the new tests.
>> [home-page]: Use https.
>
> Thanks for tackling this.  I think the reason this wasn’t done before is
> that there were various issues, notably:
>
>   https://lists.gnu.org/archive/html/bug-parted/2014-08/msg00001.html
>   https://lists.gnu.org/archive/html/bug-parted/2014-08/msg00002.html
>
> and then I dropped the ball.  :-)

It helps alot to have some background.  Thanks for this pointers.

>> +                      (substitute* "tests/t0251-gpt-unicode.sh"
>> +                        (("C.UTF-8") "en_US.UTF-8")) ;not in Glibc locales
>
> Rather “en_US.utf8”, because “utf8” is the “normalized codeset”.

Done.

>> +    (inputs `(("lvm2"       ,lvm2)
>> +              ("readline"   ,readline)
>> +              ("util-linux" ,util-linux)))
>
> I’d prefer to avoid this alignment style.  No big deal though.

Fixed.  Your nitpicking is always appreciated! ;)

I will avoid this in my future package definitions.

> OK with the above change, thank you!

Pushed in 1b933e62dcc8521e383a78e5d7952a194e47a4ec.

Thanks,

--
Mathieu Lirzin