[commit: Cabal] : Change the default config on Windows to per-user installs (4c55f69)
Ian Lynagh
igloo at earth.li
Fri Jun 24 02:05:44 CEST 2011
Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal
On branch :
http://hackage.haskell.org/trac/ghc/changeset/4c55f6990eb9c59157dcc84e1dd788cf1e4be9ae
>---------------------------------------------------------------
commit 4c55f6990eb9c59157dcc84e1dd788cf1e4be9ae
Author: Duncan Coutts <duncan at haskell.org>
Date: Mon Dec 28 16:54:11 2009 +0000
Change the default config on Windows to per-user installs
Slightly experimental. We should look out for unexpected consequences.
>---------------------------------------------------------------
cabal-install/Distribution/Client/Config.hs | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/cabal-install/Distribution/Client/Config.hs b/cabal-install/Distribution/Client/Config.hs
index d621162..8ddca49 100644
--- a/cabal-install/Distribution/Client/Config.hs
+++ b/cabal-install/Distribution/Client/Config.hs
@@ -62,8 +62,6 @@ import Distribution.Simple.Utils
( notice, warn, lowercase )
import Distribution.Compiler
( CompilerFlavor(..), defaultCompilerFlavor )
-import Distribution.System
- ( OS(Windows), buildOS )
import Distribution.Verbosity
( Verbosity, normal )
@@ -212,11 +210,9 @@ defaultCompiler :: CompilerFlavor
defaultCompiler = fromMaybe GHC defaultCompilerFlavor
defaultUserInstall :: Bool
-defaultUserInstall = case buildOS of
- -- We do global installs by default on Windows
- Windows -> False
- -- and per-user installs by default everywhere else
- _ -> True
+defaultUserInstall = True
+-- We do per-user installs by default on all platforms. We used to default to
+-- global installs on Windows but that no longer works on Windows Vista or 7.
defaultRemoteRepo :: RemoteRepo
defaultRemoteRepo = RemoteRepo name uri
More information about the Cvs-libraries
mailing list