bug#26814: [PATCH] gnu: par2cmdline: Update to 0.7.0

bug#26814: [PATCH] gnu: par2cmdline: Update to 0.7.0

[Brendan Tildesley]

[-- Attachment #1: Type: text/plain, Size: 1 bytes --]



[-- Attachment #2: 0001-gnu-par2cmdline-Update-to-0.7.0.patch --]
[-- Type: text/x-patch, Size: 2648 bytes --]

From 49b620c163e4d23f1b2415d2ee254fd87e12f2f2 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Sun, 7 May 2017 18:09:57 +1000
Subject: [PATCH] gnu: par2cmdline: Update to 0.7.0

* gnu/packages/backup.scm (par2cmdline): Update to 0.7.0
[source]: Remove old test fix incorporated upstream.
[arguments]: Add workaround for parallel test bug.
---
 gnu/packages/backup.scm | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index f9c0a22a0..547ec8e30 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -117,7 +117,7 @@ spying and/or modification by the server.")
 (define-public par2cmdline
   (package
     (name "par2cmdline")
-    (version "0.6.14")
+    (version "0.7.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/Parchive/par2cmdline/archive/v"
@@ -125,15 +125,7 @@ spying and/or modification by the server.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0ykfb7ar0x0flfdgf6i8xphyv5b93dalbjj2jb6hx7sdjax33n1g"))
-              ;; This test merely needs a file to test recovery on, but
-              ;; /dev/random is essentially /dev/urandom plus minimum entropy
-              ;; locking, making the test hang indefinitely. This change is
-              ;; already upstream: remove on upgrade to future 0.6.15.
-              ;; https://github.com/Parchive/par2cmdline/commit/27723a678f780da82c79b98592592009c779a4fb
-              (modules '((guix build utils)))
-              (snippet
-               '(substitute* "tests/test20" (("if=/dev/random") "if=/dev/urandom")))))
+                "1m9vnv3pg0nds47raq2rd2kfpaad1sc10hv40hll5byksqlbfxyq"))))
     (native-inputs
      `(("automake" ,automake)
        ("autoconf" ,autoconf)))
@@ -142,7 +134,11 @@ spying and/or modification by the server.")
      `(#:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'autoreconf
-           (lambda _ (zero? (system* "autoreconf" "-vfi")))))))
+           (lambda _ (zero? (system* "autoreconf" "-vfi"))))
+         ;; parallel test22 fails: https://github.com/Parchive/par2cmdline/issues/96
+         (replace 'check
+           (lambda _
+             (zero? (system* "make" "-j1" "check")))))))
     (synopsis "File verification and repair tool")
     (description "Par2cmdline is a tool for generating RAID-like PAR2 recovery
 files using Reed-Solomon coding.  PAR2 files can be stored along side backups
-- 
2.12.2

bug#26814: [PATCH] gnu: par2cmdline: Update to 0.7.0

[Danny Milosavljevic]

>+         (replace 'check
>+           (lambda _
>+             (zero? (system* "make" "-j1" "check")))))))

Isn't adding #:parallel-tests? enough?

(arguments '(#:parallel-tests? #f ...))

bug#26814: [PATCH] gnu: par2cmdline: Update to 0.7.0

[Brendan Tildesley]

[-- Attachment #1: Type: text/plain, Size: 289 bytes --]

On 2017-05-08 02:16, Danny Milosavljevic wrote:
>> +         (replace 'check
>> +           (lambda _
>> +             (zero? (system* "make" "-j1" "check")))))))
> Isn't adding #:parallel-tests? enough?
>
> (arguments '(#:parallel-tests? #f ...))

I hadn't realised. New patch attached.


[-- Attachment #2: 0001-gnu-par2cmdline-Update-to-0.7.0.patch --]
[-- Type: text/x-patch, Size: 2202 bytes --]

From c90ea8280e8475514801980600a7f163779dd5ed Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Mon, 15 May 2017 11:09:11 +1000
Subject: [PATCH] gnu: par2cmdline: Update to 0.7.0

* gnu/packages/backup.scm (par2cmdline): Update to 0.7.0
[source]: Remove old test fix incorporated upstream.
[arguments]: Disable parallel tests.
---
 gnu/packages/backup.scm | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index d5cb5783a..5f0e84bee 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -118,7 +118,7 @@ spying and/or modification by the server.")
 (define-public par2cmdline
   (package
     (name "par2cmdline")
-    (version "0.6.14")
+    (version "0.7.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/Parchive/par2cmdline/archive/v"
@@ -126,21 +126,14 @@ spying and/or modification by the server.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0ykfb7ar0x0flfdgf6i8xphyv5b93dalbjj2jb6hx7sdjax33n1g"))
-              ;; This test merely needs a file to test recovery on, but
-              ;; /dev/random is essentially /dev/urandom plus minimum entropy
-              ;; locking, making the test hang indefinitely. This change is
-              ;; already upstream: remove on upgrade to future 0.6.15.
-              ;; https://github.com/Parchive/par2cmdline/commit/27723a678f780da82c79b98592592009c779a4fb
-              (modules '((guix build utils)))
-              (snippet
-               '(substitute* "tests/test20" (("if=/dev/random") "if=/dev/urandom")))))
+                "1m9vnv3pg0nds47raq2rd2kfpaad1sc10hv40hll5byksqlbfxyq"))))
     (native-inputs
      `(("automake" ,automake)
        ("autoconf" ,autoconf)))
     (build-system gnu-build-system)
     (arguments
-     `(#:phases
+     `(#:parallel-tests? #f
+       #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'autoreconf
            (lambda _ (zero? (system* "autoreconf" "-vfi")))))))
-- 
2.12.2

bug#26814: [PATCH] gnu: par2cmdline: Update to 0.7.0

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 345 bytes --]

On Mon, May 15, 2017 at 11:11:56AM +1000, Brendan Tildesley wrote:
> Subject: [PATCH] gnu: par2cmdline: Update to 0.7.0
> 
> * gnu/packages/backup.scm (par2cmdline): Update to 0.7.0
> [source]: Remove old test fix incorporated upstream.
> [arguments]: Disable parallel tests.

Thanks! Pushed as 1edbdb0bfc3248abb6732ccebb2b3463b02fee3a.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]