From 27855da0d9e5b835848019f6af627470aa2f4137 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 16 Apr 2009 18:12:59 +0000 Subject: [PATCH] * Put all the GHCs in one directory. svn path=/nixpkgs/trunk/; revision=15092 --- .../compilers/ghc-6.6.1/setup-hook.sh | 41 ------------------- .../compilers/ghc/{default.nix => 6.4.2.nix} | 0 .../{ghc-6.6.1/default.nix => ghc/6.6.1.nix} | 0 .../{ghc-6.8/ghc-6.8.2.nix => ghc/6.8.2.nix} | 0 .../{ghc-6.8/ghc-6.8.3.nix => ghc/6.8.3.nix} | 0 .../compilers/{ghc-6.8 => ghc}/setup-hook.sh | 0 pkgs/top-level/all-packages.nix | 8 ++-- 7 files changed, 4 insertions(+), 45 deletions(-) delete mode 100644 pkgs/development/compilers/ghc-6.6.1/setup-hook.sh rename pkgs/development/compilers/ghc/{default.nix => 6.4.2.nix} (100%) rename pkgs/development/compilers/{ghc-6.6.1/default.nix => ghc/6.6.1.nix} (100%) rename pkgs/development/compilers/{ghc-6.8/ghc-6.8.2.nix => ghc/6.8.2.nix} (100%) rename pkgs/development/compilers/{ghc-6.8/ghc-6.8.3.nix => ghc/6.8.3.nix} (100%) rename pkgs/development/compilers/{ghc-6.8 => ghc}/setup-hook.sh (100%) 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 03057e82f4a..00000000000 --- 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 similarity index 100% rename from pkgs/development/compilers/ghc/default.nix rename to 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 similarity index 100% rename from pkgs/development/compilers/ghc-6.6.1/default.nix rename to 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 similarity index 100% rename from pkgs/development/compilers/ghc-6.8/ghc-6.8.2.nix rename to 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 similarity index 100% rename from pkgs/development/compilers/ghc-6.8/ghc-6.8.3.nix rename to 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 similarity index 100% rename from pkgs/development/compilers/ghc-6.8/setup-hook.sh rename to pkgs/development/compilers/ghc/setup-hook.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1897e99d42..25d7dc0c597 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;