From f01feca4ef920386586709fea1cd02d1e51c063f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 30 Oct 2009 12:42:48 +0000
Subject: [PATCH] * Updated libxml2 / libxslt.

svn path=/nixpkgs/branches/xorg-7.5/; revision=18053
---
 pkgs/development/libraries/libxml2/2.7.4.nix  | 27 -------------------
 .../development/libraries/libxml2/default.nix |  9 ++++---
 .../development/libraries/libxslt/default.nix |  9 ++++---
 pkgs/top-level/all-packages.nix               |  9 +------
 4 files changed, 11 insertions(+), 43 deletions(-)
 delete mode 100644 pkgs/development/libraries/libxml2/2.7.4.nix

diff --git a/pkgs/development/libraries/libxml2/2.7.4.nix b/pkgs/development/libraries/libxml2/2.7.4.nix
deleted file mode 100644
index d126aa82581..00000000000
--- a/pkgs/development/libraries/libxml2/2.7.4.nix
+++ /dev/null
@@ -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";
-  };
-}
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index d1b151a3fee..f3c9c6ca652 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,13 +1,13 @@
-{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true, ...}:
+{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true}:
 
 assert pythonSupport -> python != null;
 
 stdenv.mkDerivation {
-  name = "libxml2-2.7.3";
+  name = "libxml2-2.7.6";
 
   src = fetchurl {
-    url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.3.tar.gz;
-    sha256 = "01bgxgvl0gcx97zmlz9f2ivgbiv86kqbs9l93n2cbxywv1pc4jd5";
+    url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.6.tar.gz;
+    sha256 = "0n61rqqfiv0m64p01cwx205i6hb0mmzf7r0ya40s4fiqd2nhkkg0";
   };
 
   configureFlags = ''                                                  
@@ -23,5 +23,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://xmlsoft.org/;
     description = "A XML parsing library for C";
+    license = "bsd";
   };
 }
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index 5eccf40df01..84732891cd1 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, libxml2, ...}:
 
-stdenv.mkDerivation {
-  name = "libxslt-1.1.24";
+stdenv.mkDerivation rec {
+  name = "libxslt-1.1.26";
   
   src = fetchurl {
-    url = ftp://xmlsoft.org/libxml2/libxslt-1.1.24.tar.gz;
-    sha256 = "c0c10944841e9a79f29d409c6f8da0d1b1af0403eb3819c82c788dfa6a180b3e";
+    url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz";
+    sha256 = "1c9xdv39jvq1hp16gsbi56hbz032dmqyy0fpi4ls1y3152s55pam";
   };
   
   buildInputs = [libxml2];
@@ -18,5 +18,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://xmlsoft.org/XSLT/;
     description = "A C library and tools to do XSL transformations";
+    license = "bsd";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94f834b37f6..7a5b7d37d6a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4117,12 +4117,6 @@ let
     pythonSupport = false;
   };
 
-  # !!! Merge later.
-  libxml2New = makeOverridable (import ../development/libraries/libxml2/2.7.4.nix) {
-    inherit fetchurl stdenv zlib python;
-    pythonSupport = false;
-  };
-
   libxml2Python = libxml2.override {
     pythonSupport = true;
   };
@@ -8605,12 +8599,11 @@ let
   nixCustomFun = src: preConfigure: enableScripts: configureFlags:
     import ../tools/package-management/nix/custom.nix {
       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;
       aterm = aterm242fixes;
       db4 = db45;
       inherit docbook5_xsl libxslt docbook5 docbook_xml_dtd_43 w3m;
-      libxml2 = libxml2New;
     };
 
   disnix = import ../tools/package-management/disnix {