* Sync with the trunk.

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

pkgs/tools/text/enscript/default.nix

@@ -1,9 +1,36 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl, gettext }:
+
+stdenv.mkDerivation rec {
+  name = "enscript-1.6.5";
 
-stdenv.mkDerivation {
-  name = "enscript-1.6.4";
   src = fetchurl {
-    url = http://www.iki.fi/mtr/genscript/enscript-1.6.4.tar.gz;
-    md5 = "b5174b59e4a050fb462af5dbf28ebba3";
+    url = "mirror://gnu/enscript/${name}.tar.gz";
+    sha256 = "1sq4ng7z34qhx6cavnzndgkjpjr9lbvpxgd5a3ajgif3n57fjki2";
+  };
+
+  buildInputs = [ gettext ];
+
+  doCheck = true;
+
+  meta = {
+    description = "GNU Enscript, a converter from ASCII to PostScript, HTML, or RTF";
+
+    longDescription =
+      '' GNU Enscript converts ASCII files to PostScript, HTML, or RTF and
+         stores generated output to a file or sends it directly to the
+         printer.  It includes features for `pretty-printing'
+         (language-sensitive code highlighting) in several programming
+         languages.
+
+         Enscript can be easily extended to handle different output media and
+         it has many options that can be used to customize printouts.
+      '';
+
+    license = "GPLv3+";
+
+    homepage = http://www.gnu.org/software/enscript/;
+
+    maintainer = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.all;
   };
 }

pkgs/tools/text/sgml/opensp/default.nix

@@ -1,16 +1,20 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, xmlto, docbook_xml_dtd_412, libxslt, docbook_xsl}:
 
 stdenv.mkDerivation {
-  # OpenSP-1.5.1 requires gcc 3.3 to build.
-  # The next release is likely to be compatible with newer gccs.
-  # If so the overrideGCC in top-level/all-packages should be removed.
-  name = "OpenSP-1.5.1";
+  name = "opensp-1.5.2";
 
   src = fetchurl {
-    url = "http://prdownloads.sourceforge.net/openjade/OpenSP-1.5.1.tar.gz";
-    sha256 = "0svkgk85m6f848fi3nxnrkzg62422wxr739w5r1yrmn31n24j1iz";
+    url = mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz;
+    sha256 = "1khpasr6l0a8nfz6kcf3s81vgdab8fm2dj291n5r2s53k228kx2p";
   };
 
+  patchPhase = ''
+    sed -i s,/usr/share/sgml/docbook/xml-dtd-4.1.2/,${docbook_xml_dtd_412}/xml/dtd/docbook/, \
+      docsrc/*.xml
+  '';
+
+  buildInputs = [ xmlto docbook_xml_dtd_412 libxslt docbook_xsl ];
+
   meta = {
     description = "A suite of SGML/XML processing tools";
     license = "BSD";