From b6a84f5c50a37e29cde701292744fa57c8f822bd Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Fri, 9 Jul 2010 13:16:00 +0000
Subject: update ikiwiki and fix its dependencies.

- when installing perl.XML_LibXML:
  Cannot write to /nix/store/032pczp65kvry14ln8g8s244qlysrfi1-perl-XML-SAX-0.96/lib/perl5/site_perl/5.10.1/XML/SAX/ParserDetails.ini: Permission denied at /nix/store/032pczp65kvry14ln8g8s244qlysrfi1-perl-XML-SAX-0.96/lib/perl5/site_perl/5.10.1/XML/SAX.pm line 191.

SKIP_SAX_INSTALL=1 fixes this.

- RPC-XML hangs on during the check phase.
A temporary work around is to set doCheck as false.

svn path=/nixpkgs/trunk/; revision=22550
---
 pkgs/applications/misc/ikiwiki/default.nix | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'pkgs/applications/misc/ikiwiki/default.nix')

diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index 7df11653b044..93748e21abad 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -1,26 +1,34 @@
 { stdenv, fetchurl, perl, gettext, makeWrapper, lib, PerlMagick,
   TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate,
   CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple
-  , git ? null
-  , monotone ? null
-  , extraUtils ? []
-  }:
+, gitSupport ? false
+, git ? null
+, monotoneSupport ? false
+, monotone ? null
+, extraUtils ? []
+}:
+
+assert gitSupport -> (git != null);
+assert monotoneSupport -> (monotone != null);
 
 let
   name = "ikiwiki";
-  version = "3.20100515";
+  version = "3.20100704";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
-    sha256 = "143f245196d98ab037a097402420208da14506d6a65793d042daef5dd765ddd7";
+    sha256 = "1kakh2bf9k0fhvqhn9p9g4wwck64if2y9z23zmlcrm02bw1m6lr9";
   };
 
   buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
     TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext
-    RpcXML XMLSimple PerlMagick git monotone];
+    RpcXML XMLSimple PerlMagick]
+    ++ stdenv.lib.optionals gitSupport [git]
+    ++ stdenv.lib.optionals monotoneSupport [monotone];
+
 
   patchPhase = ''
     sed -i s@/usr/bin/perl@${perl}/bin/perl@ pm_filter mdwn2man
-- 
cgit 1.4.1