3
0
Fork 0
forked from mirrors/nixpkgs

ikiwiki: support OpenID via HTTPS

Also enable Perl LWPxParanoidAgent for "additional security".
This commit is contained in:
Peter Simons 2012-08-10 18:57:57 +02:00
parent 397f1d73ee
commit f20913e51f
3 changed files with 13 additions and 2 deletions

View file

@ -2,6 +2,7 @@
, TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate
, CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple
, YAMLLibYAML, which, HTMLTree, AuthenPassphrase, NetOpenIDConsumer
, LWPxParanoidAgent, CryptSSLeay
, gitSupport ? false, git ? null
, docutilsSupport ? false, python ? null, docutils ? null
, monotoneSupport ? false, monotone ? null
@ -37,7 +38,7 @@ stdenv.mkDerivation {
buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext
RpcXML XMLSimple PerlMagick YAML YAMLLibYAML which HTMLTree AuthenPassphrase
NetOpenIDConsumer ]
NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay ]
++ lib.optionals docutilsSupport [python docutils]
++ lib.optionals gitSupport [git]
++ lib.optionals monotoneSupport [monotone]

View file

@ -7061,7 +7061,7 @@ let
inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber
HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext
RpcXML XMLSimple PerlMagick YAML YAMLLibYAML HTMLTree Filechdir
AuthenPassphrase NetOpenIDConsumer;
AuthenPassphrase NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay;
};
imagemagick = callPackage ../applications/graphics/ImageMagick {

View file

@ -2406,6 +2406,16 @@ rec {
doCheck = false; # tries to connect to https://www.apache.org/.
};
LWPxParanoidAgent = buildPerlPackage rec {
name = "LWPx-ParanoidAgent-1.07";
src = fetchurl {
url = "mirror://cpan/authors/id/B/BR/BRADFITZ/${name}.tar.gz";
sha256 = "bd7ccbe6ed6b64195a967e9b2b04c185b7b97e8ec5a8835bb45dbcd42a18e76a";
};
doCheck = false; # 3 tests fail, probably because they try to connect to the network
propagatedBuildInputs = [ LWP NetDNS ];
};
maatkit = import ../development/perl-modules/maatkit {
inherit fetchurl buildPerlPackage stdenv DBDmysql;
};