From 20a792b5536e26a9545435df26336fb882e10bc9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 24 Feb 2018 22:27:43 +0200 Subject: gnu: recode: Update to 3.7. * gnu/packages/textutils.scm (recode): Update to 3.7. [source]: Update source uri and download type. Add snippet to remove cythonized source. [native-inputs]: Add python2-cython. [arguments]: Remove custom phases. [home-page]: Update to new upstream. [license]: Update license. --- gnu/packages/textutils.scm | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) (limited to 'gnu/packages/textutils.scm') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 3284be243e..7e001ed493 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 Roel Janssen ;;; Copyright © 2016 Jelle Licht ;;; Copyright © 2016 Alex Griffin -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2018 Efraim Flashner ;;; Copyright © 2016 ng0 ;;; Copyright © 2016 Marius Bakke ;;; Copyright © 2017 Eric Bavier @@ -83,32 +83,25 @@ to DOS format and vice versa.") (define-public recode (package (name "recode") - ;; Last beta release (3.7-beta2) is from 2008; last commit from Feb 2014. - ;; So we use that commit instead. - (version "3.7.0.201402") + (version "3.7") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/pinard/Recode.git") - (commit "2d7092a9999194fc0e9449717a8048c8d8e26c18"))) + (method url-fetch) + (uri (string-append "https://github.com/rrthomas/recode/releases/" + "download/v" version "/" name "-" version ".tar.gz")) (sha256 - (base32 "1wssv8z6g3ryrw33sksz4rjhlnhgvvdqszw1ggl4rcwks34n86zm")) - (file-name (string-append name "-" version "-checkout")))) + (base32 + "0r4yhf7i7zp2nl2apyzz7r3i2in12n385hmr8zcfr18ly0ly530q")) + (modules '((guix build utils))) + (snippet + `(begin + (delete-file "tests/Recode.c") + #t)))) (build-system gnu-build-system) - (native-inputs `(("python" ,python-2))) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-before 'check 'pre-check - (lambda _ - (substitute* "tests/setup.py" - (("([[:space:]]*)include_dirs=.*" all space) - (string-append all space "library_dirs=['../src/.libs'],\n"))) - ;; The test extension 'Recode.so' lacks RUNPATH for 'librecode.so'. - (setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/src/.libs")) - #t))))) - (home-page "https://github.com/pinard/Recode") + (native-inputs + `(("python" ,python-2) + ("python2-cython" ,python2-cython))) + (home-page "https://github.com/rrthomas/recode") (synopsis "Text encoding converter") (description "The Recode library converts files between character sets and usages. It recognises or produces over 200 different character sets (or about @@ -116,7 +109,7 @@ usages. It recognises or produces over 200 different character sets (or about any pair. When exact transliteration are not possible, it gets rid of offending characters or falls back on approximations. The recode program is a handy front-end to the library.") - (license license:gpl2+))) + (license license:gpl3+))) (define-public enca (package -- cgit v1.2.3 From 1462b456577ca315dd910f52baaf1e7750d9f281 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 24 Feb 2018 23:59:45 +0200 Subject: gnu: enca: Update to 1.19. * gnu/packages/textutils.scm (enca): Update to 1.19. [inputs]: Remove recode. [arguments]: Allow parallel tests. --- gnu/packages/textutils.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'gnu/packages/textutils.scm') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 7e001ed493..1417bea4e5 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -114,22 +114,18 @@ handy front-end to the library.") (define-public enca (package (name "enca") - (version "1.16") + (version "1.19") (source (origin (method url-fetch) (uri (string-append "https://github.com/nijel/enca/archive/" version ".tar.gz")) (sha256 - (base32 "1xik00x0yvhswsw2isnclabhv536xk1s42cf5z54gfbpbhc7ni8l")) + (base32 "099z526i7qgij7q1w3lvhl88iv3jc3nqxca2i09h6s08ghyrmzf4")) (file-name (string-append name "-" version ".tar.gz")))) (build-system gnu-build-system) - (inputs `(("recode" ,recode))) - - ;; Both 'test-convert-64.sh' and 'test-convert-filter.sh' manipulate a - ;; 'test.tmp' file, so they have to run in sequence. - (arguments '(#:parallel-tests? #f)) - + ;; enca-1.19 tests fail with recent recode. + ;(inputs `(("recode" ,recode))) (home-page "https://github.com/nijel/enca") (synopsis "Text encoding detection tool") (description "Enca (Extremely Naive Charset Analyser) consists of libenca, -- cgit v1.2.3 From db317b38dc3fadf4759da8209740c616d1b599b7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 28 Feb 2018 23:54:36 +0100 Subject: gnu: dbacl: Update phase style. * gnu/packages/textutils.scm (dbacl)[arguments]: Substitute INVOKE for SYSTEM* and end phases with #t. --- gnu/packages/textutils.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages/textutils.scm') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 1417bea4e5..c9714988d6 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -508,10 +508,12 @@ in a portable way.") (add-after 'unpack 'delete-test ;; See comments about the license. (lambda _ - (delete-file "src/tests/dbacl-jap.shin"))) + (delete-file "src/tests/dbacl-jap.shin") + #t)) (add-after 'delete-sample6-and-japanese 'autoreconf (lambda _ - (zero? (system* "autoreconf" "-vif")))) + (invoke "autoreconf" "-vif") + #t)) (add-after 'unpack 'fix-test-files (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 7314a5475e8fe0fc7ffe17d2cc30b4ae8c5381b2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 28 Feb 2018 23:55:49 +0100 Subject: gnu: dbacl: Use HTTPS home page. * gnu/packages/textutils.scm (dbacl)[home-page]: Use HTTPS. --- gnu/packages/textutils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/textutils.scm') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index c9714988d6..d75ba7766e 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -534,7 +534,7 @@ in a portable way.") ("autoconf" ,autoconf) ("automake" ,automake) ("pkg-config" ,pkg-config))) - (home-page "http://www.lbreyer.com/dbacl.html") + (home-page "https://www.lbreyer.com/dbacl.html") (synopsis "Bayesian text and email classifier") (description "dbacl is a fast Bayesian text and email classifier. It builds a variety -- cgit v1.2.3 From 54335b59f08b83cda22ee0ee5157528ad8833e40 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 21:44:16 +0200 Subject: gnu: python-editdistance: Declare a source file-name. * gnu/packages/textutils.scm (python-editdistance)[source]: Declare a source file-name. --- gnu/packages/textutils.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/textutils.scm') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index d75ba7766e..be8dd086a2 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -632,6 +632,7 @@ source code.") (uri (git-reference (url "https://github.com/aflc/editdistance.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "1l43svsv12crvzphrgi6x435z6xg8m086c64armp8wzb4l8ccm7g")))) -- cgit v1.2.3 From 54d5b27e92d8cc4e3195ce859f3c79bb676dc9df Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Mar 2018 21:46:48 +0200 Subject: gnu: python-editdistance: Use 'invoke'. * gnu/packages/textutils.scm (python-editdistance)[arguments]: Use 'invoke' instead of 'system*'. --- gnu/packages/textutils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/textutils.scm') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index be8dd086a2..2d8a104d54 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -644,7 +644,7 @@ source code.") (lambda _ (with-directory-excursion "editdistance" (delete-file "bycython.cpp") - (zero? (system* "cython" "--cplus" "bycython.pyx")))))))) + (invoke "cython" "--cplus" "bycython.pyx"))))))) (native-inputs `(("python-cython" ,python-cython))) (home-page "https://www.github.com/aflc/editdistance") -- cgit v1.2.3