Received: by mail.netbsd.org (Postfix, from userid 605) id D13C684DD6; Sun, 19 Jan 2020 07:51:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 57C5584D60 for ; Sun, 19 Jan 2020 07:51:27 +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 5SgpIohFVkZM for ; Sun, 19 Jan 2020 07:51:26 +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 98B6984D4E for ; Sun, 19 Jan 2020 07:51:26 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 8C44DFBF4; Sun, 19 Jan 2020 07:51:26 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1579420286255780" MIME-Version: 1.0 Date: Sun, 19 Jan 2020 07:51:26 +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: <20200119075126.8C44DFBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1579420286255780 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: pho Date: Sun Jan 19 07:51:26 UTC 2020 Added Files: pkgsrc/misc/cabal-install: DESCR Makefile distinfo pkgsrc/misc/cabal-install/patches: patch-Distribution_Client_Security_HTTP.hs patch-cabal-install.cabal Log Message: Import cabal-install-3.0.0.0 from wip The 'cabal' command-line program simplifies the process of managing Haskell software by automating the fetching, configuration, compilation and installation of Haskell libraries and programs. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 pkgsrc/misc/cabal-install/DESCR \ pkgsrc/misc/cabal-install/Makefile pkgsrc/misc/cabal-install/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/misc/cabal-install/patches/patch-Distribution_Client_Security_HTTP.hs \ pkgsrc/misc/cabal-install/patches/patch-cabal-install.cabal Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1579420286255780 Content-Disposition: inline Content-Length: 5474 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Added files: Index: pkgsrc/misc/cabal-install/DESCR diff -u /dev/null pkgsrc/misc/cabal-install/DESCR:1.1 --- /dev/null Sun Jan 19 07:51:26 2020 +++ pkgsrc/misc/cabal-install/DESCR Sun Jan 19 07:51:26 2020 @@ -0,0 +1,3 @@ +The 'cabal' command-line program simplifies the process of managing +Haskell software by automating the fetching, configuration, +compilation and installation of Haskell libraries and programs. Index: pkgsrc/misc/cabal-install/Makefile diff -u /dev/null pkgsrc/misc/cabal-install/Makefile:1.1 --- /dev/null Sun Jan 19 07:51:26 2020 +++ pkgsrc/misc/cabal-install/Makefile Sun Jan 19 07:51:26 2020 @@ -0,0 +1,26 @@ +# $NetBSD: Makefile,v 1.1 2020/01/19 07:51:26 pho Exp $ + +DISTNAME= cabal-install-3.0.0.0 +PKGNAME= ${DISTNAME} +CATEGORIES= misc + +MAINTAINER= pho@cielonegro.org +COMMENT= Command-line interface for Cabal and Hackage +LICENSE= modified-bsd + +.include "../../devel/hs-async/buildlink3.mk" +.include "../../converters/hs-base16-bytestring/buildlink3.mk" +.include "../../security/hs-cryptohash-sha256/buildlink3.mk" +.include "../../devel/hs-echo/buildlink3.mk" +.include "../../textproc/hs-edit-distance/buildlink3.mk" +.include "../../security/hs-hackage-security/buildlink3.mk" +.include "../../devel/hs-hashable/buildlink3.mk" +.include "../../www/hs-HTTP/buildlink3.mk" +.include "../../net/hs-network/buildlink3.mk" +.include "../../net/hs-network-uri/buildlink3.mk" +.include "../../devel/hs-random/buildlink3.mk" +.include "../../archivers/hs-tar/buildlink3.mk" +.include "../../archivers/hs-zlib/buildlink3.mk" +.include "../../net/hs-resolv/buildlink3.mk" +.include "../../mk/haskell.mk" +.include "../../mk/bsd.pkg.mk" Index: pkgsrc/misc/cabal-install/distinfo diff -u /dev/null pkgsrc/misc/cabal-install/distinfo:1.1 --- /dev/null Sun Jan 19 07:51:26 2020 +++ pkgsrc/misc/cabal-install/distinfo Sun Jan 19 07:51:26 2020 @@ -0,0 +1,8 @@ +$NetBSD: distinfo,v 1.1 2020/01/19 07:51:26 pho Exp $ + +SHA1 (cabal-install-3.0.0.0.tar.gz) = 2fe37726db987af6c23b933bb0e9b81446061449 +RMD160 (cabal-install-3.0.0.0.tar.gz) = 7217d6334bdf98f18341fb0aff8208b20717f695 +SHA512 (cabal-install-3.0.0.0.tar.gz) = 0b15313fc11bc6b6018e01b6a3a65242306977c16ce9333ea1191c1ce0020b180451235a7a65b47bc01791e05d1b246bf9d573fc7e981a46fcfc7da0fed04cca +Size (cabal-install-3.0.0.0.tar.gz) = 654045 bytes +SHA1 (patch-Distribution_Client_Security_HTTP.hs) = ba58ab3c0481b2b269e401121f2dc6f2b2bcf503 +SHA1 (patch-cabal-install.cabal) = 33633ae6970f52fcdf2a842bdc98f641c308957b Index: pkgsrc/misc/cabal-install/patches/patch-Distribution_Client_Security_HTTP.hs diff -u /dev/null pkgsrc/misc/cabal-install/patches/patch-Distribution_Client_Security_HTTP.hs:1.1 --- /dev/null Sun Jan 19 07:51:26 2020 +++ pkgsrc/misc/cabal-install/patches/patch-Distribution_Client_Security_HTTP.hs Sun Jan 19 07:51:26 2020 @@ -0,0 +1,31 @@ +$NetBSD: patch-Distribution_Client_Security_HTTP.hs,v 1.1 2020/01/19 07:51:26 pho Exp $ + +Fix build with hackage-security-0.6: +https://github.com/haskell/cabal/commit/0165f0a739a634ed03e6c87f258ebb5810005d21 + +--- Distribution/Client/Security/HTTP.hs.orig 2001-09-09 01:46:40.000000000 +0000 ++++ Distribution/Client/Security/HTTP.hs +@@ -35,7 +35,6 @@ import Hackage.Security.Client + import Hackage.Security.Client.Repository.HttpLib + import Hackage.Security.Util.Checked + import Hackage.Security.Util.Pretty +-import qualified Hackage.Security.Util.Lens as Lens + + {------------------------------------------------------------------------------- + 'HttpLib' implementation +@@ -142,7 +141,14 @@ mkReqHeaders reqHeaders mRange = concat + finalize (name, strs) = [HTTP.Header name (intercalate ", " (reverse strs))] + + insert :: Eq a => a -> [b] -> [(a, [b])] -> [(a, [b])] +- insert x y = Lens.modify (Lens.lookupM x) (++ y) ++ insert x y = modifyAssocList x (++ y) ++ ++ -- modify the first matching element ++ modifyAssocList :: Eq a => a -> (b -> b) -> [(a, b)] -> [(a, b)] ++ modifyAssocList a f = go where ++ go [] = [] ++ go (p@(a', b) : xs) | a == a' = (a', f b) : xs ++ | otherwise = p : go xs + + {------------------------------------------------------------------------------- + Custom exceptions Index: pkgsrc/misc/cabal-install/patches/patch-cabal-install.cabal diff -u /dev/null pkgsrc/misc/cabal-install/patches/patch-cabal-install.cabal:1.1 --- /dev/null Sun Jan 19 07:51:26 2020 +++ pkgsrc/misc/cabal-install/patches/patch-cabal-install.cabal Sun Jan 19 07:51:26 2020 @@ -0,0 +1,24 @@ +$NetBSD: patch-cabal-install.cabal,v 1.1 2020/01/19 07:51:26 pho Exp $ + +Fix build with GHC 8.8 + +--- cabal-install.cabal.orig 2001-09-09 01:46:40.000000000 +0000 ++++ cabal-install.cabal +@@ -308,7 +308,7 @@ executable cabal + build-depends: + async >= 2.0 && < 2.3, + array >= 0.4 && < 0.6, +- base >= 4.8 && < 4.13, ++ base >= 4.8 && < 4.14, + base16-bytestring >= 0.1.1 && < 0.2, + binary >= 0.7.3 && < 0.9, + bytestring >= 0.10.6.0 && < 0.11, +@@ -332,7 +332,7 @@ executable cabal + tar >= 0.5.0.3 && < 0.6, + time >= 1.5.0.1 && < 1.10, + zlib >= 0.5.3 && < 0.7, +- hackage-security >= 0.5.2.2 && < 0.6, ++ hackage-security >= 0.5.2.2 && < 0.7, + text >= 1.2.3 && < 1.3, + parsec >= 3.1.13.0 && < 3.2 + --_----------=_1579420286255780--