summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Klebinger <klebinger.andreas@gmx.at>2020-06-19 09:47:23 -0400
committerBen Gamari <ben@smart-cactus.org>2020-07-15 16:41:04 -0400
commite7701818e75b66957724f48c4aafac146699b667 (patch)
tree504c208405cfd53c746094a44138146fa36e1e29
parent849e8889fe9586bf9e1bf37885537f25743383f2 (diff)
downloadhaskell-e7701818e75b66957724f48c4aafac146699b667.tar.gz
winio: Fix cabal006 after upgrading cabal submodule
Demand cabal 2.0 syntax instead of >= 1.20 as required by newer cabal versions.
-rw-r--r--testsuite/tests/cabal/cabal06/p-1.0/p.cabal2
-rw-r--r--testsuite/tests/cabal/cabal06/p-1.1/p.cabal2
-rw-r--r--testsuite/tests/cabal/cabal06/q/q.cabal2
-rw-r--r--testsuite/tests/cabal/cabal06/r/r.cabal2
4 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/tests/cabal/cabal06/p-1.0/p.cabal b/testsuite/tests/cabal/cabal06/p-1.0/p.cabal
index ab7b3ebffe..00336e7bae 100644
--- a/testsuite/tests/cabal/cabal06/p-1.0/p.cabal
+++ b/testsuite/tests/cabal/cabal06/p-1.0/p.cabal
@@ -4,7 +4,7 @@ license-file: LICENSE
author: Edward Z. Yang
maintainer: ezyang@cs.stanford.edu
build-type: Simple
-cabal-version: >=1.20
+cabal-version: 2.0
library
exposed-modules: P
diff --git a/testsuite/tests/cabal/cabal06/p-1.1/p.cabal b/testsuite/tests/cabal/cabal06/p-1.1/p.cabal
index 8a7b7b271d..31ba170e04 100644
--- a/testsuite/tests/cabal/cabal06/p-1.1/p.cabal
+++ b/testsuite/tests/cabal/cabal06/p-1.1/p.cabal
@@ -4,7 +4,7 @@ license-file: LICENSE
author: Edward Z. Yang
maintainer: ezyang@cs.stanford.edu
build-type: Simple
-cabal-version: >=1.20
+cabal-version: 2.0
library
exposed-modules: P
diff --git a/testsuite/tests/cabal/cabal06/q/q.cabal b/testsuite/tests/cabal/cabal06/q/q.cabal
index 7b3a074f88..770c0bfc3f 100644
--- a/testsuite/tests/cabal/cabal06/q/q.cabal
+++ b/testsuite/tests/cabal/cabal06/q/q.cabal
@@ -4,7 +4,7 @@ license-file: LICENSE
author: Edward Z. Yang
maintainer: ezyang@cs.stanford.edu
build-type: Simple
-cabal-version: >=1.20
+cabal-version: 2.0
library
exposed-modules: Q
diff --git a/testsuite/tests/cabal/cabal06/r/r.cabal b/testsuite/tests/cabal/cabal06/r/r.cabal
index 60e16c1c78..2df73e0ed3 100644
--- a/testsuite/tests/cabal/cabal06/r/r.cabal
+++ b/testsuite/tests/cabal/cabal06/r/r.cabal
@@ -4,7 +4,7 @@ license-file: LICENSE
author: Edward Z. Yang
maintainer: ezyang@cs.stanford.edu
build-type: Simple
-cabal-version: >=1.20
+cabal-version: 2.0
executable cabal06
build-depends: base, p, q