3
0
Fork 0
forked from mirrors/nixpkgs

* small fix for the generic Cabal builder

* added Crypto and pcre-light packages

svn path=/nixpkgs/trunk/; revision=10250
This commit is contained in:
Andres Löh 2008-01-22 19:02:55 +00:00
parent 99f35b7435
commit 021e9b704b
4 changed files with 35 additions and 3 deletions

View file

@ -0,0 +1,11 @@
{cabal}:
cabal.mkDerivation (self : {
pname = "Crypto";
version = "4.1.0";
sha256 = "0984c833c5dfa6f4d56fd6fb284db7b7cef6676dc7999a1436aa856becba2b8f";
meta = {
description = "Several encryption algorithms for Haskell";
};
})

View file

@ -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"

View file

@ -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";
};
})

View file

@ -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;
};