From b89a5bfa33cbe673212dfed871fbe755973174f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Wed, 4 Jun 2008 09:59:13 +0000
Subject: [PATCH] lhs2tex version bump to 1.13, removed the external builder.sh
svn path=/nixpkgs/trunk/; revision=11971
---
pkgs/tools/typesetting/lhs2tex/builder.sh | 14 --------------
pkgs/tools/typesetting/lhs2tex/default.nix | 14 ++++++++++----
2 files changed, 10 insertions(+), 18 deletions(-)
delete mode 100644 pkgs/tools/typesetting/lhs2tex/builder.sh
diff --git a/pkgs/tools/typesetting/lhs2tex/builder.sh b/pkgs/tools/typesetting/lhs2tex/builder.sh
deleted file mode 100644
index a2a07d5ec112..000000000000
--- a/pkgs/tools/typesetting/lhs2tex/builder.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-source $stdenv/setup
-
-postInstall() {
-
- ensureDir "$out/share/doc/$name"
- cp doc/Guide2.pdf $out/share/doc/$name
- ensureDir "$out/nix-support"
- echo "$propagatedUserEnvPackages" > $out/nix-support/propagated-user-env-packages
-
-}
-
-postInstall=postInstall
-
-genericBuild
diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix
index f071f67fe97a..c4fe10026dd8 100644
--- a/pkgs/tools/typesetting/lhs2tex/default.nix
+++ b/pkgs/tools/typesetting/lhs2tex/default.nix
@@ -3,18 +3,24 @@
assert tetex == polytable.tetex;
stdenv.mkDerivation {
- name = "lhs2tex-1.13pre3";
- builder = ./builder.sh;
+ name = "lhs2tex-1.13";
src = fetchurl {
- url = "http://www.cs.uu.nl/~andres/lhs2tex/lhs2tex-1.13pre3.tar.bz2";
- sha256 = "8ddc9bd150c20c33518d747fee95577ec8f587146532cda12b8034adc847826c";
+ url = "http://people.cs.uu.nl/andres/lhs2tex/lhs2tex-1.13.tar.gz";
+ sha256 = "28282cb4afcc71785b092d358ffb33f5ec7585e50b392ae4fb6391d495a0836b";
};
buildInputs = [tetex ghc];
propagatedBuildInputs = [polytable];
propagatedUserEnvPackages = [polytable];
+ postInstall = ''
+ ensureDir "$out/share/doc/$name"
+ cp doc/Guide2.pdf $out/share/doc/$name
+ ensureDir "$out/nix-support"
+ echo "$propagatedUserEnvPackages" > $out/nix-support/propagated-user-env-packages
+ '';
+
inherit tetex;
}