From 021e9b704b8a41c373ea8de15ca8d1dde90874a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Tue, 22 Jan 2008 19:02:55 +0000
Subject: [PATCH] * small fix for the generic Cabal builder * added Crypto and
 pcre-light packages

svn path=/nixpkgs/trunk/; revision=10250
---
 .../development/libraries/haskell/Crypto/default.nix | 11 +++++++++++
 pkgs/development/libraries/haskell/cabal/cabal.nix   |  6 +++---
 .../libraries/haskell/pcre-light/default.nix         | 12 ++++++++++++
 pkgs/top-level/all-packages.nix                      |  9 +++++++++
 4 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/Crypto/default.nix
 create mode 100644 pkgs/development/libraries/haskell/pcre-light/default.nix

diff --git a/pkgs/development/libraries/haskell/Crypto/default.nix b/pkgs/development/libraries/haskell/Crypto/default.nix
new file mode 100644
index 000000000000..9cb465e50b38
--- /dev/null
+++ b/pkgs/development/libraries/haskell/Crypto/default.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "Crypto";
+  version = "4.1.0";
+  sha256 = "0984c833c5dfa6f4d56fd6fb284db7b7cef6676dc7999a1436aa856becba2b8f";
+  meta = {
+    description = "Several encryption algorithms for Haskell";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/cabal/cabal.nix b/pkgs/development/libraries/haskell/cabal/cabal.nix
index 5c53ca8a8ca7..154463e04dc4 100644
--- a/pkgs/development/libraries/haskell/cabal/cabal.nix
+++ b/pkgs/development/libraries/haskell/cabal/cabal.nix
@@ -53,7 +53,7 @@ attrs :
               for i in Setup.hs Setup.lhs; do
                 test -f $i && ghc --make $i
               done
-              ./Setup configure --prefix="$out"
+              ./Setup configure --verbose --prefix="$out"
 
               eval "$postConfigure"
             '';
@@ -78,11 +78,11 @@ attrs :
 
               ./Setup copy
               ./Setup register --gen-script
-              mkdir $out/nix-support
+              mkdir -p $out/nix-support
               sed -i 's/|.*\(ghc-pkg update\)/| \1/' register.sh
               cp register.sh $out/nix-support/register-ghclib.sh
               sed -i 's/\(ghc-pkg update\)/\1 --user/' register.sh
-              mkdir $out/bin
+              mkdir -p $out/bin
               cp register.sh $out/bin/register-${self.name}.sh
 
               eval "$postInstall"
diff --git a/pkgs/development/libraries/haskell/pcre-light/default.nix b/pkgs/development/libraries/haskell/pcre-light/default.nix
new file mode 100644
index 000000000000..1542bb7968ac
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pcre-light/default.nix
@@ -0,0 +1,12 @@
+{cabal, pcre}:
+
+cabal.mkDerivation (self : {
+  pname = "pcre-light";
+  version = "0.3";
+  sha256 = "a8cfec1c265530388efbb187426368e280331d9829fa93d8f49f16db3c3e7794";
+  propagatedBuildInputs = [pcre];
+  meta = {
+    description = "A small, efficient and portable regex library for Perl 5 compatible regular expressions";
+  };
+})  
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84bb9458800b..228a68f4d235 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2648,12 +2648,21 @@ rec {
     ghc = ghc68;
   };
 
+  Crypto = import ../development/libraries/haskell/Crypto {
+    cabal = cabal68;
+  };
+
   gtk2hs = import ../development/libraries/haskell/gtk2hs {
     inherit pkgconfig stdenv fetchurl cairo;
     inherit (gnome) gtk glib GConf libglade libgtkhtml gtkhtml;
     ghc = ghc661;
   };
 
+  pcreLight = import ../development/libraries/haskell/pcre-light {
+    inherit pcre;
+    cabal = cabal68;
+  };
+
   uulib64 = import ../development/libraries/haskell/uulib { # !!! remove?
     inherit stdenv fetchurl ghc;
   };