ikiwiki: updated to version 3.20120202

svn path=/nixpkgs/trunk/; revision=32116
This commit is contained in:
Peter Simons 2012-02-07 14:01:05 +00:00
parent f57a6512b8
commit 29869899a8
2 changed files with 7 additions and 8 deletions

View File

@ -1,10 +1,9 @@
{ stdenv, fetchurl, perl, gettext, makeWrapper, lib, PerlMagick, YAML { stdenv, fetchurl, perl, gettext, makeWrapper, lib, PerlMagick, YAML
, TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate , TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate
, CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple , CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple
, gitSupport ? false , YAMLLibYAML
, git ? null , gitSupport ? false, git ? null
, monotoneSupport ? false , monotoneSupport ? false, monotone ? null
, monotone ? null
, extraUtils ? [] , extraUtils ? []
}: }:
@ -13,19 +12,19 @@ assert monotoneSupport -> (monotone != null);
let let
name = "ikiwiki"; name = "ikiwiki";
version = "3.20120115"; version = "3.20120202";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "${name}-${version}"; name = "${name}-${version}";
src = fetchurl { src = fetchurl {
url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
sha256 = "3145372b3d86068f90348a96f9daf3a3b438d747be0e977358d82ee752499c1f"; sha256 = "0bada9a98e0990c6d99e8ca978e42926578aec36d033d6a273e415349a6cbb48";
}; };
buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext
RpcXML XMLSimple PerlMagick YAML] RpcXML XMLSimple PerlMagick YAML YAMLLibYAML ]
++ stdenv.lib.optionals gitSupport [git] ++ stdenv.lib.optionals gitSupport [git]
++ stdenv.lib.optionals monotoneSupport [monotone]; ++ stdenv.lib.optionals monotoneSupport [monotone];

View File

@ -7089,7 +7089,7 @@ let
ikiwiki = callPackage ../applications/misc/ikiwiki { ikiwiki = callPackage ../applications/misc/ikiwiki {
inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber
HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext
RpcXML XMLSimple PerlMagick YAML; RpcXML XMLSimple PerlMagick YAML YAMLLibYAML;
gitSupport = false; gitSupport = false;
monotoneSupport = false; monotoneSupport = false;
extraUtils = []; extraUtils = [];