ikiwiki: updated to version 3.20110707
svn path=/nixpkgs/trunk/; revision=27669
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
{ stdenv, fetchurl, perl, gettext, makeWrapper, lib, PerlMagick,
|
{ 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
|
, gitSupport ? false
|
||||||
, git ? null
|
, git ? null
|
||||||
, monotoneSupport ? false
|
, monotoneSupport ? false
|
||||||
@@ -13,19 +13,19 @@ assert monotoneSupport -> (monotone != null);
|
|||||||
|
|
||||||
let
|
let
|
||||||
name = "ikiwiki";
|
name = "ikiwiki";
|
||||||
version = "3.20100704";
|
version = "3.20110707";
|
||||||
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 = "1kakh2bf9k0fhvqhn9p9g4wwck64if2y9z23zmlcrm02bw1m6lr9";
|
sha256 = "b51fa7452a900212ab1c8c879227b83a688c10f770552aee61944695f8c6f1bf";
|
||||||
};
|
};
|
||||||
|
|
||||||
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]
|
RpcXML XMLSimple PerlMagick YAML]
|
||||||
++ stdenv.lib.optionals gitSupport [git]
|
++ stdenv.lib.optionals gitSupport [git]
|
||||||
++ stdenv.lib.optionals monotoneSupport [monotone];
|
++ stdenv.lib.optionals monotoneSupport [monotone];
|
||||||
|
|
||||||
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
|
|||||||
configurePhase = "perl Makefile.PL PREFIX=$out";
|
configurePhase = "perl Makefile.PL PREFIX=$out";
|
||||||
|
|
||||||
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 (git != null)
|
${lib.optionalString (git != null)
|
||||||
''--prefix PATH : ${git}/bin \''}
|
''--prefix PATH : ${git}/bin \''}
|
||||||
|
|||||||
Reference in New Issue
Block a user