Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 1215D1A9239 for ; Sat, 12 Feb 2022 05:03:45 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 38A7484EAD; Sat, 12 Feb 2022 05:03:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7248E84D17 for ; Sat, 12 Feb 2022 05:03:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id EAgOKSoBfI77 for ; Sat, 12 Feb 2022 05:03:42 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 8FFEB84D10 for ; Sat, 12 Feb 2022 05:03:42 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 89461FB24; Sat, 12 Feb 2022 05:03:42 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1644642222287880" MIME-Version: 1.0 Date: Sat, 12 Feb 2022 05:03:42 +0000 From: "Masatake Daimon" Subject: CVS commit: pkgsrc/time/hs-time-compat To: pkgsrc-changes@NetBSD.org Reply-To: pho@netbsd.org X-Mailer: log_accum Message-Id: <20220212050342.89461FB24@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1644642222287880 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: pho Date: Sat Feb 12 05:03:42 UTC 2022 Modified Files: pkgsrc/time/hs-time-compat: Makefile buildlink3.mk distinfo pkgsrc/time/hs-time-compat/patches: patch-time-compat.cabal Log Message: Update to time-compat-1.9.6.1 1.9.6.1 * Support time-1.12. 1.9.6 * Move Hashable instance here from hashable-time package. Note: ZonedTime instance is dropped, as ZonedTime doesn't have Eq instance. * Drop GHC-7.0 and GHC-7.2 support. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 pkgsrc/time/hs-time-compat/Makefile \ pkgsrc/time/hs-time-compat/distinfo cvs rdiff -u -r1.4 -r1.5 pkgsrc/time/hs-time-compat/buildlink3.mk cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/time/hs-time-compat/patches/patch-time-compat.cabal Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1644642222287880 Content-Disposition: inline Content-Length: 4739 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/time/hs-time-compat/Makefile diff -u pkgsrc/time/hs-time-compat/Makefile:1.5 pkgsrc/time/hs-time-compat/Makefile:1.6 --- pkgsrc/time/hs-time-compat/Makefile:1.5 Tue Jan 18 02:48:30 2022 +++ pkgsrc/time/hs-time-compat/Makefile Sat Feb 12 05:03:42 2022 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2022/01/18 02:48:30 pho Exp $ +# $NetBSD: Makefile,v 1.6 2022/02/12 05:03:42 pho Exp $ -DISTNAME= time-compat-1.9.5 -PKGREVISION= 2 +DISTNAME= time-compat-1.9.6.1 CATEGORIES= time MAINTAINER= pho@cielonegro.org @@ -10,7 +9,6 @@ LICENSE= modified-bsd .include "../../mk/haskell.mk" .include "../../devel/hs-base-orphans/buildlink3.mk" -.include "../../devel/hs-fail/buildlink3.mk" -.include "../../devel/hs-old-locale/buildlink3.mk" +.include "../../devel/hs-hashable/buildlink3.mk" .include "../../math/hs-semigroups/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/time/hs-time-compat/distinfo diff -u pkgsrc/time/hs-time-compat/distinfo:1.5 pkgsrc/time/hs-time-compat/distinfo:1.6 --- pkgsrc/time/hs-time-compat/distinfo:1.5 Tue Oct 26 11:24:21 2021 +++ pkgsrc/time/hs-time-compat/distinfo Sat Feb 12 05:03:42 2022 @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.5 2021/10/26 11:24:21 nia Exp $ +$NetBSD: distinfo,v 1.6 2022/02/12 05:03:42 pho Exp $ -BLAKE2s (time-compat-1.9.5.tar.gz) = 9c2eef9f1560695a5aeb571af003291dac2900f924a7b676ab70aaf6830f91a0 -SHA512 (time-compat-1.9.5.tar.gz) = c5e61242140c5bca4ca3b8e6f9f1058128cce40ac77ed3009a82d511b3ac9c0a2423bf0de1369c49e65a22fb8d864b1c9351994730951e5e302c5d17f131db83 -Size (time-compat-1.9.5.tar.gz) = 59336 bytes -SHA1 (patch-time-compat.cabal) = 71cbb0962b885cc007ebcba893d5be0f90686918 +BLAKE2s (time-compat-1.9.6.1.tar.gz) = 8a3268b3a48c7692ae50f0dc6003d144614d1816edad371b8c464baa9cd2e553 +SHA512 (time-compat-1.9.6.1.tar.gz) = ca0b19aa5e7948fd7d9fbd8ff5e1b0f93a2d8d410d515e7078b40370e7d9fc363c111d53551d57a0320efb0894bcc2210afa8fc04da9f003ded626f53b7e58ea +Size (time-compat-1.9.6.1.tar.gz) = 59964 bytes +SHA1 (patch-time-compat.cabal) = 056f2f13e0cb56d81652b9850d965248b04f7088 Index: pkgsrc/time/hs-time-compat/buildlink3.mk diff -u pkgsrc/time/hs-time-compat/buildlink3.mk:1.4 pkgsrc/time/hs-time-compat/buildlink3.mk:1.5 --- pkgsrc/time/hs-time-compat/buildlink3.mk:1.4 Tue Jan 18 02:48:30 2022 +++ pkgsrc/time/hs-time-compat/buildlink3.mk Sat Feb 12 05:03:42 2022 @@ -1,17 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.4 2022/01/18 02:48:30 pho Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2022/02/12 05:03:42 pho Exp $ BUILDLINK_TREE+= hs-time-compat .if !defined(HS_TIME_COMPAT_BUILDLINK3_MK) HS_TIME_COMPAT_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.hs-time-compat+= hs-time-compat>=1.9.5 -BUILDLINK_ABI_DEPENDS.hs-time-compat?= hs-time-compat>=1.9.5nb2 +BUILDLINK_API_DEPENDS.hs-time-compat+= hs-time-compat>=1.9.6 +BUILDLINK_ABI_DEPENDS.hs-time-compat?= hs-time-compat>=1.9.6.1 BUILDLINK_PKGSRCDIR.hs-time-compat?= ../../time/hs-time-compat .include "../../devel/hs-base-orphans/buildlink3.mk" -.include "../../devel/hs-fail/buildlink3.mk" -.include "../../devel/hs-old-locale/buildlink3.mk" +.include "../../devel/hs-hashable/buildlink3.mk" .include "../../math/hs-semigroups/buildlink3.mk" .endif # HS_TIME_COMPAT_BUILDLINK3_MK Index: pkgsrc/time/hs-time-compat/patches/patch-time-compat.cabal diff -u pkgsrc/time/hs-time-compat/patches/patch-time-compat.cabal:1.2 pkgsrc/time/hs-time-compat/patches/patch-time-compat.cabal:1.3 --- pkgsrc/time/hs-time-compat/patches/patch-time-compat.cabal:1.2 Fri Apr 23 06:34:48 2021 +++ pkgsrc/time/hs-time-compat/patches/patch-time-compat.cabal Sat Feb 12 05:03:42 2022 @@ -1,15 +1,20 @@ -$NetBSD: patch-time-compat.cabal,v 1.2 2021/04/23 06:34:48 pho Exp $ +$NetBSD: patch-time-compat.cabal,v 1.3 2022/02/12 05:03:42 pho Exp $ -Fix build with GHC 9. +Fix build with GHC 9.2 --- time-compat.cabal.orig 2001-09-09 01:46:40.000000000 +0000 +++ time-compat.cabal -@@ -54,7 +54,7 @@ library +@@ -53,11 +53,11 @@ library default-extensions: Trustworthy build-depends: -- base >=4.3 && <4.15 -+ base >=4.3 && <5 - , base-orphans >=0.8.1 && <0.9 +- base >=4.5 && <4.16 ++ base >=4.5 && <5 + , base-orphans >=0.8.4 && <0.9 , deepseq >=1.3.0.0 && <1.4 || >=1.4.1.1 && <1.5 - , time >=1.2 && <1.3 || >=1.4 && <1.7 || >=1.8 && <1.9 || >=1.9.2 && <1.9.4 || >=1.10 && <1.10.1 || >=1.11 && <1.11.2 + , time >=1.4 && <1.7 || >=1.8 && <1.9 || >=1.9.2 && <1.9.4 || >=1.10 && <1.10.1 || >=1.11 && <1.11.2 || >=1.12 && <1.13 +- , hashable >=1.3.2.0 && <1.4 ++ , hashable >=1.3.2.0 && <1.5 + + if flag(old-locale) + build-depends: --_----------=_1644642222287880--