From f9488b7043e161a96b698279637236fd6bfcae76 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Thu, 19 Dec 2019 20:24:08 +0100 Subject: gnu: libgtextutils: Build with GCC 5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/textutils.scm (libgtextutils)[native-inputs]: Add gcc-5. Signed-off-by: Ludovic Courtès --- gnu/packages/textutils.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/textutils.scm') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 668260b7d8..cf90779978 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Meiyo Peng ;;; Copyright © 2019 Yoshinori Arai +;;; Copyright © 2019 Mădălin Ionel Patrașcu ;;; ;;; This file is part of GNU Guix. ;;; @@ -47,6 +48,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages compression) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages java) #:use-module (gnu packages ncurses) @@ -232,6 +234,7 @@ nested include statements).") (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) + ("gcc" ,gcc-5) ;; doesn't build with later versions ("libtool" ,libtool))) (home-page "https://github.com/agordon/libgtextutils") (synopsis "Gordon's text utils library") -- cgit v1.2.3 From 96b96ec65162575a124e52459e36811e90bba649 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 23 Dec 2019 06:03:39 +0100 Subject: gnu: dos2unix: Don't use NAME in source URI. * gnu/packages/textutils.scm (dos2unix)[source]: Hard-code NAME. --- gnu/packages/textutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/textutils.scm') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index cf90779978..6902333808 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -67,8 +67,8 @@ (source (origin (method url-fetch) - (uri (string-append "https://waterlan.home.xs4all.nl/" name "/" - name "-" version ".tar.gz")) + (uri (string-append "https://waterlan.home.xs4all.nl/dos2unix/" + "dos2unix-" version ".tar.gz")) (sha256 (base32 "12h4c61g376bhq03y5g2xszkrkrj5hwd928rly3xsp6rvfmnbixs")))) (build-system gnu-build-system) -- cgit v1.2.3 From ac95bd97b1d0f19ebfd20d76dc77256593992bb4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 23 Dec 2019 06:03:47 +0100 Subject: gnu: dos2unix: Update to 7.4.1. * gnu/packages/textutils.scm (dos2unix): Update to 7.4.1. --- gnu/packages/textutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/textutils.scm') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 6902333808..9d66dc41ab 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -63,14 +63,14 @@ (define-public dos2unix (package (name "dos2unix") - (version "7.4.0") + (version "7.4.1") (source (origin (method url-fetch) (uri (string-append "https://waterlan.home.xs4all.nl/dos2unix/" "dos2unix-" version ".tar.gz")) (sha256 - (base32 "12h4c61g376bhq03y5g2xszkrkrj5hwd928rly3xsp6rvfmnbixs")))) + (base32 "08w6yywzirsxq8bh87jycvvw922ybhc2l426j2iqzliyn1h8mm8w")))) (build-system gnu-build-system) (arguments '(#:make-flags (list "CC=gcc" -- cgit v1.2.3 From b818194786801cb9c1b496e098aee1d657e30e96 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 24 Dec 2019 00:06:31 +0100 Subject: gnu: oniguruma: Update to 6.9.4. * gnu/packages/textutils.scm (oniguruma): Update to 6.9.4. --- gnu/packages/textutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/textutils.scm') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 9d66dc41ab..86358fa02d 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -475,7 +475,7 @@ as existing hashing techniques, with provably negligible risk of collisions.") (define-public oniguruma (package (name "oniguruma") - (version "6.9.3") + (version "6.9.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/kkos/" @@ -483,7 +483,7 @@ as existing hashing techniques, with provably negligible risk of collisions.") "/onig-" version ".tar.gz")) (sha256 (base32 - "0pvj37r1rd5h5vw99mdk8z4k44gq1ldwrapkamdiicksdfkr4ndb")))) + "0lvd1rpp49i0k1icblb0i76lj2cwmhf1c5p1jdz2m6g0ywpx4sa6")))) (build-system gnu-build-system) (home-page "https://github.com/kkos/oniguruma") (synopsis "Regular expression library") -- cgit v1.2.3