diff --git a/.typos-docs.toml b/.typos-docs.toml index ac4a9ab73d3..60a65ccac71 100644 --- a/.typos-docs.toml +++ b/.typos-docs.toml @@ -2,6 +2,7 @@ extend-exclude = [ "changelog.d/pr-11501.md", "changelog.d/pr-11602.md", + "changelog.d/pr-11621.md", ] [default] diff --git a/.typos-srcs.toml b/.typos-srcs.toml index 5a0f09e63ec..bdaebdeada6 100644 --- a/.typos-srcs.toml +++ b/.typos-srcs.toml @@ -58,4 +58,3 @@ fo = "fo" nto = "nto" # nto-qnx operating system dows = "dows" # win-dows bimap = "bimap" -explitic = "explitic" diff --git a/Cabal/src/Distribution/PackageDescription/Check.hs b/Cabal/src/Distribution/PackageDescription/Check.hs index f9fb9ec4a3d..1911b354312 100644 --- a/Cabal/src/Distribution/PackageDescription/Check.hs +++ b/Cabal/src/Distribution/PackageDescription/Check.hs @@ -520,7 +520,7 @@ checkPackageDescription ( isNothing setupBuildInfo_ && buildTypeRaw_ == Just Custom ) - (PackageDistSuspiciousWarn CVExpliticDepsCustomSetup) + (PackageDistSuspiciousWarn CVExplicitDepsCustomSetup) checkP (isNothing buildTypeRaw_ && specVersion_ < CabalSpecV2_2) (PackageBuildWarning NoBuildType) diff --git a/Cabal/src/Distribution/PackageDescription/Check/Warning.hs b/Cabal/src/Distribution/PackageDescription/Check/Warning.hs index 1bf4b8d3611..01958ffd695 100644 --- a/Cabal/src/Distribution/PackageDescription/Check/Warning.hs +++ b/Cabal/src/Distribution/PackageDescription/Check/Warning.hs @@ -244,7 +244,7 @@ data CheckExplanation | CVSourceRepository | CVExtensions CabalSpecVersion [Extension] | CVCustomSetup - | CVExpliticDepsCustomSetup + | CVExplicitDepsCustomSetup | CVAutogenPaths | CVAutogenPackageInfo | CVAutogenPackageInfoGuard @@ -411,7 +411,7 @@ data CheckExplanationID | CICVSourceRepository | CICVExtensions | CICVCustomSetup - | CICVExpliticDepsCustomSetup + | CICVExplicitDepsCustomSetup | CICVAutogenPaths | CICVAutogenPackageInfo | CICVAutogenPackageInfoGuard @@ -557,7 +557,7 @@ checkExplanationId (CVVirtualModules{}) = CICVVirtualModules checkExplanationId (CVSourceRepository{}) = CICVSourceRepository checkExplanationId (CVExtensions{}) = CICVExtensions checkExplanationId (CVCustomSetup{}) = CICVCustomSetup -checkExplanationId (CVExpliticDepsCustomSetup{}) = CICVExpliticDepsCustomSetup +checkExplanationId (CVExplicitDepsCustomSetup{}) = CICVExplicitDepsCustomSetup checkExplanationId (CVAutogenPaths{}) = CICVAutogenPaths checkExplanationId (CVAutogenPackageInfo{}) = CICVAutogenPackageInfo checkExplanationId (CVAutogenPackageInfoGuard{}) = CICVAutogenPackageInfoGuard @@ -710,7 +710,7 @@ ppCheckExplanationId CICVVirtualModules = "virtual-modules" ppCheckExplanationId CICVSourceRepository = "source-repository" ppCheckExplanationId CICVExtensions = "incompatible-extension" ppCheckExplanationId CICVCustomSetup = "no-setup-depends" -ppCheckExplanationId CICVExpliticDepsCustomSetup = "dependencies-setup" +ppCheckExplanationId CICVExplicitDepsCustomSetup = "dependencies-setup" ppCheckExplanationId CICVAutogenPaths = "no-autogen-paths" ppCheckExplanationId CICVAutogenPackageInfo = "no-autogen-pinfo" ppCheckExplanationId CICVAutogenPackageInfoGuard = "autogen-guard" @@ -1249,7 +1249,7 @@ ppExplanation CVCustomSetup = ++ "that specifies the dependencies of the Setup.hs script itself. " ++ "The 'setup-depends' field uses the same syntax as 'build-depends', " ++ "so a simple example would be 'setup-depends: base, Cabal'." -ppExplanation CVExpliticDepsCustomSetup = +ppExplanation CVExplicitDepsCustomSetup = "From version 1.24 cabal supports specifying explicit dependencies " ++ "for Custom setup scripts. Consider using 'cabal-version: 1.24' or " ++ "higher and adding a 'custom-setup' section with a 'setup-depends' " diff --git a/changelog.d/pr-11621.md b/changelog.d/pr-11621.md new file mode 100644 index 00000000000..3abb81c026e --- /dev/null +++ b/changelog.d/pr-11621.md @@ -0,0 +1,8 @@ +--- +synopsis: Fix typos explitic +packages: [Cabal] +prs: 11621 +--- + +Changes `CheckExplanation` constructor `CVExpliticDepsCustomSetup` and +`CheckExplanationID` constructor `CICVExpliticDepsCustomSetup`.