ikiwiki: update to version 3.20120629
This commit is contained in:
parent
aa986a89ae
commit
3d416ed030
@ -1,32 +1,46 @@
|
|||||||
{ stdenv, fetchurl, perl, gettext, makeWrapper, lib, PerlMagick, YAML
|
{ stdenv, fetchurl, perl, gettext, makeWrapper, 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
|
||||||
, YAMLLibYAML
|
, YAMLLibYAML, which, HTMLTree, python, docutils, Filechdir
|
||||||
, gitSupport ? false, git ? null
|
, gitSupport ? false, git ? null
|
||||||
, monotoneSupport ? false, monotone ? null
|
, monotoneSupport ? false, monotone ? null
|
||||||
|
, bazaarSupport ? false, bazaar ? null
|
||||||
|
, cvsSupport ? false, cvs ? null, cvsps ? null
|
||||||
|
, subversionSupport ? false, subversion ? null
|
||||||
|
, mercurialSupport ? false, mercurial ? null
|
||||||
, extraUtils ? []
|
, extraUtils ? []
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert gitSupport -> (git != null);
|
assert gitSupport -> (git != null);
|
||||||
assert monotoneSupport -> (monotone != null);
|
assert monotoneSupport -> (monotone != null);
|
||||||
|
assert bazaarSupport -> (bazaar != null);
|
||||||
|
assert cvsSupport -> (cvs != null && cvsps != null);
|
||||||
|
assert subversionSupport -> (subversion != null);
|
||||||
|
assert mercurialSupport -> (mercurial != null);
|
||||||
|
|
||||||
let
|
let
|
||||||
name = "ikiwiki";
|
name = "ikiwiki";
|
||||||
version = "3.20120516";
|
version = "3.20120629";
|
||||||
|
|
||||||
|
lib = stdenv.lib;
|
||||||
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 = "b75097d4f4db79a16f8b74bc4e7f824a586e0e150ecf18103888bbe553a41eb0";
|
sha256 = "7e39cdb727f261ce20fde5f0b05966680589a3d028c569780addd4b530382f07";
|
||||||
};
|
};
|
||||||
|
|
||||||
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 YAMLLibYAML ]
|
RpcXML XMLSimple PerlMagick YAML YAMLLibYAML which HTMLTree python docutils ]
|
||||||
++ stdenv.lib.optionals gitSupport [git]
|
++ lib.optionals gitSupport [git]
|
||||||
++ stdenv.lib.optionals monotoneSupport [monotone];
|
++ lib.optionals monotoneSupport [monotone]
|
||||||
|
++ lib.optionals bazaarSupport [bazaar]
|
||||||
|
++ lib.optionals cvsSupport [cvs cvsps Filechdir]
|
||||||
|
++ lib.optionals subversionSupport [subversion]
|
||||||
|
++ lib.optionals mercurialSupport [mercurial];
|
||||||
|
|
||||||
patchPhase = ''
|
patchPhase = ''
|
||||||
sed -i s@/usr/bin/perl@${perl}/bin/perl@ pm_filter mdwn2man
|
sed -i s@/usr/bin/perl@${perl}/bin/perl@ pm_filter mdwn2man
|
||||||
@ -42,17 +56,26 @@ stdenv.mkDerivation {
|
|||||||
postInstall = ''
|
postInstall = ''
|
||||||
for a in "$out/bin/"*; do
|
for a in "$out/bin/"*; do
|
||||||
wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perl}/bin:$out/bin \
|
wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perl}/bin:$out/bin \
|
||||||
${lib.optionalString gitSupport
|
${lib.optionalString gitSupport ''--prefix PATH : ${git}/bin \''}
|
||||||
''--prefix PATH : ${git}/bin \''}
|
${lib.optionalString monotoneSupport ''--prefix PATH : ${monotone}/bin \''}
|
||||||
${lib.optionalString monotoneSupport
|
${lib.optionalString bazaarSupport ''--prefix PATH : ${bazaar}/bin \''}
|
||||||
''--prefix PATH : ${monotone}/bin \''}
|
${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin \''}
|
||||||
|
${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin \''}
|
||||||
|
${lib.optionalString subversionSupport ''--prefix PATH : ${subversion}/bin \''}
|
||||||
|
${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin \''}
|
||||||
${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils}
|
${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils}
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
checkTarget = "test";
|
||||||
|
doCheck = true;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Wiki compiler, storing pages and history in a RCS";
|
description = "Wiki compiler, storing pages and history in a RCS";
|
||||||
homepage = http://ikiwiki.info/;
|
homepage = "http://ikiwiki.info/";
|
||||||
license = "GPLv2+";
|
license = "GPLv2+";
|
||||||
|
|
||||||
|
platforms = stdenv.lib.platforms.linux;
|
||||||
|
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -6954,10 +6954,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 YAMLLibYAML;
|
RpcXML XMLSimple PerlMagick YAML YAMLLibYAML HTMLTree Filechdir;
|
||||||
gitSupport = false;
|
|
||||||
monotoneSupport = false;
|
|
||||||
extraUtils = [];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
imagemagick = callPackage ../applications/graphics/ImageMagick {
|
imagemagick = callPackage ../applications/graphics/ImageMagick {
|
||||||
|
Loading…
Reference in New Issue
Block a user