Merged with trunk again

svn path=/nixpkgs/branches/stdenv-updates/; revision=10267

7 files changed, 55 insertions, 42 deletions

diff --git a/pkgs/development/tools/documentation/haddock/default.nix b/pkgs/development/tools/documentation/haddock/default.nix
new file mode 100644
index 0000000000000..86d07b240a546
--- /dev/null
+++ b/pkgs/development/tools/documentation/haddock/default.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "haddock";
+  version = "2.0.0.0";
+  name = self.fname;
+  sha256 = "a2ea5bdc127bc8b189a8d869f582ec774fea0933e7f5ca89549a6c142b9993df";
+  meta = {
+    description = "a tool for automatically generating documentation from annotated Haskell source code";
+  };
+})
diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix
index 519244ae7b849..b45db5f2ea6cb 100644
--- a/pkgs/development/tools/haskell/uuagc/default.nix
+++ b/pkgs/development/tools/haskell/uuagc/default.nix
@@ -1,14 +1,12 @@
-{stdenv, fetchurl, ghc, uulib}:
-
-stdenv.mkDerivation
-{
-  name = "uuagc-0.9.2";
-
-  src = fetchurl { url = http://www.cs.uu.nl/~ariem/uuagc-0.9.2-src.tar.gz;
-                   md5 = "cbac92287c9c0a858ccbfa37615d9f5f";
-                 };
-
-  buildInputs = [ghc uulib];
-
-  meta = { description = "The UUAG Compiler"; };
-}
+{cabal, uulib}:
+
+cabal.mkDerivation (self : {
+  pname = "uuagc";
+  version = "0.9.5";
+  name = self.fname;
+  sha256 = "c5be435efa609f72c09e175dd5cf7835a060bd7eaf6634ec4cde72ea84b99f25";
+  extraBuildInputs = [uulib];
+  meta = {
+    description = "Attribute Grammar System of Universiteit Utrecht";
+  };
+})
diff --git a/pkgs/development/tools/misc/indent/2.2.9.nix b/pkgs/development/tools/misc/indent/2.2.9.nix
index d7e91abcf83bf..5e92802beed1d 100644
--- a/pkgs/development/tools/misc/indent/2.2.9.nix
+++ b/pkgs/development/tools/misc/indent/2.2.9.nix
@@ -1,5 +1,5 @@
 args : with args;
-	with builderDefs {
+	let localDefs = builderDefs {
 		src = /* put a fetchurl here */
 		fetchurl {
 			url = ftp://ftp.gnu.org/gnu/indent/indent-2.2.9.tar.gz;
@@ -9,6 +9,7 @@ args : with args;
 		buildInputs = [];
 		configureFlags = [];
 	} null; /* null is a terminator for sumArgs */
+	in with localDefs;
 let 
 	preBuild = FullDepEntry ("
 		sed -e '/extern FILE [*]output/i#ifndef OUTPUT_DEFINED_ELSEWHERE' -i src/indent.h
@@ -19,7 +20,7 @@ in
 stdenv.mkDerivation rec {
 	name = "indent";
 	builder = writeScript (name + "-builder")
-		(textClosure [doConfigure preBuild doMakeInstall doForceShare doPropagate]);
+		(textClosure localDefs [doConfigure preBuild doMakeInstall doForceShare doPropagate]);
 	meta = {
 		description = "
 	GNU Indent - a source text formatter.
diff --git a/pkgs/development/tools/misc/intltool/0.36.2.nix b/pkgs/development/tools/misc/intltool/0.36.2.nix
index d8315a9ba62e4..884c76a800c79 100644
--- a/pkgs/development/tools/misc/intltool/0.36.2.nix
+++ b/pkgs/development/tools/misc/intltool/0.36.2.nix
@@ -1,5 +1,5 @@
 args : with args;
-	with builderDefs {
+	let localDefs = builderDefs {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://ftp.gnome.org/pub/gnome/sources/intltool/0.36/intltool-0.36.2.tar.bz2;
@@ -9,10 +9,11 @@ args : with args;
 		propagatedBuildInputs = [perl perlXMLParser];
 		configureFlags = [];
 	} null; /* null is a terminator for sumArgs */
+	in with localDefs;
 stdenv.mkDerivation rec {
 	name = "intltool-0.36.2";
 	builder = writeScript (name + "-builder")
-		(textClosure [doConfigure doMakeInstall doPropagate doForceShare]);
+		(textClosure localDefs [doConfigure doMakeInstall doPropagate doForceShare]);
 	inherit propagatedBuildInputs;
 	meta = {
 		description = "
diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix
index 23b44bf3b5b7f..cd77984ded6cf 100644
--- a/pkgs/development/tools/misc/ltrace/default.nix
+++ b/pkgs/development/tools/misc/ltrace/default.nix
@@ -1,5 +1,5 @@
 args : with args;
-	with builderDefs {
+	let localDefs = builderDefs {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.5.orig.tar.gz;
@@ -12,6 +12,7 @@ args : with args;
 			cd ltrace-*;
 		";
 	} null; /* null is a terminator for sumArgs */
+	in with localDefs;
 let
 	preConfigure = FullDepEntry ("
 		sed -e 's@-o root -g root@@' -i Makefile.in;
@@ -20,7 +21,7 @@ in
 stdenv.mkDerivation rec {
 	name = "ltrace-0.5";
 	builder = writeScript (name + "-builder")
-		(textClosure [preConfigure doConfigure doMakeInstall doForceShare]);
+		(textClosure localDefs [preConfigure doConfigure doMakeInstall doForceShare]);
 	meta = {
 		description = "
 	Library call tracer.
diff --git a/pkgs/development/tools/parsing/alex/default.nix b/pkgs/development/tools/parsing/alex/default.nix
index 00d414d56bde5..273a25753e82f 100644
--- a/pkgs/development/tools/parsing/alex/default.nix
+++ b/pkgs/development/tools/parsing/alex/default.nix
@@ -1,23 +1,12 @@
-{stdenv, fetchurl, ghc, perl}:
-
-stdenv.mkDerivation {
-  name = "alex-2.1.0";
-  src = fetchurl {
-    url = http://www.haskell.org/alex/dist/2.1.0/alex-2.1.0.tar.gz;
-    sha1 = "37599b7be5249d639b3a5a3fdc61907dc4dad660";
+{cabal, perl}:
+
+cabal.mkDerivation (self : {
+  pname = "alex";
+  version = "2.2";
+  name = self.fname;
+  sha256 = "e958d4fc6cfdb1d351dc39a45ea882f23b1b1773a736d43814a52d4939a41ffe";
+  extraBuildInputs = [perl];
+  meta = {
+    description = "A lexical analyser generator for Haskell";
   };
-  buildInputs = [ghc perl];
-
-  configurePhase = "
-    ghc --make Setup.lhs
-    ./Setup configure --prefix=\"\${out}\"
-  ";
-
-  buildPhase = "
-    ./Setup build
-  ";
-
-  installPhase = "
-    ./Setup install
-  ";
-}
+})
diff --git a/pkgs/development/tools/parsing/happy/happy-1.17.nix b/pkgs/development/tools/parsing/happy/happy-1.17.nix
new file mode 100644
index 0000000000000..b7fa22ccb800e
--- /dev/null
+++ b/pkgs/development/tools/parsing/happy/happy-1.17.nix
@@ -0,0 +1,12 @@
+{cabal, perl}:
+
+cabal.mkDerivation (self : {
+
+  # requires cabal-1.2 (and therefore, in Nix, currently ghc-6.8)
+
+  pname = "happy";
+  version = "1.17";
+  name = self.fname;
+  sha256 = "dca4e47d17e5d538335496236b3d2c3cbff644cf7380c987a4714e7784c70a2b";
+  extraBuildInputs = [perl];
+})