testing/idris: upgrade to 1.3.2

2 files changed, 80 insertions, 81 deletions

diff --git a/testing/idris/APKBUILD b/testing/idris/APKBUILD
index ce4f8f7c86..22de8a4335 100644
--- a/testing/idris/APKBUILD
+++ b/testing/idris/APKBUILD
@@ -2,13 +2,13 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Mitch Tishmack <mitch.tishmack@gmail.com>
 pkgname=idris
-pkgver=1.3.0
-pkgrel=2
+pkgver=1.3.2
+pkgrel=0
 pkgdesc="A Language with Dependent Types"
 url="https://www.idris-lang.org/"
 # Note: same as ghc, if it gets ported elsewhere this should run too.
 # armhf: disabled due to build failure
-arch=""
+arch="x86_64"
 license="BSD-3-Clause"
 depends="gmp-dev gcc"
 makedepends="ghc cabal libffi-dev ncurses-dev zlib-dev"
@@ -28,11 +28,11 @@ cabal_update() {
 	cd "$builddir"
 
 	# Create cabal config and fetch index.
-	HOME="$_cabal_home" cabal update
+	HOME="$_cabal_home" cabal v1-update
 
 	# Resolve deps and generate fresh cabal.config with version constraints.
 	rm -f cabal.config
-	HOME="$_cabal_home" cabal freeze --shadow-installed-packages
+	HOME="$_cabal_home" cabal v1-freeze --shadow-installed-packages
 
 	# Add version tag at the first line.
 	sed -i "1i--$pkgver" cabal.config
@@ -89,7 +89,7 @@ prepare() {
 	fi
 
 	# Create cabal config and fetch index.
-	HOME="$_cabal_home" cabal update
+	HOME="$_cabal_home" cabal v1-update
 
 	# Cabal implicitly loads cabal.config from the project's directory.
 	ln -sf "$srcdir"/cabal.config .
@@ -112,12 +112,12 @@ build() {
 	# Note: for libffi force constraints manually via the freeze file to prevent
 	# cabal from possibly using newer constraints for libffi that might intersect
 	# with those idris uses.
-	HOME="$_cabal_home" cabal install $_cabal_install_opts --offline --constraint=cabal-doctest==1.0.2 \
+	HOME="$_cabal_home" cabal v1-install $_cabal_install_opts --offline --constraint=cabal-doctest==1.0.2 \
 		$(_cabal_constraints) -v libffi-0.1
-	HOME="$_cabal_home" cabal install $_cabal_install_opts --offline --only-dependencies -v
+	HOME="$_cabal_home" cabal v1-install $_cabal_install_opts --offline --only-dependencies -v
 
 	# Note: ordering of prefixes is important!
-	HOME="$_cabal_home" cabal configure \
+	HOME="$_cabal_home" cabal v1-configure \
 		--prefix='/usr' \
 		--docdir='$prefix/share/doc' \
 		--datadir='$prefix/share' \
@@ -130,7 +130,7 @@ build() {
 		--disable-profiling \
 		--disable-library-profiling \
 		--flags='GMP FFI standalone'
-	HOME="$_cabal_home" cabal build
+	HOME="$_cabal_home" cabal v1-build -j
 }
 
 # TODO: Run upstream tests and/or figure out how to set paths to be able
@@ -140,7 +140,7 @@ check() {
 }
 
 package() {
-	HOME="$_cabal_home" cabal copy --destdir="$pkgdir"
+	HOME="$_cabal_home" cabal v1-copy --destdir="$pkgdir"
 
 	cd "$pkgdir"
 
@@ -153,5 +153,5 @@ package() {
 	mv usr/share/doc/LICENSE usr/share/licenses/$pkgname/
 }
 
-sha512sums="d015d643e0c121702c8e1a8a27db0a4f071fae35437bb4835314e70499b1eae123ab92d8272f0b91fae6d03b46cceee887e27935c950341c0905a4cdb43cbb84  idris-1.3.0.tar.gz
-713ae5a61d5fe297a4e4afba61d8b5d4422183780e696bd3f6059a0753a391b4cbb869e1baed24203ad2f626421e5be9cd05785cf286e003ac236f0ed024f606  cabal.config"
+sha512sums="0cd2ecb38ae1d535a38f6f4fbe39ce6d5d4ff496b97214fb24968e9c5b726c824dc79528d00e89d800563b20d4c8b2d47f0c6613433d1380802a2bd10d0816f3  idris-1.3.2.tar.gz
+33aa12d73e8cec2284a5c9b7c38c36c42aac44120ebbb75bacdb97d3b61b16382e116a1748c7a44ec76356bea2f63b9aaf15092af982942a1ff51a56d9cac9f4  cabal.config"
diff --git a/testing/idris/cabal.config b/testing/idris/cabal.config
index f7723faf36..a681c4df3b 100644
--- a/testing/idris/cabal.config
+++ b/testing/idris/cabal.config
@@ -1,99 +1,98 @@
---1.3.0
-constraints: Cabal ==2.2.0.1,
-             aeson ==1.2.4.0,
+--1.3.2
+constraints: Cabal ==2.4.0.1,
+             aeson ==1.4.7.1,
              annotated-wl-pprint ==0.7.0,
-             ansi-terminal ==0.8.0.4,
+             ansi-terminal ==0.8.2,
              ansi-wl-pprint ==0.6.8.2,
-             array ==0.5.2.0,
-             async ==2.2.1,
-             attoparsec ==0.13.2.2,
-             base ==4.11.1.0,
-             base-compat ==0.9.3,
-             base-orphans ==0.7,
-             base64-bytestring ==1.0.0.1,
-             binary ==0.8.5.1,
+             array ==0.5.3.0,
+             async ==2.2.2,
+             attoparsec ==0.13.2.4,
+             base ==4.12.0.0,
+             base-compat ==0.11.1,
+             base-compat-batteries ==0.11.1,
+             base-orphans ==0.8.2,
+             base64-bytestring ==1.0.0.3,
+             binary ==0.8.6.0,
              blaze-builder ==0.4.1.0,
-             blaze-html ==0.9.1.1,
-             blaze-markup ==0.8.2.1,
+             blaze-html ==0.9.1.2,
+             blaze-markup ==0.8.2.4,
              bytestring ==0.10.8.2,
-             case-insensitive ==1.2.0.11,
-             cheapskate ==0.1.1,
-             code-page ==0.1.3,
-             colour ==2.3.4,
-             constraints ==0.10,
-             containers ==0.5.11.0,
+             case-insensitive ==1.2.1.0,
+             cheapskate ==0.1.1.2,
+             code-page ==0.2,
+             colour ==2.3.5,
+             constraints ==0.12,
+             containers ==0.6.0.1,
              css-text ==0.1.3.0,
              data-default ==0.7.1.1,
              data-default-class ==0.1.2.0,
              data-default-instances-containers ==0.0.1,
              data-default-instances-dlist ==0.0.1,
              data-default-instances-old-locale ==0.0.1,
-             deepseq ==1.4.3.0,
+             deepseq ==1.4.4.0,
              digest ==0.0.1.2,
-             directory ==1.3.1.5,
-             dlist ==0.8.0.4,
-             enclosed-exceptions ==1.0.2,
-             exceptions ==0.10.0,
-             filepath ==1.4.2,
-             fingertree ==0.1.4.1,
+             directory ==1.3.3.0,
+             dlist ==0.8.0.8,
+             enclosed-exceptions ==1.0.3,
+             exceptions ==0.10.4,
+             filepath ==1.4.2.1,
+             fingertree ==0.1.4.2,
              fsnotify ==0.3.0.1,
 
-             ghc-prim ==0.5.2.0,
-             hashable ==1.2.7.0,
-             haskeline ==0.7.4.2,
-             hinotify ==0.3.10,
-             hsc2hs ==0.68.3,
+             ghc-prim ==0.5.3,
+             hashable ==1.3.0.0,
+             haskeline ==0.7.4.3,
+             hinotify ==0.4,
+             hsc2hs ==0.68.7,
              ieee754 ==0.8.0,
              integer-gmp ==1.0.2.0,
-             integer-logarithms ==1.0.2.1,
-             lifted-async ==0.10.0.2,
+             integer-logarithms ==1.0.3,
+             lifted-async ==0.10.0.6,
              lifted-base ==0.2.3.12,
-             megaparsec ==6.5.0,
+             megaparsec ==7.0.5,
              monad-control ==1.0.2.3,
              mtl ==2.2.2,
-             network ==2.6.3.5,
-             network-uri ==2.6.1.0,
+             network ==2.8.0.1,
+             network-uri ==2.6.3.0,
              old-locale ==1.0.0.7,
-             old-time ==1.1.0.3,
-             optparse-applicative ==0.14.2.0,
+             optparse-applicative ==0.14.3.0,
              parsec ==3.1.13.0,
-             parser-combinators ==1.0.0,
+             parser-combinators ==1.2.1,
              pretty ==1.1.3.6,
-             primitive ==0.6.4.0,
-             process ==1.6.3.0,
+             primitive ==0.7.0.1,
+             process ==1.6.5.0,
              random ==1.1,
-             regex-base ==0.93.2,
-             regex-tdfa ==1.2.3,
+             regex-base ==0.94.0.0,
+             regex-tdfa ==1.3.1.0,
 
-             safe ==0.3.17,
+             safe ==0.3.18,
              scientific ==0.3.6.2,
-             semigroups ==0.18.4,
-             shelly ==1.8.1,
-             split ==0.2.3.3,
-             stm ==2.4.5.0,
-             syb ==0.7,
-             system-fileio ==0.3.16.3,
-             system-filepath ==0.4.14,
-             tagged ==0.8.5,
-             tagsoup ==0.14.6,
-             template-haskell ==2.13.0.0,
+             semigroups ==0.19.1,
+             shelly ==1.9.0,
+             split ==0.2.3.4,
+             stm ==2.5.0.0,
+             syb ==0.7.1,
+             tagged ==0.8.6,
+             tagsoup ==0.14.8,
+             template-haskell ==2.14.0.0,
              terminal-size ==0.3.2.1,
-             terminfo ==0.4.1.1,
-             text ==1.2.3.0,
-             th-abstraction ==0.2.6.0,
+             terminfo ==0.4.1.2,
+             text ==1.2.3.1,
+             th-abstraction ==0.3.2.0,
              time ==1.8.0.2,
-             time-locale-compat ==0.1.1.4,
-             transformers ==0.5.5.0,
+             time-compat ==1.9.3,
+             transformers ==0.5.6.2,
              transformers-base ==0.4.5.2,
-             transformers-compat ==0.6.2,
+             transformers-compat ==0.6.5,
+             type-equality ==1,
              uniplate ==1.6.12,
              unix ==2.7.2.2,
-             unix-compat ==0.5.0.1,
-             unordered-containers ==0.2.9.0,
+             unix-compat ==0.5.2,
+             unordered-containers ==0.2.10.0,
              utf8-string ==1.0.1.1,
              uuid-types ==1.0.3,
-             vector ==0.12.0.1,
-             vector-binary-instances ==0.2.4,
-             xss-sanitize ==0.3.5.7,
-             zip-archive ==0.3.2.5,
-             zlib ==0.6.2
+             vector ==0.12.1.2,
+             vector-binary-instances ==0.2.5.1,
+             xss-sanitize ==0.3.6,
+             zip-archive ==0.4.1,
+             zlib ==0.6.2.1