Commit dbe0b8c2 authored by Herbert Valerio Riedel's avatar Herbert Valerio Riedel 🕺

Update Cabal submodule to latest tip of 1.20 branch

The testsuite reference output for ghcpkg01 needs to be adapted
since a "More diff friendly pretty printing of cabal files"
is now performed.
parent 241c6601
Subproject commit aaa6183dba81d77637dff84f83136639d40f268f
Subproject commit 045c843f295ba1487ce39dd7b2d02cd333755c75
......@@ -10,29 +10,19 @@ maintainer: glasgow-haskell-users@haskell.org
stability: stable
homepage: http://www.haskell.org/ghc
package-url: http://www.haskell.org/ghc
synopsis:
description: A Test Package
description:
A Test Package
category: none
author: simonmar@microsoft.com
exposed: True
exposed-modules: A
exposed-modules:
A
hidden-modules: B C.D
trusted: False
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
extra-libraries:
extra-ghci-libraries:
include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
includes:
depends:
hugs-options:
cc-options:
ld-options:
framework-dirs:
frameworks:
haddock-interfaces:
haddock-html:
pkgroot:
name: testpkg
......@@ -44,29 +34,19 @@ maintainer: glasgow-haskell-users@haskell.org
stability: stable
homepage: http://www.haskell.org/ghc
package-url: http://www.haskell.org/ghc
synopsis:
description: A Test Package
description:
A Test Package
category: none
author: simonmar@microsoft.com
exposed: True
exposed-modules: A
exposed-modules:
A
hidden-modules: B C.D
trusted: False
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
extra-libraries:
extra-ghci-libraries:
include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
includes:
depends:
hugs-options:
cc-options:
ld-options:
framework-dirs:
frameworks:
haddock-interfaces:
haddock-html:
pkgroot:
import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
......@@ -84,29 +64,19 @@ maintainer: glasgow-haskell-users@haskell.org
stability: unstable
homepage: http://www.haskell.org/ghc
package-url: http://www.haskell.org/ghc
synopsis:
description: A Test Package (new version)
description:
A Test Package (new version)
category: none
author: simonmar@microsoft.com
exposed: False
exposed-modules: A
exposed-modules:
A
hidden-modules: B C.D C.E
trusted: False
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
extra-libraries:
extra-ghci-libraries:
include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
includes:
depends:
hugs-options:
cc-options:
ld-options:
framework-dirs:
frameworks:
haddock-interfaces:
haddock-html:
pkgroot:
name: testpkg
......@@ -118,29 +88,19 @@ maintainer: glasgow-haskell-users@haskell.org
stability: unstable
homepage: http://www.haskell.org/ghc
package-url: http://www.haskell.org/ghc
synopsis:
description: A Test Package (new version)
description:
A Test Package (new version)
category: none
author: simonmar@microsoft.com
exposed: False
exposed-modules: A
exposed-modules:
A
hidden-modules: B C.D C.E
trusted: False
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
extra-libraries:
extra-ghci-libraries:
include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
includes:
depends:
hugs-options:
cc-options:
ld-options:
framework-dirs:
frameworks:
haddock-interfaces:
haddock-html:
pkgroot:
---
name: testpkg
......@@ -152,29 +112,19 @@ maintainer: glasgow-haskell-users@haskell.org
stability: stable
homepage: http://www.haskell.org/ghc
package-url: http://www.haskell.org/ghc
synopsis:
description: A Test Package
description:
A Test Package
category: none
author: simonmar@microsoft.com
exposed: True
exposed-modules: A
exposed-modules:
A
hidden-modules: B C.D
trusted: False
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
extra-libraries:
extra-ghci-libraries:
include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
includes:
depends:
hugs-options:
cc-options:
ld-options:
framework-dirs:
frameworks:
haddock-interfaces:
haddock-html:
pkgroot:
version: 2.0
......@@ -193,29 +143,19 @@ maintainer: glasgow-haskell-users@haskell.org
stability: stable
homepage: http://www.haskell.org/ghc
package-url: http://www.haskell.org/ghc
synopsis:
description: A Test Package
description:
A Test Package
category: none
author: simonmar@microsoft.com
exposed: False
exposed-modules: A
exposed-modules:
A
hidden-modules: B C.D
trusted: False
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
extra-libraries:
extra-ghci-libraries:
include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
includes:
depends:
hugs-options:
cc-options:
ld-options:
framework-dirs:
frameworks:
haddock-interfaces:
haddock-html:
pkgroot:
local01.package.conf:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment