From bb8afbf5a1fbc85f700c0e07ce5581637e3674dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 17 Jan 2016 18:41:20 +0100 Subject: [PATCH] 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/perl.scm | 16 ++++++++++------ gnu/packages/web.scm | 5 +++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 162fc9b8f3..51fb96516a 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2015 Eric Bavier @@ -663,6 +663,7 @@ (define-public perl-class-factory-util (base32 "09ifd6v0c94vr20n9yr1dxgcp7hyscqq851szdip7y24bd26nlbc")))) (build-system perl-build-system) + (native-inputs `(("perl-module-build" ,perl-module-build))) (home-page "http://search.cpan.org/dist/Class-Factory-Util") (synopsis "Utility methods for factory classes") (description "This module exports methods useful for factory classes.") @@ -1356,6 +1357,7 @@ (define-public perl-date-manip (base32 "0zd0wbf91i49753rnf7m1lw197hdl5r97mxy0n43zdmcmhvkb3qq")))) (build-system perl-build-system) + (native-inputs `(("perl-module-build" ,perl-module-build))) (arguments ;; Tests would require tzdata for timezone information, but tzdata is in ;; (gnu packages base) which would create a circular dependency. TODO: @@ -1717,6 +1719,7 @@ (define-public perl-devel-checkbin (base32 "0g71sma9jy0fjm619hcrcsb9spg2y03vjxx36y8k1xpa2553sr7m")))) (build-system perl-build-system) + (native-inputs `(("perl-module-build" ,perl-module-build))) (home-page "http://search.cpan.org/dist/Devel-CheckBin") (synopsis "Check that a command is available") (description "Devel::CheckBin is a perl module that checks whether a @@ -6159,12 +6162,13 @@ (define-public perl-module-build `(("perl-cpan-meta" ,perl-cpan-meta))) (home-page "http://search.cpan.org/dist/Module-Build") (synopsis "Build and install Perl modules") - (description "\"Module::Build\" is a system for building, testing, and -installing Perl modules. It is meant to be an alternative to -\"ExtUtils::MakeMaker\". Developers may alter the behavior of the module + (description "@code{Module::Build} is a system for building, testing, and +installing Perl modules; it used to be part of Perl itself until version 5.22, +which dropped it. It is meant to be an alternative to +@code{ExtUtils::MakeMaker}. Developers may alter the behavior of the module through subclassing in a much more straightforward way than with -\"MakeMaker\". It also does not require a \"make\" on your system - most of -the \"Module::Build\" code is pure-perl and written in a cross-platform way.") +@code{MakeMaker}. It also does not require a @command{make} on your +system---most of the @code{Module::Build} code is pure-Perl.") (license (package-license perl)))) (define-public perl-parse-cpan-meta 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 ;;; Copyright © 2013 Aljosha Papsch -;;; Copyright © 2014, 2015 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer @@ -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