cabal-install: update to 3.2.0.0
This commit is contained in:
slotThe
Daniel Kolesa
parent
2b5fce3440
commit
c2bc6839c9
3 changed files with 8 additions and 73 deletions
|
|
@ -1,5 +1,5 @@
|
|||
--- bootstrap.sh 2020-03-20 16:17:36.454442784 +0100
|
||||
+++ bootstrap.sh 2020-03-20 16:25:42.608415294 +0100
|
||||
--- bootstrap.sh 2001-09-09 03:46:40.000000000 +0200
|
||||
+++ bootstrap.sh 2020-09-12 15:29:54.913108294 +0200
|
||||
@@ -230,19 +230,19 @@
|
||||
# >= 0.2.* && < 0.6
|
||||
MTL_VER="2.2.2"; MTL_VER_REGEXP="[2]\."
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
+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)"
|
||||
+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]\.?"
|
||||
+TIME_VER="1.9.3" TIME_VER_REGEXP="1\.[1-9]\.?"
|
||||
|
|
@ -34,40 +34,12 @@
|
|||
# >= 0.1.1 && < 0.2
|
||||
MINTTY_VER="0.1.2"; MINTTY_VER_REGEXP="0\.1\.?"
|
||||
# 0.1.*
|
||||
@@ -260,14 +260,14 @@
|
||||
# 0.2.2.*
|
||||
ED25519_VER="0.0.5.0"; ED25519_VER_REGEXP="0\.0\.?"
|
||||
@@ -262,7 +262,7 @@
|
||||
# 0.0.*
|
||||
-HACKAGE_SECURITY_VER="0.5.3.0"; HACKAGE_SECURITY_VER_REGEXP="0\.5\.((2\.[2-9]|[3-9])|3)"
|
||||
- # >= 0.5.2 && < 0.6
|
||||
+HACKAGE_SECURITY_VER="0.6.0.0"; HACKAGE_SECURITY_VER_REGEXP="0\.6\."
|
||||
+ # >= 0.6.*
|
||||
HACKAGE_SECURITY_VER="0.6.0.0"; 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
|
||||
-ZIP_ARCHIVE_VER="0.3.3"; ZIP_ARCHIVE_REGEXP="0\.3\.[3-9]"
|
||||
- # >= 0.3.3 && < 0.4
|
||||
+LUKKO_VER="0.1.1"; LUKKO_VER_REGEXP="0\.1\.[1-9]"
|
||||
+ # >= 0.1.1 && <0.2
|
||||
|
||||
HACKAGE_URL="https://hackage.haskell.org/package"
|
||||
|
||||
@@ -471,7 +471,7 @@
|
||||
info_pkg "ed25519" ${ED25519_VER} ${ED25519_VER_REGEXP}
|
||||
info_pkg "tar" ${TAR_VER} ${TAR_VER_REGEXP}
|
||||
info_pkg "digest" ${DIGEST_VER} ${DIGEST_REGEXP}
|
||||
-info_pkg "zip-archive" ${ZIP_ARCHIVE_VER} ${ZIP_ARCHIVE_REGEXP}
|
||||
+info_pkg "lukko" ${LUKKO_VER} ${LUKKO_REGEXP}
|
||||
info_pkg "hackage-security" ${HACKAGE_SECURITY_VER} \
|
||||
${HACKAGE_SECURITY_VER_REGEXP}
|
||||
|
||||
@@ -509,7 +509,7 @@
|
||||
do_pkg "ed25519" ${ED25519_VER} ${ED25519_VER_REGEXP}
|
||||
do_pkg "tar" ${TAR_VER} ${TAR_VER_REGEXP}
|
||||
do_pkg "digest" ${DIGEST_VER} ${DIGEST_REGEXP}
|
||||
-do_pkg "zip-archive" ${ZIP_ARCHIVE_VER} ${ZIP_ARCHIVE_REGEXP}
|
||||
+do_pkg "lukko" ${LUKKO_VER} ${LUKKO_REGEXP}
|
||||
do_pkg "hackage-security" ${HACKAGE_SECURITY_VER} \
|
||||
${HACKAGE_SECURITY_VER_REGEXP}
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
--- Distribution/Client/Security/HTTP.hs
|
||||
+++ 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 maching 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
|
||||
--- cabal-install.cabal
|
||||
+++ cabal-install.cabal
|
||||
@@ -336,7 +336,7 @@ executable cabal
|
||||
time >= 1.5.0.1 && < 1.10,
|
||||
transformers >= 0.4.2.0 && < 0.6,
|
||||
zlib >= 0.5.3 && < 0.7,
|
||||
- hackage-security >= 0.5.2.2 && < 0.6,
|
||||
+ hackage-security >= 0.6.0.0 && < 0.7,
|
||||
text >= 1.2.3 && < 1.3,
|
||||
parsec >= 3.1.13.0 && < 3.2
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'cabal-install'
|
||||
pkgname=cabal-install
|
||||
version=3.0.0.0
|
||||
version=3.2.0.0
|
||||
revision=1
|
||||
hostmakedepends="ghc curl tar which"
|
||||
makedepends="gmp-devel libffi-devel zlib-devel"
|
||||
|
|
@ -10,11 +10,10 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
|
|||
license="BSD-3-Clause"
|
||||
homepage="https://hackage.haskell.org/package/cabal-install"
|
||||
distfiles="https://hackage.haskell.org/packages/archive/${pkgname}/${version}/${pkgname}-${version}.tar.gz"
|
||||
checksum=a432a7853afe96c0fd80f434bd80274601331d8c46b628cd19a0d8e96212aaf1
|
||||
checksum=a0555e895aaf17ca08453fde8b19af96725da8398e027aa43a49c1658a600cb0
|
||||
nopie_files="/usr/bin/cabal"
|
||||
|
||||
do_build() {
|
||||
vsed -e 's/< *4/<5/' -i $pkgname.cabal
|
||||
PREFIX=$PWD/build sh bootstrap.sh --user
|
||||
}
|
||||
do_install() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue