hpack 0.34.6 → 0.34.7
raw patch · 4 files changed
+21/−12 lines, 4 filesdep ~CabalPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: Cabal
API changes (from Hackage documentation)
Files
- CHANGELOG.md +5/−0
- hpack.cabal +8/−8
- src/Hpack/Config.hs +3/−3
- src/Hpack/Render.hs +5/−1
CHANGELOG.md view
@@ -1,3 +1,8 @@+## Changes in 0.34.7+ - Support `Cabal-3.6.*`+ - Make sure that verbatim `import` fields are rendered at the beginning of+ a section (see #486)+ ## Changes in 0.34.6 - Add `Paths_` module to `autogen-modules` when `cabal-version >= 2`
hpack.cabal view
@@ -1,11 +1,11 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.5.+-- This file has been generated from package.yaml by hpack version 0.34.6. -- -- see: https://github.com/sol/hpack name: hpack-version: 0.34.6+version: 0.34.7 synopsis: A modern format for Haskell packages description: See README at <https://github.com/sol/hpack#readme> category: Development@@ -25,9 +25,9 @@ library hs-source-dirs: src- ghc-options: -Wall+ ghc-options: -Wall -fno-warn-incomplete-uni-patterns build-depends:- Cabal >=3.0.0.0 && <3.6+ Cabal >=3.0.0.0 && <3.7 , Glob >=0.9.0 , aeson >=1.4.3.0 , base >=4.9 && <5@@ -86,9 +86,9 @@ main-is: Main.hs hs-source-dirs: driver- ghc-options: -Wall+ ghc-options: -Wall -fno-warn-incomplete-uni-patterns build-depends:- Cabal >=3.0.0.0 && <3.6+ Cabal >=3.0.0.0 && <3.7 , Glob >=0.9.0 , aeson >=1.4.3.0 , base >=4.9 && <5@@ -121,10 +121,10 @@ hs-source-dirs: test src- ghc-options: -Wall+ ghc-options: -Wall -fno-warn-incomplete-uni-patterns cpp-options: -DTEST build-depends:- Cabal >=3.0.0.0 && <3.6+ Cabal >=3.0.0.0 && <3.7 , Glob >=0.9.0 , HUnit >=1.6.0.0 , QuickCheck
src/Hpack/Config.hs view
@@ -524,11 +524,11 @@ y : x : [] -> x ++ " or " ++ y x : ys@(_:_:_) -> intercalate ", " . reverse $ ("or " ++ x) : ys -type SectionConfigWithDefaluts cSources cxxSources jsSources a = Product DefaultsConfig (WithCommonOptions cSources cxxSources jsSources a)+type SectionConfigWithDefaults cSources cxxSources jsSources a = Product DefaultsConfig (WithCommonOptions cSources cxxSources jsSources a) type PackageConfigWithDefaults cSources cxxSources jsSources = PackageConfig_- (SectionConfigWithDefaluts cSources cxxSources jsSources LibrarySection)- (SectionConfigWithDefaluts cSources cxxSources jsSources ExecutableSection)+ (SectionConfigWithDefaults cSources cxxSources jsSources LibrarySection)+ (SectionConfigWithDefaults cSources cxxSources jsSources ExecutableSection) type PackageConfig cSources cxxSources jsSources = PackageConfig_ (WithCommonOptions cSources cxxSources jsSources LibrarySection)
src/Hpack/Render.hs view
@@ -44,7 +44,8 @@ import Hpack.Util import Hpack.Config import Hpack.Render.Hints-import Hpack.Render.Dsl+import Hpack.Render.Dsl hiding (sortFieldsBy)+import qualified Hpack.Render.Dsl as Dsl renderPackage :: [String] -> Package -> String renderPackage oldCabalFile = renderPackageWith settings alignment formattingHintsFieldOrder formattingHintsSectionsFieldOrder@@ -415,3 +416,6 @@ needsQuoting :: FilePath -> Bool needsQuoting = any (\x -> isSpace x || x == ',')++sortFieldsBy :: [String] -> [Element] -> [Element]+sortFieldsBy existingFieldOrder = Dsl.sortFieldsBy ("import" : existingFieldOrder)