From bb8afbf5a1fbc85f700c0e07ce5581637e3674dc Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sun, 17 Jan 2016 18:41:20 +0100
Subject: gnu: Add dependency on Perl's 'Module::Build' as needed.

'Module::Build' was deprecated in Perl 5.20 and removed in 5.22.
Some packages need to explicitly depend on it now.

* gnu/packages/perl.scm (perl-class-factory-util):
(perl-date-manip, perl-devel-checkbin): Add 'native-inputs' field.
(perl-module-build)[description]: Mention that it used to be in Perl.
* gnu/packages/web.scm (perl-cgi-simple)[native-inputs]: Add
PERL-MODULE-BUILD.
---
 gnu/packages/web.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/web.scm')

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 52c5740388..7f95d82844 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2013 Aljosha Papsch <misc@rpapsch.de>
-;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
@@ -1558,7 +1558,8 @@ (define-public perl-cgi-simple
          "1nkyb1m1g5r47xykflf68dplanih5p15njv82frbgbsms34kp1sg"))))
     (build-system perl-build-system)
     (native-inputs
-     `(("perl-io-stringy" ,perl-io-stringy))) ;for IO::Scalar
+     `(("perl-module-build" ,perl-module-build)
+       ("perl-io-stringy" ,perl-io-stringy))) ;for IO::Scalar
     (home-page "http://search.cpan.org/dist/CGI-Simple")
     (synopsis "CGI interface that is CGI.pm compliant")
     (description "CGI::Simple provides a relatively lightweight drop in
-- 
cgit v1.2.3


From 7b158c4ee2d4b5cf6a2cd9bf0246465c3c8a06ca Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Wed, 20 Jan 2016 17:11:09 -0600
Subject: gnu: Add perl-cgi.

The CGI module was removed from Perl core in v5.21.0.

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

(limited to 'gnu/packages/web.scm')

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 7f95d82844..33db3639de 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
-;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2015, 2016 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -1544,6 +1544,34 @@ (define-public perl-catalystx-script-server-starman
 development server with Starman.")
     (license (package-license perl))))
 
+(define-public perl-cgi
+  (package
+    (name "perl-cgi")
+    (version "4.25")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://cpan/authors/id/L/LE/LEEJO/"
+                           "CGI-" version ".tar.gz"))
+       (sha256
+        (base32
+         "06hk9zzvlix1yi95wlkb1ykdxgl6lscm7452gkwr2snsb8iybczg"))))
+    (build-system perl-build-system)
+    (native-inputs
+     `(("perl-test-deep" ,perl-test-deep)
+       ("perl-test-nowarnings" ,perl-test-nowarnings)
+       ("perl-test-warn" ,perl-test-warn)))
+    (propagated-inputs
+     `(("perl-html-parser" ,perl-html-parser)))
+    (home-page "http://search.cpan.org/dist/CGI")
+    (synopsis "Handle Common Gateway Interface requests and responses")
+    (description "CGI.pm is a stable, complete and mature solution for
+processing and preparing HTTP requests and responses.  Major features include
+processing form submissions, file uploads, reading and writing cookies, query
+string generation and manipulation, and processing and preparing HTTP
+headers.")
+    (license (package-license perl))))
+
 (define-public perl-cgi-simple
   (package
     (name "perl-cgi-simple")
-- 
cgit v1.2.3


From a2190cccc2f2b371cf4a4259519ee3466f2f63ac Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Wed, 20 Jan 2016 17:15:41 -0600
Subject: gnu: Add dependencies on Perl modules as needed.

This is a follow-on to bb8afbf5.

* gnu/packages/language.scm (perl-lingua-en-inflect, perl-lingua-stem)
  (perl-snowball-norwegian, perl-snowball-swedish): Add 'native-inputs'
  field.
* gnu/packages/perl.scm (perl-aliased, perl-class-accessor-chained)
  (perl-datetime-set, perl-datetime-format-ical, perl-datetime-locale)
  (perl-error, perl-module-runtime, perl-module-runtime-conflicts)
  (perl-path-class, perl-posix-strftime-compiler, perl-readonly)
  (perl-test-differences, perl-test-pod, perl-test-trap)
  (perl-text-aligner, perl-text-glob, perl-text-table, perl-tie-ixhash)
  (perl-time-mock): Ditto.
  (perl-config-any): Add 'propagated-inputs' field.
  (perl-data-page, perl-datetime, perl-datetime-format-natural)
  (perl-moosex-getopt, perl-moosex-role-parameterized)
  (perl-moosex-types, perl-namespace-autoclean, perl-params-validate)
  (perl-tree-simple-visitorfactory)[native-inputs]: Add PERL-MODULE-BUILD.
  (perl-file-changenotify)[native-inputs]: Ditto.
  [propagated-inputs]: Add PERL-MODULE-PLUGGABLE.
  (perl-datetime-format-flexible, perl-test-writevariants)
  [propagated-inputs]: Ditto.
  (perl-test-mockobject): Add 'arguments' field.
* gnu/packages/mail.scm (perl-email-abstract)[propagated-inputs]: Ditto.
* gnu/packages/web.scm (perl-datetime-format-http, perl-io-socket-ip)
  (perl-plack-middleware-methodoverride, perl-uri-find)
  (perl-www-mechanize): Add 'native-inputs' field.
  (perl-html-template, perl-http-server-simple): Add 'propagated-inputs'
  field.
  (perl-apache-logformat-compiler, perl-html-tree)[native-inputs]:
  Add PERL-MODULE-BUILD.
  (perl-catalyst-runtime)[propagated-inputs]: Add PERL-MODULE-PLUGGABLE.
  (perl-finance-quote)[propagated-inputs]: Add PERL-CGI.
---
 gnu/packages/language.scm |  7 +++++-
 gnu/packages/mail.scm     |  1 +
 gnu/packages/perl.scm     | 64 +++++++++++++++++++++++++++++++++++++++--------
 gnu/packages/web.scm      | 21 ++++++++++++++--
 4 files changed, 80 insertions(+), 13 deletions(-)

(limited to 'gnu/packages/web.scm')

diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index b0fa7aa179..6c837948c0 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2015, 2016 Eric Bavier <bavier@member.fsf.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -60,6 +60,7 @@ (define-public perl-lingua-en-inflect
         (base32
          "0drzg9a2dkjxgf00n6jg0jzhd8972bh3j4wdnmdxpqi3zmfqhwcy"))))
     (build-system perl-build-system)
+    (native-inputs `(("perl-module-build" ,perl-module-build)))
     (home-page "http://search.cpan.org/dist/Lingua-EN-Inflect")
     (synopsis "Convert singular to plural")
     (description "Lingua::EN::Inflect provides plural inflections,
@@ -224,6 +225,8 @@ (define-public perl-lingua-stem
         (base32
          "12avh2mnnc7llmmshrr5bgb473fvydxnlqrqbl2815mf2dp4pxcg"))))
     (build-system perl-build-system)
+    (native-inputs
+     `(("perl-module-build" ,perl-module-build)))
     (propagated-inputs
      `(("perl-lingua-pt-stemmer" ,perl-lingua-pt-stemmer)
        ("perl-lingua-stem-fr" ,perl-lingua-stem-fr)
@@ -329,6 +332,7 @@ (define-public perl-snowball-norwegian
         (base32
          "0675v45bbsh7vr7kpf36xs2q79g02iq1kmfw22h20xdk4rzqvkqx"))))
     (build-system perl-build-system)
+    (native-inputs `(("perl-module-build" ,perl-module-build)))
     (home-page "http://search.cpan.org/dist/Snowball-Norwegian")
     (synopsis "Porters stemming algorithm for Norwegian")
     (description "Lingua::Stem::Snowball::No is a perl port of the norwegian
@@ -348,6 +352,7 @@ (define-public perl-snowball-swedish
         (base32
          "0agwc12jk5kmabnpsplw3wf4ii5w1zb159cpin44x3srb0sr5apg"))))
     (build-system perl-build-system)
+    (native-inputs `(("perl-module-build" ,perl-module-build)))
     (home-page "http://search.cpan.org/dist/Snowball-Swedish")
     (synopsis "Porters stemming algorithm for Swedish")
     (description "Lingua::Stem::Snowball::Se is a perl port of the swedish
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index f765728ae4..1057564b39 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -764,6 +764,7 @@ (define-public perl-email-abstract
     (build-system perl-build-system)
     (propagated-inputs
      `(("perl-email-simple" ,perl-email-simple)
+       ("perl-module-pluggable" ,perl-module-pluggable)
        ("perl-mro-compat" ,perl-mro-compat)))
     (home-page "http://search.cpan.org/dist/Email-Abstract")
     (synopsis "Interface to mail representations")
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 4d9806cf4b..0e63aa943e 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -168,6 +168,7 @@ (define-public perl-aliased
         (base32
          "1syyqzy462501kn5ma9gl6xbmcahqcn4qpafhsmpz0nd0x2m4l63"))))
     (build-system perl-build-system)
+    (native-inputs `(("perl-module-build" ,perl-module-build)))
     (home-page "http://search.cpan.org/dist/aliased")
     (synopsis "Use shorter versions of class names")
     (description "The alias module loads the class you specify and exports
@@ -503,6 +504,8 @@ (define-public perl-class-accessor-chained
         (base32
          "1lilrjy1s0q5hyr0888kf0ifxjyl2iyk4vxil4jsv0sgh39lkgx5"))))
     (build-system perl-build-system)
+    (native-inputs
+     `(("perl-module-build" ,perl-module-build)))
     (propagated-inputs
      `(("perl-class-accessor" ,perl-class-accessor)))
     (home-page "http://search.cpan.org/dist/Class-Accessor-Chained")
@@ -922,6 +925,8 @@ (define-public perl-config-any
         (base32
          "06n6jn3q3xhk57icwip0ihzqixxav6sgp6rrb35hahj1z748y3vi"))))
     (build-system perl-build-system)
+    (propagated-inputs
+     `(("perl-module-pluggable" ,perl-module-pluggable)))
     (home-page "http://search.cpan.org/dist/Config-Any")
     (synopsis "Load configuration from different file formats")
     (description "Config::Any provides a facility for Perl applications and
@@ -1179,7 +1184,8 @@ (define-public perl-data-page
          "1hvi92c4h2angryc6pngw7gbm3ysc2jfmyxk2wh9ia4vdwpbs554"))))
     (build-system perl-build-system)
     (native-inputs
-     `(("perl-test-exception" ,perl-test-exception)))
+     `(("perl-module-build" ,perl-module-build)
+       ("perl-test-exception" ,perl-test-exception)))
     (propagated-inputs
      `(("perl-class-accessor-chained" ,perl-class-accessor-chained)))
     (home-page "http://search.cpan.org/dist/Data-Page")
@@ -1384,7 +1390,8 @@ (define-public perl-datetime
          "0fli1ls298qa8nfki15myxqqqfpxvslxk4j5r3vjk577wfgjrnms"))))
     (build-system perl-build-system)
     (native-inputs
-     `(("perl-test-fatal" ,perl-test-fatal)
+     `(("perl-module-build" ,perl-module-build)
+       ("perl-test-fatal" ,perl-test-fatal)
        ("perl-test-warnings" ,perl-test-warnings)))
     (propagated-inputs
      `(("perl-datetime-locale" ,perl-datetime-locale)
@@ -1411,6 +1418,8 @@ (define-public perl-datetime-set
         (base32
          "1b27699zkj68w5ll9chjhs52vmf39f9via6x5r5844as30qh9zxb"))))
     (build-system perl-build-system)
+    (native-inputs
+     `(("perl-module-build" ,perl-module-build)))
     (propagated-inputs
      `(("perl-datetime" ,perl-datetime)
        ("perl-params-validate" ,perl-params-validate)
@@ -1513,6 +1522,7 @@ (define-public perl-datetime-format-flexible
        ("perl-datetime-format-builder" ,perl-datetime-format-builder)
        ("perl-datetime-timezone" ,perl-datetime-timezone)
        ("perl-list-moreutils" ,perl-list-moreutils)
+       ("perl-module-pluggable" ,perl-module-pluggable)
        ("perl-test-mocktime" ,perl-test-mocktime)))
     (home-page "http://search.cpan.org/dist/DateTime-Format-Flexible")
     (synopsis "Parse data/time strings")
@@ -1533,6 +1543,8 @@ (define-public perl-datetime-format-ical
         (base32
          "0cvwk7pigj7czsp81z35h7prxvylkrlk2l0kwvq0v72ykx9zc2cb"))))
     (build-system perl-build-system)
+    (native-inputs
+     `(("perl-module-build" ,perl-module-build)))
     (propagated-inputs
      `(("perl-datetime" ,perl-datetime)
        ("perl-datetime-event-ical" ,perl-datetime-event-ical)
@@ -1560,7 +1572,8 @@ (define-public perl-datetime-format-natural
          "1qq3adq1y08d0jlmwk9059s5d39hb26f3zjag099gjjyvs5c8yal"))))
     (build-system perl-build-system)
     (native-inputs
-     `(("perl-module-util" ,perl-module-util)
+     `(("perl-module-build" ,perl-module-build)
+       ("perl-module-util" ,perl-module-util)
        ("perl-test-mocktime" ,perl-test-mocktime)))
     (propagated-inputs
      `(("perl-boolean" ,perl-boolean)
@@ -1617,6 +1630,8 @@ (define-public perl-datetime-locale
         (base32
          "175grkrxiv012n6ch3z1sip4zprcili6m5zqi3njdk5c1gdvi8ca"))))
     (build-system perl-build-system)
+    (native-inputs
+     `(("perl-module-build" ,perl-module-build)))
     (propagated-inputs
      `(("perl-list-moreutils" ,perl-list-moreutils)
        ("perl-params-validate" ,perl-params-validate)))
@@ -1954,6 +1969,7 @@ (define-public perl-error
                (base32
                 "0dsxic78mxy30qvbbdzfyp501hbkwhnbmafqfxipr0yqfy8f2j5g"))))
     (build-system perl-build-system)
+    (native-inputs `(("perl-module-build" ,perl-module-build)))
     (home-page "http://search.cpan.org/dist/Error")
     (synopsis "OO-ish Error/Exception handling for Perl")
     (description "The Error package provides two interfaces.  Firstly Error
@@ -2133,10 +2149,12 @@ (define-public perl-file-changenotify
          "090i265f73jlcl5rv250791vw32j9vvl4nd5abc7myg0klb8109w"))))
     (build-system perl-build-system)
     (native-inputs
-     `(("perl-test-exception" ,perl-test-exception)))
+     `(("perl-module-build" ,perl-module-build)
+       ("perl-test-exception" ,perl-test-exception)))
     (propagated-inputs
      `(("perl-class-load" ,perl-class-load)
        ("perl-list-moreutils" ,perl-list-moreutils)
+       ("perl-module-pluggable" ,perl-module-pluggable)
        ("perl-moose" ,perl-moose)
        ("perl-moosex-params-validate" ,perl-moosex-params-validate)
        ("perl-moosex-semiaffordanceaccessor"
@@ -3110,6 +3128,7 @@ (define-public perl-module-runtime
         (base32
          "19326f094jmjs6mgpwkyisid54k67w34br8yfh0gvaaml87gwi2c"))))
     (build-system perl-build-system)
+    (native-inputs `(("perl-module-build" ,perl-module-build)))
     (home-page "http://search.cpan.org/dist/Module-Runtime")
     (synopsis "Perl runtime module handling")
     (description "The functions exported by this module deal with runtime
@@ -3129,6 +3148,8 @@ (define-public perl-module-runtime-conflicts
         (base32
          "0pz23ch78lbpn4kdbm04icgsmbr7jvmxwq1p5m4x2pap8qwd0wqg"))))
     (build-system perl-build-system)
+    (native-inputs
+     `(("perl-module-build" ,perl-module-build)))
     (propagated-inputs
      `(("perl-module-runtime" ,perl-module-runtime)
        ("perl-dist-checkconflicts" ,perl-dist-checkconflicts)))
@@ -3335,7 +3356,8 @@ (define-public perl-moosex-getopt
          "1nkzvbsiwldmpn6207ns7rinh860djnw098h6cnvywf429rjnz60"))))
     (build-system perl-build-system)
     (native-inputs
-     `(("perl-test-deep" ,perl-test-deep)
+     `(("perl-module-build" ,perl-module-build)
+       ("perl-test-deep" ,perl-test-deep)
        ("perl-test-fatal" ,perl-test-fatal)
        ("perl-test-requires" ,perl-test-requires)
        ("perl-test-trap" ,perl-test-trap)
@@ -3498,6 +3520,7 @@ (define-public perl-moosex-role-parameterized
     (build-system perl-build-system)
     (native-inputs
      `(("perl-cpan-meta-check" ,perl-cpan-meta-check)
+       ("perl-module-build" ,perl-module-build)
        ("perl-moosex-role-withoverloading" ,perl-moosex-role-withoverloading)
        ("perl-test-fatal" ,perl-test-fatal)
        ("perl-test-requires" ,perl-test-requires)))
@@ -3630,7 +3653,8 @@ (define-public perl-moosex-types
          "1iq90s1f0xbmr194q0mhnp9wxqxwwilkbdml040ibqbqvfiz87yh"))))
     (build-system perl-build-system)
     (native-inputs
-     `(("perl-test-fatal" ,perl-test-fatal)
+     `(("perl-module-build" ,perl-module-build)
+       ("perl-test-fatal" ,perl-test-fatal)
        ("perl-test-requires" ,perl-test-requires)))
     (propagated-inputs
      `(("perl-carp-clan" ,perl-carp-clan)
@@ -3798,7 +3822,8 @@ (define-public perl-namespace-autoclean
          "0msggbg2zbixxjq1fda19h0yygavxndfzc4j4pq11nfghmawjsb0"))))
     (build-system perl-build-system)
     (native-inputs
-     `(("perl-test-requires" ,perl-test-requires)))
+     `(("perl-module-build" ,perl-module-build)
+       ("perl-test-requires" ,perl-test-requires)))
     (propagated-inputs
      `(("perl-b-hooks-endofscope" ,perl-b-hooks-endofscope)
        ("perl-namespace-clean" ,perl-namespace-clean)
@@ -4038,7 +4063,8 @@ (define-public perl-params-validate
          "1wh23i9kkma6493c0q1kvy6wmahd6spg6xm3xbp2ar1iy1xhks5l"))))
     (build-system perl-build-system)
     (native-inputs
-     `(("perl-test-fatal" ,perl-test-fatal)
+     `(("perl-module-build" ,perl-module-build)
+       ("perl-test-fatal" ,perl-test-fatal)
        ("perl-test-requires" ,perl-test-requires)))
     (propagated-inputs
      `(("perl-module-implementation" ,perl-module-implementation)))
@@ -4099,6 +4125,7 @@ (define-public perl-path-class
         (base32
          "1viaj8jyshcj135la0kgfgzalaw06xnbsg9h54jx09v1342v69lj"))))
     (build-system perl-build-system)
+    (native-inputs `(("perl-module-build" ,perl-module-build)))
     (home-page "http://search.cpan.org/dist/Path-Class")
     (synopsis "Path specification manipulation")
     (description "Path::Class is a module for manipulation of file and
@@ -4158,6 +4185,7 @@ (define-public perl-posix-strftime-compiler
         (base32
          "0f9p3hx0vqx8zg5v24pz0s4zc8ln100c7c91ks681wq02phqj2v7"))))
     (build-system perl-build-system)
+    (native-inputs `(("perl-module-build" ,perl-module-build)))
     (arguments `(#:tests? #f))          ;TODO: Timezone test failures
     (home-page "http://search.cpan.org/dist/POSIX-strftime-Compiler")
     (synopsis "GNU C library compatible strftime for loggers and servers")
@@ -4201,6 +4229,7 @@ (define-public perl-readonly
         (base32
          "165zcf9lpijdpkx82za0g9rx8ckjnhipmcivdkyzshl8jmp1bl4v"))))
     (build-system perl-build-system)
+    (native-inputs `(("perl-module-build" ,perl-module-build)))
     (home-page "http://search.cpan.org/dist/Readonly")
     (synopsis "Create read-only scalars, arrays, hashes")
     (description "This module provides a facility for creating non-modifiable
@@ -4958,6 +4987,8 @@ (define-public perl-test-differences
         (base32
          "0rhs4q6qn64ji06ns7lwl6iiiw3mggvd9xk9nkiqvx1jihbplrbw"))))
     (build-system perl-build-system)
+    (native-inputs
+     `(("perl-module-build" ,perl-module-build)))
     (propagated-inputs
      `(("perl-text-diff" ,perl-text-diff)
        ("perl-capture-tiny" ,perl-capture-tiny)))
@@ -5129,6 +5160,7 @@ (define-public perl-test-mockobject
        ("perl-test-warn" ,perl-test-warn)
        ("perl-universal-can" ,perl-universal-can)
        ("perl-universal-isa" ,perl-universal-isa)))
+    (arguments `(#:tests? #f))          ;TODO: tests require perl-cgi
     (home-page "http://search.cpan.org/dist/Test-MockObject")
     (synopsis "Emulate troublesome interfaces in Perl")
     (description "Test::MockObject allows you to create objects that conform
@@ -5246,6 +5278,7 @@ (define-public perl-test-pod
         (base32
          "1hmwwhabyng4jrnll926b4ab73r40w3pfchlrvs0yx6kh6kwwy14"))))
     (build-system perl-build-system)
+    (native-inputs `(("perl-module-build" ,perl-module-build)))
     (home-page "http://search.cpan.org/dist/Test-Pod")
     (synopsis "Check for POD errors in files")
     (description "Check POD files for errors or warnings in a test file, using
@@ -5390,6 +5423,8 @@ (define-public perl-test-trap
         (base32
          "05b4zc4087imwphls4yksg4chzx9yavbri301gaxas9kv1yhx13w"))))
     (build-system perl-build-system)
+    (native-inputs
+     `(("perl-module-build" ,perl-module-build)))
     (propagated-inputs
      `(("perl-test-tester" ,perl-test-tester)
        ("perl-data-dump" ,perl-data-dump)))
@@ -5504,7 +5539,8 @@ (define-public perl-test-writevariants
        ("perl-test-directory" ,perl-test-directory)))
     (propagated-inputs
      `(("perl-data-tumbler" ,perl-data-tumbler)
-       ("perl-file-homedir" ,perl-file-homedir)))
+       ("perl-file-homedir" ,perl-file-homedir)
+       ("perl-module-pluggable" ,perl-module-pluggable)))
     (home-page "http://search.cpan.org/dist/Test-WriteVariants")
     (synopsis "Dynamic generation of tests")
     (description "The Test::WriteVariants module provides for the dynamic
@@ -5545,6 +5581,7 @@ (define-public perl-text-aligner
         (base32
          "0a6zkchc0apvzkch6z18cx6h97xfiv50r7n4xhg90x8dvk75qzcs"))))
     (build-system perl-build-system)
+    (native-inputs `(("perl-module-build" ,perl-module-build)))
     (home-page "http://search.cpan.org/dist/Text-Aligner")
     (synopsis "Align text")
     (description "Text::Aligner exports a single function, align(), which is
@@ -5627,6 +5664,7 @@ (define-public perl-text-glob
         (base32
          "0lr76wrsj8wcxrq4wi8z1640w4dmdbkznp06q744rg3g0bd238d5"))))
     (build-system perl-build-system)
+    (native-inputs `(("perl-module-build" ,perl-module-build)))
     (home-page "http://search.cpan.org/dist/Text-Glob")
     (synopsis "Match globbing patterns against text")
     (description "Text::Glob implements glob(3) style matching that can be
@@ -5665,6 +5703,8 @@ (define-public perl-text-table
         (base32
          "02c8v38k639r23dgxwgvsy4myjjzvgdb238kpiffsiz25ab3xp5j"))))
     (build-system perl-build-system)
+    (native-inputs
+     `(("perl-module-build" ,perl-module-build)))
     (propagated-inputs
      `(("perl-text-aligner" ,perl-text-aligner)))
     (home-page "http://search.cpan.org/dist/Text-Table")
@@ -5733,6 +5773,7 @@ (define-public perl-tie-ixhash
         (base32
           "0mmg9iyh42syal3z1p2pn9airq65yrkfs66cnqs9nz76jy60pfzs"))))
   (build-system perl-build-system)
+  (native-inputs `(("perl-module-build" ,perl-module-build)))
   (home-page "http://search.cpan.org/dist/Tie-IxHash")
   (synopsis "Ordered associative arrays for Perl")
   (description "This Perl module implements Perl hashes that preserve the
@@ -5862,6 +5903,8 @@ (define-public perl-time-mock
         (base32
          "0bwqyg8z98m8cjw1qcm4wg502n225k33j2fp8ywxkgfjdd1zgllv"))))
     (build-system perl-build-system)
+    (native-inputs
+     `(("perl-module-build" ,perl-module-build)))
     (propagated-inputs
      `(("perl-timedate" ,perl-timedate))) ;For Date::Parse
     (home-page "http://search.cpan.org/dist/Time-Mock")
@@ -5908,7 +5951,8 @@ (define-public perl-tree-simple-visitorfactory
          "1g27xl48q1vr7aikhxg4vvcsj1si8allxz59vmnks61wsw4by7vg"))))
     (build-system perl-build-system)
     (native-inputs
-     `(("perl-test-exception" ,perl-test-exception)))
+     `(("perl-module-build" ,perl-module-build)
+       ("perl-test-exception" ,perl-test-exception)))
     (propagated-inputs
      `(("perl-tree-simple" ,perl-tree-simple)
        ("perl-base" ,perl-base)))
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 33db3639de..02317d2fef 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -737,6 +737,7 @@ (define-public perl-apache-logformat-compiler
     (build-system perl-build-system)
     (native-inputs
      `(("perl-http-message" ,perl-http-message)
+       ("perl-module-build" ,perl-module-build)
        ("perl-test-mocktime" ,perl-test-mocktime)
        ("perl-try-tiny" ,perl-try-tiny)
        ("perl-uri" ,perl-uri)))
@@ -1318,6 +1319,7 @@ (define-public perl-catalyst-runtime
        ("perl-io-stringy" ,perl-io-stringy)
        ("perl-json-maybexs" ,perl-json-maybexs)
        ("perl-libwww" ,perl-libwww)
+       ("perl-module-pluggable" ,perl-module-pluggable)
        ("perl-moose" ,perl-moose)
        ("perl-moosex-emulate-class-accessor-fast"
         ,perl-moosex-emulate-class-accessor-fast)
@@ -1629,6 +1631,8 @@ (define-public perl-datetime-format-http
         (base32
          "0h6qqdg1yzqkdxp7hqlp0qa7d1y64nilgimxs79dys2ryjfpcknh"))))
     (build-system perl-build-system)
+    (native-inputs
+     `(("perl-module-build" ,perl-module-build)))
     (propagated-inputs
      `(("perl-datetime" ,perl-datetime)
        ("perl-http-date" ,perl-http-date)))
@@ -1723,7 +1727,8 @@ (define-public perl-finance-quote
                 (search-patch "perl-finance-quote-unuse-mozilla-ca.patch")))))
    (build-system perl-build-system)
    (propagated-inputs
-    `(("perl-datetime" ,perl-datetime)
+    `(("perl-cgi" ,perl-cgi)
+      ("perl-datetime" ,perl-datetime)
       ("perl-html-parser" ,perl-html-parser)
       ("perl-html-tableextract" ,perl-html-tableextract)
       ("perl-html-tree" ,perl-html-tree)
@@ -1870,7 +1875,8 @@ (define-public perl-html-tree
          "13qlqbpixw470gnck0xgny8hyjj576m8y24bba2p9ai2lvy76vbx"))))
     (build-system perl-build-system)
     (native-inputs
-     `(("perl-test-fatal" ,perl-test-fatal)))
+     `(("perl-module-build" ,perl-module-build)
+       ("perl-test-fatal" ,perl-test-fatal)))
     (propagated-inputs
      `(("perl-html-parser" ,perl-html-parser)
        ("perl-html-tagset" ,perl-html-tagset)
@@ -1937,6 +1943,8 @@ (define-public perl-html-template
                (base32
                 "07ahpfgidxsw2yb7y8i7bbr8s64aq6qgq832h9jswmksxbd0l43q"))))
     (build-system perl-build-system)
+    (propagated-inputs
+     `(("perl-cgi" ,perl-cgi)))
     (home-page "http://search.cpan.org/dist/HTML-Template")
     (synopsis "HTML-like templates")
     (description
@@ -2195,6 +2203,8 @@ (define-public perl-http-server-simple
         (base32
          "05klpfkss2a6i5ihmvcm27fyar0f2v4ispg2f49agab3va1gix6g"))))
     (build-system perl-build-system)
+    (propagated-inputs
+     `(("perl-cgi" ,perl-cgi)))
     (arguments
      ;; See the discussion of a related tests issue at
      ;; https://lists.gnu.org/archive/html/guix-devel/2015-01/msg00346.html
@@ -2265,6 +2275,7 @@ (define-public perl-io-socket-ip
         (base32
          "0ky20hmln6waipzqikizyw04vpszf70fgpshz7ib8zv8480ri456"))))
     (build-system perl-build-system)
+    (native-inputs `(("perl-module-build" ,perl-module-build)))
     (home-page "http://search.cpan.org/dist/IO-Socket-IP")
     (synopsis "Family-neutral IP socket supporting both IPv4 and IPv6")
     (description "This module provides a protocol-independent way to use IPv4
@@ -2589,6 +2600,8 @@ (define-public perl-plack-middleware-methodoverride
         (base32
          "1hb8dx7i4vs74n0p737wrvpdnnw6argxrjpr6kj6432zabp8325z"))))
     (build-system perl-build-system)
+    (native-inputs
+     `(("perl-module-build" ,perl-module-build)))
     (propagated-inputs
      `(("perl-plack" ,perl-plack)))
     (home-page "http://search.cpan.org/dist/Plack-Middleware-MethodOverride")
@@ -2813,6 +2826,8 @@ (define-public perl-uri-find
         (base32
          "0czc4h182s7sx3k123m7qlg7yybnwxgh369hap3c3b6xgrglrhy0"))))
     (build-system perl-build-system)
+    (native-inputs
+     `(("perl-module-build" ,perl-module-build)))
     (propagated-inputs
      `(("perl-uri" ,perl-uri)))
     (home-page "http://search.cpan.org/dist/URI-Find")
@@ -2880,6 +2895,8 @@ (define-public perl-www-mechanize
         (base32
          "1zrw8aadhwy48q51x2z2rqlkwf17bya4j4h3hy89mw783j96rmg9"))))
     (build-system perl-build-system)
+    (native-inputs                      ;only for tests
+     `(("perl-cgi" ,perl-cgi)))
     (propagated-inputs
      `(("perl-html-form" ,perl-html-form)
        ("perl-html-parser" ,perl-html-parser)
-- 
cgit v1.2.3