Skip to content

Commit

Permalink
rollback 'add haskell98 to BOOT_PACKAGES and register packages with -…
Browse files Browse the repository at this point in the history
…-force'
  • Loading branch information
Paczesiowa committed Jul 12, 2011
1 parent fefcbbf commit 76eeaa1
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions virthualenv.sh
Expand Up @@ -32,7 +32,7 @@ CABAL_CONFIG="${CABAL_DIR}/config"
VIRTHUALENV_BIN_DIR="${VIRTHUALENV_DIR}/bin" VIRTHUALENV_BIN_DIR="${VIRTHUALENV_DIR}/bin"
ACTIVATE_SCRIPT="${VIRTHUALENV_BIN_DIR}/activate" ACTIVATE_SCRIPT="${VIRTHUALENV_BIN_DIR}/activate"
CABAL_WRAPPER="${VIRTHUALENV_BIN_DIR}/cabal" CABAL_WRAPPER="${VIRTHUALENV_BIN_DIR}/cabal"
BOOT_PACKAGES="ffi rts ghc-prim integer-gmp base array containers filepath old-locale old-time unix directory pretty process Cabal bytestring ghc-binary bin-package-db hpc template-haskell ghc time random haskell98" BOOT_PACKAGES="ffi rts ghc-prim integer-gmp base array containers filepath old-locale old-time unix directory pretty process Cabal bytestring ghc-binary bin-package-db hpc template-haskell ghc"


mkdir "${VIRTHUALENV}" mkdir "${VIRTHUALENV}"
mkdir "${VIRTHUALENV_DIR}" mkdir "${VIRTHUALENV_DIR}"
Expand All @@ -42,7 +42,7 @@ mkdir "${VIRTHUALENV_BIN_DIR}"
ghc-pkg init "${GHC_PACKAGE_PATH}" ghc-pkg init "${GHC_PACKAGE_PATH}"


for package in ${BOOT_PACKAGES}; do for package in ${BOOT_PACKAGES}; do
ghc-pkg describe "${package}" | (GHC_PACKAGE_PATH="${GHC_PACKAGE_PATH}" ghc-pkg register --force -) ghc-pkg describe "${package}" | (GHC_PACKAGE_PATH="${GHC_PACKAGE_PATH}" ghc-pkg register -)
done done


cat "${CABAL_CONFIG_SKEL}" | sed "s:<CABAL_DIR>:${CABAL_DIR}:g" | sed "s:<GHC_PACKAGE_PATH>:${GHC_PACKAGE_PATH}:g" > "${CABAL_CONFIG}" cat "${CABAL_CONFIG_SKEL}" | sed "s:<CABAL_DIR>:${CABAL_DIR}:g" | sed "s:<GHC_PACKAGE_PATH>:${GHC_PACKAGE_PATH}:g" > "${CABAL_CONFIG}"
Expand Down

0 comments on commit 76eeaa1

Please sign in to comment.