[PATCH 0/2] colordiff: Add alternate URL and update

[PATCH 0/2] colordiff: Add alternate URL and update

[Leo Famulari]

The colordiff-1.0.13 package has been failing due to a bad source URI.

The first patch adds the URL for accessing "archived" tarballs and the
second patch updates to the latest colordiff release, 1.0.16.

I've asked upstream if they are willing to make all the tarballs
available under a single URL structure:
https://github.com/daveewart/colordiff/issues/28

Leo Famulari (2):
  gnu: colordiff: Add alternate URL.
  gnu: colordiff: Update to 1.0.16.

 gnu/packages/patchutils.scm | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

-- 
2.6.2

[PATCH 1/2] gnu: colordiff: Add alternate URL.

[Leo Famulari]

* gnu/packages/patchutils.scm (colordiff)[source]: Add alternate URL.
---
 gnu/packages/patchutils.scm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm
index 319ccb2..89cc667 100644
--- a/gnu/packages/patchutils.scm
+++ b/gnu/packages/patchutils.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -151,12 +152,15 @@ refreshed, and more.")
     (name "colordiff")
     (version "1.0.13")
     (source
-     (origin
-      (method url-fetch)
-      (uri (string-append "http://www.colordiff.org/colordiff-"
-                          version ".tar.gz"))
+      (origin
+        (method url-fetch)
+        (uri (list (string-append "http://www.colordiff.org/archive/colordiff-"
+                                  version ".tar.gz")
+                   (string-append "http://www.colordiff.org/colordiff-"
+                                  version ".tar.gz")))
       (sha256
-       (base32 "0akcz1p3klsjnhwcqdfq4grs6paljc5c0jzr3mqla5f862hhaa6f"))))
+       (base32
+        "0akcz1p3klsjnhwcqdfq4grs6paljc5c0jzr3mqla5f862hhaa6f"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f
-- 
2.6.2

Re: [PATCH 1/2] gnu: colordiff: Add alternate URL.

[Mark H Weaver]

Leo Famulari <leo@famulari.name> writes:
> * gnu/packages/patchutils.scm (colordiff)[source]: Add alternate URL.

Okay, please push!

    Mark

Re: [PATCH 1/2] gnu: colordiff: Add alternate URL.

[Leo Famulari]

On Fri, Dec 25, 2015 at 09:25:08AM -0500, Mark H Weaver wrote:
> Leo Famulari <leo@famulari.name> writes:
> > * gnu/packages/patchutils.scm (colordiff)[source]: Add alternate URL.
> 
> Okay, please push!

Colordiff agreed provide the current release under the "archive" URL so
I amended this patch to refer only to the "archive" URL:
https://github.com/daveewart/colordiff/issues/28

Pushed as 8d479d27ca

> 
>     Mark

Re: [PATCH 1/2] gnu: colordiff: Add alternate URL.

[Mark H Weaver]

Leo Famulari <leo@famulari.name> writes:

> On Fri, Dec 25, 2015 at 09:25:08AM -0500, Mark H Weaver wrote:
>> Leo Famulari <leo@famulari.name> writes:
>> > * gnu/packages/patchutils.scm (colordiff)[source]: Add alternate URL.
>> 
>> Okay, please push!
>
> Colordiff agreed provide the current release under the "archive" URL so
> I amended this patch to refer only to the "archive" URL:
> https://github.com/daveewart/colordiff/issues/28
>
> Pushed as 8d479d27ca

Perfect, thank you!

     Mark

[PATCH 2/2] gnu: colordiff: Update to 1.0.16.

[Leo Famulari]

* gnu/packages/patchutils.scm (colordiff): Update to 1.0.16.
---
 gnu/packages/patchutils.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm
index 89cc667..6ade1e0 100644
--- a/gnu/packages/patchutils.scm
+++ b/gnu/packages/patchutils.scm
@@ -150,7 +150,7 @@ refreshed, and more.")
 (define-public colordiff
   (package
     (name "colordiff")
-    (version "1.0.13")
+    (version "1.0.16")
     (source
       (origin
         (method url-fetch)
@@ -160,7 +160,7 @@ refreshed, and more.")
                                   version ".tar.gz")))
       (sha256
        (base32
-        "0akcz1p3klsjnhwcqdfq4grs6paljc5c0jzr3mqla5f862hhaa6f"))))
+        "12qkkw13261dra8pg7mzx4r8p9pb0ajb090bib9j1s6hgphwzwga"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f
-- 
2.6.2

Re: [PATCH 2/2] gnu: colordiff: Update to 1.0.16.

[Mark H Weaver]

Leo Famulari <leo@famulari.name> writes:
> * gnu/packages/patchutils.scm (colordiff): Update to 1.0.16.

Okay, please push!

    Thanks,
      Mark

Re: [PATCH 2/2] gnu: colordiff: Update to 1.0.16.

[Leo Famulari]

On Fri, Dec 25, 2015 at 09:26:46AM -0500, Mark H Weaver wrote:
> Leo Famulari <leo@famulari.name> writes:
> > * gnu/packages/patchutils.scm (colordiff): Update to 1.0.16.
> 
> Okay, please push!

Pushed as 3759bfad32

> 
>     Thanks,
>       Mark