From f20913e51fb6510ddd74d558a5b532764c92abdb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Aug 2012 18:57:57 +0200 Subject: [PATCH] ikiwiki: support OpenID via HTTPS Also enable Perl LWPxParanoidAgent for "additional security". --- pkgs/applications/misc/ikiwiki/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/perl-packages.nix | 10 ++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index e0a17e0e5f0c..d061495b1764 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -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] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 074b7c262958..7ec4377bbe71 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 25bdcdd27fce..d33f5a78b8fc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -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; };