From b4b392d63fc36b7bc4d81f94425c81b623fae67e Mon Sep 17 00:00:00 2001 From: slotThe Date: Wed, 25 Mar 2020 20:51:13 +0100 Subject: [PATCH] cabal-install: update to 3.0.0.0 --- srcpkgs/cabal-install/patches/ghc-8.8.3.patch | 73 +++++++++++++++++++ srcpkgs/cabal-install/patches/http.patch | 36 +++++++++ srcpkgs/cabal-install/template | 7 +- 3 files changed, 113 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/cabal-install/patches/ghc-8.8.3.patch create mode 100644 srcpkgs/cabal-install/patches/http.patch diff --git a/srcpkgs/cabal-install/patches/ghc-8.8.3.patch b/srcpkgs/cabal-install/patches/ghc-8.8.3.patch new file mode 100644 index 0000000000..137e502c37 --- /dev/null +++ b/srcpkgs/cabal-install/patches/ghc-8.8.3.patch @@ -0,0 +1,73 @@ +--- bootstrap.sh 2020-03-20 16:17:36.454442784 +0100 ++++ bootstrap.sh 2020-03-20 16:25:42.608415294 +0100 +@@ -230,19 +230,19 @@ + # >= 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]\.?" ++TIME_VER="1.9.3" TIME_VER_REGEXP="1\.[1-9]\.?" + # >= 1.1 && < 1.10 + RANDOM_VER="1.1" RANDOM_VER_REGEXP="1\.[01]\.?" + # >= 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.1.3"; 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,14 +260,14 @@ + # 0.2.2.* + ED25519_VER="0.0.5.0"; ED25519_VER_REGEXP="0\.0\.?" + # 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.* +-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} diff --git a/srcpkgs/cabal-install/patches/http.patch b/srcpkgs/cabal-install/patches/http.patch new file mode 100644 index 0000000000..9f4688b1a6 --- /dev/null +++ b/srcpkgs/cabal-install/patches/http.patch @@ -0,0 +1,36 @@ +--- 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 diff --git a/srcpkgs/cabal-install/template b/srcpkgs/cabal-install/template index 4bc3051f8c..da48df214f 100644 --- a/srcpkgs/cabal-install/template +++ b/srcpkgs/cabal-install/template @@ -1,7 +1,7 @@ # Template file for 'cabal-install' pkgname=cabal-install -version=2.4.1.0 -revision=4 +version=3.0.0.0 +revision=1 hostmakedepends="ghc curl tar which" makedepends="gmp-devel libffi-devel zlib-devel" depends="ghc" @@ -10,10 +10,11 @@ maintainer="Leah Neukirchen " 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=69bcb2b54a064982412e1587c3c5c1b4fada3344b41b568aab25730034cb21ad +checksum=a432a7853afe96c0fd80f434bd80274601331d8c46b628cd19a0d8e96212aaf1 nopie_files="/usr/bin/cabal" do_build() { + vsed -e 's/< *4/<5/' -i $pkgname.cabal PREFIX=$PWD/build sh bootstrap.sh --user } do_install() {