diff options
author | Arie Middelkoop <amiddelk@gmail.com> | 2006-12-15 13:32:55 +0000 |
---|---|---|
committer | Arie Middelkoop <amiddelk@gmail.com> | 2006-12-15 13:32:55 +0000 |
commit | afde8e6270b8dca793d1f541224013a8e3bcd687 (patch) | |
tree | 17bbf8f172c71740c03f91c857d11683fc0f5ebd /pkgs/top-level/all-packages.nix | |
parent | 4ae30fee90603b4cac7c0e3a9db0b31d6b540818 (diff) | |
download | nixlib-afde8e6270b8dca793d1f541224013a8e3bcd687.tar nixlib-afde8e6270b8dca793d1f541224013a8e3bcd687.tar.gz nixlib-afde8e6270b8dca793d1f541224013a8e3bcd687.tar.bz2 nixlib-afde8e6270b8dca793d1f541224013a8e3bcd687.tar.lz nixlib-afde8e6270b8dca793d1f541224013a8e3bcd687.tar.xz nixlib-afde8e6270b8dca793d1f541224013a8e3bcd687.tar.zst nixlib-afde8e6270b8dca793d1f541224013a8e3bcd687.zip |
Added GHC 6.6.
note: the old GHC 6.4(.2?) version is still there. I reused the bootstrap-version to bootstrap GHC-6.6. And some other packages depend on the old GHC version as well. note: only use this package for building other packages. If you install it as an end-user, you'll only be able to use the default GHC libraries, because other libraries are only privately registered to this GHC version during a nix-build by hooks (which are not executed when you run GHC yourself as an end-user). Consequently, also added a newer version of uulib and uuagc. svn path=/nixpkgs/trunk/; revision=7346
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aefe86bd1eb5..fbda1243b8eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -206,8 +206,8 @@ rec { # Bring in a path as a source, filtering out all hidden Subversion # directories. TODO: filter out backup files (*~) etc. - cleanSource = builtins.filterSource - (name: baseNameOf (toString name) != ".svn"); + cleanSource = src: builtins.filterSource + (name: baseNameOf (toString name) != ".svn") src; # !!! obsolete substitute = ../build-support/substitute/substitute.sh; @@ -681,6 +681,17 @@ rec { profiledCompiler = true; }); + # ghc66boot = import ../development/compilers/ghc-6.6-boot { + # inherit fetchurl stdenv perl readline; + # m4 = gnum4; + #}; + + ghc66 = import ../development/compilers/ghc-6.6 { + inherit fetchurl stdenv readline perl; + m4 = gnum4; + ghc = ghcboot; + }; + ghc = import ../development/compilers/ghc { inherit fetchurl stdenv perl ncurses readline m4; gcc = stdenv.gcc; @@ -1128,7 +1139,9 @@ rec { }; uuagc = import ../development/tools/haskell/uuagc { - inherit fetchurl stdenv ghc uulib; + inherit fetchurl stdenv; + ghc = ghc66; + uulib = uulib66; }; valgrind = import ../development/tools/misc/valgrind { @@ -1787,6 +1800,11 @@ rec { inherit stdenv fetchurl ghc; }; + uulib66 = import ../development/libraries/haskell/uulib-ghc-6.6 { + inherit stdenv fetchurl autoconf; + ghc = ghc66; + }; + wxHaskell = import ../development/libraries/haskell/wxHaskell { inherit fetchurl unzip ghc; stdenv = stdenvNew; |