diff --git a/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff deleted file mode 100644 index a3eaaa90f4f..00000000000 --- a/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff +++ /dev/null @@ -1,43 +0,0 @@ ---- 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/template b/srcpkgs/cabal-install/template index 18ce63f254c..d6d71870999 100644 --- a/srcpkgs/cabal-install/template +++ b/srcpkgs/cabal-install/template @@ -1,8 +1,8 @@ # Template file for 'cabal-install' pkgname=cabal-install -version=3.4.0.0 -revision=2 -wrksrc=cabal-${pkgname}-${version} +version=3.6.2.0 +revision=1 +wrksrc=cabal-Cabal-v${version} hostmakedepends="ghc curl tar which" makedepends="gmp-devel libffi-devel zlib-devel python3" depends="ghc" @@ -10,8 +10,8 @@ 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://github.com/haskell/cabal/archive/${pkgname}-${version}.tar.gz" -checksum=e4fbd5eb1d77400746a993679181f159aa415a37b931b26d67f5602f63ce971c +distfiles="https://github.com/haskell/cabal/archive/Cabal-v${version}.tar.gz" +checksum=dcf31e82cd85ea3236be18cc36c68058948994579ea7de18f99175821dbbcb64 nopie_files="/usr/bin/cabal" nocross=yes @@ -19,12 +19,12 @@ post_patch() { case "${XBPS_TARGET_MACHINE}" in i686*) # https://github.com/haskell/cabal/issues/7313 - vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.1.json ;; + vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.7.json ;; esac } do_build() { - PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.1.json + PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.7.json } do_install() { vbin _build/bin/cabal