diff options
| author | Andres Löh <mail@andres-loeh.de> | 2011-03-18 15:03:01 +0000 |
|---|---|---|
| committer | Andres Löh <mail@andres-loeh.de> | 2011-03-18 15:03:01 +0000 |
| commit | 83f99d0c386a250b981ddd6ce6e9f627e22ad15c (patch) | |
| tree | c77cefd3cec05ed3616087464bb4d28f4a9d2519 | |
| parent | b8c18bd6c3d14c837f8b7d88abb8d2ba32cb8ef4 (diff) | |
| download | nixpkgs-83f99d0c386a250b981ddd6ce6e9f627e22ad15c.tar nixpkgs-83f99d0c386a250b981ddd6ce6e9f627e22ad15c.tar.gz nixpkgs-83f99d0c386a250b981ddd6ce6e9f627e22ad15c.tar.bz2 nixpkgs-83f99d0c386a250b981ddd6ce6e9f627e22ad15c.tar.lz nixpkgs-83f99d0c386a250b981ddd6ce6e9f627e22ad15c.tar.xz nixpkgs-83f99d0c386a250b981ddd6ce6e9f627e22ad15c.tar.zst nixpkgs-83f99d0c386a250b981ddd6ce6e9f627e22ad15c.zip | |
lhs2tex version bump.
svn path=/nixpkgs/trunk/; revision=26425
| -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 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 {}; |