* Put all the GHCs in one directory.

svn path=/nixpkgs/trunk/; revision=15092

7 files changed, 4 insertions, 45 deletions

diff --git a/pkgs/development/compilers/ghc-6.6.1/setup-hook.sh b/pkgs/development/compilers/ghc-6.6.1/setup-hook.sh
deleted file mode 100644
index 03057e82f4af7..0000000000000
--- a/pkgs/development/compilers/ghc-6.6.1/setup-hook.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-# Support dir for isolating GHC
-ghc_support=$TMPDIR/ghc-6.6-nix-support
-mkdir -p $ghc_support
-
-# Create isolated package config
-packages_db=$ghc_support/package.conf
-cp @out@/lib/ghc-*/package.conf $packages_db
-chmod +w $packages_db
-
-# Generate wrappers for GHC that use the isolated package config
-makeWrapper() {
-  wrapperName="$1"
-  wrapper="$ghc_support/$wrapperName"
-  shift #the other arguments are passed to the source app
-  echo '#!'"$SHELL" > "$wrapper"
-  echo "exec \"@out@/bin/$wrapperName\" $@" '"$@"' >> "$wrapper"
-  chmod +x "$wrapper"
-}
-
-makeWrapper "ghc"         "-no-user-package-conf -package-conf $packages_db"
-makeWrapper "ghci"        "-no-user-package-conf -package-conf $packages_db"
-makeWrapper "runghc"      "-no-user-package-conf -package-conf $packages_db"
-makeWrapper "runhaskell"  "-no-user-package-conf -package-conf $packages_db"
-makeWrapper "ghc-pkg"     "--global-conf $packages_db"
-
-# Add wrappers to search path
-export _PATH=$ghc_support:$_PATH
-
-# Env hook to add packages to the package config
-addLibToPackageConf ()
-{
-    local regscript=$1/nix-support/register-ghclib.sh
-    if test -f $regscript; then
-        local oldpath=$PATH
-        export PATH=$ghc_support:$PATH
-        sh $regscript $package_db
-        export PATH=$oldpath
-    fi
-}
-
-envHooks=(${envHooks[@]} addLibToPackageConf)
diff --git a/pkgs/development/compilers/ghc/default.nix b/pkgs/development/compilers/ghc/6.4.2.nix
index c175f242ff109..c175f242ff109 100644
--- a/pkgs/development/compilers/ghc/default.nix
+++ b/pkgs/development/compilers/ghc/6.4.2.nix
diff --git a/pkgs/development/compilers/ghc-6.6.1/default.nix b/pkgs/development/compilers/ghc/6.6.1.nix
index 841306578eb69..841306578eb69 100644
--- a/pkgs/development/compilers/ghc-6.6.1/default.nix
+++ b/pkgs/development/compilers/ghc/6.6.1.nix
diff --git a/pkgs/development/compilers/ghc-6.8/ghc-6.8.2.nix b/pkgs/development/compilers/ghc/6.8.2.nix
index 9b78a979a9678..9b78a979a9678 100644
--- a/pkgs/development/compilers/ghc-6.8/ghc-6.8.2.nix
+++ b/pkgs/development/compilers/ghc/6.8.2.nix
diff --git a/pkgs/development/compilers/ghc-6.8/ghc-6.8.3.nix b/pkgs/development/compilers/ghc/6.8.3.nix
index 98ddca5b36dcc..98ddca5b36dcc 100644
--- a/pkgs/development/compilers/ghc-6.8/ghc-6.8.3.nix
+++ b/pkgs/development/compilers/ghc/6.8.3.nix
diff --git a/pkgs/development/compilers/ghc-6.8/setup-hook.sh b/pkgs/development/compilers/ghc/setup-hook.sh
index 263f46f52d429..263f46f52d429 100644
--- a/pkgs/development/compilers/ghc-6.8/setup-hook.sh
+++ b/pkgs/development/compilers/ghc/setup-hook.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c1897e99d4211..25d7dc0c59742 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1833,23 +1833,23 @@ let
 
   ghc = ghc683;
 
-  ghc682 = import ../development/compilers/ghc-6.8/ghc-6.8.2.nix {
+  ghc682 = import ../development/compilers/ghc/6.8.2.nix {
     inherit fetchurl stdenv readline perl gmp ncurses m4;
     ghc = ghcboot;
   };
 
-  ghc683 = import ../development/compilers/ghc-6.8/ghc-6.8.3.nix {
+  ghc683 = import ../development/compilers/ghc/6.8.3.nix {
     inherit fetchurl stdenv readline perl gmp ncurses m4;
     ghc = ghcboot;
     haddock = haddockboot;
   };
 
-  ghc661 = import ../development/compilers/ghc-6.6.1 {
+  ghc661 = import ../development/compilers/ghc/6.6.1.nix {
     inherit fetchurl stdenv readline perl58 gmp ncurses m4;
     ghc = ghcboot;
   };
 
-  ghc64 = import ../development/compilers/ghc {
+  ghc64 = import ../development/compilers/ghc/6.4.2.nix {
     inherit fetchurl stdenv perl ncurses readline m4 gmp;
     gcc = stdenv.gcc;
     ghc = ghcboot;