diff options
m--------- | libraries/Cabal | 0 | ||||
-rw-r--r-- | libraries/base/base.cabal | 2 | ||||
-rw-r--r-- | libraries/ghc-prim/ghc-prim.cabal | 2 | ||||
-rw-r--r-- | testsuite/tests/backpack/cabal/bkpcabal06/bkpcabal06.cabal | 2 | ||||
-rw-r--r-- | testsuite/tests/cabal/ghcpkg01.stdout | 39 | ||||
-rw-r--r-- | utils/ghc-cabal/Main.hs | 6 |
6 files changed, 12 insertions, 39 deletions
diff --git a/libraries/Cabal b/libraries/Cabal -Subproject 3f20e1faf9bc86ecb154ccf3e8b913bff14b926 +Subproject d2cf3f13dad9f1172cf9371ea197d1204e9e17a diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal index 4252cdc025..dc529a8686 100644 --- a/libraries/base/base.cabal +++ b/libraries/base/base.cabal @@ -3,7 +3,7 @@ name: base version: 4.11.0.0 -- NOTE: Don't forget to update ./changelog.md -license: BSD3 +license: BSD-3-Clause license-file: LICENSE maintainer: libraries@haskell.org bug-reports: http://ghc.haskell.org/trac/ghc/newticket?component=libraries/base diff --git a/libraries/ghc-prim/ghc-prim.cabal b/libraries/ghc-prim/ghc-prim.cabal index 9b8c1ac196..f395c9faac 100644 --- a/libraries/ghc-prim/ghc-prim.cabal +++ b/libraries/ghc-prim/ghc-prim.cabal @@ -2,7 +2,7 @@ cabal-version: 2.1 name: ghc-prim version: 0.5.2.0 -- NOTE: Don't forget to update ./changelog.md -license: BSD3 +license: BSD-3-Clause license-file: LICENSE category: GHC maintainer: libraries@haskell.org diff --git a/testsuite/tests/backpack/cabal/bkpcabal06/bkpcabal06.cabal b/testsuite/tests/backpack/cabal/bkpcabal06/bkpcabal06.cabal index 7dfac20986..ff322a4e02 100644 --- a/testsuite/tests/backpack/cabal/bkpcabal06/bkpcabal06.cabal +++ b/testsuite/tests/backpack/cabal/bkpcabal06/bkpcabal06.cabal @@ -4,7 +4,7 @@ license: BSD3 author: Edward Z. Yang maintainer: ezyang@cs.stanford.edu build-type: Simple -cabal-version: >=1.10 +cabal-version: 2.0 library sig signatures: P 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: diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs index f330ce06c3..3faf998ee7 100644 --- a/utils/ghc-cabal/Main.hs +++ b/utils/ghc-cabal/Main.hs @@ -6,7 +6,7 @@ import qualified Distribution.ModuleName as ModuleName import Distribution.PackageDescription import Distribution.PackageDescription.Check hiding (doesFileExist) import Distribution.PackageDescription.Configuration -import Distribution.PackageDescription.Parse +import Distribution.PackageDescription.Parsec import Distribution.Package import Distribution.Simple import Distribution.Simple.Configure @@ -93,7 +93,7 @@ runDefaultMain :: IO () runDefaultMain = do let verbosity = normal gpdFile <- defaultPackageDesc verbosity - gpd <- readPackageDescription verbosity gpdFile + gpd <- readGenericPackageDescription verbosity gpdFile case buildType (flattenPackageDescription gpd) of Configure -> defaultMainWithHooks autoconfUserHooks -- time has a "Custom" Setup.hs, but it's actually Configure @@ -118,7 +118,7 @@ doCheck directory = withCurrentDirectory directory $ do let verbosity = normal gpdFile <- defaultPackageDesc verbosity - gpd <- readPackageDescription verbosity gpdFile + gpd <- readGenericPackageDescription verbosity gpdFile case filter isFailure $ checkPackage gpd Nothing of [] -> return () errs -> mapM_ print errs >> exitWith (ExitFailure 1) |