pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/misc/cabal-install Update to cabal-install-3.4.0.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/ee2a6d59505c
branches: trunk
changeset: 451299:ee2a6d59505c
user: pho <pho%pkgsrc.org@localhost>
date: Sun Apr 25 13:43:44 2021 +0000
description:
Update to cabal-install-3.4.0.0
3.4.0.0 Oleg Grenrus <oleg.grenrus%iki.fi@localhost> February 2021
* See https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.4.0.0.md
3.2.0.0 Herbert Valerio Riedel <hvr%gnu.org@localhost> April 2020
* `v2-build` (and other `v2-`prefixed commands) now accept the
`--benchmark-option(s)` flags, which pass options to benchmark executables
(analogous to how `--test-option(s)` works). (#6209)
* Add solver optimization to skip a version of a package if it does not resolve
any conflicts encountered in the last version, controlled by flag
'--fine-grained-conflicts'. (#5918)
* `cabal v2-exec` doesn't fail in clean package (#6479)
* Show full ABI hash for installed packages in solver log (#5892)
* Create incoming directory even for empty packages (#4130)
* Start GHCi with `main-is` module in scope (#6311)
* Implement `--benchmark-options` for `v2-bench` (#6224)
* Fix store-dir in ghc env files generated by `cabal install --lib
--package-env` (#6298)
* `cabal v2-run` works with `.lhs` files (#6134)
* `subdir` in source-repository-package accepts multiple entries (#5472)
3.0.1.0 Herbert Valerio Riedel <hvr%gnu.org@localhost> April 2020
* Create store incoming directory
([#4130](https://github.com/haskell/cabal/issues/4130))
* `fetchRepoTarball` output is not marked
([#6385](https://github.com/haskell/cabal/pull/6385))
* Update `setupMinCabalVersionConstraint` for GHC-8.8
([#6217](https://github.com/haskell/cabal/pull/6217))
* Implement `cabal install --ignore-project`
([#5919](https://github.com/haskell/cabal/issues/5919))
* `cabal install executable` solver isn't affected by default
environment contents
([#6410](https://github.com/haskell/cabal/issues/6410))
* Use `lukko` for file locking
([#6345](https://github.com/haskell/cabal/pull/6345))
* Use `hackage-security-0.6`
([#6388](https://github.com/haskell/cabal/pull/6388))
* Other dependency upgrades
diffstat:
misc/cabal-install/Makefile | 25 ++-----
misc/cabal-install/PLIST | 5 +-
misc/cabal-install/distinfo | 16 ++--
misc/cabal-install/patches/patch-Distribution_Client_HashValue.hs | 18 +++++
misc/cabal-install/patches/patch-Distribution_Client_HttpUtils.hs | 17 +++++
misc/cabal-install/patches/patch-Distribution_Client_Security_HTTP.hs | 31 ----------
misc/cabal-install/patches/patch-Setup.hs | 29 ---------
misc/cabal-install/patches/patch-cabal-install.cabal | 24 ++----
8 files changed, 63 insertions(+), 102 deletions(-)
diffs (231 lines):
diff -r f511e33343e2 -r ee2a6d59505c misc/cabal-install/Makefile
--- a/misc/cabal-install/Makefile Sun Apr 25 12:00:24 2021 +0000
+++ b/misc/cabal-install/Makefile Sun Apr 25 13:43:44 2021 +0000
@@ -1,28 +1,17 @@
-# $NetBSD: Makefile,v 1.3 2020/10/13 12:27:11 pho Exp $
+# $NetBSD: Makefile,v 1.4 2021/04/25 13:43:44 pho Exp $
-DISTNAME= cabal-install-3.0.0.0
+DISTNAME= cabal-install-3.4.0.0
PKGNAME= ${DISTNAME}
-PKGREVISION= 2
CATEGORIES= misc
MAINTAINER= pho%cielonegro.org@localhost
COMMENT= Command-line interface for Cabal and Hackage
LICENSE= modified-bsd
-SUBST_CLASSES+= mandir
-SUBST_STAGE.mandir= pre-configure
-SUBST_MESSAGE.mandir= Fixing man page installation path
-SUBST_FILES.mandir+= Setup.hs
-SUBST_VARS.mandir+= PKGMANDIR
-
-# cabal-install installs a LICENSE file under
-# share/doc/${PLATFORM}-ghc-${GHC_VERSION}/${PKGNAME}. Variables in
-# paths are usually handled by ../../mk/haskell.mk, but in this case
-# it can't, because the package installs no libraries and therefore
-# doesn't have the package-description file. Remove share/doc to work
-# around this.
+INSTALLATION_DIRS+= share/bash-completion/completions
post-install:
- ${RM} -r ${DESTDIR}${PREFIX}/share/doc
+ ${INSTALL_DATA} ${WRKSRC}/bash-completion/cabal \
+ ${DESTDIR}${PREFIX}/share/bash-completion/completions
.include "../../devel/hs-async/buildlink3.mk"
.include "../../converters/hs-base16-bytestring/buildlink3.mk"
@@ -32,11 +21,13 @@
.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 "../../textproc/hs-regex-base/buildlink3.mk"
+.include "../../textproc/hs-regex-posix/buildlink3.mk"
.include "../../archivers/hs-tar/buildlink3.mk"
.include "../../archivers/hs-zlib/buildlink3.mk"
.include "../../net/hs-resolv/buildlink3.mk"
+.include "../../devel/hs-lukko/buildlink3.mk"
.include "../../mk/haskell.mk"
.include "../../mk/bsd.pkg.mk"
diff -r f511e33343e2 -r ee2a6d59505c misc/cabal-install/PLIST
--- a/misc/cabal-install/PLIST Sun Apr 25 12:00:24 2021 +0000
+++ b/misc/cabal-install/PLIST Sun Apr 25 13:43:44 2021 +0000
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2020/10/13 12:27:11 pho Exp $
+@comment $NetBSD: PLIST,v 1.3 2021/04/25 13:43:44 pho Exp $
bin/cabal
-man/man1/cabal.1
+share/bash-completion/completions/cabal
+share/doc/${HS_PLATFORM}/${PKGNAME}/LICENSE
diff -r f511e33343e2 -r ee2a6d59505c misc/cabal-install/distinfo
--- a/misc/cabal-install/distinfo Sun Apr 25 12:00:24 2021 +0000
+++ b/misc/cabal-install/distinfo Sun Apr 25 13:43:44 2021 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2020/10/13 12:08:10 pho Exp $
+$NetBSD: distinfo,v 1.3 2021/04/25 13:43:44 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-Setup.hs) = 0785a7a574d17447f8109263bbf52acec909fef6
-SHA1 (patch-cabal-install.cabal) = 33633ae6970f52fcdf2a842bdc98f641c308957b
+SHA1 (cabal-install-3.4.0.0.tar.gz) = e35dbadb652aa3710e75bf33ac60f3a44c4629b5
+RMD160 (cabal-install-3.4.0.0.tar.gz) = 200f90949efe23c1aebc3fbd817fe802ecea6520
+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
diff -r f511e33343e2 -r ee2a6d59505c misc/cabal-install/patches/patch-Distribution_Client_HashValue.hs
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/cabal-install/patches/patch-Distribution_Client_HashValue.hs Sun Apr 25 13:43:44 2021 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-Distribution_Client_HashValue.hs,v 1.1 2021/04/25 13:43:44 pho Exp $
+
+Fix build with base16-bytestring-1.0.*
+
+--- Distribution/Client/HashValue.hs.orig 2021-04-25 13:09:32.521615949 +0000
++++ Distribution/Client/HashValue.hs
+@@ -71,9 +71,8 @@ hashFromTUF (Sec.Hash hashstr) =
+ --TODO: [code cleanup] either we should get TUF to use raw bytestrings or
+ -- perhaps we should also just use a base16 string as the internal rep.
+ case Base16.decode (BS.pack hashstr) of
+- (hash, trailing) | not (BS.null hash) && BS.null trailing
+- -> HashValue hash
+- _ -> error "hashFromTUF: cannot decode base16 hash"
++ Right hash -> HashValue hash
++ Left _ -> error "hashFromTUF: cannot decode base16 hash"
+
+
+ -- | Truncate a 32 byte SHA256 hash to
diff -r f511e33343e2 -r ee2a6d59505c misc/cabal-install/patches/patch-Distribution_Client_HttpUtils.hs
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/cabal-install/patches/patch-Distribution_Client_HttpUtils.hs Sun Apr 25 13:43:44 2021 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-Distribution_Client_HttpUtils.hs,v 1.1 2021/04/25 13:43:44 pho Exp $
+
+Fix build with base16-bytestring-1.0.*
+
+--- Distribution/Client/HttpUtils.hs.orig 2021-04-25 13:14:42.533821044 +0000
++++ Distribution/Client/HttpUtils.hs
+@@ -182,7 +182,9 @@ downloadURI transport verbosity uri path
+ fragmentParser = do
+ _ <- P.string "#sha256="
+ str <- some P.hexDigit
+- return (fst (Base16.decode (BS8.pack str)))
++ case Base16.decode (BS8.pack str) of
++ Right b16 -> return b16
++ Left err -> fail err
+
+ ------------------------------------------------------------------------------
+ -- Utilities for repo url management
diff -r f511e33343e2 -r ee2a6d59505c misc/cabal-install/patches/patch-Distribution_Client_Security_HTTP.hs
--- a/misc/cabal-install/patches/patch-Distribution_Client_Security_HTTP.hs Sun Apr 25 12:00:24 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-$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
diff -r f511e33343e2 -r ee2a6d59505c misc/cabal-install/patches/patch-Setup.hs
--- a/misc/cabal-install/patches/patch-Setup.hs Sun Apr 25 12:00:24 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-$NetBSD: patch-Setup.hs,v 1.1 2020/10/13 12:08:10 pho Exp $
-
-Install man pages under PKGMANDIR. It's unfortunate that ./Setup has
-no options for changing the directory. The module
-Distribution.Simple.InstallDirs is a part of GHC, and we also don't
-want to change its default mandir because GHC isn't meant to be used
-solely within pkgsrc.
-
-Be careful not to modify this patch after running "bmake
-configure". It will break the patch.
-
---- Setup.hs.orig 2020-10-13 11:50:11.049290780 +0000
-+++ Setup.hs
-@@ -5,7 +5,7 @@ import Distribution.Simple ( defaultMain
- , postCopy
- , postInst
- )
--import Distribution.Simple.InstallDirs ( mandir
-+import Distribution.Simple.InstallDirs ( prefix
- , CopyDest (NoCopyDest)
- )
- import Distribution.Simple.LocalBuildInfo ( LocalBuildInfo(..)
-@@ -59,5 +59,5 @@ buildManpage lbi verbosity = do
-
- installManpage :: PackageDescription -> LocalBuildInfo -> Verbosity -> CopyDest -> IO ()
- installManpage pkg lbi verbosity copy = do
-- let destDir = mandir (absoluteInstallDirs pkg lbi copy) </> "man1"
-+ let destDir = prefix (absoluteInstallDirs pkg lbi copy) </> "@PKGMANDIR@" </> "man1"
- installOrdinaryFiles verbosity destDir [(buildDir lbi </> "cabal", "cabal.1")]
diff -r f511e33343e2 -r ee2a6d59505c misc/cabal-install/patches/patch-cabal-install.cabal
--- a/misc/cabal-install/patches/patch-cabal-install.cabal Sun Apr 25 12:00:24 2021 +0000
+++ b/misc/cabal-install/patches/patch-cabal-install.cabal Sun Apr 25 13:43:44 2021 +0000
@@ -1,24 +1,18 @@
-$NetBSD: patch-cabal-install.cabal,v 1.1 2020/01/19 07:51:26 pho Exp $
+$NetBSD: patch-cabal-install.cabal,v 1.2 2021/04/25 13:43:44 pho Exp $
-Fix build with GHC 8.8
+Fix build with GHC 9
+Fix build with base16-bytestring-1.0.*
--- cabal-install.cabal.orig 2001-09-09 01:46:40.000000000 +0000
+++ cabal-install.cabal
-@@ -308,7 +308,7 @@ executable cabal
+@@ -336,8 +336,8 @@ 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,
+- base >= 4.8 && < 4.15,
+- base16-bytestring >= 0.1.1 && < 0.2,
++ base >= 4.8 && < 5,
++ base16-bytestring >= 0.1.1 && < 1.1,
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
-
+ Cabal == 3.4.*,
Home |
Main Index |
Thread Index |
Old Index