From 642ab56ceb6da0b6f25e6553439a89ddcd817865 Mon Sep 17 00:00:00 2001 From: pho Date: Fri, 31 Jan 2025 03:55:34 +0000 Subject: [PATCH] devel/fourmolu: update to fourmolu-0.17.0.0 ## Fourmolu 0.17.0.0 * Add new `import-grouping` option to group imports with grouping rules specified in configuration ([#403](https://github.com/fourmolu/fourmolu/pull/403)) * Add new `sort-constraints` option to sort constraints alphabetically ([#433](https://github.com/fourmolu/fourmolu/pull/433)) * Add new `sort-derived-classes` option to sort classes in deriving clauses ([#434](https://github.com/fourmolu/fourmolu/pull/434)) * Add new `sort-derived-clauses` option to sort classes deriving clauses ([#434](https://github.com/fourmolu/fourmolu/pull/434)) * Add new `trailing-section-operators` option to disable trailing "section" operators (those that are `infixr 0`, such as `$`) ([#444](https://github.com/fourmolu/fourmolu/pull/444)) * Fix issue where `single-constraint-parens: never` would drop parentheses around implicit parameters ([#446](https://github.com/fourmolu/fourmolu/issues/446)) * Fix indentation for parenthesized expressions that start off the indentation column ([#428](https://github.com/fourmolu/fourmolu/issues/428)) * Allow multiline comments in indented contexts ([#65](https://github.com/fourmolu/fourmolu/issues/65)) ## Fourmolu 0.16.2.0 ### Upstream changes: #### Ormolu 0.7.7.0 * Use single-line layout for parens around single-line content. [Issue 1120](https://github.com/tweag/ormolu/issues/1120). * Allow function arguments to be on the same line even if the full type (with constraints and foralls) are on multiple lines. [PR 1125](https://github.com/tweag/ormolu/pull/1125). ## Fourmolu 0.16.1.0 ### Upstream changes: #### Ormolu 0.7.6.0 * Fix Haddock comments on infix constructors [Issue 758](https://github.com/tweag/ormolu/issues/758). * Don't require a trailing newline in `.ormolu` files. [Issue 1122](https://github.com/tweag/ormolu/issues/1122). * Remove unnecessary indentation from list comprehensions. [Issue 966](https://github.com/tweag/ormolu/issues/966). ## Fourmolu 0.16.0.0 * Allow specifying path to configuration file with `--config` ([#396](https://github.com/fourmolu/fourmolu/issues/396)) ### Upstream changes: #### Ormolu 0.7.5.0 * Switched to `ghc-lib-parser-9.10`, with the following new syntactic features/behaviors: * GHC proposal [#575](https://github.com/ghc-proposals/ghc-proposals/blob/10290a668608d608c3f6c6010be265cf7a02e1fc/proposals/0575-deprecated-instances.rst): deprecated instances. * GHC proposal [#281](https://github.com/ghc-proposals/ghc-proposals/blob/10290a668608d608c3f6c6010be265cf7a02e1fc/proposals/0281-visible-forall.rst): visible forall in types of terms. Enabled by `RequiredTypeArguments` (enabled by default). * `LinearTypes`: `let` and `where` bindings can now be linear, in particular have multiplicity annotations. * Using `forall` as an identifier is now a parse error. * GHC proposal [#65](https://github.com/ghc-proposals/ghc-proposals/blob/10290a668608d608c3f6c6010be265cf7a02e1fc/proposals/0065-type-infix.rst): namespacing fixity declarations for type names and WARNING/DEPRECATED pragmas. * `TypeAbstractions` now supports `@`-binders in lambdas and function equations. * Support for the `GHC2024` language. * Updated to `Cabal-syntax-3.12`. --- devel/fourmolu/Makefile | 21 ++++++++++----------- devel/fourmolu/PLIST | 14 +++++++++++++- devel/fourmolu/buildlink3.mk | 16 ++++++++-------- devel/fourmolu/distinfo | 8 ++++---- 4 files changed, 35 insertions(+), 24 deletions(-) diff --git a/devel/fourmolu/Makefile b/devel/fourmolu/Makefile index 8398abb164ff..9e51c9d48a75 100644 --- a/devel/fourmolu/Makefile +++ b/devel/fourmolu/Makefile @@ -1,32 +1,31 @@ -# $NetBSD: Makefile,v 1.12 2024/05/09 01:31:43 pho Exp $ +# $NetBSD: Makefile,v 1.13 2025/01/31 03:55:34 pho Exp $ -DISTNAME= fourmolu-0.15.0.0 +DISTNAME= fourmolu-0.17.0.0 PKGNAME= ${DISTNAME} -PKGREVISION= 1 CATEGORIES= devel MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Formatter for Haskell source code LICENSE= modified-bsd -HASKELL_UNRESTRICT_DEPENDENCIES+= \ - ansi-terminal - # lib:fourmolu -.include "../../converters/hs-aeson/buildlink3.mk" -.include "../../devel/hs-ansi-terminal/buildlink3.mk" .include "../../textproc/hs-Diff/buildlink3.mk" +.include "../../devel/hs-memotrie/buildlink3.mk" +.include "../../devel/hs-ansi-terminal/buildlink3.mk" +.include "../../devel/hs-choice/buildlink3.mk" .include "../../devel/hs-file-embed/buildlink3.mk" .include "../../devel/hs-ghc-lib-parser/buildlink3.mk" .include "../../textproc/hs-megaparsec/buildlink3.mk" -.include "../../devel/hs-memotrie/buildlink3.mk" -.include "../../math/hs-scientific/buildlink3.mk" .include "../../devel/hs-syb/buildlink3.mk" -.include "../../textproc/hs-yaml/buildlink3.mk" +.include "../../converters/hs-aeson/buildlink3.mk" +.include "../../math/hs-scientific/buildlink3.mk" # exe:fourmolu +.include "../../devel/hs-ghc-lib-parser/buildlink3.mk" .include "../../devel/hs-optparse-applicative/application.mk" .include "../../devel/hs-th-env/buildlink3.mk" +.include "../../devel/hs-terminal-size/buildlink3.mk" +.include "../../textproc/hs-yaml/buildlink3.mk" .include "../../mk/haskell.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/fourmolu/PLIST b/devel/fourmolu/PLIST index f67350bd9fb6..a5b7267b2358 100644 --- a/devel/fourmolu/PLIST +++ b/devel/fourmolu/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2024/05/03 09:21:00 pho Exp $ +@comment $NetBSD: PLIST,v 1.5 2025/01/31 03:55:34 pho Exp $ bin/fourmolu ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/GHC/DynFlags.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/GHC/DynFlags.hi @@ -12,6 +12,9 @@ ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Config.p_hi ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Config/Gen.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Config/Gen.hi ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Config/Gen.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Config/Types.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Config/Types.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Config/Types.p_hi ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Diff/ParseResult.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Diff/ParseResult.hi ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Diff/ParseResult.p_hi @@ -39,6 +42,9 @@ ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Fixity/Printer.p_hi ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Imports.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Imports.hi ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Imports.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Imports/Grouping.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Imports/Grouping.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Imports/Grouping.p_hi ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Parser.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Parser.hi ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Parser.p_hi @@ -156,6 +162,9 @@ ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Utils/Cabal.p_hi ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Utils/Fixity.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Utils/Fixity.hi ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Utils/Fixity.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Utils/Glob.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Utils/Glob.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Utils/Glob.p_hi ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Utils/IO.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Utils/IO.hi ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Ormolu/Utils/IO.p_hi @@ -178,6 +187,7 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Ormolu-Fixity-Internal.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Ormolu-Fixity-Parser.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Ormolu-Fixity-Printer.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Ormolu-Fixity.html +${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Ormolu-Imports-Grouping.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Ormolu-Imports.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Ormolu-Parser-CommentStream.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Ormolu-Parser-Pragma.html @@ -217,6 +227,7 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Ormolu-Terminal-QualifiedDo ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Ormolu-Terminal.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Ormolu-Utils-Cabal.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Ormolu-Utils-Fixity.html +${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Ormolu-Utils-Glob.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Ormolu-Utils-IO.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Ormolu-Utils.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Ormolu.html @@ -238,6 +249,7 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-M.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-N.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-O.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-P.html +${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-Q.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-R.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-S.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-T.html diff --git a/devel/fourmolu/buildlink3.mk b/devel/fourmolu/buildlink3.mk index 892f4d8a4ad2..1415ebcd0c5b 100644 --- a/devel/fourmolu/buildlink3.mk +++ b/devel/fourmolu/buildlink3.mk @@ -1,24 +1,24 @@ -# $NetBSD: buildlink3.mk,v 1.11 2024/05/09 01:31:43 pho Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2025/01/31 03:55:34 pho Exp $ BUILDLINK_TREE+= fourmolu .if !defined(FOURMOLU_BUILDLINK3_MK) FOURMOLU_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.fourmolu+= fourmolu>=0.15.0 -BUILDLINK_ABI_DEPENDS.fourmolu+= fourmolu>=0.15.0.0nb1 +BUILDLINK_API_DEPENDS.fourmolu+= fourmolu>=0.17.0 +BUILDLINK_ABI_DEPENDS.fourmolu+= fourmolu>=0.17.0.0 BUILDLINK_PKGSRCDIR.fourmolu?= ../../devel/fourmolu -.include "../../converters/hs-aeson/buildlink3.mk" -.include "../../devel/hs-ansi-terminal/buildlink3.mk" .include "../../textproc/hs-Diff/buildlink3.mk" +.include "../../devel/hs-memotrie/buildlink3.mk" +.include "../../devel/hs-ansi-terminal/buildlink3.mk" +.include "../../devel/hs-choice/buildlink3.mk" .include "../../devel/hs-file-embed/buildlink3.mk" .include "../../devel/hs-ghc-lib-parser/buildlink3.mk" .include "../../textproc/hs-megaparsec/buildlink3.mk" -.include "../../devel/hs-memotrie/buildlink3.mk" -.include "../../math/hs-scientific/buildlink3.mk" .include "../../devel/hs-syb/buildlink3.mk" -.include "../../textproc/hs-yaml/buildlink3.mk" +.include "../../converters/hs-aeson/buildlink3.mk" +.include "../../math/hs-scientific/buildlink3.mk" .endif # FOURMOLU_BUILDLINK3_MK BUILDLINK_TREE+= -fourmolu diff --git a/devel/fourmolu/distinfo b/devel/fourmolu/distinfo index d09b29f03508..8451eeebd4c2 100644 --- a/devel/fourmolu/distinfo +++ b/devel/fourmolu/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.5 2024/05/03 09:21:00 pho Exp $ +$NetBSD: distinfo,v 1.6 2025/01/31 03:55:34 pho Exp $ -BLAKE2s (fourmolu-0.15.0.0.tar.gz) = cbdec50787223df8ebe1f2610efa33fc92af6caba4c49f26ed23e549b851ef55 -SHA512 (fourmolu-0.15.0.0.tar.gz) = 8e98577cb7c091641b32db04ddd12b10f5c0095b11ff028eb317d60f35975626026c3156dc85b654ba9e2625c1c0da5e9b682b9ffb68e954c6ebb7c9e16f3962 -Size (fourmolu-0.15.0.0.tar.gz) = 409507 bytes +BLAKE2s (fourmolu-0.17.0.0.tar.gz) = 303751bbd40bf229c307156ade4586ba0c16bc88af645a907b717ebae88e5fdc +SHA512 (fourmolu-0.17.0.0.tar.gz) = 7aab8a9b3fb93703a83165098b1ddec2198d6d280584160afdb6037b6f76c7907bd0fd8e247b3a92ca8c110ab14ccab67c1d64a024bd63546b799c8bb8b3b576 +Size (fourmolu-0.17.0.0.tar.gz) = 431703 bytes