Hi Matthias, I tested this upgrade by rebuilding all the dependenents and running a minimal manual flow. OK?
Thanks Greg >From 99f7e29829c85c6d68d62a97a1d59a771d8d9346 Mon Sep 17 00:00:00 2001 From: Greg Steuck <[email protected]> Date: Sat, 21 Jan 2023 22:36:28 -0800 Subject: [PATCH] Upgrade cabal-install to 3.8.1.0 --- devel/cabal-install/Makefile | 42 ++--- devel/cabal-install/distinfo | 116 +++++++------ devel/cabal-install/files/openbsd.json | 156 ++++++++++-------- .../patch-cabal-install_cabal-install_cabal | 23 --- 4 files changed, 176 insertions(+), 161 deletions(-) delete mode 100644 devel/cabal-install/patches/patch-cabal-install_cabal-install_cabal diff --git a/devel/cabal-install/Makefile b/devel/cabal-install/Makefile index f8c7f137ac1..3c8f4017e76 100644 --- a/devel/cabal-install/Makefile +++ b/devel/cabal-install/Makefile @@ -1,11 +1,10 @@ COMMENT = command-line interface for Cabal and Hackage -DISTNAME = cabal-install-3.6.3.0 +DISTNAME = cabal-install-3.8.1.0 CATEGORIES = devel GH_ACCOUNT = haskell -GH_TAGNAME = Cabal-v3.6.3.0 +GH_TAGNAME = cabal-install-v3.8.1.0 GH_PROJECT = cabal -REVISION = 0 HOMEPAGE = https://github.com/haskell/cabal @@ -32,28 +31,31 @@ MASTER_SITES0 = https://hackage.haskell.org/package/ # Produced by manually copying values out of files/openbsd.json. _MANIFEST = \ - Cabal-syntax 3.6.0.0 0 \ - HTTP 4000.3.16 1 \ - async 2.2.4 1 \ + Cabal-syntax 3.8.1.0 0 \ + HTTP 4000.4.1 1 \ + async 2.2.4 2 \ base16-bytestring 1.0.2.0 0 \ base64-bytestring 1.2.1.0 0 \ - cryptohash-sha256 0.11.102.1 0 \ + cabal-install-solver 3.8.1.0 0 \ + cryptohash-sha256 0.11.102.1 1 \ + data-array-byte 0.1.0.1 1 \ echo 0.1.4 0 \ - ed25519 0.0.5.0 5 \ + ed25519 0.0.5.0 6 \ edit-distance 0.2.2.1 1 \ - hackage-security 0.6.2.1 1 \ - hashable 1.4.0.2 0 \ - lukko 0.1.1.3 2 \ + hackage-security 0.6.2.3 0 \ + hashable 1.4.2.0 0 \ + lukko 0.1.1.3 3 \ network 3.1.2.7 0 \ - network-uri 2.6.4.1 0 \ - random 1.2.1 0 \ - regex-base 0.94.0.2 0 \ - regex-posix 0.96.0.1 0 \ - resolv 0.1.2.0 4 \ - splitmix 0.1.0.4 0 \ - th-compat 0.1.3 0 \ - tar 0.5.1.1 4 \ - zlib 0.6.2.3 1 + network-uri 2.6.4.2 0 \ + random 1.2.1.1 0 \ + regex-base 0.94.0.2 1 \ + regex-posix 0.96.0.1 1 \ + resolv 0.1.2.0 5 \ + safe-exceptions 0.1.7.3 0 \ + splitmix 0.1.0.4 2 \ + th-compat 0.1.4 0 \ + tar 0.5.1.1 5 \ + zlib 0.6.3.0 0 .for _package _version _revision in ${_MANIFEST} DISTFILES += {${_package}-${_version}/}${_package}-${_version}.tar.gz:0 diff --git a/devel/cabal-install/distinfo b/devel/cabal-install/distinfo index 0c69c5f0b9b..8da8810da4d 100644 --- a/devel/cabal-install/distinfo +++ b/devel/cabal-install/distinfo @@ -1,90 +1,102 @@ -SHA256 (hackage/Cabal-syntax-3.6.0.0.tar.gz) = yiXl/GATl1ZfqFfxqkd3QPrH9D1lnnfE2bFIXcojklE= -SHA256 (hackage/Cabal-syntax-3.6.0.0_0.cabal) = A31wuwkcSfaHJt3pIPagA7ZGg1qGzctbWtWK2a8yB9k= -SHA256 (hackage/HTTP-4000.3.16.tar.gz) = 1gkcA3hxrD0I0CHJBiBhdFZ0mdWiamy4BM9TDNWQ/i0= -SHA256 (hackage/HTTP-4000.3.16_1.cabal) = YEJkPBWgtD5SKmaT8eMi8FAA1RlUOoQUnLgK7/7jT3E= +SHA256 (hackage/Cabal-syntax-3.8.1.0.tar.gz) = B+jdsZ/gF4FIXxUitq/CKrpoCwqyjr5rv7hKLdaYzg8= +SHA256 (hackage/Cabal-syntax-3.8.1.0_0.cabal) = kWv9YhT7JaD2DpPbUG3+Gi7JZ4AOHiGWb472NO8B4zQ= +SHA256 (hackage/HTTP-4000.4.1.tar.gz) = 3zHY7+x3USTauFbXF33cujG+n54INuvasD2UOS8t1FM= +SHA256 (hackage/HTTP-4000.4.1_1.cabal) = uHjVdcRwvR9y03r2ZU2SSrK5SJ2I3opxvXTZ1dcmwBM= SHA256 (hackage/async-2.2.4.tar.gz) = SE34W+DnbE/tk3ZFHkjh0MbpeVLOeXNbctVCl+fgpyU= -SHA256 (hackage/async-2.2.4_1.cabal) = uD3sNKU1IN6Ext09x6rkXSJAm0brRxxHi5gQghWjcPA= +SHA256 (hackage/async-2.2.4_2.cabal) = K5QJAjU2gjIzzjE0VYVl0BszguZR+lSsjLipmWfgI8k= SHA256 (hackage/base16-bytestring-1.0.2.0.tar.gz) = HVqRFD7w4iFXU2CT7I5Z0iamgiDsiTeNXcruqGRyx4Q= SHA256 (hackage/base16-bytestring-1.0.2.0_0.cabal) = ZKuteBarjKvthInin4B7Om+Cjgss7A6uQEMj1p0235o= SHA256 (hackage/base64-bytestring-1.2.1.0.tar.gz) = +/jtMO3eJx62BTUgIUMdjxsFX5WlavMf4urPa9/cSck= SHA256 (hackage/base64-bytestring-1.2.1.0_0.cabal) = UOwOIpJV1MRcvdVo2gETEbiIfzBLkxVkiGAW9JhDNNg= -SHA256 (hackage/cabal-install-3.6.3.0.tar.gz) = 3qCGrK1tn+X+Itg4uVtOmIAi6FGfONQWCRGeoyv7dGY= +SHA256 (hackage/cabal-install-3.8.1.0.tar.gz) = 5UfY732GyPFjOyPSi+06hFe/CNs6OC5LT6ocx+jeA5M= +SHA256 (hackage/cabal-install-solver-3.8.1.0.tar.gz) = 3yNp9sN1F6OyYlvBkFfZ4ga7tAOGvLYH8X3H0uWI/+c= +SHA256 (hackage/cabal-install-solver-3.8.1.0_0.cabal) = nObpqwI2GSJRND3b5YS02yot/vKTCj5VEa83Rv5kg9w= SHA256 (hackage/cryptohash-sha256-0.11.102.1.tar.gz) = c6fccWOHGoCDdJUDmgmZZ7EfXE/nChGCd4QvenE8a/Y= -SHA256 (hackage/cryptohash-sha256-0.11.102.1_0.cabal) = GI0LWgSR6LaGsy2bFEySh3YLozPSUJvz8X49hG+8IzI= +SHA256 (hackage/cryptohash-sha256-0.11.102.1_1.cabal) = +s0MBJJe+SXsBSQ0cf0WBVIp/fUfZNsaEEneDMbG38M= +SHA256 (hackage/data-array-byte-0.1.0.1.tar.gz) = G7bsoLPgLQV/5/ThTIHvOVIW9CGrMP2qGxgBfJwCVgA= +SHA256 (hackage/data-array-byte-0.1.0.1_1.cabal) = LvG9NRHoK6VvfyPNeT3S2oQzih58LL6lsVFBev47qto= SHA256 (hackage/echo-0.1.4.tar.gz) = yf4b8pBIJaZbZnJR7GRPGXtx3FwgnS0lS+XePUlrDkM= SHA256 (hackage/echo-0.1.4_0.cabal) = zM53FWLEmisppSBGymjGIXnpfo++rNrjLKhKhURej0I= SHA256 (hackage/ed25519-0.0.5.0.tar.gz) = 2KWVjr+pMJeQ763mQnXcXEQbVoZFxFzu0bDG/zbWFW0= -SHA256 (hackage/ed25519-0.0.5.0_5.cabal) = JKx7Xz2fo8L3AmKzKfKnXyTn/YKfiMGJs4jvobzWfrI= +SHA256 (hackage/ed25519-0.0.5.0_6.cabal) = iFyeJBDl2RoIsZmJffCGf+zt+BghbXMpotQ6USgz3WM= SHA256 (hackage/edit-distance-0.2.2.1.tar.gz) = PoiF7i9WrU2pQPBDro+YHuL+M2tejkuj90Ns/09SbEo= SHA256 (hackage/edit-distance-0.2.2.1_1.cabal) = TTOknNOD1QrwkPG4iGQtEBFuQ4CfnaYCPZ/G9n0mVu4= -SHA256 (hackage/hackage-security-0.6.2.1.tar.gz) = vyLNFt3n1rcTBGP01zJLZKKWTZ7z9SPfl9fLmFRNZKg= -SHA256 (hackage/hackage-security-0.6.2.1_1.cabal) = 6zTD4vo5+YGSkwRcA+VhSKcSVXPB3iZc3+XZZ/HXHG4= -SHA256 (hackage/hashable-1.4.0.2.tar.gz) = g2Bu3TVtkUwHXs1E9tX+kaOxhqoGg8jdjJp+jiKkdgA= -SHA256 (hackage/hashable-1.4.0.2_0.cabal) = DN3QIp0arDBeoEBECcC7+rgfB1gXvXS4spKe/1gzPlU= +SHA256 (hackage/hackage-security-0.6.2.3.tar.gz) = Uu4FdpcZVVcdhGuObAljj4n094gfSpUXPkTMwNhWoGY= +SHA256 (hackage/hackage-security-0.6.2.3_0.cabal) = ZPxg8/TQIEfFSVa2l2wOT8cnIokcaHWrENlTWbwANVo= +SHA256 (hackage/hashable-1.4.2.0.tar.gz) = G0AA6oK4H2nUbQr0FSwQxjA4c1EHOOJM/Edndg0w4/g= +SHA256 (hackage/hashable-1.4.2.0_0.cabal) = Aqzt16yCm1J1b+SBodUylNj11CqqVt9WDGLGzsNYehQ= SHA256 (hackage/lukko-0.1.1.3.tar.gz) = qA77YM+j2uGGgsAZgNdtX35BPhkc0YaZLhv3OI1Iqx8= -SHA256 (hackage/lukko-0.1.1.3_2.cabal) = wITAQ6QGMtPK/KxQ+17v+E2R7bBwpUuqlJRfHJdvl8A= +SHA256 (hackage/lukko-0.1.1.3_3.cabal) = 79TAjE3xrD9COFioNMDjtbSQn+vaZqkB0SqOHVe92qg= SHA256 (hackage/network-3.1.2.7.tar.gz) = f3Yg/vGhrz09Z0f1EOcyI6XGAOfX/ZrOBz0SIr3GPYU= SHA256 (hackage/network-3.1.2.7_0.cabal) = 49eLE9uVEq6xBuRKM0q0K3qkjSbAlymQhAhMuL5cVWg= -SHA256 (hackage/network-uri-2.6.4.1.tar.gz) = V4VtuTYIpNQZ9oG4gcm41ESIANWmh1h9w36KngsiNYQ= -SHA256 (hackage/network-uri-2.6.4.1_0.cabal) = pHZRZO0KLRZoRG6y4DRgzphkX78INZjGkIRq95t94Q0= -SHA256 (hackage/random-1.2.1.tar.gz) = Jlx2j8XyylPN5qh+cGtESMrUdMPe7OkzwQPyRFNmFFc= -SHA256 (hackage/random-1.2.1_0.cabal) = i+4k3AyYWpDueNlMYfiu0hxJYzaG8PHBTFB42BjuQ6I= +SHA256 (hackage/network-uri-2.6.4.2.tar.gz) = nBiJcxJuiTJQuIHyDogR3KBsIjwjQCsG96Hy6ZV5cig= +SHA256 (hackage/network-uri-2.6.4.2_0.cabal) = H95Zq/XYKpZmtEFbwrLp4z9sEwkHT9oS1QQQx9vZXzs= +SHA256 (hackage/random-1.2.1.1.tar.gz) = PhJy9+1qTXvRcSuQFD7DJv7psiV4kiI3n+ogqckMm3Y= +SHA256 (hackage/random-1.2.1.1_0.cabal) = 3qHxHlVpMy3GyO+q0cswEBalWHtnVJQ6SfneCK4OVtk= SHA256 (hackage/regex-base-0.94.0.2.tar.gz) = e5lAj1gPW7Z6HEE+C8c1iGYIJRMxrTYyICDyFprqLvE= -SHA256 (hackage/regex-base-0.94.0.2_0.cabal) = JWGtrIzjc5EJSAZt6+CQoiszaxKbpa8YwDMlJNFucs4= +SHA256 (hackage/regex-base-0.94.0.2_1.cabal) = T/RCXHEM3fRA37rGzVIxC7ayPheQI5D/ccn8fqr8T8w= SHA256 (hackage/regex-posix-0.96.0.1.tar.gz) = x4J8ORkZIncR4c/wp2KxZ4/Yc5+ckC/BgwQf809ZJZw= -SHA256 (hackage/regex-posix-0.96.0.1_0.cabal) = tkIeU1Z2awwKeLYJSuLjpiWbQsFHtxcoPAPBywkWPco= +SHA256 (hackage/regex-posix-0.96.0.1_1.cabal) = nbuktlo7tpddl0CBS+VZPGstLWoLP+vI7JQO25qbvfQ= SHA256 (hackage/resolv-0.1.2.0.tar.gz) = gaK6+tSE2xI8+NF6AtmLs4ihJ/0Pgi+gIliUaKDmRnE= -SHA256 (hackage/resolv-0.1.2.0_4.cabal) = IIjrk2i5IPgLvk47A8O4SECQII9cOzFkW9Z6nvfSbbQ= +SHA256 (hackage/resolv-0.1.2.0_5.cabal) = YeLZj/Y0uLSz20Z3ckIMD5x5wtqd3z0trrKvJBfyxTU= +SHA256 (hackage/safe-exceptions-0.1.7.3.tar.gz) = kc4o2Pim79MXiNSCftXNy5pUatQFOobFb3lHxmowtb8= +SHA256 (hackage/safe-exceptions-0.1.7.3_0.cabal) = bpsbIzr4DMCqF+qFjSZBuhRvsRy8xZcKUmSeiddyguI= SHA256 (hackage/splitmix-0.1.0.4.tar.gz) = bQZUAjlOepEXCT27RTCiE0LJseLsUJUWyKjQ/+2Y7Ko= -SHA256 (hackage/splitmix-0.1.0.4_0.cabal) = cUpV/SjT4lM71bSedPYE745dewbySciBb2xUrtQx3PE= +SHA256 (hackage/splitmix-0.1.0.4_2.cabal) = 2yXC4XlnqmtgRquLG5a6PzRMpZpitg+2ET1R6jBaPY4= SHA256 (hackage/tar-0.5.1.1.tar.gz) = s4REn2KysKo+bSyxAEuAYLAfIeyT57Y+evbY+tip8d4= -SHA256 (hackage/tar-0.5.1.1_4.cabal) = 2GmfRrSF8QXuqccVjz1DLKV45rvl1odRGE6YmaQdQw0= -SHA256 (hackage/th-compat-0.1.3.tar.gz) = a1BZyvZxT0fakpU7rfL1VhGYd+CXCMFOIGs66YuGgcY= -SHA256 (hackage/th-compat-0.1.3_0.cabal) = oW3ZIpR6aHfe/lLEw40atI7T+FqCaTD10aVodB1hmZM= -SHA256 (hackage/zlib-0.6.2.3.tar.gz) = gH9r3fnLPFF85XV9mR3ePH4xmVOiLIbuA9dFNL1avIg= -SHA256 (hackage/zlib-0.6.2.3_1.cabal) = JiqT2/Nwvln07lfzsaUbM4vCwwl5fao3wU8iYq5h2uQ= -SIZE (hackage/Cabal-syntax-3.6.0.0.tar.gz) = 1751 -SIZE (hackage/Cabal-syntax-3.6.0.0_0.cabal) = 1567 -SIZE (hackage/HTTP-4000.3.16.tar.gz) = 74516 -SIZE (hackage/HTTP-4000.3.16_1.cabal) = 5947 +SHA256 (hackage/tar-0.5.1.1_5.cabal) = vBSWnqSt/sbu4gJk3s9KB8QAKziyqoAtWNhrGiz3uJU= +SHA256 (hackage/th-compat-0.1.4.tar.gz) = 2Pl6wUq0e2uKew/bT/lUJjIuxWut0BZSrBXaSkTUurg= +SHA256 (hackage/th-compat-0.1.4_0.cabal) = bKd8ToC05BCeMFScJpYxqcwpXI/CQxzkEjlypfgPe/w= +SHA256 (hackage/zlib-0.6.3.0.tar.gz) = nqqYmtRTRDi1vrUcHTpMj2oIj9/wslmlOU+/OaruBNo= +SHA256 (hackage/zlib-0.6.3.0_0.cabal) = ghSp03WA8X+LZ1EJV4pdvmhTVZ7vFW403CIz8RI6zjM= +SIZE (hackage/Cabal-syntax-3.8.1.0.tar.gz) = 233354 +SIZE (hackage/Cabal-syntax-3.8.1.0_0.cabal) = 7380 +SIZE (hackage/HTTP-4000.4.1.tar.gz) = 74330 +SIZE (hackage/HTTP-4000.4.1_1.cabal) = 5862 SIZE (hackage/async-2.2.4.tar.gz) = 14148 -SIZE (hackage/async-2.2.4_1.cabal) = 3095 +SIZE (hackage/async-2.2.4_2.cabal) = 3095 SIZE (hackage/base16-bytestring-1.0.2.0.tar.gz) = 7219 SIZE (hackage/base16-bytestring-1.0.2.0_0.cabal) = 2541 SIZE (hackage/base64-bytestring-1.2.1.0.tar.gz) = 13743 SIZE (hackage/base64-bytestring-1.2.1.0_0.cabal) = 2396 -SIZE (hackage/cabal-install-3.6.3.0.tar.gz) = 2119242 +SIZE (hackage/cabal-install-3.8.1.0.tar.gz) = 2181366 +SIZE (hackage/cabal-install-solver-3.8.1.0.tar.gz) = 85413 +SIZE (hackage/cabal-install-solver-3.8.1.0_0.cabal) = 4764 SIZE (hackage/cryptohash-sha256-0.11.102.1.tar.gz) = 15707 -SIZE (hackage/cryptohash-sha256-0.11.102.1_0.cabal) = 5629 +SIZE (hackage/cryptohash-sha256-0.11.102.1_1.cabal) = 5671 +SIZE (hackage/data-array-byte-0.1.0.1.tar.gz) = 6784 +SIZE (hackage/data-array-byte-0.1.0.1_1.cabal) = 1989 SIZE (hackage/echo-0.1.4.tar.gz) = 5501 SIZE (hackage/echo-0.1.4_0.cabal) = 2834 SIZE (hackage/ed25519-0.0.5.0.tar.gz) = 80034 -SIZE (hackage/ed25519-0.0.5.0_5.cabal) = 4165 +SIZE (hackage/ed25519-0.0.5.0_6.cabal) = 4175 SIZE (hackage/edit-distance-0.2.2.1.tar.gz) = 13228 SIZE (hackage/edit-distance-0.2.2.1_1.cabal) = 2351 -SIZE (hackage/hackage-security-0.6.2.1.tar.gz) = 86396 -SIZE (hackage/hackage-security-0.6.2.1_1.cabal) = 12348 -SIZE (hackage/hashable-1.4.0.2.tar.gz) = 25528 -SIZE (hackage/hashable-1.4.0.2_0.cabal) = 5005 +SIZE (hackage/hackage-security-0.6.2.3.tar.gz) = 86611 +SIZE (hackage/hackage-security-0.6.2.3_0.cabal) = 12649 +SIZE (hackage/hashable-1.4.2.0.tar.gz) = 25094 +SIZE (hackage/hashable-1.4.2.0_0.cabal) = 4483 SIZE (hackage/lukko-0.1.1.3.tar.gz) = 28575 -SIZE (hackage/lukko-0.1.1.3_2.cabal) = 4556 +SIZE (hackage/lukko-0.1.1.3_3.cabal) = 4570 SIZE (hackage/network-3.1.2.7.tar.gz) = 139973 SIZE (hackage/network-3.1.2.7_0.cabal) = 4888 -SIZE (hackage/network-uri-2.6.4.1.tar.gz) = 32373 -SIZE (hackage/network-uri-2.6.4.1_0.cabal) = 2936 -SIZE (hackage/random-1.2.1.tar.gz) = 47143 -SIZE (hackage/random-1.2.1_0.cabal) = 6598 +SIZE (hackage/network-uri-2.6.4.2.tar.gz) = 31309 +SIZE (hackage/network-uri-2.6.4.2_0.cabal) = 3163 +SIZE (hackage/random-1.2.1.1.tar.gz) = 47109 +SIZE (hackage/random-1.2.1.1_0.cabal) = 6541 SIZE (hackage/regex-base-0.94.0.2.tar.gz) = 10488 -SIZE (hackage/regex-base-0.94.0.2_0.cabal) = 2635 +SIZE (hackage/regex-base-0.94.0.2_1.cabal) = 2643 SIZE (hackage/regex-posix-0.96.0.1.tar.gz) = 12853 -SIZE (hackage/regex-posix-0.96.0.1_0.cabal) = 2920 +SIZE (hackage/regex-posix-0.96.0.1_1.cabal) = 2954 SIZE (hackage/resolv-0.1.2.0.tar.gz) = 156710 -SIZE (hackage/resolv-0.1.2.0_4.cabal) = 4720 +SIZE (hackage/resolv-0.1.2.0_5.cabal) = 4720 +SIZE (hackage/safe-exceptions-0.1.7.3.tar.gz) = 14169 +SIZE (hackage/safe-exceptions-0.1.7.3_0.cabal) = 1398 SIZE (hackage/splitmix-0.1.0.4.tar.gz) = 22382 -SIZE (hackage/splitmix-0.1.0.4_0.cabal) = 6483 +SIZE (hackage/splitmix-0.1.0.4_2.cabal) = 6537 SIZE (hackage/tar-0.5.1.1.tar.gz) = 39155 -SIZE (hackage/tar-0.5.1.1_4.cabal) = 5459 -SIZE (hackage/th-compat-0.1.3.tar.gz) = 13718 -SIZE (hackage/th-compat-0.1.3_0.cabal) = 2888 -SIZE (hackage/zlib-0.6.2.3.tar.gz) = 149186 -SIZE (hackage/zlib-0.6.2.3_1.cabal) = 5329 +SIZE (hackage/tar-0.5.1.1_5.cabal) = 5459 +SIZE (hackage/th-compat-0.1.4.tar.gz) = 14838 +SIZE (hackage/th-compat-0.1.4_0.cabal) = 3135 +SIZE (hackage/zlib-0.6.3.0.tar.gz) = 369595 +SIZE (hackage/zlib-0.6.3.0_0.cabal) = 5216 diff --git a/devel/cabal-install/files/openbsd.json b/devel/cabal-install/files/openbsd.json index cd568c16165..2de28cd4ac3 100644 --- a/devel/cabal-install/files/openbsd.json +++ b/devel/cabal-install/files/openbsd.json @@ -7,78 +7,84 @@ ], "builtin": [], "dependencies": [ + { + "cabal_sha256": "07e8ddb19fe01781485f1522b6afc22aba680b0ab28ebe6bbfb84a2dd698ce0f", + "flags": [], + "package": "Cabal-syntax", + "revision": null, + "source": "local", + "src_sha256": null, + "version": "3.8.1.0" + }, { "cabal_sha256": null, - "flags": [ - "-bundled-binary-generic" - ], + "flags": [], "package": "Cabal", "revision": null, "source": "local", "src_sha256": null, - "version": "3.6.3.0" + "version": "3.8.1.0" }, { - "cabal_sha256": "714a55fd28d3e2533bd5b49e74f604ef8e5d7b06f249c8816f6c54aed431dcf1", + "cabal_sha256": "db25c2e17967aa6b6046ab8b1b96ba3f344ca59a62b60fb6113d51ea305a3d8e", "flags": [ "-optimised-mixer" ], "package": "splitmix", - "revision": 0, + "revision": 2, "source": "hackage", "src_sha256": "6d065402394e7a9117093dbb4530a21342c9b1e2ec509516c8a8d0ffed98ecaa", "version": "0.1.0.4" }, { - "cabal_sha256": "8bee24dc0c985a90ee78d94c61f8aed21c49633686f0f1c14c5078d818ee43a2", + "cabal_sha256": "dea1f11e5569332dc6c8efaad1cb301016a5587b6754943a49f9de08ae0e56d9", "flags": [], "package": "random", "revision": 0, "source": "hackage", - "src_sha256": "265c768fc5f2ca53cde6a87e706b4448cad474c3deece933c103f24453661457", - "version": "1.2.1" + "src_sha256": "3e1272f7ed6a4d7bd1712b90143ec326fee9b225789222379fea20a9c90c9b76", + "version": "1.2.1.1" }, { - "cabal_sha256": "037d70bb091c49f68726dde920f6a003b646835a86cdcb5b5ad58ad9af3207d9", + "cabal_sha256": "2ef1bd3511e82ba56f7f23cd793dd2da84338a1e7c2cbea5b151417afe3baada", "flags": [], - "package": "Cabal-syntax", - "revision": 0, + "package": "data-array-byte", + "revision": 1, "source": "hackage", - "src_sha256": "ca25e5fc601397565fa857f1aa477740fac7f43d659e77c4d9b1485dca239251", - "version": "3.6.0.0" + "src_sha256": "1bb6eca0b3e02d057fe7f4e14c81ef395216f421ab30fdaa1b18017c9c025600", + "version": "0.1.0.1" }, { - "cabal_sha256": "0cddd0229d1aac305ea0404409c0bbfab81f075817bd74b8b2929eff58333e55", + "cabal_sha256": "02acedd7ac829b52756fe481a1d53294d8f5d42aaa56df560c62c6cec3587a14", "flags": [ - "+containers", "+integer-gmp", "-random-initial-seed" ], "package": "hashable", "revision": 0, "source": "hackage", - "src_sha256": "83606edd356d914c075ecd44f6d5fe91a3b186aa0683c8dd8c9a7e8e22a47600", - "version": "1.4.0.2" + "src_sha256": "1b4000ea82b81f69d46d0af4152c10c6303873510738e24cfc4767760d30e3f8", + "version": "1.4.2.0" }, { - "cabal_sha256": "b83dec34a53520de84c6dd3dc7aae45d22409b46eb471c478b98108215a370f0", + "cabal_sha256": "2b9409023536823233ce3134558565d01b3382e651fa54ac8cb8a99967e023c9", "flags": [ "-bench" ], "package": "async", - "revision": 1, + "revision": 2, "source": "hackage", "src_sha256": "484df85be0e76c4fed9376451e48e1d0c6e97952ce79735b72d54297e7e0a725", "version": "2.2.4" }, { - "cabal_sha256": "d8699f46b485f105eea9c7158f3d432ca578e6bbe5d68751184e9899a41d430d", + "cabal_sha256": "bc14969ea4adfec6eee20264decf4a07c4002b38b2aa802d58d86b1a2cf7b895", "flags": [ "-old-bytestring", "-old-time" ], "package": "tar", - "revision": 4, + "revision": 5, "source": "hackage", "src_sha256": "b384449f62b2b0aa3e6d2cb1004b8060b01f21ec93e7b63e7af6d8fad8a9f1de", "version": "0.5.1.1" @@ -95,28 +101,27 @@ "version": "3.1.2.7" }, { - "cabal_sha256": "a16dd922947a6877defe52c4c38d1ab48ed3f85a826930f5d1a568741d619993", + "cabal_sha256": "6ca77c4e80b4e4109e30549c269631a9cc295c8fc2431ce4123972a5f80f7bfc", "flags": [], "package": "th-compat", "revision": 0, "source": "hackage", - "src_sha256": "6b5059caf6714f47da92953badf2f556119877e09708c14e206b3ae98b8681c6", - "version": "0.1.3" + "src_sha256": "d8f97ac14ab47b6b8a7b0fdb4ff95426322ec56badd01652ac15da4a44d4bab8", + "version": "0.1.4" }, { - "cabal_sha256": "a4765164ed0a2d1668446eb2e03460ce98645fbf083598c690846af79b7de10d", + "cabal_sha256": "1fde59abf5d82a9666b4415bc2b2e9e33f6c1309074fda12d50410c7dbd95f3b", "flags": [], "package": "network-uri", "revision": 0, "source": "hackage", - "src_sha256": "57856db93608a4d419f681b881c9b8d4448800d5a687587dc37e8a9e0b223584", - "version": "2.6.4.1" + "src_sha256": "9c188973126e893250b881f20e8811dca06c223c23402b06f7a1f2e995797228", + "version": "2.6.4.2" }, { - "cabal_sha256": "6042643c15a0b43e522a6693f1e322f05000d519543a84149cb80aeffee34f71", + "cabal_sha256": "b878d575c470bd1f72d37af6654d924ab2b9489d88de8a71bd74d9d5d726c013", "flags": [ "-conduit10", - "-mtl1", "+network-uri", "-warn-as-error", "-warp-tests" @@ -124,8 +129,8 @@ "package": "HTTP", "revision": 1, "source": "hackage", - "src_sha256": "d6091c037871ac3d08d021c906206174567499d5a26a6cb804cf530cd590fe2d", - "version": "4000.3.16" + "src_sha256": "df31d8efec775124dab856d7177ddcba31be9f9e0836ebdab03d94392f2dd453", + "version": "4000.4.1" }, { "cabal_sha256": "64abad7816ab8cabed8489e29f807b3a6f828e0b2cec0eae404323d69d36df9a", @@ -146,13 +151,35 @@ "version": "1.2.1.0" }, { - "cabal_sha256": "188d0b5a0491e8b686b32d9b144c9287760ba333d2509bf3f17e3d846fbc2332", + "cabal_sha256": "4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee", + "flags": [], + "package": "edit-distance", + "revision": 1, + "source": "hackage", + "src_sha256": "3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a", + "version": "0.2.2.1" + }, + { + "cabal_sha256": null, + "flags": [ + "-debug-conflict-sets", + "-debug-expensive-assertions", + "-debug-tracetree" + ], + "package": "cabal-install-solver", + "revision": null, + "source": "local", + "src_sha256": null, + "version": "3.8.1.0" + }, + { + "cabal_sha256": "facd0c04925ef925ec05243471fd16055229fdf51f64db1a1049de0cc6c6dfc3", "flags": [ "-exe", "+use-cbits" ], "package": "cryptohash-sha256", - "revision": 0, + "revision": 1, "source": "hackage", "src_sha256": "73a7dc7163871a80837495039a099967b11f5c4fe70a118277842f7a713c6bf6", "version": "0.11.102.1" @@ -169,16 +196,7 @@ "version": "0.1.4" }, { - "cabal_sha256": "4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee", - "flags": [], - "package": "edit-distance", - "revision": 1, - "source": "hackage", - "src_sha256": "3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a", - "version": "0.2.2.1" - }, - { - "cabal_sha256": "b6d9e5729b3053671700ecd02b4b95a4f315fe1b983aeb2d64cd25c3e7d828cb", + "cabal_sha256": "885c9e2410e5d91a08b199897df0867fecedf818216d7329a2d43a512833dd63", "flags": [ "+no-donna", "+test-doctests", @@ -186,86 +204,92 @@ "+test-properties" ], "package": "ed25519", - "revision": 4, + "revision": 6, "source": "hackage", "src_sha256": "d8a5958ebfa9309790efade64275dc5c441b568645c45ceed1b0c6ff36d6156d", "version": "0.0.5.0" }, { - "cabal_sha256": "c084c043a40632d3cafcac50fb5eeff84d91edb070a54baa94945f1c976f97c0", + "cabal_sha256": "efd4c08c4df1ac3f423858a834c0e3b5b4909febda66a901d12a8e1d57bddaa8", "flags": [ "+ofd-locking" ], "package": "lukko", - "revision": 2, + "revision": 3, "source": "hackage", "src_sha256": "a80efb60cfa3dae18682c01980d76d5f7e413e191cd186992e1bf7388d48ab1f", "version": "0.1.1.3" }, { - "cabal_sha256": "262a93dbf370be59f4ee57f3b1a51b338bc2c309797daa37c14f2262ae61dae4", + "cabal_sha256": "8214a9d37580f17f8b675109578a5dbe6853559eef156e34dc2233f1123ace33", "flags": [ "-bundled-c-zlib", "-non-blocking-ffi", "-pkg-config" ], "package": "zlib", - "revision": 1, + "revision": 0, "source": "hackage", - "src_sha256": "807f6bddf9cb3c517ce5757d991dde3c7e319953a22c86ee03d74534bd5abc88", - "version": "0.6.2.3" + "src_sha256": "9eaa989ad4534438b5beb51c1d3a4c8f6a088fdff0b259a5394fbf39aaee04da", + "version": "0.6.3.0" }, { - "cabal_sha256": "eb34c3e2fa39f9819293045c03e56148a7125573c1de265cdfe5d967f1d71c6e", + "cabal_sha256": "64fc60f3f4d02047c54956b6976c0e4fc72722891c6875ab10d95359bc00355a", "flags": [ "+base48", - "-cabal-syntax", + "+cabal-syntax", "+lukko", "-mtl21", "-old-directory", "+use-network-uri" ], "package": "hackage-security", - "revision": 1, + "revision": 0, "source": "hackage", - "src_sha256": "bf22cd16dde7d6b7130463f4d7324b64a2964d9ef3f523df97d7cb98544d64a8", - "version": "0.6.2.1" + "src_sha256": "52ee0576971955571d846b8e6c09638f89f4f7881f4a95173e44ccc0d856a066", + "version": "0.6.2.3" }, { - "cabal_sha256": "2561adac8ce373910948066debe090a22b336b129ba5af18c0332524d16e72ce", + "cabal_sha256": "4ff4425c710cddf440dfbac6cd52310bb6b23e17902390ff71c9fc7eaafc4fcc", "flags": [], "package": "regex-base", - "revision": 0, + "revision": 1, "source": "hackage", "src_sha256": "7b99408f580f5bb67a1c413e0bc735886608251331ad36322020f2169aea2ef1", "version": "0.94.0.2" }, { - "cabal_sha256": "b6421e5356766b0c0a78b6094ae2e3a6259b42c147b717283c03c1cb09163dca", + "cabal_sha256": "9dbba4b65a3bb6975d9740814be5593c6b2d2d6a0b3febc8ec940edb9a9bbdf4", "flags": [ "-_regex-posix-clib" ], "package": "regex-posix", - "revision": 0, + "revision": 1, "source": "hackage", "src_sha256": "c7827c391919227711e1cff0a762b1678fd8739f9c902fc183041ff34f59259c", "version": "0.96.0.1" }, { - "cabal_sha256": "2088eb9368b920f80bbe4e3b03c3b8484090208f5c3b31645bd67a9ef7d26db4", + "cabal_sha256": "61e2d98ff634b8b4b3db467772420c0f9c79c2da9ddf3d2daeb2af2417f2c535", "flags": [], "package": "resolv", - "revision": 4, + "revision": 5, "source": "hackage", "src_sha256": "81a2bafad484db123cf8d17a02d98bb388a127fd0f822fa022589468a0e64671", "version": "0.1.2.0" }, + { + "cabal_sha256": "6e9b1b233af80cc0aa17ea858d2641ba146fb11cbcc5970a52649e89d77282e2", + "flags": [], + "package": "safe-exceptions", + "revision": 0, + "source": "hackage", + "src_sha256": "91ce28d8f8a6efd31788d4827ed5cdcb9a546ad4053a86c56f7947c66a30b5bf", + "version": "0.1.7.3" + }, { "cabal_sha256": null, "flags": [ - "-debug-conflict-sets", - "-debug-expensive-assertions", - "-debug-tracetree", "+lukko", "+native-dns" ], @@ -273,7 +297,7 @@ "revision": null, "source": "local", "src_sha256": null, - "version": "3.6.3.0" + "version": "3.8.1.0" } ] } diff --git a/devel/cabal-install/patches/patch-cabal-install_cabal-install_cabal b/devel/cabal-install/patches/patch-cabal-install_cabal-install_cabal deleted file mode 100644 index 610970e4fce..00000000000 --- a/devel/cabal-install/patches/patch-cabal-install_cabal-install_cabal +++ /dev/null @@ -1,23 +0,0 @@ -Relaxes the upper boundaries to allow building with ghc 9.2.2. - -Index: cabal-install/cabal-install.cabal ---- cabal-install/cabal-install.cabal.orig -+++ cabal-install/cabal-install.cabal -@@ -278,7 +278,7 @@ executable cabal - echo >= 0.1.3 && < 0.2, - edit-distance >= 0.2.2 && < 0.3, - filepath >= 1.4.0.0 && < 1.5, -- hashable >= 1.0 && < 1.4, -+ hashable >= 1.0 && < 1.5, - HTTP >= 4000.1.5 && < 4000.4, - mtl >= 2.0 && < 2.3, - network-uri >= 2.6.0.2 && < 2.7, -@@ -287,7 +287,7 @@ executable cabal - random >= 1.2 && < 1.3, - stm >= 2.0 && < 2.6, - tar >= 0.5.0.3 && < 0.6, -- time >= 1.5.0.1 && < 1.11, -+ time >= 1.5.0.1 && < 1.12, - transformers >= 0.4.2.0 && < 0.6, - zlib >= 0.5.3 && < 0.7, - hackage-security >= 0.6.0.1 && < 0.7, -- 2.39.0
