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 106691A9239 for ; Fri, 11 Feb 2022 17:49:08 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 12EB984D6A; Fri, 11 Feb 2022 17:49:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4C3E984D16 for ; Fri, 11 Feb 2022 17:49:06 +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 e5-D-hwDZy-4 for ; Fri, 11 Feb 2022 17:49:05 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 6730D84CE2 for ; Fri, 11 Feb 2022 17:49:05 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 61013FB24; Fri, 11 Feb 2022 17:49:05 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1644601745214130" MIME-Version: 1.0 Date: Fri, 11 Feb 2022 17:49:05 +0000 From: "Masatake Daimon" Subject: CVS commit: pkgsrc/misc/cabal-install To: pkgsrc-changes@NetBSD.org Reply-To: pho@netbsd.org X-Mailer: log_accum Message-Id: <20220211174905.61013FB24@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1644601745214130 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: pho Date: Fri Feb 11 17:49:05 UTC 2022 Modified Files: pkgsrc/misc/cabal-install: Makefile distinfo pkgsrc/misc/cabal-install/patches: patch-cabal-install.cabal Added Files: pkgsrc/misc/cabal-install/patches: patch-src_Distribution_Client_FileMonitor.hs Removed Files: pkgsrc/misc/cabal-install/patches: patch-Distribution_Client_HashValue.hs patch-Distribution_Client_HttpUtils.hs Log Message: Update to cabal-install-3.6.2.0 3.6.2.0 Emily Pillmore October 2021 * See https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.6.2.0.md 3.6.0.0 Emily Pillmore August 2021 * See https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.6.0.0.md To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 pkgsrc/misc/cabal-install/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/misc/cabal-install/distinfo cvs rdiff -u -r1.1 -r0 \ pkgsrc/misc/cabal-install/patches/patch-Distribution_Client_HashValue.hs \ pkgsrc/misc/cabal-install/patches/patch-Distribution_Client_HttpUtils.hs cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/misc/cabal-install/patches/patch-cabal-install.cabal cvs rdiff -u -r0 -r1.1 \ pkgsrc/misc/cabal-install/patches/patch-src_Distribution_Client_FileMonitor.hs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1644601745214130 Content-Disposition: inline Content-Length: 6566 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/misc/cabal-install/Makefile diff -u pkgsrc/misc/cabal-install/Makefile:1.6 pkgsrc/misc/cabal-install/Makefile:1.7 --- pkgsrc/misc/cabal-install/Makefile:1.6 Tue Jan 18 02:48:19 2022 +++ pkgsrc/misc/cabal-install/Makefile Fri Feb 11 17:49:05 2022 @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2022/01/18 02:48:19 pho Exp $ +# $NetBSD: Makefile,v 1.7 2022/02/11 17:49:05 pho Exp $ -DISTNAME= cabal-install-3.4.0.0 +DISTNAME= cabal-install-3.6.2.0 PKGNAME= ${DISTNAME} -PKGREVISION= 2 CATEGORIES= misc MAINTAINER= pho@cielonegro.org Index: pkgsrc/misc/cabal-install/distinfo diff -u pkgsrc/misc/cabal-install/distinfo:1.5 pkgsrc/misc/cabal-install/distinfo:1.6 --- pkgsrc/misc/cabal-install/distinfo:1.5 Tue Oct 26 10:58:58 2021 +++ pkgsrc/misc/cabal-install/distinfo Fri Feb 11 17:49:05 2022 @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.5 2021/10/26 10:58:58 nia Exp $ +$NetBSD: distinfo,v 1.6 2022/02/11 17:49:05 pho Exp $ -BLAKE2s (cabal-install-3.4.0.0.tar.gz) = e2f35f1d5733d630de30c056bd196b199923a42986ad03918b9d85e6b95976b2 -SHA512 (cabal-install-3.4.0.0.tar.gz) = 0fd93c86c59e3c626341be3c67e69a1502f1ce1413b4a456cd930d5449cabdaeb033ac5f47673db0e708fc194aadf8ab0aa2904b6b0f195b57907c5b40588323 -Size (cabal-install-3.4.0.0.tar.gz) = 640775 bytes -SHA1 (patch-Distribution_Client_HashValue.hs) = 95e627979748e5e697959c89ddee22127784a079 -SHA1 (patch-Distribution_Client_HttpUtils.hs) = d3979223eebba0ac20cce1f81ad083b3d490e66d -SHA1 (patch-cabal-install.cabal) = 21d95449ded3b7f7576fa55578d9dbad511b10f9 +BLAKE2s (cabal-install-3.6.2.0.tar.gz) = 1aa26188bfd8afa31f589f1276546b2f304359667f36d268306591b510f7302b +SHA512 (cabal-install-3.6.2.0.tar.gz) = a02d72fd7d0bf7778b1d4f2925e0b78f6c321cb29d59d559da758bfa6a0cd17fc776bd64911db8d28a208189b35db50aceae109782a1011e059446c4c2d77ad3 +Size (cabal-install-3.6.2.0.tar.gz) = 633319 bytes +SHA1 (patch-cabal-install.cabal) = 0f993bc694658c409b585a640fe42b6d1b82d129 +SHA1 (patch-src_Distribution_Client_FileMonitor.hs) = e68ac117c20aa698033af2ab4fd0407b99b8542d Index: pkgsrc/misc/cabal-install/patches/patch-cabal-install.cabal diff -u pkgsrc/misc/cabal-install/patches/patch-cabal-install.cabal:1.2 pkgsrc/misc/cabal-install/patches/patch-cabal-install.cabal:1.3 --- pkgsrc/misc/cabal-install/patches/patch-cabal-install.cabal:1.2 Sun Apr 25 13:43:44 2021 +++ pkgsrc/misc/cabal-install/patches/patch-cabal-install.cabal Fri Feb 11 17:49:05 2022 @@ -1,18 +1,33 @@ -$NetBSD: patch-cabal-install.cabal,v 1.2 2021/04/25 13:43:44 pho Exp $ +$NetBSD: patch-cabal-install.cabal,v 1.3 2022/02/11 17:49:05 pho Exp $ -Fix build with GHC 9 -Fix build with base16-bytestring-1.0.* +Fix build with GHC 9.2 --- cabal-install.cabal.orig 2001-09-09 01:46:40.000000000 +0000 +++ cabal-install.cabal -@@ -336,8 +336,8 @@ executable cabal +@@ -266,7 +266,7 @@ executable cabal build-depends: async >= 2.0 && < 2.3, array >= 0.4 && < 0.6, - base >= 4.8 && < 4.15, -- base16-bytestring >= 0.1.1 && < 0.2, + base >= 4.8 && < 5, -+ base16-bytestring >= 0.1.1 && < 1.1, + base16-bytestring >= 0.1.1 && < 1.1.0.0, binary >= 0.7.3 && < 0.9, - bytestring >= 0.10.6.0 && < 0.11, - Cabal == 3.4.*, + bytestring >= 0.10.6.0 && < 0.12, +@@ -278,7 +278,7 @@ executable cabal + echo >= 0.1.3 && < 0.2, + edit-distance >= 0.2.2 && < 0.3, + filepath >= 1.4.0.0 && < 1.5, +- hashable >= 1.0 && < 1.4, ++ hashable >= 1.0 && < 1.5, + HTTP >= 4000.1.5 && < 4000.4, + mtl >= 2.0 && < 2.3, + network-uri >= 2.6.0.2 && < 2.7, +@@ -287,7 +287,7 @@ executable cabal + random >= 1.2 && < 1.3, + stm >= 2.0 && < 2.6, + tar >= 0.5.0.3 && < 0.6, +- time >= 1.5.0.1 && < 1.11, ++ time >= 1.5.0.1 && < 1.12, + transformers >= 0.4.2.0 && < 0.6, + zlib >= 0.5.3 && < 0.7, + hackage-security >= 0.6.0.1 && < 0.7, Added files: Index: pkgsrc/misc/cabal-install/patches/patch-src_Distribution_Client_FileMonitor.hs diff -u /dev/null pkgsrc/misc/cabal-install/patches/patch-src_Distribution_Client_FileMonitor.hs:1.1 --- /dev/null Fri Feb 11 17:49:05 2022 +++ pkgsrc/misc/cabal-install/patches/patch-src_Distribution_Client_FileMonitor.hs Fri Feb 11 17:49:05 2022 @@ -0,0 +1,40 @@ +$NetBSD: patch-src_Distribution_Client_FileMonitor.hs,v 1.1 2022/02/11 17:49:05 pho Exp $ + +Cabal-3.6.0.0 shipped with GHC 9.2.1 exports neither Tag nor +structuredDecodeTriple so we have no choice but to kill the entire +file-watching machinery. pho@ has no idea how it ended up in this +situation. The upstream has never released Cabal with this broken +Distribution.Utils.Structured apparently??? + +--- src/Distribution/Client/FileMonitor.hs.orig 2022-02-08 02:09:01.086511380 +0000 ++++ src/Distribution/Client/FileMonitor.hs +@@ -63,7 +63,7 @@ import Distribution.Compat.Tim + import Distribution.Client.Glob + import Distribution.Simple.Utils (handleDoesNotExist, writeFileAtomic) + import Distribution.Client.Utils (mergeBy, MergeResult(..)) +-import Distribution.Utils.Structured (structuredEncode, Tag (..)) ++import Distribution.Utils.Structured (structuredEncode) + import System.FilePath + import System.Directory + import System.IO +@@ -508,19 +508,7 @@ checkFileMonitorChanged + structuredDecodeTriple + :: forall a b c. (Structured a, Structured b, Structured c, Binary.Binary a, Binary.Binary b, Binary.Binary c) + => BS.ByteString -> Either String (a, b, Either String c) +-structuredDecodeTriple lbs = +- let partialDecode = +- (`runGetOrFail` lbs) $ do +- (_ :: Tag (a,b,c)) <- Binary.get +- (a :: a) <- Binary.get +- (b :: b) <- Binary.get +- pure (a, b) +- cleanEither (Left (_, pos, msg)) = Left ("Data.Binary.Get.runGet at position " ++ show pos ++ ": " ++ msg) +- cleanEither (Right (_,_,v)) = Right v +- +- in case partialDecode of +- Left (_, pos, msg) -> Left ("Data.Binary.Get.runGet at position " ++ show pos ++ ": " ++ msg) +- Right (lbs', _, (x,y)) -> Right (x, y, cleanEither $ runGetOrFail (Binary.get :: Binary.Get c) lbs') ++structuredDecodeTriple _ = Left "cabal-install cannot currently monitor changes in files" + + -- | Helper for reading the cache file. + -- --_----------=_1644601745214130--