Update MODGHC_PACKAGE_KEY, patch dependency metadata in the .cabal file,
tweak dependencies and bump for ghc-8.2.2.
This commit is contained in:
kili
parent
6015482b12
commit
00d2fed1e7
@ -1,8 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.5 2017/11/07 22:11:08 kili Exp $
|
||||
# $OpenBSD: Makefile,v 1.6 2018/01/22 21:23:53 kili Exp $
|
||||
|
||||
COMMENT = extensible optionally-pure exceptions
|
||||
|
||||
DISTNAME = exceptions-0.8.3
|
||||
REVISION = 0
|
||||
CATEGORIES = devel
|
||||
|
||||
MAINTAINER = Matthias Kilian <kili@openbsd.org>
|
||||
@ -14,7 +15,7 @@ MODULES = lang/ghc
|
||||
|
||||
MODGHC_BUILD = cabal hackage haddock register
|
||||
|
||||
MODGHC_PACKAGE_KEY = 7py7fmRxowDFpHmiHGKrTb
|
||||
MODGHC_PACKAGE_KEY = IMG8z9bQ0kKKt0LCvLfr9v
|
||||
|
||||
BUILD_DEPENDS = ${RUN_DEPENDS}
|
||||
RUN_DEPENDS += devel/hs-mtl>=2.0,<2.3 \
|
||||
|
||||
22
devel/hs-exceptions/patches/patch-exceptions_cabal
Normal file
22
devel/hs-exceptions/patches/patch-exceptions_cabal
Normal file
@ -0,0 +1,22 @@
|
||||
$OpenBSD: patch-exceptions_cabal,v 1.1 2018/01/22 21:23:53 kili Exp $
|
||||
|
||||
Metadata dependency changes.
|
||||
|
||||
Index: exceptions.cabal
|
||||
--- exceptions.cabal.orig
|
||||
+++ exceptions.cabal
|
||||
@@ -35,7 +35,7 @@ library
|
||||
build-depends:
|
||||
base >= 4.3 && < 5,
|
||||
stm >= 2.2 && < 3,
|
||||
- template-haskell >= 2.2 && < 2.12,
|
||||
+ template-haskell >= 2.2 && < 2.13,
|
||||
transformers >= 0.2 && < 0.6,
|
||||
transformers-compat >= 0.3 && < 0.6,
|
||||
mtl >= 2.0 && < 2.3
|
||||
@@ -62,4 +62,4 @@ test-suite exceptions-tests
|
||||
mtl,
|
||||
test-framework >= 0.8 && < 0.9,
|
||||
test-framework-quickcheck2 >= 0.3 && < 0.4,
|
||||
- QuickCheck >= 2.5 && < 2.10
|
||||
+ QuickCheck >= 2.5 && < 2.11
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2015/09/11 18:51:16 kili Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.2 2018/01/22 21:23:53 kili Exp $
|
||||
lib/ghc/${DISTNAME}/
|
||||
lib/ghc/${DISTNAME}/Control/
|
||||
lib/ghc/${DISTNAME}/Control/Monad/
|
||||
@ -18,13 +18,9 @@ share/doc/hs-${DISTNAME}/html/Control-Monad-Catch-Pure.html
|
||||
share/doc/hs-${DISTNAME}/html/Control-Monad-Catch.html
|
||||
share/doc/hs-${DISTNAME}/html/doc-index.html
|
||||
share/doc/hs-${DISTNAME}/html/exceptions.haddock
|
||||
share/doc/hs-${DISTNAME}/html/frames.html
|
||||
share/doc/hs-${DISTNAME}/html/haddock-util.js
|
||||
share/doc/hs-${DISTNAME}/html/hslogo-16.png
|
||||
share/doc/hs-${DISTNAME}/html/index-frames.html
|
||||
share/doc/hs-${DISTNAME}/html/index.html
|
||||
share/doc/hs-${DISTNAME}/html/mini_Control-Monad-Catch-Pure.html
|
||||
share/doc/hs-${DISTNAME}/html/mini_Control-Monad-Catch.html
|
||||
share/doc/hs-${DISTNAME}/html/minus.gif
|
||||
share/doc/hs-${DISTNAME}/html/ocean.css
|
||||
share/doc/hs-${DISTNAME}/html/plus.gif
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.8 2017/11/07 22:20:53 kili Exp $
|
||||
# $OpenBSD: Makefile,v 1.9 2018/01/22 21:23:53 kili Exp $
|
||||
|
||||
COMMENT = scientific number type
|
||||
|
||||
@ -6,8 +6,8 @@ COMMENT = scientific number type
|
||||
# Please do *not* update without thinking.
|
||||
PORTROACH = ignore:1
|
||||
|
||||
# 0.3.4.9 for haskell-platform 8.0.2
|
||||
DISTNAME = scientific-0.3.4.6
|
||||
REVISION = 0
|
||||
CATEGORIES = devel
|
||||
|
||||
HOMEPAGE = https://github.com/basvandijk/scientific
|
||||
@ -21,11 +21,11 @@ MODULES = lang/ghc
|
||||
|
||||
MODGHC_BUILD = cabal hackage haddock register
|
||||
|
||||
MODGHC_PACKAGE_KEY = KHbfTo5SODkPBujZqnDMi
|
||||
MODGHC_PACKAGE_KEY = JWnrWS98ixeAp8KdIqhPYx
|
||||
|
||||
BUILD_DEPENDS = ${RUN_DEPENDS}
|
||||
RUN_DEPENDS = devel/hs-hashable>=1.1.2,<1.3 \
|
||||
devel/hs-text>=0.8,<1.3 \
|
||||
devel/hs-vector>=0.5,<0.12
|
||||
devel/hs-vector>=0.5,<0.13
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
40
devel/hs-scientific/patches/patch-scientific_cabal
Normal file
40
devel/hs-scientific/patches/patch-scientific_cabal
Normal file
@ -0,0 +1,40 @@
|
||||
$OpenBSD: patch-scientific_cabal,v 1.1 2018/01/22 21:23:53 kili Exp $
|
||||
|
||||
Stupid dependency changes not in contained in the distfile:
|
||||
|
||||
http://hackage.haskell.org/package/scientific-0.3.5.2/revisions/
|
||||
|
||||
Index: scientific.cabal
|
||||
--- scientific.cabal.orig
|
||||
+++ scientific.cabal
|
||||
@@ -68,12 +68,12 @@ library
|
||||
Utils
|
||||
other-extensions: DeriveDataTypeable, BangPatterns
|
||||
ghc-options: -Wall
|
||||
- build-depends: base >= 4.3 && < 4.10
|
||||
+ build-depends: base >= 4.3 && < 4.11
|
||||
, ghc-prim
|
||||
, deepseq >= 1.3 && < 1.5
|
||||
, text >= 0.8 && < 1.3
|
||||
, hashable >= 1.1.2 && < 1.3
|
||||
- , vector >= 0.5 && < 0.12
|
||||
+ , vector >= 0.5 && < 0.13
|
||||
, containers >= 0.1 && < 0.6
|
||||
, binary >= 0.4.1 && < 0.9
|
||||
|
||||
@@ -98,7 +98,7 @@ test-suite test-scientific
|
||||
ghc-options: -Wall
|
||||
|
||||
build-depends: scientific
|
||||
- , base >= 4.3 && < 4.10
|
||||
+ , base >= 4.3 && < 4.11
|
||||
, binary >= 0.4.1 && < 0.9
|
||||
, tasty >= 0.5 && < 0.12
|
||||
, tasty-ant-xml >= 1.0 && < 1.1
|
||||
@@ -120,5 +120,5 @@ benchmark bench-scientific
|
||||
default-language: Haskell2010
|
||||
ghc-options: -O2
|
||||
build-depends: scientific
|
||||
- , base >= 4.3 && < 4.10
|
||||
+ , base >= 4.3 && < 4.11
|
||||
, criterion >= 0.5 && < 1.2
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.4 2017/11/07 22:20:54 kili Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.5 2018/01/22 21:23:53 kili Exp $
|
||||
lib/ghc/${DISTNAME}/
|
||||
lib/ghc/${DISTNAME}/Data/
|
||||
lib/ghc/${DISTNAME}/Data/ByteString/
|
||||
@ -36,14 +36,9 @@ share/doc/hs-${DISTNAME}/html/Data-ByteString-Builder-Scientific.html
|
||||
share/doc/hs-${DISTNAME}/html/Data-Scientific.html
|
||||
share/doc/hs-${DISTNAME}/html/Data-Text-Lazy-Builder-Scientific.html
|
||||
share/doc/hs-${DISTNAME}/html/doc-index.html
|
||||
share/doc/hs-${DISTNAME}/html/frames.html
|
||||
share/doc/hs-${DISTNAME}/html/haddock-util.js
|
||||
share/doc/hs-${DISTNAME}/html/hslogo-16.png
|
||||
share/doc/hs-${DISTNAME}/html/index-frames.html
|
||||
share/doc/hs-${DISTNAME}/html/index.html
|
||||
share/doc/hs-${DISTNAME}/html/mini_Data-ByteString-Builder-Scientific.html
|
||||
share/doc/hs-${DISTNAME}/html/mini_Data-Scientific.html
|
||||
share/doc/hs-${DISTNAME}/html/mini_Data-Text-Lazy-Builder-Scientific.html
|
||||
share/doc/hs-${DISTNAME}/html/minus.gif
|
||||
share/doc/hs-${DISTNAME}/html/ocean.css
|
||||
share/doc/hs-${DISTNAME}/html/plus.gif
|
||||
|
||||
22
devel/hs-stm/patches/patch-stm_cabal
Normal file
22
devel/hs-stm/patches/patch-stm_cabal
Normal file
@ -0,0 +1,22 @@
|
||||
$OpenBSD: patch-stm_cabal,v 1.1 2018/01/22 21:23:53 kili Exp $
|
||||
|
||||
Builds fine with base-4.11.
|
||||
|
||||
Aas usual, this is a 'metadata only' update, no new release, no new
|
||||
distfile, nice for upstream, but fucking distribution package
|
||||
maintainers:
|
||||
|
||||
http://hackage.haskell.org/package/stm-2.4.4.1/revisions/
|
||||
|
||||
Index: stm.cabal
|
||||
--- stm.cabal.orig
|
||||
+++ stm.cabal
|
||||
@@ -34,7 +34,7 @@ library
|
||||
other-extensions: Safe
|
||||
|
||||
build-depends:
|
||||
- base >= 4.3 && < 4.10,
|
||||
+ base >= 4.3 && < 4.11,
|
||||
array >= 0.3 && < 0.6
|
||||
|
||||
exposed-modules:
|
||||
@ -1,10 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.1.1.1 2017/11/03 14:48:11 kili Exp $
|
||||
# $OpenBSD: Makefile,v 1.2 2018/01/22 21:23:53 kili Exp $
|
||||
|
||||
# used by cabal-install
|
||||
|
||||
COMMENT= hackage security library
|
||||
|
||||
DISTNAME= hackage-security-0.5.2.2
|
||||
REVISION = 0
|
||||
CATEGORIES= security
|
||||
|
||||
# BSD3
|
||||
@ -14,7 +15,7 @@ MODULES= lang/ghc
|
||||
|
||||
MODGHC_BUILD = cabal hackage haddock register
|
||||
|
||||
MODGHC_PACKAGE_KEY = 8JKMlcbbllrBcXw2VuzwB7
|
||||
MODGHC_PACKAGE_KEY = 2xPvTJk9eMUH8RAihmaWhK
|
||||
|
||||
RUN_DEPENDS = archivers/hs-zlib>=0.5,<0.7 \
|
||||
devel/hs-base16-bytestring>=0.1.1,<0.2 \
|
||||
|
||||
@ -0,0 +1,53 @@
|
||||
$OpenBSD: patch-hackage-security_cabal,v 1.1 2018/01/22 21:23:53 kili Exp $
|
||||
|
||||
Some (not all) stupid "metadata" changes, not contained in the
|
||||
distribution file.
|
||||
|
||||
http://hackage.haskell.org/package/hackage-security-0.5.2.2/revisions/
|
||||
|
||||
Index: hackage-security.cabal
|
||||
--- hackage-security.cabal.orig
|
||||
+++ hackage-security.cabal
|
||||
@@ -99,9 +99,9 @@ library
|
||||
base16-bytestring >= 0.1.1 && < 0.2,
|
||||
base64-bytestring >= 1.0 && < 1.1,
|
||||
bytestring >= 0.9 && < 0.11,
|
||||
- Cabal >= 1.14 && < 1.26,
|
||||
+ Cabal >= 1.14 && < 2.2,
|
||||
containers >= 0.4 && < 0.6,
|
||||
- directory >= 1.1.0.2 && < 1.3,
|
||||
+ directory >= 1.1.0.2 && < 1.4,
|
||||
ed25519 >= 0.0 && < 0.1,
|
||||
filepath >= 1.2 && < 1.5,
|
||||
mtl >= 2.2 && < 2.3,
|
||||
@@ -111,7 +111,7 @@ library
|
||||
-- 0.4.2 introduces TarIndex, 0.4.4 introduces more
|
||||
-- functionality, 0.5.0 changes type of serialise
|
||||
tar >= 0.5 && < 0.6,
|
||||
- time >= 1.2 && < 1.7,
|
||||
+ time >= 1.2 && < 1.9,
|
||||
transformers >= 0.4 && < 0.6,
|
||||
zlib >= 0.5 && < 0.7,
|
||||
-- whatever versions are bundled with ghc:
|
||||
@@ -149,9 +149,7 @@ library
|
||||
UndecidableInstances
|
||||
-- use the new stage1/cross-compile-friendly Quotes subset of TH for new GHCs
|
||||
if impl(ghc >= 8.0)
|
||||
- -- place holder until Hackage allows to edit in the new extension token
|
||||
- -- other-extensions: TemplateHaskellQuotes
|
||||
- other-extensions:
|
||||
+ other-extensions: TemplateHaskellQuotes
|
||||
else
|
||||
other-extensions: TemplateHaskell
|
||||
|
||||
@@ -205,9 +203,7 @@ library
|
||||
|
||||
if impl(ghc >= 7.10)
|
||||
other-extensions: AllowAmbiguousTypes
|
||||
--- StaticPointers
|
||||
--- ^^^ Temporarily disabled because Hackage doesn't know yet about this
|
||||
--- extension and will therefore reject this package.
|
||||
+ StaticPointers
|
||||
|
||||
test-suite TestSuite
|
||||
type: exitcode-stdio-1.0
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2017/11/03 14:48:11 kili Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.2 2018/01/22 21:23:53 kili Exp $
|
||||
lib/ghc/${DISTNAME}/
|
||||
lib/ghc/${DISTNAME}/HS${DISTNAME}-${MODGHC_PACKAGE_KEY}.o
|
||||
lib/ghc/${DISTNAME}/Hackage/
|
||||
@ -148,32 +148,10 @@ share/doc/hs-${DISTNAME}/html/doc-index-U.html
|
||||
share/doc/hs-${DISTNAME}/html/doc-index-V.html
|
||||
share/doc/hs-${DISTNAME}/html/doc-index-W.html
|
||||
share/doc/hs-${DISTNAME}/html/doc-index.html
|
||||
share/doc/hs-${DISTNAME}/html/frames.html
|
||||
share/doc/hs-${DISTNAME}/html/hackage-security.haddock
|
||||
share/doc/hs-${DISTNAME}/html/haddock-util.js
|
||||
share/doc/hs-${DISTNAME}/html/hslogo-16.png
|
||||
share/doc/hs-${DISTNAME}/html/index-frames.html
|
||||
share/doc/hs-${DISTNAME}/html/index.html
|
||||
share/doc/hs-${DISTNAME}/html/mini_Hackage-Security-Client-Formats.html
|
||||
share/doc/hs-${DISTNAME}/html/mini_Hackage-Security-Client-Repository-Cache.html
|
||||
share/doc/hs-${DISTNAME}/html/mini_Hackage-Security-Client-Repository-HttpLib.html
|
||||
share/doc/hs-${DISTNAME}/html/mini_Hackage-Security-Client-Repository-Local.html
|
||||
share/doc/hs-${DISTNAME}/html/mini_Hackage-Security-Client-Repository-Remote.html
|
||||
share/doc/hs-${DISTNAME}/html/mini_Hackage-Security-Client-Repository.html
|
||||
share/doc/hs-${DISTNAME}/html/mini_Hackage-Security-Client-Verify.html
|
||||
share/doc/hs-${DISTNAME}/html/mini_Hackage-Security-Client.html
|
||||
share/doc/hs-${DISTNAME}/html/mini_Hackage-Security-JSON.html
|
||||
share/doc/hs-${DISTNAME}/html/mini_Hackage-Security-Key-Env.html
|
||||
share/doc/hs-${DISTNAME}/html/mini_Hackage-Security-Server.html
|
||||
share/doc/hs-${DISTNAME}/html/mini_Hackage-Security-TUF-FileMap.html
|
||||
share/doc/hs-${DISTNAME}/html/mini_Hackage-Security-Trusted.html
|
||||
share/doc/hs-${DISTNAME}/html/mini_Hackage-Security-Util-Checked.html
|
||||
share/doc/hs-${DISTNAME}/html/mini_Hackage-Security-Util-IO.html
|
||||
share/doc/hs-${DISTNAME}/html/mini_Hackage-Security-Util-Lens.html
|
||||
share/doc/hs-${DISTNAME}/html/mini_Hackage-Security-Util-Path.html
|
||||
share/doc/hs-${DISTNAME}/html/mini_Hackage-Security-Util-Pretty.html
|
||||
share/doc/hs-${DISTNAME}/html/mini_Hackage-Security-Util-Some.html
|
||||
share/doc/hs-${DISTNAME}/html/mini_Text-JSON-Canonical.html
|
||||
share/doc/hs-${DISTNAME}/html/minus.gif
|
||||
share/doc/hs-${DISTNAME}/html/ocean.css
|
||||
share/doc/hs-${DISTNAME}/html/plus.gif
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user