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

* Comment out ghc68extraLibs (it breaks the Nixpkgs release due to

Browse Source 
missing files and I don't understand the code...).

svn path=/nixpkgs/trunk/; revision=11672
This commit is contained in:
Eelco Dolstra 2008-04-22 07:20:34 +00:00
parent ba767eab2e
commit ad2b8b43f1
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1212,11 +1212,13 @@ let pkgs = rec {
inherit fetchurl stdenv gawk system; inherit fetchurl stdenv gawk system;
}; };
/*
flapjax = import ../development/compilers/flapjax { flapjax = import ../development/compilers/flapjax {
inherit fetchurl stdenv; inherit fetchurl stdenv;
ghc = ghcsAndLibs.ghc68.ghc; ghc = ghcsAndLibs.ghc68.ghc;
libs = with (ghc68extraLibs ghcsAndLibs.ghc68 // ghcsAndLibs.ghc68.core_libs); [ mtl parsec random ]; libs = with (ghc68extraLibs ghcsAndLibs.ghc68 // ghcsAndLibs.ghc68.core_libs); [ mtl parsec random ];
}; };
*/
g77 = import ../build-support/gcc-wrapper { g77 = import ../build-support/gcc-wrapper {
name = "g77"; name = "g77";
@ -1391,11 +1393,13 @@ let pkgs = rec {
} // ( if args ? pass then (args.pass) else {} ) // { inherit buildInputs; } ); } // ( if args ? pass then (args.pass) else {} ) // { inherit buildInputs; } );
/*
ghcCabalExecutableFun = (import ../development/compilers/ghc/ghc-wrapper/ghc-cabal-executable-fun.nix){ ghcCabalExecutableFun = (import ../development/compilers/ghc/ghc-wrapper/ghc-cabal-executable-fun.nix){
inherit ghc68extraLibs ghcsAndLibs stdenv lib; inherit ghc68extraLibs ghcsAndLibs stdenv lib;
# extra packages from this top level file: # extra packages from this top level file:
inherit perl; inherit perl;
}; };
*/
# creates annotated derivation (comments see above) # creates annotated derivation (comments see above)
addHasktagsTaggingInfo = deriv : deriv // { addHasktagsTaggingInfo = deriv : deriv // {
@ -1413,7 +1417,8 @@ let pkgs = rec {
}; };
}; };
# this may change in the future # this may change in the future
/*
ghc68extraLibs = (import ../misc/ghc68extraLibs ) { ghc68extraLibs = (import ../misc/ghc68extraLibs ) {
# lib like stuff # lib like stuff
inherit bleedingEdgeRepos fetchurl lib addHasktagsTaggingInfo ghcCabalDerivation pkgconfig unzip zlib; inherit bleedingEdgeRepos fetchurl lib addHasktagsTaggingInfo ghcCabalDerivation pkgconfig unzip zlib;
@ -1423,13 +1428,16 @@ let pkgs = rec {
executables = ghc68executables; executables = ghc68executables;
wxGTK = wxGTK26; wxGTK = wxGTK26;
}; };
*/
# Executables compiled by this ghc68 - I'm too lazy to add them all as additional file in here # Executables compiled by this ghc68 - I'm too lazy to add them all as additional file in here
/*
ghc68executables = recurseIntoAttrs (import ../misc/ghc68executables { ghc68executables = recurseIntoAttrs (import ../misc/ghc68executables {
inherit ghcCabalExecutableFun fetchurl lib bleedingEdgeRepos autoconf zlib; inherit ghcCabalExecutableFun fetchurl lib bleedingEdgeRepos autoconf zlib;
inherit X11; inherit X11;
inherit (xlibs) xmessage; inherit (xlibs) xmessage;
}); });
*/
# the wrappers basically does one thing: It defines GHC_PACKAGE_PATH before calling ghc{i,-pkg} # 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 # So you can have different wrappers with different library combinations
@ -1437,6 +1445,7 @@ let pkgs = rec {
# the lib to the libraries list below # the lib to the libraries list below
# Doesn't create that much useless symlinks (you seldomly want to read the # Doesn't create that much useless symlinks (you seldomly want to read the
# .hi and .o files, right? # .hi and .o files, right?
/*
ghcLibraryWrapper68 = ghcLibraryWrapper68 =
let ghc = ghcsAndLibs.ghc68.ghc; in let ghc = ghcsAndLibs.ghc68.ghc; in
ghcWrapper rec { ghcWrapper rec {
@ -1453,6 +1462,7 @@ let pkgs = rec {
# ++ map ( a : __getAttr a (ghc68extraLibs ghcsAndLibs.ghc68 ) ) [ "mtl" "parsec" ... ] # ++ map ( a : __getAttr a (ghc68extraLibs ghcsAndLibs.ghc68 ) ) [ "mtl" "parsec" ... ]
inherit ghc; inherit ghc;
}; };
*/
# ghc66boot = import ../development/compilers/ghc-6.6-boot { # ghc66boot = import ../development/compilers/ghc-6.6-boot {
# inherit fetchurl stdenv perl readline; # inherit fetchurl stdenv perl readline;
@ -2027,11 +2037,13 @@ let pkgs = rec {
inherit cabal; inherit cabal;
}; };
/*
hsc2hs = import ../development/tools/misc/hsc2hs { hsc2hs = import ../development/tools/misc/hsc2hs {
inherit bleedingEdgeRepos stdenv; inherit bleedingEdgeRepos stdenv;
ghc = ghcsAndLibs.ghc68.ghc; ghc = ghcsAndLibs.ghc68.ghc;
libs = with (ghc68extraLibs ghcsAndLibs.ghc68 // ghcsAndLibs.ghc68.core_libs); [ base directory process cabal_darcs ]; libs = with (ghc68extraLibs ghcsAndLibs.ghc68 // ghcsAndLibs.ghc68.core_libs); [ base directory process cabal_darcs ];
}; };
*/
guileLint = import ../development/tools/guile/guile-lint { guileLint = import ../development/tools/guile/guile-lint {
inherit fetchurl stdenv guile; inherit fetchurl stdenv guile;