From 83f99d0c386a250b981ddd6ce6e9f627e22ad15c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Fri, 18 Mar 2011 15:03:01 +0000
Subject: [PATCH] lhs2tex version bump.

svn path=/nixpkgs/trunk/; revision=26425
---
 pkgs/tools/typesetting/lhs2tex/default.nix | 11 ++++-------
 pkgs/top-level/haskell-packages.nix        |  4 +---
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix
index 012c98f6887..68f2347bb65 100644
--- a/pkgs/tools/typesetting/lhs2tex/default.nix
+++ b/pkgs/tools/typesetting/lhs2tex/default.nix
@@ -1,14 +1,11 @@
-{cabal, tetex, polytable, regexCompat}:
-
-#assert tetex == polytable.tetex;
+{cabal, texLive, regexCompat}:
 
 cabal.mkDerivation (self : {
   pname = "lhs2tex";
-  version = "1.16";
+  version = "1.17";
   name = self.fname;
-  sha256 = "aa43ec92e8d7c94213365a7211d605314476977155e36420caa3cfb394f7c76f";
-  extraBuildInputs = [tetex regexCompat];
-  propagatedBuildInputs = [polytable]; # automatically in user-env now with cabal
+  sha256 = "1x49316m5xm4f6hw5q7kia9rpfpygxhk5gnifd54ai0zjmdlkxrc";
+  extraBuildInputs = [regexCompat texLive];
 
   postInstall = ''
     ensureDir "$out/share/doc/$name"
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 55d2e42e206..af6036ed45f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1018,9 +1018,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {};
   cabalInstall = self.cabalInstall_0_6_2;
 
-  lhs2tex = callPackage ../tools/typesetting/lhs2tex {
-    inherit (pkgs) tetex polytable;
-  };
+  lhs2tex = callPackage ../tools/typesetting/lhs2tex {};
 
   myhasktags = callPackage ../tools/misc/myhasktags {};