From 397f1d73ee9b626ad823d87d7454b511542f6a35 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Aug 2012 18:43:49 +0200 Subject: ikiwiki: enable OpenID support * added perl-Crypt-DH-GMP-0.00010 * added perl-Devel-CheckLib-0.98 * added perl-HTTP-Message-6.03 * added perl-IO-CaptureOutput-1.1102 * added perl-Net-OpenID-Common-1.14 * added perl-Net-OpenID-Consumer-1.13 --- pkgs/applications/misc/ikiwiki/default.nix | 5 ++- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/perl-packages.nix | 71 ++++++++++++++++++++++++++---- 3 files changed, 67 insertions(+), 11 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 73dfe29a572c0..e0a17e0e5f0c8 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl, gettext, makeWrapper, PerlMagick, YAML , TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate , CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple -, YAMLLibYAML, which, HTMLTree, AuthenPassphrase +, YAMLLibYAML, which, HTMLTree, AuthenPassphrase, NetOpenIDConsumer , gitSupport ? false, git ? null , docutilsSupport ? false, python ? null, docutils ? null , monotoneSupport ? false, monotone ? null @@ -36,7 +36,8 @@ stdenv.mkDerivation { buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext - RpcXML XMLSimple PerlMagick YAML YAMLLibYAML which HTMLTree AuthenPassphrase ] + RpcXML XMLSimple PerlMagick YAML YAMLLibYAML which HTMLTree AuthenPassphrase + NetOpenIDConsumer ] ++ 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 753fb893e09da..074b7c262958f 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; + AuthenPassphrase NetOpenIDConsumer; }; imagemagick = callPackage ../applications/graphics/ImageMagick { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7fc3a0442e886..25bdcdd27fce6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -936,6 +936,17 @@ rec { buildInputs = [CryptCBC]; }; + CryptDHGMP = buildPerlPackage rec { + name = "Crypt-DH-GMP-0.00010"; + src = fetchurl { + url = "mirror://cpan/authors/id//D/DM/DMAKI/${name}.tar.gz"; + sha256 = "7d947cd48a98880df4fb5b0785758bef9ae1357eba7c376ad0fca3fd262a5fe9"; + }; + buildInputs = [ DevelChecklib TestRequires pkgs.gmp ]; + NIX_CFLAGS_COMPILE = "-I${pkgs.gmp}/include"; + NIX_CFLAGS_LINK = "-L${pkgs.gmp}/lib -lgmp"; + }; + CryptEksblowfish = buildPerlPackage rec { name = "Crypt-Eksblowfish-0.009"; src = fetchurl { @@ -986,6 +997,14 @@ rec { }; }; + CryptUnixCryptXS = buildPerlPackage rec { + name = "Crypt-UnixCrypt_XS-0.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BO/BORISZ/${name}.tar.gz"; + sha256 = "527c32b8b6eb50d52b081ceae4be2d748e718e40ea85940da59a3adeb3a33156"; + }; + }; + CryptSmbHash = buildPerlPackage rec { name = "Crypt-SmbHash-0.12"; src = fetchurl { @@ -1201,6 +1220,15 @@ rec { propagatedBuildInputs = [ ClassLoad ClassSingleton ParamsValidate TryTiny ]; }; + DevelChecklib = buildPerlPackage rec { + name = "Devel-CheckLib-0.98"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MATTN/${name}.tar.gz"; + sha256 = "2b6b62665403bcdce67b53eb3bee7b57b6576026640c01aa57c7126e32ce20da"; + }; + propagatedBuildInputs = [ IOCaptureOutput ]; + }; + DBDSQLite = import ../development/perl-modules/DBD-SQLite { inherit stdenv fetchurl buildPerlPackage DBI; inherit (pkgs) sqlite; @@ -1945,6 +1973,15 @@ rec { buildInputs = [ TestMore ]; }; + HTTPRequest = buildPerlPackage rec { + name = "HTTP-Message-6.03"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz"; + sha256 = "c736e083bdf0eea1bb73e2dc3b66db0a8283942c0f69063afadb9a7cfa80011b"; + }; + propagatedBuildInputs = [ HTTPDate URI HTMLParser LWP ]; + }; + HTTPRequestAsCGI = buildPerlPackage rec { name = "HTTP-Request-AsCGI-1.2"; src = fetchurl { @@ -1981,6 +2018,14 @@ rec { }; }; + IOCaptureOutput = buildPerlPackage rec { + name = "IO-CaptureOutput-1.1102"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/IO/${name}.tar.gz"; + sha256 = "2ea16dbecb21a3c2be49a93fb1e7e51275bed3f7ef3ac30cbdbff5d0178d43c7"; + }; + }; + IOCompress = buildPerlPackage rec { name = "IO-Compress-2.037"; src = fetchurl { @@ -2854,6 +2899,24 @@ rec { }; }; + NetOpenIDCommon = buildPerlPackage rec { + name = "Net-OpenID-Common-1.14"; + src = fetchurl { + url = "mirror://cpan/authors/id/W/WR/WROG/${name}.tar.gz"; + sha256 = "24ac83539b188d85bd2c7bd67e355aab0ede3f98170b23cb50bd30b11b4387ff"; + }; + propagatedBuildInputs = [ CryptDHGMP URI HTMLParser HTTPRequest XMLSimple ]; + }; + + NetOpenIDConsumer = buildPerlPackage rec { + name = "Net-OpenID-Consumer-1.13"; + src = fetchurl { + url = "mirror://cpan/authors/id/W/WR/WROG/${name}.tar.gz"; + sha256 = "4ab927b6756366fa4cef2b54088645849f32fc7e0cd8de0a50001bbf62946fd8"; + }; + propagatedBuildInputs = [ NetOpenIDCommon JSON ]; + }; + PackageDeprecationManager = buildPerlPackage rec { name = "Package-DeprecationManager-0.11"; src = fetchurl { @@ -4019,14 +4082,6 @@ rec { }; }; - CryptUnixCryptXS = buildPerlPackage rec { - name = "Crypt-UnixCrypt_XS-0.09"; - src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BORISZ/${name}.tar.gz"; - sha256 = "527c32b8b6eb50d52b081ceae4be2d748e718e40ea85940da59a3adeb3a33156"; - }; - }; - URI = buildPerlPackage rec { name = "URI-1.59"; src = fetchurl { -- cgit 1.4.1