Skip to content

Commit 8cc72dd

Browse files
committed
Cabal: Reexport all of Cabal-syntax
To preserve compatibility for downstream users Cabal will reexport all of Cabal-syntax for the time being. In the future we may deprecate these reexports. This requires that we bump the cabal-version of Cabal.cabal to 1.22 and drops support for GHC < 7.10. Closes #7974.
1 parent 8e648ae commit 8cc72dd

File tree

2 files changed

+147
-2
lines changed

2 files changed

+147
-2
lines changed

Cabal/Cabal.cabal

Lines changed: 143 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cabal-version: >=1.10
1+
cabal-version: >=1.22
22
name: Cabal
33
version: 3.7.0.0
44
copyright: 2003-2021, Cabal Development Team (see AUTHORS file)
@@ -164,6 +164,148 @@ library
164164
Distribution.Verbosity
165165
Distribution.Verbosity.Internal
166166

167+
-- We reexport all of Cabal-syntax to aid in compatibility for downstream
168+
-- users. In the future we may opt to deprecate some or all of these exports.
169+
-- See haskell/Cabal#7974.
170+
reexported-modules:
171+
Distribution.Backpack,
172+
Distribution.CabalSpecVersion,
173+
Distribution.Compat.Binary,
174+
Distribution.Compat.CharParsing,
175+
Distribution.Compat.DList,
176+
Distribution.Compat.Exception,
177+
Distribution.Compat.Graph,
178+
Distribution.Compat.Lens,
179+
Distribution.Compat.MonadFail,
180+
Distribution.Compat.Newtype,
181+
Distribution.Compat.NonEmptySet,
182+
Distribution.Compat.Parsing,
183+
Distribution.Compat.Prelude,
184+
Distribution.Compat.Semigroup,
185+
Distribution.Compat.Typeable,
186+
Distribution.Compiler,
187+
Distribution.FieldGrammar,
188+
Distribution.FieldGrammar.Class,
189+
Distribution.FieldGrammar.FieldDescrs,
190+
Distribution.FieldGrammar.Newtypes,
191+
Distribution.FieldGrammar.Parsec,
192+
Distribution.FieldGrammar.Pretty,
193+
Distribution.Fields,
194+
Distribution.Fields.ConfVar,
195+
Distribution.Fields.Field,
196+
Distribution.Fields.Lexer,
197+
Distribution.Fields.LexerMonad,
198+
Distribution.Fields.ParseResult,
199+
Distribution.Fields.Parser,
200+
Distribution.Fields.Pretty,
201+
Distribution.InstalledPackageInfo,
202+
Distribution.License,
203+
Distribution.ModuleName,
204+
Distribution.Package,
205+
Distribution.PackageDescription,
206+
Distribution.PackageDescription.Configuration,
207+
Distribution.PackageDescription.FieldGrammar,
208+
Distribution.PackageDescription.Parsec,
209+
Distribution.PackageDescription.PrettyPrint,
210+
Distribution.PackageDescription.Quirks,
211+
Distribution.PackageDescription.Utils,
212+
Distribution.Parsec,
213+
Distribution.Parsec.Error,
214+
Distribution.Parsec.FieldLineStream,
215+
Distribution.Parsec.Position,
216+
Distribution.Parsec.Warning,
217+
Distribution.Pretty,
218+
Distribution.SPDX,
219+
Distribution.SPDX.License,
220+
Distribution.SPDX.LicenseExceptionId,
221+
Distribution.SPDX.LicenseExpression,
222+
Distribution.SPDX.LicenseId,
223+
Distribution.SPDX.LicenseListVersion,
224+
Distribution.SPDX.LicenseReference,
225+
Distribution.System,
226+
Distribution.Text,
227+
Distribution.Types.AbiDependency,
228+
Distribution.Types.AbiHash,
229+
Distribution.Types.Benchmark,
230+
Distribution.Types.Benchmark.Lens,
231+
Distribution.Types.BenchmarkInterface,
232+
Distribution.Types.BenchmarkType,
233+
Distribution.Types.BuildInfo,
234+
Distribution.Types.BuildInfo.Lens,
235+
Distribution.Types.BuildType,
236+
Distribution.Types.Component,
237+
Distribution.Types.ComponentId,
238+
Distribution.Types.ComponentName,
239+
Distribution.Types.ComponentRequestedSpec,
240+
Distribution.Types.CondTree,
241+
Distribution.Types.Condition,
242+
Distribution.Types.ConfVar,
243+
Distribution.Types.Dependency,
244+
Distribution.Types.DependencyMap,
245+
Distribution.Types.ExeDependency,
246+
Distribution.Types.Executable,
247+
Distribution.Types.Executable.Lens,
248+
Distribution.Types.ExecutableScope,
249+
Distribution.Types.ExposedModule,
250+
Distribution.Types.Flag,
251+
Distribution.Types.ForeignLib,
252+
Distribution.Types.ForeignLib.Lens,
253+
Distribution.Types.ForeignLibOption,
254+
Distribution.Types.ForeignLibType,
255+
Distribution.Types.GenericPackageDescription,
256+
Distribution.Types.GenericPackageDescription.Lens,
257+
Distribution.Types.HookedBuildInfo,
258+
Distribution.Types.IncludeRenaming,
259+
Distribution.Types.InstalledPackageInfo,
260+
Distribution.Types.InstalledPackageInfo.Lens,
261+
Distribution.Types.InstalledPackageInfo.FieldGrammar,
262+
Distribution.Types.LegacyExeDependency,
263+
Distribution.Types.Lens,
264+
Distribution.Types.Library,
265+
Distribution.Types.Library.Lens,
266+
Distribution.Types.LibraryName,
267+
Distribution.Types.LibraryVisibility,
268+
Distribution.Types.Mixin,
269+
Distribution.Types.Module,
270+
Distribution.Types.ModuleReexport,
271+
Distribution.Types.ModuleRenaming,
272+
Distribution.Types.MungedPackageId,
273+
Distribution.Types.MungedPackageName,
274+
Distribution.Types.PackageDescription,
275+
Distribution.Types.PackageDescription.Lens,
276+
Distribution.Types.PackageId,
277+
Distribution.Types.PackageId.Lens,
278+
Distribution.Types.PackageName,
279+
Distribution.Types.PackageVersionConstraint,
280+
Distribution.Types.PkgconfigDependency,
281+
Distribution.Types.PkgconfigName,
282+
Distribution.Types.PkgconfigVersion,
283+
Distribution.Types.PkgconfigVersionRange,
284+
Distribution.Types.SetupBuildInfo,
285+
Distribution.Types.SetupBuildInfo.Lens,
286+
Distribution.Types.SourceRepo,
287+
Distribution.Types.SourceRepo.Lens,
288+
Distribution.Types.TestSuite,
289+
Distribution.Types.TestSuite.Lens,
290+
Distribution.Types.TestSuiteInterface,
291+
Distribution.Types.TestType,
292+
Distribution.Types.UnitId,
293+
Distribution.Types.UnqualComponentName,
294+
Distribution.Types.Version,
295+
Distribution.Types.VersionInterval,
296+
Distribution.Types.VersionInterval.Legacy,
297+
Distribution.Types.VersionRange,
298+
Distribution.Types.VersionRange.Internal,
299+
Distribution.Utils.Base62,
300+
Distribution.Utils.Generic,
301+
Distribution.Utils.MD5,
302+
Distribution.Utils.Path,
303+
Distribution.Utils.ShortText,
304+
Distribution.Utils.String,
305+
Distribution.Utils.Structured,
306+
Distribution.Version,
307+
Language.Haskell.Extension
308+
167309
-- Parsec parser-related modules
168310
build-depends:
169311
-- transformers-0.4.0.0 doesn't have record syntax e.g. for Identity

changelog.d/cabal-syntax

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,8 @@ prs: #7620
33
issues: #7559
44

55
description {
6-
- Extract `Cabal-syntax` from `Cabal` to provide the syntax and parsing code for `.cabal` files
6+
- Extract `Cabal-syntax` from `Cabal` to provide the syntax and parsing code
7+
for `.cabal` files. `Cabal` currently reexports all of the modules which were
8+
moved to `Cabal-syntax` although these exports may be deprecated in the
9+
future.
710
}

0 commit comments

Comments
 (0)