aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGleb Popov <arrowd@FreeBSD.org>2021-06-12 10:12:01 +0000
committerGleb Popov <arrowd@FreeBSD.org>2021-06-12 10:14:10 +0000
commit97f1cc453444879eb24f60e08906d0986b2a2967 (patch)
treecffa3fd6e4c2bc320f12169bb9e77872cd1663f9
parent9db3b6bbb62c7f86094e882d4d1a0b187d26a13b (diff)
downloadports-97f1cc453444879eb24f60e08906d0986b2a2967.tar.gz
ports-97f1cc453444879eb24f60e08906d0986b2a2967.zip
devel/hs-cabal-install: Fix build with new GHC.
-rw-r--r--devel/hs-cabal-install/Makefile2
-rw-r--r--devel/hs-cabal-install/files/patch-bootstrap_linux-8.10.1.json31
2 files changed, 28 insertions, 5 deletions
diff --git a/devel/hs-cabal-install/Makefile b/devel/hs-cabal-install/Makefile
index d0f8de87ed5d..1a32907791c1 100644
--- a/devel/hs-cabal-install/Makefile
+++ b/devel/hs-cabal-install/Makefile
@@ -1,7 +1,7 @@
PORTNAME= cabal-install
DISTVERSIONPREFIX= ${PORTNAME}-
DISTVERSION= 3.4.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-cabal-install/files/patch-bootstrap_linux-8.10.1.json b/devel/hs-cabal-install/files/patch-bootstrap_linux-8.10.1.json
index 85390fae20ba..2fcd94143618 100644
--- a/devel/hs-cabal-install/files/patch-bootstrap_linux-8.10.1.json
+++ b/devel/hs-cabal-install/files/patch-bootstrap_linux-8.10.1.json
@@ -1,15 +1,24 @@
---- bootstrap/linux-8.10.1.json.orig 2021-03-05 14:30:13 UTC
+--- bootstrap/linux-8.10.1.json.orig 2021-02-20 10:28:17 UTC
+++ bootstrap/linux-8.10.1.json
+@@ -2,7 +2,7 @@
+ "builtin": [
+ {
+ "package": "rts",
+- "version": "1.0"
++ "version": "1.0.1"
+ },
+ {
+ "package": "ghc-prim",
@@ -14,7 +14,7 @@
},
{
"package": "base",
- "version": "4.14.0.0"
-+ "version": "4.14.1.0"
++ "version": "4.14.2.0"
},
{
"package": "array",
-@@ -26,7 +26,7 @@
+@@ -26,11 +26,11 @@
},
{
"package": "bytestring",
@@ -18,6 +27,11 @@
},
{
"package": "containers",
+- "version": "0.6.2.1"
++ "version": "0.6.4.1"
+ },
+ {
+ "package": "binary",
@@ -62,7 +62,7 @@
},
{
@@ -37,7 +51,16 @@
{
"package": "ghc-boot-th",
- "version": "8.10.1"
-+ "version": "8.10.4"
++ "version": "8.10.5"
},
{
"package": "template-haskell",
+@@ -86,7 +86,7 @@
+ },
+ {
+ "package": "stm",
+- "version": "2.5.0.0"
++ "version": "2.5.0.1"
+ }
+ ],
+ "dependencies": [