diff options
author | Marius Bakke <mbakke@fastmail.com> | 2018-02-20 17:36:56 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2018-02-20 17:36:56 +0100 |
commit | 7f69459aca16756f35f08049c64a1bd77d23f33e (patch) | |
tree | 1d267fb62feab89de5d97582672540cbaa37392c /gnu/packages/patchutils.scm | |
parent | 4a82722a658220ec1e10f9f2d5d77407d38db90e (diff) | |
parent | b1989c12501e880afab62d3ff961791906fef350 (diff) | |
download | guix-7f69459aca16756f35f08049c64a1bd77d23f33e.tar guix-7f69459aca16756f35f08049c64a1bd77d23f33e.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patchutils.scm')
-rw-r--r-- | gnu/packages/patchutils.scm | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 1e4b3fbd1c..224b0e8d64 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015 Leo Famulari <leo@famulari.name> +;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -150,24 +151,26 @@ refreshed, and more.") (define-public colordiff (package (name "colordiff") - (version "1.0.16") + (version "1.0.18") (source (origin (method url-fetch) - (uri (list (string-append "http://www.colordiff.org/archive/colordiff-" + (uri (list (string-append "https://www.colordiff.org/colordiff-" + version ".tar.gz") + (string-append "http://www.colordiff.org/archive/colordiff-" version ".tar.gz"))) (sha256 (base32 - "12qkkw13261dra8pg7mzx4r8p9pb0ajb090bib9j1s6hgphwzwga")))) + "1q6n60n4b9fnzccxyxv04mxjsql4ddq17vl2c74ijvjdhpcfrkr9")))) (build-system gnu-build-system) (arguments - `(#:tests? #f + `(#:tests? #f ; no tests #:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out")) "INSTALL_DIR=/bin" "MAN_DIR=/share/man/man1") #:phases (modify-phases %standard-phases - (delete 'configure) - (delete 'build)))) + (delete 'configure) ; no configure script + (delete 'build)))) ; nothing to build (inputs `(("perl" ,perl) ("xmlto" ,xmlto))) |