package-constraints by package file

Cabal-syntax/src/Distribution/CabalSpecVersion.hs

@@ -32,7 +32,8 @@ data CabalSpecVersion
     CabalSpecV3_4
   | CabalSpecV3_6
   | CabalSpecV3_8
-  -- 3.10: no changes
+  | -- 3.10 -- 3.11: no changes
+    CabalSpecV3_12
   deriving (Eq, Ord, Show, Read, Enum, Bounded, Typeable, Data, Generic)
 
 instance Binary CabalSpecVersion
@@ -43,6 +44,7 @@ instance NFData CabalSpecVersion where rnf = genericRnf
 --
 -- @since 3.0.0.0
 showCabalSpecVersion :: CabalSpecVersion -> String
+showCabalSpecVersion CabalSpecV3_12 = "3.12"
 showCabalSpecVersion CabalSpecV3_8 = "3.8"
 showCabalSpecVersion CabalSpecV3_6 = "3.6"
 showCabalSpecVersion CabalSpecV3_4 = "3.4"
@@ -63,13 +65,14 @@ showCabalSpecVersion CabalSpecV1_2 = "1.2"
 showCabalSpecVersion CabalSpecV1_0 = "1.0"
 
 cabalSpecLatest :: CabalSpecVersion
-cabalSpecLatest = CabalSpecV3_8
+cabalSpecLatest = CabalSpecV3_12
 
 -- | Parse 'CabalSpecVersion' from version digits.
 --
 -- It may fail if for recent versions the version is not exact.
 cabalSpecFromVersionDigits :: [Int] -> Maybe CabalSpecVersion
 cabalSpecFromVersionDigits v
+  | v == [3, 12] = Just CabalSpecV3_12
   | v == [3, 8] = Just CabalSpecV3_8
   | v == [3, 6] = Just CabalSpecV3_6
   | v == [3, 4] = Just CabalSpecV3_4
@@ -92,6 +95,7 @@ cabalSpecFromVersionDigits v
 
 -- | @since 3.4.0.0
 cabalSpecToVersionDigits :: CabalSpecVersion -> [Int]
+cabalSpecToVersionDigits CabalSpecV3_12 = [3, 12]
 cabalSpecToVersionDigits CabalSpecV3_8 = [3, 8]
 cabalSpecToVersionDigits CabalSpecV3_6 = [3, 6]
 cabalSpecToVersionDigits CabalSpecV3_4 = [3, 4]

Cabal-syntax/src/Distribution/PackageDescription/FieldGrammar.hs

@@ -104,6 +104,7 @@ packageDescriptionFieldGrammar
      , c (List FSep (Identity (SymbolicPath PackageDir LicenseFile)) (SymbolicPath PackageDir LicenseFile))
      , c (List FSep TestedWith (CompilerFlavor, VersionRange))
      , c (List VCat FilePathNT String)
+     , c (List CommaVCat (Identity Dependency) Dependency)
      , c FilePathNT
      , c CompatLicenseFile
      , c CompatFilePath
@@ -146,6 +147,8 @@ packageDescriptionFieldGrammar =
     <*> monoidalFieldAla "extra-source-files" formatExtraSourceFiles L.extraSrcFiles
     <*> monoidalFieldAla "extra-tmp-files" (alaList' VCat FilePathNT) L.extraTmpFiles
     <*> monoidalFieldAla "extra-doc-files" (alaList' VCat FilePathNT) L.extraDocFiles
+    <*> monoidalFieldAla "package-constraints" formatDependencyList L.packageConstraints
+      ^^^ availableSince CabalSpecV3_12 []
   where
     packageIdentifierGrammar =
       PackageIdentifier

Cabal-syntax/src/Distribution/PackageDescription/Parsec.hs

@@ -240,7 +240,7 @@ goSections specVer = traverse_ process
     process (Field (Name pos name) _) =
       lift $
         parseWarning pos PWTTrailingFields $
-          "Ignoring trailing fields after sections: " ++ show name
+          "Ignoring trailing fields after sections: " ++ show name ++ ". Consider moving these fields before any stanzas in your cabal file."
     process (Section name args secFields) =
       parseSection name args secFields
 

Cabal-syntax/src/Distribution/Types/PackageDescription.hs

@@ -146,6 +146,8 @@ data PackageDescription = PackageDescription
   , extraSrcFiles :: [FilePath]
   , extraTmpFiles :: [FilePath]
   , extraDocFiles :: [FilePath]
+  , -- default constraints to override unversioned dependencies
+    packageConstraints :: [Dependency]
   }
   deriving (Generic, Show, Read, Eq, Ord, Typeable, Data)
 
@@ -232,6 +234,7 @@ emptyPackageDescription =
     , extraSrcFiles = []
     , extraTmpFiles = []
     , extraDocFiles = []
+    , packageConstraints = []
     }
 
 -- ---------------------------------------------------------------------------
@@ -488,6 +491,7 @@ instance L.HasBuildInfos PackageDescription where
         a22
         a23
         a24
+        a25
       ) =
       PackageDescription a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18 a19
         <$> (traverse . L.buildInfo) f x1 -- library
@@ -501,3 +505,4 @@ instance L.HasBuildInfos PackageDescription where
         <*> pure a22 -- extra src files
         <*> pure a23 -- extra temp files
         <*> pure a24 -- extra doc files
+        <*> pure a25 -- default constraints

Cabal-syntax/src/Distribution/Types/PackageDescription/Lens.hs

@@ -19,6 +19,7 @@ import Distribution.Types.Benchmark.Lens (benchmarkBuildInfo, benchmarkName)
 import Distribution.Types.BuildInfo (BuildInfo)
 import Distribution.Types.BuildType (BuildType)
 import Distribution.Types.ComponentName (ComponentName (..))
+import Distribution.Types.Dependency (Dependency (..))
 import Distribution.Types.Executable (Executable, exeModules)
 import Distribution.Types.Executable.Lens (exeBuildInfo, exeName)
 import Distribution.Types.ForeignLib (ForeignLib, foreignLibModules)
@@ -158,6 +159,10 @@ extraDocFiles :: Lens' PackageDescription [String]
 extraDocFiles f s = fmap (\x -> s{T.extraDocFiles = x}) (f (T.extraDocFiles s))
 {-# INLINE extraDocFiles #-}
 
+packageConstraints :: Lens' PackageDescription [Dependency]
+packageConstraints f s = fmap (\x -> s{T.packageConstraints = x}) (f (T.packageConstraints s))
+{-# INLINE packageConstraints #-}
+
 -- | @since 3.0.0.0
 allLibraries :: Traversal' PackageDescription Library
 allLibraries f pd = mk <$> traverse f (T.library pd) <*> traverse f (T.subLibraries pd)

Cabal-tests/tests/ParserTests/regressions/Octree-0.5.expr

@@ -66,7 +66,8 @@ GenericPackageDescription {
     dataDir = ".",
     extraSrcFiles = [],
     extraTmpFiles = [],
-    extraDocFiles = []},
+    extraDocFiles = [],
+    packageConstraints = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   condLibrary = Just

Cabal-tests/tests/ParserTests/regressions/anynone.expr

@@ -32,7 +32,8 @@ GenericPackageDescription {
     dataDir = ".",
     extraSrcFiles = [],
     extraTmpFiles = [],
-    extraDocFiles = []},
+    extraDocFiles = [],
+    packageConstraints = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   condLibrary = Just

Cabal-tests/tests/ParserTests/regressions/big-version.expr

@@ -34,7 +34,8 @@ GenericPackageDescription {
     dataDir = ".",
     extraSrcFiles = [],
     extraTmpFiles = [],
-    extraDocFiles = []},
+    extraDocFiles = [],
+    packageConstraints = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   condLibrary = Just

Cabal-tests/tests/ParserTests/regressions/common-conditional.expr

@@ -44,7 +44,8 @@ GenericPackageDescription {
     dataDir = ".",
     extraSrcFiles = [],
     extraTmpFiles = [],
-    extraDocFiles = []},
+    extraDocFiles = [],
+    packageConstraints = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [
     MkPackageFlag {

Cabal-tests/tests/ParserTests/regressions/common.expr

@@ -47,7 +47,8 @@ GenericPackageDescription {
     dataDir = ".",
     extraSrcFiles = [],
     extraTmpFiles = [],
-    extraDocFiles = []},
+    extraDocFiles = [],
+    packageConstraints = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   condLibrary = Just

Cabal-tests/tests/ParserTests/regressions/common2.expr

@@ -43,7 +43,8 @@ GenericPackageDescription {
     dataDir = ".",
     extraSrcFiles = [],
     extraTmpFiles = [],
-    extraDocFiles = []},
+    extraDocFiles = [],
+    packageConstraints = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   condLibrary = Just

Cabal-tests/tests/ParserTests/regressions/common3.expr

@@ -47,7 +47,8 @@ GenericPackageDescription {
     dataDir = ".",
     extraSrcFiles = [],
     extraTmpFiles = [],
-    extraDocFiles = []},
+    extraDocFiles = [],
+    packageConstraints = []},
   gpdScannedVersion = Nothing,
   genPackageFlags = [],
   condLibrary = Just