Skip to content

Commit 091f61a

Browse files
authored
Merge pull request #10820 from haskell/re10819
Re #10819 Take format specification history back to version 1.8
2 parents 9e89bb3 + 9355eb1 commit 091f61a

File tree

2 files changed

+39
-6
lines changed

2 files changed

+39
-6
lines changed

Diff for: doc/cabal-package-description-file.rst

+5-5
Original file line numberDiff line numberDiff line change
@@ -1578,7 +1578,7 @@ system-dependent values for these fields.
15781578
compiled twice, once as part of the library and again for the executable.
15791579

15801580
.. pkg-field:: default-extensions: identifier list
1581-
:since: 1.12
1581+
:since: 1.10
15821582

15831583
A list of Haskell extensions used by every module. These determine
15841584
corresponding compiler options enabled for all files. Extension
@@ -1588,7 +1588,7 @@ system-dependent values for these fields.
15881588
to be preprocessed with a C preprocessor.
15891589

15901590
.. pkg-field:: other-extensions: identifier list
1591-
:since: 1.12
1591+
:since: 1.10
15921592

15931593
A list of Haskell extensions used by some (but not necessarily all)
15941594
modules. From GHC version 6.6 onward, these may be specified by
@@ -1617,7 +1617,7 @@ system-dependent values for these fields.
16171617
:pkg-field:`other-extensions` declarations.
16181618

16191619
.. pkg-field:: default-language: identifier
1620-
:since: 1.12
1620+
:since: 1.10
16211621

16221622
Specifies a language standard or a group of language extensions to be activated for the project. In the case of GHC, `see here for details <https://downloads.haskell.org/ghc/latest/docs/users_guide/exts/control.html#controlling-extensions>`__.
16231623

@@ -1629,9 +1629,9 @@ system-dependent values for these fields.
16291629
- ``Haskell98``
16301630

16311631
.. pkg-field:: other-languages: identifier
1632-
:since: 1.12
1632+
:since: 1.10
16331633

1634-
TBW
1634+
Specifies a language standard used by some (but not necessarily all) modules.
16351635

16361636
.. pkg-field:: extensions: identifier list
16371637
:deprecated: 1.12

Diff for: doc/file-format-changelog.rst

+34-1
Original file line numberDiff line numberDiff line change
@@ -305,9 +305,42 @@ relative to the respective preceding *published* version.
305305
``cabal-version: 1.12``
306306
-----------------------
307307

308-
* Change syntax of :pkg-field:`cabal-version` to support the new recommended
308+
* Change the syntax of :pkg-field:`cabal-version` to support the new recommended
309309
``cabal-version: x.y`` style
310310

311+
``cabal-version: ==1.10``
312+
-------------------------
311313

314+
* Change the syntax of :pkg-field:`cabal-version` to require a version range of
315+
the form ``cabal-version: >= x.y``. (Consequently, ``cabal-version: ==1.10``
316+
is, itself, not valid syntax.)
317+
318+
* New :pkg-field:`default-language` (to specify a default language standard when
319+
one is not explicitly specified) and :pkg-field:`other-languages`
320+
(for language standards used by some modules) added.
321+
322+
* New :pkg-field:`default-extensions` (for Haskell language extensions used by
323+
every module) and :pkg-field:`other-extensions` (for extensions used by some
324+
modules) added. :pkg-field:`extensions` deprecated.
325+
326+
* New :pkg-section:`test-suite` stanza for describing a package test suite
327+
added.
328+
329+
* ``exitcode-stdio-1.0`` is a valid value of the `type` field in a
330+
:pkg-section:`test-suite` stanza.
331+
332+
``cabal-version: ==1.8``
333+
------------------------
334+
335+
* Added support for the :pkg-field:`build-depends` of a
336+
:pkg-section:`executable` stanza being able to specify the library in the same
337+
package (if the package provides one) by the name of the package (without a
338+
version constraint). Cabal then treats the executable as if it were in another
339+
package that depended on the package providing the executable and the library.
340+
341+
* The syntax for specifying package version ranges is expanded.
342+
343+
* New :pkg-field:`license` types ``MIT`` and versioned ``GPL`` and ``LGPL``
344+
added.
312345

313346
.. include:: references.inc

0 commit comments

Comments
 (0)