diff options
-rw-r--r-- | pkgs/tools/typesetting/lhs2tex/default.nix | 11 | ||||
-rw-r--r-- | 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 012c98f68871..68f2347bb656 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 55d2e42e2067..af6036ed45ff 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 {}; |