Merge pull request #3825 from 23Skidoo/check-extra-doc-files

D.PD.Check: extra-doc-files only allowed when Cabal >= 1.18.
haskell · Sep 12, 2016 · 00e9a09 · 00e9a09
2 parents 5289f17 + 5b9dfcb
commit 00e9a09
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Cabal/Distribution/PackageDescription/Check.hs b/Cabal/Distribution/PackageDescription/Check.hs
@@ -985,6 +985,12 @@ checkCabalVersion pkg =
         ++ "different modules then list the other ones in the "
         ++ "'other-languages' field."
 
+  , checkVersion [1,18]
+    (not . null $ extraDocFiles pkg) $
+      PackageDistInexcusable $
+           "To use the 'extra-doc-files' field the package needs to specify "
+        ++ "at least 'cabal-version: >= 1.18'."
+
   , checkVersion [1,23]
     (not (null (subLibraries pkg))) $
       PackageDistInexcusable $

diff --git a/Cabal/Distribution/Types/BuildType.hs b/Cabal/Distribution/Types/BuildType.hs
@@ -46,4 +46,3 @@ instance Text BuildType where
       "Custom"    -> Custom
       "Make"      -> Make
       _           -> UnknownBuildType name
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -46,4 +46,3 @@ instance Text BuildType where
		"Custom" -> Custom
		"Make" -> Make
		_ -> UnknownBuildType name