From 15aa82631de32e96c7488faab349d76903751099 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Sun, 25 Nov 2018 17:51:29 +0200 Subject: [PATCH] Refactor pretty, so it goes via intermediate format Something to do: Go from Parsec.Field to Pretty.Field directly, that's may be useful for some tools --- Cabal/Cabal.cabal | 1 + Cabal/Distribution/FieldGrammar/Pretty.hs | 32 +- Cabal/Distribution/InstalledPackageInfo.hs | 5 +- .../PackageDescription/PrettyPrint.hs | 176 ++++++----- Cabal/Distribution/Pretty/Field.hs | 71 +++++ Cabal/tests/ParserTests/ipi/Includes2.format | 53 ++-- .../ipi/internal-preprocessor-test.format | 45 +-- .../ipi/issue-2276-ghc-9885.format | 279 +++++++++--------- .../tests/ParserTests/ipi/transformers.format | 42 +-- .../ParserTests/regressions/Octree-0.5.format | 50 ++-- .../ParserTests/regressions/common.cabal | 3 + .../tests/ParserTests/regressions/common.expr | 3 +- .../ParserTests/regressions/common.format | 33 +-- .../ParserTests/regressions/common2.format | 34 +-- .../tests/ParserTests/regressions/elif.format | 18 +- .../ParserTests/regressions/elif2.format | 24 +- .../regressions/encoding-0.8.format | 19 +- .../regressions/generics-sop.format | 92 +++--- .../ParserTests/regressions/issue-5055.format | 29 +- .../ParserTests/regressions/issue-774.format | 14 +- .../regressions/jaeger-flamegraph.format | 50 ++-- .../regressions/leading-comma.format | 11 +- .../ParserTests/regressions/noVersion.format | 14 +- .../regressions/nothing-unicode.format | 20 +- .../ParserTests/regressions/shake.format | 118 ++++---- .../ParserTests/regressions/spdx-1.format | 10 +- .../ParserTests/regressions/spdx-2.format | 10 +- .../ParserTests/regressions/spdx-3.format | 10 +- .../regressions/th-lift-instances.format | 58 ++-- .../regressions/wl-pprint-indef.format | 28 +- 30 files changed, 703 insertions(+), 649 deletions(-) create mode 100644 Cabal/Distribution/Pretty/Field.hs diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal index 0dc5598bd2c..643da5db3af 100644 --- a/Cabal/Cabal.cabal +++ b/Cabal/Cabal.cabal @@ -319,6 +319,7 @@ library Distribution.TestSuite Distribution.Text Distribution.Pretty + Distribution.Pretty.Field Distribution.Types.AbiHash Distribution.Types.AnnotatedId Distribution.Types.Benchmark diff --git a/Cabal/Distribution/FieldGrammar/Pretty.hs b/Cabal/Distribution/FieldGrammar/Pretty.hs index e8a152525d5..d6180f73897 100644 --- a/Cabal/Distribution/FieldGrammar/Pretty.hs +++ b/Cabal/Distribution/FieldGrammar/Pretty.hs @@ -7,41 +7,42 @@ module Distribution.FieldGrammar.Pretty ( import Distribution.Compat.Lens import Distribution.Compat.Newtype import Distribution.Compat.Prelude +import Distribution.Parsec.Field (FieldName) import Distribution.Pretty (Pretty (..)) -import Distribution.Simple.Utils (fromUTF8BS) +import Distribution.Pretty.Field (Field (..)) +import Distribution.Simple.Utils (toUTF8BS) import Prelude () import Text.PrettyPrint (Doc) import qualified Text.PrettyPrint as PP import Distribution.FieldGrammar.Class -import Distribution.ParseUtils (ppField) newtype PrettyFieldGrammar s a = PrettyFG - { fieldGrammarPretty :: s -> Doc + { fieldGrammarPretty :: s -> [Field] } deriving (Functor) instance Applicative (PrettyFieldGrammar s) where pure _ = PrettyFG (\_ -> mempty) - PrettyFG f <*> PrettyFG x = PrettyFG (\s -> f s PP.$$ x s) + PrettyFG f <*> PrettyFG x = PrettyFG (\s -> f s <> x s) -- | We can use 'PrettyFieldGrammar' to pp print the @s@. -- -- /Note:/ there is not trailing @($+$ text "")@. -prettyFieldGrammar :: PrettyFieldGrammar s a -> s -> Doc +prettyFieldGrammar :: PrettyFieldGrammar s a -> s -> [Field] prettyFieldGrammar = fieldGrammarPretty instance FieldGrammar PrettyFieldGrammar where blurFieldGrammar f (PrettyFG pp) = PrettyFG (pp . aview f) uniqueFieldAla fn _pack l = PrettyFG $ \s -> - ppField (fromUTF8BS fn) (pretty (pack' _pack (aview l s))) + ppField fn (pretty (pack' _pack (aview l s))) booleanFieldDef fn l def = PrettyFG pp where pp s | b == def = mempty - | otherwise = ppField (fromUTF8BS fn) (PP.text (show b)) + | otherwise = ppField fn (PP.text (show b)) where b = aview l s @@ -49,26 +50,26 @@ instance FieldGrammar PrettyFieldGrammar where where pp s = case aview l s of Nothing -> mempty - Just a -> ppField (fromUTF8BS fn) (pretty (pack' _pack a)) + Just a -> ppField fn (pretty (pack' _pack a)) optionalFieldDefAla fn _pack l def = PrettyFG pp where pp s | x == def = mempty - | otherwise = ppField (fromUTF8BS fn) (pretty (pack' _pack x)) + | otherwise = ppField fn (pretty (pack' _pack x)) where x = aview l s monoidalFieldAla fn _pack l = PrettyFG pp where - pp s = ppField (fromUTF8BS fn) (pretty (pack' _pack (aview l s))) + pp s = ppField fn (pretty (pack' _pack (aview l s))) prefixedFields _fnPfx l = PrettyFG (pp . aview l) where - pp xs = PP.vcat - -- always print the field, even its Doc is empty + pp xs = + -- always print the field, even its Doc is empty. -- i.e. don't use ppField - [ PP.text n <<>> PP.colon PP.<+> (PP.vcat $ map PP.text $ lines s) + [ Field (toUTF8BS n) $ PP.vcat $ map PP.text $ lines s | (n, s) <- xs -- fnPfx `isPrefixOf` n ] @@ -77,3 +78,8 @@ instance FieldGrammar PrettyFieldGrammar where deprecatedSince _ _ x = x availableSince _ _ = id hiddenField _ = PrettyFG (\_ -> mempty) + +ppField :: FieldName -> Doc -> [Field] +ppField name fielddoc + | PP.isEmpty fielddoc = [] + | otherwise = [ Field name fielddoc ] diff --git a/Cabal/Distribution/InstalledPackageInfo.hs b/Cabal/Distribution/InstalledPackageInfo.hs index 2710801e363..9e266d780d1 100644 --- a/Cabal/Distribution/InstalledPackageInfo.hs +++ b/Cabal/Distribution/InstalledPackageInfo.hs @@ -52,7 +52,8 @@ import Distribution.FieldGrammar import Distribution.FieldGrammar.FieldDescrs import Distribution.ModuleName import Distribution.Package hiding (installedPackageId, installedUnitId) -import Distribution.ParseUtils +import Distribution.ParseUtils hiding (showFields) +import Distribution.Pretty.Field (showFields) import Distribution.Types.ComponentName import Distribution.Types.LibraryName import Distribution.Utils.Generic (toUTF8BS) @@ -133,7 +134,7 @@ showInstalledPackageInfo ipi = -- | The variant of 'showInstalledPackageInfo' which outputs @pkgroot@ field too. showFullInstalledPackageInfo :: InstalledPackageInfo -> String -showFullInstalledPackageInfo = Disp.render . (Disp.$+$ Disp.text "") . prettyFieldGrammar ipiFieldGrammar +showFullInstalledPackageInfo = showFields . prettyFieldGrammar ipiFieldGrammar -- | -- diff --git a/Cabal/Distribution/PackageDescription/PrettyPrint.hs b/Cabal/Distribution/PackageDescription/PrettyPrint.hs index a060a86d587..00a48bddc50 100644 --- a/Cabal/Distribution/PackageDescription/PrettyPrint.hs +++ b/Cabal/Distribution/PackageDescription/PrettyPrint.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE OverloadedStrings #-} ----------------------------------------------------------------------------- -- | -- Module : Distribution.PackageDescription.PrettyPrint @@ -26,31 +27,29 @@ module Distribution.PackageDescription.PrettyPrint ( showHookedBuildInfo, ) where -import Prelude () import Distribution.Compat.Prelude +import Prelude () +import Distribution.Types.CondTree import Distribution.Types.Dependency -import Distribution.Types.ForeignLib (ForeignLib (foreignLibName)) +import Distribution.Types.ForeignLib (ForeignLib (foreignLibName)) import Distribution.Types.UnqualComponentName -import Distribution.Types.CondTree import Distribution.PackageDescription -import Distribution.Simple.Utils -import Distribution.ParseUtils +import Distribution.ParseUtils () import Distribution.Pretty +import Distribution.Pretty.Field +import Distribution.Simple.Utils -import Distribution.FieldGrammar (PrettyFieldGrammar', prettyFieldGrammar) +import Distribution.FieldGrammar (PrettyFieldGrammar', prettyFieldGrammar) import Distribution.PackageDescription.FieldGrammar - (packageDescriptionFieldGrammar, buildInfoFieldGrammar, - flagFieldGrammar, foreignLibFieldGrammar, libraryFieldGrammar, - benchmarkFieldGrammar, testSuiteFieldGrammar, - setupBInfoFieldGrammar, sourceRepoFieldGrammar, executableFieldGrammar) + (benchmarkFieldGrammar, buildInfoFieldGrammar, executableFieldGrammar, flagFieldGrammar, + foreignLibFieldGrammar, libraryFieldGrammar, packageDescriptionFieldGrammar, + setupBInfoFieldGrammar, sourceRepoFieldGrammar, testSuiteFieldGrammar) import qualified Distribution.PackageDescription.FieldGrammar as FG -import Text.PrettyPrint - (hsep, space, parens, char, nest, ($$), (<+>), - text, vcat, ($+$), Doc, render) +import Text.PrettyPrint (Doc, char, hsep, parens, text, (<+>)) import qualified Data.ByteString.Lazy.Char8 as BS.Char8 @@ -60,63 +59,60 @@ writeGenericPackageDescription fpath pkg = writeUTF8File fpath (showGenericPacka -- | Writes a generic package description to a string showGenericPackageDescription :: GenericPackageDescription -> String -showGenericPackageDescription = render . ($+$ text "") . ppGenericPackageDescription - -ppGenericPackageDescription :: GenericPackageDescription -> Doc -ppGenericPackageDescription gpd = - ppPackageDescription (packageDescription gpd) - $+$ ppSetupBInfo (setupBuildInfo (packageDescription gpd)) - $+$ ppGenPackageFlags (genPackageFlags gpd) - $+$ ppCondLibrary (condLibrary gpd) - $+$ ppCondSubLibraries (condSubLibraries gpd) - $+$ ppCondForeignLibs (condForeignLibs gpd) - $+$ ppCondExecutables (condExecutables gpd) - $+$ ppCondTestSuites (condTestSuites gpd) - $+$ ppCondBenchmarks (condBenchmarks gpd) - -ppPackageDescription :: PackageDescription -> Doc +showGenericPackageDescription = showFields . ppGenericPackageDescription + +ppGenericPackageDescription :: GenericPackageDescription -> [Field] +ppGenericPackageDescription gpd = concat + [ ppPackageDescription (packageDescription gpd) + , ppSetupBInfo (setupBuildInfo (packageDescription gpd)) + , ppGenPackageFlags (genPackageFlags gpd) + , ppCondLibrary (condLibrary gpd) + , ppCondSubLibraries (condSubLibraries gpd) + , ppCondForeignLibs (condForeignLibs gpd) + , ppCondExecutables (condExecutables gpd) + , ppCondTestSuites (condTestSuites gpd) + , ppCondBenchmarks (condBenchmarks gpd) + ] + +ppPackageDescription :: PackageDescription -> [Field] ppPackageDescription pd = prettyFieldGrammar packageDescriptionFieldGrammar pd - $+$ ppSourceRepos (sourceRepos pd) + ++ ppSourceRepos (sourceRepos pd) -ppSourceRepos :: [SourceRepo] -> Doc -ppSourceRepos [] = mempty -ppSourceRepos (hd:tl) = ppSourceRepo hd $+$ ppSourceRepos tl +ppSourceRepos :: [SourceRepo] -> [Field] +ppSourceRepos = map ppSourceRepo -ppSourceRepo :: SourceRepo -> Doc -ppSourceRepo repo = - emptyLine $ text "source-repository" <+> pretty kind $+$ - nest indentWith (prettyFieldGrammar (sourceRepoFieldGrammar kind) repo) +ppSourceRepo :: SourceRepo -> Field +ppSourceRepo repo = Section "source-repository" [pretty kind] $ + prettyFieldGrammar (sourceRepoFieldGrammar kind) repo where kind = repoKind repo -ppSetupBInfo :: Maybe SetupBuildInfo -> Doc +ppSetupBInfo :: Maybe SetupBuildInfo -> [Field] ppSetupBInfo Nothing = mempty ppSetupBInfo (Just sbi) | defaultSetupDepends sbi = mempty - | otherwise = - emptyLine $ text "custom-setup" $+$ - nest indentWith (prettyFieldGrammar (setupBInfoFieldGrammar False) sbi) + | otherwise = pure $ Section "custom-setup" [] $ + prettyFieldGrammar (setupBInfoFieldGrammar False) sbi -ppGenPackageFlags :: [Flag] -> Doc -ppGenPackageFlags flds = vcat [ppFlag f | f <- flds] +ppGenPackageFlags :: [Flag] -> [Field] +ppGenPackageFlags = map ppFlag -ppFlag :: Flag -> Doc -ppFlag flag@(MkFlag name _ _ _) = - emptyLine $ text "flag" <+> ppFlagName name $+$ - nest indentWith (prettyFieldGrammar (flagFieldGrammar name) flag) +ppFlag :: Flag -> Field +ppFlag flag@(MkFlag name _ _ _) = Section "flag" [ppFlagName name] $ + prettyFieldGrammar (flagFieldGrammar name) flag -ppCondTree2 :: PrettyFieldGrammar' s -> CondTree ConfVar [Dependency] s -> Doc +ppCondTree2 :: PrettyFieldGrammar' s -> CondTree ConfVar [Dependency] s -> [Field] ppCondTree2 grammar = go where -- TODO: recognise elif opportunities go (CondNode it _ ifs) = - prettyFieldGrammar grammar it - $+$ vcat (map ppIf ifs) + prettyFieldGrammar grammar it ++ + concatMap ppIf ifs ppIf (CondBranch c thenTree Nothing) -- | isEmpty thenDoc = mempty - | otherwise = ppIfCondition c $$ nest indentWith thenDoc + | otherwise = [ppIfCondition c thenDoc] where thenDoc = go thenTree @@ -124,52 +120,52 @@ ppCondTree2 grammar = go case (False, False) of -- case (isEmpty thenDoc, isEmpty elseDoc) of (True, True) -> mempty - (False, True) -> ppIfCondition c $$ nest indentWith thenDoc - (True, False) -> ppIfCondition (cNot c) $$ nest indentWith elseDoc - (False, False) -> (ppIfCondition c $$ nest indentWith thenDoc) - $+$ (text "else" $$ nest indentWith elseDoc) + (False, True) -> [ ppIfCondition c thenDoc ] + (True, False) -> [ ppIfCondition (cNot c) elseDoc ] + (False, False) -> [ ppIfCondition c thenDoc + , Section "else" [] elseDoc + ] where thenDoc = go thenTree elseDoc = go elseTree -ppCondLibrary :: Maybe (CondTree ConfVar [Dependency] Library) -> Doc +ppCondLibrary :: Maybe (CondTree ConfVar [Dependency] Library) -> [Field] ppCondLibrary Nothing = mempty -ppCondLibrary (Just condTree) = - emptyLine $ text "library" $+$ - nest indentWith (ppCondTree2 (libraryFieldGrammar Nothing) condTree) - -ppCondSubLibraries :: [(UnqualComponentName, CondTree ConfVar [Dependency] Library)] -> Doc -ppCondSubLibraries libs = vcat - [ emptyLine $ (text "library" <+> pretty n) $+$ - nest indentWith (ppCondTree2 (libraryFieldGrammar $ Just n) condTree) +ppCondLibrary (Just condTree) = pure $ Section "library" [] $ + ppCondTree2 (libraryFieldGrammar Nothing) condTree + +ppCondSubLibraries :: [(UnqualComponentName, CondTree ConfVar [Dependency] Library)] -> [Field] +ppCondSubLibraries libs = + [ Section "library" [pretty n] + $ ppCondTree2 (libraryFieldGrammar $ Just n) condTree | (n, condTree) <- libs ] -ppCondForeignLibs :: [(UnqualComponentName, CondTree ConfVar [Dependency] ForeignLib)] -> Doc -ppCondForeignLibs flibs = vcat - [ emptyLine $ (text "foreign-library" <+> pretty n) $+$ - nest indentWith (ppCondTree2 (foreignLibFieldGrammar n) condTree) +ppCondForeignLibs :: [(UnqualComponentName, CondTree ConfVar [Dependency] ForeignLib)] -> [Field] +ppCondForeignLibs flibs = + [ Section "foreign-library" [pretty n] + $ ppCondTree2 (foreignLibFieldGrammar n) condTree | (n, condTree) <- flibs ] -ppCondExecutables :: [(UnqualComponentName, CondTree ConfVar [Dependency] Executable)] -> Doc -ppCondExecutables exes = vcat - [ emptyLine $ (text "executable" <+> pretty n) $+$ - nest indentWith (ppCondTree2 (executableFieldGrammar n) condTree) +ppCondExecutables :: [(UnqualComponentName, CondTree ConfVar [Dependency] Executable)] -> [Field] +ppCondExecutables exes = + [ Section "executable" [pretty n] + $ ppCondTree2 (executableFieldGrammar n) condTree | (n, condTree) <- exes ] -ppCondTestSuites :: [(UnqualComponentName, CondTree ConfVar [Dependency] TestSuite)] -> Doc -ppCondTestSuites suites = vcat - [ emptyLine $ (text "test-suite" <+> pretty n) $+$ - nest indentWith (ppCondTree2 testSuiteFieldGrammar (fmap FG.unvalidateTestSuite condTree)) +ppCondTestSuites :: [(UnqualComponentName, CondTree ConfVar [Dependency] TestSuite)] -> [Field] +ppCondTestSuites suites = + [ Section "test-suite" [pretty n] + $ ppCondTree2 testSuiteFieldGrammar (fmap FG.unvalidateTestSuite condTree) | (n, condTree) <- suites ] -ppCondBenchmarks :: [(UnqualComponentName, CondTree ConfVar [Dependency] Benchmark)] -> Doc -ppCondBenchmarks suites = vcat - [ emptyLine $ (text "benchmark" <+> pretty n) $+$ - nest indentWith (ppCondTree2 benchmarkFieldGrammar (fmap FG.unvalidateBenchmark condTree)) +ppCondBenchmarks :: [(UnqualComponentName, CondTree ConfVar [Dependency] Benchmark)] -> [Field] +ppCondBenchmarks suites = + [ Section "benchmark" [pretty n] + $ ppCondTree2 benchmarkFieldGrammar (fmap FG.unvalidateBenchmark condTree) | (n, condTree) <- suites ] @@ -190,11 +186,8 @@ ppConfVar (Impl c v) = text "impl" <<>> parens (pretty c <+> ppFlagName :: FlagName -> Doc ppFlagName = text . unFlagName -ppIfCondition :: (Condition ConfVar) -> Doc -ppIfCondition c = (emptyLine $ text "if" <+> ppCondition c) - -emptyLine :: Doc -> Doc -emptyLine d = text "" $+$ d +ppIfCondition :: (Condition ConfVar) -> [Field] -> Field +ppIfCondition c = Section "if" [ppCondition c] -- | @since 2.0.0.2 writePackageDescription :: FilePath -> PackageDescription -> NoCallStackIO () @@ -236,12 +229,9 @@ writeHookedBuildInfo fpath = writeFileAtomic fpath . BS.Char8.pack -- | @since 2.0.0.2 showHookedBuildInfo :: HookedBuildInfo -> String -showHookedBuildInfo (mb_lib_bi, ex_bis) = render $ - maybe mempty (prettyFieldGrammar buildInfoFieldGrammar) mb_lib_bi - $$ vcat - [ space - $$ (text "executable:" <+> pretty name) - $$ prettyFieldGrammar buildInfoFieldGrammar bi - | (name, bi) <- ex_bis - ] - $+$ text "" +showHookedBuildInfo (mb_lib_bi, ex_bis) = showFields $ + maybe mempty (prettyFieldGrammar buildInfoFieldGrammar) mb_lib_bi ++ + [ Section "executable:" [pretty name] + $ prettyFieldGrammar buildInfoFieldGrammar bi + | (name, bi) <- ex_bis + ] diff --git a/Cabal/Distribution/Pretty/Field.hs b/Cabal/Distribution/Pretty/Field.hs new file mode 100644 index 00000000000..46bdf6e4bd7 --- /dev/null +++ b/Cabal/Distribution/Pretty/Field.hs @@ -0,0 +1,71 @@ +{-# LANGUAGE BangPatterns #-} +-- | Cabal-like file AST types: 'Field', 'Section' etc, +-- +-- This (intermediate) data type is used for pretty-printing. +module Distribution.Pretty.Field ( + Field (..), + showFields, + ) where + +import Distribution.Compat.Prelude +import Prelude () + +import Distribution.Parsec.Field (FieldName) +import Distribution.Simple.Utils (fromUTF8BS) + +import qualified Data.ByteString as BS +import qualified Text.PrettyPrint as PP + +data Field + = Field FieldName PP.Doc + | Section FieldName [PP.Doc] [Field] + +-- | Prettyprint a list of fields. +showFields :: [Field] -> String +showFields = unlines . renderFields + +renderFields :: [Field] -> [String] +renderFields fields = flattenBlocks $ map (renderField len) fields + where + len = maxNameLength 0 fields + + maxNameLength !acc [] = acc + maxNameLength !acc (Field name _ : rest) = maxNameLength (max acc (BS.length name)) rest + maxNameLength !acc (Section {} : rest) = maxNameLength acc rest + +-- | Block of lines, +-- Boolean parameter tells whether block should be surrounded by empty lines +data Block = Block Bool [String] + +flattenBlocks :: [Block] -> [String] +flattenBlocks = go0 where + go0 [] = [] + go0 (Block surr strs : blocks) = strs ++ go surr blocks + + go _surr' [] = [] + go surr' (Block surr strs : blocks) = ins $ strs ++ go surr blocks where + ins | surr' || surr = ("" :) + | otherwise = id + +renderField :: Int -> Field -> Block +renderField fw (Field name doc) = Block False $ case lines narrow of + [] -> [ name' ++ ":" ] + [singleLine] | length singleLine < 60 + -> [ name' ++ ": " ++ replicate (fw - length name') ' ' ++ narrow ] + _ -> (name' ++ ":") : map indent (lines (PP.render doc)) + where + name' = fromUTF8BS name + narrow = PP.renderStyle narrowStyle doc + + narrowStyle :: PP.Style + narrowStyle = PP.style { PP.lineLength = PP.lineLength PP.style - fw } + +renderField _ (Section name args fields) = Block True $ + [ PP.render $ PP.hsep $ PP.text (fromUTF8BS name) : args ] + ++ + (map indent $ renderFields fields) + +-- Indent with 4 spaces. See 'Distribution.Pretty.indentWith' +indent :: String -> String +indent [] = [] +indent xs = ' ' : ' ' : ' ' : ' ' : xs diff --git a/Cabal/tests/ParserTests/ipi/Includes2.format b/Cabal/tests/ParserTests/ipi/Includes2.format index 10ff7895a6e..279d3868559 100644 --- a/Cabal/tests/ParserTests/ipi/Includes2.format +++ b/Cabal/tests/ParserTests/ipi/Includes2.format @@ -1,24 +1,29 @@ -name: z-Includes2-z-mylib -version: 0.1.0.0 -package-name: Includes2 -lib-name: mylib -id: Includes2-0.1.0.0-inplace-mylib+3gY9SyjX86dBypHcOaev1n -instantiated-with: Database=Includes2-0.1.0.0-inplace-mysql:Database.MySQL -key: Includes2-0.1.0.0-inplace-mylib+3gY9SyjX86dBypHcOaev1n -license: BSD3 -maintainer: ezyang@cs.stanford.edu -author: Edward Z. Yang -abi: inplace -exposed-modules: - Mine -import-dirs: /home/travis/build/haskell/cabal/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal.dist/work/./dist/build/x86_64-linux/ghc-8.2.2/Includes2-0.1.0.0/l/mylib/Includes2-0.1.0.0-inplace-mylib+3gY9SyjX86dBypHcOaev1n/build/Includes2-0.1.0.0-inplace-mylib+3gY9SyjX86dBypHcOaev1n -library-dirs: /home/travis/build/haskell/cabal/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal.dist/work/./dist/build/x86_64-linux/ghc-8.2.2/Includes2-0.1.0.0/l/mylib/Includes2-0.1.0.0-inplace-mylib+3gY9SyjX86dBypHcOaev1n/build/Includes2-0.1.0.0-inplace-mylib+3gY9SyjX86dBypHcOaev1n -dynamic-library-dirs: /home/travis/build/haskell/cabal/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal.dist/work/./dist/build/x86_64-linux/ghc-8.2.2/Includes2-0.1.0.0/l/mylib/Includes2-0.1.0.0-inplace-mylib+3gY9SyjX86dBypHcOaev1n/build/Includes2-0.1.0.0-inplace-mylib+3gY9SyjX86dBypHcOaev1n -data-dir: /home/travis/build/haskell/cabal/cabal-testsuite/PackageTests/Backpack/Includes2 -hs-libraries: HSIncludes2-0.1.0.0-inplace-mylib+3gY9SyjX86dBypHcOaev1n -depends: - base-4.10.1.0 Includes2-0.1.0.0-inplace-mysql -abi-depends: base-4.10.1.0=35a7f6be752ee4f7385cb5bf28677879 - Includes2-0.1.0.0-inplace-mysql=inplace -haddock-interfaces: /home/travis/build/haskell/cabal/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal.dist/work/./dist/build/x86_64-linux/ghc-8.2.2/Includes2-0.1.0.0/l/mylib/Includes2-0.1.0.0-inplace-mylib+3gY9SyjX86dBypHcOaev1n/doc/html/Includes2/Includes2.haddock -haddock-html: /home/travis/build/haskell/cabal/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal.dist/work/./dist/build/x86_64-linux/ghc-8.2.2/Includes2-0.1.0.0/l/mylib/Includes2-0.1.0.0-inplace-mylib+3gY9SyjX86dBypHcOaev1n/doc/html/Includes2 +name: z-Includes2-z-mylib +version: 0.1.0.0 +package-name: Includes2 +lib-name: mylib +id: Includes2-0.1.0.0-inplace-mylib+3gY9SyjX86dBypHcOaev1n +instantiated-with: Database=Includes2-0.1.0.0-inplace-mysql:Database.MySQL +key: Includes2-0.1.0.0-inplace-mylib+3gY9SyjX86dBypHcOaev1n +license: BSD3 +maintainer: ezyang@cs.stanford.edu +author: Edward Z. Yang +abi: inplace +exposed-modules: Mine +import-dirs: + /home/travis/build/haskell/cabal/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal.dist/work/./dist/build/x86_64-linux/ghc-8.2.2/Includes2-0.1.0.0/l/mylib/Includes2-0.1.0.0-inplace-mylib+3gY9SyjX86dBypHcOaev1n/build/Includes2-0.1.0.0-inplace-mylib+3gY9SyjX86dBypHcOaev1n +library-dirs: + /home/travis/build/haskell/cabal/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal.dist/work/./dist/build/x86_64-linux/ghc-8.2.2/Includes2-0.1.0.0/l/mylib/Includes2-0.1.0.0-inplace-mylib+3gY9SyjX86dBypHcOaev1n/build/Includes2-0.1.0.0-inplace-mylib+3gY9SyjX86dBypHcOaev1n +dynamic-library-dirs: + /home/travis/build/haskell/cabal/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal.dist/work/./dist/build/x86_64-linux/ghc-8.2.2/Includes2-0.1.0.0/l/mylib/Includes2-0.1.0.0-inplace-mylib+3gY9SyjX86dBypHcOaev1n/build/Includes2-0.1.0.0-inplace-mylib+3gY9SyjX86dBypHcOaev1n +data-dir: + /home/travis/build/haskell/cabal/cabal-testsuite/PackageTests/Backpack/Includes2 +hs-libraries: HSIncludes2-0.1.0.0-inplace-mylib+3gY9SyjX86dBypHcOaev1n +depends: base-4.10.1.0 Includes2-0.1.0.0-inplace-mysql +abi-depends: + base-4.10.1.0=35a7f6be752ee4f7385cb5bf28677879 + Includes2-0.1.0.0-inplace-mysql=inplace +haddock-interfaces: + /home/travis/build/haskell/cabal/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal.dist/work/./dist/build/x86_64-linux/ghc-8.2.2/Includes2-0.1.0.0/l/mylib/Includes2-0.1.0.0-inplace-mylib+3gY9SyjX86dBypHcOaev1n/doc/html/Includes2/Includes2.haddock +haddock-html: + /home/travis/build/haskell/cabal/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal.dist/work/./dist/build/x86_64-linux/ghc-8.2.2/Includes2-0.1.0.0/l/mylib/Includes2-0.1.0.0-inplace-mylib+3gY9SyjX86dBypHcOaev1n/doc/html/Includes2 diff --git a/Cabal/tests/ParserTests/ipi/internal-preprocessor-test.format b/Cabal/tests/ParserTests/ipi/internal-preprocessor-test.format index 74b21a09791..b06b6104372 100644 --- a/Cabal/tests/ParserTests/ipi/internal-preprocessor-test.format +++ b/Cabal/tests/ParserTests/ipi/internal-preprocessor-test.format @@ -1,23 +1,26 @@ -name: internal-preprocessor-test -version: 0.1.0.0 -id: internal-preprocessor-test-0.1.0.0 -key: internal-preprocessor-test-0.1.0.0 -license: GPL-3 -maintainer: mikhail.glushenkov@gmail.com -author: Mikhail Glushenkov -synopsis: Internal custom preprocessor example. +name: internal-preprocessor-test +version: 0.1.0.0 +id: internal-preprocessor-test-0.1.0.0 +key: internal-preprocessor-test-0.1.0.0 +license: GPL-3 +maintainer: mikhail.glushenkov@gmail.com +author: Mikhail Glushenkov +synopsis: Internal custom preprocessor example. description: See https://github.com/haskell/cabal/issues/1541#issuecomment-30155513 -category: Testing -exposed: True -exposed-modules: - A -import-dirs: /home/ogre/Documents/other-haskell/cabal/cabal-testsuite/PackageTests/CustomPreProcess/setup.dist/work/dist/build -library-dirs: /home/ogre/Documents/other-haskell/cabal/cabal-testsuite/PackageTests/CustomPreProcess/setup.dist/work/dist/build - /home/ogre/Documents/other-haskell/cabal/cabal-testsuite/PackageTests/CustomPreProcess/setup.dist/work/dist/build -data-dir: /home/ogre/Documents/other-haskell/cabal/cabal-testsuite/PackageTests/CustomPreProcess -hs-libraries: HSinternal-preprocessor-test-0.1.0.0 -depends: - base-4.8.2.0-0d6d1084fbc041e1cded9228e80e264d -haddock-interfaces: /home/ogre/Documents/other-haskell/cabal/cabal-testsuite/PackageTests/CustomPreProcess/setup.dist/work/dist/doc/html/internal-preprocessor-test/internal-preprocessor-test.haddock -haddock-html: /home/ogre/Documents/other-haskell/cabal/cabal-testsuite/PackageTests/CustomPreProcess/setup.dist/work/dist/doc/html/internal-preprocessor-test +category: Testing +exposed: True +exposed-modules: A +import-dirs: + /home/ogre/Documents/other-haskell/cabal/cabal-testsuite/PackageTests/CustomPreProcess/setup.dist/work/dist/build +library-dirs: + /home/ogre/Documents/other-haskell/cabal/cabal-testsuite/PackageTests/CustomPreProcess/setup.dist/work/dist/build + /home/ogre/Documents/other-haskell/cabal/cabal-testsuite/PackageTests/CustomPreProcess/setup.dist/work/dist/build +data-dir: + /home/ogre/Documents/other-haskell/cabal/cabal-testsuite/PackageTests/CustomPreProcess +hs-libraries: HSinternal-preprocessor-test-0.1.0.0 +depends: base-4.8.2.0-0d6d1084fbc041e1cded9228e80e264d +haddock-interfaces: + /home/ogre/Documents/other-haskell/cabal/cabal-testsuite/PackageTests/CustomPreProcess/setup.dist/work/dist/doc/html/internal-preprocessor-test/internal-preprocessor-test.haddock +haddock-html: + /home/ogre/Documents/other-haskell/cabal/cabal-testsuite/PackageTests/CustomPreProcess/setup.dist/work/dist/doc/html/internal-preprocessor-test diff --git a/Cabal/tests/ParserTests/ipi/issue-2276-ghc-9885.format b/Cabal/tests/ParserTests/ipi/issue-2276-ghc-9885.format index 7575d8231fc..6c899383095 100644 --- a/Cabal/tests/ParserTests/ipi/issue-2276-ghc-9885.format +++ b/Cabal/tests/ParserTests/ipi/issue-2276-ghc-9885.format @@ -1,11 +1,11 @@ -name: transformers -version: 0.5.2.0 -id: transformers-0.5.2.0 -key: transformers-0.5.2.0 -license: BSD3 -maintainer: Ross Paterson -author: Andy Gill, Ross Paterson -synopsis: Concrete functor and monad transformers +name: transformers +version: 0.5.2.0 +id: transformers-0.5.2.0 +key: transformers-0.5.2.0 +license: BSD3 +maintainer: Ross Paterson +author: Andy Gill, Ross Paterson +synopsis: Concrete functor and monad transformers description: A portable library of functor and monad transformers, inspired by the paper \"Functional Programming with Overloading and Higher-Order @@ -28,9 +28,9 @@ description: Alternatively, it can be used with the non-portable monad classes in the @mtl@ or @monads-tf@ packages, which automatically lift operations introduced by monad transformers through other transformers. -category: Control -abi: e04579c0363c9229351d1a0b394bf2d5 -exposed: True +category: Control +abi: e04579c0363c9229351d1a0b394bf2d5 +exposed: True exposed-modules: Control.Applicative.Backwards Control.Applicative.Lift Control.Monad.Signatures Control.Monad.Trans.Class @@ -43,131 +43,134 @@ exposed-modules: Control.Monad.Trans.State.Strict Control.Monad.Trans.Writer Control.Monad.Trans.Writer.Lazy Control.Monad.Trans.Writer.Strict Data.Functor.Constant Data.Functor.Reverse -import-dirs: /opt/ghc/8.2.2/lib/ghc-8.2.2/transformers-0.5.2.0 -library-dirs: /opt/ghc/8.2.2/lib/ghc-8.2.2/transformers-0.5.2.0 +import-dirs: /opt/ghc/8.2.2/lib/ghc-8.2.2/transformers-0.5.2.0 +library-dirs: /opt/ghc/8.2.2/lib/ghc-8.2.2/transformers-0.5.2.0 dynamic-library-dirs: /opt/ghc/8.2.2/lib/ghc-8.2.2/transformers-0.5.2.0 -data-dir: /opt/ghc/8.2.2/share/x86_64-linux-ghc-8.2.2/transformers-0.5.2.0 -hs-libraries: HStransformers-0.5.2.0 -depends: - base-4.10.1.0 -abi-depends: base-4.10.1.0=35a7f6be752ee4f7385cb5bf28677879 -ld-options: -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm - -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -haddock-interfaces: /opt/ghc/8.2.2/share/doc/ghc-8.2.2/html/libraries/transformers-0.5.2.0/transformers.haddock -haddock-html: /opt/ghc/8.2.2/share/doc/ghc-8.2.2/html/libraries/transformers-0.5.2.0 +data-dir: + /opt/ghc/8.2.2/share/x86_64-linux-ghc-8.2.2/transformers-0.5.2.0 +hs-libraries: HStransformers-0.5.2.0 +depends: base-4.10.1.0 +abi-depends: base-4.10.1.0=35a7f6be752ee4f7385cb5bf28677879 +ld-options: + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm + -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm -lm +haddock-interfaces: + /opt/ghc/8.2.2/share/doc/ghc-8.2.2/html/libraries/transformers-0.5.2.0/transformers.haddock +haddock-html: + /opt/ghc/8.2.2/share/doc/ghc-8.2.2/html/libraries/transformers-0.5.2.0 diff --git a/Cabal/tests/ParserTests/ipi/transformers.format b/Cabal/tests/ParserTests/ipi/transformers.format index 31c301a7cf2..d517afbefd4 100644 --- a/Cabal/tests/ParserTests/ipi/transformers.format +++ b/Cabal/tests/ParserTests/ipi/transformers.format @@ -1,11 +1,11 @@ -name: transformers -version: 0.5.2.0 -id: transformers-0.5.2.0 -key: transformers-0.5.2.0 -license: BSD3 -maintainer: Ross Paterson -author: Andy Gill, Ross Paterson -synopsis: Concrete functor and monad transformers +name: transformers +version: 0.5.2.0 +id: transformers-0.5.2.0 +key: transformers-0.5.2.0 +license: BSD3 +maintainer: Ross Paterson +author: Andy Gill, Ross Paterson +synopsis: Concrete functor and monad transformers description: A portable library of functor and monad transformers, inspired by the paper \"Functional Programming with Overloading and Higher-Order @@ -28,9 +28,9 @@ description: Alternatively, it can be used with the non-portable monad classes in the @mtl@ or @monads-tf@ packages, which automatically lift operations introduced by monad transformers through other transformers. -category: Control -abi: e04579c0363c9229351d1a0b394bf2d5 -exposed: True +category: Control +abi: e04579c0363c9229351d1a0b394bf2d5 +exposed: True exposed-modules: Control.Applicative.Backwards Control.Applicative.Lift Control.Monad.Signatures Control.Monad.Trans.Class @@ -43,13 +43,15 @@ exposed-modules: Control.Monad.Trans.State.Strict Control.Monad.Trans.Writer Control.Monad.Trans.Writer.Lazy Control.Monad.Trans.Writer.Strict Data.Functor.Constant Data.Functor.Reverse -import-dirs: /opt/ghc/8.2.2/lib/ghc-8.2.2/transformers-0.5.2.0 -library-dirs: /opt/ghc/8.2.2/lib/ghc-8.2.2/transformers-0.5.2.0 +import-dirs: /opt/ghc/8.2.2/lib/ghc-8.2.2/transformers-0.5.2.0 +library-dirs: /opt/ghc/8.2.2/lib/ghc-8.2.2/transformers-0.5.2.0 dynamic-library-dirs: /opt/ghc/8.2.2/lib/ghc-8.2.2/transformers-0.5.2.0 -data-dir: /opt/ghc/8.2.2/share/x86_64-linux-ghc-8.2.2/transformers-0.5.2.0 -hs-libraries: HStransformers-0.5.2.0 -depends: - base-4.10.1.0 -abi-depends: base-4.10.1.0=35a7f6be752ee4f7385cb5bf28677879 -haddock-interfaces: /opt/ghc/8.2.2/share/doc/ghc-8.2.2/html/libraries/transformers-0.5.2.0/transformers.haddock -haddock-html: /opt/ghc/8.2.2/share/doc/ghc-8.2.2/html/libraries/transformers-0.5.2.0 +data-dir: + /opt/ghc/8.2.2/share/x86_64-linux-ghc-8.2.2/transformers-0.5.2.0 +hs-libraries: HStransformers-0.5.2.0 +depends: base-4.10.1.0 +abi-depends: base-4.10.1.0=35a7f6be752ee4f7385cb5bf28677879 +haddock-interfaces: + /opt/ghc/8.2.2/share/doc/ghc-8.2.2/html/libraries/transformers-0.5.2.0/transformers.haddock +haddock-html: + /opt/ghc/8.2.2/share/doc/ghc-8.2.2/html/libraries/transformers-0.5.2.0 diff --git a/Cabal/tests/ParserTests/regressions/Octree-0.5.format b/Cabal/tests/ParserTests/regressions/Octree-0.5.format index b27a21c58f5..5004cc9f114 100644 --- a/Cabal/tests/ParserTests/regressions/Octree-0.5.format +++ b/Cabal/tests/ParserTests/regressions/Octree-0.5.format @@ -1,50 +1,48 @@ Octree-0.5.cabal:39:3: Non breaking spaces at 39:3, 41:3, 43:3 cabal-version: >=1.8 -name: Octree -version: 0.5 -license: BSD3 -license-file: LICENSE -copyright: Copyright by Michal J. Gajda '2012 -maintainer: mjgajda@googlemail.com -author: Michal J. Gajda -stability: beta -tested-with: ghc ==7.0.4 ghc ==7.4.1 ghc ==7.4.2 ghc ==7.6.0 -homepage: https://github.com/mgajda/octree -package-url: http://hackage.haskell.org/package/octree -bug-reports: mailto:mjgajda@googlemail.com -synopsis: Simple unbalanced Octree for storing data about 3D points +name: Octree +version: 0.5 +license: BSD3 +license-file: LICENSE +copyright: Copyright by Michal J. Gajda '2012 +maintainer: mjgajda@googlemail.com +author: Michal J. Gajda +stability: beta +tested-with: ghc ==7.0.4 ghc ==7.4.1 ghc ==7.4.2 ghc ==7.6.0 +homepage: https://github.com/mgajda/octree +package-url: http://hackage.haskell.org/package/octree +bug-reports: mailto:mjgajda@googlemail.com +synopsis: Simple unbalanced Octree for storing data about 3D points description: Octree data structure is relatively shallow data structure for space partitioning. -category: Data -build-type: Simple +category: Data +build-type: Simple source-repository head - type: git + type: git location: git@github.com:mgajda/octree.git library - exposed-modules: - Data.Octree - other-modules: - Data.Octree.Internal - extensions: ScopedTypeVariables + exposed-modules: Data.Octree + other-modules: Data.Octree.Internal + extensions: ScopedTypeVariables build-depends: base >=4.0 && <4.7, AC-Vector >=2.3.0, QuickCheck >=2.4.0 test-suite test_Octree - type: exitcode-stdio-1.0 - main-is: tests/test_Octree.hs + type: exitcode-stdio-1.0 + main-is: tests/test_Octree.hs build-depends: base >=4.0 && <4.7, AC-Vector >=2.3.0, QuickCheck >=2.4.0 test-suite readme - type: exitcode-stdio-1.0 - main-is: README.lhs - ghc-options: -pgmL markdown-unlit + type: exitcode-stdio-1.0 + main-is: README.lhs + ghc-options: -pgmL markdown-unlit build-depends: base >=4.0 && <4.7, AC-Vector >=2.3.0, diff --git a/Cabal/tests/ParserTests/regressions/common.cabal b/Cabal/tests/ParserTests/regressions/common.cabal index 62c8ad9179e..73bd1c89b66 100644 --- a/Cabal/tests/ParserTests/regressions/common.cabal +++ b/Cabal/tests/ParserTests/regressions/common.cabal @@ -1,8 +1,11 @@ name: common version: 0 +x-revision: 1 synopsis: Common-stanza demo demo build-type: Simple cabal-version: >=1.10 +-- note: empty field +x-follows-version-policy: source-repository head Type: git diff --git a/Cabal/tests/ParserTests/regressions/common.expr b/Cabal/tests/ParserTests/regressions/common.expr index c7ab57f0ad2..c59ae52f66f 100644 --- a/Cabal/tests/ParserTests/regressions/common.expr +++ b/Cabal/tests/ParserTests/regressions/common.expr @@ -133,7 +133,8 @@ GenericPackageDescription buildTypeRaw = Just Simple, category = "", copyright = "", - customFieldsPD = [], + customFieldsPD = [_×_ "x-revision" "1", + _×_ "x-follows-version-policy" ""], dataDir = "", dataFiles = [], description = "", diff --git a/Cabal/tests/ParserTests/regressions/common.format b/Cabal/tests/ParserTests/regressions/common.format index 22870d7cfca..22ce6dad432 100644 --- a/Cabal/tests/ParserTests/regressions/common.format +++ b/Cabal/tests/ParserTests/regressions/common.format @@ -1,25 +1,24 @@ -common.cabal:26:3: Unknown field: import. You should set cabal-version: 2.2 or larger to use common stanzas -common.cabal:17:3: Unknown field: import. You should set cabal-version: 2.2 or larger to use common stanzas -common.cabal:11:1: Ignoring section: common. You should set cabal-version: 2.2 or larger to use common stanzas. -cabal-version: >=1.10 -name: common -version: 0 -synopsis: Common-stanza demo demo -build-type: Simple +common.cabal:29:3: Unknown field: import. You should set cabal-version: 2.2 or larger to use common stanzas +common.cabal:20:3: Unknown field: import. You should set cabal-version: 2.2 or larger to use common stanzas +common.cabal:14:1: Ignoring section: common. You should set cabal-version: 2.2 or larger to use common stanzas. +cabal-version: >=1.10 +name: common +version: 0 +synopsis: Common-stanza demo demo +x-revision: 1 +x-follows-version-policy: +build-type: Simple source-repository head - type: git + type: git location: https://github.com/hvr/-.git library - exposed-modules: - ElseIf + exposed-modules: ElseIf default-language: Haskell2010 - build-depends: - ghc-prim -any + build-depends: ghc-prim -any test-suite tests - type: exitcode-stdio-1.0 - main-is: Tests.hs - build-depends: - HUnit -any + type: exitcode-stdio-1.0 + main-is: Tests.hs + build-depends: HUnit -any diff --git a/Cabal/tests/ParserTests/regressions/common2.format b/Cabal/tests/ParserTests/regressions/common2.format index 616d7ac38b2..ce861761a1f 100644 --- a/Cabal/tests/ParserTests/regressions/common2.format +++ b/Cabal/tests/ParserTests/regressions/common2.format @@ -1,41 +1,37 @@ cabal-version: 2.1 -name: common -version: 0 -synopsis: Common-stanza demo demo -build-type: Simple +name: common +version: 0 +synopsis: Common-stanza demo demo +build-type: Simple source-repository head - type: git + type: git location: https://github.com/hvr/-.git library - exposed-modules: - ElseIf + exposed-modules: ElseIf default-language: Haskell2010 build-depends: base >=4.10 && <4.11, containers -any, ghc-prim -any - + if os(windows) - build-depends: - Win32 -any + build-depends: Win32 -any test-suite tests - type: exitcode-stdio-1.0 - main-is: Tests.hs + type: exitcode-stdio-1.0 + main-is: Tests.hs build-depends: base >=4.10 && <4.11, containers -any, HUnit -any - + if os(windows) - build-depends: - Win32 -any - + build-depends: Win32 -any + if os(windows) - build-depends: - Win32 -any - + build-depends: Win32 -any + if os(windows) buildable: False diff --git a/Cabal/tests/ParserTests/regressions/elif.format b/Cabal/tests/ParserTests/regressions/elif.format index 6f7fa62439a..e6cba2b3901 100644 --- a/Cabal/tests/ParserTests/regressions/elif.format +++ b/Cabal/tests/ParserTests/regressions/elif.format @@ -1,20 +1,18 @@ elif.cabal:19:3: invalid subsection "else" elif.cabal:17:3: invalid subsection "elif". You should set cabal-version: 2.2 or larger to use elif-conditionals. cabal-version: >=1.10 -name: elif -version: 0 -synopsis: The elif demo -build-type: Simple +name: elif +version: 0 +synopsis: The elif demo +build-type: Simple source-repository head - type: git + type: git location: https://github.com/hvr/-.git library - exposed-modules: - ElseIf + exposed-modules: ElseIf default-language: Haskell2010 - + if os(linux) - build-depends: - unix -any + build-depends: unix -any diff --git a/Cabal/tests/ParserTests/regressions/elif2.format b/Cabal/tests/ParserTests/regressions/elif2.format index b83094712df..615b4d26e63 100644 --- a/Cabal/tests/ParserTests/regressions/elif2.format +++ b/Cabal/tests/ParserTests/regressions/elif2.format @@ -1,25 +1,23 @@ cabal-version: 2.1 -name: elif -version: 0 -synopsis: The elif demo -build-type: Simple +name: elif +version: 0 +synopsis: The elif demo +build-type: Simple source-repository head - type: git + type: git location: https://github.com/hvr/-.git library - exposed-modules: - ElseIf + exposed-modules: ElseIf default-language: Haskell2010 - + if os(linux) - build-depends: - unix -any + build-depends: unix -any + else - if os(windows) - build-depends: - Win32 -any + build-depends: Win32 -any + else buildable: False diff --git a/Cabal/tests/ParserTests/regressions/encoding-0.8.format b/Cabal/tests/ParserTests/regressions/encoding-0.8.format index 3fe5dbcb94b..1b5a897f786 100644 --- a/Cabal/tests/ParserTests/regressions/encoding-0.8.format +++ b/Cabal/tests/ParserTests/regressions/encoding-0.8.format @@ -1,19 +1,18 @@ encoding-0.8.cabal:1:1: The field "name" is specified more than once at positions 1:1, 2:1 -cabal-version: >=1.12 -name: encoding -version: 0.8 +cabal-version: >=1.12 +name: encoding +version: 0.8 extra-source-files: README.md "--" "--" custom-setup - setup-depends: base <5, - ghc-prim -any + setup-depends: + base <5, + ghc-prim -any library - exposed-modules: - Data.Encoding - ghc-options: -Wall -O2 -threaded -rtsopts "-with-rtsopts=-N1 -A64m" - build-depends: - base (>4.4 || ==4.4) + exposed-modules: Data.Encoding + ghc-options: -Wall -O2 -threaded -rtsopts "-with-rtsopts=-N1 -A64m" + build-depends: base (>4.4 || ==4.4) diff --git a/Cabal/tests/ParserTests/regressions/generics-sop.format b/Cabal/tests/ParserTests/regressions/generics-sop.format index e388c37569e..6e3d53664b4 100644 --- a/Cabal/tests/ParserTests/regressions/generics-sop.format +++ b/Cabal/tests/ParserTests/regressions/generics-sop.format @@ -1,13 +1,15 @@ -cabal-version: >=1.10 -name: generics-sop -version: 0.3.1.0 -license: BSD3 -license-file: LICENSE -maintainer: andres@well-typed.com -author: Edsko de Vries , Andres Löh -tested-with: ghc ==7.8.4 ghc ==7.10.3 ghc ==8.0.1 ghc ==8.0.2 - ghc ==8.2.1 ghc ==8.3.* -synopsis: Generic Programming using True Sums of Products +cabal-version: >=1.10 +name: generics-sop +version: 0.3.1.0 +license: BSD3 +license-file: LICENSE +maintainer: andres@well-typed.com +author: + Edsko de Vries , Andres Löh +tested-with: + ghc ==7.8.4 ghc ==7.10.3 ghc ==8.0.1 ghc ==8.0.2 ghc ==8.2.1 + ghc ==8.3.* +synopsis: Generic Programming using True Sums of Products description: A library to support the definition of generic functions. Datatypes are viewed in a uniform, structured way: @@ -36,19 +38,19 @@ description: . Workshop on Generic Programming (WGP) 2014. . -category: Generics -build-type: Custom -extra-source-files: - CHANGELOG.md +category: Generics +build-type: Custom +extra-source-files: CHANGELOG.md source-repository head - type: git + type: git location: https://github.com/well-typed/generics-sop custom-setup - setup-depends: base -any, - Cabal -any, - cabal-doctest >=1.0.2 && <1.1 + setup-depends: + base -any, + Cabal -any, + cabal-doctest >=1.0.2 && <1.1 library exposed-modules: @@ -66,56 +68,56 @@ library Generics.SOP.NS Generics.SOP.Universe Generics.SOP.Sing - hs-source-dirs: src - default-language: Haskell2010 - default-extensions: CPP ScopedTypeVariables TypeFamilies RankNTypes - TypeOperators GADTs ConstraintKinds MultiParamTypeClasses - TypeSynonymInstances FlexibleInstances FlexibleContexts - DeriveFunctor DeriveFoldable DeriveTraversable DefaultSignatures - KindSignatures DataKinds FunctionalDependencies - other-extensions: OverloadedStrings PolyKinds UndecidableInstances - TemplateHaskell DeriveGeneric StandaloneDeriving - ghc-options: -Wall + hs-source-dirs: src + default-language: Haskell2010 + default-extensions: + CPP ScopedTypeVariables TypeFamilies RankNTypes TypeOperators GADTs + ConstraintKinds MultiParamTypeClasses TypeSynonymInstances + FlexibleInstances FlexibleContexts DeriveFunctor DeriveFoldable + DeriveTraversable DefaultSignatures KindSignatures DataKinds + FunctionalDependencies + other-extensions: + OverloadedStrings PolyKinds UndecidableInstances TemplateHaskell + DeriveGeneric StandaloneDeriving + ghc-options: -Wall build-depends: base >=4.7 && <5, template-haskell >=2.8 && <2.13, ghc-prim >=0.3 && <0.6, deepseq >=1.3 && <1.5 - + if !impl(ghc >=7.8) - build-depends: - tagged >=0.7 && <0.9 - + build-depends: tagged >=0.7 && <0.9 + if !impl(ghc >=8.0) build-depends: transformers-compat >=0.3 && <0.6, transformers >=0.3 && <0.6 - + if impl(ghc >=7.8) default-extensions: AutoDeriveTypeable - + if impl(ghc <7.10) other-extensions: OverlappingInstances test-suite doctests - type: exitcode-stdio-1.0 - main-is: doctests.hs - hs-source-dirs: test - default-language: Haskell2010 - ghc-options: -Wall -threaded + type: exitcode-stdio-1.0 + main-is: doctests.hs + hs-source-dirs: test + default-language: Haskell2010 + ghc-options: -Wall -threaded x-doctest-options: --preserve-it build-depends: base -any, doctest >=0.13 && <0.14 test-suite generics-sop-examples - type: exitcode-stdio-1.0 - main-is: Example.hs - hs-source-dirs: test - other-modules: - HTransExample + type: exitcode-stdio-1.0 + main-is: Example.hs + hs-source-dirs: test + other-modules: HTransExample default-language: Haskell2010 - ghc-options: -Wall + ghc-options: -Wall build-depends: base >=4.6 && <5, generics-sop -any diff --git a/Cabal/tests/ParserTests/regressions/issue-5055.format b/Cabal/tests/ParserTests/regressions/issue-5055.format index 558c0c371e5..2b49468fdc1 100644 --- a/Cabal/tests/ParserTests/regressions/issue-5055.format +++ b/Cabal/tests/ParserTests/regressions/issue-5055.format @@ -1,24 +1,21 @@ cabal-version: >=2.0 -name: issue -version: 5055 -license: BSD3 -synopsis: no type in all branches -description: - no type in all branches. -category: Test -build-type: Simple +name: issue +version: 5055 +license: BSD3 +synopsis: no type in all branches +description: no type in all branches. +category: Test +build-type: Simple executable flag-test-exe - main-is: FirstMain.hs + main-is: FirstMain.hs default-language: Haskell2010 - build-depends: - base >=4.8 && <5 + build-depends: base >=4.8 && <5 test-suite flag-cabal-test - type: exitcode-stdio-1.0 - main-is: SecondMain.hs + type: exitcode-stdio-1.0 + main-is: SecondMain.hs default-language: Haskell2010 - build-depends: - base >=4.8 && <5 - + build-depends: base >=4.8 && <5 + if os(windows) diff --git a/Cabal/tests/ParserTests/regressions/issue-774.format b/Cabal/tests/ParserTests/regressions/issue-774.format index af2641d7235..dac948c2c5a 100644 --- a/Cabal/tests/ParserTests/regressions/issue-774.format +++ b/Cabal/tests/ParserTests/regressions/issue-774.format @@ -1,7 +1,8 @@ cabal-version: >=1.12 -name: issue -version: 744 -synopsis: Package description parser interprets curly braces in the description field +name: issue +version: 744 +synopsis: + Package description parser interprets curly braces in the description field description: Here is some C code: . @@ -10,10 +11,9 @@ description: > } . What does it look like? -build-type: Simple +build-type: Simple library - exposed-modules: - Issue + exposed-modules: Issue default-language: Haskell2010 - ghc-options: -Wall -threaded "-with-rtsopts=-N -s -M1G -c" -rtsopts + ghc-options: -Wall -threaded "-with-rtsopts=-N -s -M1G -c" -rtsopts diff --git a/Cabal/tests/ParserTests/regressions/jaeger-flamegraph.format b/Cabal/tests/ParserTests/regressions/jaeger-flamegraph.format index d0d0eee4acc..541a927814d 100644 --- a/Cabal/tests/ParserTests/regressions/jaeger-flamegraph.format +++ b/Cabal/tests/ParserTests/regressions/jaeger-flamegraph.format @@ -1,14 +1,14 @@ cabal-version: 2.2 -name: jaeger-flamegraph -version: 1.0.0 -license: BSD-3-Clause -license-file: LICENSE -copyright: (c) 2018 Symbiont.io -maintainer: Sam Halliday -author: Sam Halliday -tested-with: ghc ^>=8.4.4 || ^>=8.6.2 -bug-reports: https://github.com/symbiont-io/jaeger-flamegraph/pulls -synopsis: Generate flamegraphs from Jaeger .json dumps. +name: jaeger-flamegraph +version: 1.0.0 +license: BSD-3-Clause +license-file: LICENSE +copyright: (c) 2018 Symbiont.io +maintainer: Sam Halliday +author: Sam Halliday +tested-with: ghc ^>=8.4.4 || ^>=8.6.2 +bug-reports: https://github.com/symbiont-io/jaeger-flamegraph/pulls +synopsis: Generate flamegraphs from Jaeger .json dumps. description: This is a small tool to convert JSON dumps obtained from a Jaeger server () into a format consumable @@ -23,27 +23,26 @@ description: . > $ jaeger-flamegraph -f input.json | flamegraph.pl > output.svg . -category: Testing +category: Testing source-repository head - type: git + type: git location: https://github.com/symbiont-io/jaeger-flamegraph library - exposed-modules: - Interval - hs-source-dirs: library + exposed-modules: Interval + hs-source-dirs: library default-language: Haskell2010 - ghc-options: -Wall -Werror=missing-home-modules + ghc-options: -Wall -Werror=missing-home-modules build-depends: base ^>=4.11.1.0 || ^>=4.12.0.0, QuickCheck ^>=2.12.6.1 executable jaeger-flamegraph - main-is: Main.hs - hs-source-dirs: exe + main-is: Main.hs + hs-source-dirs: exe default-language: Haskell2010 - ghc-options: -Wall -Werror=missing-home-modules -threaded + ghc-options: -Wall -Werror=missing-home-modules -threaded build-depends: base ^>=4.11.1.0 || ^>=4.12.0.0, jaeger-flamegraph -any, @@ -55,14 +54,13 @@ executable jaeger-flamegraph text ^>=1.2.3.1 test-suite tests - type: exitcode-stdio-1.0 - main-is: Driver.hs + type: exitcode-stdio-1.0 + main-is: Driver.hs build-tool-depends: tasty-discover:tasty-discover ^>=4.2.1 - hs-source-dirs: test - other-modules: - IntervalTest - default-language: Haskell2010 - ghc-options: -Wall -Werror=missing-home-modules -threaded + hs-source-dirs: test + other-modules: IntervalTest + default-language: Haskell2010 + ghc-options: -Wall -Werror=missing-home-modules -threaded build-depends: base ^>=4.11.1.0 || ^>=4.12.0.0, jaeger-flamegraph -any, diff --git a/Cabal/tests/ParserTests/regressions/leading-comma.format b/Cabal/tests/ParserTests/regressions/leading-comma.format index 5080176480c..da805109807 100644 --- a/Cabal/tests/ParserTests/regressions/leading-comma.format +++ b/Cabal/tests/ParserTests/regressions/leading-comma.format @@ -1,12 +1,11 @@ cabal-version: 2.1 -name: leading-comma -version: 0 -synopsis: leading comma, trailing comma, or ordinary -build-type: Simple +name: leading-comma +version: 0 +synopsis: leading comma, trailing comma, or ordinary +build-type: Simple library - exposed-modules: - LeadingComma + exposed-modules: LeadingComma default-language: Haskell2010 build-depends: base -any, diff --git a/Cabal/tests/ParserTests/regressions/noVersion.format b/Cabal/tests/ParserTests/regressions/noVersion.format index 3aacd6b5f3b..5847397dbef 100644 --- a/Cabal/tests/ParserTests/regressions/noVersion.format +++ b/Cabal/tests/ParserTests/regressions/noVersion.format @@ -1,12 +1,10 @@ cabal-version: 1.22 -name: noVersion -version: 0 -synopsis: -none in build-depends -build-type: Simple +name: noVersion +version: 0 +synopsis: -none in build-depends +build-type: Simple library - exposed-modules: - ElseIf + exposed-modules: ElseIf default-language: Haskell2010 - build-depends: - bad-package >1 && <1 + build-depends: bad-package >1 && <1 diff --git a/Cabal/tests/ParserTests/regressions/nothing-unicode.format b/Cabal/tests/ParserTests/regressions/nothing-unicode.format index f314547b12f..071b357dbcf 100644 --- a/Cabal/tests/ParserTests/regressions/nothing-unicode.format +++ b/Cabal/tests/ParserTests/regressions/nothing-unicode.format @@ -1,22 +1,20 @@ cabal-version: >=1.10 -name: 無 -version: 0 -synopsis: The canonical non-package 無 -x-無: 無 -build-type: Simple +name: 無 +version: 0 +synopsis: The canonical non-package 無 +x-無: 無 +build-type: Simple source-repository head - type: git + type: git location: https://github.com/hvr/-.git flag 無 - description: - 無 + description: 無 library - exposed-modules: - Ω + exposed-modules: Ω default-language: Haskell2010 - + if !flag(無) buildable: False diff --git a/Cabal/tests/ParserTests/regressions/shake.format b/Cabal/tests/ParserTests/regressions/shake.format index c646143465c..813836c6043 100644 --- a/Cabal/tests/ParserTests/regressions/shake.format +++ b/Cabal/tests/ParserTests/regressions/shake.format @@ -1,16 +1,17 @@ -cabal-version: >=1.18 -name: shake -version: 0.15.11 -license: BSD3 -license-file: LICENSE -copyright: Neil Mitchell 2011-2017 -maintainer: Neil Mitchell -author: Neil Mitchell -tested-with: ghc ==8.0.1 ghc ==7.10.3 ghc ==7.8.4 ghc ==7.6.3 - ghc ==7.4.2 -homepage: http://shakebuild.com -bug-reports: https://github.com/ndmitchell/shake/issues -synopsis: Build system library, like Make, but more accurate dependencies. +cabal-version: >=1.18 +name: shake +version: 0.15.11 +license: BSD3 +license-file: LICENSE +copyright: Neil Mitchell 2011-2017 +maintainer: Neil Mitchell +author: Neil Mitchell +tested-with: + ghc ==8.0.1 ghc ==7.10.3 ghc ==7.8.4 ghc ==7.6.3 ghc ==7.4.2 +homepage: http://shakebuild.com +bug-reports: https://github.com/ndmitchell/shake/issues +synopsis: + Build system library, like Make, but more accurate dependencies. description: Shake is a Haskell library for writing build systems - designed as a replacement for @make@. See "Development.Shake" for an introduction, @@ -31,8 +32,8 @@ description: Shake also provides more accurate dependency tracking, including seamless support for generated files, and dependencies on system information (e.g. compiler version). -category: Development, Shake -build-type: Simple +category: Development, Shake +build-type: Simple data-files: html/viz.js html/profile.html @@ -65,18 +66,18 @@ extra-source-files: src/Paths.hs docs/Manual.md docs/shake-progress.png -extra-doc-files: CHANGES.txt - README.md +extra-doc-files: + CHANGES.txt + README.md source-repository head - type: git + type: git location: https://github.com/ndmitchell/shake.git flag portable - description: - Obtain FileTime using portable functions - default: False - manual: True + description: Obtain FileTime using portable functions + default: False + manual: True library exposed-modules: @@ -88,7 +89,7 @@ library Development.Shake.Forward Development.Shake.Rule Development.Shake.Util - hs-source-dirs: src + hs-source-dirs: src other-modules: Development.Ninja.Env Development.Ninja.Lexer @@ -150,26 +151,23 @@ library transformers >=0.2, extra >=1.4.8, deepseq >=1.1 - + if flag(portable) cpp-options: -DPORTABLE - + if impl(ghc <7.6) - build-depends: - old-time -any + build-depends: old-time -any + else - if !os(windows) - build-depends: - unix >=2.5.1 - + build-depends: unix >=2.5.1 + if !os(windows) - build-depends: - unix -any + build-depends: unix -any executable shake - main-is: Run.hs - hs-source-dirs: src + main-is: Run.hs + hs-source-dirs: src other-modules: Development.Make.All Development.Make.Env @@ -227,7 +225,7 @@ executable shake Paths_shake Run default-language: Haskell2010 - ghc-options: -main-is Run.main -rtsopts + ghc-options: -main-is Run.main -rtsopts build-depends: base ==4.*, directory -any, @@ -246,30 +244,27 @@ executable shake extra >=1.4.8, deepseq >=1.1, primitive -any - + if impl(ghc >=7.8) ghc-options: -threaded "-with-rtsopts=-I0 -qg -qb" - + if flag(portable) cpp-options: -DPORTABLE - + if impl(ghc <7.6) - build-depends: - old-time -any + build-depends: old-time -any + else - if !os(windows) - build-depends: - unix >=2.5.1 - + build-depends: unix >=2.5.1 + if !os(windows) - build-depends: - unix -any + build-depends: unix -any test-suite shake-test - type: exitcode-stdio-1.0 - main-is: Test.hs - hs-source-dirs: src + type: exitcode-stdio-1.0 + main-is: Test.hs + hs-source-dirs: src other-modules: Development.Make.All Development.Make.Env @@ -368,7 +363,7 @@ test-suite shake-test Test.Verbosity Test.Version default-language: Haskell2010 - ghc-options: -main-is Test.main -rtsopts + ghc-options: -main-is Test.main -rtsopts build-depends: base ==4.*, directory -any, @@ -387,25 +382,22 @@ test-suite shake-test deepseq >=1.1, extra >=1.4.8, QuickCheck >=2.0 - + if impl(ghc >=7.6) ghc-options: -with-rtsopts=-K1K - + if impl(ghc >=7.8) ghc-options: -threaded - + if flag(portable) cpp-options: -DPORTABLE - + if impl(ghc <7.6) - build-depends: - old-time -any + build-depends: old-time -any + else - if !os(windows) - build-depends: - unix >=2.5.1 - + build-depends: unix >=2.5.1 + if !os(windows) - build-depends: - unix -any + build-depends: unix -any diff --git a/Cabal/tests/ParserTests/regressions/spdx-1.format b/Cabal/tests/ParserTests/regressions/spdx-1.format index 69e9c5a649a..d1630338d06 100644 --- a/Cabal/tests/ParserTests/regressions/spdx-1.format +++ b/Cabal/tests/ParserTests/regressions/spdx-1.format @@ -1,9 +1,9 @@ cabal-version: 2.0 -name: spdx -version: 0 -license: BSD3 -synopsis: testing positive parsing of spdx identifiers -build-type: Simple +name: spdx +version: 0 +license: BSD3 +synopsis: testing positive parsing of spdx identifiers +build-type: Simple library default-language: Haskell2010 diff --git a/Cabal/tests/ParserTests/regressions/spdx-2.format b/Cabal/tests/ParserTests/regressions/spdx-2.format index e5da361cc14..ffa7db4370d 100644 --- a/Cabal/tests/ParserTests/regressions/spdx-2.format +++ b/Cabal/tests/ParserTests/regressions/spdx-2.format @@ -1,9 +1,9 @@ cabal-version: 2.2 -name: spdx -version: 0 -license: AGPL-1.0 -synopsis: testing positive parsing of spdx identifiers -build-type: Simple +name: spdx +version: 0 +license: AGPL-1.0 +synopsis: testing positive parsing of spdx identifiers +build-type: Simple library default-language: Haskell2010 diff --git a/Cabal/tests/ParserTests/regressions/spdx-3.format b/Cabal/tests/ParserTests/regressions/spdx-3.format index 3d9497e46b1..e4ddde6dc91 100644 --- a/Cabal/tests/ParserTests/regressions/spdx-3.format +++ b/Cabal/tests/ParserTests/regressions/spdx-3.format @@ -1,9 +1,9 @@ cabal-version: 2.4 -name: spdx -version: 0 -license: AGPL-1.0-only -synopsis: testing positive parsing of spdx identifiers -build-type: Simple +name: spdx +version: 0 +license: AGPL-1.0-only +synopsis: testing positive parsing of spdx identifiers +build-type: Simple library default-language: Haskell2010 diff --git a/Cabal/tests/ParserTests/regressions/th-lift-instances.format b/Cabal/tests/ParserTests/regressions/th-lift-instances.format index f32efc68b79..9fa06388b8d 100644 --- a/Cabal/tests/ParserTests/regressions/th-lift-instances.format +++ b/Cabal/tests/ParserTests/regressions/th-lift-instances.format @@ -1,22 +1,22 @@ th-lift-instances.cabal:15:9: Tabs used as indentation at 15:9 -cabal-version: >=1.10 -name: th-lift-instances -version: 0.1.4 -license: BSD3 -license-file: LICENSE -copyright: Copyright (C) 2013-2014 Benno Fünfstück -maintainer: Benno Fünfstück -author: Benno Fünfstück -stability: experimental -homepage: http://github.com/bennofs/th-lift-instances/ -bug-reports: http://github.com/bennofs/th-lift-instances/issues -synopsis: Lift instances for template-haskell for common data types. +cabal-version: >=1.10 +name: th-lift-instances +version: 0.1.4 +license: BSD3 +license-file: LICENSE +copyright: Copyright (C) 2013-2014 Benno Fünfstück +maintainer: Benno Fünfstück +author: Benno Fünfstück +stability: experimental +homepage: http://github.com/bennofs/th-lift-instances/ +bug-reports: http://github.com/bennofs/th-lift-instances/issues +synopsis: Lift instances for template-haskell for common data types. description: Most data types in haskell platform do not have Lift instances. This package provides orphan instances for containers, text, bytestring and vector. -category: Template Haskell -x-revision: 1 -build-type: Custom +category: Template Haskell +x-revision: 1 +build-type: Custom extra-source-files: .ghci .gitignore @@ -25,16 +25,15 @@ extra-source-files: README.md source-repository head - type: git + type: git location: https://github.com/bennofs/th-lift-instances.git library - exposed-modules: - Instances.TH.Lift - hs-source-dirs: src + exposed-modules: Instances.TH.Lift + hs-source-dirs: src default-language: Haskell2010 other-extensions: TemplateHaskell - ghc-options: -Wall -fwarn-tabs + ghc-options: -Wall -fwarn-tabs build-depends: base >=4.4 && <5, template-haskell <2.10, @@ -45,11 +44,10 @@ library bytestring >=0.9 && <0.11 test-suite tests - type: exitcode-stdio-1.0 - main-is: Main.hs - hs-source-dirs: tests - other-modules: - Data + type: exitcode-stdio-1.0 + main-is: Main.hs + hs-source-dirs: tests + other-modules: Data default-language: Haskell2010 other-extensions: TemplateHaskell build-depends: @@ -63,16 +61,16 @@ test-suite tests QuickCheck >=2.6 && <2.8 test-suite doctests - type: exitcode-stdio-1.0 - main-is: doctests.hs - hs-source-dirs: tests + type: exitcode-stdio-1.0 + main-is: doctests.hs + hs-source-dirs: tests default-language: Haskell2010 - ghc-options: -Wall -threaded + ghc-options: -Wall -threaded build-depends: base -any, directory >=1.0, doctest >=0.9.1, filepath -any - + if impl(ghc <7.6.1) ghc-options: -Werror diff --git a/Cabal/tests/ParserTests/regressions/wl-pprint-indef.format b/Cabal/tests/ParserTests/regressions/wl-pprint-indef.format index d0ad2f213f6..129c82d19d9 100644 --- a/Cabal/tests/ParserTests/regressions/wl-pprint-indef.format +++ b/Cabal/tests/ParserTests/regressions/wl-pprint-indef.format @@ -2,36 +2,34 @@ wl-pprint-indef.cabal:28:3: The field "mixins" is available only since the Cabal wl-pprint-indef.cabal:27:3: The field "signatures" is available only since the Cabal specification version 2.0. wl-pprint-indef.cabal:23:3: The field "mixins" is available only since the Cabal specification version 2.0. cabal-version: >=1.6 -name: wl-pprint-indef -version: 1.2 -license: BSD3 -license-file: LICENSE -maintainer: Noam Lewis -author: Daan Leijen -synopsis: The Wadler/Leijen Pretty Printer +name: wl-pprint-indef +version: 1.2 +license: BSD3 +license-file: LICENSE +maintainer: Noam Lewis +author: Daan Leijen +synopsis: The Wadler/Leijen Pretty Printer description: This is a pretty printing library based on Wadler's paper "A Prettier Printer". See the haddocks for full info. This version allows the library user to declare overlapping instances of the 'Pretty' class. -category: Text -build-type: Simple +category: Text +build-type: Simple source-repository head - type: git + type: git location: git@github.com:danidiaz/wl-pprint-indef.git library - exposed-modules: - Text.PrettyPrint.Leijen + exposed-modules: Text.PrettyPrint.Leijen build-depends: base <5, str-sig >=0.1.0.0 executable wl-pprint-string-example - main-is: Main.hs + main-is: Main.hs hs-source-dirs: example-string - other-modules: - StringImpl + other-modules: StringImpl build-depends: base <5, str-string >=0.1.0.0,