Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6D61E85AA3 for ; Tue, 31 Oct 2023 08:46:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id EzvorHZCrl2d for ; Tue, 31 Oct 2023 08:46:24 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id BB59585AA4 for ; Tue, 31 Oct 2023 08:46:24 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B4D48FADC; Tue, 31 Oct 2023 08:46:24 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_169874198424510" MIME-Version: 1.0 Date: Tue, 31 Oct 2023 08:46:24 +0000 From: "Masatake Daimon" Subject: CVS commit: pkgsrc/lang/dhall To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: pho@netbsd.org X-Mailer: log_accum Message-Id: <20231031084624.B4D48FADC@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_169874198424510 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: pho Date: Tue Oct 31 08:46:24 UTC 2023 Modified Files: pkgsrc/lang/dhall: Makefile PLIST buildlink3.mk distinfo Added Files: pkgsrc/lang/dhall/patches: patch-dhall.cabal patch-src_Dhall_DirectoryTree.hs patch-src_Dhall_TH.hs Log Message: lang/dhall: Update to 1.42.0 1.42.0 * Supports standard version 23.0.0 - BREAKING CHANGE TO THE API AND LANGUAGE: Language support for Bytes literals * This is a breaking change to the API due to adding new Bytes and BytesLiteral constructors to the Expr type * This is a breaking change to the language now that Bytes is a reserved identifier - BREAKING CHANGE TO THE API AND LANGUAGE: New {Date,Time,TimeZone}/show builtins * This is a breaking change to the API due to adding new {Date,Time,TimeZone}Show constructors to the Expr type * This is a breaking change to the language now that {Date,Time,TimeZone}/show are not reserved identifiers * BREAKING CHANGE: dhall lint no longer sorts let bindings - This had to be removed because the old behavior was not always correct - The old behavior would sometimes change the behavior of a Dhall program or break the program - Out of an abundance of caution we're disabling the feature until it can be properly fixed (which is't trivial) * BUG FIX: Fix pretty-printing of Time literals - The pretty-printer was stripping leading zeros from the fractional component of seconds * BUG FIX: Fix custom normalizers to work for things other than functions - Before this change you could extend the language with custom functions, but not custom values (e.g. foo = 1) * BUG FIX: Don't URL encode path components - The pretty-printer was URL-encoding path components, which is not correct (according to the standard) - URL path components are supposed to be already URL-encoded by the user and left undisturbed by the interpreter (which is now what it correctly does) * New dhall package command: #2478, #2508 - This command makes it easier to turn a directory full of Dhall expressions into a dhall package (e.g. package.dhall) * Improved dhall to-directory-tree subcommand - The dhall to-directory-tree subcommand now optionally supports specifying metadata for generated paths - For a worked example, see: https://github.com/dhall-lang/dhall-haskell/blob/main/dhall/examples/to-directory-tree.dhall * dhall freeze --cache --all is now idempotent: #2486, #2500 - Before this change a second run would fail due to attempting to resolve the missing import it would generate * New Template Haskell options for adding strictness annotations to generated Haskell types * Template Haskell can now generate higher-kinded Haskell types from higher-kinded Dhall types * New Dhall.Freeze utilities for working with custom evaluators * Add Data instances for Import and various other types * Add Eq instances for InvalidDecoder and ExtractError To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/dhall/Makefile \ pkgsrc/lang/dhall/buildlink3.mk cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/dhall/PLIST cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/dhall/distinfo cvs rdiff -u -r0 -r1.4 pkgsrc/lang/dhall/patches/patch-dhall.cabal cvs rdiff -u -r0 -r1.1 \ pkgsrc/lang/dhall/patches/patch-src_Dhall_DirectoryTree.hs \ pkgsrc/lang/dhall/patches/patch-src_Dhall_TH.hs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_169874198424510 Content-Disposition: inline Content-Length: 16094 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/dhall/Makefile diff -u pkgsrc/lang/dhall/Makefile:1.7 pkgsrc/lang/dhall/Makefile:1.8 --- pkgsrc/lang/dhall/Makefile:1.7 Mon Oct 9 04:54:37 2023 +++ pkgsrc/lang/dhall/Makefile Tue Oct 31 08:46:24 2023 @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2023/10/09 04:54:37 pho Exp $ +# $NetBSD: Makefile,v 1.8 2023/10/31 08:46:24 pho Exp $ -DISTNAME= dhall-1.41.2 +DISTNAME= dhall-1.42.0 PKGNAME= ${DISTNAME} -PKGREVISION= 2 CATEGORIES= lang MAINTAINER= pkgsrc-users@NetBSD.org @@ -10,7 +9,12 @@ COMMENT= Configuration language guarante LICENSE= modified-bsd HASKELL_UNRESTRICT_DEPENDENCIES+= \ - template-haskell + Diff \ + aeson \ + ansi-terminal \ + optparse-applicative \ + template-haskell \ + unix-compat # If bin/dhall is to be linked dynamically, it will depend on more than 140 # shared objects and the dynamic linker will spend more than a second to @@ -59,8 +63,8 @@ HASKELL_ENABLE_DYNAMIC_EXECUTABLE= no .include "../../textproc/hs-text-manipulate/buildlink3.mk" .include "../../textproc/hs-text-short/buildlink3.mk" .include "../../devel/hs-th-lift-instances/buildlink3.mk" +.include "../../devel/hs-unix-compat/buildlink3.mk" .include "../../devel/hs-unordered-containers/buildlink3.mk" -.include "../../net/hs-uri-encode/buildlink3.mk" .include "../../devel/hs-vector/buildlink3.mk" .include "../../security/hs-cryptohash-sha256/buildlink3.mk" .include "../../www/hs-http-client/buildlink3.mk" Index: pkgsrc/lang/dhall/buildlink3.mk diff -u pkgsrc/lang/dhall/buildlink3.mk:1.7 pkgsrc/lang/dhall/buildlink3.mk:1.8 --- pkgsrc/lang/dhall/buildlink3.mk:1.7 Mon Oct 9 04:54:37 2023 +++ pkgsrc/lang/dhall/buildlink3.mk Tue Oct 31 08:46:24 2023 @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.7 2023/10/09 04:54:37 pho Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2023/10/31 08:46:24 pho Exp $ BUILDLINK_TREE+= dhall .if !defined(DHALL_BUILDLINK3_MK) DHALL_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.dhall+= dhall>=1.41.2 -BUILDLINK_ABI_DEPENDS.dhall+= dhall>=1.41.2nb2 +BUILDLINK_API_DEPENDS.dhall+= dhall>=1.42.0 +BUILDLINK_ABI_DEPENDS.dhall+= dhall>=1.42.0 BUILDLINK_PKGSRCDIR.dhall?= ../../lang/dhall .include "../../converters/hs-aeson/buildlink3.mk" @@ -42,8 +42,8 @@ BUILDLINK_PKGSRCDIR.dhall?= ../../lang/d .include "../../textproc/hs-text-manipulate/buildlink3.mk" .include "../../textproc/hs-text-short/buildlink3.mk" .include "../../devel/hs-th-lift-instances/buildlink3.mk" +.include "../../devel/hs-unix-compat/buildlink3.mk" .include "../../devel/hs-unordered-containers/buildlink3.mk" -.include "../../net/hs-uri-encode/buildlink3.mk" .include "../../devel/hs-vector/buildlink3.mk" .include "../../security/hs-cryptohash-sha256/buildlink3.mk" .include "../../www/hs-http-client/buildlink3.mk" Index: pkgsrc/lang/dhall/PLIST diff -u pkgsrc/lang/dhall/PLIST:1.2 pkgsrc/lang/dhall/PLIST:1.3 --- pkgsrc/lang/dhall/PLIST:1.2 Sun Jan 29 12:16:06 2023 +++ pkgsrc/lang/dhall/PLIST Tue Oct 31 08:46:24 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2023/01/29 12:16:06 pho Exp $ +@comment $NetBSD: PLIST,v 1.3 2023/10/31 08:46:24 pho Exp $ bin/dhall lib/${PKGNAME}/${HS_VERSION}/package-description lib/${PKGNAME}/${HS_VERSION}/package-id @@ -26,6 +26,9 @@ ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKG ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/DirectoryTree.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/DirectoryTree.hi ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/DirectoryTree.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/DirectoryTree/Types.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/DirectoryTree/Types.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/DirectoryTree/Types.p_hi ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Eval.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Eval.hi ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Eval.p_hi @@ -74,6 +77,9 @@ ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKG ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Optics.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Optics.hi ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Optics.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Package.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Package.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Package.p_hi ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Parser.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Parser.hi ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Parser.p_hi @@ -110,6 +116,78 @@ ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKG ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax.hi ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Binding.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Binding.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Binding.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Chunks.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Chunks.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Chunks.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Const.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Const.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Const.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Expr.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Expr.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Expr.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/FunctionBinding.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/FunctionBinding.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/FunctionBinding.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Import.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Import.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Import.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Applicative.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Applicative.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Applicative.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Bifunctor.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Bifunctor.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Bifunctor.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Data.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Data.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Data.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Eq.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Eq.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Eq.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Foldable.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Foldable.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Foldable.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Functor.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Functor.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Functor.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Lift.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Lift.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Lift.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Monad.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Monad.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Monad.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/NFData.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/NFData.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/NFData.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Ord.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Ord.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Ord.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Pretty.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Pretty.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Pretty.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Show.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Show.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Show.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Traversable.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Traversable.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Instances/Traversable.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/MultiLet.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/MultiLet.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/MultiLet.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Operations.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Operations.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Operations.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/RecordField.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/RecordField.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/RecordField.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Types.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Types.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Types.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Var.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Var.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/Syntax/Var.p_hi ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/TH.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/TH.hi ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Dhall/TH.p_hi @@ -137,7 +215,7 @@ ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKG lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a ${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so -${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/LICENSE +share/doc/${HS_PLATFORM}/${PKGNAME}/LICENSE ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Dhall-Binary.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Dhall-Context.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Dhall-Core.html @@ -154,6 +232,7 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/${P ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Dhall-Marshal-Decode.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Dhall-Marshal-Encode.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Dhall-Optics.html +${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Dhall-Package.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Dhall-Parser-Expression.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Dhall-Parser-Token.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Dhall-Parser.html @@ -201,10 +280,12 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/${P ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-X.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-Z.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index.html +${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index.json ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/haddock-bundle.min.js ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/index.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/linuwial.css ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/meta.json ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/quick-jump.css +${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/quick-jump.min.js ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/synopsis.png share/${HS_PLATFORM}/${PKGNAME}/man/dhall.1 Index: pkgsrc/lang/dhall/distinfo diff -u pkgsrc/lang/dhall/distinfo:1.3 pkgsrc/lang/dhall/distinfo:1.4 --- pkgsrc/lang/dhall/distinfo:1.3 Sun Jan 29 12:16:06 2023 +++ pkgsrc/lang/dhall/distinfo Tue Oct 31 08:46:24 2023 @@ -1,5 +1,8 @@ -$NetBSD: distinfo,v 1.3 2023/01/29 12:16:06 pho Exp $ +$NetBSD: distinfo,v 1.4 2023/10/31 08:46:24 pho Exp $ -BLAKE2s (dhall-1.41.2.tar.gz) = 83d484695a9c44b671dae76589761f4b6541d03e5c6e4640d2bf94e164c4644d -SHA512 (dhall-1.41.2.tar.gz) = d2d1b0f513f02f8eb9bc25d0e01a1e749c09eb4089a0982b1ea20f18ff598932b62c898e764167f74718dc71aabe5760ce2e0abe0fe550cb7f1b3ac773219f9a -Size (dhall-1.41.2.tar.gz) = 640162 bytes +BLAKE2s (dhall-1.42.0.tar.gz) = b55b4e30a9dfcc4f99254e53549814ee36cbf28f579356cafe6e420d4660661d +SHA512 (dhall-1.42.0.tar.gz) = 3f576245a8bf910e711e239eae0c6403c62e29a1571895b895fdb37e4c4724b10874865b76723eebd2ea82169f1120d28828fd3d57a6e0aaffa0c8552ec2c799 +Size (dhall-1.42.0.tar.gz) = 672458 bytes +SHA1 (patch-dhall.cabal) = 414cd99f8f5ba3012abd9e7f468f08003cf93623 +SHA1 (patch-src_Dhall_DirectoryTree.hs) = ec856ffbf1d6d37f8f4ebefe9e6ed06f3547e734 +SHA1 (patch-src_Dhall_TH.hs) = 60964cbdca32e38a8eede1fdcc59f1b69c940bf9 Added files: Index: pkgsrc/lang/dhall/patches/patch-dhall.cabal diff -u /dev/null pkgsrc/lang/dhall/patches/patch-dhall.cabal:1.4 --- /dev/null Tue Oct 31 08:46:24 2023 +++ pkgsrc/lang/dhall/patches/patch-dhall.cabal Tue Oct 31 08:46:24 2023 @@ -0,0 +1,14 @@ +$NetBSD: patch-dhall.cabal,v 1.4 2023/10/31 08:46:24 pho Exp $ + +No idea why but System.PosixCompat.User from unix-compat has been removed. + +--- dhall.cabal.orig 2023-10-31 08:37:22.860855117 +0000 ++++ dhall.cabal +@@ -251,6 +251,7 @@ Common common + th-lift-instances >= 0.1.13 && < 0.2 , + time >= 1.9 && < 1.13, + transformers >= 0.5.2.0 && < 0.7 , ++ unix, + unix-compat, + unordered-containers >= 0.1.3.0 && < 0.3 , + vector >= 0.11.0.0 && < 0.14 Index: pkgsrc/lang/dhall/patches/patch-src_Dhall_DirectoryTree.hs diff -u /dev/null pkgsrc/lang/dhall/patches/patch-src_Dhall_DirectoryTree.hs:1.1 --- /dev/null Tue Oct 31 08:46:24 2023 +++ pkgsrc/lang/dhall/patches/patch-src_Dhall_DirectoryTree.hs Tue Oct 31 08:46:24 2023 @@ -0,0 +1,16 @@ +$NetBSD: patch-src_Dhall_DirectoryTree.hs,v 1.1 2023/10/31 08:46:24 pho Exp $ + +No idea why but System.PosixCompat.User from unix-compat has been removed. + +--- src/Dhall/DirectoryTree.hs.orig 2023-10-31 08:26:39.723875281 +0000 ++++ src/Dhall/DirectoryTree.hs +@@ -54,8 +54,8 @@ import qualified Prettyprinter + import qualified Prettyprinter.Render.String as Pretty + import qualified System.Directory as Directory + import qualified System.FilePath as FilePath ++import qualified System.Posix.User as Posix + import qualified System.PosixCompat.Files as Posix +-import qualified System.PosixCompat.User as Posix + + {-| Attempt to transform a Dhall record into a directory tree where: + Index: pkgsrc/lang/dhall/patches/patch-src_Dhall_TH.hs diff -u /dev/null pkgsrc/lang/dhall/patches/patch-src_Dhall_TH.hs:1.1 --- /dev/null Tue Oct 31 08:46:24 2023 +++ pkgsrc/lang/dhall/patches/patch-src_Dhall_TH.hs Tue Oct 31 08:46:24 2023 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_Dhall_TH.hs,v 1.1 2023/10/31 08:46:24 pho Exp $ + +Fix build with GHC 9.6 (template-haskell-2.20.0.0). + +--- src/Dhall/TH.hs.orig 2023-10-31 08:15:53.407444449 +0000 ++++ src/Dhall/TH.hs +@@ -263,7 +263,7 @@ toDeclaration generateOptions@GenerateOp + + interpretOptions = generateToInterpretOptions generateOptions typ + +- toTypeVar (V n i) = Syntax.PlainTV $ Syntax.mkName (Text.unpack n ++ show i) ++ toTypeVar (V n i) = Syntax.PlainTV (Syntax.mkName (Text.unpack n ++ show i)) () + + toDataD typeName typeParams constructors = do + let name = Syntax.mkName (Text.unpack typeName) --_----------=_169874198424510--