Updated from trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23275

pkgs/tools/text/ebook-tools/default.nix

@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, cmake, libxml2, libzip }:
+
+let
+  pn = "ebook-tools";
+in
+
+stdenv.mkDerivation rec {
+  name = "${pn}-0.1.1";
+
+  src = fetchurl {
+    url = "mirror://sf/${pn}/${name}.tar.gz";
+    sha256 = "07flqm0c252jklggjmg998qzyvwlw67c3db2jbg734figngrjh79";
+  };
+
+  buildInputs = [ cmake libxml2 libzip ];
+
+  meta = {
+    homepage = "http://${pn}.sourceforge.net";
+    description = "Tools and libs for dealing with various ebook file formats";
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}

pkgs/tools/text/xml/xmlstarlet/default.nix

@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, libxml2, libxslt }:
+
+stdenv.mkDerivation rec {
+  name = "xmlstarlet-1.0.2";
+  
+  src = fetchurl {
+    url = "mirror://sourceforge/xmlstar/${name}.tar.gz";
+    sha256 = "07a5c3fhqpvyy07pggl3ky7ahvlcpsmppy71x4h4albvanfbpjwj";
+  };
+
+  buildInputs = [ pkgconfig libxml2 libxslt ];
+
+  preConfigure =
+    ''
+      export LIBXSLT_PREFIX=${libxslt}
+      export LIBXML_PREFIX=${libxml2}
+      export LIBXSLT_LIBS=$(pkg-config --libs libxslt libexslt)
+      export LIBXML_LIBS=$(pkg-config --libs libxml-2.0)
+    '';
+
+  postInstall =
+    ''
+      ln -s xml $out/bin/xmlstarlet
+    '';
+
+  meta = {
+    description = "A command line tool for manipulating and querying XML data";
+    homepage = http://xmlstar.sourceforge.net/;
+    license = "bsd";
+  };
+}

pkgs/tools/text/xml/xpf/default.nix

@@ -4,9 +4,16 @@ assert libxml2.pythonSupport == true;
 
 stdenv.mkDerivation {
   name = "xpf-0.2";
+  
   src = fetchurl {
     url = http://nixos.org/tarballs/xpf-0.2.tar.gz;
     md5 = "d92658828139e1495e052d0cfe25d312";
   };
+  
   buildInputs = [python libxml2];
+
+  meta = {
+    description = "XML Pipes and Filters - command line tools for manipulating and querying XML data";
+    homepage = http://www.cs.uu.nl/wiki/bin/view/Martin/XmlPipesAndFilters;
+  };
 }