dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

* Move the remaining GHC-dependent packages to haskell-packages.nix.

Browse Source 
svn path=/nixpkgs/trunk/; revision=15144
This commit is contained in:
Eelco Dolstra 2009-04-19 10:27:22 +00:00
parent 1c1967a9a1
commit c9a740bc26
2 changed files with 65 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
pkgs/top-level/all-packages.nix
View File

@ -886,10 +886,6 @@ let
inherit fetchurl stdenv readline;
};
lhs2tex = import ../tools/typesetting/lhs2tex {
inherit fetchurl stdenv ghc tetex polytable;
};
libtorrent = import ../tools/networking/p2p/libtorrent {
inherit fetchurl stdenv pkgconfig openssl libsigcxx;
};
@ -1692,7 +1688,7 @@ let
ghcsAndLibs =
assert builtins ? listToAttrs;
recurseIntoAttrs (import ../development/compilers/ghcs {
import ../development/compilers/ghcs {
ghcboot = ghc642Binary;
inherit fetchurl stdenv recurseIntoAttrs perl gnum4 gmp readline lib;
inherit ghcPkgUtil ctags autoconf automake getConfig;
@ -1702,7 +1698,7 @@ let
# needed for install darcs ghc version
happy = ghc68executables.happy;
alex = ghc68executables.alex;
});
};
# creates ghc-X-wl wich adds the passed libraries to the env var GHC_PACKAGE_PATH
ghcWrapper = { ghcPackagedLibs ? false, ghc, libraries, name, suffix ? "ghc_wrapper_${ghc.name}" } :
@ -1790,12 +1786,12 @@ let
# Executables compiled by this ghc68 - I'm too lazy to add them all as additional file in here
ghc68executables = recurseIntoAttrs (import ../misc/ghc68executables {
ghc68executables = import ../misc/ghc68executables {
inherit ghcCabalExecutableFun fetchurl lib bleedingEdgeRepos autoconf zlib getConfig;
#inherit X11;
inherit (xlibs) xmessage;
inherit pkgs; # passing pkgs to add the possibility for the user to add his own executables. pkgs is passed.
});
};
# the wrappers basically does one thing: It defines GHC_PACKAGE_PATH before calling ghc{i,-pkg}
# So you can have different wrappers with different library combinations
@ -1820,12 +1816,7 @@ let
inherit ghc;
};
ghc = ghc6102;
ghc642 = import ../development/compilers/ghc/6.4.2.nix {
inherit fetchurl stdenv perl ncurses readline m4 gmp;
ghc = ghc642Binary;
};
#ghc = haskellPackages.ghc;
ghc642Binary = lowPrio (import ../development/compilers/ghc/6.4.2-binary.nix {
inherit fetchurl stdenv ncurses gmp;
@ -1833,17 +1824,43 @@ let
perl = perl58;
});
ghc661 = import ../development/compilers/ghc/6.6.1.nix {
ghc6101Binary = lowPrio (import ../development/compilers/ghc/6.10.1-binary.nix {
inherit fetchurl stdenv perl ncurses gmp libedit;
});
ghc6102Binary = lowPrio (import ../development/compilers/ghc/6.10.2-binary.nix {
inherit fetchurl stdenv perl ncurses gmp libedit;
});
haskellPackages = haskellPackages_ghc6102;
haskellPackages_ghc642 = import ./haskell-packages.nix {
inherit pkgs;
ghc = import ../development/compilers/ghc/6.4.2.nix {
inherit fetchurl stdenv perl ncurses readline m4 gmp;
ghc = ghc642Binary;
};
};
haskellPackages_ghc661 = import ./haskell-packages.nix {
inherit pkgs;
ghc = import ../development/compilers/ghc/6.6.1.nix {
inherit fetchurl stdenv readline perl58 gmp ncurses m4;
ghc = ghc642Binary;
};
};
ghc682 = import ../development/compilers/ghc/6.8.2.nix {
haskellPackages_ghc682 = import ./haskell-packages.nix {
inherit pkgs;
ghc = import ../development/compilers/ghc/6.8.2.nix {
inherit fetchurl stdenv readline perl gmp ncurses m4;
ghc = ghc642Binary;
};
};
ghc683 = import ../development/compilers/ghc/6.8.3.nix {
haskellPackages_ghc683 = recurseIntoAttrs (import ./haskell-packages.nix {
inherit pkgs;
ghc = import ../development/compilers/ghc/6.8.3.nix {
inherit fetchurl stdenv readline perl gmp ncurses m4;
ghc = ghc642Binary;
haddock = import ../development/tools/documentation/haddock/boot.nix {
@ -1854,32 +1871,16 @@ let
};
};
};
ghc6101Binary = lowPrio (import ../development/compilers/ghc/6.10.1-binary.nix {
inherit fetchurl stdenv perl ncurses gmp libedit;
});
ghc6102 = import ../development/compilers/ghc/6.10.2.nix {
haskellPackages_ghc6102 = recurseIntoAttrs (import ./haskell-packages.nix {
inherit pkgs;
ghc = import ../development/compilers/ghc/6.10.2.nix {
inherit fetchurl stdenv perl ncurses gmp libedit;
ghc = ghc6101Binary;
};
ghc6102Binary = lowPrio (import ../development/compilers/ghc/6.10.2-binary.nix {
inherit fetchurl stdenv perl ncurses gmp libedit;
});
haskellPackages = recurseIntoAttrs haskellPackages_ghc6102;
haskellPackages_ghc6102 = import ./haskell-packages.nix {
inherit pkgs;
ghc = ghc6102;
};
haskellPackages_ghc683 = import ./haskell-packages.nix {
inherit pkgs;
ghc = ghc683;
};
gprolog = import ../development/compilers/gprolog {
inherit fetchurl stdenv;
};
@ -1891,10 +1892,6 @@ let
libstdcpp5 = gcc33.gcc;
};
helium = import ../development/compilers/helium {
inherit fetchurl stdenv ghc;
};
ikarus = builderDefsPackage (selectVersion ../development/compilers/ikarus "0.0.3") {
inherit gmp;
};
@ -2476,10 +2473,6 @@ let
inherit fetchurl stdenv yacc;
};
frown = import ../development/tools/parsing/frown {
inherit fetchurl stdenv ghc;
};
m4 = gnum4;
gnum4 = import ../development/tools/misc/gnum4 {

18
pkgs/top-level/haskell-packages.nix
View File

@ -147,6 +147,11 @@ rec {
inherit (pkgs) fetchsvn stdenv coreutils m4 libtool llvm;
};
helium = import ../development/compilers/helium {
inherit ghc;
inherit (pkgs) fetchurl stdenv;
};
# Development tools.
@ -155,6 +160,11 @@ rec {
inherit (pkgs) perl;
};
frown = import ../development/tools/parsing/frown {
inherit ghc;
inherit (pkgs) fetchurl stdenv;
};
# old version of haddock, still more stable than 2.0
haddock09 = import ../development/tools/documentation/haddock/haddock-0.9.nix {
inherit cabal;
@ -192,4 +202,12 @@ rec {
inherit cabal xmonad X11;
};
# Tools.
lhs2tex = import ../tools/typesetting/lhs2tex {
inherit ghc;
inherit (pkgs) fetchurl stdenv tetex polytable;
};
}