Update `Cabal` submodule

This also requires adapting `ghc-pkg` to use the new Cabal parsing API
as the old ReadP-based one has finally been evicted for good.

Hadrian bit finished by: Ben Gamari <ben@smart-cactus.org>

2 files changed, 123 insertions, 136 deletions

diff --git a/testsuite/tests/cabal/ghcpkg01.stdout b/testsuite/tests/cabal/ghcpkg01.stdout
index 4523e2807b..5b133ee34a 100644
--- a/testsuite/tests/cabal/ghcpkg01.stdout
+++ b/testsuite/tests/cabal/ghcpkg01.stdout
@@ -1,52 +1,48 @@
 local01.package.conf
     (no packages)
 Reading package info from "test.pkg" ... done.
-name: testpkg
-version: 1.2.3.4
-id: testpkg-1.2.3.4-XXX
-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
-exposed: True
-exposed-modules:
-    A
-hidden-modules: B C.D
-import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
-library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
-hs-libraries: testpkg-1.2.3.4-XXX
-include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
+name:            testpkg
+version:         1.2.3.4
+id:              testpkg-1.2.3.4-XXX
+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
+exposed:         True
+exposed-modules: A
+hidden-modules:  B C.D
+import-dirs:     /usr/local/lib/testpkg "c:/Program Files/testpkg"
+library-dirs:    /usr/local/lib/testpkg "c:/Program Files/testpkg"
+hs-libraries:    testpkg-1.2.3.4-XXX
+include-dirs:    /usr/local/include/testpkg "c:/Program Files/testpkg"
 pkgroot: 
 
-name: testpkg
-version: 1.2.3.4
-id: testpkg-1.2.3.4-XXX
-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
-exposed: True
-exposed-modules:
-    A
-hidden-modules: B C.D
-import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
-library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
-hs-libraries: testpkg-1.2.3.4-XXX
-include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
+name:            testpkg
+version:         1.2.3.4
+id:              testpkg-1.2.3.4-XXX
+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
+exposed:         True
+exposed-modules: A
+hidden-modules:  B C.D
+import-dirs:     /usr/local/lib/testpkg "c:/Program Files/testpkg"
+library-dirs:    /usr/local/lib/testpkg "c:/Program Files/testpkg"
+hs-libraries:    testpkg-1.2.3.4-XXX
+include-dirs:    /usr/local/include/testpkg "c:/Program Files/testpkg"
 pkgroot: 
 
 import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
@@ -55,74 +51,68 @@ local01.package.conf
     testpkg-1.2.3.4
     (testpkg-2.0)
 
-name: testpkg
-version: 2.0
-id: testpkg-2.0-XXX
-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
-exposed-modules:
-    A
-hidden-modules: B C.D C.E
-import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
-library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
-hs-libraries: testpkg-2.0-XXX
-include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
+name:            testpkg
+version:         2.0
+id:              testpkg-2.0-XXX
+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
+exposed-modules: A
+hidden-modules:  B C.D C.E
+import-dirs:     /usr/local/lib/testpkg "c:/Program Files/testpkg"
+library-dirs:    /usr/local/lib/testpkg "c:/Program Files/testpkg"
+hs-libraries:    testpkg-2.0-XXX
+include-dirs:    /usr/local/include/testpkg "c:/Program Files/testpkg"
 pkgroot: 
 
-name: testpkg
-version: 2.0
-id: testpkg-2.0-XXX
-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
-exposed-modules:
-    A
-hidden-modules: B C.D C.E
-import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
-library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
-hs-libraries: testpkg-2.0-XXX
-include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
+name:            testpkg
+version:         2.0
+id:              testpkg-2.0-XXX
+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
+exposed-modules: A
+hidden-modules:  B C.D C.E
+import-dirs:     /usr/local/lib/testpkg "c:/Program Files/testpkg"
+library-dirs:    /usr/local/lib/testpkg "c:/Program Files/testpkg"
+hs-libraries:    testpkg-2.0-XXX
+include-dirs:    /usr/local/include/testpkg "c:/Program Files/testpkg"
 pkgroot: 
 ---
-name: testpkg
-version: 1.2.3.4
-id: testpkg-1.2.3.4-XXX
-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
-exposed: True
-exposed-modules:
-    A
-hidden-modules: B C.D
-import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
-library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
-hs-libraries: testpkg-1.2.3.4-XXX
-include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
+name:            testpkg
+version:         1.2.3.4
+id:              testpkg-1.2.3.4-XXX
+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
+exposed:         True
+exposed-modules: A
+hidden-modules:  B C.D
+import-dirs:     /usr/local/lib/testpkg "c:/Program Files/testpkg"
+library-dirs:    /usr/local/lib/testpkg "c:/Program Files/testpkg"
+hs-libraries:    testpkg-1.2.3.4-XXX
+include-dirs:    /usr/local/include/testpkg "c:/Program Files/testpkg"
 pkgroot: 
 
 version: 2.0
@@ -132,27 +122,25 @@ exposed: True
 exposed: False
 exposed: False
 Reading package info from "test3.pkg" ... done.
-name: testpkg
-version: 1.2.3.4
-id: testpkg-1.2.3.4-XXX
-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
-exposed-modules:
-    A
-hidden-modules: B C.D
-import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
-library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
-hs-libraries: testpkg-1.2.3.4-XXX
-include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
+name:            testpkg
+version:         1.2.3.4
+id:              testpkg-1.2.3.4-XXX
+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
+exposed-modules: A
+hidden-modules:  B C.D
+import-dirs:     /usr/local/lib/testpkg "c:/Program Files/testpkg"
+library-dirs:    /usr/local/lib/testpkg "c:/Program Files/testpkg"
+hs-libraries:    testpkg-1.2.3.4-XXX
+include-dirs:    /usr/local/include/testpkg "c:/Program Files/testpkg"
 pkgroot: 
 
 local01.package.conf
diff --git a/testsuite/tests/cabal/ghcpkg07.stdout b/testsuite/tests/cabal/ghcpkg07.stdout
index 627b381e8f..6b2d35edec 100644
--- a/testsuite/tests/cabal/ghcpkg07.stdout
+++ b/testsuite/tests/cabal/ghcpkg07.stdout
@@ -1,11 +1,10 @@
 Reading package info from "test.pkg" ... done.
-exposed-modules:
-    E, A from testpkg-1.2.3.4-XXX:A, A1 from testpkg-1.2.3.4-XXX:A,
-    E2 from testpkg7a-1.0-XXX:E
+exposed-modules: E, A from testpkg-1.2.3.4-XXX:A,
+                 A1 from testpkg-1.2.3.4-XXX:A, E2 from testpkg7a-1.0-XXX:E
 testpkg7b-1.0: module reexport refers to a module A that is reexported but not defined in the defining package testpkg7a-1.0-XXX (ignoring)
 testpkg7b-1.0: module reexport refers to a module A1 that is reexported but not defined in the defining package testpkg7a-1.0-XXX (ignoring)
 testpkg7b-1.0: module reexport refers to a module E2 that is reexported but not defined in the defining package testpkg7a-1.0-XXX (ignoring)
-exposed-modules:
-    F1 from testpkg-1.2.3.4-XXX:A, F2 from testpkg7a-1.0-XXX:A,
-    F3 from testpkg7a-1.0-XXX:A1, F4 from testpkg7a-1.0-XXX:E,
-    E from testpkg7a-1.0-XXX:E, E3 from testpkg7a-1.0-XXX:E2
+exposed-modules: F1 from testpkg-1.2.3.4-XXX:A,
+                 F2 from testpkg7a-1.0-XXX:A, F3 from testpkg7a-1.0-XXX:A1,
+                 F4 from testpkg7a-1.0-XXX:E, E from testpkg7a-1.0-XXX:E,
+                 E3 from testpkg7a-1.0-XXX:E2