diff options
16 files changed, 26 insertions, 28 deletions
diff --git a/libraries/Cabal b/libraries/Cabal -Subproject 8dc7f0db292ff1a5b1316127e3652d06ab51f3a +Subproject 32dad5c1cf70d65ecb93b0ec214445cf9c9f661 diff --git a/libraries/ghc-prim/ghc-prim.cabal b/libraries/ghc-prim/ghc-prim.cabal index e68b09c944..bca9225023 100644 --- a/libraries/ghc-prim/ghc-prim.cabal +++ b/libraries/ghc-prim/ghc-prim.cabal @@ -1,4 +1,4 @@ -cabal-version: 2.1 +cabal-version: 2.2 name: ghc-prim version: 0.7.0 -- NOTE: Don't forget to update ./changelog.md diff --git a/testsuite/tests/backpack/cabal/T16219/backpack-issue.cabal b/testsuite/tests/backpack/cabal/T16219/backpack-issue.cabal index 69f47e8e54..3a15b2e705 100644 --- a/testsuite/tests/backpack/cabal/T16219/backpack-issue.cabal +++ b/testsuite/tests/backpack/cabal/T16219/backpack-issue.cabal @@ -1,8 +1,9 @@ +cabal-version: 2.2 name: backpack-issue version: 0.1.0.0 -- synopsis: -- description: -license: BSD3 +license: BSD-3-Clause license-file: LICENSE author: Isaac Elliott maintainer: isaace71295@gmail.com @@ -10,7 +11,6 @@ maintainer: isaace71295@gmail.com -- category: build-type: Simple extra-source-files: CHANGELOG.md -cabal-version: >=2 library library-a signatures: A.Sig diff --git a/testsuite/tests/backpack/cabal/bkpcabal01/bkpcabal01.cabal b/testsuite/tests/backpack/cabal/bkpcabal01/bkpcabal01.cabal index c46675f1ce..8955d65329 100644 --- a/testsuite/tests/backpack/cabal/bkpcabal01/bkpcabal01.cabal +++ b/testsuite/tests/backpack/cabal/bkpcabal01/bkpcabal01.cabal @@ -1,10 +1,10 @@ +cabal-version: 2.2 name: bkpcabal01 version: 0.1.0.0 -license: BSD3 +license: BSD-3-Clause author: Edward Z. Yang maintainer: ezyang@cs.stanford.edu build-type: Simple -cabal-version: >=1.25 library impl exposed-modules: H, I diff --git a/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.cabal b/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.cabal index 92ba58633a..a94a6521a7 100644 --- a/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.cabal +++ b/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.cabal @@ -1,10 +1,10 @@ +cabal-version: 2.2 name: bkpcabal01 version: 0.1.0.0 -license: BSD3 +license: BSD-3-Clause author: Edward Z. Yang maintainer: ezyang@cs.stanford.edu build-type: Simple -cabal-version: >=1.25 library p signatures: H diff --git a/testsuite/tests/backpack/cabal/bkpcabal03/asig1/asig1.cabal b/testsuite/tests/backpack/cabal/bkpcabal03/asig1/asig1.cabal index f45c925414..3977ac1927 100644 --- a/testsuite/tests/backpack/cabal/bkpcabal03/asig1/asig1.cabal +++ b/testsuite/tests/backpack/cabal/bkpcabal03/asig1/asig1.cabal @@ -1,10 +1,10 @@ +cabal-version: 2.2 name: asig1 version: 0.1.0.0 -license: BSD3 +license: BSD-3-Clause author: Edward Z. Yang maintainer: ezyang@cs.stanford.edu build-type: Simple -cabal-version: >=1.25 library build-depends: base diff --git a/testsuite/tests/backpack/cabal/bkpcabal03/asig2/asig2.cabal b/testsuite/tests/backpack/cabal/bkpcabal03/asig2/asig2.cabal index 1d802d8fe3..e97ccbdc7e 100644 --- a/testsuite/tests/backpack/cabal/bkpcabal03/asig2/asig2.cabal +++ b/testsuite/tests/backpack/cabal/bkpcabal03/asig2/asig2.cabal @@ -1,10 +1,10 @@ +cabal-version: 2.2 name: asig2 version: 0.1.0.0 -license: BSD3 +license: BSD-3-Clause author: Edward Z. Yang maintainer: ezyang@cs.stanford.edu build-type: Simple -cabal-version: >=1.25 library build-depends: base diff --git a/testsuite/tests/backpack/cabal/bkpcabal03/bkpcabal03.cabal.in1 b/testsuite/tests/backpack/cabal/bkpcabal03/bkpcabal03.cabal.in1 index 689a7c87be..8fb32a789d 100644 --- a/testsuite/tests/backpack/cabal/bkpcabal03/bkpcabal03.cabal.in1 +++ b/testsuite/tests/backpack/cabal/bkpcabal03/bkpcabal03.cabal.in1 @@ -1,10 +1,10 @@ +cabal-version: 2.2 name: bkpcabal03 version: 0.1.0.0 -license: BSD3 +license: BSD-3-Clause author: Edward Z. Yang maintainer: ezyang@cs.stanford.edu build-type: Simple -cabal-version: >=1.25 library build-depends: asig1, base diff --git a/testsuite/tests/backpack/cabal/bkpcabal03/bkpcabal03.cabal.in2 b/testsuite/tests/backpack/cabal/bkpcabal03/bkpcabal03.cabal.in2 index a25c7fed46..8db22c1da7 100644 --- a/testsuite/tests/backpack/cabal/bkpcabal03/bkpcabal03.cabal.in2 +++ b/testsuite/tests/backpack/cabal/bkpcabal03/bkpcabal03.cabal.in2 @@ -1,10 +1,10 @@ +cabal-version: 2.2 name: bkpcabal03 version: 0.1.0.0 -license: BSD3 +license: BSD-3-Clause author: Edward Z. Yang maintainer: ezyang@cs.stanford.edu build-type: Simple -cabal-version: >=1.25 library build-depends: asig1, asig2, base diff --git a/testsuite/tests/backpack/cabal/bkpcabal04/bkpcabal04.cabal.in1 b/testsuite/tests/backpack/cabal/bkpcabal04/bkpcabal04.cabal.in1 index 1ce11c5bcc..456c9f92c7 100644 --- a/testsuite/tests/backpack/cabal/bkpcabal04/bkpcabal04.cabal.in1 +++ b/testsuite/tests/backpack/cabal/bkpcabal04/bkpcabal04.cabal.in1 @@ -1,10 +1,10 @@ +cabal-version: 2.2 name: bkpcabal04 version: 0.1.0.0 -license: BSD3 +license: BSD-3-Clause author: Edward Z. Yang maintainer: ezyang@cs.stanford.edu build-type: Simple -cabal-version: >=1.25 library p signatures: A diff --git a/testsuite/tests/backpack/cabal/bkpcabal04/bkpcabal04.cabal.in2 b/testsuite/tests/backpack/cabal/bkpcabal04/bkpcabal04.cabal.in2 index e6fa4c6660..f15f5ac520 100644 --- a/testsuite/tests/backpack/cabal/bkpcabal04/bkpcabal04.cabal.in2 +++ b/testsuite/tests/backpack/cabal/bkpcabal04/bkpcabal04.cabal.in2 @@ -1,10 +1,10 @@ +cabal-version: 2.2 name: bkpcabal04 version: 0.1.0.0 -license: BSD3 +license: BSD-3-Clause author: Edward Z. Yang maintainer: ezyang@cs.stanford.edu build-type: Simple -cabal-version: >=1.25 library p signatures: A diff --git a/testsuite/tests/backpack/cabal/bkpcabal05/bkpcabal05.cabal b/testsuite/tests/backpack/cabal/bkpcabal05/bkpcabal05.cabal index 47e78a4b74..723f105ce3 100644 --- a/testsuite/tests/backpack/cabal/bkpcabal05/bkpcabal05.cabal +++ b/testsuite/tests/backpack/cabal/bkpcabal05/bkpcabal05.cabal @@ -1,10 +1,10 @@ +cabal-version: 2.2 name: bkpcabal05 version: 0.1.0.0 -license: BSD3 +license: BSD-3-Clause author: Edward Z. Yang maintainer: ezyang@cs.stanford.edu build-type: Simple -cabal-version: >=1.25 library signatures: A diff --git a/testsuite/tests/backpack/cabal/bkpcabal06/bkpcabal06.cabal b/testsuite/tests/backpack/cabal/bkpcabal06/bkpcabal06.cabal index ff322a4e02..e62687dcc0 100644 --- a/testsuite/tests/backpack/cabal/bkpcabal06/bkpcabal06.cabal +++ b/testsuite/tests/backpack/cabal/bkpcabal06/bkpcabal06.cabal @@ -1,10 +1,10 @@ +cabal-version: 2.2 name: bkpcabal06 version: 0.1.0.0 -license: BSD3 +license: BSD-3-Clause author: Edward Z. Yang maintainer: ezyang@cs.stanford.edu build-type: Simple -cabal-version: 2.0 library sig signatures: P diff --git a/testsuite/tests/backpack/cabal/bkpcabal07/bkpcabal07.cabal b/testsuite/tests/backpack/cabal/bkpcabal07/bkpcabal07.cabal index 4f66fc44a9..db4d04e9da 100644 --- a/testsuite/tests/backpack/cabal/bkpcabal07/bkpcabal07.cabal +++ b/testsuite/tests/backpack/cabal/bkpcabal07/bkpcabal07.cabal @@ -1,10 +1,10 @@ +cabal-version: 2.2 name: bkpcabal06 version: 0.1.0.0 -license: BSD3 +license: BSD-3-Clause author: Edward Z. Yang maintainer: ezyang@cs.stanford.edu build-type: Simple -cabal-version: >=2.0 library indef signatures: P diff --git a/testsuite/tests/cabal/cabal01/test.cabal b/testsuite/tests/cabal/cabal01/test.cabal index b5c3b74ebe..c37f41c648 100644 --- a/testsuite/tests/cabal/cabal01/test.cabal +++ b/testsuite/tests/cabal/cabal01/test.cabal @@ -1,3 +1,4 @@ +Cabal-Version: 2.2 Name: test Version: 1.0 Exposed-Modules: A diff --git a/testsuite/tests/driver/T4437.hs b/testsuite/tests/driver/T4437.hs index a0bcebf889..c83d29b03d 100644 --- a/testsuite/tests/driver/T4437.hs +++ b/testsuite/tests/driver/T4437.hs @@ -40,9 +40,6 @@ expectedGhcOnlyExtensions = [ "RelaxedLayout" , "AlternativeLayoutRule" , "AlternativeLayoutRuleTransitional" - , "LinearTypes" - , "QualifiedDo" - , "LexicalNegation" ] expectedCabalOnlyExtensions :: [String] |