JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Updated libxml2 / libxslt.

Browse Source 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18053
This commit is contained in:
Eelco Dolstra 2009-10-30 12:42:48 +00:00
parent 6f04e6a5d6
commit f01feca4ef
4 changed files with 11 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/development/libraries/libxml2/2.7.4.nix
View File

@ -1,27 +0,0 @@
{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true}:
assert pythonSupport -> python != null;
stdenv.mkDerivation {
name = "libxml2-2.7.4";
src = fetchurl {
url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.4.tar.gz;
sha256 = "1psk9r69z02cmjpbixs89qj0zprfyi6xc598j51cc0gah0h3wq03";
};
configureFlags = ''
${if pythonSupport then "--with-python=${python}" else ""}
'';
propagatedBuildInputs = [zlib];
setupHook = ./setup-hook.sh;
passthru = {inherit pythonSupport;};
meta = {
homepage = http://xmlsoft.org/;
description = "A XML parsing library for C";
};
}

9
pkgs/development/libraries/libxml2/default.nix
View File

@ -1,13 +1,13 @@
{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true, ...}: {stdenv, fetchurl, zlib, python ? null, pythonSupport ? true}:
assert pythonSupport -> python != null; assert pythonSupport -> python != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libxml2-2.7.3"; name = "libxml2-2.7.6";
src = fetchurl { src = fetchurl {
url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.3.tar.gz; url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.6.tar.gz;
sha256 = "01bgxgvl0gcx97zmlz9f2ivgbiv86kqbs9l93n2cbxywv1pc4jd5"; sha256 = "0n61rqqfiv0m64p01cwx205i6hb0mmzf7r0ya40s4fiqd2nhkkg0";
}; };
configureFlags = '' configureFlags = ''
@ -23,5 +23,6 @@ stdenv.mkDerivation {
meta = { meta = {
homepage = http://xmlsoft.org/; homepage = http://xmlsoft.org/;
description = "A XML parsing library for C"; description = "A XML parsing library for C";
license = "bsd";
}; };
} }

9
pkgs/development/libraries/libxslt/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, libxml2, ...}: {stdenv, fetchurl, libxml2, ...}:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "libxslt-1.1.24"; name = "libxslt-1.1.26";
src = fetchurl { src = fetchurl {
url = ftp://xmlsoft.org/libxml2/libxslt-1.1.24.tar.gz; url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz";
sha256 = "c0c10944841e9a79f29d409c6f8da0d1b1af0403eb3819c82c788dfa6a180b3e"; sha256 = "1c9xdv39jvq1hp16gsbi56hbz032dmqyy0fpi4ls1y3152s55pam";
}; };
buildInputs = [libxml2]; buildInputs = [libxml2];
@ -18,5 +18,6 @@ stdenv.mkDerivation {
meta = { meta = {
homepage = http://xmlsoft.org/XSLT/; homepage = http://xmlsoft.org/XSLT/;
description = "A C library and tools to do XSL transformations"; description = "A C library and tools to do XSL transformations";
license = "bsd";
}; };
} }

9
pkgs/top-level/all-packages.nix
View File

@ -4117,12 +4117,6 @@ let
pythonSupport = false; pythonSupport = false;
}; };
# !!! Merge later.
libxml2New = makeOverridable (import ../development/libraries/libxml2/2.7.4.nix) {
inherit fetchurl stdenv zlib python;
pythonSupport = false;
};
libxml2Python = libxml2.override { libxml2Python = libxml2.override {
pythonSupport = true; pythonSupport = true;
}; };
@ -8605,12 +8599,11 @@ let
nixCustomFun = src: preConfigure: enableScripts: configureFlags: nixCustomFun = src: preConfigure: enableScripts: configureFlags:
import ../tools/package-management/nix/custom.nix { import ../tools/package-management/nix/custom.nix {
inherit fetchurl stdenv perl curl bzip2 openssl src preConfigure automake inherit fetchurl stdenv perl curl bzip2 openssl src preConfigure automake
autoconf libtool configureFlags enableScripts lib bison; autoconf libtool configureFlags enableScripts lib bison libxml2;
flex = flex2533; flex = flex2533;
aterm = aterm242fixes; aterm = aterm242fixes;
db4 = db45; db4 = db45;
inherit docbook5_xsl libxslt docbook5 docbook_xml_dtd_43 w3m; inherit docbook5_xsl libxslt docbook5 docbook_xml_dtd_43 w3m;
libxml2 = libxml2New;
}; };
disnix = import ../tools/package-management/disnix { disnix = import ../tools/package-management/disnix {