Cabal 1.8.0.4 → 1.8.0.6
raw patch · 2 files changed
+9/−6 lines, 2 filesPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
API changes (from Hackage documentation)
- Distribution.InstalledPackageInfo: instance (Read m) => Read (InstalledPackageInfo_ m)
- Distribution.InstalledPackageInfo: instance (Show m) => Show (InstalledPackageInfo_ m)
- Distribution.PackageDescription: instance (Eq c) => Eq (Condition c)
- Distribution.PackageDescription: instance (Show c) => Show (Condition c)
- Distribution.PackageDescription.Configuration: instance (Monoid d) => Monoid (DepTestRslt d)
- Distribution.PackageDescription.Parse: instance (Monad m) => Monad (StT s m)
- Distribution.ParseUtils: AmbigousParse :: String -> LineNo -> PError
- Distribution.ParseUtils: F :: LineNo -> String -> String -> Field
- Distribution.ParseUtils: FieldDescr :: String -> (a -> Doc) -> (LineNo -> String -> a -> ParseResult a) -> FieldDescr a
- Distribution.ParseUtils: FromString :: String -> (Maybe LineNo) -> PError
- Distribution.ParseUtils: IfBlock :: LineNo -> String -> [Field] -> [Field] -> Field
- Distribution.ParseUtils: NoParse :: String -> LineNo -> PError
- Distribution.ParseUtils: PWarning :: String -> PWarning
- Distribution.ParseUtils: ParseFailed :: PError -> ParseResult a
- Distribution.ParseUtils: ParseOk :: [PWarning] -> a -> ParseResult a
- Distribution.ParseUtils: Section :: LineNo -> String -> String -> [Field] -> Field
- Distribution.ParseUtils: TabsError :: LineNo -> PError
- Distribution.ParseUtils: UTFWarning :: LineNo -> String -> PWarning
- Distribution.ParseUtils: boolField :: String -> (b -> Bool) -> (Bool -> b -> b) -> FieldDescr b
- Distribution.ParseUtils: catchParseError :: ParseResult a -> (PError -> ParseResult a) -> ParseResult a
- Distribution.ParseUtils: commaListField :: String -> (a -> Doc) -> (ReadP [a] a) -> (b -> [a]) -> ([a] -> b -> b) -> FieldDescr b
- Distribution.ParseUtils: data Field
- Distribution.ParseUtils: data FieldDescr a
- Distribution.ParseUtils: data PError
- Distribution.ParseUtils: data PWarning
- Distribution.ParseUtils: data ParseResult a
- Distribution.ParseUtils: fName :: Field -> String
- Distribution.ParseUtils: field :: String -> (a -> Doc) -> (ReadP a a) -> FieldDescr a
- Distribution.ParseUtils: fieldGet :: FieldDescr a -> a -> Doc
- Distribution.ParseUtils: fieldName :: FieldDescr a -> String
- Distribution.ParseUtils: fieldSet :: FieldDescr a -> LineNo -> String -> a -> ParseResult a
- Distribution.ParseUtils: ignoreUnrec :: UnrecFieldParser a
- Distribution.ParseUtils: instance (Show a) => Show (ParseResult a)
- Distribution.ParseUtils: instance Eq Field
- Distribution.ParseUtils: instance Monad ParseResult
- Distribution.ParseUtils: instance Show Field
- Distribution.ParseUtils: instance Show PError
- Distribution.ParseUtils: instance Show PWarning
- Distribution.ParseUtils: liftField :: (b -> a) -> (a -> b -> b) -> FieldDescr a -> FieldDescr b
- Distribution.ParseUtils: lineNo :: Field -> LineNo
- Distribution.ParseUtils: listField :: String -> (a -> Doc) -> (ReadP [a] a) -> (b -> [a]) -> ([a] -> b -> b) -> FieldDescr b
- Distribution.ParseUtils: locatedErrorMsg :: PError -> (Maybe LineNo, String)
- Distribution.ParseUtils: optsField :: String -> CompilerFlavor -> (b -> [(CompilerFlavor, [String])]) -> ([(CompilerFlavor, [String])] -> b -> b) -> FieldDescr b
- Distribution.ParseUtils: parseBuildTool :: ReadP r Dependency
- Distribution.ParseUtils: parseCommaList :: ReadP r a -> ReadP r [a]
- Distribution.ParseUtils: parseExtensionQ :: ReadP r Extension
- Distribution.ParseUtils: parseFail :: PError -> ParseResult a
- Distribution.ParseUtils: parseFields :: [FieldDescr a] -> a -> String -> ParseResult a
- Distribution.ParseUtils: parseFilePathQ :: ReadP r FilePath
- Distribution.ParseUtils: parseFreeText :: ReadP s String
- Distribution.ParseUtils: parseLicenseQ :: ReadP r License
- Distribution.ParseUtils: parseModuleNameQ :: ReadP r ModuleName
- Distribution.ParseUtils: parseOptCommaList :: ReadP r a -> ReadP r [a]
- Distribution.ParseUtils: parseOptVersion :: ReadP r Version
- Distribution.ParseUtils: parsePackageNameQ :: ReadP r PackageName
- Distribution.ParseUtils: parsePkgconfigDependency :: ReadP r Dependency
- Distribution.ParseUtils: parseQuoted :: ReadP r a -> ReadP r a
- Distribution.ParseUtils: parseSepList :: ReadP r b -> ReadP r a -> ReadP r [a]
- Distribution.ParseUtils: parseTestedWithQ :: ReadP r (CompilerFlavor, VersionRange)
- Distribution.ParseUtils: parseTokenQ :: ReadP r String
- Distribution.ParseUtils: parseTokenQ' :: ReadP r String
- Distribution.ParseUtils: parseVersionRangeQ :: ReadP r VersionRange
- Distribution.ParseUtils: ppField :: String -> Doc -> Doc
- Distribution.ParseUtils: ppFields :: [FieldDescr a] -> a -> Doc
- Distribution.ParseUtils: readFields :: String -> ParseResult [Field]
- Distribution.ParseUtils: runE :: LineNo -> String -> ReadE a -> String -> ParseResult a
- Distribution.ParseUtils: runP :: LineNo -> String -> ReadP a a -> String -> ParseResult a
- Distribution.ParseUtils: showFields :: [FieldDescr a] -> a -> String
- Distribution.ParseUtils: showFilePath :: FilePath -> Doc
- Distribution.ParseUtils: showFreeText :: String -> Doc
- Distribution.ParseUtils: showPWarning :: FilePath -> PWarning -> String
- Distribution.ParseUtils: showSingleNamedField :: [FieldDescr a] -> String -> Maybe (a -> String)
- Distribution.ParseUtils: showTestedWith :: (CompilerFlavor, VersionRange) -> Doc
- Distribution.ParseUtils: showToken :: String -> Doc
- Distribution.ParseUtils: simpleField :: String -> (a -> Doc) -> (ReadP a a) -> (b -> a) -> (a -> b -> b) -> FieldDescr b
- Distribution.ParseUtils: spaceListField :: String -> (a -> Doc) -> (ReadP [a] a) -> (b -> [a]) -> ([a] -> b -> b) -> FieldDescr b
- Distribution.ParseUtils: syntaxError :: LineNo -> String -> ParseResult a
- Distribution.ParseUtils: type LineNo = Int
- Distribution.ParseUtils: type UnrecFieldParser a = (String, String) -> a -> Maybe a
- Distribution.ParseUtils: warnUnrec :: UnrecFieldParser a
- Distribution.ParseUtils: warning :: String -> ParseResult ()
- Distribution.Simple.InstallDirs: instance (Monoid dir) => Monoid (InstallDirs dir)
- Distribution.Simple.InstallDirs: instance (Read dir) => Read (InstallDirs dir)
- Distribution.Simple.InstallDirs: instance (Show dir) => Show (InstallDirs dir)
- Distribution.Simple.Setup: instance (Bounded a) => Bounded (Flag a)
- Distribution.Simple.Setup: instance (Enum a) => Enum (Flag a)
- Distribution.Simple.Setup: instance (Eq a) => Eq (Flag a)
- Distribution.Simple.Setup: instance (Show a) => Show (Flag a)
+ Distribution.InstalledPackageInfo: instance Read m => Read (InstalledPackageInfo_ m)
+ Distribution.InstalledPackageInfo: instance Show m => Show (InstalledPackageInfo_ m)
+ Distribution.PackageDescription: instance Eq c => Eq (Condition c)
+ Distribution.PackageDescription: instance Show c => Show (Condition c)
+ Distribution.PackageDescription.Configuration: instance Monoid d => Monoid (DepTestRslt d)
+ Distribution.PackageDescription.Parse: instance Monad m => Monad (StT s m)
+ Distribution.Simple.InstallDirs: instance Monoid dir => Monoid (InstallDirs dir)
+ Distribution.Simple.InstallDirs: instance Read dir => Read (InstallDirs dir)
+ Distribution.Simple.InstallDirs: instance Show dir => Show (InstallDirs dir)
+ Distribution.Simple.Setup: instance Bounded a => Bounded (Flag a)
+ Distribution.Simple.Setup: instance Enum a => Enum (Flag a)
+ Distribution.Simple.Setup: instance Eq a => Eq (Flag a)
+ Distribution.Simple.Setup: instance Show a => Show (Flag a)
- Distribution.Package: class (Package pkg) => PackageFixedDeps pkg
+ Distribution.Package: class Package pkg => PackageFixedDeps pkg
- Distribution.Package: depends :: (PackageFixedDeps pkg) => pkg -> [PackageIdentifier]
+ Distribution.Package: depends :: PackageFixedDeps pkg => pkg -> [PackageIdentifier]
- Distribution.Package: packageId :: (Package pkg) => pkg -> PackageIdentifier
+ Distribution.Package: packageId :: Package pkg => pkg -> PackageIdentifier
- Distribution.Package: packageName :: (Package pkg) => pkg -> PackageName
+ Distribution.Package: packageName :: Package pkg => pkg -> PackageName
- Distribution.Package: packageVersion :: (Package pkg) => pkg -> Version
+ Distribution.Package: packageVersion :: Package pkg => pkg -> Version
- Distribution.PackageDescription.Check: checkPackageContent :: (Monad m) => CheckPackageContentOps m -> PackageDescription -> m [PackageCheck]
+ Distribution.PackageDescription.Check: checkPackageContent :: Monad m => CheckPackageContentOps m -> PackageDescription -> m [PackageCheck]
- Distribution.Simple.Command: choiceOpt :: (Eq b) => [(b, OptFlags, Description)] -> MkOptDescr (a -> b) (b -> a -> a) a
+ Distribution.Simple.Command: choiceOpt :: Eq b => [(b, OptFlags, Description)] -> MkOptDescr (a -> b) (b -> a -> a) a
- Distribution.Simple.Command: optArg :: (Monoid b) => ArgPlaceHolder -> ReadE b -> b -> (b -> [Maybe String]) -> MkOptDescr (a -> b) (b -> a -> a) a
+ Distribution.Simple.Command: optArg :: Monoid b => ArgPlaceHolder -> ReadE b -> b -> (b -> [Maybe String]) -> MkOptDescr (a -> b) (b -> a -> a) a
- Distribution.Simple.Command: optArg' :: (Monoid b) => ArgPlaceHolder -> (Maybe String -> b) -> (b -> [Maybe String]) -> MkOptDescr (a -> b) (b -> a -> a) a
+ Distribution.Simple.Command: optArg' :: Monoid b => ArgPlaceHolder -> (Maybe String -> b) -> (b -> [Maybe String]) -> MkOptDescr (a -> b) (b -> a -> a) a
- Distribution.Simple.Command: reqArg :: (Monoid b) => ArgPlaceHolder -> ReadE b -> (b -> [String]) -> MkOptDescr (a -> b) (b -> a -> a) a
+ Distribution.Simple.Command: reqArg :: Monoid b => ArgPlaceHolder -> ReadE b -> (b -> [String]) -> MkOptDescr (a -> b) (b -> a -> a) a
- Distribution.Simple.Command: reqArg' :: (Monoid b) => ArgPlaceHolder -> (String -> b) -> (b -> [String]) -> MkOptDescr (a -> b) (b -> a -> a) a
+ Distribution.Simple.Command: reqArg' :: Monoid b => ArgPlaceHolder -> (String -> b) -> (b -> [String]) -> MkOptDescr (a -> b) (b -> a -> a) a
- Distribution.Simple.Configure: tryGetConfigStateFile :: (Read a) => FilePath -> IO (Either String a)
+ Distribution.Simple.Configure: tryGetConfigStateFile :: Read a => FilePath -> IO (Either String a)
- Distribution.Simple.Utils: comparing :: (Ord a) => (b -> a) -> b -> b -> Ordering
+ Distribution.Simple.Utils: comparing :: Ord a => (b -> a) -> b -> b -> Ordering
- Distribution.Simple.Utils: equating :: (Eq a) => (b -> a) -> b -> b -> Bool
+ Distribution.Simple.Utils: equating :: Eq a => (b -> a) -> b -> b -> Bool
- Distribution.Text: disp :: (Text a) => a -> Doc
+ Distribution.Text: disp :: Text a => a -> Doc
- Distribution.Text: display :: (Text a) => a -> String
+ Distribution.Text: display :: Text a => a -> String
- Distribution.Text: parse :: (Text a) => ReadP r a
+ Distribution.Text: parse :: Text a => ReadP r a
- Distribution.Text: simpleParse :: (Text a) => String -> Maybe a
+ Distribution.Text: simpleParse :: Text a => String -> Maybe a
Files
- Cabal.cabal +3/−3
- Distribution/Simple/Register.hs +6/−3
Cabal.cabal view
@@ -1,5 +1,5 @@ Name: Cabal-Version: 1.8.0.4+Version: 1.8.0.6 Copyright: 2003-2006, Isaac Jones 2005-2009, Duncan Coutts License: BSD3@@ -32,7 +32,7 @@ source-repository this type: darcs location: http://darcs.haskell.org/cabal-branches/cabal-1.8/- tag: 1.8.0.4+ tag: 1.8.0.6 Flag base4 Description: Choose the even newer, even smaller, split-up base package.@@ -59,7 +59,7 @@ ghc-options: -Wall -fno-ignore-asserts if impl(ghc >= 6.8) ghc-options: -fwarn-tabs- cpp-options: "-DCABAL_VERSION=1,8,0,4"+ cpp-options: "-DCABAL_VERSION=1,8,0,6" nhc98-Options: -K4M Exposed-Modules:
Distribution/Simple/Register.hs view
@@ -115,7 +115,7 @@ import Control.Monad (when) import Data.Maybe ( isJust, fromMaybe, maybeToList )-import Data.List (partition)+import Data.List (partition, nub) -- -----------------------------------------------------------------------------@@ -146,8 +146,11 @@ modeGenerateRegScript = fromFlag (regGenScript regFlags) inplace = fromFlag (regInPlace regFlags)- packageDbs = withPackageDB lbi- ++ maybeToList (flagToMaybe (regPackageDB regFlags))+ -- FIXME: there's really no guarantee this will work.+ -- registering into a totally different db stack can+ -- fail if dependencies cannot be satisfied.+ packageDbs = nub $ withPackageDB lbi+ ++ maybeToList (flagToMaybe (regPackageDB regFlags)) distPref = fromFlag (regDistPref regFlags) verbosity = fromFlag (regVerbosity regFlags)