* GHC now works again.

svn path=/nixpkgs/trunk/; revision=925
This commit is contained in:
Eelco Dolstra 2004-04-07 14:16:57 +00:00
parent 9c55897afc
commit 02ec562596
5 changed files with 11 additions and 34 deletions

View file

@ -4,13 +4,11 @@ assert perl != null;
assert stdenv.system == "i686-linux";
derivation {
name = "ghc-6.2";
system = stdenv.system;
builder = ./boot.sh;
stdenv.mkDerivation {
name = "ghc-6.2.1";
src = fetchurl {
url = http://www.haskell.org/ghc/dist/6.2/ghc-6.2-i386-unknown-linux.tar.bz2;
md5 = "5b2f19ca00fd7494002047d7fb4dce3e";
url = http://www.haskell.org/ghc/dist/6.2.1/ghc-6.2.1-i386-unknown-linux.tar.bz2;
md5 = "48d9d6b9f7bf1f15d69e8bd732ee254c";
};
inherit stdenv perl;
buildInputs = [perl];
}

View file

@ -1,11 +0,0 @@
#! /bin/sh
buildinputs="$perl"
. $stdenv/setup || exit 1
tar xvfj $src || exit 1
cd ghc-* || exit 1
./configure --prefix=$out || exit 1
make || exit 1
make install || exit 1
strip -S $out/lib/*/*.a || exit 1

View file

@ -1,9 +0,0 @@
buildinputs="$perl $ghc $m4"
. $stdenv/setup || exit 1
tar xvfj $src || exit 1
cd ghc-* || exit 1
./configure --prefix=$out || exit 1
make || exit 1
make install || exit 1
strip -S $out/lib/*/*.a || exit 1

View file

@ -3,11 +3,10 @@
assert perl != null && ghc != null && m4 != null;
stdenv.mkDerivation {
name = "ghc-6.2";
builder = ./builder.sh;
name = "ghc-6.2.1";
src = fetchurl {
url = http://www.haskell.org/ghc/dist/6.2/ghc-6.2-src.tar.bz2;
md5 = "cc495e263f4384e1d6b38e851bf6eca0";
url = http://www.haskell.org/ghc/dist/6.2.1/ghc-6.2.1-src.tar.bz2;
md5 = "fa9f90fd6b8852679c5fc16509e94d7a";
};
inherit perl ghc m4;
buildInputs = [perl ghc m4];
}

View file

@ -30,8 +30,8 @@ let {
pkgs.flexnew
pkgs.gcc
pkgs.strategoxt
# pkgs.ghc
# pkgs.helium
pkgs.ghc
pkgs.helium
pkgs.perl
pkgs.python
pkgs.libxml2