* uuagc and uulib are now using ghc-6.8.2

svn path=/nixpkgs/trunk/; revision=10255

pkgs/development/libraries/haskell/uulib-ghc-6.6/builder.sh

@@ -1,21 +0,0 @@
-source $stdenv/setup
-
-
-tar xzf "$src" &&
-cd uulib-* &&
-
-
-autoconf &&
-./configure --prefix=$out &&
-
-
-ghc --make Setup.hs -o setup -package Cabal &&
-./setup configure --prefix=$out --with-hc-pkg=ghc-pkg &&
-
-
-./setup build &&
-./setup install &&
-./setup register --gen-script &&
-
-mkdir -p $out/nix-support/ &&
-cp register.sh $out/nix-support/register-ghclib.sh

pkgs/development/libraries/haskell/uulib-ghc-6.6/default.nix

@@ -1,11 +0,0 @@
-{stdenv, fetchurl, autoconf, ghc}:
-
-stdenv.mkDerivation
-{
-  name = "uulib-0.9.2-ghc-6.6";
-  src = fetchurl { url = http://www.cs.uu.nl/~ariem/uulib-2006-10-30-src.tar.gz;
-                   md5 = "d26059447d45fa91f54eca38680be7b7";
-                 };
-  builder = ./builder.sh;
-  buildInputs = [ autoconf ghc ];
-}

pkgs/development/libraries/haskell/uulib/builder.sh

@@ -1,51 +0,0 @@
-source $stdenv/setup
-
-
-export HOME=$(pwd)/fake-home
-
-
-#add ghc to search path
-test -n "$ghc" && PATH=$PATH:$ghc/bin
-
-#unpack
-tar xzf "$src" &&
-cd uulib-* &&
-
-#configure
-ghc --make Setup.hs -o setup -package Cabal &&
-./setup configure --prefix=$out &&
-
-#make
-./setup build &&
-
-#install
-./setup copy &&
-
-# Create package database. If we can find the ghc version we might install the
-# package, like ghc does, in $out/lib/ghc-version/package.conf.
-
-support=$out/nix-support &&
-packages_db=$out/nix-support/package.conf &&
-
-mkdir $support &&
-cp $ghc/lib/ghc-*/package.conf $packages_db &&
-chmod +w $packages_db &&
-#echo '[]' > $packages_db &&
-
-# We save a modified version of a register script. This gives a dependency on
-# ghc, but this should not be a problem as long as $out is a static library.
-
-./setup register --gen-script &&
-sed '/ghc-pkg/ s|update -|-f "$1" update -|' register.sh > register-pkg.sh &&
-sed '/ghc-pkg/ s|--auto-ghci-libs||' register-pkg.sh > $support/register.sh &&
-
-# The package and its direct cabal dependencies are registered. This may result
-# in duplicate registrations attempts but hopefully that will not result in
-# errors.
-
-# uulib has no dependencies on other ghc libraries
-for dep in ; do
-	sh $dep/nix-support/register.sh $packages_db || exit 1
-done &&
-sh register-pkg.sh $packages_db &&
-rm -f $package_db.old

pkgs/development/libraries/haskell/uulib/default.nix

@@ -1,12 +1,10 @@
-{stdenv, fetchurl, ghc}:
+{cabal}:
 
-stdenv.mkDerivation {
+cabal.mkDerivation (self : {
-  name = "uulib-0.9.2";
+  pname = "uulib";
-  src = fetchurl {
+  version = "0.9.5";
-    url = http://nix.cs.uu.nl/dist/tarballs/uulib-0.9.2-src.tar.gz;
+  sha256 = "38415725133af464de582dadc7d7e60b1aeb96344b18b239d176bf2181f98563";
-    md5 = "0cc9acc6a268e2bc5c8a954e67406e2d";
+  meta = {
+    description = "Fast Parser Combinators and Pretty Printing Combinators";
   };
-  builder = ./builder.sh;
+})
-  #buildInputs = [ ghc ];
-  inherit ghc;
-}

pkgs/development/tools/haskell/uuagc/default.nix

@@ -1,14 +1,12 @@
-{stdenv, fetchurl, ghc, uulib}:
+{cabal, uulib}:
 
-stdenv.mkDerivation
+cabal.mkDerivation (self : {
-{
+  pname = "uuagc";
-  name = "uuagc-0.9.2";
+  version = "0.9.5";
-
+  name = self.fname;
-  src = fetchurl { url = http://www.cs.uu.nl/~ariem/uuagc-0.9.2-src.tar.gz;
+  sha256 = "c5be435efa609f72c09e175dd5cf7835a060bd7eaf6634ec4cde72ea84b99f25";
-                   md5 = "cbac92287c9c0a858ccbfa37615d9f5f";
+  extraBuildInputs = [uulib];
+  meta = {
+    description = "Attribute Grammar System of Universiteit Utrecht";
   };
-
+})
-  buildInputs = [ghc uulib];
-
-  meta = { description = "The UUAG Compiler"; };
-}

pkgs/top-level/all-packages.nix

@@ -1618,9 +1618,7 @@ rec {
   };
 
   uuagc = import ../development/tools/haskell/uuagc {
-    inherit fetchurl stdenv;
+    inherit cabal uulib;
-    ghc = ghc66;
-    uulib = uulib66;
   };
 
   gdb = import ../development/tools/misc/gdb {
@@ -2666,13 +2664,8 @@ rec {
     inherit cabal pcre;
   };
 
-  # uulib64 = import ../development/libraries/haskell/uulib { # !!! remove?
+  uulib = import ../development/libraries/haskell/uulib {
-  #   inherit stdenv fetchurl ghc;
+    inherit cabal;
-  # };
-
-  uulib66 = import ../development/libraries/haskell/uulib-ghc-6.6 { # !!! ugh
-    inherit stdenv fetchurl autoconf;
-    ghc = ghc66;
   };
 
   wxHaskell = import ../development/libraries/haskell/wxHaskell {