* Updated Catalyst to 5.9. It now uses Plack for interfacing with the

web server, so add that as well.

svn path=/nixpkgs/trunk/; revision=29709
This commit is contained in:
Eelco Dolstra 2011-10-07 12:18:17 +00:00
parent ef27bfc02a
commit 20778d629b
2 changed files with 261 additions and 57 deletions

View File

@ -0,0 +1,17 @@
Use $OPENSSL_X509_CERT_FILE to get the CA certificates.
diff -ru -x '*~' LWP-Protocol-https-6.02-orig/lib/LWP/Protocol/https.pm LWP-Protocol-https-6.02/lib/LWP/Protocol/https.pm
--- LWP-Protocol-https-6.02-orig/lib/LWP/Protocol/https.pm 2011-03-27 13:54:01.000000000 +0200
+++ LWP-Protocol-https-6.02/lib/LWP/Protocol/https.pm 2011-10-07 13:23:41.398628375 +0200
@@ -21,6 +21,11 @@
}
if ($ssl_opts{SSL_verify_mode}) {
unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
+ if (defined $ENV{'OPENSSL_X509_CERT_FILE'}) {
+ $ssl_opts{SSL_ca_file} = $ENV{'OPENSSL_X509_CERT_FILE'};
+ }
+ }
+ unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
eval {
require Mozilla::CA;
};

View File

@ -292,7 +292,7 @@ rec {
};
buildInputs = [ TestWWWMechanizeCatalyst TestUseOk ];
propagatedBuildInputs =
[ CatalystPluginAuthentication ClassAccessor CryptPasswdMD5 AuthenHtpasswd ];
[ CatalystPluginAuthentication ClassAccessor CryptPasswdMD5 AuthenHtpasswd HTMLForm ];
};
CatalystAuthenticationStoreDBIxClass = buildPerlPackage rec {
@ -389,10 +389,10 @@ rec {
};
CatalystRuntime = buildPerlPackage rec{
name = "Catalyst-Runtime-5.80033";
name = "Catalyst-Runtime-5.90003";
src = fetchurl {
url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz";
sha256 = "1q542lrnvc0a11923awhk51fqzzxfa8zdkbch7z07dl8y81mwhl2";
sha256 = "0i53d208gf9bg6zasa8ya0nk3wik1crfrkw9rmbxsba16i5nm101";
};
buildInputs = [ TestException ];
propagatedBuildInputs =
@ -405,6 +405,7 @@ rec {
TextSimpleTable TimeHiRes TreeSimple TreeSimpleVisitorFactory
URI TaskWeaken /* TextBalanced */ MROCompat MooseXTypes
MooseXGetopt MooseXTypesCommon StringRewritePrefix
MooseXTypesLoadableClass Plack PlackMiddlewareReverseProxy
];
};
@ -1148,6 +1149,15 @@ rec {
};
};
DevelStackTraceAsHTML = buildPerlPackage rec {
name = "Devel-StackTrace-AsHTML-0.11";
src = fetchurl {
url = "mirror://cpan/modules/by-module/Devel/${name}.tar.gz";
sha256 = "0y0r42gszp3bxbs9j2nn3xgs8ij1cnadrywwwdc6r0y8m0siyapg";
};
propagatedBuildInputs = [ DevelStackTrace ];
};
DevelSymdump = buildPerlPackage rec {
name = "Devel-Symdump-2.08";
src = fetchurl {
@ -1268,6 +1278,14 @@ rec {
};
};
EncodeLocale = buildPerlPackage rec {
name = "Encode-Locale-1.02";
src = fetchurl {
url = "mirror://cpan/modules/by-module/Encode/${name}.tar.gz";
sha256 = "0h2kim6mg236s749wlg35lhv1zdkrkr0bm65spkg005cn0mbmi90";
};
};
Error = buildPerlPackage rec {
name = "Error-0.17016";
src = fetchurl {
@ -1377,6 +1395,15 @@ rec {
propagatedBuildInputs = [ NumberCompare TextGlob ];
};
FileListing = buildPerlPackage rec {
name = "File-Listing-6.03";
src = fetchurl {
url = "mirror://cpan/modules/by-module/File/${name}.tar.gz";
sha256 = "154hp49pcngsqrwi1pbw3fx82v7vql4dc9wh7qfj37vmy8sn1s93";
};
propagatedBuildInputs = [ HTTPDate ];
};
FileModified = buildPerlPackage {
name = "File-Modified-0.07";
src = fetchurl {
@ -1410,6 +1437,14 @@ rec {
propagatedBuildInputs = [ClassInspector ParamsUtil];
};
FilesysNotifySimple = buildPerlPackage rec {
name = "Filesys-Notify-Simple-0.08";
src = fetchurl {
url = "mirror://cpan/modules/by-module/Filesys/${name}.tar.gz";
sha256 = "042klyvi8fbkhmyg1h7883bbjdhiclmky9w2wfga7piq5il6nxgi";
};
};
FileTemp = buildPerlPackage rec {
name = "File-Temp-0.22";
src = fetchurl {
@ -1541,6 +1576,14 @@ rec {
propagatedBuildInputs = [ Clone ];
};
HashMultiValue = buildPerlPackage rec {
name = "Hash-MultiValue-0.10";
src = fetchurl {
url = "mirror://cpan/modules/by-module/Hash/${name}.tar.gz";
sha256 = "1n9klrg01myij2svcmdc212msmsr3cmsl2yw5k9my8j3s96b5yn1";
};
};
HookLexWrap = buildPerlPackage rec {
name = "Hook-LexWrap-0.22";
src = fetchurl {
@ -1550,6 +1593,15 @@ rec {
buildInputs = [ pkgs.unzip ];
};
HTMLForm = buildPerlPackage rec {
name = "HTML-Form-6.00";
src = fetchurl {
url = "mirror://cpan/modules/by-module/HTML/${name}.tar.gz";
sha256 = "11s9mlybjm14sa6m3wcfjf9pv00yynv0yk4parx44ga9h1a6y6xl";
};
propagatedBuildInputs = [ HTMLParser HTTPMessage URI ];
};
HTMLFormFu = buildPerlPackage rec {
name = "HTML-FormFu-0.03007";
src = fetchurl {
@ -1568,11 +1620,11 @@ rec {
];
};
HTMLParser = buildPerlPackage {
name = "HTML-Parser-3.56";
HTMLParser = buildPerlPackage rec {
name = "HTML-Parser-3.68";
src = fetchurl {
url = mirror://cpan/authors/id/G/GA/GAAS/HTML-Parser-3.56.tar.gz;
sha256 = "0x1h42r54aq4yqpwi7mla4jzia9c5ysyqh8ir2nav833f9jm6g2h";
url = "mirror://cpan/modules/by-module/HTML/${name}.tar.gz";
sha256 = "1hhniqqpvi01vxsyvmcj677yg7a12zy0a3ynwxwg3ig6shn8a3j3";
};
propagatedBuildInputs = [HTMLTagset];
};
@ -1586,11 +1638,11 @@ rec {
propagatedBuildInputs = [HTMLParser];
};
HTMLTagset = buildPerlPackage {
name = "HTML-Tagset-3.10";
HTMLTagset = buildPerlPackage rec {
name = "HTML-Tagset-3.20";
src = fetchurl {
url = mirror://cpan/authors/id/P/PE/PETDANCE/HTML-Tagset-3.10.tar.gz;
sha256 = "05k292qy7jzjlmmybis8nncpnwwa4jfkm7q3gq6866ydxrzds9xh";
url = "mirror://cpan/modules/by-module/HTML/${name}.tar.gz";
sha256 = "1qh8249wgr4v9vgghq77zh1d2zs176bir223a8gh3k9nksn7vcdd";
};
};
@ -1652,6 +1704,23 @@ rec {
propagatedBuildInputs = [ LWP ];
};
HTTPCookies = buildPerlPackage rec {
name = "HTTP-Cookies-6.00";
src = fetchurl {
url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz";
sha256 = "0758c3rj22z1bj7pbypmh1jadgd6w68nn8inhds96r39jhc79d9h";
};
propagatedBuildInputs = [ HTTPDate HTTPMessage ];
};
HTTPDate = buildPerlPackage rec {
name = "HTTP-Date-6.00";
src = fetchurl {
url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz";
sha256 = "15nrnfir4xqdd3lm0s0jgh9zwxx5ylmvl63xqmj5wipzl4l76vs6";
};
};
HTTPHeaderParserXS = buildPerlPackage rec {
name = "HTTP-HeaderParser-XS-0.20";
src = fetchurl {
@ -1660,6 +1729,24 @@ rec {
};
};
HTTPMessage = buildPerlPackage rec {
name = "HTTP-Message-6.02";
src = fetchurl {
url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz";
sha256 = "10ai2vabbx6yqsyz6rbi7hp4vljmlq9kyn74jvjp95la5v4b6c93";
};
propagatedBuildInputs = [ EncodeLocale HTMLParser HTTPDate IOCompress LWPMediaTypes URI ];
};
HTTPParserXS = buildPerlPackage rec {
name = "HTTP-Parser-XS-0.14";
src = fetchurl {
url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz";
sha256 = "06srbjc380kvvj76r8n5c2y282j5zfgn0s0zmb9h3shwrynfqj05";
};
buildInputs = [ TestMore ];
};
HTTPRequestAsCGI = buildPerlPackage rec {
name = "HTTP-Request-AsCGI-1.2";
src = fetchurl {
@ -1670,12 +1757,12 @@ rec {
};
HTTPResponseEncoding = buildPerlPackage rec {
name = "HTTP-Response-Encoding-0.05";
name = "HTTP-Response-Encoding-0.06";
src = fetchurl {
url = "mirror://cpan/authors/id/D/DA/DANKOGAI/${name}.tar.gz";
sha256 = "04gdl633g0s2ckn7zixcma2krbpfcd46jngg155qpdx5sdwfkm16";
url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz";
sha256 = "1am8lis8107s5npca1xgazdy5sknknzcqyhdmc220s4a4f77n5hh";
};
propagatedBuildInputs = [LWP];
propagatedBuildInputs = [ LWP ];
};
HTTPServerSimple = buildPerlPackage rec {
@ -1732,14 +1819,13 @@ rec {
};
};
IOSocketSSL = buildPerlPackage {
name = "IO-Socket-SSL-1.33";
IOSocketSSL = buildPerlPackage rec {
name = "IO-Socket-SSL-1.44";
src = fetchurl {
url = mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-1.33.tar.gz;
sha256 = "1lpp2cs794d989b9gfhssjv1bkcs9lmrkjcpnxsavj7822izs4xj";
url = "mirror://cpan/modules/by-module/IO/${name}.tar.gz";
sha256 = "1xbgx1ij34a3dlwv94zjh3a02cj2lyhwzxcmv59harl784xn1mlg";
};
propagatedBuildInputs = [NetSSLeay];
# TODO: IOSocketINET6
propagatedBuildInputs = [ URI NetSSLeay ];
};
IOString = buildPerlPackage rec {
@ -2029,21 +2115,39 @@ rec {
};
};
LWP = buildPerlPackage rec {
name = "libwww-perl-5.825";
name = "libwww-perl-6.02";
src = fetchurl {
url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz";
sha256 = "1wb7br1n86571xz19l20cc5ysy1lx3rhvlk02g5517919z3jxvhw";
url = "mirror://cpan/modules/by-module/LWP/${name}.tar.gz";
sha256 = "0cn2cbrz5mrpqmnfhhk0bgv0c1q1x722xlnlnzw6zymj5sg3w6dm";
};
propagatedBuildInputs = [URI HTMLParser HTMLTagset];
propagatedBuildInputs =
[ EncodeLocale FileListing HTMLParser HTTPCookies HTTPMessage LWPMediaTypes URI NetHTTP ];
};
LWPMediaTypes = buildPerlPackage rec {
name = "LWP-MediaTypes-6.01";
src = fetchurl {
url = "mirror://cpan/modules/by-module/LWP/${name}.tar.gz";
sha256 = "1fhxql3xnhrlyzkjyss4swvhyh0r58cv2kwjcpj3mdbbg54ah9fz";
};
};
LWPProtocolHttps = buildPerlPackage rec {
name = "LWP-Protocol-https-6.02";
src = fetchurl {
url = "mirror://cpan/modules/by-module/LWP/${name}.tar.gz";
sha256 = "0y2an4v7g4jm8fsszk2489m179i28kx79ywwiywkwk1aw3yqh0y5";
};
patches = [ ../development/perl-modules/lwp-protocol-https-cert-file.patch ];
propagatedBuildInputs = [ LWP IOSocketSSL ];
doCheck = false; # tries to connect to https://www.apache.org/.
};
maatkit = import ../development/perl-modules/maatkit {
inherit fetchurl buildPerlPackage stdenv DBDmysql;
};
MailIMAPClient = buildPerlPackage {
name = "Mail-IMAPClient-2.2.9";
src = fetchurl {
@ -2251,6 +2355,15 @@ rec {
propagatedBuildInputs = [ Moose MooseXTypes ];
};
MooseXTypesLoadableClass = buildPerlPackage rec {
name = "MooseX-Types-LoadableClass-0.006";
src = fetchurl {
url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz";
sha256 = "035d2gzq1j60skn39jav2jr6sbx1hq9vqmmfjfc3cvhahfzrygs4";
};
propagatedBuildInputs = [ ClassLoad Moose MooseXTypes NamespaceClean ];
};
Mouse = buildPerlPackage rec {
name = "Mouse-0.26";
src = fetchurl {
@ -2313,7 +2426,7 @@ rec {
patches =
[ ../development/perl-modules/net-amazon-mechanicalturk.patch ];
propagatedBuildInputs =
[ DigestHMAC LWP URI XMLParser IOString CryptSSLeay ];
[ DigestHMAC LWP LWPProtocolHttps URI XMLParser IOString ];
buildInputs = [ DBI DBDSQLite ];
};
@ -2327,6 +2440,14 @@ rec {
doCheck = false;
};
NetHTTP = buildPerlPackage rec {
name = "Net-HTTP-6.01";
src = fetchurl {
url = "mirror://cpan/modules/by-module/Net/${name}.tar.gz";
sha256 = "0ipad5y605fr968snxmp1sxrkvag9r5y0g8qvj9n7ca9nbwq7n3n";
};
};
NetIP = buildPerlPackage {
name = "Net-IP-1.25";
src = fetchurl {
@ -2336,10 +2457,10 @@ rec {
};
NetServer = buildPerlPackage rec {
name = "Net-Server-0.97";
name = "Net-Server-0.99";
src = fetchurl {
url = "mirror://cpan/authors/id/R/RH/RHANDOM/${name}.tar.gz";
sha256 = "13vhv13w06g6h6iqx440q1h6hwj0kpjdxcc3fl9crkwg5glygg2f";
url = "mirror://cpan/modules/by-module/Net/${name}.tar.gz";
sha256 = "0pdf2fvklpcxrdz3wwmhbvjs6kvzcvjw28f3pny8z17188lv06n1";
};
doCheck = false; # seems to hang waiting for connections
};
@ -2363,16 +2484,15 @@ rec {
propagatedBuildInputs = [IOSocketSSL];
};
NetSSLeay = buildPerlPackage {
name = "Net-SSLeay-1.36";
NetSSLeay = buildPerlPackage rec {
name = "Net-SSLeay-1.42";
src = fetchurl {
url = mirror://cpan/authors/id/F/FL/FLORA/Net-SSLeay-1.36.tar.gz;
sha256 = "1kjk5kdwsklchxrv21m4ii80akbxrg3i6y4zwfb91an5cdr8jqp2";
url = "mirror://cpan/modules/by-module/Net/${name}.tar.gz";
sha256 = "17gxf0d1l0qlxn0d6gqz1dlzl6cdqv0jg47k0h1fcs45rlcpgjmn";
};
buildInputs = [pkgs.openssl];
buildInputs = [ pkgs.openssl ];
OPENSSL_PREFIX = pkgs.openssl;
# Test perform network access
doCheck = false;
doCheck = false; # Test performs network access.
};
NetTwitterLite = buildPerlPackage {
@ -2574,6 +2694,28 @@ rec {
};
};
Plack = buildPerlPackage rec {
name = "Plack-0.9984";
src = fetchurl {
url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz";
sha256 = "0xx200va9l6zimp2ybvbh1l3m80cdw03mfxqqf9k6v7cqvxir6pz";
};
buildInputs = [ TestRequires TestTCP HTTPRequestAsCGI ];
propagatedBuildInputs =
[ LWP FileShareDir TryTiny DevelStackTrace DevelStackTraceAsHTML HTTPBody
HashMultiValue FilesysNotifySimple
];
};
PlackMiddlewareReverseProxy = buildPerlPackage rec {
name = "Plack-Middleware-ReverseProxy-0.10";
src = fetchurl {
url = "mirror://cpan/modules/by-module/Plack/${name}.tar.gz";
sha256 = "0w9bl1z71frra0dgz4gsxskvj1c8dhjkhrj2gqwdds6jcqyny7mf";
};
propagatedBuildInputs = [ Plack YAML ];
};
PPI = buildPerlPackage rec {
name = "PPI-1.210";
src = fetchurl {
@ -2593,6 +2735,14 @@ rec {
doCheck = false;
};
PSGI = buildPerlPackage rec {
name = "PSGI-1.03";
src = fetchurl {
url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz";
sha256 = "0b1k7smg50xfdhrjifa2gkkm52vna41alvbw8vb2pk99jmgnngh6";
};
};
ModulePluggable = buildPerlPackage rec {
name = "Module-Pluggable-3.9";
src = fetchurl {
@ -2809,6 +2959,17 @@ rec {
];
};
Starman = buildPerlPackage rec {
name = "Starman-0.2014";
src = fetchurl {
url = "mirror://cpan/modules/by-module/Plack/${name}.tar.gz";
sha256 = "0hf3wpm2q4zcgjahjrpkkzy4fn74vkddg9yqs7p97xb290pvlbki";
};
buildInputs = [ TestRequires TestTCP ];
propagatedBuildInputs = [ Plack DataDump HTTPParserXS NetServer ];
doCheck = false; # binds to various TCP ports1
};
StatisticsDescriptive = buildPerlPackage rec {
name = "Statistics-Descriptive-3.0202";
src = fetchurl {
@ -2977,6 +3138,15 @@ rec {
buildInputs = [TestPodCoverage];
};
TaskPlack = buildPerlPackage rec {
name = "Task-Plack-0.25";
src = fetchurl {
url = "mirror://cpan/modules/by-module/Task/${name}.tar.gz";
sha256 = "1mk3z7xis1akf8245qgw5mnnsl7570kdidx83nj81kv410pw2v43";
};
propagatedBuildInputs = [ Plack PSGI ];
};
TaskWeaken = buildPerlPackage {
name = "Task-Weaken-1.02";
src = fetchurl {
@ -3162,14 +3332,6 @@ rec {
};
};
TestSimple = buildPerlPackage rec {
name = "Test-Simple-0.98";
src = fetchurl {
url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz";
sha256 = "1a0jrl3n2g05qn6c79pv5bnc1wlq36qccwdgf1pjrrvmrgi07cig";
};
};
TestScript = buildPerlPackage rec {
name = "Test-Script-1.07";
src = fetchurl {
@ -3179,6 +3341,22 @@ rec {
propagatedBuildInputs = [ProbePerl IPCRun3];
};
TestSharedFork = buildPerlPackage rec {
name = "Test-SharedFork-0.18";
src = fetchurl {
url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz";
sha256 = "1wc41jzi780w75m2ry1038mzxyz7386r8rmhbnmj3krcdxy676cc";
};
};
TestSimple = buildPerlPackage rec {
name = "Test-Simple-0.98";
src = fetchurl {
url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz";
sha256 = "1a0jrl3n2g05qn6c79pv5bnc1wlq36qccwdgf1pjrrvmrgi07cig";
};
};
TestSubCalls = buildPerlPackage rec {
name = "Test-SubCalls-1.09";
src = fetchurl {
@ -3188,6 +3366,15 @@ rec {
propagatedBuildInputs = [ HookLexWrap ];
};
TestTCP = buildPerlPackage rec {
name = "Test-TCP-1.13";
src = fetchurl {
url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz";
sha256 = "00vbkynkdflqgdvywdxzgg3yx1w7nfb68py8l3lglq9jq4pq9wbb";
};
propagatedBuildInputs = [ TestMore TestSharedFork ];
};
TestTester = buildPerlPackage {
name = "Test-Tester-0.107";
src = fetchurl {
@ -3227,17 +3414,17 @@ rec {
};
TestWWWMechanizeCatalyst = buildPerlPackage rec {
name = "Test-WWW-Mechanize-Catalyst-0.45";
name = "Test-WWW-Mechanize-Catalyst-0.55";
src = fetchurl {
url = "mirror://cpan/authors/id/L/LB/LBROCARD/${name}.tar.gz";
sha256 = "0hixz0hibv2z87kdqvrphzgww0xibgg56w7bh299dgw2739hy4yf";
url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz";
sha256 = "0zdg4sxx231dj3qgbr58i63927gl4qzh0krignqxp8q6ck3hr63f";
};
propagatedBuildInputs = [
CatalystRuntime TestWWWMechanize WWWMechanize
CatalystPluginSessionStateCookie
];
buildInputs = [TestPod];
doCheck = false;
propagatedBuildInputs =
[ CatalystRuntime TestWWWMechanize WWWMechanize
CatalystPluginSessionStateCookie HTMLForm
];
buildInputs = [ TestPod ];
doCheck = false; # listens on an external port
};
TextAligner = buildPerlPackage rec {
@ -3435,10 +3622,10 @@ rec {
};
URI = buildPerlPackage rec {
name = "URI-1.51";
name = "URI-1.59";
src = fetchurl {
url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz";
sha256 = "0gfdphz0yhm62vn9cbw720i6pm1gingcir15dq8ppbnk6cylnyal";
sha256 = "1inanl9vs6q1bwvig1s8hdwagjw4484gs4s7pjnx5f4xb2dx526b";
};
};