From 37aeb85f45ad2d3163e206e127d7b4cefc8b0533 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 8 Jan 2023 22:43:23 +0100 Subject: gnu: ikiwiki: Add missing inputs. This fixes a regression from a1f9eba892784069e34338e01237a74b8a3bd8a2 whereby loading po4a as a library fails. * gnu/packages/web.scm (ikiwiki)[inputs]: Add PERL-SYNTAX-KEYWORD-TRY and PERL-XS-PARSE-KEYWORD. --- gnu/packages/web.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index dcb7b3872a..eb9635f6ee 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2016–2022 Tobias Geerinckx-Rice ;;; Copyright © 2016 Bake Timmons ;;; Copyright © 2017 Thomas Danckaert -;;; Copyright © 2017, 2018, 2020, 2021, 2022 Marius Bakke +;;; Copyright © 2017-2018, 2020-2023 Marius Bakke ;;; Copyright © 2017 Kei Kebreau ;;; Copyright © 2017 Petter ;;; Copyright © 2017, 2021 Pierre Langlois @@ -5249,6 +5249,12 @@ (define-public ikiwiki ("perl-xml-sax" ,perl-xml-sax) ("perl-xml-twig" ,perl-xml-twig) ("perl-yaml-tiny" ,perl-yaml-tiny) + + ;; Ikiwiki loads po4a as a library, and thus needs the po4a dependencies + ;; available. Duplicate them here. + ;; XXX: It would be ideal to hard code these in po4a somehow. + ("perl-syntax-keyword-try" ,perl-syntax-keyword-try) + ("perl-xs-parse-keyword" ,perl-xs-parse-keyword) ("po4a" ,po4a))) (propagated-inputs (list perl-cgi-formbuilder -- cgit v1.2.3 From d0044216c94b984bdb36a6b912fa5b34a6e6b07c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 8 Jan 2023 22:48:18 +0100 Subject: gnu: ikiwiki: Remove input labels. * gnu/packages/web.scm (ikiwiki)[native-inputs, inputs]: Remove labels. --- gnu/packages/web.scm | 54 ++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index eb9635f6ee..f31a573e22 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5228,34 +5228,34 @@ (define-public ikiwiki (find-files bin)) #t)))))) (native-inputs - `(("which" ,which) - ("gettext" ,gettext-minimal) - ("subversion" ,subversion) - ("git" ,git) - ("bazaar" ,bazaar) - ("cvs" ,cvs) - ("mercurial" ,mercurial))) + (list which + gettext-minimal + subversion + git + bazaar + cvs + mercurial)) (inputs - `(("python" ,python-wrapper) - ("perl-authen-passphrase" ,perl-authen-passphrase) - ("perl-cgi-simple" ,perl-cgi-simple) - ("perl-db-file" ,perl-db-file) - ("perl-file-mimeinfo" ,perl-file-mimeinfo) - ("perl-html-tagset" ,perl-html-tagset) - ("perl-image-magick" ,perl-image-magick) - ("perl-ipc-run" ,perl-ipc-run) - ("perl-lwpx-paranoidagent" ,perl-lwpx-paranoidagent) - ("perl-xml-feed" ,perl-xml-feed) - ("perl-xml-sax" ,perl-xml-sax) - ("perl-xml-twig" ,perl-xml-twig) - ("perl-yaml-tiny" ,perl-yaml-tiny) - - ;; Ikiwiki loads po4a as a library, and thus needs the po4a dependencies - ;; available. Duplicate them here. - ;; XXX: It would be ideal to hard code these in po4a somehow. - ("perl-syntax-keyword-try" ,perl-syntax-keyword-try) - ("perl-xs-parse-keyword" ,perl-xs-parse-keyword) - ("po4a" ,po4a))) + (list python-wrapper + perl-authen-passphrase + perl-cgi-simple + perl-db-file + perl-file-mimeinfo + perl-html-tagset + perl-image-magick + perl-ipc-run + perl-lwpx-paranoidagent + perl-xml-feed + perl-xml-sax + perl-xml-twig + perl-yaml-tiny + + ;; Ikiwiki loads po4a as a library, and thus needs the po4a dependencies + ;; available. Duplicate them here. + ;; XXX: It would be ideal to hard code these in po4a somehow. + perl-syntax-keyword-try + perl-xs-parse-keyword + po4a)) (propagated-inputs (list perl-cgi-formbuilder perl-cgi-session -- cgit v1.2.3