Skip to content

Commit 1dc62bf

Browse files
authored
Merge pull request #6693 from commercialhaskell/pkg-checks
`stack sdist`\`upload` identify Cabal version used to check packages
2 parents 6a98459 + f5a3eb9 commit 1dc62bf

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ Other enhancements:
3131
`install-msys` option in YAML configuration files.
3232
* Option `allow-newer-deps` is no longer classified as experimental in
3333
documentation.
34+
* `stack sdist` and `stack upload` report the version of Cabal (the library)
35+
being used to check packages.
3436

3537
Bug fixes:
3638

src/Stack/SDist.hs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ import qualified Distribution.PackageDescription.Check as Check
4242
import qualified Distribution.PackageDescription.Parsec as Cabal
4343
import Distribution.PackageDescription.PrettyPrint
4444
( showGenericPackageDescription )
45+
import Distribution.Simple.Utils ( cabalVersion )
4546
import Distribution.Version
4647
( earlierVersion, hasLowerBound, hasUpperBound, isAnyVersion
4748
, orLaterVersion, simplifyVersionRange
@@ -574,7 +575,8 @@ checkPackageInExtractedTarball pkgDir = do
574575
prettyInfoL
575576
[ flow "Checking package"
576577
, style Current (fromPackageName name)
577-
, flow "for common mistakes."
578+
, flow "for common mistakes using Cabal version"
579+
, fromString $ versionString cabalVersion <> "."
578580
]
579581
let pkgChecks =
580582
-- MSS 2017-12-12: Try out a few different variants of pkgDesc to try

0 commit comments

Comments
 (0)