From c43780605d2a94af4b375a97f14261d6300f9582 Mon Sep 17 00:00:00 2001 From: Vanessa McHale Date: Thu, 26 Sep 2019 12:51:11 -0500 Subject: [PATCH 1/2] Bump allowed cabal-version --- Cabal/Distribution/PackageDescription/Parsec.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cabal/Distribution/PackageDescription/Parsec.hs b/Cabal/Distribution/PackageDescription/Parsec.hs index 9513d4fa018..aa221208a13 100644 --- a/Cabal/Distribution/PackageDescription/Parsec.hs +++ b/Cabal/Distribution/PackageDescription/Parsec.hs @@ -106,7 +106,7 @@ parseGenericPackageDescription bs = do setCabalSpecVersion ver -- if we get too new version, fail right away case ver of - Just v | v > mkVersion [3,0] -> parseFailure zeroPos + Just v | v > mkVersion [3,1] -> parseFailure zeroPos "Unsupported cabal-version. See https://github.com/haskell/cabal/issues/4899." _ -> pure () From 74a3ec7853dbbf5c78d64d175b080557b42f7e35 Mon Sep 17 00:00:00 2001 From: Vanessa McHale Date: Sat, 28 Sep 2019 14:38:57 -0500 Subject: [PATCH 2/2] Use 3.2, not 3.1 --- Cabal/Distribution/PackageDescription/Parsec.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cabal/Distribution/PackageDescription/Parsec.hs b/Cabal/Distribution/PackageDescription/Parsec.hs index aa221208a13..ba08a01b55e 100644 --- a/Cabal/Distribution/PackageDescription/Parsec.hs +++ b/Cabal/Distribution/PackageDescription/Parsec.hs @@ -106,7 +106,7 @@ parseGenericPackageDescription bs = do setCabalSpecVersion ver -- if we get too new version, fail right away case ver of - Just v | v > mkVersion [3,1] -> parseFailure zeroPos + Just v | v > mkVersion [3,2] -> parseFailure zeroPos "Unsupported cabal-version. See https://github.com/haskell/cabal/issues/4899." _ -> pure ()