Merge branch 'staging' into closure-size

2 files changed, 3 insertions, 32 deletions

diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix
index 3343579bbab..600522d45a2 100644
--- a/pkgs/tools/typesetting/hevea/default.nix
+++ b/pkgs/tools/typesetting/hevea/default.nix
@@ -1,18 +1,16 @@
 { stdenv, fetchurl, ocaml }:
 
 stdenv.mkDerivation rec {
-  name = "hevea-2.26";
+  name = "hevea-2.28";
 
   src = fetchurl {
     url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz";
-    sha256 = "173v6z2li12pah6315dfpwhqrdljkhsff82gj7sql812zwjkvd2f";
+    sha256 = "14fns13wlnpiv9i05841kvi3cq4b9v2sw5x3ff6ziws28q701qnd";
   };
 
   buildInputs = [ ocaml ];
 
-  configurePhase = ''
-    export makeFlags="PREFIX=$out";
-  '';
+  makeFlags = "PREFIX=$(out)";
 
   meta = with stdenv.lib; {
     description = "A quite complete and fast LATEX to HTML translator";
diff --git a/pkgs/tools/typesetting/tex/latex2html/default.nix b/pkgs/tools/typesetting/tex/latex2html/default.nix
deleted file mode 100644
index 45fec9f76da..00000000000
--- a/pkgs/tools/typesetting/tex/latex2html/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, tex, perl, netpbm, ghostscript }:
-
-stdenv.mkDerivation rec {
-  name = "latex2html-2008";
-
-  src = fetchurl {
-    url = "http://www.latex2html.org/~latex2ht/current/${name}.tar.gz";
-    sha256 = "1b9pld6wz01p1pf5qwxjipdkhq34hmmw9mfkjp150hlqlcanhiar";
-  };
-
-  buildInputs = [ tex perl ghostscript netpbm ];
-
-  preConfigure = ''
-    patchShebangs .
-    sed -i -e "s|#! /bin/cat|#! $(type -p cat)|" configure
-    configureFlags="--with-texpath=$out/share/texmf-nix";
-  '';
-
-  meta = {
-    homepage = "http://www.latex2html.org/";
-    description = "Converter written in Perl that converts LaTeX documents to HTML";
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    broken = true;
-  };
-
-}