* uuagc and uulib are now using ghc-6.8.2

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

2 files changed, 8 insertions, 61 deletions

diff --git a/pkgs/development/libraries/haskell/uulib/builder.sh b/pkgs/development/libraries/haskell/uulib/builder.sh
deleted file mode 100644
index bdb0e81430e1a..0000000000000
--- a/pkgs/development/libraries/haskell/uulib/builder.sh
+++ /dev/null
@@ -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
diff --git a/pkgs/development/libraries/haskell/uulib/default.nix b/pkgs/development/libraries/haskell/uulib/default.nix
index c8bcf25dcc4bc..0e5e517d7c542 100644
--- a/pkgs/development/libraries/haskell/uulib/default.nix
+++ b/pkgs/development/libraries/haskell/uulib/default.nix
@@ -1,12 +1,10 @@
-{stdenv, fetchurl, ghc}:
+{cabal}:
 
-stdenv.mkDerivation {
-  name = "uulib-0.9.2";
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/uulib-0.9.2-src.tar.gz;
-    md5 = "0cc9acc6a268e2bc5c8a954e67406e2d";
+cabal.mkDerivation (self : {
+  pname = "uulib";
+  version = "0.9.5";
+  sha256 = "38415725133af464de582dadc7d7e60b1aeb96344b18b239d176bf2181f98563";
+  meta = {
+    description = "Fast Parser Combinators and Pretty Printing Combinators";
   };
-  builder = ./builder.sh;
-  #buildInputs = [ ghc ];
-  inherit ghc;
-}
+})