Author: guibert
Date: Fri Jul 9 13:16:00 2010
New Revision: 22550
URL: https://svn.nixos.org/websvn/nix/?rev=22550&sc=1
Log:
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.
Modified:
nixpkgs/trunk/pkgs/applications/misc/ikiwiki/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
nixpkgs/trunk/pkgs/top-level/perl-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/misc/ikiwiki/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/misc/ikiwiki/default.nix Fri Jul 9
13:15:56 2010 (r22549)
+++ nixpkgs/trunk/pkgs/applications/misc/ikiwiki/default.nix Fri Jul 9
13:16:00 2010 (r22550)
@@ -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/p...@${perl}/bin/perl@ pm_filter mdwn2man
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jul 9 13:15:56
2010 (r22549)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jul 9 13:16:00
2010 (r22550)
@@ -8197,8 +8197,9 @@
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 = [];
};
Modified: nixpkgs/trunk/pkgs/top-level/perl-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/perl-packages.nix Fri Jul 9 13:15:56
2010 (r22549)
+++ nixpkgs/trunk/pkgs/top-level/perl-packages.nix Fri Jul 9 13:16:00
2010 (r22550)
@@ -2186,6 +2186,7 @@
sha256 =
"a023649603240e7a19fc52a8316a41c854639c0600058ea4d1e436fe1b1b7734";
};
propagatedBuildInputs = [LWP XMLLibXML XMLParser];
+ doCheck = false;
};
ReturnValue = buildPerlPackage {
@@ -2814,11 +2815,12 @@
};
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];
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
