diff options
Diffstat (limited to 'gnu/packages/gettext.scm')
| -rw-r--r-- | gnu/packages/gettext.scm | 65 |
1 files changed, 37 insertions, 28 deletions
diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index 82604ee9be..e20d4d1427 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Alex Kost <alezost@gmail.com> -;;; Copyright © 2017, 2019 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2017, 2019, 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> @@ -52,25 +52,24 @@ (define-public gettext-minimal (package (name "gettext-minimal") - (version "0.20.1") + (version "0.21") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gettext/gettext-" version ".tar.gz")) (sha256 (base32 - "0p3zwkk27wm2m2ccfqm57nj7vqkmfpn7ja1nf65zmhz8qqs5chb6")))) + "04kbg1sx0ncfrsbr85ggjslqkzzb243fcw9nyh3rrv1a22ihszf7")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;9 MiB of HTML (inputs - `(("libunistring" ,libunistring) - ("libxml2" ,libxml2) - - ;; TODO: ncurses is only needed for the 'libtextstyle' library. - ;; The next version of gettext can use a separate libtextstyle, - ;; but for now we include it here in 'gettext-minimal'. - ("ncurses" ,ncurses))) + (list libunistring + libxml2 + ;; TODO: ncurses is only needed for the 'libtextstyle' library. + ;; The next version of gettext can use a separate libtextstyle, + ;; but for now we include it here in 'gettext-minimal'. + ncurses)) (arguments `(#:configure-flags '("--with-included-libunistring=no" "--with-included-libxml=no") @@ -199,22 +198,21 @@ color, font attributes (weight, posture), or underlining.") (base32 "0kgbm0af7jwpfspa2xxiy9nc2l1r2s1rhbhz4r229zcqv49ak6sq")))) (build-system python-build-system) (native-inputs - `(("python-bump2version" ,python-bump2version) - ("python-flake8" ,python-flake8) - ("python-flake8-implicit-str-concat" ,python-flake8-implicit-str-concat) - ("python-flake8-print" ,python-flake8-print) - ("python-isort" ,python-isort) - ("python-pre-commit" ,python-pre-commit) - ("python-pytest" ,python-pytest) - ("python-pytest-cov" ,python-pytest-cov) - ("python-sphinx" ,python-sphinx) - ("python-sphinx-argparse" ,python-sphinx-argparse) - ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme) - ("python-twine" ,python-twine) - ("python-yamllint" ,python-yamllint))) + (list python-bump2version + python-flake8 + python-flake8-implicit-str-concat + python-flake8-print + python-isort + python-pre-commit + python-pytest + python-pytest-cov + python-sphinx + python-sphinx-argparse + python-sphinx-rtd-theme + python-twine + python-yamllint)) (propagated-inputs - `(("python-polib" ,python-polib) - ("python-pymd4c" ,python-pymd4c))) + (list python-polib python-pymd4c)) (home-page "https://github.com/mondeja/mdpo") (synopsis "Markdown file translation utilities using pofiles") (description @@ -238,12 +236,14 @@ from Markdown files.") `(#:phases (modify-phases %standard-phases (add-after 'install 'wrap-programs - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) ;; Make sure all executables in "bin" find the Perl modules - ;; provided by this package at runtime. + ;; required by this package at runtime. (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin/")) - (path (string-append out "/lib/perl5/site_perl"))) + (Pod::Parser (assoc-ref inputs "perl-pod-parser")) + (path (string-append out "/lib/perl5/site_perl:" + Pod::Parser "/lib/perl5/site_perl"))) (for-each (lambda (file) (wrap-program file `("PERL5LIB" ":" prefix (,path)))) @@ -263,6 +263,13 @@ from Markdown files.") (string-append (assoc-ref inputs "docbook-xml") "/xml/dtd/docbook/"))) #t)) + (add-before 'build 'do-not-override-PERL5LIB + (lambda _ + ;; Don't hard-code PERL5LIB to include just the build directory + ;; so that the build script finds modules from inputs. + (substitute* "Po4aBuilder.pm" + (("PERL5LIB=lib") "")) + (setenv "PERL5LIB" (string-append (getenv "PERL5LIB") ":lib")))) (add-before 'check 'disable-failing-tests (lambda _ ;; FIXME: these tests require SGMLS.pm. @@ -286,6 +293,8 @@ from Markdown files.") ("perl-test-pod" ,perl-test-pod) ("perl-yaml-tiny" ,perl-yaml-tiny) ("texlive" ,texlive-tiny))) + (inputs + (list perl-pod-parser)) (home-page "https://po4a.org/") (synopsis "Scripts to ease maintenance of translations") (description |