From ad2b8b43f1befbd2d31e84ae9f9ba80e9e0a6b2b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Apr 2008 07:20:34 +0000
Subject: [PATCH] * Comment out ghc68extraLibs (it breaks the Nixpkgs release
 due to   missing files and I don't understand the code...).

svn path=/nixpkgs/trunk/; revision=11672
---
 pkgs/top-level/all-packages.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

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