diff options
| author | Oleg Grenrus <oleg.grenrus@iki.fi> | 2018-01-21 20:37:17 +0200 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-01-21 20:39:02 -0500 |
| commit | 2671cccde749ed64129097358f81bff43480cdb9 (patch) | |
| tree | aec56bdf80e6bbf82f60f1208d3050bf8d0d36a3 /testsuite/tests/cabal | |
| parent | 6c0db98bc5d1dceb8fa48544532f85d386900e4a (diff) | |
| download | haskell-2671cccde749ed64129097358f81bff43480cdb9.tar.gz | |
Update Cabal submodule
- Cabal-2.2 uses SPDX license identifiers, so I had to update
`cabal-version: 2.1` packages `license: BSD3` to `license: BSD-3-Clause`
- `ghc-cabal` used old ReadP parsec, now it uses `parsec` too
- InstalledPackageInfo pretty-printing have changed a little,
fields with default values aren't printed. This can be changed in
`Cabal` still, but I haven't found problems with omitting them.
Note: `BSD-3-Clause` is parsed as "name = BSD, version = 3" by old
parser (because 3-Clause looks like version 3 with tag Clause).
If you see *"BSD-3" is not a valid license*, then something is using
old parser still.
Fixes #9885.
Diffstat (limited to 'testsuite/tests/cabal')
| -rw-r--r-- | testsuite/tests/cabal/ghcpkg01.stdout | 39 |
1 files changed, 6 insertions, 33 deletions
diff --git a/testsuite/tests/cabal/ghcpkg01.stdout b/testsuite/tests/cabal/ghcpkg01.stdout index ef77814b4c..4523e2807b 100644 --- a/testsuite/tests/cabal/ghcpkg01.stdout +++ b/testsuite/tests/cabal/ghcpkg01.stdout @@ -8,23 +8,19 @@ key: testpkg-1.2.3.4-XXX license: BSD3 copyright: (c) The Univsersity of Glasgow 2004 maintainer: glasgow-haskell-users@haskell.org +author: simonmar@microsoft.com stability: stable homepage: http://www.haskell.org/ghc package-url: http://www.haskell.org/ghc description: A Test Package category: none -author: simonmar@microsoft.com exposed: True -indefinite: False exposed-modules: A hidden-modules: B C.D -abi: -trusted: False import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" -data-dir: "" hs-libraries: testpkg-1.2.3.4-XXX include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg" pkgroot: @@ -36,23 +32,19 @@ key: testpkg-1.2.3.4-XXX license: BSD3 copyright: (c) The Univsersity of Glasgow 2004 maintainer: glasgow-haskell-users@haskell.org +author: simonmar@microsoft.com stability: stable homepage: http://www.haskell.org/ghc package-url: http://www.haskell.org/ghc description: A Test Package category: none -author: simonmar@microsoft.com exposed: True -indefinite: False exposed-modules: A hidden-modules: B C.D -abi: -trusted: False import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" -data-dir: "" hs-libraries: testpkg-1.2.3.4-XXX include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg" pkgroot: @@ -70,23 +62,18 @@ key: testpkg-2.0-XXX license: BSD3 copyright: (c) The Univsersity of Glasgow 2004 maintainer: glasgow-haskell-users@haskell.org +author: simonmar@microsoft.com stability: unstable homepage: http://www.haskell.org/ghc package-url: http://www.haskell.org/ghc description: A Test Package (new version) category: none -author: simonmar@microsoft.com -exposed: False -indefinite: False exposed-modules: A hidden-modules: B C.D C.E -abi: -trusted: False import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" -data-dir: "" hs-libraries: testpkg-2.0-XXX include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg" pkgroot: @@ -98,23 +85,18 @@ key: testpkg-2.0-XXX license: BSD3 copyright: (c) The Univsersity of Glasgow 2004 maintainer: glasgow-haskell-users@haskell.org +author: simonmar@microsoft.com stability: unstable homepage: http://www.haskell.org/ghc package-url: http://www.haskell.org/ghc description: A Test Package (new version) category: none -author: simonmar@microsoft.com -exposed: False -indefinite: False exposed-modules: A hidden-modules: B C.D C.E -abi: -trusted: False import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" -data-dir: "" hs-libraries: testpkg-2.0-XXX include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg" pkgroot: @@ -126,23 +108,19 @@ key: testpkg-1.2.3.4-XXX license: BSD3 copyright: (c) The Univsersity of Glasgow 2004 maintainer: glasgow-haskell-users@haskell.org +author: simonmar@microsoft.com stability: stable homepage: http://www.haskell.org/ghc package-url: http://www.haskell.org/ghc description: A Test Package category: none -author: simonmar@microsoft.com exposed: True -indefinite: False exposed-modules: A hidden-modules: B C.D -abi: -trusted: False import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" -data-dir: "" hs-libraries: testpkg-1.2.3.4-XXX include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg" pkgroot: @@ -161,23 +139,18 @@ key: testpkg-1.2.3.4-XXX license: BSD3 copyright: (c) The Univsersity of Glasgow 2004 maintainer: glasgow-haskell-users@haskell.org +author: simonmar@microsoft.com stability: stable homepage: http://www.haskell.org/ghc package-url: http://www.haskell.org/ghc description: A Test Package category: none -author: simonmar@microsoft.com -exposed: False -indefinite: False exposed-modules: A hidden-modules: B C.D -abi: -trusted: False import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" -data-dir: "" hs-libraries: testpkg-1.2.3.4-XXX include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg" pkgroot: |