Permalink
Browse files

Rename the default package environment file.

  • Loading branch information...
1 parent 8a0839a commit d1d172170690e6bfa8fe00b976bf51aaeb215a44 @23Skidoo 23Skidoo committed Oct 15, 2012
Showing with 9 additions and 1 deletion.
  1. +9 −1 cabal-install/Distribution/Client/PackageEnvironment.hs
@@ -20,6 +20,7 @@ module Distribution.Client.PackageEnvironment (
, initialPackageEnvironment
, commentPackageEnvironment
, defaultPackageEnvironmentFileName
+ , userPackageEnvironmentFileName
) where
import Distribution.Client.Config ( SavedConfig(..), commentSavedConfig,
@@ -80,8 +81,15 @@ instance Monoid PackageEnvironment where
where
combine f = f a `mappend` f b
+-- | The automatically-created package environment file that should not be
+-- touched by the user.
defaultPackageEnvironmentFileName :: FilePath
-defaultPackageEnvironmentFileName = "pkgenv"
+defaultPackageEnvironmentFileName = "cabal.sandbox.config"
+
+-- | Optional package environment file that can be used to customize the default
+-- settings. Created by the user.
+userPackageEnvironmentFileName :: FilePath
+userPackageEnvironmentFileName = "cabal.config"
-- | Defaults common to 'initialPackageEnvironment' and
-- 'commentPackageEnvironment'.

0 comments on commit d1d1721

Please sign in to comment.