1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
diff -ur cabal-install-3.2.0.0-old/bootstrap.sh cabal-install-3.2.0.0/bootstrap.sh
--- cabal-install-3.2.0.0-old/bootstrap.sh 2001-09-08 21:46:40.000000000 -0400
+++ cabal-install-3.2.0.0/bootstrap.sh 2020-05-15 17:27:27.504875150 -0400
@@ -230,9 +230,9 @@
# >= 0.2.* && < 0.6
MTL_VER="2.2.2"; MTL_VER_REGEXP="[2]\."
# >= 2.0 && < 3
-HTTP_VER="4000.3.12"; HTTP_VER_REGEXP="4000\.(2\.([5-9]|1[0-9]|2[0-9])|3\.?)"
+HTTP_VER="4000.3.14"; HTTP_VER_REGEXP="4000\.(2\.([5-9]|1[0-9]|2[0-9])|3\.?)"
# >= 4000.2.5 < 4000.4
-ZLIB_VER="0.6.2"; ZLIB_VER_REGEXP="(0\.5\.([3-9]|1[0-9])|0\.6)"
+ZLIB_VER="0.6.2.1"; ZLIB_VER_REGEXP="(0\.5\.([3-9]|1[0-9])|0\.6)"
# >= 0.5.3 && <= 0.7
TIME_VER="1.9.1" TIME_VER_REGEXP="1\.[1-9]\.?"
# >= 1.1 && < 1.10
@@ -240,9 +240,9 @@
# >= 1 && < 1.2
STM_VER="2.4.5.0"; STM_VER_REGEXP="2\."
# == 2.*
-HASHABLE_VER="1.2.7.0"; HASHABLE_VER_REGEXP="1\."
+HASHABLE_VER="1.3.0.0"; HASHABLE_VER_REGEXP="1\."
# 1.*
-ASYNC_VER="2.2.1"; ASYNC_VER_REGEXP="2\."
+ASYNC_VER="2.2.2"; ASYNC_VER_REGEXP="2\."
# 2.*
BASE16_BYTESTRING_VER="0.1.1.6"; BASE16_BYTESTRING_VER_REGEXP="0\.1"
# 0.1.*
@@ -250,7 +250,7 @@
# >=1.0
CRYPTOHASH_SHA256_VER="0.11.101.0"; CRYPTOHASH_SHA256_VER_REGEXP="0\.11\.?"
# 0.11.*
-RESOLV_VER="0.1.1.1"; RESOLV_VER_REGEXP="0\.1\.[1-9]"
+RESOLV_VER="0.1.2.0"; RESOLV_VER_REGEXP="0\.1\.[1-9]"
# >= 0.1.1 && < 0.2
MINTTY_VER="0.1.2"; MINTTY_VER_REGEXP="0\.1\.?"
# 0.1.*
@@ -260,13 +260,13 @@
# 0.2.2.*
ED25519_VER="0.0.5.0"; ED25519_VER_REGEXP="0\.0\.?"
# 0.0.*
-HACKAGE_SECURITY_VER="0.6.0.0"; HACKAGE_SECURITY_VER_REGEXP="0\.6\."
+HACKAGE_SECURITY_VER="0.6.0.1"; HACKAGE_SECURITY_VER_REGEXP="0\.6\."
# >= 0.7.0.0 && < 0.7
-TAR_VER="0.5.1.0"; TAR_VER_REGEXP="0\.5\.([1-9]|1[0-9]|0\.[3-9]|0\.1[0-9])\.?"
+TAR_VER="0.5.1.1"; TAR_VER_REGEXP="0\.5\.([1-9]|1[0-9]|0\.[3-9]|0\.1[0-9])\.?"
# >= 0.5.0.3 && < 0.6
DIGEST_VER="0.0.1.2"; DIGEST_REGEXP="0\.0\.(1\.[2-9]|[2-9]\.?)"
# >= 0.0.1.2 && < 0.1
-LUKKO_VER="0.1.1"; LUKKO_VER_REGEXP="0\.1\.[1-9]"
+LUKKO_VER="0.1.1.2"; LUKKO_VER_REGEXP="0\.1\.[1-9]"
# >= 0.1.1 && <0.2
HACKAGE_URL="https://hackage.haskell.org/package"
@@ -419,6 +419,10 @@
fi
unpack_pkg "${PKG}" "${VER}"
fi
+ if [ "${PKG}" == "ed25519" ]; then
+ # Bump the version bounds on ghc-prim for ed25519.
+ sed -i '/ghc-prim/s/0.6/0.7/' "${PKG}-${VER}"/ed25519.cabal
+ fi
(cd "${PKG}-${VER}" && install_pkg ${PKG} ${VER})
fi
}
diff -ur cabal-install-3.2.0.0-old/cabal-install.cabal cabal-install-3.2.0.0/cabal-install.cabal
--- cabal-install-3.2.0.0-old/cabal-install.cabal 2001-09-08 21:46:40.000000000 -0400
+++ cabal-install-3.2.0.0/cabal-install.cabal 2020-05-15 17:21:00.891424563 -0400
@@ -316,7 +316,7 @@
build-depends:
async >= 2.0 && < 2.3,
array >= 0.4 && < 0.6,
- base >= 4.8 && < 4.14,
+ base >= 4.8 && < 4.15,
base16-bytestring >= 0.1.1 && < 0.2,
binary >= 0.7.3 && < 0.9,
bytestring >= 0.10.6.0 && < 0.11,
diff -ur cabal-install-3.2.0.0-old/Distribution/Client/Sandbox.hs cabal-install-3.2.0.0/Distribution/Client/Sandbox.hs
--- cabal-install-3.2.0.0-old/Distribution/Client/Sandbox.hs 2001-09-08 21:46:40.000000000 -0400
+++ cabal-install-3.2.0.0/Distribution/Client/Sandbox.hs 2020-05-15 17:21:00.891424563 -0400
@@ -1,5 +1,6 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE RankNTypes #-}
-----------------------------------------------------------------------------
-- |
-- Module : Distribution.Client.Sandbox
|