From 2e937c437a3e8098a821db863ebe6cf4bcc87de0 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Fri, 16 Aug 2013 23:44:33 +0200
Subject: unmaintain several packages

---
 pkgs/tools/typesetting/xmlto/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/tools/typesetting')

diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix
index 423772385958..c72192317b77 100644
--- a/pkgs/tools/typesetting/xmlto/default.nix
+++ b/pkgs/tools/typesetting/xmlto/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     license = "GPLv2+";
     homepage = https://fedorahosted.org/xmlto/;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
-- 
cgit 1.4.1


From 588c8e062ce609f5c16b7b31f50d1808a4f0f9c8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 Aug 2013 11:39:11 +0200
Subject: haskell-lhs2tex: re-generate expression with recent version of
 cabal2nix

---
 pkgs/tools/typesetting/lhs2tex/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'pkgs/tools/typesetting')

diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix
index 2b96ae526c40..ec1c9021522f 100644
--- a/pkgs/tools/typesetting/lhs2tex/default.nix
+++ b/pkgs/tools/typesetting/lhs2tex/default.nix
@@ -1,18 +1,18 @@
-{cabal, texLive, regexCompat}:
+{ cabal, filepath, mtl, regexCompat, texLive }:
 
 cabal.mkDerivation (self: {
   pname = "lhs2tex";
   version = "1.18.1";
-  name = self.fname;
   sha256 = "0j4n7vkabsggn94gbwixy1vmckdck2nggdiqvk6n9nx164if5jnw";
-  extraBuildInputs = [regexCompat texLive];
-
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [ filepath mtl regexCompat ];
+  extraLibraries = [ texLive ];
   postInstall = ''
     mkdir -p "$out/share/doc/$name"
     cp doc/Guide2.pdf $out/share/doc/$name
     mkdir -p "$out/nix-support"
   '';
-
   meta = {
     homepage = "http://www.andres-loeh.de/lhs2tex/";
     description = "Preprocessor for typesetting Haskell sources with LaTeX";
-- 
cgit 1.4.1