Cabal 2.0.1.1 → 2.2.0.0

raw patch · 559 files changed

+27500/−49485 lines, 559 filesdep +Diffdep +base-compatdep +base-orphansdep −generics-sopdep −keysdep −singleton-booldep ~QuickCheckdep ~Win32dep ~arrayPVP ok

version bump matches the API change (PVP)

Dependencies added: Diff, base-compat, base-orphans, integer-logarithms, mtl, optparse-applicative, tasty-golden, text, tree-diff

Dependencies removed: generics-sop, keys, singleton-bool, these

Dependency ranges changed: QuickCheck, Win32, array, base, binary, bytestring, containers, deepseq, directory, filepath, old-time, parsec, pretty, process, tar, tasty, transformers, unix

API changes (from Hackage documentation)

Files

• Cabal.cabal +250/−76
• ChangeLog.md +771/−0
• Distribution/Backpack.hs +88/−23
• Distribution/Backpack/ConfiguredComponent.hs +6/−1
• Distribution/Backpack/LinkedComponent.hs +68/−62
• Distribution/Backpack/MixLink.hs +26/−33
• Distribution/Backpack/ModuleScope.hs +61/−18
• Distribution/Backpack/PreModuleShape.hs +45/−0
• Distribution/Backpack/UnifyM.hs +18/−30
• Distribution/CabalSpecVersion.hs +66/−0
• Distribution/Compat/Binary/Class.hs +49/−49
• Distribution/Compat/CharParsing.hs +356/−0
• Distribution/Compat/CopyFile.hs +69/−23
• Distribution/Compat/DList.hs +8/−0
• Distribution/Compat/Directory.hs +27/−0
• Distribution/Compat/Environment.hs +9/−0
• Distribution/Compat/Lens.hs +254/−0
• Distribution/Compat/Map/Strict.hs +5/−0
• Distribution/Compat/Newtype.hs +70/−0
• Distribution/Compat/Parsec.hs +0/−73
• Distribution/Compat/Parsing.hs +403/−0
• Distribution/Compat/Prelude.hs +3/−2
• Distribution/Compat/ReadP.hs +12/−4
• Distribution/Compiler.hs +21/−6
• Distribution/FieldGrammar.hs +85/−0
• Distribution/FieldGrammar/Class.hs +147/−0
• Distribution/FieldGrammar/FieldDescrs.hs +86/−0
• Distribution/FieldGrammar/Parsec.hs +297/−0
• Distribution/FieldGrammar/Pretty.hs +80/−0
• Distribution/InstalledPackageInfo.hs +47/−414
• Distribution/License.hs +118/−16
• Distribution/Make.hs +2/−0
• Distribution/ModuleName.hs +18/−5
• Distribution/Package.hs +1/−1
• Distribution/PackageDescription.hs +9/−6
• Distribution/PackageDescription/Check.hs +272/−197
• Distribution/PackageDescription/Configuration.hs +5/−5
• Distribution/PackageDescription/FieldGrammar.hs +532/−0
• Distribution/PackageDescription/Parse.hs +0/−1309
• Distribution/PackageDescription/Parsec.hs +587/−326
• Distribution/PackageDescription/Parsec/FieldDescr.hs +0/−619
• Distribution/PackageDescription/PrettyPrint.hs +116/−257
• Distribution/PackageDescription/Quirks.hs +203/−0
• Distribution/ParseUtils.hs +12/−1
• Distribution/Parsec/Class.hs +271/−400
• Distribution/Parsec/Common.hs +100/−0
• Distribution/Parsec/ConfVar.hs +25/−43
• Distribution/Parsec/Field.hs +96/−0
• Distribution/Parsec/FieldLineStream.hs +96/−0
• Distribution/Parsec/Lexer.hs +422/−0
• Distribution/Parsec/Lexer.x +0/−269
• Distribution/Parsec/LexerMonad.hs +26/−18
• Distribution/Parsec/Newtypes.hs +278/−0
• Distribution/Parsec/ParseResult.hs +142/−0
• Distribution/Parsec/Parser.hs +24/−49
• Distribution/Parsec/Types/Common.hs +0/−89
• Distribution/Parsec/Types/Field.hs +0/−82
• Distribution/Parsec/Types/FieldDescr.hs +0/−238
• Distribution/Parsec/Types/ParseResult.hs +0/−87
• Distribution/Pretty.hs +95/−0
• Distribution/PrettyUtils.hs +3/−44
• Distribution/ReadE.hs +13/−2
• Distribution/SPDX.hs +34/−0
• Distribution/SPDX/License.hs +64/−0
• Distribution/SPDX/LicenseExceptionId.hs +143/−0
• Distribution/SPDX/LicenseExpression.hs +158/−0
• Distribution/SPDX/LicenseId.hs +1485/−0
• Distribution/SPDX/LicenseReference.hs +79/−0
• Distribution/Simple.hs +83/−45
• Distribution/Simple/Build.hs +10/−1
• Distribution/Simple/Build/PathsModule.hs +24/−11
• Distribution/Simple/BuildPaths.hs +27/−7
• Distribution/Simple/BuildTarget.hs +4/−0
• Distribution/Simple/Compiler.hs +25/−4
• Distribution/Simple/Configure.hs +113/−54
• Distribution/Simple/GHC.hs +100/−15
• Distribution/Simple/GHC/IPIConvert.hs +9/−8
• Distribution/Simple/GHC/Internal.hs +66/−14
• Distribution/Simple/GHCJS.hs +6/−7
• Distribution/Simple/Haddock.hs +31/−37
• Distribution/Simple/HaskellSuite.hs +2/−2
• Distribution/Simple/Install.hs +9/−7
• Distribution/Simple/InstallDirs.hs +15/−3
• Distribution/Simple/JHC.hs +9/−9
• Distribution/Simple/LHC.hs +8/−8
• Distribution/Simple/PackageIndex.hs +2/−2
• Distribution/Simple/PreProcess.hs +2/−1
• Distribution/Simple/Program.hs +9/−10
• Distribution/Simple/Program/Ar.hs +27/−6
• Distribution/Simple/Program/GHC.hs +25/−8
• Distribution/Simple/Program/HcPkg.hs +1/−5
• Distribution/Simple/Program/Ld.hs +34/−9
• Distribution/Simple/Program/ResponseFile.hs +60/−0
• Distribution/Simple/Program/Run.hs +31/−27
• Distribution/Simple/Register.hs +20/−5
• Distribution/Simple/Setup.hs +172/−183
• Distribution/Simple/SrcDist.hs +1/−1
• Distribution/Simple/Test.hs +4/−4
• Distribution/Simple/Test/ExeV10.hs +2/−2
• Distribution/Simple/Test/LibV09.hs +2/−2
• Distribution/Simple/UHC.hs +4/−4
• Distribution/Simple/Utils.hs +91/−48
• Distribution/System.hs +54/−15
• Distribution/Text.hs +17/−23
• Distribution/Types/AbiDependency.hs +52/−0
• Distribution/Types/AbiHash.hs +13/−2
• Distribution/Types/AnnotatedId.hs +9/−0
• Distribution/Types/Benchmark.hs +7/−0
• Distribution/Types/Benchmark/Lens.hs +27/−0
• Distribution/Types/BenchmarkInterface.hs +2/−0
• Distribution/Types/BenchmarkType.hs +17/−8
• Distribution/Types/BuildInfo.hs +54/−0
• Distribution/Types/BuildInfo/Lens.hs +316/−0
• Distribution/Types/BuildType.hs +35/−16
• Distribution/Types/Component.hs +9/−0
• Distribution/Types/ComponentId.hs +10/−2
• Distribution/Types/ComponentName.hs +9/−7
• Distribution/Types/CondTree.hs +4/−0
• Distribution/Types/Condition.hs +2/−0
• Distribution/Types/Dependency.hs +13/−5
• Distribution/Types/ExeDependency.hs +23/−12
• Distribution/Types/Executable.hs +7/−0
• Distribution/Types/Executable/Lens.hs +32/−0
• Distribution/Types/ExecutableScope.hs +28/−19
• Distribution/Types/ExposedModule.hs +57/−0
• Distribution/Types/ForeignLib.hs +35/−10
• Distribution/Types/ForeignLib/Lens.hs +45/−0
• Distribution/Types/ForeignLibOption.hs +17/−4
• Distribution/Types/ForeignLibType.hs +21/−6
• Distribution/Types/GenericPackageDescription.hs +190/−24
• Distribution/Types/GenericPackageDescription/Lens.hs +121/−0
• Distribution/Types/IncludeRenaming.hs +29/−12
• Distribution/Types/InstalledPackageInfo.hs +168/−0
• Distribution/Types/InstalledPackageInfo/FieldGrammar.hs +262/−0
• Distribution/Types/InstalledPackageInfo/Lens.hs +179/−0
• Distribution/Types/LegacyExeDependency.hs +29/−15
• Distribution/Types/Lens.hs +25/−0
• Distribution/Types/Library.hs +15/−8
• Distribution/Types/Library/Lens.hs +40/−0
• Distribution/Types/LocalBuildInfo.hs +6/−2
• Distribution/Types/Mixin.hs +22/−9
• Distribution/Types/Module.hs +14/−2
• Distribution/Types/ModuleReexport.hs +27/−9
• Distribution/Types/ModuleRenaming.hs +61/−12
• Distribution/Types/MungedPackageName.hs +14/−7
• Distribution/Types/PackageDescription.hs +87/−36
• Distribution/Types/PackageDescription/Lens.hs +150/−0
• Distribution/Types/PackageId.hs +6/−4
• Distribution/Types/PackageId/Lens.hs +22/−0
• Distribution/Types/PackageName.hs +8/−1
• Distribution/Types/PkgconfigDependency.hs +22/−10
• Distribution/Types/PkgconfigName.hs +13/−4
• Distribution/Types/SetupBuildInfo.hs +10/−7
• Distribution/Types/SetupBuildInfo/Lens.hs +21/−0
• Distribution/Types/SourceRepo.hs +32/−13
• Distribution/Types/SourceRepo/Lens.hs +39/−0
• Distribution/Types/TestSuite.hs +7/−0
• Distribution/Types/TestSuite/Lens.hs +27/−0
• Distribution/Types/TestSuiteInterface.hs +1/−0
• Distribution/Types/TestType.hs +19/−9
• Distribution/Types/UnitId.hs +20/−3
• Distribution/Types/UnqualComponentName.hs +12/−7
• Distribution/Types/Version.hs +255/−0
• Distribution/Types/VersionInterval.hs +361/−0
• Distribution/Types/VersionRange.hs +586/−0
• Distribution/Utils/Generic.hs +165/−105
• Distribution/Utils/IOData.hs +73/−0
• Distribution/Utils/String.hs +12/−4
• Distribution/Verbosity.hs +37/−6
• Distribution/Version.hs +262/−1086
• Language/Haskell/Extension.hs +166/−120
• changelog +0/−671
• dist/build/Distribution/Parsec/Lexer.hs +0/−491
• doc/API/Cabal/Cabal.haddock binary
• doc/API/Cabal/Distribution-Backpack-ComponentsGraph.html +0/−11
• doc/API/Cabal/Distribution-Backpack-Configure.html +0/−5
• doc/API/Cabal/Distribution-Backpack-ConfiguredComponent.html +0/−16
• doc/API/Cabal/Distribution-Backpack-DescribeUnitId.html +0/−8
• doc/API/Cabal/Distribution-Backpack-FullUnitId.html +0/−4
• doc/API/Cabal/Distribution-Backpack-LinkedComponent.html +0/−20
• doc/API/Cabal/Distribution-Backpack-ModSubst.html +0/−5
• doc/API/Cabal/Distribution-Backpack-ModuleShape.html +0/−6
• doc/API/Cabal/Distribution-Backpack.html +0/−39
• doc/API/Cabal/Distribution-Compat-Binary.html +0/−4
• doc/API/Cabal/Distribution-Compat-CreatePipe.html +0/−4
• doc/API/Cabal/Distribution-Compat-DList.html +0/−4
• doc/API/Cabal/Distribution-Compat-Exception.html +0/−4
• doc/API/Cabal/Distribution-Compat-Graph.html +0/−46
• doc/API/Cabal/Distribution-Compat-Map-Strict.html +0/−4
• doc/API/Cabal/Distribution-Compat-Prelude-Internal.html too large to diff
• doc/API/Cabal/Distribution-Compat-ReadP.html +0/−41
• doc/API/Cabal/Distribution-Compat-Semigroup.html +0/−33
• doc/API/Cabal/Distribution-Compat-Stack.html +0/−41
• doc/API/Cabal/Distribution-Compat-Time.html +0/−12
• doc/API/Cabal/Distribution-Compiler.html +0/−26
• doc/API/Cabal/Distribution-InstalledPackageInfo.html +0/−30
• doc/API/Cabal/Distribution-License.html +0/−34
• doc/API/Cabal/Distribution-Make.html +0/−46
• doc/API/Cabal/Distribution-ModuleName.html +0/−8
• doc/API/Cabal/Distribution-Package.html +0/−14
• doc/API/Cabal/Distribution-PackageDescription-Check.html +0/−39
• doc/API/Cabal/Distribution-PackageDescription-Configuration.html +0/−44
• doc/API/Cabal/Distribution-PackageDescription-Parse.html +0/−13
• doc/API/Cabal/Distribution-PackageDescription-PrettyPrint.html +0/−4
• doc/API/Cabal/Distribution-PackageDescription-Utils.html +0/−4
• doc/API/Cabal/Distribution-PackageDescription.html +0/−185
• doc/API/Cabal/Distribution-ReadE.html +0/−4
• doc/API/Cabal/Distribution-Simple-Bench.html +0/−6
• doc/API/Cabal/Distribution-Simple-Build-Macros.html +0/−10
• doc/API/Cabal/Distribution-Simple-Build-PathsModule.html +0/−9
• doc/API/Cabal/Distribution-Simple-Build.html +0/−7
• doc/API/Cabal/Distribution-Simple-BuildPaths.html +0/−11
• doc/API/Cabal/Distribution-Simple-BuildTarget.html +0/−10
• doc/API/Cabal/Distribution-Simple-BuildToolDepends.html +0/−25
• doc/API/Cabal/Distribution-Simple-CCompiler.html +0/−13
• doc/API/Cabal/Distribution-Simple-Command.html +0/−30
• doc/API/Cabal/Distribution-Simple-Compiler.html +0/−42
• doc/API/Cabal/Distribution-Simple-Configure.html +0/−97
• doc/API/Cabal/Distribution-Simple-Doctest.html +0/−4
• doc/API/Cabal/Distribution-Simple-GHC.html +0/−29
• doc/API/Cabal/Distribution-Simple-GHCJS.html +0/−6
• doc/API/Cabal/Distribution-Simple-Haddock.html +0/−8
• doc/API/Cabal/Distribution-Simple-HaskellSuite.html +0/−4
• doc/API/Cabal/Distribution-Simple-Hpc.html +0/−7
• doc/API/Cabal/Distribution-Simple-Install.html +0/−9
• doc/API/Cabal/Distribution-Simple-InstallDirs.html +0/−40
• doc/API/Cabal/Distribution-Simple-JHC.html +0/−7
• doc/API/Cabal/Distribution-Simple-LHC.html +0/−19
• doc/API/Cabal/Distribution-Simple-LocalBuildInfo.html +0/−154
• doc/API/Cabal/Distribution-Simple-PackageIndex.html +0/−63
• doc/API/Cabal/Distribution-Simple-PreProcess-Unlit.html +0/−6
• doc/API/Cabal/Distribution-Simple-PreProcess.html +0/−41
• doc/API/Cabal/Distribution-Simple-Program-Ar.html +0/−14
• doc/API/Cabal/Distribution-Simple-Program-Builtin.html +0/−5
• doc/API/Cabal/Distribution-Simple-Program-Db.html +0/−54
• doc/API/Cabal/Distribution-Simple-Program-Find.html +0/−20
• doc/API/Cabal/Distribution-Simple-Program-GHC.html +0/−27
• doc/API/Cabal/Distribution-Simple-Program-HcPkg.html +0/−17
• doc/API/Cabal/Distribution-Simple-Program-Hpc.html +0/−8
• doc/API/Cabal/Distribution-Simple-Program-Internal.html +0/−7
• doc/API/Cabal/Distribution-Simple-Program-Ld.html +0/−4
• doc/API/Cabal/Distribution-Simple-Program-Run.html +0/−20
• doc/API/Cabal/Distribution-Simple-Program-Script.html +0/−6
• doc/API/Cabal/Distribution-Simple-Program-Strip.html +0/−4
• doc/API/Cabal/Distribution-Simple-Program-Types.html +0/−42
• doc/API/Cabal/Distribution-Simple-Program.html +0/−97
• doc/API/Cabal/Distribution-Simple-Register.html +0/−27
• doc/API/Cabal/Distribution-Simple-Setup.html +0/−56
• doc/API/Cabal/Distribution-Simple-SrcDist.html +0/−19
• doc/API/Cabal/Distribution-Simple-Test-ExeV10.html +0/−4
• doc/API/Cabal/Distribution-Simple-Test-LibV09.html +0/−10
• doc/API/Cabal/Distribution-Simple-Test-Log.html +0/−11
• doc/API/Cabal/Distribution-Simple-Test.html +0/−6
• doc/API/Cabal/Distribution-Simple-UHC.html +0/−7
• doc/API/Cabal/Distribution-Simple-UserHooks.html +0/−21
• doc/API/Cabal/Distribution-Simple-Utils.html +0/−116
• doc/API/Cabal/Distribution-Simple.html +0/−29
• doc/API/Cabal/Distribution-System.html +0/−33
• doc/API/Cabal/Distribution-TestSuite.html +0/−19
• doc/API/Cabal/Distribution-Text.html +0/−10
• doc/API/Cabal/Distribution-Types-AbiHash.html +0/−6
• doc/API/Cabal/Distribution-Types-AnnotatedId.html +0/−6
• doc/API/Cabal/Distribution-Types-Benchmark.html +0/−5
• doc/API/Cabal/Distribution-Types-BenchmarkInterface.html +0/−11
• doc/API/Cabal/Distribution-Types-BenchmarkType.html +0/−4
• doc/API/Cabal/Distribution-Types-BuildInfo.html +0/−11
• doc/API/Cabal/Distribution-Types-BuildType.html +0/−9
• doc/API/Cabal/Distribution-Types-Component.html +0/−6
• doc/API/Cabal/Distribution-Types-ComponentId.html +0/−9
• doc/API/Cabal/Distribution-Types-ComponentInclude.html +0/−5
• doc/API/Cabal/Distribution-Types-ComponentLocalBuildInfo.html +0/−91
• doc/API/Cabal/Distribution-Types-ComponentName.html +0/−8
• doc/API/Cabal/Distribution-Types-ComponentRequestedSpec.html +0/−30
• doc/API/Cabal/Distribution-Types-CondTree.html +0/−26
• doc/API/Cabal/Distribution-Types-Condition.html +0/−4
• doc/API/Cabal/Distribution-Types-Dependency.html +0/−5
• doc/API/Cabal/Distribution-Types-DependencyMap.html +0/−5
• doc/API/Cabal/Distribution-Types-ExeDependency.html +0/−4
• doc/API/Cabal/Distribution-Types-Executable.html +0/−5
• doc/API/Cabal/Distribution-Types-ExecutableScope.html +0/−4
• doc/API/Cabal/Distribution-Types-ForeignLib.html +0/−17
• doc/API/Cabal/Distribution-Types-ForeignLibOption.html +0/−8
• doc/API/Cabal/Distribution-Types-ForeignLibType.html +0/−5
• doc/API/Cabal/Distribution-Types-GenericPackageDescription.html +0/−9
• doc/API/Cabal/Distribution-Types-HookedBuildInfo.html +0/−41
• doc/API/Cabal/Distribution-Types-IncludeRenaming.html +0/−5
• doc/API/Cabal/Distribution-Types-LegacyExeDependency.html +0/−6
• doc/API/Cabal/Distribution-Types-Library.html +0/−14
• doc/API/Cabal/Distribution-Types-LocalBuildInfo.html +0/−56
• doc/API/Cabal/Distribution-Types-Mixin.html +0/−4
• doc/API/Cabal/Distribution-Types-Module.html +0/−11
• doc/API/Cabal/Distribution-Types-ModuleReexport.html +0/−4
• doc/API/Cabal/Distribution-Types-ModuleRenaming.html +0/−14
• doc/API/Cabal/Distribution-Types-MungedPackageId.html +0/−8
• doc/API/Cabal/Distribution-Types-MungedPackageName.html +0/−26
• doc/API/Cabal/Distribution-Types-PackageDescription.html +0/−62
• doc/API/Cabal/Distribution-Types-PackageId.html +0/−4
• doc/API/Cabal/Distribution-Types-PackageName.html +0/−6
• doc/API/Cabal/Distribution-Types-PkgconfigDependency.html +0/−4
• doc/API/Cabal/Distribution-Types-PkgconfigName.html +0/−5
• doc/API/Cabal/Distribution-Types-SetupBuildInfo.html +0/−7
• doc/API/Cabal/Distribution-Types-SourceRepo.html +0/−34
• doc/API/Cabal/Distribution-Types-TargetInfo.html +0/−8
• doc/API/Cabal/Distribution-Types-TestSuite.html +0/−5
• doc/API/Cabal/Distribution-Types-TestSuiteInterface.html +0/−11
• doc/API/Cabal/Distribution-Types-TestType.html +0/−4
• doc/API/Cabal/Distribution-Types-UnitId.html +0/−34
• doc/API/Cabal/Distribution-Types-UnqualComponentName.html +0/−10
• doc/API/Cabal/Distribution-Utils-Generic.html +0/−59
• doc/API/Cabal/Distribution-Utils-LogProgress.html +0/−6
• doc/API/Cabal/Distribution-Utils-MapAccum.html +0/−4
• doc/API/Cabal/Distribution-Utils-NubList.html +0/−15
• doc/API/Cabal/Distribution-Utils-Progress.html +0/−11
• doc/API/Cabal/Distribution-Utils-ShortText.html +0/−8
• doc/API/Cabal/Distribution-Verbosity.html +0/−11
• doc/API/Cabal/Distribution-Version.html +0/−78
• doc/API/Cabal/Language-Haskell-Extension.html +0/−113
• doc/API/Cabal/doc-index-124.html +0/−4
• doc/API/Cabal/doc-index-33.html +0/−4
• doc/API/Cabal/doc-index-36.html +0/−4
• doc/API/Cabal/doc-index-38.html +0/−4
• doc/API/Cabal/doc-index-42.html +0/−4
• doc/API/Cabal/doc-index-43.html +0/−4
• doc/API/Cabal/doc-index-45.html +0/−4
• doc/API/Cabal/doc-index-46.html +0/−4
• doc/API/Cabal/doc-index-47.html +0/−4
• doc/API/Cabal/doc-index-60.html +0/−4
• doc/API/Cabal/doc-index-61.html +0/−4
• doc/API/Cabal/doc-index-62.html +0/−4
• doc/API/Cabal/doc-index-92.html +0/−4
• doc/API/Cabal/doc-index-94.html +0/−4
• doc/API/Cabal/doc-index-A.html +0/−4
• doc/API/Cabal/doc-index-All.html +0/−4
• doc/API/Cabal/doc-index-B.html +0/−4
• doc/API/Cabal/doc-index-C.html +0/−4
• doc/API/Cabal/doc-index-D.html +0/−4
• doc/API/Cabal/doc-index-E.html +0/−4
• doc/API/Cabal/doc-index-F.html +0/−4
• doc/API/Cabal/doc-index-G.html +0/−4
• doc/API/Cabal/doc-index-H.html +0/−4
• doc/API/Cabal/doc-index-I.html +0/−4
• doc/API/Cabal/doc-index-J.html +0/−4
• doc/API/Cabal/doc-index-K.html +0/−4
• doc/API/Cabal/doc-index-L.html +0/−4
• doc/API/Cabal/doc-index-M.html +0/−4
• doc/API/Cabal/doc-index-N.html +0/−4
• doc/API/Cabal/doc-index-O.html +0/−4
• doc/API/Cabal/doc-index-P.html +0/−4
• doc/API/Cabal/doc-index-Q.html +0/−4
• doc/API/Cabal/doc-index-R.html +0/−4
• doc/API/Cabal/doc-index-S.html +0/−4
• doc/API/Cabal/doc-index-T.html +0/−4
• doc/API/Cabal/doc-index-U.html +0/−4
• doc/API/Cabal/doc-index-V.html +0/−4
• doc/API/Cabal/doc-index-W.html +0/−4
• doc/API/Cabal/doc-index-X.html +0/−4
• doc/API/Cabal/doc-index-Y.html +0/−4
• doc/API/Cabal/doc-index-Z.html +0/−4
• doc/API/Cabal/doc-index.html +0/−4
• doc/API/Cabal/haddock-util.js +0/−186
• doc/API/Cabal/hslogo-16.png binary
• doc/API/Cabal/index.html +0/−7
• doc/API/Cabal/minus.gif binary
• doc/API/Cabal/ocean.css +0/−618
• doc/API/Cabal/plus.gif binary
• doc/API/Cabal/synopsis.png binary
• doc/README.md +6/−2
• doc/conf.py +12/−1
• doc/developing-packages.rst +435/−67
• doc/installing-packages.rst +24/−3
• doc/nix-local-build.rst +183/−39
• doc/references.inc +2/−0
• doc/users-guide/.buildinfo +0/−4
• doc/users-guide/.doctrees/bugs-and-stability.doctree binary
• doc/users-guide/.doctrees/concepts-and-development.doctree binary
• doc/users-guide/.doctrees/config-and-install.doctree binary
• doc/users-guide/.doctrees/developing-packages.doctree binary
• doc/users-guide/.doctrees/environment.pickle binary
• doc/users-guide/.doctrees/index.doctree binary
• doc/users-guide/.doctrees/installing-packages.doctree binary
• doc/users-guide/.doctrees/intro.doctree binary
• doc/users-guide/.doctrees/misc.doctree binary
• doc/users-guide/.doctrees/nix-integration.doctree binary
• doc/users-guide/.doctrees/nix-local-build-overview.doctree binary
• doc/users-guide/.doctrees/nix-local-build.doctree binary
• doc/users-guide/_sources/bugs-and-stability.rst.txt +0/−6
• doc/users-guide/_sources/concepts-and-development.rst.txt +0/−7
• doc/users-guide/_sources/config-and-install.rst.txt +0/−5
• doc/users-guide/_sources/developing-packages.rst.txt +0/−2866
• doc/users-guide/_sources/index.rst.txt +0/−14
• doc/users-guide/_sources/installing-packages.rst.txt +0/−1702
• doc/users-guide/_sources/intro.rst.txt +0/−200
• doc/users-guide/_sources/misc.rst.txt +0/−103
• doc/users-guide/_sources/nix-integration.rst.txt +0/−49
• doc/users-guide/_sources/nix-local-build-overview.rst.txt +0/−34
• doc/users-guide/_sources/nix-local-build.rst.txt +0/−1719
• doc/users-guide/_static/Cabal-dark.png binary
• doc/users-guide/_static/ajax-loader.gif binary
• doc/users-guide/_static/basic.css +0/−639
• doc/users-guide/_static/comment-bright.png binary
• doc/users-guide/_static/comment-close.png binary
• doc/users-guide/_static/comment.png binary
• doc/users-guide/_static/css/badge_only.css +0/−2
• doc/users-guide/_static/css/theme.css +0/−5
• doc/users-guide/_static/doctools.js +0/−287
• doc/users-guide/_static/down-pressed.png binary
• doc/users-guide/_static/down.png binary
• doc/users-guide/_static/file.png binary
• doc/users-guide/_static/fonts/Inconsolata-Bold.ttf binary
• doc/users-guide/_static/fonts/Inconsolata-Regular.ttf binary
• doc/users-guide/_static/fonts/Lato-Bold.ttf binary
• doc/users-guide/_static/fonts/Lato-Regular.ttf binary
• doc/users-guide/_static/fonts/RobotoSlab-Bold.ttf binary
• doc/users-guide/_static/fonts/RobotoSlab-Regular.ttf binary
• doc/users-guide/_static/fonts/fontawesome-webfont.eot binary
• doc/users-guide/_static/fonts/fontawesome-webfont.svg +0/−685
• doc/users-guide/_static/fonts/fontawesome-webfont.ttf binary
• doc/users-guide/_static/fonts/fontawesome-webfont.woff binary
• doc/users-guide/_static/jquery-3.1.0.js +0/−10074
• doc/users-guide/_static/jquery.js +0/−4
• doc/users-guide/_static/js/modernizr.min.js +0/−4
• doc/users-guide/_static/js/theme.js +0/−169
• doc/users-guide/_static/minus.png binary
• doc/users-guide/_static/plus.png binary
• doc/users-guide/_static/pygments.css +0/−2
• doc/users-guide/_static/searchtools.js +0/−758
• doc/users-guide/_static/underscore-1.3.1.js +0/−999
• doc/users-guide/_static/underscore.js +0/−31
• doc/users-guide/_static/up-pressed.png binary
• doc/users-guide/_static/up.png binary
• doc/users-guide/_static/websupport.js +0/−808
• doc/users-guide/bugs-and-stability.html +0/−272
• doc/users-guide/cabal-projectindex.html +0/−1604
• doc/users-guide/concepts-and-development.html +0/−284
• doc/users-guide/config-and-install.html +0/−299
• doc/users-guide/developing-packages.html +0/−3144
• doc/users-guide/genindex.html +0/−3277
• doc/users-guide/index.html +0/−285
• doc/users-guide/installing-packages.html +0/−1973
• doc/users-guide/intro.html +0/−413
• doc/users-guide/misc.html +0/−357
• doc/users-guide/nix-integration.html +0/−286
• doc/users-guide/nix-local-build-overview.html +0/−322
• doc/users-guide/nix-local-build.html +0/−2293
• doc/users-guide/objects.inv binary
• doc/users-guide/search.html +0/−248
• doc/users-guide/searchindex.js +0/−1
• tests/CheckTests.hs +73/−0
• tests/DiffInstances.hs +0/−107
• tests/HackageTests.hs +299/−0
• tests/Instances/TreeDiff.hs +91/−0
• tests/Instances/TreeDiff/Language.hs +17/−0
• tests/Instances/TreeDiff/SPDX.hs +28/−0
• tests/Instances/TreeDiff/Version.hs +14/−0
• tests/ParserHackageTests.hs +0/−365
• tests/ParserTests.hs +257/−11
• tests/ParserTests/errors/common1.cabal +29/−0
• tests/ParserTests/errors/common1.errors +2/−0
• tests/ParserTests/errors/common2.cabal +29/−0
• tests/ParserTests/errors/common2.errors +2/−0
• tests/ParserTests/errors/common3.cabal +31/−0
• tests/ParserTests/errors/common3.errors +2/−0
• tests/ParserTests/errors/forward-compat.cabal +4/−0
• tests/ParserTests/errors/forward-compat.errors +5/−0
• tests/ParserTests/errors/forward-compat2.cabal +16/−0
• tests/ParserTests/errors/forward-compat2.errors +2/−0
• tests/ParserTests/errors/forward-compat3.cabal +16/−0
• tests/ParserTests/errors/forward-compat3.errors +2/−0
• tests/ParserTests/errors/issue-5055-2.cabal +25/−0
• tests/ParserTests/errors/issue-5055-2.errors +2/−0
• tests/ParserTests/errors/issue-5055.cabal +21/−0
• tests/ParserTests/errors/issue-5055.errors +2/−0
• tests/ParserTests/errors/leading-comma.cabal +20/−0
• tests/ParserTests/errors/leading-comma.errors +8/−0
• tests/ParserTests/errors/noVersion.cabal +10/−0
• tests/ParserTests/errors/noVersion.errors +6/−0
• tests/ParserTests/errors/noVersion2.cabal +10/−0
• tests/ParserTests/errors/noVersion2.errors +7/−0
• tests/ParserTests/errors/range-ge-wild.cabal +10/−0
• tests/ParserTests/errors/range-ge-wild.errors +6/−0
• tests/ParserTests/ipi/Includes2.cabal +27/−0
• tests/ParserTests/ipi/Includes2.expr +50/−0
• tests/ParserTests/ipi/Includes2.format +24/−0
• tests/ParserTests/ipi/internal-preprocessor-test.cabal +26/−0
• tests/ParserTests/ipi/internal-preprocessor-test.expr +45/−0
• tests/ParserTests/ipi/internal-preprocessor-test.format +23/−0
• tests/ParserTests/ipi/issue-2276-ghc-9885.cabal +175/−0
• tests/ParserTests/ipi/issue-2276-ghc-9885.expr +2085/−0
• tests/ParserTests/ipi/issue-2276-ghc-9885.format +173/−0
• tests/ParserTests/ipi/transformers.cabal +59/−0
• tests/ParserTests/ipi/transformers.expr +85/−0
• tests/ParserTests/ipi/transformers.format +55/−0
• tests/ParserTests/regressions/MiniAgda.cabal +89/−0
• tests/ParserTests/regressions/MiniAgda.check +1/−0
• tests/ParserTests/regressions/Octree-0.5.cabal +44/−0
• tests/ParserTests/regressions/Octree-0.5.expr +286/−0
• tests/ParserTests/regressions/Octree-0.5.format +52/−0
• tests/ParserTests/regressions/common.cabal +32/−0
• tests/ParserTests/regressions/common.expr +156/−0
• tests/ParserTests/regressions/common.format +25/−0
• tests/ParserTests/regressions/common2.cabal +43/−0
• tests/ParserTests/regressions/common2.expr +412/−0
• tests/ParserTests/regressions/common2.format +41/−0
• tests/ParserTests/regressions/elif.cabal +20/−0
• tests/ParserTests/regressions/elif.expr +157/−0
• tests/ParserTests/regressions/elif.format +20/−0
• tests/ParserTests/regressions/elif2.cabal +20/−0
• tests/ParserTests/regressions/elif2.expr +316/−0
• tests/ParserTests/regressions/elif2.format +25/−0
• tests/ParserTests/regressions/encoding-0.8.cabal +24/−0
• tests/ParserTests/regressions/encoding-0.8.expr +119/−0
• tests/ParserTests/regressions/encoding-0.8.format +19/−0
• tests/ParserTests/regressions/extensions-paths-5054.cabal +39/−0
• tests/ParserTests/regressions/extensions-paths-5054.check +1/−0
• tests/ParserTests/regressions/generics-sop.cabal +128/−0
• tests/ParserTests/regressions/generics-sop.expr +638/−0
• tests/ParserTests/regressions/generics-sop.format +121/−0
• tests/ParserTests/regressions/haddock-api-2.18.1-check.cabal +147/−0
• tests/ParserTests/regressions/haddock-api-2.18.1-check.check +11/−0
• tests/ParserTests/regressions/issue-5055.cabal +25/−0
• tests/ParserTests/regressions/issue-5055.expr +215/−0
• tests/ParserTests/regressions/issue-5055.format +24/−0
• tests/ParserTests/regressions/issue-774.cabal +21/−0
• tests/ParserTests/regressions/issue-774.check +7/−0
• tests/ParserTests/regressions/issue-774.expr +105/−0
• tests/ParserTests/regressions/issue-774.format +19/−0
• tests/ParserTests/regressions/leading-comma.cabal +19/−0
• tests/ParserTests/regressions/leading-comma.expr +115/−0
• tests/ParserTests/regressions/leading-comma.format +17/−0
• tests/ParserTests/regressions/noVersion.cabal +11/−0
• tests/ParserTests/regressions/noVersion.expr +103/−0
• tests/ParserTests/regressions/noVersion.format +12/−0
• tests/ParserTests/regressions/nothing-unicode.cabal +21/−0
• tests/ParserTests/regressions/nothing-unicode.check +6/−0
• tests/ParserTests/regressions/nothing-unicode.expr +157/−0
• tests/ParserTests/regressions/nothing-unicode.format +22/−0
• tests/ParserTests/regressions/shake.cabal +402/−0
• tests/ParserTests/regressions/shake.expr +1721/−0
• tests/ParserTests/regressions/shake.format +411/−0
• tests/ParserTests/regressions/th-lift-instances.cabal +76/−0
• tests/ParserTests/regressions/th-lift-instances.expr +432/−0
• tests/ParserTests/regressions/th-lift-instances.format +78/−0
• tests/ParserTests/regressions/wl-pprint-indef.cabal +34/−0
• tests/ParserTests/regressions/wl-pprint-indef.expr +183/−0
• tests/ParserTests/regressions/wl-pprint-indef.format +38/−0
• tests/ParserTests/warnings/doubledash.cabal +9/−0
• tests/ParserTests/warnings/multiplesingular.cabal +8/−0
• tests/ParserTests/warnings/subsection.cabal +1/−1
• tests/ParserTests/warnings/tab.cabal +12/−0
• tests/StructDiff.hs +0/−162
• tests/UnitTests.hs +9/−0
• tests/UnitTests/Distribution/SPDX.hs +99/−0
• tests/UnitTests/Distribution/Simple/Utils.hs +6/−5
• tests/UnitTests/Distribution/Types/GenericPackageDescription.hs +37/−0
• tests/UnitTests/Distribution/Utils/Generic.hs +71/−0
• tests/UnitTests/Distribution/Version.hs +173/−188
• tests/custom-setup/CabalDoctestSetup.hs +475/−0
• tests/custom-setup/CustomSetupTests.hs +8/−0
• tests/custom-setup/IdrisSetup.hs +383/−0

@@ -1,6 +1,6 @@ name:          Cabal-version:       2.0.1.1-copyright:     2003-2017, Cabal Development Team (see AUTHORS file)+version:       2.2.0.0+copyright:     2003-2018, Cabal Development Team (see AUTHORS file) license:       BSD3 license-file:  LICENSE author:        Cabal Development Team <cabal-devel@haskell.org>@@ -22,25 +22,117 @@ -- we can bootstrap.  extra-source-files:-  README.md tests/README.md changelog+  README.md tests/README.md ChangeLog.md   doc/bugs-and-stability.rst doc/concepts-and-development.rst   doc/conf.py doc/config-and-install.rst doc/developing-packages.rst   doc/images/Cabal-dark.png doc/index.rst doc/installing-packages.rst   doc/intro.rst doc/misc.rst doc/nix-local-build-overview.rst   doc/nix-local-build.rst doc/README.md doc/references.inc -  -- Generated with 'misc/gen-extra-source-files.sh'+  -- Generated with 'make gen-extra-source-files'   -- Do NOT edit this section manually; instead, run the script.   -- BEGIN gen-extra-source-files+  tests/ParserTests/errors/common1.cabal+  tests/ParserTests/errors/common1.errors+  tests/ParserTests/errors/common2.cabal+  tests/ParserTests/errors/common2.errors+  tests/ParserTests/errors/common3.cabal+  tests/ParserTests/errors/common3.errors+  tests/ParserTests/errors/forward-compat.cabal+  tests/ParserTests/errors/forward-compat.errors+  tests/ParserTests/errors/forward-compat2.cabal+  tests/ParserTests/errors/forward-compat2.errors+  tests/ParserTests/errors/forward-compat3.cabal+  tests/ParserTests/errors/forward-compat3.errors+  tests/ParserTests/errors/issue-5055-2.cabal+  tests/ParserTests/errors/issue-5055-2.errors+  tests/ParserTests/errors/issue-5055.cabal+  tests/ParserTests/errors/issue-5055.errors+  tests/ParserTests/errors/leading-comma.cabal+  tests/ParserTests/errors/leading-comma.errors+  tests/ParserTests/errors/noVersion.cabal+  tests/ParserTests/errors/noVersion.errors+  tests/ParserTests/errors/noVersion2.cabal+  tests/ParserTests/errors/noVersion2.errors+  tests/ParserTests/errors/range-ge-wild.cabal+  tests/ParserTests/errors/range-ge-wild.errors+  tests/ParserTests/ipi/Includes2.cabal+  tests/ParserTests/ipi/Includes2.expr+  tests/ParserTests/ipi/Includes2.format+  tests/ParserTests/ipi/internal-preprocessor-test.cabal+  tests/ParserTests/ipi/internal-preprocessor-test.expr+  tests/ParserTests/ipi/internal-preprocessor-test.format+  tests/ParserTests/ipi/issue-2276-ghc-9885.cabal+  tests/ParserTests/ipi/issue-2276-ghc-9885.expr+  tests/ParserTests/ipi/issue-2276-ghc-9885.format+  tests/ParserTests/ipi/transformers.cabal+  tests/ParserTests/ipi/transformers.expr+  tests/ParserTests/ipi/transformers.format+  tests/ParserTests/regressions/MiniAgda.cabal+  tests/ParserTests/regressions/MiniAgda.check+  tests/ParserTests/regressions/Octree-0.5.cabal+  tests/ParserTests/regressions/Octree-0.5.expr+  tests/ParserTests/regressions/Octree-0.5.format+  tests/ParserTests/regressions/common.cabal+  tests/ParserTests/regressions/common.expr+  tests/ParserTests/regressions/common.format+  tests/ParserTests/regressions/common2.cabal+  tests/ParserTests/regressions/common2.expr+  tests/ParserTests/regressions/common2.format+  tests/ParserTests/regressions/elif.cabal+  tests/ParserTests/regressions/elif.expr+  tests/ParserTests/regressions/elif.format+  tests/ParserTests/regressions/elif2.cabal+  tests/ParserTests/regressions/elif2.expr+  tests/ParserTests/regressions/elif2.format+  tests/ParserTests/regressions/encoding-0.8.cabal+  tests/ParserTests/regressions/encoding-0.8.expr+  tests/ParserTests/regressions/encoding-0.8.format+  tests/ParserTests/regressions/extensions-paths-5054.cabal+  tests/ParserTests/regressions/extensions-paths-5054.check+  tests/ParserTests/regressions/generics-sop.cabal+  tests/ParserTests/regressions/generics-sop.expr+  tests/ParserTests/regressions/generics-sop.format+  tests/ParserTests/regressions/haddock-api-2.18.1-check.cabal+  tests/ParserTests/regressions/haddock-api-2.18.1-check.check+  tests/ParserTests/regressions/issue-5055.cabal+  tests/ParserTests/regressions/issue-5055.expr+  tests/ParserTests/regressions/issue-5055.format+  tests/ParserTests/regressions/issue-774.cabal+  tests/ParserTests/regressions/issue-774.check+  tests/ParserTests/regressions/issue-774.expr+  tests/ParserTests/regressions/issue-774.format+  tests/ParserTests/regressions/leading-comma.cabal+  tests/ParserTests/regressions/leading-comma.expr+  tests/ParserTests/regressions/leading-comma.format+  tests/ParserTests/regressions/noVersion.cabal+  tests/ParserTests/regressions/noVersion.expr+  tests/ParserTests/regressions/noVersion.format+  tests/ParserTests/regressions/nothing-unicode.cabal+  tests/ParserTests/regressions/nothing-unicode.check+  tests/ParserTests/regressions/nothing-unicode.expr+  tests/ParserTests/regressions/nothing-unicode.format+  tests/ParserTests/regressions/shake.cabal+  tests/ParserTests/regressions/shake.expr+  tests/ParserTests/regressions/shake.format+  tests/ParserTests/regressions/th-lift-instances.cabal+  tests/ParserTests/regressions/th-lift-instances.expr+  tests/ParserTests/regressions/th-lift-instances.format+  tests/ParserTests/regressions/wl-pprint-indef.cabal+  tests/ParserTests/regressions/wl-pprint-indef.expr+  tests/ParserTests/regressions/wl-pprint-indef.format   tests/ParserTests/warnings/bom.cabal   tests/ParserTests/warnings/bool.cabal   tests/ParserTests/warnings/deprecatedfield.cabal+  tests/ParserTests/warnings/doubledash.cabal   tests/ParserTests/warnings/extratestmodule.cabal   tests/ParserTests/warnings/gluedop.cabal+  tests/ParserTests/warnings/multiplesingular.cabal   tests/ParserTests/warnings/nbsp.cabal   tests/ParserTests/warnings/newsyntax.cabal   tests/ParserTests/warnings/oldsyntax.cabal   tests/ParserTests/warnings/subsection.cabal+  tests/ParserTests/warnings/tab.cabal   tests/ParserTests/warnings/trailingfield.cabal   tests/ParserTests/warnings/unknownfield.cabal   tests/ParserTests/warnings/unknownsection.cabal@@ -64,37 +156,28 @@   description:  Use directory < 1.2 and old-time   default:      False -flag parsec-  description:  Use parsec parser-  default:      False-  manual:       True--flag parsec-struct-diff-  description:  Use StructDiff in parsec tests. Affects only parsec tests.-  default:      False-  manual:       True- library   build-depends:-    array      >= 0.1 && < 0.6,-    base       >= 4.5 && < 5,-    bytestring >= 0.9 && < 1,-    containers >= 0.4 && < 0.6,-    deepseq    >= 1.3 && < 1.5,-    filepath   >= 1.3 && < 1.5,-    pretty     >= 1.1 && < 1.2,+    array      >= 0.4     && < 0.6,+    base       >= 4.5     && < 5,+    bytestring >= 0.9.2.1 && < 0.11,+    containers >= 0.4.2.1 && < 0.6,+    deepseq    >= 1.3     && < 1.5,+    filepath   >= 1.3     && < 1.5,+    pretty     >= 1.1.1   && < 1.2,     process    >= 1.1.0.1 && < 1.7,-    time       >= 1.4 && < 1.9+    time       >= 1.4     && < 1.9    if flag(old-directory)-    build-depends: directory >= 1.1 && < 1.2, old-time >= 1 && < 1.2,-                   process   >= 1.0.1.1  && < 1.1.0.2+    build-depends: directory >= 1.1.0.2  && < 1.2,+                   process   >= 1.0.1.1  && < 1.1.0.2,+                   old-time  >= 1.1      && < 1.2   else-    build-depends: directory >= 1.2 && < 1.4,+    build-depends: directory >= 1.2      && < 1.4,                    process   >= 1.1.0.2  && < 1.7    if flag(bundled-binary-generic)-    build-depends: binary >= 0.5 && < 0.7+    build-depends: binary >= 0.5.1 && < 0.7   else     build-depends: binary >= 0.7 && < 0.9 @@ -102,13 +185,10 @@   if impl(ghc < 7.6)     build-depends: ghc-prim >= 0.2 && < 0.3 -  if !os(windows)-    build-depends:-      unix >= 2.5 && < 2.8-   if os(windows)-    build-depends:-      Win32 >= 2.2 && < 2.7+    build-depends: Win32 >= 2.2.2 && < 2.7+  else+    build-depends: unix  >= 2.5.1 && < 2.8    ghc-options: -Wall -fno-ignore-asserts -fwarn-tabs   if impl(ghc >= 8.0)@@ -125,14 +205,19 @@     Distribution.Backpack.LinkedComponent     Distribution.Backpack.ModSubst     Distribution.Backpack.ModuleShape+    Distribution.Backpack.PreModuleShape+    Distribution.CabalSpecVersion+    Distribution.Utils.IOData     Distribution.Utils.LogProgress     Distribution.Utils.MapAccum     Distribution.Compat.CreatePipe+    Distribution.Compat.Directory     Distribution.Compat.Environment     Distribution.Compat.Exception     Distribution.Compat.Graph     Distribution.Compat.Internal.TempFile     Distribution.Compat.Map.Strict+    Distribution.Compat.Newtype     Distribution.Compat.Prelude.Internal     Distribution.Compat.ReadP     Distribution.Compat.Semigroup@@ -141,6 +226,10 @@     Distribution.Compat.DList     Distribution.Compiler     Distribution.InstalledPackageInfo+    Distribution.Types.AbiDependency+    Distribution.Types.ExposedModule+    Distribution.Types.InstalledPackageInfo+    Distribution.Types.InstalledPackageInfo.FieldGrammar     Distribution.License     Distribution.Make     Distribution.ModuleName@@ -148,7 +237,6 @@     Distribution.PackageDescription     Distribution.PackageDescription.Check     Distribution.PackageDescription.Configuration-    Distribution.PackageDescription.Parse     Distribution.PackageDescription.PrettyPrint     Distribution.PackageDescription.Utils     Distribution.ParseUtils@@ -190,6 +278,7 @@     Distribution.Simple.Program.Hpc     Distribution.Simple.Program.Internal     Distribution.Simple.Program.Ld+    Distribution.Simple.Program.ResponseFile     Distribution.Simple.Program.Run     Distribution.Simple.Program.Script     Distribution.Simple.Program.Strip@@ -204,9 +293,16 @@     Distribution.Simple.UHC     Distribution.Simple.UserHooks     Distribution.Simple.Utils+    Distribution.SPDX+    Distribution.SPDX.License+    Distribution.SPDX.LicenseId+    Distribution.SPDX.LicenseExceptionId+    Distribution.SPDX.LicenseExpression+    Distribution.SPDX.LicenseReference     Distribution.System     Distribution.TestSuite     Distribution.Text+    Distribution.Pretty     Distribution.Types.AbiHash     Distribution.Types.AnnotatedId     Distribution.Types.Benchmark@@ -255,6 +351,9 @@     Distribution.Types.LocalBuildInfo     Distribution.Types.ComponentRequestedSpec     Distribution.Types.TargetInfo+    Distribution.Types.Version+    Distribution.Types.VersionRange+    Distribution.Types.VersionInterval     Distribution.Utils.Generic     Distribution.Utils.NubList     Distribution.Utils.ShortText@@ -264,27 +363,51 @@     Language.Haskell.Extension     Distribution.Compat.Binary -  if flag(parsec)-    cpp-options: -DCABAL_PARSEC-    build-depends:-      transformers,-      parsec >= 3.1.9 && <3.2-    build-tools:-      alex >=3.1.4 && <3.3-    exposed-modules:-      Distribution.Compat.Parsec-      Distribution.PackageDescription.Parsec-      Distribution.PackageDescription.Parsec.FieldDescr-      Distribution.Parsec.Class-      Distribution.Parsec.ConfVar-      Distribution.Parsec.Lexer-      Distribution.Parsec.LexerMonad-      Distribution.Parsec.Parser-      Distribution.Parsec.Types.Common-      Distribution.Parsec.Types.Field-      Distribution.Parsec.Types.FieldDescr-      Distribution.Parsec.Types.ParseResult+  -- Parsec parser-related modules+  build-depends:+    transformers >= 0.3      && < 0.6,+    mtl          >= 2.1      && < 2.3,+    text         >= 1.2.3.0  && < 1.3,+    parsec       >= 3.1.13.0 && < 3.2+  exposed-modules:+    Distribution.Compat.Parsing+    Distribution.Compat.CharParsing+    Distribution.FieldGrammar+    Distribution.FieldGrammar.Class+    Distribution.FieldGrammar.FieldDescrs+    Distribution.FieldGrammar.Parsec+    Distribution.FieldGrammar.Pretty+    Distribution.PackageDescription.FieldGrammar+    Distribution.PackageDescription.Parsec+    Distribution.PackageDescription.Quirks+    Distribution.Parsec.Class+    Distribution.Parsec.Common+    Distribution.Parsec.ConfVar+    Distribution.Parsec.Field+    Distribution.Parsec.FieldLineStream+    Distribution.Parsec.Lexer+    Distribution.Parsec.LexerMonad+    Distribution.Parsec.Newtypes+    Distribution.Parsec.ParseResult+    Distribution.Parsec.Parser +  -- Lens functionality+  exposed-modules:+    Distribution.Compat.Lens+    Distribution.Types.Lens+    Distribution.Types.Benchmark.Lens+    Distribution.Types.BuildInfo.Lens+    Distribution.Types.Executable.Lens+    Distribution.Types.ForeignLib.Lens+    Distribution.Types.GenericPackageDescription.Lens+    Distribution.Types.InstalledPackageInfo.Lens+    Distribution.Types.Library.Lens+    Distribution.Types.PackageDescription.Lens+    Distribution.Types.PackageId.Lens+    Distribution.Types.SetupBuildInfo.Lens+    Distribution.Types.SourceRepo.Lens+    Distribution.Types.TestSuite.Lens+   other-modules:     Distribution.Backpack.PreExistingComponent     Distribution.Backpack.ReadyComponent@@ -357,7 +480,10 @@     UnitTests.Distribution.Compat.Graph     UnitTests.Distribution.Simple.Program.Internal     UnitTests.Distribution.Simple.Utils+    UnitTests.Distribution.SPDX     UnitTests.Distribution.System+    UnitTests.Distribution.Types.GenericPackageDescription+    UnitTests.Distribution.Utils.Generic     UnitTests.Distribution.Utils.NubList     UnitTests.Distribution.Utils.ShortText     UnitTests.Distribution.Version@@ -365,65 +491,113 @@   build-depends:     array,     base,+    bytestring,     containers,     directory,     filepath,-    tasty,+    integer-logarithms >= 1.0.2 && <1.1,+    tasty >= 1.0 && < 1.1,     tasty-hunit,     tasty-quickcheck,     tagged,+    text,     pretty,-    QuickCheck >= 2.7 && < 2.11,+    QuickCheck >= 2.11.3 && < 2.12,     Cabal   ghc-options: -Wall   default-language: Haskell2010  test-suite parser-tests-  if !flag(parsec)-    buildable: False-   type: exitcode-stdio-1.0   hs-source-dirs: tests   main-is: ParserTests.hs   build-depends:     base,+    base-compat >=0.9.3 && <0.10,     bytestring,     filepath,-    tasty,+    tasty >= 1.0 && < 1.1,     tasty-hunit,     tasty-quickcheck,+    tasty-golden >=2.3.1.1 && <2.4,+    Diff >=0.3.4 && <0.4,     Cabal   ghc-options: -Wall   default-language: Haskell2010 -test-suite parser-hackage-tests-  if !flag(parsec)-    buildable: False+  if impl(ghc >= 7.8)+    build-depends:+      tree-diff      >= 0.0.1 && <0.1+    other-modules:+      Instances.TreeDiff+      Instances.TreeDiff.Language+      Instances.TreeDiff.SPDX+      Instances.TreeDiff.Version +test-suite check-tests   type: exitcode-stdio-1.0-  main-is: ParserHackageTests.hs-   hs-source-dirs: tests+  main-is: CheckTests.hs   build-depends:     base,-    containers,-    tar >=0.5 && <0.6,     bytestring,-    directory,     filepath,+    tasty >= 1.0 && < 1.1,+    tasty-golden >=2.3.1.1 && <2.4,+    Diff >=0.3.4 && <0.4,     Cabal+  ghc-options: -Wall+  default-language: Haskell2010 -  if flag(parsec-struct-diff)+test-suite custom-setup-tests+  type: exitcode-stdio-1.0+  hs-source-dirs: tests/custom-setup+  main-is: CustomSetupTests.hs+  other-modules:+    CabalDoctestSetup+    IdrisSetup+  build-depends:+    Cabal,+    base,+    directory,+    filepath,+    process+  default-language: Haskell2010++test-suite hackage-tests+  type: exitcode-stdio-1.0+  main-is: HackageTests.hs++  -- TODO: need to get 01-index.tar on appveyor+  if os(windows)+    buildable: False++  hs-source-dirs: tests++  build-depends:+    base,+    Cabal,+    bytestring,+    deepseq,+    containers,+    directory,+    filepath++  build-depends:+    base-compat          >=0.9.3    && <0.10,+    base-orphans         >=0.6      && <0.7,+    optparse-applicative >=0.13.2.0 && <0.15,+    tar                  >=0.5.0.3  && <0.6++  if impl(ghc >= 7.8)     build-depends:-      generics-sop ==0.2.*,-      these >=0.7.1 && <0.8,-      singleton-bool >=0.1.1.0 && <0.2,-      keys+      tree-diff      >= 0.0.1 && <0.1     other-modules:-      DiffInstances-      StructDiff-    cpp-options: -DHAS_STRUCT_DIFF+      Instances.TreeDiff+      Instances.TreeDiff.Language+      Instances.TreeDiff.SPDX+      Instances.TreeDiff.Version -  ghc-options: -Wall -rtsopts+  ghc-options: -Wall -rtsopts -threaded   default-extensions: CPP   default-language: Haskell2010

@@ -0,0 +1,771 @@+# 2.2.0.0 [Mikhail Glushenkov](mailto:mikhail.glushenkov@gmail.com) March 2018++  * The 2.2 migration guide gives advice on adapting Custom setup+    scripts to backwards-incompatible changes in this release:+    https://github.com/haskell/cabal/wiki/2.2-migration-guide.+  * New Parsec-based parser for `.cabal` files is now the+    default. This brings memory consumption and speed improvements, as+    well as making new syntax extensions easier to implement.+  * Support for common stanzas (#4751).+  * Added elif-conditionals to `.cabal` syntax (#4750).+  * The package license information can now be specified using the+    SPDX syntax. This requires setting `cabal-version` to 2.2+ (#2547,+    #5050).+  * Support for GHC's numeric -g debug levels (#4673).+  * Compilation with section splitting is now supported via the+    `--enable-split-sections` flag (#4819)+  * Fields with mandatory commas (e.g. build-depends) may now have a+    leading or a trailing comma (either one, not both) (#4953)+  * Added `virtual-modules` field, to allow modules that are not built+    but registered (#4875).+  * Use better defaulting for `build-type`; rename `PackageDescription`'s+    `buildType` field to `buildTypeRaw` and introduce new `buildType`+    function (#4958)+  * `D.T.PackageDescription.allBuildInfo` now returns all build infos, not+    only for buildable components (#5087).+  * Removed `UnknownBuildType` constructor from `BuildType` (#5003).+  * Added `HexFloatLiterals` to `KnownExtension`.+  * Cabal will no longer try to build an empty set of `inputModules`+    (#4890).+  * `copyComponent` and `installIncludeFiles` will now look for+    include headers in the build directory (`dist/build/...` by+    default) as well (#4866).+  * Added `cxx-options` and `cxx-sources` buildinfo fields for+    separate compilation of C++ source files (#3700).+  * Removed unused `--allow-newer`/`--allow-older` support from+    `Setup configure` (#4527).+  * Changed `FlagAssignment` to be an opaque `newtype` (#4849).+  * Changed `rawSystemStdInOut` to use proper type to represent+    binary and textual data; new `Distribution.Utils.IOData` module;+    removed obsolete `startsWithBOM`, `fileHasBOM`, `fromUTF8`,+    and `toUTF8` functions; add new `toUTF8BS`/`toUTF8LBS`+    encoding functions. (#4666)+  * Added a `cabal check` warning when the `.cabal` file name does+    not match package name (#4592).+  * The `ar` program now receives its arguments via a response file+    (`@file`).  Old behaviour can be restored with+    `--disable-response-files` argument to `configure` or+    `install` (#4596).+  * Added `.Lens` modules, with optics for package description data+    types (#4701).+  * Support for building with Win32 version 2.6 (#4835).+  * Change `compilerExtensions` and `ghcOptExtensionMap` to contain+    `Maybe Flag`s, since a supported extention can lack a flag (#4443).+  * Pretty-printing of `.cabal` files is slightly different due to+    parser changes. For an example, see+    https://mail.haskell.org/pipermail/cabal-devel/2017-December/010414.html.+  * `--hyperlink-source` now uses Haddock's hyperlinker backend when+    Haddock is new enough, falling back to HsColour otherwise.+  * `D.S.defaultHookedPackageDesc` has been deprecated in favour of+    `D.S.findHookedPackageDesc` (#4874).+  * `D.S.getHookedBuildInfo` now takes an additional parameter+    specifying the build directory path (#4874).+  * Emit warning when encountering unknown GHC versions (#415).++### 2.0.1.1 [Mikhail Glushenkov](mailto:mikhail.glushenkov@gmail.com) December 2017++  * Don't pass `other-modules` to stub executable for detailed-0.9+  (#4918).+  * Hpc: Use relative .mix search paths (#4917).++## 2.0.1.0 [Mikhail Glushenkov](mailto:mikhail.glushenkov@gmail.com) November 2017++  * Support for GHC's numeric -g debug levels (#4673).+  * Added a new `Distribution.Verbosity.modifyVerbosity` combinator+    (#4724).+  * Added a new `cabal check` warning about unused, undeclared or+    non-Unicode flags.  Also, it warns about leading dash, which is+    unusable but accepted if it's unused in conditionals. (#4687)+  * Modify `allBuildInfo` to include foreign library info (#4763).+  * Documentation fixes.++### 2.0.0.2 [Mikhail Glushenkov](mailto:mikhail.glushenkov@gmail.com) July 2017++  * See http://coldwa.st/e/blog/2017-09-09-Cabal-2-0.html+    for more detailed release notes.+  * The 2.0 migration guide gives advice on adapting Custom setup+    scripts to backwards-incompatible changes in this release:+    https://github.com/haskell/cabal/wiki/2.0-migration-guide+  * Add CURRENT_PACKAGE_VERSION to cabal_macros.h (#4319)+  * Dropped support for versions of GHC earlier than 6.12 (#3111).+  * GHC compatibility window for the Cabal library has been extended+    to five years (#3838).+  * Convenience/internal libraries are now supported (#269).+    An internal library is declared using the stanza `library+    'libname'`.  Packages which use internal libraries can+    result in multiple registrations; thus `--gen-pkg-config`+    can now output a directory of registration scripts rather than+    a single file.+  * Backwards incompatible change to preprocessor interface:+    the function in `PPSuffixHandler` now takes an additional+    `ComponentLocalBuildInfo` specifying the build information+    of the component being preprocessed.+  * Backwards incompatible change to `cabal_macros.h` (#1893): we now+    generate a macro file for each component which contains only+    information about the direct dependencies of that component.+    Consequently, `dist/build/autogen/cabal_macros.h` contains+    only the macros for the library, and is not generated if a+    package has no library; to find the macros for an executable+    named `foobar`, look in `dist/build/foobar/autogen/cabal_macros.h`.+    Similarly, if you used `autogenModulesDir` you should now+    use `autogenComponentModulesDir`, which now requires a+    `ComponentLocalBuildInfo` argument as well in order to+    disambiguate which component the autogenerated files are for.+  * Backwards incompatible change to `Component`: `TestSuite` and+    `Benchmark` no longer have `testEnabled` and+    `benchmarkEnabled`.  If you used+    `enabledTests` or `enabledBenchmarks`, please instead use+    `enabledTestLBIs` and `enabledBenchLBIs`+    (you will need a `LocalBuildInfo` for these functions.)+    Additionally, the semantics of `withTest` and `withBench`+    have changed: they now iterate over all buildable+    such components, regardless of whether or not they have+    been enabled; if you only want enabled components,+    use `withTestLBI` and `withBenchLBI`.+    `finalizePackageDescription` is deprecated:+    its replacement `finalizePD` now takes an extra argument+    `ComponentRequestedSpec` which specifies what components+    are to be enabled: use this instead of modifying the+    `Component` in a `GenericPackageDescription`.  (As+    it's not possible now, `finalizePackageDescription`+    will assume tests/benchmarks are disabled.)+    If you only need to test if a component is buildable+    (i.e., it is marked buildable in the Cabal file)+    use the new function `componentBuildable`.+  * Backwards incompatible change to `PackageName` (#3896):+    `PackageName` is now opaque; conversion to/from `String` now works+    via (old) `unPackageName` and (new) `mkPackageName` functions.+  * Backwards incompatible change to `ComponentId` (#3917):+    `ComponentId` is now opaque; conversion to/from `String` now works+    via `unComponentId` and `mkComponentId` functions.+  * Backwards incompatible change to `AbiHash` (#3921):+    `AbiHash` is now opaque; conversion to/from `String` now works+    via `unAbiHash` and `mkAbiHash` functions.+  * Backwards incompatible change to `FlagName` (#4062):+    `FlagName` is now opaque; conversion to/from `String` now works+    via `unFlagName` and `mkFlagName` functions.+  * Backwards incompatible change to `Version` (#3905):+    Version is now opaque; conversion to/from `[Int]` now works+    via `versionNumbers` and `mkVersion` functions.+  * Add support for `--allow-older` (dual to `--allow-newer`) (#3466)+  * Improved an error message for process output decoding errors+  (#3408).+  * `getComponentLocalBuildInfo`, `withComponentsInBuildOrder`+    and `componentsInBuildOrder` are deprecated in favor of a+    new interface in `Distribution.Types.LocalBuildInfo`.+  * New `autogen-modules` field. Modules that are built automatically at+    setup, like Paths_PACKAGENAME or others created with a build-type+    custom, appear on `other-modules` for the Library, Executable,+    Test-Suite or Benchmark stanzas or also on `exposed-modules` for+    libraries but are not really on the package when distributed. This+    makes commands like sdist fail because the file is not found, so with+    this new field modules that appear there are treated the same way as+    Paths_PACKAGENAME was and there is no need to create complex build+    hooks. Just add the module names on `other-modules` and+    `exposed-modules` as always and on the new `autogen-modules` besides.+  (#3656).+  * New `./Setup configure` flag `--cabal-file`, allowing multiple+  `.cabal` files in a single directory (#3553). Primarily intended for+  internal use.+  * Macros in `cabal_macros.h` are now ifndef'd, so that they+  don't cause an error if the macro is already defined. (#3041)+  * `./Setup configure` now accepts a single argument specifying+    the component to be configured.  The semantics of this mode+    of operation are described in+    <https://github.com/ghc-proposals/ghc-proposals/pull/4>+  * Internal `build-tools` dependencies are now added to PATH+    upon invocation of GHC, so that they can be conveniently+    used via `-pgmF`. (#1541)+  * Add support for new caret-style version range operator `^>=` (#3705)+  * Verbosity `-v` now takes an extended format which allows+    specifying exactly what you want to be logged.  The format is+    `[silent|normal|verbose|debug] flags`, where flags is a space+    separated list of flags. At the moment, only the flags+    +callsite and +callstack are supported; these report the+    call site/stack of a logging output respectively (these+    are only supported if Cabal is built with GHC 8.0/7.10.2+    or greater, respectively).+  * New `Distribution.Utils.ShortText.ShortText` type for representing+    short text strings compactly (#3898)+  * Cabal no longer supports using a version bound to disambiguate+    between an internal and external package (#4020).  This should+    not affect many people, as this mode of use already did not+    work with the dependency solver.+  * Support for "foreign libraries" (#2540), which are Haskell+    libraries intended to be used by foreign languages like C.+    Foreign libraries only work with GHC 7.8 and later.+  * Added a technical preview version of integrated doctest support (#4480).+  * Added a new `scope` field to the executable stanza. Executables+    with `scope: private` get installed into+    $libexecdir/$libexecsubdir. Additionally $libexecdir now has a+    subdir structure similar to $lib(sub)dir to allow installing+    private executables of different packages and package versions+    alongside one another.  Private executables are those that are+    expected to be run by other programs rather than users. (#3461)++## 1.24.2.0 [Mikhail Glushenkov](mailto:mikhail.glushenkov@gmail.com) December 2016+  * Fixed a bug in the handling of non-buildable components (#4094).+  * Reverted a PVP-noncompliant API change in 1.24.1.0 (#4123).+  * Bumped the directory upper bound to < 1.4 (#4158).++## 1.24.1.0 [Ryan Thomas](mailto:ryan@ryant.org) October 2016+  * API addition: `differenceVersionRanges` (#3519).+  * Fixed reexported-modules display mangling (#3928).+  * Check that the correct cabal-version is specified when the+  extra-doc-files field is present (#3825).+  * Fixed an incorrect invocation of GetShortPathName that was+  causing build failures on Windows (#3649).+  * Linker flags are now set correctly on GHC >= 7.8 (#3443).++# 1.24.0.0 [Ryan Thomas](mailto:ryan@ryant.org) March 2016+  * Support GHC 8.+  * Deal with extra C sources from preprocessors (#238).+  * Include cabal_macros.h when running c2hs (#2600).+  * Don't recompile C sources unless needed (#2601).+  * Read `builddir` option from `CABAL_BUILDDIR` environment variable.+  * Add `--profiling-detail=$level` flag with a default for libraries+    and executables of `exported-functions` and `toplevel-functions`+    respectively (GHC's `-fprof-auto-{exported,top}` flags) (#193).+  * New `custom-setup` stanza to specify setup deps. Setup is also built+    with the cabal_macros.h style macros, for conditional compilation.+  * Support Haddock response files (#2746).+  * Fixed a bug in the Text instance for Platform (#2862).+  * New `setup haddock` option: `--for-hackage` (#2852).+  * New `--show-detail=direct`; like streaming, but allows the test+    program to detect that is connected to a terminal, and works+    reliable with a non-threaded runtime (#2911, and serves as a+    work-around for #2398)+  * Library support for multi-instance package DBs (#2948).+  * Improved the `./Setup configure` solver (#3082, #3076).+  * The `--allow-newer` option can be now used with `./Setup+  configure` (#3163).+  * Added a way to specify extra locations to find OS X frameworks+  in (`extra-framework-dirs`). Can be used both in `.cabal` files and+  as an argument to `./Setup configure` (#3158).+  * Macros `VERSION_$pkgname` and `MIN_VERSION_$pkgname` are now+  also generated for the current package. (#3235).+  * Backpack is supported!  Two new fields supported in Cabal+  files: signatures and mixins; and a new flag+  to setup scripts, `--instantiate-with`.  See+  https://github.com/ezyang/ghc-proposals/blob/backpack/proposals/0000-backpack.rst+  for more details.++----++## 1.22.8.0 [Ryan Thomas](mailto:ryan@ryant.org) March 2016+  * Distribution.Simple.Setup: remove job cap. Fixes #3191.+  * Check all object file suffixes for recompilation. Fixes #3128.+  * Move source files under `src/`. Fixes #3003.++## 1.22.7.0 [Ryan Thomas](mailto:ryan@ryant.org) January 2016+  * Backport #3012 to the 1.22 branch+  * Cabal.cabal: change build-type to Simple+  * Add foldl' import+  * The Cabal part for fully gcc-like response files++## 1.22.6.0 [Ryan Thomas](mailto:ryan@ryant.org) December 2015+  * Relax upper bound to allow upcoming binary-0.8++## 1.22.5.0 [Ryan Thomas](mailto:ryan@ryant.org) November 2015+  * Don't recompile C sources unless needed (#2601). (Luke Iannini)+  * Support Haddock response files.+  * Add frameworks when linking a dynamic library.++## 1.22.4.0 [Ryan Thomas](mailto:ryan@ryant.org) June 2015+  * Add libname install-dirs variable, use it by default. Fixes #2437. (Edward Z. Yang)+  * Reduce temporary directory name length, fixes #2502. (Edward Z. Yang)+  * Workaround for #2527. (Mikhail Glushenkov)++## 1.22.3.0 [Ryan Thomas](mailto:ryan@ryant.org) April 2015+  * Fix for the ghcjs-pkg version number handling (Luite Stegeman)+  * filterConfigureFlags: filter more flags (Mikhail Glushenkov)+  * Cabal check will fail on -fprof-auto passed as a ghc-option - Fixes #2479 (John Chee)++## 1.22.2.0 [Ryan Thomas](mailto:ryan@ryant.org) March 2015+  * Don't pass `--{en,dis}able-profiling` to old setup.+  * Add -Wall police+  * Fix dependencies on `old-time`+  * Fix test interface detailed-0.9 with GHC 7.10+  * Fix HPC tests with GHC 7.10+  * Make sure to pass the package key to ghc+  * Use `--package-{name|version}` when available for Haddock when available+  * Put full package name and version in library names+  * Fully specify package key format, so external tools can generate it.++# 1.22.0.0 [Johan Tibell](mailto:johan.tibell@gmail.com) January 2015+  * Support GHC 7.10.+  * Experimental support for emitting DWARF debug info.+  * Preliminary support for relocatable packages.+  * Allow cabal to be used inside cabal exec enviroments.+  * hpc: support mutliple "ways" (e.g. profiling and vanilla).+  * Support GHCJS.+  * Improved command line documentation.+  * Add `-none` constraint syntax for version ranges (#2093).+  * Make the default doc index file path compiler/arch/os-dependent+  (#2136).+  * Warn instead of dying when generating documentation and hscolour+  isn't installed (455f51622fa38347db62197a04bb0fa5b928ff17).+  * Support the new BinaryLiterals extension+  (1f25ab3c5eff311ada73c6c987061b80e9bbebd9).+  * Warn about `ghc-prof-options: -auto-all` in `cabal check` (#2162).+  * Add preliminary support for multiple instances of the same package+  version installed side-by-side (#2002).+  * New binary build config format - faster build times (#2076).+  * Support module thinning and renaming (#2038).+  * Add a new license type: UnspecifiedLicense (#2141).+  * Remove support for Hugs and nhc98 (#2168).+  * Invoke `tar` with `--formar ustar` if possible in `sdist` (#1903).+  * Replace `--enable-library-coverage` with `--enable-coverage`, which+  enables program coverage for all components (#1945).+  * Suggest that `ExitFailure 9` is probably due to memory+  exhaustion (#1522).+  * Drop support for Haddock < 2.0 (#1808, #1718).+  * Make `cabal test`/`cabal bench` build only what's needed for+  running tests/benchmarks (#1821).+  * Build shared libraries by default when linking executables dynamically.+  * Build profiled libraries by default when profiling executables.++----++### 1.20.0.4 [Ryan Thomas](mailto:ryan@ryant.org) January 2016+  * Cabal.cabal: change build-type to Simple.++### 1.20.0.1 [Johan Tibell](mailto:johan.tibell@gmail.com) May 2014+  * Fix streaming test output.++# 1.20.0.0 [Johan Tibell](mailto:johan.tibell@gmail.com) April 2014+  * Rewrite user guide+  * Fix repl Ctrl+C handling+  * Add haskell-suite compiler support+  * Add __HADDOCK_VERSION__ define+  * Allow specifying exact dependency version using hash+  * Rename extra-html-files to extra-doc-files+  * Add parallel build support for GHC 7.8 and later+  * Don't call ranlib on OS X+  * Avoid re-linking executables, test suites, and benchmarks+  unnecessarily, shortening build times+  * Add `--allow-newer` which allows upper version bounds to be+  ignored+  * Add `--enable-library-stripping`+  * Add command for freezing dependencies+  * Allow repl to be used outside Cabal packages+  * Add `--require-sandbox`+  * Don't use `--strip-unneeded` on OS X or iOS+  * Add new license-files field got additional licenses+  * Fix if(solaris) on some Solaris versions+  * Don't use -dylib-install-name on OS X with GHC > 7.8+  * Add DragonFly as a known OS+  * Improve pretty-printing of Cabal files+  * Add test flag `--show-details=streaming` for real-time test output+  * Add exec command++----++## 1.10.2.0 [Duncan Coutts](mailto:duncan@community.haskell.org) June 2011+  * Include test suites in cabal sdist+  * Fix for conditionals in test suite stanzas in `.cabal` files+  * Fix permissions of directories created during install+  * Fix for global builds when $HOME env var is not set++## 1.10.1.0 [Duncan Coutts](mailto:duncan@community.haskell.org) February 2011+  * Improved error messages when test suites are not enabled+  * Template parameters allowed in test `--test-option(s)` flag+  * Improved documentation of the test feature+  * Relaxed QA check on cabal-version when using test-suite sections+  * `haddock` command now allows both `--hoogle` and `--html` at the same time+  * Find ghc-version-specific instances of the hsc2hs program+  * Preserve file executable permissions in sdist tarballs+  * Pass gcc location and flags to ./configure scripts+  * Get default gcc flags from ghc++# 1.10.0.0 [Duncan Coutts](mailto:duncan@haskell.org) November 2010+  * New cabal test feature+  * Initial support for UHC+  * New default-language and other-languages fields (e.g. Haskell98/2010)+  * New default-extensions and other-extensions fields+  * Deprecated extensions field (for packages using cabal-version >=1.10)+  * Cabal-version field must now only be of the form `>= x.y`+  * Removed deprecated `--copy-prefix=` feature+  * Auto-reconfigure when `.cabal` file changes+  * Workaround for haddock overwriting .hi and .o files when using TH+  * Extra cpp flags used with hsc2hs and c2hs (-D${os}_BUILD_OS etc)+  * New cpp define VERSION_<package> gives string version of dependencies+  * User guide source now in markdown format for easier editing+  * Improved checks and error messages for C libraries and headers+  * Removed BSD4 from the list of suggested licenses+  * Updated list of known language extensions+  * Fix for include paths to allow C code to import FFI stub.h files+  * Fix for intra-package dependencies on OSX+  * Stricter checks on various bits of `.cabal` file syntax+  * Minor fixes for c2hs++----++### 1.8.0.6 [Duncan Coutts](mailto:duncan@haskell.org) June 2010+  * Fix `register --global/--user`++### 1.8.0.4 [Duncan Coutts](mailto:duncan@haskell.org) March 2010+  * Set dylib-install-name for dynalic libs on OSX+  * Stricter configure check that compiler supports a package's extensions+  * More configure-time warnings+  * Hugs can compile Cabal lib again+  * Default datadir now follows prefix on Windows+  * Support for finding installed packages for hugs+  * Cabal version macros now have proper parenthesis+  * Reverted change to filter out deps of non-buildable components+  * Fix for registering implace when using a specific package db+  * Fix mismatch between $os and $arch path template variables+  * Fix for finding ar.exe on Windows, always pick ghc's version+  * Fix for intra-package dependencies with ghc-6.12++# 1.8.0.2 [Duncan Coutts](mailto:duncan@haskell.org) December 2009+  * Support for GHC-6.12+  * New unique installed package IDs which use a package hash+  * Allow executables to depend on the lib within the same package+  * Dependencies for each component apply only to that component+    (previously applied to all the other components too)+  * Added new known license MIT and versioned GPL and LGPL+  * More liberal package version range syntax+  * Package registration files are now UTF8+  * Support for LHC and JHC-0.7.2+  * Deprecated RecordPuns extension in favour of NamedFieldPuns+  * Deprecated PatternSignatures extension in favor of ScopedTypeVariables+  * New VersionRange semantic view as a sequence of intervals+  * Improved package quality checks+  * Minor simplification in a couple `Setup.hs` hooks+  * Beginnings of a unit level testsuite using QuickCheck+  * Various bug fixes+  * Various internal cleanups++----++### 1.6.0.2 [Duncan Coutts](mailto:duncan@haskell.org) February 2009+  * New configure-time check for C headers and libraries+  * Added language extensions present in ghc-6.10+  * Added support for NamedFieldPuns extension in ghc-6.8+  * Fix in configure step for ghc-6.6 on Windows+  * Fix warnings in `Path_pkgname.hs` module on Windows+  * Fix for exotic flags in ld-options field+  * Fix for using pkg-config in a package with a lib and an executable+  * Fix for building haddock docs for exes that use the Paths module+  * Fix for installing header files in subdirectories+  * Fix for the case of building profiling libs but not ordinary libs+  * Fix read-only attribute of installed files on Windows+  * Ignore ghc -threaded flag when profiling in ghc-6.8 and older++### 1.6.0.1 [Duncan Coutts](mailto:duncan@haskell.org) October 2008+  * Export a compat function to help alex and happy++# 1.6.0.0 [Duncan Coutts](mailto:duncan@haskell.org) October 2008+  * Support for ghc-6.10+  * Source control repositories can now be specified in `.cabal` files+  * Bug report URLs can be now specified in `.cabal` files+  * Wildcards now allowed in data-files and extra-source-files fields+  * New syntactic sugar for dependencies `build-depends: foo ==1.2.*`+  * New cabal_macros.h provides macros to test versions of dependencies+  * Relocatable bindists now possible on unix via env vars+  * New `exposed` field allows packages to be not exposed by default+  * Install dir flags can now use $os and $arch variables+  * New `--builddir` flag allows multiple builds from a single sources dir+  * cc-options now only apply to .c files, not for -fvia-C+  * cc-options are not longer propagated to dependent packages+  * The cpp/cc/ld-options fields no longer use `,` as a separator+  * hsc2hs is now called using gcc instead of using ghc as gcc+  * New api for manipulating sets and graphs of packages+  * Internal api improvements and code cleanups+  * Minor improvements to the user guide+  * Miscellaneous minor bug fixes++----++### 1.4.0.2 [Duncan Coutts](mailto:duncan@haskell.org) August 2008+  * Fix executable stripping default+  * Fix striping exes on OSX that export dynamic symbols (like ghc)+  * Correct the order of arguments given by `--prog-options=`+  * Fix corner case with overlapping user and global packages+  * Fix for modules that use pre-processing and `.hs-boot` files+  * Clarify some points in the user guide and readme text+  * Fix verbosity flags passed to sub-command like haddock+  * Fix `sdist --snapshot`+  * Allow meta-packages that contain no modules or C code+  * Make the generated Paths module -Wall clean on Windows++### 1.4.0.1 [Duncan Coutts](mailto:duncan@haskell.org) June 2008+  * Fix a bug which caused `.` to always be in the sources search path+  * Haddock-2.2 and later do now support the `--hoogle` flag++# 1.4.0.0 [Duncan Coutts](mailto:duncan@haskell.org) June 2008+  * Rewritten command line handling support+  * Command line completion with bash+  * Better support for Haddock 2+  * Improved support for nhc98+  * Removed support for ghc-6.2+  * Haddock markup in `.lhs` files now supported+  * Default colour scheme for highlighted source code+  * Default prefix for `--user` installs is now `$HOME/.cabal`+  * All `.cabal` files are treaded as UTF-8 and must be valid+  * Many checks added for common mistakes+  * New `--package-db=` option for specific package databases+  * Many internal changes to support cabal-install+  * Stricter parsing for version strings, eg dissalows "1.05"+  * Improved user guide introduction+  * Programatica support removed+  * New options `--program-prefix/suffix` allows eg versioned programs+  * Support packages that use `.hs-boot` files+  * Fix sdist for Main modules that require preprocessing+  * New configure -O flag with optimisation level 0--2+  * Provide access to "`x-`" extension fields through the Cabal api+  * Added check for broken installed packages+  * Added warning about using inconsistent versions of dependencies+  * Strip binary executable files by default with an option to disable+  * New options to add site-specific include and library search paths+  * Lift the restriction that libraries must have exposed-modules+  * Many bugs fixed.+  * Many internal structural improvements and code cleanups++----++## 1.2.4.0 [Duncan Coutts](mailto:duncan@haskell.org) June 2008+  * Released with GHC 6.8.3+  * Backported several fixes and minor improvements from Cabal-1.4+  * Use a default colour scheme for sources with hscolour >=1.9+  * Support `--hyperlink-source` for Haddock >= 2.0+  * Fix for running in a non-writable directory+  * Add OSX -framework arguments when linking executables+  * Updates to the user guide+  * Allow build-tools names to include + and _+  * Export autoconfUserHooks and simpleUserHooks+  * Export ccLdOptionsBuildInfo for `Setup.hs` scripts+  * Export unionBuildInfo and make BuildInfo an instance of Monoid+  * Fix to allow the `main-is` module to use a pre-processor++## 1.2.3.0 [Duncan Coutts](mailto:duncan@haskell.org) Nov 2007+  * Released with GHC 6.8.2+  * Includes full list of GHC language extensions+  * Fix infamous `dist/conftest.c` bug+  * Fix `configure --interfacedir=`+  * Find ld.exe on Windows correctly+  * Export PreProcessor constructor and mkSimplePreProcessor+  * Fix minor bug in unlit code+  * Fix some markup in the haddock docs++## 1.2.2.0 [Duncan Coutts](mailto:duncan@haskell.org) Nov 2007+  * Released with GHC 6.8.1+  * Support haddock-2.0+  * Support building DSOs with GHC+  * Require reconfiguring if the `.cabal` file has changed+  * Fix os(windows) configuration test+  * Fix building documentation+  * Fix building packages on Solaris+  * Other minor bug fixes++## 1.2.1 [Duncan Coutts](mailto:duncan@haskell.org) Oct 2007+  * To be included in GHC 6.8.1+  * New field `cpp-options` used when preprocessing Haskell modules+  * Fixes for hsc2hs when using ghc+  * C source code gets compiled with -O2 by default+  * OS aliases, to allow os(windows) rather than requiring os(mingw32)+  * Fix cleaning of `stub` files+  * Fix cabal-setup, command line ui that replaces `runhaskell Setup.hs`+  * Build docs even when dependent packages docs are missing+  * Allow the `--html-dir` to be specified at configure time+  * Fix building with ghc-6.2+  * Other minor bug fixes and build fixes++# 1.2.0  [Duncan Coutts](mailto:duncan.coutts@worc.ox.ac.uk) Sept 2007+  * To be included in GHC 6.8.x+  * New configurations feature+  * Can make haddock docs link to hilighted sources (with hscolour)+  * New flag to allow linking to haddock docs on the web+  * Supports pkg-config+  * New field `build-tools` for tool dependencies+  * Improved c2hs support+  * Preprocessor output no longer clutters source dirs+  * Separate `includes` and `install-includes` fields+  * Makefile command to generate makefiles for building libs with GHC+  * New `--docdir` configure flag+  * Generic `--with-prog` `--prog-args` configure flags+  * Better default installation paths on Windows+  * Install paths can be specified relative to each other+  * License files now installed+  * Initial support for NHC (incomplete)+  * Consistent treatment of verbosity+  * Reduced verbosity of configure step by default+  * Improved helpfulness of output messages+  * Help output now clearer and fits in 80 columns+  * New setup register `--gen-pkg-config` flag for distros+  * Major internal refactoring, hooks api has changed+  * Dozens of bug fixes++----++### 1.1.6.2 [Duncan Coutts](mailto:duncan.coutts@worc.ox.ac.uk) May 2007++  * Released with GHC 6.6.1+  * Handle windows text file encoding for `.cabal` files+  * Fix compiling a executable for profiling that uses Template Haskell+  * Other minor bug fixes and user guide clarifications++### 1.1.6.1 [Duncan Coutts](mailto:duncan.coutts@worc.ox.ac.uk) Oct 2006++  * fix unlit code+  * fix escaping in register.sh++## 1.1.6  [Duncan Coutts](mailto:duncan.coutts@worc.ox.ac.uk) Oct 2006++  * Released with GHC 6.6+  * Added support for hoogle+  * Allow profiling and normal builds of libs to be chosen indepentantly+  * Default installation directories on Win32 changed+  * Register haddock docs with ghc-pkg+  * Get haddock to make hyperlinks to dependent package docs+  * Added BangPatterns language extension+  * Various bug fixes++## 1.1.4  [Duncan Coutts](mailto:duncan.coutts@worc.ox.ac.uk) May 2006++  * Released with GHC 6.4.2+  * Better support for packages that need to install header files+  * cabal-setup added, but not installed by default yet+  * Implemented `setup register --inplace`+  * Have packages exposed by default with ghc-6.2+  * It is no longer necessary to run `configure` before `clean` or `sdist`+  * Added support for ghc's `-split-objs`+  * Initial support for JHC+  * Ignore extension fields in `.cabal` files (fields begining with "`x-`")+  * Some changes to command hooks API to improve consistency+  * Hugs support improvements+  * Added GeneralisedNewtypeDeriving language extension+  * Added cabal-version field+  * Support hidden modules with haddock+  * Internal code refactoring+  * More bug fixes++## 1.1.3  [Isaac Jones](mailto:ijones@syntaxpolice.org) Sept 2005++  * WARNING: Interfaces not documented in the user's guide may+    change in future releases.+  * Move building of GHCi .o libs to the build phase rather than+  register phase. (from Duncan Coutts)+  * Use .tar.gz for source package extension+  * Uses GHC instead of cpphs if the latter is not available+  * Added experimental "command hooks" which completely override the+  default behavior of a command.+  * Some bugfixes++# 1.1.1  [Isaac Jones](mailto:ijones@syntaxpolice.org) July 2005++  * WARNING: Interfaces not documented in the user's guide may+    change in future releases.+  * Handles recursive modules for GHC 6.2 and GHC 6.4.+  * Added `setup test` command (Used with UserHook)+  * implemented handling of _stub.{c,h,o} files+  * Added support for profiling+  * Changed install prefix of libraries (pref/pkgname-version+    to prefix/pkgname-version/compname-version)+  * Added pattern guards as a language extension+  * Moved some functionality to Language.Haskell.Extension+  * Register / unregister .bat files for windows+  * Exposed more of the API+  * Added support for the hide-all-packages flag in GHC > 6.4+  * Several bug fixes++----++# 1.0  [Isaac Jones](mailto:ijones@syntaxpolice.org) March 11 2005++  * Released with GHC 6.4, Hugs March 2005, and nhc98 1.18+  * Some sanity checking++----++# 0.5  [Isaac Jones](mailto:ijones@syntaxpolice.org) Wed Feb 19 2005++  * __WARNING__: this is a pre-release and the interfaces are+    still likely to change until we reach a 1.0 release.+  * Hooks interfaces changed+  * Added preprocessors to user hooks+  * No more executable-modules or hidden-modules.  Use+    `other-modules` instead.+  * Certain fields moved into BuildInfo, much refactoring+  * `extra-libs` -> `extra-libraries`+  * Added `--gen-script` to configure and unconfigure.+  * `modules-ghc` (etc) now `ghc-modules` (etc)+  * added new fields including `synopsis`+  * Lots of bug fixes+  * spaces can sometimes be used instead of commas+  * A user manual has appeared (Thanks, ross!)+  * for ghc 6.4, configures versionsed depends properly+  * more features to `./setup haddock`++----++# 0.4  [Isaac Jones](mailto:ijones@syntaxpolice.org) Sun Jan 16 2005++  * Much thanks to all the awesome fptools hackers who have been+  working hard to build the Haskell Cabal!++  * __Interface Changes__:++    * __WARNING__: this is a pre-release and the interfaces are still+    likely to change until we reach a 1.0 release.++    * Instead of Package.description, you should name your+    description files <something>.cabal.  In particular, we suggest+    that you name it <packagename>.cabal, but this is not enforced+    (yet).  Multiple `.cabal` files in the same directory is an error,+    at least for now.++    * `./setup install --install-prefix` is gone.  Use `./setup copy`+    `--copy-prefix` instead.++    * The `Modules` field is gone.  Use `hidden-modules`,+    `exposed-modules`, and `executable-modules`.++    * `Build-depends` is now a package-only field, and can't go into+    executable stanzas.  Build-depends is a package-to-package+    relationship.++    * Some new fields.  Use the Source.++  * __New Features__++    * Cabal is now included as a package in the CVS version of+    fptools.  That means it'll be released as `-package Cabal` in+    future versions of the compilers, and if you are a bleeding-edge+    user, you can grab it from the CVS repository with the compilers.++    * Hugs compatibility and NHC98 compatibility should both be+    improved.++    * Hooks Interface / Autoconf compatibility: Most of the hooks+    interface is hidden for now, because it's not finalized.  I have+    exposed only `defaultMainWithHooks` and `defaultUserHooks`.  This+    allows you to use a ./configure script to preprocess+    `foo.buildinfo`, which gets merged with `foo.cabal`.  In future+    releases, we'll expose UserHooks, but we're definitely going to+    change the interface to those.  The interface to the two functions+    I've exposed should stay the same, though.++    * ./setup haddock is a baby feature which pre-processes the+    source code with hscpp and runs haddock on it.  This is brand new+    and hardly tested, so you get to knock it around and see what you+    think.++    * Some commands now actually implement verbosity.++    * The preprocessors have been tested a bit more, and seem to work+    OK.  Please give feedback if you use these.++----++# 0.3  [Isaac Jones](mailto:ijones@syntaxpolice.org) Sun Jan 16 2005++  * Unstable snapshot release+  * From now on, stable releases are even.++----++# 0.2  [Isaac Jones](mailto:ijones@syntaxpolice.org)++  * Adds more HUGS support and preprocessor support.

@@ -1,9 +1,9 @@-{-# LANGUAGE FlexibleInstances #-}-{-# LANGUAGE RankNTypes #-}-{-# LANGUAGE PatternGuards #-}-{-# LANGUAGE DeriveGeneric #-}-{-# LANGUAGE DeriveDataTypeable #-}+{-# LANGUAGE DeriveDataTypeable         #-}+{-# LANGUAGE DeriveGeneric              #-}+{-# LANGUAGE FlexibleInstances          #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-}+{-# LANGUAGE PatternGuards              #-}+{-# LANGUAGE RankNTypes                 #-}  -- | This module defines the core data types for Backpack.  For more -- details, see:@@ -31,6 +31,8 @@     dispOpenModuleSubstEntry,     parseOpenModuleSubst,     parseOpenModuleSubstEntry,+    parsecOpenModuleSubst,+    parsecOpenModuleSubstEntry,     openModuleSubstFreeHoles,      -- * Conversions to 'UnitId'@@ -38,22 +40,26 @@     hashModuleSubst, ) where -import Prelude () import Distribution.Compat.Prelude hiding (mod)-import Distribution.Compat.ReadP-import qualified Distribution.Compat.ReadP as Parse-import qualified Text.PrettyPrint as Disp-import Text.PrettyPrint (hcat)+import Distribution.Compat.ReadP   ((<++))+import Distribution.Parsec.Class+import Distribution.Pretty+import Prelude ()+import Text.PrettyPrint            (hcat) +import qualified Distribution.Compat.CharParsing as P+import qualified Distribution.Compat.ReadP       as Parse+import qualified Text.PrettyPrint                as Disp+ import Distribution.ModuleName import Distribution.Text import Distribution.Types.ComponentId-import Distribution.Types.UnitId import Distribution.Types.Module+import Distribution.Types.UnitId import Distribution.Utils.Base62  import qualified Data.Map as Map-import Data.Set (Set)+import           Data.Set (Set) import qualified Data.Set as Set  -----------------------------------------------------------------------@@ -103,13 +109,32 @@     rnf (IndefFullUnitId cid subst) = rnf cid `seq` rnf subst     rnf (DefiniteUnitId uid) = rnf uid -instance Text OpenUnitId where-    disp (IndefFullUnitId cid insts)+instance Pretty OpenUnitId where+    pretty (IndefFullUnitId cid insts)         -- TODO: arguably a smart constructor to enforce invariant would be         -- better-        | Map.null insts = disp cid-        | otherwise      = disp cid <<>> Disp.brackets (dispOpenModuleSubst insts)-    disp (DefiniteUnitId uid) = disp uid+        | Map.null insts = pretty cid+        | otherwise      = pretty cid <<>> Disp.brackets (dispOpenModuleSubst insts)+    pretty (DefiniteUnitId uid) = pretty uid++-- |+--+-- >>> eitherParsec "foobar" :: Either String OpenUnitId+--Right (DefiniteUnitId (DefUnitId {unDefUnitId = UnitId "foobar"}))+--+-- >>> eitherParsec "foo[Str=text-1.2.3:Data.Text.Text]" :: Either String OpenUnitId+-- Right (IndefFullUnitId (ComponentId "foo") (fromList [(ModuleName ["Str"],OpenModule (DefiniteUnitId (DefUnitId {unDefUnitId = UnitId "text-1.2.3"})) (ModuleName ["Data","Text","Text"]))]))+--+instance Parsec OpenUnitId where+    parsec = P.try parseOpenUnitId <|> fmap DefiniteUnitId parsec+      where+        parseOpenUnitId = do+            cid <- parsec+            insts <- P.between (P.char '[') (P.char ']')+                       parsecOpenModuleSubst+            return (IndefFullUnitId cid insts)++instance Text OpenUnitId where     parse = parseOpenUnitId <++ fmap DefiniteUnitId parse       where         parseOpenUnitId = do@@ -160,11 +185,33 @@     rnf (OpenModule uid mod_name) = rnf uid `seq` rnf mod_name     rnf (OpenModuleVar mod_name) = rnf mod_name +instance Pretty OpenModule where+    pretty (OpenModule uid mod_name) =+        hcat [pretty uid, Disp.text ":", pretty mod_name]+    pretty (OpenModuleVar mod_name) =+        hcat [Disp.char '<', pretty mod_name, Disp.char '>']++-- |+--+-- >>> eitherParsec "Includes2-0.1.0.0-inplace-mysql:Database.MySQL" :: Either String OpenModule+-- Right (OpenModule (DefiniteUnitId (DefUnitId {unDefUnitId = UnitId "Includes2-0.1.0.0-inplace-mysql"})) (ModuleName ["Database","MySQL"]))+--+instance Parsec OpenModule where+    parsec = parsecModuleVar <|> parsecOpenModule+      where+        parsecOpenModule = do+            uid <- parsec+            _ <- P.char ':'+            mod_name <- parsec+            return (OpenModule uid mod_name)++        parsecModuleVar = do+            _ <- P.char '<'+            mod_name <- parsec+            _ <- P.char '>'+            return (OpenModuleVar mod_name)+ instance Text OpenModule where-    disp (OpenModule uid mod_name) =-        hcat [disp uid, Disp.text ":", disp mod_name]-    disp (OpenModuleVar mod_name) =-        hcat [Disp.char '<', disp mod_name, Disp.char '>']     parse = parseModuleVar <++ parseOpenModule       where         parseOpenModule = do@@ -205,17 +252,35 @@ dispOpenModuleSubstEntry (k, v) = disp k <<>> Disp.char '=' <<>> disp v  -- | Inverse to 'dispModSubst'.-parseOpenModuleSubst :: ReadP r OpenModuleSubst+parseOpenModuleSubst :: Parse.ReadP r OpenModuleSubst parseOpenModuleSubst = fmap Map.fromList       . flip Parse.sepBy (Parse.char ',')       $ parseOpenModuleSubstEntry  -- | Inverse to 'dispModSubstEntry'.-parseOpenModuleSubstEntry :: ReadP r (ModuleName, OpenModule)+parseOpenModuleSubstEntry :: Parse.ReadP r (ModuleName, OpenModule) parseOpenModuleSubstEntry =     do k <- parse        _ <- Parse.char '='        v <- parse+       return (k, v)++-- | Inverse to 'dispModSubst'.+--+-- @since 2.2+parsecOpenModuleSubst :: CabalParsing m => m OpenModuleSubst+parsecOpenModuleSubst = fmap Map.fromList+      . flip P.sepBy (P.char ',')+      $ parsecOpenModuleSubstEntry++-- | Inverse to 'dispModSubstEntry'.+--+-- @since 2.2+parsecOpenModuleSubstEntry :: CabalParsing m => m (ModuleName, OpenModule)+parsecOpenModuleSubstEntry =+    do k <- parsec+       _ <- P.char '='+       v <- parsec        return (k, v)  -- | Get the set of holes ('ModuleVar') embedded in a 'OpenModuleSubst'.

@@ -40,6 +40,7 @@ import Distribution.Version import Distribution.Utils.LogProgress import Distribution.Utils.MapAccum+import Distribution.Utils.Generic  import Control.Monad import qualified Data.Set as Set@@ -191,7 +192,11 @@                          , pn /= packageName pkg_descr                          , (cn, e) <- Map.toList comp_map                          , cn == CLibName ]-    exe_deps =+    -- We have to nub here, because 'getAllToolDependencies' may return+    -- duplicates (see #4986).  (NB: This is not needed for lib_deps,+    -- since those elaborate into includes, for which there explicitly+    -- may be multiple instances of a package)+    exe_deps = ordNub $         [ exe         | ExeDependency pn cn _ <- getAllToolDependencies pkg_descr bi         -- The error suppression here is important, because in general

@@ -21,6 +21,7 @@ import Distribution.Backpack.FullUnitId import Distribution.Backpack.ConfiguredComponent import Distribution.Backpack.ModuleShape+import Distribution.Backpack.PreModuleShape import Distribution.Backpack.ModuleScope import Distribution.Backpack.UnifyM import Distribution.Backpack.MixLink@@ -122,7 +123,7 @@     -> ConfiguredComponent     -> LogProgress LinkedComponent toLinkedComponent verbosity db this_pid pkg_map ConfiguredComponent {-    cc_ann_id = aid@AnnotatedId { ann_id = this_cid, ann_cname = compname },+    cc_ann_id = aid@AnnotatedId { ann_id = this_cid },     cc_component = component,     cc_exe_deps = exe_deps,     cc_public = is_public,@@ -140,6 +141,7 @@                              exposedModules lib,                              reexportedModules lib)                 _ -> ([], [], [])+        src_hidden = otherModules (componentBuildInfo component)          -- Take each included ComponentId and resolve it into an         -- *unlinked* unit identity.  We will use unification (relying@@ -158,31 +160,55 @@             dieProgress (vcat (intersperse (text "") -- double newline!                                 [ hang (text "-") 2 err | err <- errs])) +    -- Pre-shaping+    let pre_shape = mixLinkPreModuleShape $+            PreModuleShape {+                preModShapeProvides = Set.fromList (src_provs ++ src_hidden),+                preModShapeRequires = Set.fromList src_reqs+            } : [ renamePreModuleShape (toPreModuleShape sh) rns+                | ComponentInclude (AnnotatedId { ann_id = (_, sh) }) rns _ <- unlinked_includes ]+        reqs  = preModShapeRequires pre_shape+        insts = [ (req, OpenModuleVar req)+                | req <- Set.toList reqs ]+        this_uid = IndefFullUnitId this_cid . Map.fromList $ insts+     -- OK, actually do unification     -- TODO: the unification monad might return errors, in which     -- case we have to deal.  Use monadic bind for now.-    (linked_shape0   :: ModuleScope,+    (linked_shape0  :: ModuleScope,      linked_includes0 :: [ComponentInclude OpenUnitId ModuleRenaming],      linked_sig_includes0 :: [ComponentInclude OpenUnitId ModuleRenaming])-      <- orErr $ runUnifyM verbosity db $ do+      <- orErr $ runUnifyM verbosity this_cid db $ do         -- The unification monad is implemented using mutable         -- references.  Thus, we must convert our *pure* data         -- structures into mutable ones to perform unification.-        ---        {-++        let convertMod :: (ModuleName -> ModuleSource) -> ModuleName -> UnifyM s (ModuleScopeU s)+            convertMod from m = do+                m_u <- convertModule (OpenModule this_uid m)+                return (Map.singleton m [WithSource (from m) m_u], Map.empty)+        -- Handle 'exposed-modules'+        exposed_mod_shapes_u <- mapM (convertMod FromExposedModules) src_provs+        -- Handle 'other-modules'+        other_mod_shapes_u <- mapM (convertMod FromOtherModules) src_hidden++        -- Handle 'signatures'         let convertReq :: ModuleName -> UnifyM s (ModuleScopeU s)             convertReq req = do                 req_u <- convertModule (OpenModuleVar req)-                return (Map.empty, Map.singleton req req_u)-            -- NB: We DON'T convert locally defined modules, as in the-            -- absence of mutual recursion across packages they-            -- cannot participate in mix-in linking.-        -}-        (shapes_u, all_includes_u) <- fmap unzip (mapM convertInclude unlinked_includes)+                return (Map.empty, Map.singleton req [WithSource (FromSignatures req) req_u])+        req_shapes_u <- mapM convertReq src_reqs++        -- Handle 'mixins'+        (incl_shapes_u, all_includes_u) <- fmap unzip (mapM convertInclude unlinked_includes)+         failIfErrs -- Prevent error cascade         -- Mix-in link everything!  mixLink is the real workhorse.-        shape_u <- mixLink shapes_u-        -- shape_u <- foldM mixLink emptyModuleScopeU (shapes_u ++ src_reqs_u)+        shape_u <- mixLink $ exposed_mod_shapes_u+                          ++ other_mod_shapes_u+                          ++ req_shapes_u+                          ++ incl_shapes_u+         -- src_reqs_u <- mapM convertReq src_reqs         -- Read out all the final results by converting back         -- into a pure representation.@@ -199,40 +225,6 @@         sig_incls <- mapM convertIncludeU sig_includes_u         return (shape, incls, sig_incls) -    -- linked_shape0 is almost complete, but it doesn't contain-    -- the actual modules we export ourselves.  Add them!-    let reqs = Map.keysSet (modScopeRequires linked_shape0)-                `Set.union` Set.fromList src_reqs-        -- TODO: check that there aren't pre-filled requirements...-        insts = [ (req, OpenModuleVar req)-                | req <- Set.toList reqs ]-        this_uid = IndefFullUnitId this_cid . Map.fromList $ insts--        -- add the local exports to the scope-        local_source m = [ModuleSource (packageName this_pid)-                                       compname-                                       defaultIncludeRenaming m True]-        local_exports = Map.fromListWith (++) $-          [ (mod_name, local_source (OpenModule this_uid mod_name)) | mod_name <- src_provs ]-        local_reqs = Map.fromListWith (++) $-          [ (mod_name, local_source (OpenModuleVar mod_name)) | mod_name <- src_reqs ]-          -- NB: do NOT include hidden modules here: GHC 7.10's ghc-pkg-          -- won't allow it (since someone could directly synthesize-          -- an 'InstalledPackageInfo' that violates abstraction.)-          -- Though, maybe it should be relaxed?-        linked_shape = linked_shape0 {-                          modScopeProvides =-                            Map.unionWith (++)-                              local_exports-                              (modScopeProvides linked_shape0),-                          -- TODO: test that requirements aren't already-                          -- in scope-                          modScopeRequires =-                            Map.unionWith (++)-                              local_reqs-                              (modScopeRequires linked_shape0)-                        }-     let isNotLib (CLib _) = False         isNotLib _        = True     when (not (Set.null reqs) && isNotLib component) $@@ -240,6 +232,19 @@             hang (text "Non-library component has unfilled requirements:")                 4 (vcat [disp req | req <- Set.toList reqs]) +    -- NB: do NOT include hidden modules here: GHC 7.10's ghc-pkg+    -- won't allow it (since someone could directly synthesize+    -- an 'InstalledPackageInfo' that violates abstraction.)+    -- Though, maybe it should be relaxed?+    let src_hidden_set = Set.fromList src_hidden+        linked_shape = linked_shape0 {+            modScopeProvides =+                -- Would rather use withoutKeys but need BC+                Map.filterWithKey+                    (\k _ -> not (k `Set.member` src_hidden_set))+                    (modScopeProvides linked_shape0)+            }+     -- OK, compute the reexports     -- TODO: This code reports the errors for reexports one reexport at     -- a time.  Better to collect them all up and report them all at@@ -259,15 +264,20 @@           (x, xs) <-             case mb_pn of               Just pn ->-                case filter ((pn==) . msrc_pkgname) cands of-                  (x1:xs1) -> return (x1, xs1)-                  _ -> Left (brokenReexportMsg reex)+                let matches_pn (FromMixins pn' _ _)     = pn == pn'+                    matches_pn (FromBuildDepends pn' _) = pn == pn'+                    matches_pn (FromExposedModules _) = pn == packageName this_pid+                    matches_pn (FromOtherModules _)   = pn == packageName this_pid+                    matches_pn (FromSignatures _)     = pn == packageName this_pid+                in case filter (matches_pn . getSource) cands of+                    (x1:xs1) -> return (x1, xs1)+                    _ -> Left (brokenReexportMsg reex)               Nothing -> return (x0, xs0)           -- Test that all the candidates are consistent-          case filter (\x' -> msrc_module x /= msrc_module x') xs of+          case filter (\x' -> unWithSource x /= unWithSource x') xs of             [] -> return ()             _ -> Left $ ambiguousReexportMsg reex x xs-          return (to, msrc_module x)+          return (to, unWithSource x)         _ ->           Left (brokenReexportMsg reex) @@ -362,15 +372,15 @@        , text "It occurs in neither the 'exposed-modules' of this package,"        , text "nor any of its 'build-depends' dependencies." ] -ambiguousReexportMsg :: ModuleReexport -> ModuleSource -> [ModuleSource] -> Doc+ambiguousReexportMsg :: ModuleReexport -> ModuleWithSource -> [ModuleWithSource] -> Doc ambiguousReexportMsg (ModuleReexport mb_pn from _to) y1 ys =   vcat [ text "Ambiguous reexport" <+> quotes (disp from)        , hang (text "It could refer to either:") 2             (vcat (msg : msgs))        , help_msg mb_pn ]   where-    msg  = text "  " <+> displaySource y1-    msgs = [text "or" <+> displaySource y | y <- ys]+    msg  = text "  " <+> displayModuleWithSource y1+    msgs = [text "or" <+> displayModuleWithSource y | y <- ys]     help_msg Nothing =       -- TODO: This advice doesn't help if the ambiguous exports       -- come from a package named the same thing@@ -382,12 +392,8 @@       vcat [ text "The ambiguity can be resolved by using the"            , text "mixins field to rename one of the module"            , text "names differently." ]-    displaySource y-      = vcat [ quotes (disp (msrc_module y))+    displayModuleWithSource y+      = vcat [ quotes (disp (unWithSource y))              , text "brought into scope by" <+>-                if not (isDefaultIncludeRenaming (msrc_renaming y))-                  then text "the mixin" <+>-                       disp (msrc_pkgname y) <+>-                       parens (disp (includeProvidesRn (msrc_renaming y)))-                  else text "the build dependency on" <+> disp (msrc_pkgname y)+                dispModuleSource (getSource y)              ]

@@ -10,12 +10,12 @@ import Distribution.Backpack import Distribution.Backpack.UnifyM import Distribution.Backpack.FullUnitId+import Distribution.Backpack.ModuleScope  import qualified Distribution.Utils.UnionFind as UnionFind import Distribution.ModuleName import Distribution.Text import Distribution.Types.ComponentId-import Distribution.Types.ComponentName  import Text.PrettyPrint import Control.Monad@@ -36,39 +36,21 @@     let remaining = Map.difference reqs filled     return (provs, remaining) --- TODO: Deduplicate this with Distribution.Backpack.UnifyM.ci_msg-dispSource :: ModuleSourceU s -> Doc-dispSource src- | usrc_implicit src- = text "build-depends:" <+> pp_pn- | otherwise- = text "mixins:" <+> pp_pn <+> disp (usrc_renaming src)- where-  pp_pn =-    -- NB: This syntax isn't quite the source syntax, but it-    -- should be clear enough.  To do source syntax, we'd-    -- need to know what the package we're linking is.-    case usrc_compname src of-        CLibName -> disp (usrc_pkgname src)-        CSubLibName cn -> disp (usrc_pkgname src) <<>> colon <<>> disp cn-        -- Shouldn't happen-        cn -> disp (usrc_pkgname src) <+> parens (disp cn)- -- | Link a list of possibly provided modules to a single -- requirement.  This applies a side-condition that all -- of the provided modules at the same name are *actually* -- the same module. linkProvision :: ModuleName-              -> [ModuleSourceU s] -- provs-              -> [ModuleSourceU s] -- reqs-              -> UnifyM s [ModuleSourceU s]+              -> [ModuleWithSourceU s] -- provs+              -> [ModuleWithSourceU s] -- reqs+              -> UnifyM s [ModuleWithSourceU s] linkProvision mod_name ret@(prov:provs) (req:reqs) = do     -- TODO: coalesce all the non-unifying modules together     forM_ provs $ \prov' -> do         -- Careful: read it out BEFORE unifying, because the         -- unification algorithm preemptively unifies modules-        mod  <- convertModuleU (usrc_module prov)-        mod' <- convertModuleU (usrc_module prov')+        mod  <- convertModuleU (unWithSource prov)+        mod' <- convertModuleU (unWithSource prov')         r <- unify prov prov'         case r of             Just () -> return ()@@ -76,11 +58,22 @@                 addErr $                   text "Ambiguous module" <+> quotes (disp mod_name) $$                   text "It could refer to" <+>-                    ( text "  " <+> (quotes (disp mod)  $$ in_scope_by prov) $$-                      text "or" <+> (quotes (disp mod') $$ in_scope_by prov') ) $$+                    ( text "  " <+> (quotes (disp mod)  $$ in_scope_by (getSource prov)) $$+                      text "or" <+> (quotes (disp mod') $$ in_scope_by (getSource prov')) ) $$                   link_doc-    mod <- convertModuleU (usrc_module prov)-    req_mod <- convertModuleU (usrc_module req)+    mod <- convertModuleU (unWithSource prov)+    req_mod <- convertModuleU (unWithSource req)+    self_cid <- fmap unify_self_cid getUnifEnv+    case mod of+      OpenModule (IndefFullUnitId cid _) _+        | cid == self_cid -> addErr $+            text "Cannot instantiate requirement" <+> quotes (disp mod_name) <+>+                in_scope_by (getSource req) $$+            text "with locally defined module" <+> in_scope_by (getSource prov) $$+            text "as this would create a cyclic dependency, which GHC does not support." $$+            text "Try moving this module to a separate library, e.g.," $$+            text "create a new stanza: library 'sublib'."+      _ -> return ()     r <- unify prov req     case r of         Just () -> return ()@@ -95,14 +88,14 @@     return ret   where     unify s1 s2 = tryM $ addErrContext short_link_doc-                       $ unifyModule (usrc_module s1) (usrc_module s2)-    in_scope_by s = text "brought into scope by" <+> dispSource s+                       $ unifyModule (unWithSource s1) (unWithSource s2)+    in_scope_by s = text "brought into scope by" <+> dispModuleSource s     short_link_doc = text "While filling requirement" <+> quotes (disp mod_name)     link_doc = text "While filling requirements of" <+> reqs_doc     reqs_doc-      | null reqs = dispSource req-      | otherwise =  (       text "   " <+> dispSource req  $$-                      vcat [ text "and" <+> dispSource r | r <- reqs])+      | null reqs = dispModuleSource (getSource req)+      | otherwise =  (       text "   " <+> dispModuleSource (getSource req)  $$+                      vcat [ text "and" <+> dispModuleSource (getSource r) | r <- reqs]) linkProvision _ _ _ = error "linkProvision"  

@@ -1,3 +1,6 @@+{-# LANGUAGE DeriveFunctor #-}+{-# LANGUAGE DeriveTraversable #-}+{-# LANGUAGE DeriveFoldable #-} -- | See <https://github.com/ezyang/ghc-proposals/blob/backpack/proposals/0000-backpack.rst> module Distribution.Backpack.ModuleScope (     -- * Module scopes@@ -5,6 +8,11 @@     ModuleProvides,     ModuleRequires,     ModuleSource(..),+    dispModuleSource,+    WithSource(..),+    unWithSource,+    getSource,+    ModuleWithSource,     emptyModuleScope, ) where @@ -18,8 +26,10 @@  import Distribution.Backpack import Distribution.Backpack.ModSubst+import Distribution.Text  import qualified Data.Map as Map+import Text.PrettyPrint   -----------------------------------------------------------------------@@ -61,28 +71,61 @@     modScopeRequires :: ModuleRequires     } +-- | An empty 'ModuleScope'.+emptyModuleScope :: ModuleScope+emptyModuleScope = ModuleScope Map.empty Map.empty+ -- | Every 'Module' in scope at a 'ModuleName' is annotated with -- the 'PackageName' it comes from.-type ModuleProvides = Map ModuleName [ModuleSource]+type ModuleProvides = Map ModuleName [ModuleWithSource] -- | INVARIANT: entries for ModuleName m, have msrc_module is OpenModuleVar m-type ModuleRequires = Map ModuleName [ModuleSource]+type ModuleRequires = Map ModuleName [ModuleWithSource] -- TODO: consider newtping the two types above. -data ModuleSource =-    ModuleSource {-        -- We don't have line numbers, but if we did the-        -- package name and renaming could be associated-        -- with that as well-        msrc_pkgname :: PackageName,-        msrc_compname :: ComponentName,-        msrc_renaming :: IncludeRenaming,-        msrc_module :: OpenModule,-        msrc_implicit :: Bool-    }+-- | Description of where a module participating in mixin linking came+-- from.+data ModuleSource+    = FromMixins         PackageName ComponentName IncludeRenaming+    | FromBuildDepends   PackageName ComponentName+    | FromExposedModules ModuleName+    | FromOtherModules   ModuleName+    | FromSignatures     ModuleName+-- We don't have line numbers, but if we did, we'd want to record that+-- too --- | An empty 'ModuleScope'.-emptyModuleScope :: ModuleScope-emptyModuleScope = ModuleScope Map.empty Map.empty+-- TODO: Deduplicate this with Distribution.Backpack.UnifyM.ci_msg+dispModuleSource :: ModuleSource -> Doc+dispModuleSource (FromMixins pn cn incls)+  = text "mixins:" <+> dispComponent pn cn <+> disp incls+dispModuleSource (FromBuildDepends pn cn)+  = text "build-depends:" <+> dispComponent pn cn+dispModuleSource (FromExposedModules m)+  = text "exposed-modules:" <+> disp m+dispModuleSource (FromOtherModules m)+  = text "other-modules:" <+> disp m+dispModuleSource (FromSignatures m)+  = text "signatures:" <+> disp m -instance ModSubst ModuleSource where-    modSubst subst src = src { msrc_module = modSubst subst (msrc_module src) }+-- Dependency+dispComponent :: PackageName -> ComponentName -> Doc+dispComponent pn cn =+    -- NB: This syntax isn't quite the source syntax, but it+    -- should be clear enough.  To do source syntax, we'd+    -- need to know what the package we're linking is.+    case cn of+        CLibName -> disp pn+        CSubLibName ucn -> disp pn <<>> colon <<>> disp ucn+        -- Case below shouldn't happen+        _ -> disp pn <+> parens (disp cn)++-- | An 'OpenModule', annotated with where it came from in a Cabal file.+data WithSource a = WithSource ModuleSource a+    deriving (Functor, Foldable, Traversable)+unWithSource :: WithSource a -> a+unWithSource (WithSource _ x) = x+getSource :: WithSource a -> ModuleSource+getSource (WithSource s _) = s+type ModuleWithSource = WithSource OpenModule++instance ModSubst a => ModSubst (WithSource a) where+    modSubst subst (WithSource s m) = WithSource s (modSubst subst m)

@@ -0,0 +1,45 @@+{-# LANGUAGE DeriveDataTypeable #-}+{-# LANGUAGE DeriveGeneric #-}++module Distribution.Backpack.PreModuleShape (+    PreModuleShape(..),+    toPreModuleShape,+    renamePreModuleShape,+    mixLinkPreModuleShape,+) where++import Prelude ()+import Distribution.Compat.Prelude++import Data.Set (Set)+import qualified Data.Set as Set+import qualified Data.Map as Map++import Distribution.Backpack.ModuleShape+import Distribution.Types.IncludeRenaming+import Distribution.Types.ModuleRenaming+import Distribution.ModuleName++data PreModuleShape = PreModuleShape {+        preModShapeProvides :: Set ModuleName,+        preModShapeRequires :: Set ModuleName+    }+    deriving (Eq, Show, Generic)++toPreModuleShape :: ModuleShape -> PreModuleShape+toPreModuleShape (ModuleShape provs reqs) = PreModuleShape (Map.keysSet provs) reqs++renamePreModuleShape :: PreModuleShape -> IncludeRenaming -> PreModuleShape+renamePreModuleShape (PreModuleShape provs reqs) (IncludeRenaming prov_rn req_rn) =+    PreModuleShape+        (Set.fromList (mapMaybe prov_fn (Set.toList provs)))+        (Set.map req_fn reqs)+  where+    prov_fn = interpModuleRenaming prov_rn+    req_fn k = fromMaybe k (interpModuleRenaming req_rn k)++mixLinkPreModuleShape :: [PreModuleShape] -> PreModuleShape+mixLinkPreModuleShape shapes = PreModuleShape provs (Set.difference reqs provs)+  where+    provs = Set.unions (map preModShapeProvides shapes)+    reqs  = Set.unions (map preModShapeRequires shapes)

@@ -35,7 +35,7 @@     emptyModuleScopeU,     convertModuleScopeU, -    ModuleSourceU(..),+    ModuleWithSourceU,      convertInclude,     convertModuleProvides,@@ -92,14 +92,15 @@ newtype UnifyM s a = UnifyM { unUnifyM :: UnifEnv s -> ST s (Maybe a) }  -- | Run a computation in the unification monad.-runUnifyM :: Verbosity -> FullDb -> (forall s. UnifyM s a) -> Either [MsgDoc] a-runUnifyM verbosity db m+runUnifyM :: Verbosity -> ComponentId -> FullDb -> (forall s. UnifyM s a) -> Either [MsgDoc] a+runUnifyM verbosity self_cid db m     = runST $ do i    <- newSTRef 0                  hmap <- newSTRef Map.empty                  errs <- newSTRef []                  mb_r <- unUnifyM m UnifEnv {                             unify_uniq = i,                             unify_reqs = hmap,+                            unify_self_cid = self_cid,                             unify_verbosity = verbosity,                             unify_ctx = [],                             unify_db = db,@@ -123,6 +124,11 @@         -- the requirement at the same module name to fill it.         -- This mapping grows monotonically.         unify_reqs :: UnifRef s (Map ModuleName (ModuleU s)),+        -- | Component id of the unit we're linking.  We use this+        -- to detect if we fill a requirement with a local module,+        -- which in principle should be OK but is not currently+        -- supported by GHC.+        unify_self_cid :: ComponentId,         -- | How verbose the error message should be         unify_verbosity :: Verbosity,         -- | The error reporting context@@ -422,19 +428,9 @@ -- | The mutable counterpart of 'ModuleScope'. type ModuleScopeU s = (ModuleProvidesU s, ModuleRequiresU s) -- | The mutable counterpart of 'ModuleProvides'-type ModuleProvidesU s = Map ModuleName [ModuleSourceU s]+type ModuleProvidesU s = Map ModuleName [ModuleWithSourceU s] type ModuleRequiresU s = ModuleProvidesU s-data ModuleSourceU s =-    ModuleSourceU {-        -- We don't have line numbers, but if we did the-        -- package name and renaming could be associated-        -- with that as well-        usrc_pkgname :: PackageName,-        usrc_compname :: ComponentName,-        usrc_renaming :: IncludeRenaming,-        usrc_module :: ModuleU s,-        usrc_implicit :: Bool-    }+type ModuleWithSourceU s = WithSource (ModuleU s)  -- TODO: Deduplicate this with Distribution.Backpack.MixLink.dispSource ci_msg :: ComponentInclude (OpenUnitId, ModuleShape) IncludeRenaming -> Doc@@ -467,13 +463,11 @@                     ci_implicit = implicit                }) = addErrContext (text "In" <+> ci_msg ci) $ do     let pn = packageName pid-        source m = ModuleSource {-                        msrc_pkgname = pn,-                        msrc_compname = compname,-                        msrc_renaming = incl,-                        msrc_module = m,-                        msrc_implicit = implicit-                    }+        the_source | implicit+                   = FromBuildDepends pn compname+                   | otherwise+                   = FromMixins pn compname incl+        source = WithSource the_source      -- Suppose our package has two requirements A and B, and     -- we include it with @requires (A as X)@@@ -621,17 +615,11 @@  -- | Convert a 'ModuleProvides' to a 'ModuleProvidesU' convertModuleProvides :: ModuleProvides -> UnifyM s (ModuleProvidesU s)-convertModuleProvides = T.mapM $ \ms ->-    mapM (\(ModuleSource pn cn incl m i)-            -> do m' <- convertModule m-                  return (ModuleSourceU pn cn incl m' i)) ms+convertModuleProvides = T.mapM (mapM (T.mapM convertModule))  -- | Convert a 'ModuleProvidesU' to a 'ModuleProvides' convertModuleProvidesU :: ModuleProvidesU s -> UnifyM s ModuleProvides-convertModuleProvidesU = T.mapM $ \ms ->-    mapM (\(ModuleSourceU pn cn incl m i)-            -> do m' <- convertModuleU m-                  return (ModuleSource pn cn incl m' i)) ms+convertModuleProvidesU = T.mapM (mapM (T.mapM convertModuleU))  convertModuleRequires :: ModuleRequires -> UnifyM s (ModuleRequiresU s) convertModuleRequires = convertModuleProvides

@@ -0,0 +1,66 @@+{-# LANGUAGE DeriveDataTypeable #-}+{-# LANGUAGE DeriveGeneric #-}+module Distribution.CabalSpecVersion where++import Prelude ()+import Distribution.Compat.Prelude+import qualified Data.Set as Set++-- | Different Cabal-the-spec versions.+--+-- We branch based on this at least in the parser.+--+data CabalSpecVersion+    = CabalSpecOld+    | CabalSpecV1_22+    | CabalSpecV1_24+    | CabalSpecV2_0+    | CabalSpecV2_2+  deriving (Eq, Ord, Show, Read, Enum, Bounded, Typeable, Data, Generic)++cabalSpecLatest :: CabalSpecVersion+cabalSpecLatest = CabalSpecV2_2++cabalSpecFeatures :: CabalSpecVersion -> Set.Set CabalFeature+cabalSpecFeatures CabalSpecOld   = Set.empty+cabalSpecFeatures CabalSpecV1_22 = Set.empty+cabalSpecFeatures CabalSpecV1_24 = Set.empty+cabalSpecFeatures CabalSpecV2_0  = Set.empty+cabalSpecFeatures CabalSpecV2_2  = Set.fromList+    [ Elif+    , CommonStanzas+    ]++cabalSpecSupports :: CabalSpecVersion -> [Int] -> Bool+cabalSpecSupports CabalSpecOld v   = v < [1,21]+cabalSpecSupports CabalSpecV1_22 v = v < [1,23]+cabalSpecSupports CabalSpecV1_24 v = v < [1,25]+cabalSpecSupports CabalSpecV2_0 v  = v < [2,1]+cabalSpecSupports CabalSpecV2_2 _  = True++specHasCommonStanzas :: CabalSpecVersion -> HasCommonStanzas+specHasCommonStanzas CabalSpecV2_2 = HasCommonStanzas+specHasCommonStanzas _             = NoCommonStanzas++specHasElif :: CabalSpecVersion -> HasElif+specHasElif CabalSpecV2_2 = HasElif+specHasElif _             = NoElif++-------------------------------------------------------------------------------+-- Features+-------------------------------------------------------------------------------++data CabalFeature+    = Elif+    | CommonStanzas+  deriving (Eq, Ord, Show, Read, Enum, Bounded, Typeable, Data, Generic)++-------------------------------------------------------------------------------+-- Booleans+-------------------------------------------------------------------------------++data HasElif = HasElif | NoElif+  deriving (Eq, Show)++data HasCommonStanzas = HasCommonStanzas | NoCommonStanzas+  deriving (Eq, Show)

@@ -30,7 +30,7 @@ import Data.Binary.Put import Data.Binary.Get -import Control.Monad+import Control.Applicative ((<$>), (<*>), (*>)) import Foreign  import Data.ByteString.Lazy (ByteString)@@ -104,12 +104,12 @@ -- Bools are encoded as a byte in the range 0 .. 1 instance Binary Bool where     put     = putWord8 . fromIntegral . fromEnum-    get     = liftM (toEnum . fromIntegral) getWord8+    get     = fmap (toEnum . fromIntegral) getWord8  -- Values of type 'Ordering' are encoded as a byte in the range 0 .. 2 instance Binary Ordering where     put     = putWord8 . fromIntegral . fromEnum-    get     = liftM (toEnum . fromIntegral) getWord8+    get     = fmap (toEnum . fromIntegral) getWord8  ------------------------------------------------------------------------ -- Words and Ints@@ -137,34 +137,34 @@ -- Int8s are written as a single byte. instance Binary Int8 where     put i   = put (fromIntegral i :: Word8)-    get     = liftM fromIntegral (get :: Get Word8)+    get     = fmap fromIntegral (get :: Get Word8)  -- Int16s are written as a 2 bytes in big endian format instance Binary Int16 where     put i   = put (fromIntegral i :: Word16)-    get     = liftM fromIntegral (get :: Get Word16)+    get     = fmap fromIntegral (get :: Get Word16)  -- Int32s are written as a 4 bytes in big endian format instance Binary Int32 where     put i   = put (fromIntegral i :: Word32)-    get     = liftM fromIntegral (get :: Get Word32)+    get     = fmap fromIntegral (get :: Get Word32)  -- Int64s are written as a 4 bytes in big endian format instance Binary Int64 where     put i   = put (fromIntegral i :: Word64)-    get     = liftM fromIntegral (get :: Get Word64)+    get     = fmap fromIntegral (get :: Get Word64)  ------------------------------------------------------------------------  -- Words are are written as Word64s, that is, 8 bytes in big endian format instance Binary Word where     put i   = put (fromIntegral i :: Word64)-    get     = liftM fromIntegral (get :: Get Word64)+    get     = fmap fromIntegral (get :: Get Word64)  -- Ints are are written as Int64s, that is, 8 bytes in big endian format instance Binary Int where     put i   = put (fromIntegral i :: Int64)-    get     = liftM fromIntegral (get :: Get Int64)+    get     = fmap fromIntegral (get :: Get Int64)  ------------------------------------------------------------------------ --@@ -200,7 +200,7 @@     get = do         tag <- get :: Get Word8         case tag of-            0 -> liftM fromIntegral (get :: Get SmallInt)+            0 -> fmap fromIntegral (get :: Get SmallInt)             _ -> do sign  <- get                     bytes <- get                     let v = roll bytes@@ -237,7 +237,7 @@ import GHC.IOBase (IO(..))  instance Binary Integer where-    put (S# i)    = putWord8 0 >> put (I# i)+    put (S# i)    = putWord8 0 *> put (I# i)     put (J# s ba) = do         putWord8 1         put (I# s)@@ -263,7 +263,7 @@      -- Pretty scary. Should be quick though     get = do-        (fp, off, n@(I# sz)) <- liftM toForeignPtr get      -- so decode a ByteString+        (fp, off, n@(I# sz)) <- fmap toForeignPtr get      -- so decode a ByteString         assert (off == 0) $ return $ unsafePerformIO $ do             (MBA arr) <- newByteArray sz                    -- and copy it into a ByteArray#             let to = byteArrayContents# (unsafeCoerce# arr) -- urk, is this safe?@@ -287,8 +287,8 @@ -}  instance (Binary a,Integral a) => Binary (R.Ratio a) where-    put r = put (R.numerator r) >> put (R.denominator r)-    get = liftM2 (R.%) get get+    put r = put (R.numerator r) *> put (R.denominator r)+    get = (R.%) <$> get <*> get  ------------------------------------------------------------------------ @@ -314,23 +314,23 @@         w = fromIntegral (shiftR c 18 .&. 0x7)      get = do-        let getByte = liftM (fromIntegral :: Word8 -> Int) get+        let getByte = fmap (fromIntegral :: Word8 -> Int) get             shiftL6 = flip shiftL 6 :: Int -> Int         w <- getByte         r <- case () of                 _ | w < 0x80  -> return w                   | w < 0xe0  -> do-                                    x <- liftM (xor 0x80) getByte+                                    x <- fmap (xor 0x80) getByte                                     return (x .|. shiftL6 (xor 0xc0 w))                   | w < 0xf0  -> do-                                    x <- liftM (xor 0x80) getByte-                                    y <- liftM (xor 0x80) getByte+                                    x <- fmap (xor 0x80) getByte+                                    y <- fmap (xor 0x80) getByte                                     return (y .|. shiftL6 (x .|. shiftL6                                             (xor 0xe0 w)))                   | otherwise -> do-                                x <- liftM (xor 0x80) getByte-                                y <- liftM (xor 0x80) getByte-                                z <- liftM (xor 0x80) getByte+                                x <- fmap (xor 0x80) getByte+                                y <- fmap (xor 0x80) getByte+                                z <- fmap (xor 0x80) getByte                                 return (z .|. shiftL6 (y .|. shiftL6                                         (x .|. shiftL6 (xor 0xf0 w))))         return $! chr r@@ -339,20 +339,20 @@ -- Instances for the first few tuples  instance (Binary a, Binary b) => Binary (a,b) where-    put (a,b)           = put a >> put b-    get                 = liftM2 (,) get get+    put (a,b)           = put a *> put b+    get                 = (,) <$> get <*> get  instance (Binary a, Binary b, Binary c) => Binary (a,b,c) where-    put (a,b,c)         = put a >> put b >> put c-    get                 = liftM3 (,,) get get get+    put (a,b,c)         = put a *> put b *> put c+    get                 = (,,) <$> get <*> get <*> get  instance (Binary a, Binary b, Binary c, Binary d) => Binary (a,b,c,d) where-    put (a,b,c,d)       = put a >> put b >> put c >> put d-    get                 = liftM4 (,,,) get get get get+    put (a,b,c,d)       = put a *> put b *> put c *> put d+    get                 = (,,,) <$> get <*> get <*> get <*> get  instance (Binary a, Binary b, Binary c, Binary d, Binary e) => Binary (a,b,c,d,e) where-    put (a,b,c,d,e)     = put a >> put b >> put c >> put d >> put e-    get                 = liftM5 (,,,,) get get get get get+    put (a,b,c,d,e)     = put a *> put b *> put c *> put d *> put e+    get                 = (,,,,) <$> get <*> get <*> get <*> get <*> get  -- -- and now just recurse:@@ -390,7 +390,7 @@ -- Container types  instance Binary a => Binary [a] where-    put l  = put (length l) >> traverse_ put l+    put l  = put (length l) *> traverse_ put l     get    = do n <- get :: Get Int                 getMany n @@ -407,21 +407,21 @@  instance (Binary a) => Binary (Maybe a) where     put Nothing  = putWord8 0-    put (Just x) = putWord8 1 >> put x+    put (Just x) = putWord8 1 *> put x     get = do         w <- getWord8         case w of             0 -> return Nothing-            _ -> liftM Just get+            _ -> fmap Just get  instance (Binary a, Binary b) => Binary (Either a b) where-    put (Left  a) = putWord8 0 >> put a-    put (Right b) = putWord8 1 >> put b+    put (Left  a) = putWord8 0 *> put a+    put (Right b) = putWord8 1 *> put b     get = do         w <- getWord8         case w of-            0 -> liftM Left  get-            _ -> liftM Right get+            0 -> fmap Left  get+            _ -> fmap Right get  ------------------------------------------------------------------------ -- ByteStrings (have specially efficient instances)@@ -445,26 +445,26 @@ -- Maps and Sets  instance (Binary a) => Binary (Set.Set a) where-    put s = put (Set.size s) >> traverse_ put (Set.toAscList s)-    get   = liftM Set.fromDistinctAscList get+    put s = put (Set.size s) *> traverse_ put (Set.toAscList s)+    get   = fmap Set.fromDistinctAscList get  instance (Binary k, Binary e) => Binary (Map.Map k e) where-    put m = put (Map.size m) >> traverse_ put (Map.toAscList m)-    get   = liftM Map.fromDistinctAscList get+    put m = put (Map.size m) *> traverse_ put (Map.toAscList m)+    get   = fmap Map.fromDistinctAscList get  instance Binary IntSet.IntSet where-    put s = put (IntSet.size s) >> traverse_ put (IntSet.toAscList s)-    get   = liftM IntSet.fromDistinctAscList get+    put s = put (IntSet.size s) *> traverse_ put (IntSet.toAscList s)+    get   = fmap IntSet.fromDistinctAscList get  instance (Binary e) => Binary (IntMap.IntMap e) where-    put m = put (IntMap.size m) >> traverse_ put (IntMap.toAscList m)-    get   = liftM IntMap.fromDistinctAscList get+    put m = put (IntMap.size m) *> traverse_ put (IntMap.toAscList m)+    get   = fmap IntMap.fromDistinctAscList get  ------------------------------------------------------------------------ -- Queues and Sequences  instance (Binary e) => Binary (Seq.Seq e) where-    put s = put (Seq.length s) >> Fold.traverse_ put s+    put s = put (Seq.length s) *> Fold.traverse_ put s     get = do n <- get :: Get Int              rep Seq.empty n get       where rep xs 0 _ = return $! xs@@ -477,18 +477,18 @@  instance Binary Double where     put d = put (decodeFloat d)-    get   = liftM2 encodeFloat get get+    get   = encodeFloat <$> get <*> get  instance Binary Float where     put f = put (decodeFloat f)-    get   = liftM2 encodeFloat get get+    get   = encodeFloat <$> get <*> get  ------------------------------------------------------------------------ -- Trees  instance (Binary e) => Binary (T.Tree e) where-    put (T.Node r s) = put r >> put s-    get = liftM2 T.Node get get+    put (T.Node r s) = put r *> put s+    get = T.Node <$> get <*> get  ------------------------------------------------------------------------ -- Arrays

@@ -0,0 +1,356 @@+{-# LANGUAGE GADTs #-}+{-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE ScopedTypeVariables #-}+{-# OPTIONS_GHC -fspec-constr -fspec-constr-count=8 #-}+-----------------------------------------------------------------------------+-- |+-- Module      :  Distribution.Compat.CharParsing+-- Copyright   :  (c) Edward Kmett 2011+-- License     :  BSD3+--+-- Maintainer  :  ekmett@gmail.com+-- Stability   :  experimental+-- Portability :  non-portable+--+-- Parsers for character streams+--+-- Originally in @parsers@ package.+--+-----------------------------------------------------------------------------+module Distribution.Compat.CharParsing+  (+  -- * Combinators+    oneOf        -- :: CharParsing m => [Char] -> m Char+  , noneOf       -- :: CharParsing m => [Char] -> m Char+  , spaces       -- :: CharParsing m => m ()+  , space        -- :: CharParsing m => m Char+  , newline      -- :: CharParsing m => m Char+  , tab          -- :: CharParsing m => m Char+  , upper        -- :: CharParsing m => m Char+  , lower        -- :: CharParsing m => m Char+  , alphaNum     -- :: CharParsing m => m Char+  , letter       -- :: CharParsing m => m Char+  , digit        -- :: CharParsing m => m Char+  , hexDigit     -- :: CharParsing m => m Char+  , octDigit     -- :: CharParsing m => m Char+  , satisfyRange -- :: CharParsing m => Char -> Char -> m Char+  -- * Class+  , CharParsing(..)+  -- * Cabal additions+  , integral+  , munch1+  , munch+  , skipSpaces1+  , module Distribution.Compat.Parsing+  ) where++import Prelude ()+import Distribution.Compat.Prelude++import Control.Monad.Trans.Class (lift)+import Control.Monad.Trans.State.Lazy as Lazy+import Control.Monad.Trans.State.Strict as Strict+import Control.Monad.Trans.Writer.Lazy as Lazy+import Control.Monad.Trans.Writer.Strict as Strict+import Control.Monad.Trans.RWS.Lazy as Lazy+import Control.Monad.Trans.RWS.Strict as Strict+import Control.Monad.Trans.Reader (ReaderT (..))+import Control.Monad.Trans.Identity (IdentityT (..))+import Data.Char+import Data.Text (Text, unpack)++import qualified Text.Parsec as Parsec+import qualified Distribution.Compat.ReadP as ReadP++import Distribution.Compat.Parsing++-- | @oneOf cs@ succeeds if the current character is in the supplied+-- list of characters @cs@. Returns the parsed character. See also+-- 'satisfy'.+--+-- >   vowel  = oneOf "aeiou"+oneOf :: CharParsing m => [Char] -> m Char+oneOf xs = satisfy (\c -> c `elem` xs)+{-# INLINE oneOf #-}++-- | As the dual of 'oneOf', @noneOf cs@ succeeds if the current+-- character is /not/ in the supplied list of characters @cs@. Returns the+-- parsed character.+--+-- >  consonant = noneOf "aeiou"+noneOf :: CharParsing m => [Char] -> m Char+noneOf xs = satisfy (\c -> c `notElem` xs)+{-# INLINE noneOf #-}++-- | Skips /zero/ or more white space characters. See also 'skipMany'.+spaces :: CharParsing m => m ()+spaces = skipMany space <?> "white space"+{-# INLINE spaces #-}++-- | Parses a white space character (any character which satisfies 'isSpace')+-- Returns the parsed character.+space :: CharParsing m => m Char+space = satisfy isSpace <?> "space"+{-# INLINE space #-}++-- | Parses a newline character (\'\\n\'). Returns a newline character.+newline :: CharParsing m => m Char+newline = char '\n' <?> "new-line"+{-# INLINE newline #-}++-- | Parses a tab character (\'\\t\'). Returns a tab character.+tab :: CharParsing m => m Char+tab = char '\t' <?> "tab"+{-# INLINE tab #-}++-- | Parses an upper case letter. Returns the parsed character.+upper :: CharParsing m => m Char+upper = satisfy isUpper <?> "uppercase letter"+{-# INLINE upper #-}++-- | Parses a lower case character. Returns the parsed character.+lower :: CharParsing m => m Char+lower = satisfy isLower <?> "lowercase letter"+{-# INLINE lower #-}++-- | Parses a letter or digit. Returns the parsed character.+alphaNum :: CharParsing m => m Char+alphaNum = satisfy isAlphaNum <?> "letter or digit"+{-# INLINE alphaNum #-}++-- | Parses a letter (an upper case or lower case character). Returns the+-- parsed character.+letter :: CharParsing m => m Char+letter = satisfy isAlpha <?> "letter"+{-# INLINE letter #-}++-- | Parses a digit. Returns the parsed character.+digit :: CharParsing m => m Char+digit = satisfy isDigit <?> "digit"+{-# INLINE digit #-}++-- | Parses a hexadecimal digit (a digit or a letter between \'a\' and+-- \'f\' or \'A\' and \'F\'). Returns the parsed character.+hexDigit :: CharParsing m => m Char+hexDigit = satisfy isHexDigit <?> "hexadecimal digit"+{-# INLINE hexDigit #-}++-- | Parses an octal digit (a character between \'0\' and \'7\'). Returns+-- the parsed character.+octDigit :: CharParsing m => m Char+octDigit = satisfy isOctDigit <?> "octal digit"+{-# INLINE octDigit #-}++satisfyRange :: CharParsing m => Char -> Char -> m Char+satisfyRange a z = satisfy (\c -> c >= a && c <= z)+{-# INLINE satisfyRange #-}++-- | Additional functionality needed to parse character streams.+class Parsing m => CharParsing m where+  -- | Parse a single character of the input, with UTF-8 decoding+  satisfy :: (Char -> Bool) -> m Char++  -- | @char c@ parses a single character @c@. Returns the parsed+  -- character (i.e. @c@).+  --+  -- /e.g./+  --+  -- @semiColon = 'char' ';'@+  char :: Char -> m Char+  char c = satisfy (c ==) <?> show [c]+  {-# INLINE char #-}++  -- | @notChar c@ parses any single character other than @c@. Returns the parsed+  -- character.+  notChar :: Char -> m Char+  notChar c = satisfy (c /=)+  {-# INLINE notChar #-}++  -- | This parser succeeds for any character. Returns the parsed character.+  anyChar :: m Char+  anyChar = satisfy (const True)+  {-# INLINE anyChar #-}++  -- | @string s@ parses a sequence of characters given by @s@. Returns+  -- the parsed string (i.e. @s@).+  --+  -- >  divOrMod    =   string "div"+  -- >              <|> string "mod"+  string :: String -> m String+  string s = s <$ try (traverse_ char s) <?> show s+  {-# INLINE string #-}++  -- | @text t@ parses a sequence of characters determined by the text @t@ Returns+  -- the parsed text fragment (i.e. @t@).+  --+  -- Using @OverloadedStrings@:+  --+  -- >  divOrMod    =   text "div"+  -- >              <|> text "mod"+  text :: Text -> m Text+  text t = t <$ string (unpack t)+  {-# INLINE text #-}++instance (CharParsing m, MonadPlus m) => CharParsing (Lazy.StateT s m) where+  satisfy = lift . satisfy+  {-# INLINE satisfy #-}+  char    = lift . char+  {-# INLINE char #-}+  notChar = lift . notChar+  {-# INLINE notChar #-}+  anyChar = lift anyChar+  {-# INLINE anyChar #-}+  string  = lift . string+  {-# INLINE string #-}+  text = lift . text+  {-# INLINE text #-}++instance (CharParsing m, MonadPlus m) => CharParsing (Strict.StateT s m) where+  satisfy = lift . satisfy+  {-# INLINE satisfy #-}+  char    = lift . char+  {-# INLINE char #-}+  notChar = lift . notChar+  {-# INLINE notChar #-}+  anyChar = lift anyChar+  {-# INLINE anyChar #-}+  string  = lift . string+  {-# INLINE string #-}+  text = lift . text+  {-# INLINE text #-}++instance (CharParsing m, MonadPlus m) => CharParsing (ReaderT e m) where+  satisfy = lift . satisfy+  {-# INLINE satisfy #-}+  char    = lift . char+  {-# INLINE char #-}+  notChar = lift . notChar+  {-# INLINE notChar #-}+  anyChar = lift anyChar+  {-# INLINE anyChar #-}+  string  = lift . string+  {-# INLINE string #-}+  text = lift . text+  {-# INLINE text #-}++instance (CharParsing m, MonadPlus m, Monoid w) => CharParsing (Strict.WriterT w m) where+  satisfy = lift . satisfy+  {-# INLINE satisfy #-}+  char    = lift . char+  {-# INLINE char #-}+  notChar = lift . notChar+  {-# INLINE notChar #-}+  anyChar = lift anyChar+  {-# INLINE anyChar #-}+  string  = lift . string+  {-# INLINE string #-}+  text = lift . text+  {-# INLINE text #-}++instance (CharParsing m, MonadPlus m, Monoid w) => CharParsing (Lazy.WriterT w m) where+  satisfy = lift . satisfy+  {-# INLINE satisfy #-}+  char    = lift . char+  {-# INLINE char #-}+  notChar = lift . notChar+  {-# INLINE notChar #-}+  anyChar = lift anyChar+  {-# INLINE anyChar #-}+  string  = lift . string+  {-# INLINE string #-}+  text = lift . text+  {-# INLINE text #-}++instance (CharParsing m, MonadPlus m, Monoid w) => CharParsing (Lazy.RWST r w s m) where+  satisfy = lift . satisfy+  {-# INLINE satisfy #-}+  char    = lift . char+  {-# INLINE char #-}+  notChar = lift . notChar+  {-# INLINE notChar #-}+  anyChar = lift anyChar+  {-# INLINE anyChar #-}+  string  = lift . string+  {-# INLINE string #-}+  text = lift . text+  {-# INLINE text #-}++instance (CharParsing m, MonadPlus m, Monoid w) => CharParsing (Strict.RWST r w s m) where+  satisfy = lift . satisfy+  {-# INLINE satisfy #-}+  char    = lift . char+  {-# INLINE char #-}+  notChar = lift . notChar+  {-# INLINE notChar #-}+  anyChar = lift anyChar+  {-# INLINE anyChar #-}+  string  = lift . string+  {-# INLINE string #-}+  text = lift . text+  {-# INLINE text #-}++instance (CharParsing m, MonadPlus m) => CharParsing (IdentityT m) where+  satisfy = lift . satisfy+  {-# INLINE satisfy #-}+  char    = lift . char+  {-# INLINE char #-}+  notChar = lift . notChar+  {-# INLINE notChar #-}+  anyChar = lift anyChar+  {-# INLINE anyChar #-}+  string  = lift . string+  {-# INLINE string #-}+  text = lift . text+  {-# INLINE text #-}++instance Parsec.Stream s m Char => CharParsing (Parsec.ParsecT s u m) where+  satisfy   = Parsec.satisfy+  char      = Parsec.char+  notChar c = Parsec.satisfy (/= c)+  anyChar   = Parsec.anyChar+  string    = Parsec.string++instance t ~ Char => CharParsing (ReadP.Parser r t) where+  satisfy   = ReadP.satisfy+  char      = ReadP.char+  notChar c = ReadP.satisfy (/= c)+  anyChar   = ReadP.get+  string    = ReadP.string++-------------------------------------------------------------------------------+-- Our additions+-------------------------------------------------------------------------------++integral :: (CharParsing m, Integral a) => m a+integral = toNumber <$> some d <?> "integral"+  where+    toNumber = foldl' (\a b -> a * 10 + b) 0+    d = f <$> satisfyRange '0' '9'+    f '0' = 0+    f '1' = 1+    f '2' = 2+    f '3' = 3+    f '4' = 4+    f '5' = 5+    f '6' = 6+    f '7' = 7+    f '8' = 8+    f '9' = 9+    f _   = error "panic! integral"+{-# INLINE integral #-}++-- | Greedily munch characters while predicate holds.+-- Require at least one character.+munch1 :: CharParsing m => (Char -> Bool) -> m String+munch1 = some . satisfy+{-# INLINE munch1 #-}++-- | Greedely munch characters while predicate holds.+-- Always succeeds.+munch :: CharParsing m => (Char -> Bool) -> m String+munch = many . satisfy+{-# INLINE munch #-}++skipSpaces1 :: CharParsing m => m ()+skipSpaces1 = skipSome space+{-# INLINE skipSpaces1 #-}

@@ -15,6 +15,8 @@ import Distribution.Compat.Prelude  import Distribution.Compat.Exception++#ifndef mingw32_HOST_OS import Distribution.Compat.Internal.TempFile  import Control.Exception@@ -27,19 +29,34 @@ import System.FilePath          ( takeDirectory ) import System.IO-         ( IOMode(ReadMode), hClose, hGetBuf, hPutBuf+         ( IOMode(ReadMode), hClose, hGetBuf, hPutBuf, hFileSize          , withBinaryFile ) import Foreign          ( allocaBytes ) -#ifndef mingw32_HOST_OS-import System.Posix.Internals (withFilePath) import System.Posix.Types          ( FileMode ) import System.Posix.Internals-         ( c_chmod )+         ( c_chmod, withFilePath ) import Foreign.C          ( throwErrnoPathIfMinus1_ )++#else /* else mingw32_HOST_OS */++import Control.Exception+  ( throwIO )+import qualified Data.ByteString.Lazy as BSL+import System.IO.Error+  ( ioeSetLocation )+import System.Directory+  ( doesFileExist )+import System.FilePath+  ( isRelative, normalise )+import System.IO+  ( IOMode(ReadMode), hFileSize+  , withBinaryFile )++import qualified System.Win32.File as Win32 ( copyFile ) #endif /* mingw32_HOST_OS */  copyOrdinaryFile, copyExecutableFile :: FilePath -> FilePath -> NoCallStackIO ()@@ -68,23 +85,46 @@ copyFile fromFPath toFPath =   copy     `catchIO` (\ioe -> throwIO (ioeSetLocation ioe "copyFile"))-    where copy = withBinaryFile fromFPath ReadMode $ \hFrom ->-                 bracketOnError openTmp cleanTmp $ \(tmpFPath, hTmp) ->-                 do allocaBytes bufferSize $ copyContents hFrom hTmp-                    hClose hTmp-                    renameFile tmpFPath toFPath-          openTmp = openBinaryTempFile (takeDirectory toFPath) ".copyFile.tmp"-          cleanTmp (tmpFPath, hTmp) = do-            hClose hTmp          `catchIO` \_ -> return ()-            removeFile tmpFPath  `catchIO` \_ -> return ()-          bufferSize = 4096+    where+#ifndef mingw32_HOST_OS+      copy = withBinaryFile fromFPath ReadMode $ \hFrom ->+             bracketOnError openTmp cleanTmp $ \(tmpFPath, hTmp) ->+             do allocaBytes bufferSize $ copyContents hFrom hTmp+                hClose hTmp+                renameFile tmpFPath toFPath+      openTmp = openBinaryTempFile (takeDirectory toFPath) ".copyFile.tmp"+      cleanTmp (tmpFPath, hTmp) = do+        hClose hTmp          `catchIO` \_ -> return ()+        removeFile tmpFPath  `catchIO` \_ -> return ()+      bufferSize = 4096 -          copyContents hFrom hTo buffer = do-                  count <- hGetBuf hFrom buffer bufferSize-                  when (count > 0) $ do-                          hPutBuf hTo buffer count-                          copyContents hFrom hTo buffer+      copyContents hFrom hTo buffer = do+              count <- hGetBuf hFrom buffer bufferSize+              when (count > 0) $ do+                      hPutBuf hTo buffer count+                      copyContents hFrom hTo buffer+#else+      copy = Win32.copyFile (toExtendedLengthPath fromFPath)+                            (toExtendedLengthPath toFPath)+                            False +-- NOTE: Shamelessly lifted from System.Directory.Internal.Windows++-- | Add the @"\\\\?\\"@ prefix if necessary or possible.  The path remains+-- unchanged if the prefix is not added.  This function can sometimes be used+-- to bypass the @MAX_PATH@ length restriction in Windows API calls.+toExtendedLengthPath :: FilePath -> FilePath+toExtendedLengthPath path+  | isRelative path = path+  | otherwise =+      case normalise path of+        '\\' : '?'  : '?' : '\\' : _ -> path+        '\\' : '\\' : '?' : '\\' : _ -> path+        '\\' : '\\' : '.' : '\\' : _ -> path+        '\\' : subpath@('\\' : _) -> "\\\\?\\UNC" <> subpath+        normalisedPath -> "\\\\?\\" <> normalisedPath+#endif /* mingw32_HOST_OS */+ -- | Like `copyFile`, but does not touch the target if source and destination -- are already byte-identical. This is recommended as it is useful for -- time-stamp based recompilation avoidance.@@ -94,7 +134,8 @@   unless equal $ copyFile src dest  -- | Checks if two files are byte-identical.--- Returns False if either of the files do not exist.+-- Returns False if either of the files do not exist or if files+-- are of different size. filesEqual :: FilePath -> FilePath -> NoCallStackIO Bool filesEqual f1 f2 = do   ex1 <- doesFileExist f1@@ -102,6 +143,11 @@   if not (ex1 && ex2) then return False else     withBinaryFile f1 ReadMode $ \h1 ->       withBinaryFile f2 ReadMode $ \h2 -> do-        c1 <- BSL.hGetContents h1-        c2 <- BSL.hGetContents h2-        return $! c1 == c2+        s1 <- hFileSize h1+        s2 <- hFileSize h2+        if s1 /= s2+          then return False+          else do+            c1 <- BSL.hGetContents h1+            c2 <- BSL.hGetContents h2+            return $! c1 == c2

@@ -13,6 +13,8 @@     DList,     runDList,     singleton,+    fromList,+    toList,     snoc, ) where @@ -28,6 +30,12 @@ -- | Make 'DList' with containing single element. singleton :: a -> DList a singleton a = DList (a:)++fromList :: [a] -> DList a+fromList as = DList (as ++)++toList :: DList a -> [a]+toList = runDList  snoc :: DList a -> a -> DList a snoc xs x = xs <> singleton x

@@ -0,0 +1,27 @@+{-# LANGUAGE CPP #-}++module Distribution.Compat.Directory (listDirectory, makeAbsolute) where++import System.Directory as Dir+#if !MIN_VERSION_directory(1,2,2)+import System.FilePath as Path+#endif++#if !MIN_VERSION_directory(1,2,5)++listDirectory :: FilePath -> IO [FilePath]+listDirectory path =+  filter f `fmap` Dir.getDirectoryContents path+  where f filename = filename /= "." && filename /= ".."++#endif++#if !MIN_VERSION_directory(1,2,2)++makeAbsolute :: FilePath -> IO FilePath+makeAbsolute p | Path.isAbsolute p = return p+               | otherwise         = do+    cwd <- Dir.getCurrentDirectory+    return $ cwd </> p++#endif

@@ -31,6 +31,9 @@  #ifdef mingw32_HOST_OS import Foreign.C+#if __GLASGOW_HASKELL__ < 708+import Foreign.Ptr (nullPtr)+#endif import GHC.Windows #else import Foreign.C.Types@@ -123,6 +126,12 @@     err <- c_GetLastError     unless (err == eRROR_ENVVAR_NOT_FOUND) $ do       throwGetLastError "unsetEnv"++eRROR_ENVVAR_NOT_FOUND :: DWORD+eRROR_ENVVAR_NOT_FOUND = 203++foreign import WINDOWS_CCONV unsafe "windows.h GetLastError"+    c_GetLastError:: IO DWORD #else unsetEnv key = withFilePath key (throwErrnoIf_ (/= 0) "unsetEnv" . c_unsetenv) #if __GLASGOW_HASKELL__ > 706

@@ -0,0 +1,254 @@+{-# LANGUAGE RankNTypes #-}+-- | This module provides very basic lens functionality, without extra dependencies.+--+-- For the documentation of the combinators see <http://hackage.haskell.org/package/lens lens> package.+-- This module uses the same vocabulary.+module Distribution.Compat.Lens (+    -- * Types+    Lens,+    Lens',+    Traversal,+    Traversal',+    -- ** LensLike+    LensLike,+    LensLike',+    -- ** rank-1 types+    Getting,+    AGetter,+    ASetter,+    ALens,+    ALens',+    -- * Getter+    view,+    use,+    -- * Setter+    set,+    over,+    -- * Fold+    toDListOf,+    toListOf,+    toSetOf,+    -- * Lens+    cloneLens,+    aview,+    -- * Common lenses+    _1, _2,+    -- * Operators+    (&),+    (^.),+    (.~), (?~), (%~),+    (.=), (?=), (%=),+    (^#),+    (#~), (#%~),+    -- * Internal Comonads+    Pretext (..),+    -- * Cabal developer info+    -- $development+    ) where++import Prelude()+import Distribution.Compat.Prelude++import Control.Applicative (Const (..))+import Data.Functor.Identity (Identity (..))+import Control.Monad.State.Class (MonadState (..), gets, modify)++import qualified Distribution.Compat.DList as DList+import qualified Data.Set as Set++-------------------------------------------------------------------------------+-- Types+-------------------------------------------------------------------------------++type LensLike  f s t a b = (a -> f b) -> s -> f t+type LensLike' f s   a   = (a -> f a) -> s -> f s++type Lens      s t a b = forall f. Functor f     => LensLike f s t a b+type Traversal s t a b = forall f. Applicative f => LensLike f s t a b++type Lens'      s a = Lens s s a a+type Traversal' s a = Traversal s s a a++type Getting r s a = LensLike (Const r) s s a a++type AGetter s   a   = LensLike (Const a)     s s a a  -- this doens't exist in 'lens'+type ASetter s t a b = LensLike Identity      s t a b+type ALens   s t a b = LensLike (Pretext a b) s t a b++type ALens' s a = ALens s s a a++-------------------------------------------------------------------------------+-- Getter+-------------------------------------------------------------------------------++view :: Getting a s a -> s ->  a+view l s = getConst (l Const s)+{-# INLINE view #-}++use :: MonadState s m => Getting a s a -> m a+use l = gets (view l)+{-# INLINE use #-}++-------------------------------------------------------------------------------+-- Setter+-------------------------------------------------------------------------------++set :: ASetter s t a  b -> b -> s -> t+set l x = over l (const x)++over :: ASetter s t a b -> (a -> b) -> s -> t+over l f s = runIdentity (l (\x -> Identity (f x)) s)++-------------------------------------------------------------------------------+-- Fold+-------------------------------------------------------------------------------++toDListOf :: Getting (DList.DList a) s a -> s -> DList.DList a+toDListOf l s = getConst (l (\x -> Const (DList.singleton x)) s)++toListOf :: Getting (DList.DList a) s a -> s -> [a]+toListOf l = DList.runDList . toDListOf l++toSetOf  :: Getting (Set.Set a) s a -> s -> Set.Set a+toSetOf l s = getConst (l (\x -> Const (Set.singleton x)) s)++-------------------------------------------------------------------------------+-- Lens+-------------------------------------------------------------------------------++aview :: ALens s t a b -> s -> a+aview l = pretextPos  . l pretextSell+{-# INLINE aview #-}+{-+lens :: (s -> a) -> (s -> a -> s) -> Lens' s a+lens sa sbt afb s = sbt s <$> afb (sa s)+-}++-------------------------------------------------------------------------------+-- Common+-------------------------------------------------------------------------------++_1 ::  Lens (a, c) (b, c) a b+_1 f (a, c) = flip (,) c <$> f a++_2 ::  Lens (c, a) (c, b) a b+_2 f (c, a) = (,) c <$> f a++-------------------------------------------------------------------------------+-- Operators+-------------------------------------------------------------------------------++-- | '&' is a reverse application operator+(&) :: a -> (a -> b) -> b+(&) = flip ($)+{-# INLINE (&) #-}+infixl 1 &++infixl 8 ^., ^#+infixr 4 .~, %~, ?~+infixr 4 #~, #%~+infixr 4 .=, %=, ?=++(^.) :: s -> Getting a s a -> a+s ^. l = getConst (l Const s)+{-# INLINE (^.) #-}++(.~) :: ASetter s t a b -> b -> s -> t+(.~) = set+{-# INLINE (.~) #-}++(?~) :: ASetter s t a (Maybe b) -> b -> s -> t+l ?~ b = set l (Just b)+{-# INLINE (?~) #-}++(%~) :: ASetter s t a b -> (a -> b) -> s -> t+(%~) = over+{-# INLINE (%~) #-}++(.=) :: MonadState s m => ASetter s s a b -> b -> m ()+l .= b = modify (l .~ b)+{-# INLINE (.=) #-}++(?=) :: MonadState s m => ASetter s s a (Maybe b) -> b -> m ()+l ?= b = modify (l ?~ b)+{-# INLINE (?=) #-}++(%=) :: MonadState s m => ASetter s s a b -> (a -> b) -> m ()+l %= f = modify (l %~ f)+{-# INLINE (%=) #-}++(^#) :: s -> ALens s t a b -> a+s ^# l = aview l s++(#~) :: ALens s t a b -> b -> s -> t+(#~) l b s = pretextPeek b (l pretextSell s)+{-# INLINE (#~) #-}++(#%~) :: ALens s t a b -> (a -> b) -> s -> t+(#%~) l f s = pretextPeeks f (l pretextSell s)+{-# INLINE (#%~) #-}++pretextSell :: a -> Pretext a b b+pretextSell a = Pretext (\afb -> afb a)+{-# INLINE pretextSell #-}++pretextPeeks :: (a -> b) -> Pretext a b t -> t+pretextPeeks f (Pretext m) = runIdentity $ m (\x -> Identity (f x))+{-# INLINE pretextPeeks #-}++pretextPeek :: b -> Pretext a b t -> t+pretextPeek b (Pretext m) = runIdentity $ m (\_ -> Identity b)+{-# INLINE pretextPeek #-}++pretextPos :: Pretext a b t -> a+pretextPos (Pretext m) = getConst (m Const)+{-# INLINE pretextPos #-}++cloneLens :: Functor f => ALens s t a b -> LensLike f s t a b+cloneLens l f s = runPretext (l pretextSell s) f+{-# INLINE cloneLens #-}++-------------------------------------------------------------------------------+-- Comonads+-------------------------------------------------------------------------------++-- | @lens@ variant is also parametrised by profunctor.+data Pretext a b t = Pretext { runPretext :: forall f. Functor f => (a -> f b) -> f t }++instance Functor (Pretext a b) where+    fmap f (Pretext pretext) = Pretext (\afb -> fmap f (pretext afb))++-------------------------------------------------------------------------------+-- Documentation+-------------------------------------------------------------------------------++-- $development+--+-- We cannot depend on @template-haskell@, because Cabal is a boot library.+-- This fact makes defining optics a manual task. Here is a small recipe to+-- make the process less tedious.+--+-- First start a repl+--+-- > cabal new-repl Cabal:hackage-tests+--+-- Because @--extra-package@ isn't yet implemented, we use a test-suite+-- with @generics-sop@ dependency.+--+-- In the repl, we load a helper script:+--+-- > :l ../generics-sop-lens.hs+--+-- Now we are set up to derive lenses!+--+-- > :m +Distribution.Types.SourceRepo+-- > putStr $ genericLenses (Proxy :: Proxy SourceRepo)+--+-- @+-- repoKind :: Lens' SourceRepo RepoKind+-- repoKind f s = fmap (\\x -> s { T.repoKind = x }) (f (T.repoKind s))+-- \{-# INLINE repoKind #-\}+-- ...+-- @+--+-- /Note:/ You may need to adjust type-aliases, e.g. `String` to `FilePath`.

@@ -12,6 +12,7 @@ #ifdef HAVE_containers_050 #else     , insertWith+    , fromSet #endif     ) where @@ -20,7 +21,11 @@ #else import Data.Map as X hiding (insertWith, insertWith') import qualified Data.Map+import qualified Data.Set  insertWith :: Ord k => (a -> a -> a) -> k -> a -> Map k a -> Map k a insertWith = Data.Map.insertWith'++fromSet :: (k -> a) -> Data.Set.Set k -> Map k a+fromSet f = Data.Map.fromDistinctAscList . Prelude.map (\k -> (k, f k)) . Data.Set.toList #endif