[bug#31748] [PATCH 0/2] enable ikiwiki 'Edit' and 'Preferences' links

[bug#31748] [PATCH 0/2] enable ikiwiki 'Edit' and 'Preferences' links

[Paul Garlick]

Hi Guix,

The current GNU Guix ikiwiki package produces wikis with an incomplete set of
functioning links.  Specifically, the 'Edit' and 'Preferences' links generate
error messages (missing perl modules).

These two patches add the necessary inputs to produce the expected 'signin'
pages when the links are accessed.

Best regards,

Paul.

Paul Garlick (2):
  gnu: Add perl-cgi-formbuilder.
  gnu: ikiwiki: Add inputs for CGI script and remove duplicate input.

 gnu/packages/web.scm | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

-- 
1.8.3.1

[bug#31748] [PATCH 1/2] gnu: Add perl-cgi-formbuilder.

[Paul Garlick]

* gnu/packages/web.scm (perl-cgi-formbuilder): New variable.
---
 gnu/packages/web.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 7819a87..80f9f22 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -2133,6 +2133,30 @@ string generation and manipulation, and processing and preparing HTTP
 headers.")
     (license l:perl-license)))
 
+(define-public perl-cgi-formbuilder
+  (package
+    (name "perl-cgi-formbuilder")
+    (version "3.10")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://cpan.metacpan.org/authors/id/B/BI/BIGPRESH/"
+             "CGI-FormBuilder-" version ".tar.gz"))
+       (sha256
+        (base32
+         "163ixq9kninqq094z2rnkg9pv3bcmvjphlww4vksfrzhq3h9pjdf"))))
+    (build-system perl-build-system)
+    (inputs `(("perl-cgi" ,perl-cgi)))
+    (home-page
+     "https://metacpan.org/release/CGI-FormBuilder")
+    (synopsis
+     "Generate and process stateful forms")
+    (description
+     "@code{CGI::FormBuilder} provides an easy way to generate and process CGI
+form-based applications.")
+    (license l:perl-license)))
+
 (define-public perl-cgi-session
   (package
     (name "perl-cgi-session")
-- 
1.8.3.1

[bug#31748] [PATCH 2/2] gnu: ikiwiki: Add inputs for CGI script and remove duplicate input.

[Paul Garlick]

* gnu/packages/web.scm (ikiwiki)[inputs]: Add perl-cgi-formbuilder and
perl-db-file.  Remove perl-uri duplicate.  Sort 'perl-*' inputs
alphabetically.
---
 gnu/packages/web.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 80f9f22..5254b9a 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -4402,16 +4402,17 @@ NetSurf project.")
        ("mercurial" ,mercurial)))
     (inputs
      `(("python" ,python-wrapper)
+       ("perl-cgi-formbuilder" ,perl-cgi-formbuilder)
        ("perl-cgi-session" ,perl-cgi-session)
        ("perl-cgi-simple" ,perl-cgi-simple)
-       ("perl-json" ,perl-json)
-       ("perl-image-magick" ,perl-image-magick)
-       ("perl-uri" ,perl-uri)
+       ("perl-db-file" ,perl-db-file)
        ("perl-html-parser" ,perl-html-parser)
-       ("perl-uri" ,perl-uri)
-       ("perl-text-markdown-discount" ,perl-text-markdown-discount)
        ("perl-html-scrubber" ,perl-html-scrubber)
        ("perl-html-template" ,perl-html-template)
+       ("perl-image-magick" ,perl-image-magick)
+       ("perl-json" ,perl-json)
+       ("perl-text-markdown-discount" ,perl-text-markdown-discount)
+       ("perl-uri" ,perl-uri)
        ("perl-yaml-libyaml" ,perl-yaml-libyaml)))
     (home-page "https://ikiwiki.info/")
     (synopsis "Wiki compiler, capable of generating HTML")
-- 
1.8.3.1

bug#31748: [PATCH 0/2] enable ikiwiki 'Edit' and 'Preferences' links

[宋文武]

Paul Garlick <pgarlick@tourbillion-technology.com> writes:

> Hi Guix,
>
> The current GNU Guix ikiwiki package produces wikis with an incomplete set of
> functioning links.  Specifically, the 'Edit' and 'Preferences' links generate
> error messages (missing perl modules).
>
> These two patches add the necessary inputs to produce the expected 'signin'
> pages when the links are accessed.

Pushed, thank you!