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: [PATCH] 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 +++++++++++++++-------
pkgs/top-level/all-packages.nix | 5 +++--
pkgs/top-level/perl-packages.nix | 8 +++++---
3 files changed, 23 insertions(+), 12 deletions(-)
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
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6de9f53b011d..01fd2c4b64f2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8197,8 +8197,9 @@ let
inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber
HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext
RpcXML XMLSimple PerlMagick;
- git = if getPkgConfig "ikiwiki" "git" true then git else null;
- monotone = if getPkgConfig "ikiwiki" "monotone" false then monotone else null;
+ gitSupport = getPkgConfig "ikiwiki" "git" false;
+ monotoneSupport = getPkgConfig "ikiwiki" "monotone" false;
+ inherit git monotone;
extraUtils = [];
};
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index dadc86907963..e14c5244d564 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2186,6 +2186,7 @@ rec {
sha256 = "a023649603240e7a19fc52a8316a41c854639c0600058ea4d1e436fe1b1b7734";
};
propagatedBuildInputs = [LWP XMLLibXML XMLParser];
+ doCheck = false;
};
ReturnValue = buildPerlPackage {
@@ -2814,11 +2815,12 @@ rec {
};
XMLLibXML = buildPerlPackage {
- name = "XML-LibXML-1.66";
+ name = "XML-LibXML-1.70";
src = fetchurl {
- url = mirror://cpan/authors/id/P/PA/PAJAS/XML-LibXML-1.66.tar.gz;
- sha256 = "1a0bdiv3px6igxnbbjq10064iahm8f5i310p4y05w6zn5d51awyl";
+ url = mirror://cpan/authors/id/P/PA/PAJAS/XML-LibXML-1.70.tar.gz;
+ sha256 = "181viglnw93kz9w3bvs8dqvx4xnqvf448vnwam8dia9bfw3czrjk";
};
+ SKIP_SAX_INSTALL=1;
buildInputs = [pkgs.libxml2];
propagatedBuildInputs = [XMLLibXMLCommon XMLSAX];
};