From ff3a37eaa0b3da4bc6d62d2cc8c35675356179bf Mon Sep 17 00:00:00 2001
From: Oleg Grenrus <oleg.grenrus@iki.fi>
Date: Tue, 6 Mar 2018 14:19:16 +0200
Subject: [PATCH] s/cabal-version: >= 2.0/cabal-version: 2.0/

---
 Cabal/Distribution/PackageDescription/Check.hs            | 8 ++++----
 .../PackageTests/AutogenModules/Package/setup.cabal.out   | 2 +-
 .../PackageTests/AutogenModules/Package/setup.out         | 2 +-
 .../PackageTests/AutogenModules/Package/setup.test.hs     | 2 +-
 .../PackageTests/AutogenModules/SrcDist/setup.test.hs     | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cabal/Distribution/PackageDescription/Check.hs b/Cabal/Distribution/PackageDescription/Check.hs
index b6cb098489..314ed14c28 100644
--- a/Cabal/Distribution/PackageDescription/Check.hs
+++ b/Cabal/Distribution/PackageDescription/Check.hs
@@ -261,7 +261,7 @@ checkLibrary pkg lib =
   , checkVersion [1,25] (not (null (signatures lib))) $
       PackageDistInexcusable $
            "To use the 'signatures' field the package needs to specify "
-        ++ "at least 'cabal-version: >= 2.0'."
+        ++ "at least 'cabal-version: 2.0'."
 
     -- check that all autogen-modules appear on other-modules or exposed-modules
   , check
@@ -1170,7 +1170,7 @@ checkCabalVersion pkg =
   , checkVersion [1,25] usesBackpackIncludes $
       PackageDistInexcusable $
            "To use the 'mixins' field the package needs to specify "
-        ++ "at least 'cabal-version: >= 2.0'."
+        ++ "at least 'cabal-version: 2.0'."
 
     -- check use of 'extra-framework-dirs' field
   , checkVersion [1,23] (any (not . null) (buildInfoField extraFrameworkDirs)) $
@@ -1225,7 +1225,7 @@ checkCabalVersion pkg =
         ++ "'build-depends' field: "
         ++ commaSep (map display depsUsingMajorBoundSyntax)
         ++ ". To use this new syntax the package need to specify at least "
-        ++ "'cabal-version: >= 2.0'. Alternatively, if broader compatibility "
+        ++ "'cabal-version: 2.0'. Alternatively, if broader compatibility "
         ++ "is important then use: " ++ commaSep
            [ display (Dependency name (eliminateMajorBoundSyntax versionRange))
            | Dependency name versionRange <- depsUsingMajorBoundSyntax ]
@@ -1337,7 +1337,7 @@ checkCabalVersion pkg =
            && elem (autogenPathsModuleName pkg) allModuleNames
            && not (elem (autogenPathsModuleName pkg) allModuleNamesAutogen) ) $
       PackageDistInexcusable $
-           "Packages using 'cabal-version: >= 2.0' and the autogenerated "
+           "Packages using 'cabal-version: 2.0' and the autogenerated "
         ++ "module Paths_* must include it also on the 'autogen-modules' field "
         ++ "besides 'exposed-modules' and 'other-modules'. This specifies that "
         ++ "the module does not come with the package and is generated on "
diff --git a/cabal-testsuite/PackageTests/AutogenModules/Package/setup.cabal.out b/cabal-testsuite/PackageTests/AutogenModules/Package/setup.cabal.out
index 09001915e0..969342196a 100644
--- a/cabal-testsuite/PackageTests/AutogenModules/Package/setup.cabal.out
+++ b/cabal-testsuite/PackageTests/AutogenModules/Package/setup.cabal.out
@@ -14,7 +14,7 @@ An 'autogen-module' is neither on 'exposed-modules' or 'other-modules'.
 On executable 'Exe' an 'autogen-module' is not on 'other-modules'
 On test suite 'Test' an 'autogen-module' is not on 'other-modules'
 On benchmark 'Bench' an 'autogen-module' is not on 'other-modules'
-Packages using 'cabal-version: >= 2.0' and the autogenerated module Paths_* must include it also on the 'autogen-modules' field besides 'exposed-modules' and 'other-modules'. This specifies that the module does not come with the package and is generated on setup. Modules built with a custom Setup.hs script also go here to ensure that commands like sdist don't fail.
+Packages using 'cabal-version: 2.0' and the autogenerated module Paths_* must include it also on the 'autogen-modules' field besides 'exposed-modules' and 'other-modules'. This specifies that the module does not come with the package and is generated on setup. Modules built with a custom Setup.hs script also go here to ensure that commands like sdist don't fail.
 The filename ./my.cabal does not match package name (expected: AutogenModules.cabal)
 Note: the public hackage server would reject this package.
 Warning: Cannot run preprocessors. Run 'configure' command first.
diff --git a/cabal-testsuite/PackageTests/AutogenModules/Package/setup.out b/cabal-testsuite/PackageTests/AutogenModules/Package/setup.out
index 3bed075154..c218a77fdd 100644
--- a/cabal-testsuite/PackageTests/AutogenModules/Package/setup.out
+++ b/cabal-testsuite/PackageTests/AutogenModules/Package/setup.out
@@ -13,7 +13,7 @@ An 'autogen-module' is neither on 'exposed-modules' or 'other-modules'.
 On executable 'Exe' an 'autogen-module' is not on 'other-modules'
 On test suite 'Test' an 'autogen-module' is not on 'other-modules'
 On benchmark 'Bench' an 'autogen-module' is not on 'other-modules'
-Packages using 'cabal-version: >= 2.0' and the autogenerated module Paths_* must include it also on the 'autogen-modules' field besides 'exposed-modules' and 'other-modules'. This specifies that the module does not come with the package and is generated on setup. Modules built with a custom Setup.hs script also go here to ensure that commands like sdist don't fail.
+Packages using 'cabal-version: 2.0' and the autogenerated module Paths_* must include it also on the 'autogen-modules' field besides 'exposed-modules' and 'other-modules'. This specifies that the module does not come with the package and is generated on setup. Modules built with a custom Setup.hs script also go here to ensure that commands like sdist don't fail.
 The filename ./my.cabal does not match package name (expected: AutogenModules.cabal)
 Note: the public hackage server would reject this package.
 Warning: Cannot run preprocessors. Run 'configure' command first.
diff --git a/cabal-testsuite/PackageTests/AutogenModules/Package/setup.test.hs b/cabal-testsuite/PackageTests/AutogenModules/Package/setup.test.hs
index cc65181fc8..eaf49da6cb 100644
--- a/cabal-testsuite/PackageTests/AutogenModules/Package/setup.test.hs
+++ b/cabal-testsuite/PackageTests/AutogenModules/Package/setup.test.hs
@@ -20,7 +20,7 @@ main = setupAndCabalTest $ do
                    "On benchmark 'Bench' an 'autogen-module' is not on "
                 ++ "'other-modules'"
         let pathsAutogenMsg =
-                "Packages using 'cabal-version: >= 2.0' and the autogenerated"
+                "Packages using 'cabal-version: 2.0' and the autogenerated"
 
         -- Asserts for the desired check messages after configure.
         assertOutputContains libAutogenMsg   configureResult
diff --git a/cabal-testsuite/PackageTests/AutogenModules/SrcDist/setup.test.hs b/cabal-testsuite/PackageTests/AutogenModules/SrcDist/setup.test.hs
index fdbbf818a1..c5fbcf26bf 100644
--- a/cabal-testsuite/PackageTests/AutogenModules/SrcDist/setup.test.hs
+++ b/cabal-testsuite/PackageTests/AutogenModules/SrcDist/setup.test.hs
@@ -51,7 +51,7 @@ main = setupAndCabalTest $ do
                    "On benchmark 'Bench' an 'autogen-module' is not on "
                 ++ "'other-modules'"
         let pathsAutogenMsg =
-                "Packages using 'cabal-version: >= 2.0' and the autogenerated"
+                "Packages using 'cabal-version: 2.0' and the autogenerated"
 
         -- Asserts for the undesired check messages after configure.
         assertOutputDoesNotContain libAutogenMsg   configureResult
-- 
GitLab