From 126a58ce2b46946d1adcf799eb418e83c068911a Mon Sep 17 00:00:00 2001 From: slotThe Date: Sun, 28 Feb 2021 18:34:26 +0100 Subject: [PATCH] cabal-install: update to 3.4.0.0 --- .../patches/ghc-8.10.4-build.diff | 43 ++++++++++++++++++ srcpkgs/cabal-install/patches/ghc-8.8.4.patch | 45 ------------------- srcpkgs/cabal-install/template | 16 ++++--- 3 files changed, 52 insertions(+), 52 deletions(-) create mode 100644 srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff delete mode 100644 srcpkgs/cabal-install/patches/ghc-8.8.4.patch diff --git a/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff new file mode 100644 index 00000000000..a3eaaa90f4f --- /dev/null +++ b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff @@ -0,0 +1,43 @@ +--- a/bootstrap/linux-8.10.1.json 2021-02-20 11:28:17.000000000 +0100 ++++ b/bootstrap/linux-8.10.1.json 2021-02-28 18:54:36.417761219 +0100 +@@ -14,7 +14,7 @@ + }, + { + "package": "base", +- "version": "4.14.0.0" ++ "version": "4.14.1.0" + }, + { + "package": "array", +@@ -26,7 +26,7 @@ + }, + { + "package": "bytestring", +- "version": "0.10.10.0" ++ "version": "0.10.12.0" + }, + { + "package": "containers", +@@ -62,7 +62,7 @@ + }, + { + "package": "text", +- "version": "1.2.3.2" ++ "version": "1.2.4.1" + }, + { + "package": "parsec", +@@ -74,11 +74,11 @@ + }, + { + "package": "process", +- "version": "1.6.8.2" ++ "version": "1.6.9.0" + }, + { + "package": "ghc-boot-th", +- "version": "8.10.1" ++ "version": "8.10.4" + }, + { + "package": "template-haskell", diff --git a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch b/srcpkgs/cabal-install/patches/ghc-8.8.4.patch deleted file mode 100644 index f80c72add1d..00000000000 --- a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/bootstrap.sh 2001-09-09 03:46:40.000000000 +0200 -+++ b/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]\." - # >= 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.* -@@ -262,7 +262,7 @@ - # 0.0.* - 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 diff --git a/srcpkgs/cabal-install/template b/srcpkgs/cabal-install/template index 2c15789b1f9..99ebb54427f 100644 --- a/srcpkgs/cabal-install/template +++ b/srcpkgs/cabal-install/template @@ -1,24 +1,26 @@ # Template file for 'cabal-install' pkgname=cabal-install -version=3.2.0.0 +version=3.4.0.0 revision=1 +wrksrc=cabal-${pkgname}-${version} hostmakedepends="ghc curl tar which" -makedepends="gmp-devel libffi-devel zlib-devel" +makedepends="gmp-devel libffi-devel zlib-devel python3" depends="ghc" short_desc="Command-line interface for Cabal and Hackage" 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=a0555e895aaf17ca08453fde8b19af96725da8398e027aa43a49c1658a600cb0 +distfiles="https://github.com/haskell/cabal/archive/${pkgname}-${version}.tar.gz" +checksum=e4fbd5eb1d77400746a993679181f159aa415a37b931b26d67f5602f63ce971c nopie_files="/usr/bin/cabal" nocross=yes do_build() { - PREFIX=$PWD/build sh bootstrap.sh --jobs ${XBPS_MAKEJOBS} --user + PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.1.json } do_install() { - vbin build/bin/cabal - vman build/share/man/man1/cabal.1 + vbin _build/bin/cabal + PREFIX=$PWD _build/bin/cabal man --raw > cabal.1 + vman cabal.1 vlicense LICENSE }