Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [WIP] GHC 8.10.4
@ 2021-03-16 10:48 slotThe
  2021-03-16 16:44 ` [PR PATCH] [Updated] " slotThe
                   ` (38 more replies)
  0 siblings, 39 replies; 40+ messages in thread
From: slotThe @ 2021-03-16 10:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2950 bytes --]

There is a new pull request by slotThe against master on the void-packages repository

https://github.com/slotThe/void-packages ghc-8.10.4
https://github.com/void-linux/void-packages/pull/29506

[WIP] GHC 8.10.4
It's that time of the year again!

- [X] ghc; I took over as maintainer here, @leahneukirchen said that was okay on IRC (cc'ing here to make sure)
- [ ] ghc-bin; took over as mainainer of orphaned package.
    - [X] x86_64-musl; [Link here](https://www34.zippyshare.com/d/yvtjb7uJ/38780/ghc-8.10.4-x86_64-void-linux-musl.tar.xz)
    - [ ] i686-musl
    cc @q66 for these
    - [ ] ppc64le
    - [ ] ppc64le-musl
- [X] cabal-install
- [X] stack
 
Rebuild literally every single haskell package we have and see if anything's broken:

- [ ] git-mediate
- [ ] kmonad
- [ ] cgrep
- [ ] debug-me
- [ ] hlint
- [ ] hoogle
- [ ] darcs
- [ ] shellcheck
- [ ] git-annex
- [ ] hledger
- [ ] pandoc
- [ ] xmobar

For the following two I'd like to fix #6414 while we're at it.  Because stack can't install libraries globally, this would involve either removing these packages entirely and advising users to install them in their own [stack or cabal projects](https://github.com/xmonad/xmonad-testing), or finding a way to build them with cabal and updating ghc's data base accordingly.  This would probably use `v1` commands, as we don't want to nuke our users db if we update xmonad. Cc @xaltsc as the current maintainer and @chilledfrogs as someone who might want to tackle this (if I read the IRC discussion correctly). 

- [ ] xmonad
- [ ] xmonad-contrib

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


A patch file from https://github.com/void-linux/void-packages/pull/29506.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghc-8.10.4-29506.patch --]
[-- Type: text/x-diff, Size: 19529 bytes --]

From 42f34d3da820d46fabe371221f59f836683e8de7 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 31 Jan 2021 14:31:24 +0100
Subject: [PATCH 1/4] ghc: update to 8.10.4

The change of maintainership was okay-ed by Leah.
---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch | 41 +++++++++++-------------
 srcpkgs/ghc/template                     |  8 ++---
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index ac353ed417e5..c9bd2583abe0 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -85,7 +85,7 @@ index ec3c18a..0359be7 100644
 +        in Right [ 0x3D800000 .|. hi16 w32,
 +                   0x618C0000 .|. lo16 w32,
 +                   0x7D8903A6, 0x4E800420 ]
- 
+
      ArchPPC64LE ->
          -- The ABI requires r12 to point to the function's entry point.
 diff --git a/rts/Adjustor.c b/rts/Adjustor.c
@@ -93,7 +93,7 @@ index d360cfe..ab7ede7 100644
 --- a/rts/Adjustor.c
 +++ b/rts/Adjustor.c
 @@ -49,7 +49,7 @@ Haskell side.
- 
+
  #if defined(i386_HOST_ARCH)
  extern void adjustorCode(void);
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
@@ -104,16 +104,16 @@ index d360cfe..ab7ede7 100644
 @@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
  extern void obscure_ccall_ret_code(void);
  #endif
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
- 
+
  /* !!! !!! WARNING: !!! !!!
 @@ -318,7 +318,7 @@ typedef struct AdjustorStub {
  } AdjustorStub;
  #endif
- 
+
 -#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  static int totalArgumentSize(char *typeString)
@@ -131,10 +131,10 @@ index d360cfe..ab7ede7 100644
 @@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
          }
      }
- 
+
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-         
+
  #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
  #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
 @@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
@@ -151,9 +151,9 @@ index 2795b83..63cfe91 100644
 --- a/rts/AdjustorAsm.S
 +++ b/rts/AdjustorAsm.S
 @@ -2,7 +2,7 @@
- 
+
  /* ******************************** PowerPC ******************************** */
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
@@ -166,34 +166,31 @@ index 934926e..2ff8662 100644
 @@ -717,7 +717,7 @@ StgRunIsImplementedInAssembler(void)
     Everything is in assembler, so we don't have to deal with GCC...
     -------------------------------------------------------------------------- */
- 
+
 -#if defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
- 
+
  static void GNUC3_ATTRIBUTE(used)
  StgRunIsImplementedInAssembler(void)
 @@ -842,7 +842,7 @@ StgRunIsImplementedInAssembler(void)
- 
+
  #endif
- 
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
  /* -----------------------------------------------------------------------------
     PowerPC 64 little endian architecture
- 
+
 diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
 index 9274a44..3b4fc33 100644
 --- a/rts/StgCRunAsm.S
 +++ b/rts/StgCRunAsm.S
-@@ -1,7 +1,7 @@
- #include "ghcconfig.h"
- #include "rts/Constants.h"
- 
+@@ -5,7 +5,7 @@
+  * then functions StgRun/StgReturn are implemented in file StgCRun.c */
+ #if !defined(USE_MINIINTERPRETER)
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
- # ifdef linux_HOST_OS
+ # if defined(linux_HOST_OS)
  # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
  	.file	"StgCRun.c"
--- 
-2.30.0
-
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 0b1440b2f6d9..c6acfa79e75d 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,8 +1,8 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.8.4
-revision=2
+version=8.10.4
+revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
 hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
@@ -10,11 +10,11 @@ hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
 makedepends="libnuma-devel"
 depends="perl gcc libffi-devel gmp-devel libnuma-devel"
 short_desc="Glorious Haskell Compiler"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d
+checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
 patch_args="-Np1"
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"

From e7e9d4710f6d42c6edb4e482643ce466864ce090 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 28 Feb 2021 18:34:26 +0100
Subject: [PATCH 2/4] 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 000000000000..63965ca12d44
--- /dev/null
+++ b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
@@ -0,0 +1,43 @@
+--- bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
++++ 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 1dd08f07fb44..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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]\."
-                        #  >= 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 f8b18f32cdb2..3ab1c2382454 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 <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=a0555e895aaf17ca08453fde8b19af96725da8398e027aa43a49c1658a600cb0
+distfiles="https://github.com/haskell/cabal/archive/cabal-install-3.4.0.0.tar.gz"
+checksum=e4fbd5eb1d77400746a993679181f159aa415a37b931b26d67f5602f63ce971c
 nopie_files="/usr/bin/cabal"
 nocross=yes
 
 do_build() {
-	PREFIX=$PWD/build sh bootstrap.sh --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
 }

From 5dd4586e919951ac5fed74d4b8208ab2a577a9cc Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 12:37:23 +0100
Subject: [PATCH 3/4] ghc-bin: update to 8.10.4

Take over maintainership of orphaned package.
---
 srcpkgs/ghc-bin/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 9101601358b9..eacbca4e74f8 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,13 +1,13 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.8.4
+version=8.10.4
 revision=1
 archs="i686* x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
 short_desc="Glorious Haskell Compiler - precompiled binaries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 nostrip=yes
@@ -15,17 +15,17 @@ noshlibprovides=yes
 conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
-	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb8-linux.tar.xz"
-	checksum=51a36892f1264744195274187298d13ac62bce2da86d4ddf76d8054ab90f2feb
+	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
+	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=779647d3f4e6e39da9e13b2559319ede76b4fff1107e4dc369a09aadeecad971
+	checksum=56e53f46ad53e6640753d608d01228528fca8ccec01b09bba6ad3b6890a18994
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0
+	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
 	;;
 i686-musl)
 	distfiles="https://distfiles.voidlinux.de/ghc-${version}-i386-unknown-linux-musl.tar.xz"

From 89ded9eeb013f6855dbd9ab4b788125ae171726a Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 15:11:29 +0100
Subject: [PATCH 4/4] stack: update to 2.5.1.1

---
 srcpkgs/stack/patches/datakinds.patch | 14 ------
 srcpkgs/stack/patches/ghc-8.8.4.patch | 70 ---------------------------
 srcpkgs/stack/patches/ppc.patch       | 18 +++----
 srcpkgs/stack/template                | 10 ++--
 4 files changed, 14 insertions(+), 98 deletions(-)
 delete mode 100644 srcpkgs/stack/patches/datakinds.patch
 delete mode 100644 srcpkgs/stack/patches/ghc-8.8.4.patch

diff --git a/srcpkgs/stack/patches/datakinds.patch b/srcpkgs/stack/patches/datakinds.patch
deleted file mode 100644
index 1c06480515f7..000000000000
--- a/srcpkgs/stack/patches/datakinds.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Stack/Storage/User.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/User.hs	2020-12-06 20:51:06.632607164 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
---- src/Stack/Storage/Project.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/Project.hs	2020-12-06 21:55:21.349484738 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch
deleted file mode 100644
index 6b55c176e150..000000000000
--- a/srcpkgs/stack/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- masterdir/builddir/stack-2.5.1/stack.cabal	2020-10-17 17:19:10.724179166 +0200
-+++ stack.cabal	2020-10-17 17:18:03.803498792 +0200
-@@ -234,6 +234,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -272,7 +273,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -359,6 +360,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -396,7 +398,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -480,6 +482,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -518,7 +521,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , optparse-generic
-     , pantry >=0.5.1.3
-     , path
-@@ -609,6 +612,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -647,7 +651,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
diff --git a/srcpkgs/stack/patches/ppc.patch b/srcpkgs/stack/patches/ppc.patch
index 1b5bc191b47c..724aaaf3a65c 100644
--- a/srcpkgs/stack/patches/ppc.patch
+++ b/srcpkgs/stack/patches/ppc.patch
@@ -7,7 +7,7 @@
 +import              System.Endian (getSystemEndianness, Endianness (..))
  import              System.Uname (getRelease)
  import              Data.List.Split (splitOn)
-@@ -1264,4 +1265,9 @@ getOSKey platform =
+@@ -1264,6 +1265,11 @@ getOSKey platform =
          Platform X86_64                Cabal.Windows -> return "windows64"
          Platform Arm                   Cabal.Linux   -> return "linux-armv7"
          Platform AArch64               Cabal.Linux   -> return "linux-aarch64"
@@ -21,11 +21,11 @@
  downloadFromInfo
 --- stack.cabal
 +++ stack.cabal
-@@ -235,6 +235,7 @@ library
-       , conduit
-       , conduit-extra
-       , containers
-+      , cpu >=0.1.2
-       , cryptonite
-       , cryptonite-conduit
-       , deepseq
+@@ -244,6 +244,7 @@
+         conduit >=1.3.1.2,
+         conduit-extra >=1.3.4,
+         containers >=0.6.0.1,
++        cpu >=0.1.2,
+         cryptonite >=0.25,
+         cryptonite-conduit >=0.2.2,
+         deepseq >=1.4.4.0,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 257aba10e50d..66da6618e77d 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.5.1
+version=2.5.1.1
 revision=1
-_stackage="lts-16.13"
+_stackage="lts-17.5"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -10,10 +10,10 @@ short_desc="Cross-platform program for developing Haskell projects"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://haskellstack.org"
-distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
+distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076
- b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58"
+checksum="ccf3ef6dff0412fe8409ef2cfbdf48cad65150f64aec7696725c75881827b539
+ d03bee7e51bbdec5053573f94f644a6baeb140cdd95dbe47261e03c04306b252"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
@ 2021-03-16 16:44 ` slotThe
  2021-03-16 17:23 ` slotThe
                   ` (37 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-03-16 16:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2968 bytes --]

There is an updated pull request by slotThe against master on the void-packages repository

https://github.com/slotThe/void-packages ghc-8.10.4
https://github.com/void-linux/void-packages/pull/29506

[WIP] GHC 8.10.4
It's that time of the year again!

- [X] ghc; I took over as maintainer here, @leahneukirchen said that was okay on IRC (cc'ing here to make sure)
- [ ] ghc-bin; took over as mainainer of orphaned package.
    - [X] x86_64-musl; [Link here](https://www34.zippyshare.com/d/yvtjb7uJ/38780/ghc-8.10.4-x86_64-void-linux-musl.tar.xz)
    - [ ] i686-musl
    cc @q66 for these
    - [ ] ppc64le
    - [ ] ppc64le-musl
- [X] cabal-install
- [X] stack
 
Rebuild literally every single haskell package we have and see if anything's broken:

- [ ] git-mediate
- [ ] kmonad
- [ ] cgrep
- [ ] debug-me
- [ ] hlint
- [ ] hoogle
- [ ] darcs
- [ ] shellcheck
- [ ] git-annex
- [ ] hledger
- [ ] pandoc
- [ ] xmobar

For the following two I'd like to fix #6414 while we're at it.  Because stack can't install libraries globally, this would involve either removing these packages entirely and advising users to install them in their own [stack or cabal projects](https://github.com/xmonad/xmonad-testing), or finding a way to build them with cabal and updating ghc's data base accordingly.  This would probably use `v1` commands, as we don't want to nuke our users db if we update xmonad. Cc @xaltsc as the current maintainer and @chilledfrogs as someone who might want to tackle this (if I read the IRC discussion correctly). 

- [ ] xmonad
- [ ] xmonad-contrib

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/29506.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghc-8.10.4-29506.patch --]
[-- Type: text/x-diff, Size: 20550 bytes --]

From 42f34d3da820d46fabe371221f59f836683e8de7 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 31 Jan 2021 14:31:24 +0100
Subject: [PATCH 1/5] ghc: update to 8.10.4

The change of maintainership was okay-ed by Leah.
---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch | 41 +++++++++++-------------
 srcpkgs/ghc/template                     |  8 ++---
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index ac353ed417e5..c9bd2583abe0 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -85,7 +85,7 @@ index ec3c18a..0359be7 100644
 +        in Right [ 0x3D800000 .|. hi16 w32,
 +                   0x618C0000 .|. lo16 w32,
 +                   0x7D8903A6, 0x4E800420 ]
- 
+
      ArchPPC64LE ->
          -- The ABI requires r12 to point to the function's entry point.
 diff --git a/rts/Adjustor.c b/rts/Adjustor.c
@@ -93,7 +93,7 @@ index d360cfe..ab7ede7 100644
 --- a/rts/Adjustor.c
 +++ b/rts/Adjustor.c
 @@ -49,7 +49,7 @@ Haskell side.
- 
+
  #if defined(i386_HOST_ARCH)
  extern void adjustorCode(void);
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
@@ -104,16 +104,16 @@ index d360cfe..ab7ede7 100644
 @@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
  extern void obscure_ccall_ret_code(void);
  #endif
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
- 
+
  /* !!! !!! WARNING: !!! !!!
 @@ -318,7 +318,7 @@ typedef struct AdjustorStub {
  } AdjustorStub;
  #endif
- 
+
 -#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  static int totalArgumentSize(char *typeString)
@@ -131,10 +131,10 @@ index d360cfe..ab7ede7 100644
 @@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
          }
      }
- 
+
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-         
+
  #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
  #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
 @@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
@@ -151,9 +151,9 @@ index 2795b83..63cfe91 100644
 --- a/rts/AdjustorAsm.S
 +++ b/rts/AdjustorAsm.S
 @@ -2,7 +2,7 @@
- 
+
  /* ******************************** PowerPC ******************************** */
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
@@ -166,34 +166,31 @@ index 934926e..2ff8662 100644
 @@ -717,7 +717,7 @@ StgRunIsImplementedInAssembler(void)
     Everything is in assembler, so we don't have to deal with GCC...
     -------------------------------------------------------------------------- */
- 
+
 -#if defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
- 
+
  static void GNUC3_ATTRIBUTE(used)
  StgRunIsImplementedInAssembler(void)
 @@ -842,7 +842,7 @@ StgRunIsImplementedInAssembler(void)
- 
+
  #endif
- 
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
  /* -----------------------------------------------------------------------------
     PowerPC 64 little endian architecture
- 
+
 diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
 index 9274a44..3b4fc33 100644
 --- a/rts/StgCRunAsm.S
 +++ b/rts/StgCRunAsm.S
-@@ -1,7 +1,7 @@
- #include "ghcconfig.h"
- #include "rts/Constants.h"
- 
+@@ -5,7 +5,7 @@
+  * then functions StgRun/StgReturn are implemented in file StgCRun.c */
+ #if !defined(USE_MINIINTERPRETER)
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
- # ifdef linux_HOST_OS
+ # if defined(linux_HOST_OS)
  # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
  	.file	"StgCRun.c"
--- 
-2.30.0
-
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 0b1440b2f6d9..c6acfa79e75d 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,8 +1,8 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.8.4
-revision=2
+version=8.10.4
+revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
 hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
@@ -10,11 +10,11 @@ hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
 makedepends="libnuma-devel"
 depends="perl gcc libffi-devel gmp-devel libnuma-devel"
 short_desc="Glorious Haskell Compiler"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d
+checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
 patch_args="-Np1"
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"

From e7e9d4710f6d42c6edb4e482643ce466864ce090 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 28 Feb 2021 18:34:26 +0100
Subject: [PATCH 2/5] 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 000000000000..63965ca12d44
--- /dev/null
+++ b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
@@ -0,0 +1,43 @@
+--- bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
++++ 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 1dd08f07fb44..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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]\."
-                        #  >= 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 f8b18f32cdb2..3ab1c2382454 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 <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=a0555e895aaf17ca08453fde8b19af96725da8398e027aa43a49c1658a600cb0
+distfiles="https://github.com/haskell/cabal/archive/cabal-install-3.4.0.0.tar.gz"
+checksum=e4fbd5eb1d77400746a993679181f159aa415a37b931b26d67f5602f63ce971c
 nopie_files="/usr/bin/cabal"
 nocross=yes
 
 do_build() {
-	PREFIX=$PWD/build sh bootstrap.sh --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
 }

From 5dd4586e919951ac5fed74d4b8208ab2a577a9cc Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 12:37:23 +0100
Subject: [PATCH 3/5] ghc-bin: update to 8.10.4

Take over maintainership of orphaned package.
---
 srcpkgs/ghc-bin/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 9101601358b9..eacbca4e74f8 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,13 +1,13 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.8.4
+version=8.10.4
 revision=1
 archs="i686* x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
 short_desc="Glorious Haskell Compiler - precompiled binaries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 nostrip=yes
@@ -15,17 +15,17 @@ noshlibprovides=yes
 conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
-	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb8-linux.tar.xz"
-	checksum=51a36892f1264744195274187298d13ac62bce2da86d4ddf76d8054ab90f2feb
+	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
+	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=779647d3f4e6e39da9e13b2559319ede76b4fff1107e4dc369a09aadeecad971
+	checksum=56e53f46ad53e6640753d608d01228528fca8ccec01b09bba6ad3b6890a18994
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0
+	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
 	;;
 i686-musl)
 	distfiles="https://distfiles.voidlinux.de/ghc-${version}-i386-unknown-linux-musl.tar.xz"

From 89ded9eeb013f6855dbd9ab4b788125ae171726a Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 15:11:29 +0100
Subject: [PATCH 4/5] stack: update to 2.5.1.1

---
 srcpkgs/stack/patches/datakinds.patch | 14 ------
 srcpkgs/stack/patches/ghc-8.8.4.patch | 70 ---------------------------
 srcpkgs/stack/patches/ppc.patch       | 18 +++----
 srcpkgs/stack/template                | 10 ++--
 4 files changed, 14 insertions(+), 98 deletions(-)
 delete mode 100644 srcpkgs/stack/patches/datakinds.patch
 delete mode 100644 srcpkgs/stack/patches/ghc-8.8.4.patch

diff --git a/srcpkgs/stack/patches/datakinds.patch b/srcpkgs/stack/patches/datakinds.patch
deleted file mode 100644
index 1c06480515f7..000000000000
--- a/srcpkgs/stack/patches/datakinds.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Stack/Storage/User.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/User.hs	2020-12-06 20:51:06.632607164 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
---- src/Stack/Storage/Project.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/Project.hs	2020-12-06 21:55:21.349484738 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch
deleted file mode 100644
index 6b55c176e150..000000000000
--- a/srcpkgs/stack/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- masterdir/builddir/stack-2.5.1/stack.cabal	2020-10-17 17:19:10.724179166 +0200
-+++ stack.cabal	2020-10-17 17:18:03.803498792 +0200
-@@ -234,6 +234,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -272,7 +273,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -359,6 +360,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -396,7 +398,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -480,6 +482,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -518,7 +521,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , optparse-generic
-     , pantry >=0.5.1.3
-     , path
-@@ -609,6 +612,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -647,7 +651,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
diff --git a/srcpkgs/stack/patches/ppc.patch b/srcpkgs/stack/patches/ppc.patch
index 1b5bc191b47c..724aaaf3a65c 100644
--- a/srcpkgs/stack/patches/ppc.patch
+++ b/srcpkgs/stack/patches/ppc.patch
@@ -7,7 +7,7 @@
 +import              System.Endian (getSystemEndianness, Endianness (..))
  import              System.Uname (getRelease)
  import              Data.List.Split (splitOn)
-@@ -1264,4 +1265,9 @@ getOSKey platform =
+@@ -1264,6 +1265,11 @@ getOSKey platform =
          Platform X86_64                Cabal.Windows -> return "windows64"
          Platform Arm                   Cabal.Linux   -> return "linux-armv7"
          Platform AArch64               Cabal.Linux   -> return "linux-aarch64"
@@ -21,11 +21,11 @@
  downloadFromInfo
 --- stack.cabal
 +++ stack.cabal
-@@ -235,6 +235,7 @@ library
-       , conduit
-       , conduit-extra
-       , containers
-+      , cpu >=0.1.2
-       , cryptonite
-       , cryptonite-conduit
-       , deepseq
+@@ -244,6 +244,7 @@
+         conduit >=1.3.1.2,
+         conduit-extra >=1.3.4,
+         containers >=0.6.0.1,
++        cpu >=0.1.2,
+         cryptonite >=0.25,
+         cryptonite-conduit >=0.2.2,
+         deepseq >=1.4.4.0,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 257aba10e50d..66da6618e77d 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.5.1
+version=2.5.1.1
 revision=1
-_stackage="lts-16.13"
+_stackage="lts-17.5"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -10,10 +10,10 @@ short_desc="Cross-platform program for developing Haskell projects"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://haskellstack.org"
-distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
+distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076
- b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58"
+checksum="ccf3ef6dff0412fe8409ef2cfbdf48cad65150f64aec7696725c75881827b539
+ d03bee7e51bbdec5053573f94f644a6baeb140cdd95dbe47261e03c04306b252"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 604eb336f2760329b8b229465de08dd1505aa562 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 16 Mar 2021 17:41:58 +0100
Subject: [PATCH 5/5] xmobar: bump for ghc 8.10.4

---
 srcpkgs/xmobar/files/stack.yaml | 2 +-
 srcpkgs/xmobar/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 7bc4bf189d23..52fd0e3e49fe 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 81ae92fd2940..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.37
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
  2021-03-16 16:44 ` [PR PATCH] [Updated] " slotThe
@ 2021-03-16 17:23 ` slotThe
  2021-03-17 17:00 ` leahneukirchen
                   ` (36 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-03-16 17:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2968 bytes --]

There is an updated pull request by slotThe against master on the void-packages repository

https://github.com/slotThe/void-packages ghc-8.10.4
https://github.com/void-linux/void-packages/pull/29506

[WIP] GHC 8.10.4
It's that time of the year again!

- [X] ghc; I took over as maintainer here, @leahneukirchen said that was okay on IRC (cc'ing here to make sure)
- [ ] ghc-bin; took over as mainainer of orphaned package.
    - [X] x86_64-musl; [Link here](https://www34.zippyshare.com/d/yvtjb7uJ/38780/ghc-8.10.4-x86_64-void-linux-musl.tar.xz)
    - [ ] i686-musl
    cc @q66 for these
    - [ ] ppc64le
    - [ ] ppc64le-musl
- [X] cabal-install
- [X] stack
 
Rebuild literally every single haskell package we have and see if anything's broken:

- [ ] git-mediate
- [ ] kmonad
- [ ] cgrep
- [ ] debug-me
- [ ] hlint
- [ ] hoogle
- [ ] darcs
- [ ] shellcheck
- [ ] git-annex
- [ ] hledger
- [ ] pandoc
- [x] xmobar

For the following two I'd like to fix #6414 while we're at it.  Because stack can't install libraries globally, this would involve either removing these packages entirely and advising users to install them in their own [stack or cabal projects](https://github.com/xmonad/xmonad-testing), or finding a way to build them with cabal and updating ghc's data base accordingly.  This would probably use `v1` commands, as we don't want to nuke our users db if we update xmonad. Cc @xaltsc as the current maintainer and @chilledfrogs as someone who might want to tackle this (if I read the IRC discussion correctly). 

- [ ] xmonad
- [ ] xmonad-contrib

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/29506.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghc-8.10.4-29506.patch --]
[-- Type: text/x-diff, Size: 20543 bytes --]

From 42f34d3da820d46fabe371221f59f836683e8de7 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 31 Jan 2021 14:31:24 +0100
Subject: [PATCH 1/5] ghc: update to 8.10.4

The change of maintainership was okay-ed by Leah.
---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch | 41 +++++++++++-------------
 srcpkgs/ghc/template                     |  8 ++---
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index ac353ed417e5..c9bd2583abe0 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -85,7 +85,7 @@ index ec3c18a..0359be7 100644
 +        in Right [ 0x3D800000 .|. hi16 w32,
 +                   0x618C0000 .|. lo16 w32,
 +                   0x7D8903A6, 0x4E800420 ]
- 
+
      ArchPPC64LE ->
          -- The ABI requires r12 to point to the function's entry point.
 diff --git a/rts/Adjustor.c b/rts/Adjustor.c
@@ -93,7 +93,7 @@ index d360cfe..ab7ede7 100644
 --- a/rts/Adjustor.c
 +++ b/rts/Adjustor.c
 @@ -49,7 +49,7 @@ Haskell side.
- 
+
  #if defined(i386_HOST_ARCH)
  extern void adjustorCode(void);
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
@@ -104,16 +104,16 @@ index d360cfe..ab7ede7 100644
 @@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
  extern void obscure_ccall_ret_code(void);
  #endif
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
- 
+
  /* !!! !!! WARNING: !!! !!!
 @@ -318,7 +318,7 @@ typedef struct AdjustorStub {
  } AdjustorStub;
  #endif
- 
+
 -#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  static int totalArgumentSize(char *typeString)
@@ -131,10 +131,10 @@ index d360cfe..ab7ede7 100644
 @@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
          }
      }
- 
+
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-         
+
  #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
  #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
 @@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
@@ -151,9 +151,9 @@ index 2795b83..63cfe91 100644
 --- a/rts/AdjustorAsm.S
 +++ b/rts/AdjustorAsm.S
 @@ -2,7 +2,7 @@
- 
+
  /* ******************************** PowerPC ******************************** */
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
@@ -166,34 +166,31 @@ index 934926e..2ff8662 100644
 @@ -717,7 +717,7 @@ StgRunIsImplementedInAssembler(void)
     Everything is in assembler, so we don't have to deal with GCC...
     -------------------------------------------------------------------------- */
- 
+
 -#if defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
- 
+
  static void GNUC3_ATTRIBUTE(used)
  StgRunIsImplementedInAssembler(void)
 @@ -842,7 +842,7 @@ StgRunIsImplementedInAssembler(void)
- 
+
  #endif
- 
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
  /* -----------------------------------------------------------------------------
     PowerPC 64 little endian architecture
- 
+
 diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
 index 9274a44..3b4fc33 100644
 --- a/rts/StgCRunAsm.S
 +++ b/rts/StgCRunAsm.S
-@@ -1,7 +1,7 @@
- #include "ghcconfig.h"
- #include "rts/Constants.h"
- 
+@@ -5,7 +5,7 @@
+  * then functions StgRun/StgReturn are implemented in file StgCRun.c */
+ #if !defined(USE_MINIINTERPRETER)
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
- # ifdef linux_HOST_OS
+ # if defined(linux_HOST_OS)
  # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
  	.file	"StgCRun.c"
--- 
-2.30.0
-
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 0b1440b2f6d9..c6acfa79e75d 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,8 +1,8 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.8.4
-revision=2
+version=8.10.4
+revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
 hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
@@ -10,11 +10,11 @@ hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
 makedepends="libnuma-devel"
 depends="perl gcc libffi-devel gmp-devel libnuma-devel"
 short_desc="Glorious Haskell Compiler"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d
+checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
 patch_args="-Np1"
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"

From 40374990acd5b6cd9bdef01dd0889de79aef76e4 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 28 Feb 2021 18:34:26 +0100
Subject: [PATCH 2/5] 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 000000000000..63965ca12d44
--- /dev/null
+++ b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
@@ -0,0 +1,43 @@
+--- bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
++++ 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 1dd08f07fb44..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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]\."
-                        #  >= 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 f8b18f32cdb2..99ebb54427fe 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 <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=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 --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
 }

From 2b02e32fe30aa49882342c64dde9d6d79e59f642 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 12:37:23 +0100
Subject: [PATCH 3/5] ghc-bin: update to 8.10.4

Take over maintainership of orphaned package.
---
 srcpkgs/ghc-bin/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 9101601358b9..eacbca4e74f8 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,13 +1,13 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.8.4
+version=8.10.4
 revision=1
 archs="i686* x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
 short_desc="Glorious Haskell Compiler - precompiled binaries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 nostrip=yes
@@ -15,17 +15,17 @@ noshlibprovides=yes
 conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
-	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb8-linux.tar.xz"
-	checksum=51a36892f1264744195274187298d13ac62bce2da86d4ddf76d8054ab90f2feb
+	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
+	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=779647d3f4e6e39da9e13b2559319ede76b4fff1107e4dc369a09aadeecad971
+	checksum=56e53f46ad53e6640753d608d01228528fca8ccec01b09bba6ad3b6890a18994
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0
+	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
 	;;
 i686-musl)
 	distfiles="https://distfiles.voidlinux.de/ghc-${version}-i386-unknown-linux-musl.tar.xz"

From c2a77025feed786f6ac6f3ccbd8a5c7da6b715b4 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 15:11:29 +0100
Subject: [PATCH 4/5] stack: update to 2.5.1.1

---
 srcpkgs/stack/patches/datakinds.patch | 14 ------
 srcpkgs/stack/patches/ghc-8.8.4.patch | 70 ---------------------------
 srcpkgs/stack/patches/ppc.patch       | 18 +++----
 srcpkgs/stack/template                | 10 ++--
 4 files changed, 14 insertions(+), 98 deletions(-)
 delete mode 100644 srcpkgs/stack/patches/datakinds.patch
 delete mode 100644 srcpkgs/stack/patches/ghc-8.8.4.patch

diff --git a/srcpkgs/stack/patches/datakinds.patch b/srcpkgs/stack/patches/datakinds.patch
deleted file mode 100644
index 1c06480515f7..000000000000
--- a/srcpkgs/stack/patches/datakinds.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Stack/Storage/User.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/User.hs	2020-12-06 20:51:06.632607164 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
---- src/Stack/Storage/Project.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/Project.hs	2020-12-06 21:55:21.349484738 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch
deleted file mode 100644
index 6b55c176e150..000000000000
--- a/srcpkgs/stack/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- masterdir/builddir/stack-2.5.1/stack.cabal	2020-10-17 17:19:10.724179166 +0200
-+++ stack.cabal	2020-10-17 17:18:03.803498792 +0200
-@@ -234,6 +234,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -272,7 +273,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -359,6 +360,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -396,7 +398,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -480,6 +482,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -518,7 +521,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , optparse-generic
-     , pantry >=0.5.1.3
-     , path
-@@ -609,6 +612,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -647,7 +651,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
diff --git a/srcpkgs/stack/patches/ppc.patch b/srcpkgs/stack/patches/ppc.patch
index 1b5bc191b47c..724aaaf3a65c 100644
--- a/srcpkgs/stack/patches/ppc.patch
+++ b/srcpkgs/stack/patches/ppc.patch
@@ -7,7 +7,7 @@
 +import              System.Endian (getSystemEndianness, Endianness (..))
  import              System.Uname (getRelease)
  import              Data.List.Split (splitOn)
-@@ -1264,4 +1265,9 @@ getOSKey platform =
+@@ -1264,6 +1265,11 @@ getOSKey platform =
          Platform X86_64                Cabal.Windows -> return "windows64"
          Platform Arm                   Cabal.Linux   -> return "linux-armv7"
          Platform AArch64               Cabal.Linux   -> return "linux-aarch64"
@@ -21,11 +21,11 @@
  downloadFromInfo
 --- stack.cabal
 +++ stack.cabal
-@@ -235,6 +235,7 @@ library
-       , conduit
-       , conduit-extra
-       , containers
-+      , cpu >=0.1.2
-       , cryptonite
-       , cryptonite-conduit
-       , deepseq
+@@ -244,6 +244,7 @@
+         conduit >=1.3.1.2,
+         conduit-extra >=1.3.4,
+         containers >=0.6.0.1,
++        cpu >=0.1.2,
+         cryptonite >=0.25,
+         cryptonite-conduit >=0.2.2,
+         deepseq >=1.4.4.0,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 257aba10e50d..66da6618e77d 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.5.1
+version=2.5.1.1
 revision=1
-_stackage="lts-16.13"
+_stackage="lts-17.5"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -10,10 +10,10 @@ short_desc="Cross-platform program for developing Haskell projects"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://haskellstack.org"
-distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
+distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076
- b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58"
+checksum="ccf3ef6dff0412fe8409ef2cfbdf48cad65150f64aec7696725c75881827b539
+ d03bee7e51bbdec5053573f94f644a6baeb140cdd95dbe47261e03c04306b252"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 45cb74fc9759810e913a86e6780b64b1801c4e27 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 16 Mar 2021 17:41:58 +0100
Subject: [PATCH 5/5] xmobar: bump for ghc 8.10.4

---
 srcpkgs/xmobar/files/stack.yaml | 2 +-
 srcpkgs/xmobar/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 7bc4bf189d23..52fd0e3e49fe 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 81ae92fd2940..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.37
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
  2021-03-16 16:44 ` [PR PATCH] [Updated] " slotThe
  2021-03-16 17:23 ` slotThe
@ 2021-03-17 17:00 ` leahneukirchen
  2021-03-18  7:47 ` [PR PATCH] [Updated] " slotThe
                   ` (35 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: leahneukirchen @ 2021-03-17 17:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 166 bytes --]

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/29506#issuecomment-801249764

Comment:
:+1: to take over.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (2 preceding siblings ...)
  2021-03-17 17:00 ` leahneukirchen
@ 2021-03-18  7:47 ` slotThe
  2021-03-18  8:09 ` slotThe
                   ` (34 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-03-18  7:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2968 bytes --]

There is an updated pull request by slotThe against master on the void-packages repository

https://github.com/slotThe/void-packages ghc-8.10.4
https://github.com/void-linux/void-packages/pull/29506

[WIP] GHC 8.10.4
It's that time of the year again!

- [X] ghc; I took over as maintainer here, @leahneukirchen said that was okay on IRC (cc'ing here to make sure)
- [ ] ghc-bin; took over as mainainer of orphaned package.
    - [X] x86_64-musl; [Link here](https://www34.zippyshare.com/d/yvtjb7uJ/38780/ghc-8.10.4-x86_64-void-linux-musl.tar.xz)
    - [ ] i686-musl
    cc @q66 for these
    - [ ] ppc64le
    - [ ] ppc64le-musl
- [X] cabal-install
- [X] stack
 
Rebuild literally every single haskell package we have and see if anything's broken:

- [ ] git-mediate
- [ ] kmonad
- [ ] cgrep
- [ ] debug-me
- [ ] hlint
- [ ] hoogle
- [ ] darcs
- [ ] shellcheck
- [ ] git-annex
- [ ] hledger
- [ ] pandoc
- [x] xmobar

For the following two I'd like to fix #6414 while we're at it.  Because stack can't install libraries globally, this would involve either removing these packages entirely and advising users to install them in their own [stack or cabal projects](https://github.com/xmonad/xmonad-testing), or finding a way to build them with cabal and updating ghc's data base accordingly.  This would probably use `v1` commands, as we don't want to nuke our users db if we update xmonad. Cc @xaltsc as the current maintainer and @chilledfrogs as someone who might want to tackle this (if I read the IRC discussion correctly). 

- [ ] xmonad
- [ ] xmonad-contrib

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/29506.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghc-8.10.4-29506.patch --]
[-- Type: text/x-diff, Size: 24826 bytes --]

From 42f34d3da820d46fabe371221f59f836683e8de7 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 31 Jan 2021 14:31:24 +0100
Subject: [PATCH 1/8] ghc: update to 8.10.4

The change of maintainership was okay-ed by Leah.
---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch | 41 +++++++++++-------------
 srcpkgs/ghc/template                     |  8 ++---
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index ac353ed417e5..c9bd2583abe0 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -85,7 +85,7 @@ index ec3c18a..0359be7 100644
 +        in Right [ 0x3D800000 .|. hi16 w32,
 +                   0x618C0000 .|. lo16 w32,
 +                   0x7D8903A6, 0x4E800420 ]
- 
+
      ArchPPC64LE ->
          -- The ABI requires r12 to point to the function's entry point.
 diff --git a/rts/Adjustor.c b/rts/Adjustor.c
@@ -93,7 +93,7 @@ index d360cfe..ab7ede7 100644
 --- a/rts/Adjustor.c
 +++ b/rts/Adjustor.c
 @@ -49,7 +49,7 @@ Haskell side.
- 
+
  #if defined(i386_HOST_ARCH)
  extern void adjustorCode(void);
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
@@ -104,16 +104,16 @@ index d360cfe..ab7ede7 100644
 @@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
  extern void obscure_ccall_ret_code(void);
  #endif
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
- 
+
  /* !!! !!! WARNING: !!! !!!
 @@ -318,7 +318,7 @@ typedef struct AdjustorStub {
  } AdjustorStub;
  #endif
- 
+
 -#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  static int totalArgumentSize(char *typeString)
@@ -131,10 +131,10 @@ index d360cfe..ab7ede7 100644
 @@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
          }
      }
- 
+
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-         
+
  #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
  #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
 @@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
@@ -151,9 +151,9 @@ index 2795b83..63cfe91 100644
 --- a/rts/AdjustorAsm.S
 +++ b/rts/AdjustorAsm.S
 @@ -2,7 +2,7 @@
- 
+
  /* ******************************** PowerPC ******************************** */
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
@@ -166,34 +166,31 @@ index 934926e..2ff8662 100644
 @@ -717,7 +717,7 @@ StgRunIsImplementedInAssembler(void)
     Everything is in assembler, so we don't have to deal with GCC...
     -------------------------------------------------------------------------- */
- 
+
 -#if defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
- 
+
  static void GNUC3_ATTRIBUTE(used)
  StgRunIsImplementedInAssembler(void)
 @@ -842,7 +842,7 @@ StgRunIsImplementedInAssembler(void)
- 
+
  #endif
- 
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
  /* -----------------------------------------------------------------------------
     PowerPC 64 little endian architecture
- 
+
 diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
 index 9274a44..3b4fc33 100644
 --- a/rts/StgCRunAsm.S
 +++ b/rts/StgCRunAsm.S
-@@ -1,7 +1,7 @@
- #include "ghcconfig.h"
- #include "rts/Constants.h"
- 
+@@ -5,7 +5,7 @@
+  * then functions StgRun/StgReturn are implemented in file StgCRun.c */
+ #if !defined(USE_MINIINTERPRETER)
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
- # ifdef linux_HOST_OS
+ # if defined(linux_HOST_OS)
  # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
  	.file	"StgCRun.c"
--- 
-2.30.0
-
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 0b1440b2f6d9..c6acfa79e75d 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,8 +1,8 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.8.4
-revision=2
+version=8.10.4
+revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
 hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
@@ -10,11 +10,11 @@ hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
 makedepends="libnuma-devel"
 depends="perl gcc libffi-devel gmp-devel libnuma-devel"
 short_desc="Glorious Haskell Compiler"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d
+checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
 patch_args="-Np1"
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"

From 40374990acd5b6cd9bdef01dd0889de79aef76e4 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 28 Feb 2021 18:34:26 +0100
Subject: [PATCH 2/8] 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 000000000000..63965ca12d44
--- /dev/null
+++ b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
@@ -0,0 +1,43 @@
+--- bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
++++ 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 1dd08f07fb44..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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]\."
-                        #  >= 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 f8b18f32cdb2..99ebb54427fe 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 <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=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 --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
 }

From 2b02e32fe30aa49882342c64dde9d6d79e59f642 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 12:37:23 +0100
Subject: [PATCH 3/8] ghc-bin: update to 8.10.4

Take over maintainership of orphaned package.
---
 srcpkgs/ghc-bin/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 9101601358b9..eacbca4e74f8 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,13 +1,13 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.8.4
+version=8.10.4
 revision=1
 archs="i686* x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
 short_desc="Glorious Haskell Compiler - precompiled binaries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 nostrip=yes
@@ -15,17 +15,17 @@ noshlibprovides=yes
 conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
-	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb8-linux.tar.xz"
-	checksum=51a36892f1264744195274187298d13ac62bce2da86d4ddf76d8054ab90f2feb
+	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
+	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=779647d3f4e6e39da9e13b2559319ede76b4fff1107e4dc369a09aadeecad971
+	checksum=56e53f46ad53e6640753d608d01228528fca8ccec01b09bba6ad3b6890a18994
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0
+	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
 	;;
 i686-musl)
 	distfiles="https://distfiles.voidlinux.de/ghc-${version}-i386-unknown-linux-musl.tar.xz"

From c2a77025feed786f6ac6f3ccbd8a5c7da6b715b4 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 15:11:29 +0100
Subject: [PATCH 4/8] stack: update to 2.5.1.1

---
 srcpkgs/stack/patches/datakinds.patch | 14 ------
 srcpkgs/stack/patches/ghc-8.8.4.patch | 70 ---------------------------
 srcpkgs/stack/patches/ppc.patch       | 18 +++----
 srcpkgs/stack/template                | 10 ++--
 4 files changed, 14 insertions(+), 98 deletions(-)
 delete mode 100644 srcpkgs/stack/patches/datakinds.patch
 delete mode 100644 srcpkgs/stack/patches/ghc-8.8.4.patch

diff --git a/srcpkgs/stack/patches/datakinds.patch b/srcpkgs/stack/patches/datakinds.patch
deleted file mode 100644
index 1c06480515f7..000000000000
--- a/srcpkgs/stack/patches/datakinds.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Stack/Storage/User.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/User.hs	2020-12-06 20:51:06.632607164 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
---- src/Stack/Storage/Project.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/Project.hs	2020-12-06 21:55:21.349484738 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch
deleted file mode 100644
index 6b55c176e150..000000000000
--- a/srcpkgs/stack/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- masterdir/builddir/stack-2.5.1/stack.cabal	2020-10-17 17:19:10.724179166 +0200
-+++ stack.cabal	2020-10-17 17:18:03.803498792 +0200
-@@ -234,6 +234,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -272,7 +273,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -359,6 +360,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -396,7 +398,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -480,6 +482,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -518,7 +521,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , optparse-generic
-     , pantry >=0.5.1.3
-     , path
-@@ -609,6 +612,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -647,7 +651,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
diff --git a/srcpkgs/stack/patches/ppc.patch b/srcpkgs/stack/patches/ppc.patch
index 1b5bc191b47c..724aaaf3a65c 100644
--- a/srcpkgs/stack/patches/ppc.patch
+++ b/srcpkgs/stack/patches/ppc.patch
@@ -7,7 +7,7 @@
 +import              System.Endian (getSystemEndianness, Endianness (..))
  import              System.Uname (getRelease)
  import              Data.List.Split (splitOn)
-@@ -1264,4 +1265,9 @@ getOSKey platform =
+@@ -1264,6 +1265,11 @@ getOSKey platform =
          Platform X86_64                Cabal.Windows -> return "windows64"
          Platform Arm                   Cabal.Linux   -> return "linux-armv7"
          Platform AArch64               Cabal.Linux   -> return "linux-aarch64"
@@ -21,11 +21,11 @@
  downloadFromInfo
 --- stack.cabal
 +++ stack.cabal
-@@ -235,6 +235,7 @@ library
-       , conduit
-       , conduit-extra
-       , containers
-+      , cpu >=0.1.2
-       , cryptonite
-       , cryptonite-conduit
-       , deepseq
+@@ -244,6 +244,7 @@
+         conduit >=1.3.1.2,
+         conduit-extra >=1.3.4,
+         containers >=0.6.0.1,
++        cpu >=0.1.2,
+         cryptonite >=0.25,
+         cryptonite-conduit >=0.2.2,
+         deepseq >=1.4.4.0,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 257aba10e50d..66da6618e77d 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.5.1
+version=2.5.1.1
 revision=1
-_stackage="lts-16.13"
+_stackage="lts-17.5"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -10,10 +10,10 @@ short_desc="Cross-platform program for developing Haskell projects"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://haskellstack.org"
-distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
+distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076
- b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58"
+checksum="ccf3ef6dff0412fe8409ef2cfbdf48cad65150f64aec7696725c75881827b539
+ d03bee7e51bbdec5053573f94f644a6baeb140cdd95dbe47261e03c04306b252"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 45cb74fc9759810e913a86e6780b64b1801c4e27 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 16 Mar 2021 17:41:58 +0100
Subject: [PATCH 5/8] xmobar: bump for ghc 8.10.4

---
 srcpkgs/xmobar/files/stack.yaml | 2 +-
 srcpkgs/xmobar/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 7bc4bf189d23..52fd0e3e49fe 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 81ae92fd2940..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.37
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From 539a913bea0ac338015d2fea62d901259e699f73 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:03:10 +0100
Subject: [PATCH 6/8] hlint: update to 3.2.7

---
 srcpkgs/hlint/files/stack.yaml   |  7 -------
 srcpkgs/hlint/patches/data.patch | 10 ++++------
 srcpkgs/hlint/template           |  8 ++++----
 3 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/hlint/files/stack.yaml

diff --git a/srcpkgs/hlint/files/stack.yaml b/srcpkgs/hlint/files/stack.yaml
deleted file mode 100644
index 12aead6562c5..000000000000
--- a/srcpkgs/hlint/files/stack.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-resolver: lts-16.13
-packages: [.]
-extra-deps:
-  - ghc-lib-parser-8.8.4.20200716
-  - ghc-lib-parser-ex-8.8.5.8
-ghc-options:
-    "$locals": -Wunused-imports -Worphans -Wunused-top-binds -Wunused-local-binds -Wincomplete-patterns
diff --git a/srcpkgs/hlint/patches/data.patch b/srcpkgs/hlint/patches/data.patch
index bdfac204f477..c73b376e5df7 100644
--- a/srcpkgs/hlint/patches/data.patch
+++ b/srcpkgs/hlint/patches/data.patch
@@ -1,13 +1,11 @@
-diff --git src/CmdLine.hs src/CmdLine.hs
-index 8c3d530..ccf7aac 100644
 --- src/CmdLine.hs
 +++ src/CmdLine.hs
-@@ -52,7 +52,7 @@ automatic cmd = case cmd of
+@@ -58,7 +58,7 @@
                  b <- doesDirectoryExist x
-                 if b then return cmd{cmdDataDir=x} else do
+                 if b then pure cmd{cmdDataDir=x} else do
                      exe <- getExecutablePath
--                    return cmd{cmdDataDir = takeDirectory exe </> "data"}
-+                    return cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
+-                    pure cmd{cmdDataDir = takeDirectory exe </> "data"}
++                    pure cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
          git cmd
              | cmdGit cmd = do
                  mgit <- findExecutable "git"
diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index 16fbb03ce2b9..5044f6d508ce 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,16 +1,16 @@
 # Template file for 'hlint'
 pkgname=hlint
-version=2.2.11
-revision=2
+version=3.2.7
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/ndmitchell/${pkgname}"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=207539d3627efd3caed9e6fd3b1aeb8f1eb64553f1f9f166090adbf2fb71e172
+checksum=fcdeefcc79a52206add44b409abcab48c5fe2adff9d5aff077acbc43c702b54e
 nocross=yes # Can't yet cross compile Haskell
 nopie_files="/usr/bin/hlint"
 

From 1d545a33bbf3549ea1ba6657f1dd1a5837225307 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:43:37 +0100
Subject: [PATCH 7/8] kmonad: bump for ghc 8.10.4

---
 srcpkgs/kmonad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index 13e8845581ae..8c34a920ba7d 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,9 +1,9 @@
 # Template file for 'kmonad'
 pkgname=kmonad
 version=0.4.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage=lts-16.13
+stackage=lts-17.5
 short_desc="Keyboard remapping utility providing qmk-like functionality"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"

From f99d7925552e70b52ad01df9061dc4e92e3e87d3 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 16:21:35 +0100
Subject: [PATCH 8/8] hoogle: bump for ghc 8.10.4

---
 srcpkgs/hoogle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 4305ac4ae6e8..eafda8747cdf 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,9 +1,9 @@
 # Template file for 'hoogle'
 pkgname=hoogle
 version=5.0.18.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="zlib-devel"
 short_desc="Haskell API search engine"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (3 preceding siblings ...)
  2021-03-18  7:47 ` [PR PATCH] [Updated] " slotThe
@ 2021-03-18  8:09 ` slotThe
  2021-03-19 14:08 ` slotThe
                   ` (33 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-03-18  8:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2968 bytes --]

There is an updated pull request by slotThe against master on the void-packages repository

https://github.com/slotThe/void-packages ghc-8.10.4
https://github.com/void-linux/void-packages/pull/29506

[WIP] GHC 8.10.4
It's that time of the year again!

- [X] ghc; I took over as maintainer here, @leahneukirchen said that was okay on IRC (cc'ing here to make sure)
- [ ] ghc-bin; took over as mainainer of orphaned package.
    - [X] x86_64-musl; [Link here](https://www34.zippyshare.com/d/yvtjb7uJ/38780/ghc-8.10.4-x86_64-void-linux-musl.tar.xz)
    - [ ] i686-musl
    cc @q66 for these
    - [ ] ppc64le
    - [ ] ppc64le-musl
- [X] cabal-install
- [X] stack
 
Rebuild literally every single haskell package we have and see if anything's broken:

- [ ] git-mediate
- [x] kmonad
- [ ] cgrep
- [ ] debug-me
- [x] hlint
- [x] hoogle
- [ ] darcs
- [ ] shellcheck
- [ ] git-annex
- [ ] hledger
- [ ] pandoc
- [x] xmobar

For the following two I'd like to fix #6414 while we're at it.  Because stack can't install libraries globally, this would involve either removing these packages entirely and advising users to install them in their own [stack or cabal projects](https://github.com/xmonad/xmonad-testing), or finding a way to build them with cabal and updating ghc's data base accordingly.  This would probably use `v1` commands, as we don't want to nuke our users db if we update xmonad. Cc @xaltsc as the current maintainer and @chilledfrogs as someone who might want to tackle this (if I read the IRC discussion correctly). 

- [ ] xmonad
- [ ] xmonad-contrib

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/29506.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghc-8.10.4-29506.patch --]
[-- Type: text/x-diff, Size: 24876 bytes --]

From 42f34d3da820d46fabe371221f59f836683e8de7 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 31 Jan 2021 14:31:24 +0100
Subject: [PATCH 1/8] ghc: update to 8.10.4

The change of maintainership was okay-ed by Leah.
---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch | 41 +++++++++++-------------
 srcpkgs/ghc/template                     |  8 ++---
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index ac353ed417e5..c9bd2583abe0 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -85,7 +85,7 @@ index ec3c18a..0359be7 100644
 +        in Right [ 0x3D800000 .|. hi16 w32,
 +                   0x618C0000 .|. lo16 w32,
 +                   0x7D8903A6, 0x4E800420 ]
- 
+
      ArchPPC64LE ->
          -- The ABI requires r12 to point to the function's entry point.
 diff --git a/rts/Adjustor.c b/rts/Adjustor.c
@@ -93,7 +93,7 @@ index d360cfe..ab7ede7 100644
 --- a/rts/Adjustor.c
 +++ b/rts/Adjustor.c
 @@ -49,7 +49,7 @@ Haskell side.
- 
+
  #if defined(i386_HOST_ARCH)
  extern void adjustorCode(void);
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
@@ -104,16 +104,16 @@ index d360cfe..ab7ede7 100644
 @@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
  extern void obscure_ccall_ret_code(void);
  #endif
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
- 
+
  /* !!! !!! WARNING: !!! !!!
 @@ -318,7 +318,7 @@ typedef struct AdjustorStub {
  } AdjustorStub;
  #endif
- 
+
 -#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  static int totalArgumentSize(char *typeString)
@@ -131,10 +131,10 @@ index d360cfe..ab7ede7 100644
 @@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
          }
      }
- 
+
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-         
+
  #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
  #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
 @@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
@@ -151,9 +151,9 @@ index 2795b83..63cfe91 100644
 --- a/rts/AdjustorAsm.S
 +++ b/rts/AdjustorAsm.S
 @@ -2,7 +2,7 @@
- 
+
  /* ******************************** PowerPC ******************************** */
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
@@ -166,34 +166,31 @@ index 934926e..2ff8662 100644
 @@ -717,7 +717,7 @@ StgRunIsImplementedInAssembler(void)
     Everything is in assembler, so we don't have to deal with GCC...
     -------------------------------------------------------------------------- */
- 
+
 -#if defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
- 
+
  static void GNUC3_ATTRIBUTE(used)
  StgRunIsImplementedInAssembler(void)
 @@ -842,7 +842,7 @@ StgRunIsImplementedInAssembler(void)
- 
+
  #endif
- 
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
  /* -----------------------------------------------------------------------------
     PowerPC 64 little endian architecture
- 
+
 diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
 index 9274a44..3b4fc33 100644
 --- a/rts/StgCRunAsm.S
 +++ b/rts/StgCRunAsm.S
-@@ -1,7 +1,7 @@
- #include "ghcconfig.h"
- #include "rts/Constants.h"
- 
+@@ -5,7 +5,7 @@
+  * then functions StgRun/StgReturn are implemented in file StgCRun.c */
+ #if !defined(USE_MINIINTERPRETER)
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
- # ifdef linux_HOST_OS
+ # if defined(linux_HOST_OS)
  # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
  	.file	"StgCRun.c"
--- 
-2.30.0
-
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 0b1440b2f6d9..c6acfa79e75d 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,8 +1,8 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.8.4
-revision=2
+version=8.10.4
+revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
 hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
@@ -10,11 +10,11 @@ hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
 makedepends="libnuma-devel"
 depends="perl gcc libffi-devel gmp-devel libnuma-devel"
 short_desc="Glorious Haskell Compiler"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d
+checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
 patch_args="-Np1"
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"

From 40374990acd5b6cd9bdef01dd0889de79aef76e4 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 28 Feb 2021 18:34:26 +0100
Subject: [PATCH 2/8] 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 000000000000..63965ca12d44
--- /dev/null
+++ b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
@@ -0,0 +1,43 @@
+--- bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
++++ 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 1dd08f07fb44..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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]\."
-                        #  >= 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 f8b18f32cdb2..99ebb54427fe 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 <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=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 --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
 }

From 2b02e32fe30aa49882342c64dde9d6d79e59f642 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 12:37:23 +0100
Subject: [PATCH 3/8] ghc-bin: update to 8.10.4

Take over maintainership of orphaned package.
---
 srcpkgs/ghc-bin/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 9101601358b9..eacbca4e74f8 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,13 +1,13 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.8.4
+version=8.10.4
 revision=1
 archs="i686* x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
 short_desc="Glorious Haskell Compiler - precompiled binaries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 nostrip=yes
@@ -15,17 +15,17 @@ noshlibprovides=yes
 conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
-	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb8-linux.tar.xz"
-	checksum=51a36892f1264744195274187298d13ac62bce2da86d4ddf76d8054ab90f2feb
+	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
+	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=779647d3f4e6e39da9e13b2559319ede76b4fff1107e4dc369a09aadeecad971
+	checksum=56e53f46ad53e6640753d608d01228528fca8ccec01b09bba6ad3b6890a18994
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0
+	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
 	;;
 i686-musl)
 	distfiles="https://distfiles.voidlinux.de/ghc-${version}-i386-unknown-linux-musl.tar.xz"

From c2a77025feed786f6ac6f3ccbd8a5c7da6b715b4 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 15:11:29 +0100
Subject: [PATCH 4/8] stack: update to 2.5.1.1

---
 srcpkgs/stack/patches/datakinds.patch | 14 ------
 srcpkgs/stack/patches/ghc-8.8.4.patch | 70 ---------------------------
 srcpkgs/stack/patches/ppc.patch       | 18 +++----
 srcpkgs/stack/template                | 10 ++--
 4 files changed, 14 insertions(+), 98 deletions(-)
 delete mode 100644 srcpkgs/stack/patches/datakinds.patch
 delete mode 100644 srcpkgs/stack/patches/ghc-8.8.4.patch

diff --git a/srcpkgs/stack/patches/datakinds.patch b/srcpkgs/stack/patches/datakinds.patch
deleted file mode 100644
index 1c06480515f7..000000000000
--- a/srcpkgs/stack/patches/datakinds.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Stack/Storage/User.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/User.hs	2020-12-06 20:51:06.632607164 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
---- src/Stack/Storage/Project.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/Project.hs	2020-12-06 21:55:21.349484738 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch
deleted file mode 100644
index 6b55c176e150..000000000000
--- a/srcpkgs/stack/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- masterdir/builddir/stack-2.5.1/stack.cabal	2020-10-17 17:19:10.724179166 +0200
-+++ stack.cabal	2020-10-17 17:18:03.803498792 +0200
-@@ -234,6 +234,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -272,7 +273,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -359,6 +360,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -396,7 +398,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -480,6 +482,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -518,7 +521,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , optparse-generic
-     , pantry >=0.5.1.3
-     , path
-@@ -609,6 +612,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -647,7 +651,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
diff --git a/srcpkgs/stack/patches/ppc.patch b/srcpkgs/stack/patches/ppc.patch
index 1b5bc191b47c..724aaaf3a65c 100644
--- a/srcpkgs/stack/patches/ppc.patch
+++ b/srcpkgs/stack/patches/ppc.patch
@@ -7,7 +7,7 @@
 +import              System.Endian (getSystemEndianness, Endianness (..))
  import              System.Uname (getRelease)
  import              Data.List.Split (splitOn)
-@@ -1264,4 +1265,9 @@ getOSKey platform =
+@@ -1264,6 +1265,11 @@ getOSKey platform =
          Platform X86_64                Cabal.Windows -> return "windows64"
          Platform Arm                   Cabal.Linux   -> return "linux-armv7"
          Platform AArch64               Cabal.Linux   -> return "linux-aarch64"
@@ -21,11 +21,11 @@
  downloadFromInfo
 --- stack.cabal
 +++ stack.cabal
-@@ -235,6 +235,7 @@ library
-       , conduit
-       , conduit-extra
-       , containers
-+      , cpu >=0.1.2
-       , cryptonite
-       , cryptonite-conduit
-       , deepseq
+@@ -244,6 +244,7 @@
+         conduit >=1.3.1.2,
+         conduit-extra >=1.3.4,
+         containers >=0.6.0.1,
++        cpu >=0.1.2,
+         cryptonite >=0.25,
+         cryptonite-conduit >=0.2.2,
+         deepseq >=1.4.4.0,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 257aba10e50d..66da6618e77d 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.5.1
+version=2.5.1.1
 revision=1
-_stackage="lts-16.13"
+_stackage="lts-17.5"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -10,10 +10,10 @@ short_desc="Cross-platform program for developing Haskell projects"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://haskellstack.org"
-distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
+distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076
- b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58"
+checksum="ccf3ef6dff0412fe8409ef2cfbdf48cad65150f64aec7696725c75881827b539
+ d03bee7e51bbdec5053573f94f644a6baeb140cdd95dbe47261e03c04306b252"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 45cb74fc9759810e913a86e6780b64b1801c4e27 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 16 Mar 2021 17:41:58 +0100
Subject: [PATCH 5/8] xmobar: bump for ghc 8.10.4

---
 srcpkgs/xmobar/files/stack.yaml | 2 +-
 srcpkgs/xmobar/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 7bc4bf189d23..52fd0e3e49fe 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 81ae92fd2940..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.37
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From e54307ee30e73ed307c196ef590d393ee9a7c892 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:03:10 +0100
Subject: [PATCH 6/8] hlint: update to 3.2.7

---
 srcpkgs/hlint/files/stack.yaml   |  7 -------
 srcpkgs/hlint/patches/data.patch | 10 ++++------
 srcpkgs/hlint/template           | 10 +++++-----
 3 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/hlint/files/stack.yaml

diff --git a/srcpkgs/hlint/files/stack.yaml b/srcpkgs/hlint/files/stack.yaml
deleted file mode 100644
index 12aead6562c5..000000000000
--- a/srcpkgs/hlint/files/stack.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-resolver: lts-16.13
-packages: [.]
-extra-deps:
-  - ghc-lib-parser-8.8.4.20200716
-  - ghc-lib-parser-ex-8.8.5.8
-ghc-options:
-    "$locals": -Wunused-imports -Worphans -Wunused-top-binds -Wunused-local-binds -Wincomplete-patterns
diff --git a/srcpkgs/hlint/patches/data.patch b/srcpkgs/hlint/patches/data.patch
index bdfac204f477..c73b376e5df7 100644
--- a/srcpkgs/hlint/patches/data.patch
+++ b/srcpkgs/hlint/patches/data.patch
@@ -1,13 +1,11 @@
-diff --git src/CmdLine.hs src/CmdLine.hs
-index 8c3d530..ccf7aac 100644
 --- src/CmdLine.hs
 +++ src/CmdLine.hs
-@@ -52,7 +52,7 @@ automatic cmd = case cmd of
+@@ -58,7 +58,7 @@
                  b <- doesDirectoryExist x
-                 if b then return cmd{cmdDataDir=x} else do
+                 if b then pure cmd{cmdDataDir=x} else do
                      exe <- getExecutablePath
--                    return cmd{cmdDataDir = takeDirectory exe </> "data"}
-+                    return cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
+-                    pure cmd{cmdDataDir = takeDirectory exe </> "data"}
++                    pure cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
          git cmd
              | cmdGit cmd = do
                  mgit <- findExecutable "git"
diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index 16fbb03ce2b9..fb30f947a452 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,16 +1,16 @@
 # Template file for 'hlint'
 pkgname=hlint
-version=2.2.11
-revision=2
+version=3.2.7
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
-homepage="https://github.com/ndmitchell/${pkgname}"
+homepage="https://github.com/ndmitchell/hlint"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=207539d3627efd3caed9e6fd3b1aeb8f1eb64553f1f9f166090adbf2fb71e172
+checksum=fcdeefcc79a52206add44b409abcab48c5fe2adff9d5aff077acbc43c702b54e
 nocross=yes # Can't yet cross compile Haskell
 nopie_files="/usr/bin/hlint"
 

From 5622d038a130716bba46d4d2fd8f7e6c46547484 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:43:37 +0100
Subject: [PATCH 7/8] kmonad: bump for ghc 8.10.4

---
 srcpkgs/kmonad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index 13e8845581ae..8c34a920ba7d 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,9 +1,9 @@
 # Template file for 'kmonad'
 pkgname=kmonad
 version=0.4.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage=lts-16.13
+stackage=lts-17.5
 short_desc="Keyboard remapping utility providing qmk-like functionality"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"

From 02ed4b0c964678af952bb3d437e72b26c0a56836 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 16:21:35 +0100
Subject: [PATCH 8/8] hoogle: bump for ghc 8.10.4

---
 srcpkgs/hoogle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 4305ac4ae6e8..eafda8747cdf 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,9 +1,9 @@
 # Template file for 'hoogle'
 pkgname=hoogle
 version=5.0.18.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="zlib-devel"
 short_desc="Haskell API search engine"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (4 preceding siblings ...)
  2021-03-18  8:09 ` slotThe
@ 2021-03-19 14:08 ` slotThe
  2021-03-20 13:03 ` slotThe
                   ` (32 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-03-19 14:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2968 bytes --]

There is an updated pull request by slotThe against master on the void-packages repository

https://github.com/slotThe/void-packages ghc-8.10.4
https://github.com/void-linux/void-packages/pull/29506

[WIP] GHC 8.10.4
It's that time of the year again!

- [X] ghc; I took over as maintainer here, @leahneukirchen said that was okay on IRC (cc'ing here to make sure)
- [ ] ghc-bin; took over as mainainer of orphaned package.
    - [X] x86_64-musl; [Link here](https://www34.zippyshare.com/d/yvtjb7uJ/38780/ghc-8.10.4-x86_64-void-linux-musl.tar.xz)
    - [ ] i686-musl
    cc @q66 for these
    - [ ] ppc64le
    - [ ] ppc64le-musl
- [X] cabal-install
- [X] stack
 
Rebuild literally every single haskell package we have and see if anything's broken:

- [ ] git-mediate
- [x] kmonad
- [ ] cgrep
- [ ] debug-me
- [x] hlint
- [x] hoogle
- [ ] darcs
- [ ] shellcheck
- [ ] git-annex
- [ ] hledger
- [ ] pandoc
- [x] xmobar

For the following two I'd like to fix #6414 while we're at it.  Because stack can't install libraries globally, this would involve either removing these packages entirely and advising users to install them in their own [stack or cabal projects](https://github.com/xmonad/xmonad-testing), or finding a way to build them with cabal and updating ghc's data base accordingly.  This would probably use `v1` commands, as we don't want to nuke our users db if we update xmonad. Cc @xaltsc as the current maintainer and @chilledfrogs as someone who might want to tackle this (if I read the IRC discussion correctly). 

- [ ] xmonad
- [ ] xmonad-contrib

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/29506.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghc-8.10.4-29506.patch --]
[-- Type: text/x-diff, Size: 27826 bytes --]

From 42f34d3da820d46fabe371221f59f836683e8de7 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 31 Jan 2021 14:31:24 +0100
Subject: [PATCH 01/10] ghc: update to 8.10.4

The change of maintainership was okay-ed by Leah.
---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch | 41 +++++++++++-------------
 srcpkgs/ghc/template                     |  8 ++---
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index ac353ed417e5..c9bd2583abe0 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -85,7 +85,7 @@ index ec3c18a..0359be7 100644
 +        in Right [ 0x3D800000 .|. hi16 w32,
 +                   0x618C0000 .|. lo16 w32,
 +                   0x7D8903A6, 0x4E800420 ]
- 
+
      ArchPPC64LE ->
          -- The ABI requires r12 to point to the function's entry point.
 diff --git a/rts/Adjustor.c b/rts/Adjustor.c
@@ -93,7 +93,7 @@ index d360cfe..ab7ede7 100644
 --- a/rts/Adjustor.c
 +++ b/rts/Adjustor.c
 @@ -49,7 +49,7 @@ Haskell side.
- 
+
  #if defined(i386_HOST_ARCH)
  extern void adjustorCode(void);
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
@@ -104,16 +104,16 @@ index d360cfe..ab7ede7 100644
 @@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
  extern void obscure_ccall_ret_code(void);
  #endif
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
- 
+
  /* !!! !!! WARNING: !!! !!!
 @@ -318,7 +318,7 @@ typedef struct AdjustorStub {
  } AdjustorStub;
  #endif
- 
+
 -#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  static int totalArgumentSize(char *typeString)
@@ -131,10 +131,10 @@ index d360cfe..ab7ede7 100644
 @@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
          }
      }
- 
+
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-         
+
  #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
  #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
 @@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
@@ -151,9 +151,9 @@ index 2795b83..63cfe91 100644
 --- a/rts/AdjustorAsm.S
 +++ b/rts/AdjustorAsm.S
 @@ -2,7 +2,7 @@
- 
+
  /* ******************************** PowerPC ******************************** */
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
@@ -166,34 +166,31 @@ index 934926e..2ff8662 100644
 @@ -717,7 +717,7 @@ StgRunIsImplementedInAssembler(void)
     Everything is in assembler, so we don't have to deal with GCC...
     -------------------------------------------------------------------------- */
- 
+
 -#if defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
- 
+
  static void GNUC3_ATTRIBUTE(used)
  StgRunIsImplementedInAssembler(void)
 @@ -842,7 +842,7 @@ StgRunIsImplementedInAssembler(void)
- 
+
  #endif
- 
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
  /* -----------------------------------------------------------------------------
     PowerPC 64 little endian architecture
- 
+
 diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
 index 9274a44..3b4fc33 100644
 --- a/rts/StgCRunAsm.S
 +++ b/rts/StgCRunAsm.S
-@@ -1,7 +1,7 @@
- #include "ghcconfig.h"
- #include "rts/Constants.h"
- 
+@@ -5,7 +5,7 @@
+  * then functions StgRun/StgReturn are implemented in file StgCRun.c */
+ #if !defined(USE_MINIINTERPRETER)
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
- # ifdef linux_HOST_OS
+ # if defined(linux_HOST_OS)
  # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
  	.file	"StgCRun.c"
--- 
-2.30.0
-
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 0b1440b2f6d9..c6acfa79e75d 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,8 +1,8 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.8.4
-revision=2
+version=8.10.4
+revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
 hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
@@ -10,11 +10,11 @@ hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
 makedepends="libnuma-devel"
 depends="perl gcc libffi-devel gmp-devel libnuma-devel"
 short_desc="Glorious Haskell Compiler"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d
+checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
 patch_args="-Np1"
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"

From 40374990acd5b6cd9bdef01dd0889de79aef76e4 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 28 Feb 2021 18:34:26 +0100
Subject: [PATCH 02/10] 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 000000000000..63965ca12d44
--- /dev/null
+++ b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
@@ -0,0 +1,43 @@
+--- bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
++++ 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 1dd08f07fb44..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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]\."
-                        #  >= 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 f8b18f32cdb2..99ebb54427fe 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 <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=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 --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
 }

From 2b02e32fe30aa49882342c64dde9d6d79e59f642 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 12:37:23 +0100
Subject: [PATCH 03/10] ghc-bin: update to 8.10.4

Take over maintainership of orphaned package.
---
 srcpkgs/ghc-bin/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 9101601358b9..eacbca4e74f8 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,13 +1,13 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.8.4
+version=8.10.4
 revision=1
 archs="i686* x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
 short_desc="Glorious Haskell Compiler - precompiled binaries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 nostrip=yes
@@ -15,17 +15,17 @@ noshlibprovides=yes
 conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
-	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb8-linux.tar.xz"
-	checksum=51a36892f1264744195274187298d13ac62bce2da86d4ddf76d8054ab90f2feb
+	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
+	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=779647d3f4e6e39da9e13b2559319ede76b4fff1107e4dc369a09aadeecad971
+	checksum=56e53f46ad53e6640753d608d01228528fca8ccec01b09bba6ad3b6890a18994
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0
+	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
 	;;
 i686-musl)
 	distfiles="https://distfiles.voidlinux.de/ghc-${version}-i386-unknown-linux-musl.tar.xz"

From c2a77025feed786f6ac6f3ccbd8a5c7da6b715b4 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 15:11:29 +0100
Subject: [PATCH 04/10] stack: update to 2.5.1.1

---
 srcpkgs/stack/patches/datakinds.patch | 14 ------
 srcpkgs/stack/patches/ghc-8.8.4.patch | 70 ---------------------------
 srcpkgs/stack/patches/ppc.patch       | 18 +++----
 srcpkgs/stack/template                | 10 ++--
 4 files changed, 14 insertions(+), 98 deletions(-)
 delete mode 100644 srcpkgs/stack/patches/datakinds.patch
 delete mode 100644 srcpkgs/stack/patches/ghc-8.8.4.patch

diff --git a/srcpkgs/stack/patches/datakinds.patch b/srcpkgs/stack/patches/datakinds.patch
deleted file mode 100644
index 1c06480515f7..000000000000
--- a/srcpkgs/stack/patches/datakinds.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Stack/Storage/User.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/User.hs	2020-12-06 20:51:06.632607164 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
---- src/Stack/Storage/Project.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/Project.hs	2020-12-06 21:55:21.349484738 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch
deleted file mode 100644
index 6b55c176e150..000000000000
--- a/srcpkgs/stack/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- masterdir/builddir/stack-2.5.1/stack.cabal	2020-10-17 17:19:10.724179166 +0200
-+++ stack.cabal	2020-10-17 17:18:03.803498792 +0200
-@@ -234,6 +234,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -272,7 +273,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -359,6 +360,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -396,7 +398,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -480,6 +482,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -518,7 +521,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , optparse-generic
-     , pantry >=0.5.1.3
-     , path
-@@ -609,6 +612,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -647,7 +651,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
diff --git a/srcpkgs/stack/patches/ppc.patch b/srcpkgs/stack/patches/ppc.patch
index 1b5bc191b47c..724aaaf3a65c 100644
--- a/srcpkgs/stack/patches/ppc.patch
+++ b/srcpkgs/stack/patches/ppc.patch
@@ -7,7 +7,7 @@
 +import              System.Endian (getSystemEndianness, Endianness (..))
  import              System.Uname (getRelease)
  import              Data.List.Split (splitOn)
-@@ -1264,4 +1265,9 @@ getOSKey platform =
+@@ -1264,6 +1265,11 @@ getOSKey platform =
          Platform X86_64                Cabal.Windows -> return "windows64"
          Platform Arm                   Cabal.Linux   -> return "linux-armv7"
          Platform AArch64               Cabal.Linux   -> return "linux-aarch64"
@@ -21,11 +21,11 @@
  downloadFromInfo
 --- stack.cabal
 +++ stack.cabal
-@@ -235,6 +235,7 @@ library
-       , conduit
-       , conduit-extra
-       , containers
-+      , cpu >=0.1.2
-       , cryptonite
-       , cryptonite-conduit
-       , deepseq
+@@ -244,6 +244,7 @@
+         conduit >=1.3.1.2,
+         conduit-extra >=1.3.4,
+         containers >=0.6.0.1,
++        cpu >=0.1.2,
+         cryptonite >=0.25,
+         cryptonite-conduit >=0.2.2,
+         deepseq >=1.4.4.0,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 257aba10e50d..66da6618e77d 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.5.1
+version=2.5.1.1
 revision=1
-_stackage="lts-16.13"
+_stackage="lts-17.5"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -10,10 +10,10 @@ short_desc="Cross-platform program for developing Haskell projects"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://haskellstack.org"
-distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
+distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076
- b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58"
+checksum="ccf3ef6dff0412fe8409ef2cfbdf48cad65150f64aec7696725c75881827b539
+ d03bee7e51bbdec5053573f94f644a6baeb140cdd95dbe47261e03c04306b252"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 45cb74fc9759810e913a86e6780b64b1801c4e27 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 16 Mar 2021 17:41:58 +0100
Subject: [PATCH 05/10] xmobar: bump for ghc 8.10.4

---
 srcpkgs/xmobar/files/stack.yaml | 2 +-
 srcpkgs/xmobar/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 7bc4bf189d23..52fd0e3e49fe 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 81ae92fd2940..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.37
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From e54307ee30e73ed307c196ef590d393ee9a7c892 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:03:10 +0100
Subject: [PATCH 06/10] hlint: update to 3.2.7

---
 srcpkgs/hlint/files/stack.yaml   |  7 -------
 srcpkgs/hlint/patches/data.patch | 10 ++++------
 srcpkgs/hlint/template           | 10 +++++-----
 3 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/hlint/files/stack.yaml

diff --git a/srcpkgs/hlint/files/stack.yaml b/srcpkgs/hlint/files/stack.yaml
deleted file mode 100644
index 12aead6562c5..000000000000
--- a/srcpkgs/hlint/files/stack.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-resolver: lts-16.13
-packages: [.]
-extra-deps:
-  - ghc-lib-parser-8.8.4.20200716
-  - ghc-lib-parser-ex-8.8.5.8
-ghc-options:
-    "$locals": -Wunused-imports -Worphans -Wunused-top-binds -Wunused-local-binds -Wincomplete-patterns
diff --git a/srcpkgs/hlint/patches/data.patch b/srcpkgs/hlint/patches/data.patch
index bdfac204f477..c73b376e5df7 100644
--- a/srcpkgs/hlint/patches/data.patch
+++ b/srcpkgs/hlint/patches/data.patch
@@ -1,13 +1,11 @@
-diff --git src/CmdLine.hs src/CmdLine.hs
-index 8c3d530..ccf7aac 100644
 --- src/CmdLine.hs
 +++ src/CmdLine.hs
-@@ -52,7 +52,7 @@ automatic cmd = case cmd of
+@@ -58,7 +58,7 @@
                  b <- doesDirectoryExist x
-                 if b then return cmd{cmdDataDir=x} else do
+                 if b then pure cmd{cmdDataDir=x} else do
                      exe <- getExecutablePath
--                    return cmd{cmdDataDir = takeDirectory exe </> "data"}
-+                    return cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
+-                    pure cmd{cmdDataDir = takeDirectory exe </> "data"}
++                    pure cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
          git cmd
              | cmdGit cmd = do
                  mgit <- findExecutable "git"
diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index 16fbb03ce2b9..fb30f947a452 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,16 +1,16 @@
 # Template file for 'hlint'
 pkgname=hlint
-version=2.2.11
-revision=2
+version=3.2.7
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
-homepage="https://github.com/ndmitchell/${pkgname}"
+homepage="https://github.com/ndmitchell/hlint"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=207539d3627efd3caed9e6fd3b1aeb8f1eb64553f1f9f166090adbf2fb71e172
+checksum=fcdeefcc79a52206add44b409abcab48c5fe2adff9d5aff077acbc43c702b54e
 nocross=yes # Can't yet cross compile Haskell
 nopie_files="/usr/bin/hlint"
 

From 5622d038a130716bba46d4d2fd8f7e6c46547484 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:43:37 +0100
Subject: [PATCH 07/10] kmonad: bump for ghc 8.10.4

---
 srcpkgs/kmonad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index 13e8845581ae..8c34a920ba7d 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,9 +1,9 @@
 # Template file for 'kmonad'
 pkgname=kmonad
 version=0.4.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage=lts-16.13
+stackage=lts-17.5
 short_desc="Keyboard remapping utility providing qmk-like functionality"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"

From 02ed4b0c964678af952bb3d437e72b26c0a56836 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 16:21:35 +0100
Subject: [PATCH 08/10] hoogle: bump for ghc 8.10.4

---
 srcpkgs/hoogle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 4305ac4ae6e8..eafda8747cdf 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,9 +1,9 @@
 # Template file for 'hoogle'
 pkgname=hoogle
 version=5.0.18.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="zlib-devel"
 short_desc="Haskell API search engine"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From 687066585bef2f80652f93646af137cb9026d0b8 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 11:18:37 +0100
Subject: [PATCH 09/10] cgrep: bump for ghc 8.10.4

---
 srcpkgs/cgrep/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index 7b4047614a71..15eda3bafd0e 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,12 +1,12 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.6.33
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.18"
+stackage="lts-17.5"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="https://awgn.github.io/cgrep/"
 distfiles="https://github.com/awgn/${pkgname}/archive/v${version}.tar.gz"

From 67a9c11f6e6829ceb16ecb04f9858af9d5ad5597 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 15:03:05 +0100
Subject: [PATCH 10/10] debug-me: bump for ghc 8.10.4

---
 srcpkgs/debug-me/files/stack.yaml                     |  2 +-
 .../patches/{ghc8.8.3.patch => ghc8.10.4.patch}       | 11 +++++++++++
 srcpkgs/debug-me/template                             |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 rename srcpkgs/debug-me/patches/{ghc8.8.3.patch => ghc8.10.4.patch} (70%)

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index 9c88cea9ab3c..ecff9d9d18f2 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - '.'
-resolver: lts-16.13
+resolver: lts-17.5
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/patches/ghc8.8.3.patch b/srcpkgs/debug-me/patches/ghc8.10.4.patch
similarity index 70%
rename from srcpkgs/debug-me/patches/ghc8.8.3.patch
rename to srcpkgs/debug-me/patches/ghc8.10.4.patch
index f1779331c5a9..9cc19db63be3 100644
--- a/srcpkgs/debug-me/patches/ghc8.8.3.patch
+++ b/srcpkgs/debug-me/patches/ghc8.10.4.patch
@@ -20,3 +20,14 @@
  		defaultSettings
 
  checkEnv :: ServerOpts -> IO ServerOpts
+--- debug-me.cabal
++++ debug-me.cabal
+@@ -64,7 +64,7 @@
+     , stm-chans (>= 3.0)
+     , posix-pty (>= 0.2.1)
+     , terminal-size (>= 0.3)
+-    , aeson (>= 0.11 && < 1.5)
++    , aeson (>= 0.11 && < 1.6)
+     , sandi (>= 0.4)
+     , text (>= 1.2.2)
+     , optparse-applicative (>= 0.12)
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 3df514e0be48..797c52f1f479 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -1,7 +1,7 @@
 # Template file for 'debug-me'
 pkgname=debug-me
 version=1.20200820
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (5 preceding siblings ...)
  2021-03-19 14:08 ` slotThe
@ 2021-03-20 13:03 ` slotThe
  2021-03-25  7:57 ` slotThe
                   ` (31 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-03-20 13:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3013 bytes --]

There is an updated pull request by slotThe against master on the void-packages repository

https://github.com/slotThe/void-packages ghc-8.10.4
https://github.com/void-linux/void-packages/pull/29506

[WIP] GHC 8.10.4
It's that time of the year again!

- [X] ghc; I took over as maintainer here, @leahneukirchen said that was okay on IRC (cc'ing here to make sure)
- [ ] ghc-bin; took over as mainainer of orphaned package.
    - [X] x86_64-musl; [Link here](https://www34.zippyshare.com/d/yvtjb7uJ/38780/ghc-8.10.4-x86_64-void-linux-musl.tar.xz)
    - [ ] i686-musl
    cc @q66 for these
    - [ ] ppc64le
    - [ ] ppc64le-musl
- [X] cabal-install
- [X] stack
 
Rebuild literally every single haskell package we have and see if anything's broken:

- [ ] git-mediate
- [x] kmonad
- [x] cgrep; took over as mainainer of orphaned package.
- [x] debug-me
- [x] hlint
- [x] hoogle
- [ ] darcs
- [ ] shellcheck
- [ ] git-annex
- [ ] hledger
- [ ] pandoc
- [x] xmobar

For the following two I'd like to fix #6414 while we're at it.  Because stack can't install libraries globally, this would involve either removing these packages entirely and advising users to install them in their own [stack or cabal projects](https://github.com/xmonad/xmonad-testing), or finding a way to build them with cabal and updating ghc's data base accordingly.  This would probably use `v1` commands, as we don't want to nuke our users db if we update xmonad. Cc @xaltsc as the current maintainer and @chilledfrogs as someone who might want to tackle this (if I read the IRC discussion correctly). 

- [ ] xmonad
- [ ] xmonad-contrib

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/29506.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghc-8.10.4-29506.patch --]
[-- Type: text/x-diff, Size: 28806 bytes --]

From 42f34d3da820d46fabe371221f59f836683e8de7 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 31 Jan 2021 14:31:24 +0100
Subject: [PATCH 01/11] ghc: update to 8.10.4

The change of maintainership was okay-ed by Leah.
---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch | 41 +++++++++++-------------
 srcpkgs/ghc/template                     |  8 ++---
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index ac353ed417e5..c9bd2583abe0 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -85,7 +85,7 @@ index ec3c18a..0359be7 100644
 +        in Right [ 0x3D800000 .|. hi16 w32,
 +                   0x618C0000 .|. lo16 w32,
 +                   0x7D8903A6, 0x4E800420 ]
- 
+
      ArchPPC64LE ->
          -- The ABI requires r12 to point to the function's entry point.
 diff --git a/rts/Adjustor.c b/rts/Adjustor.c
@@ -93,7 +93,7 @@ index d360cfe..ab7ede7 100644
 --- a/rts/Adjustor.c
 +++ b/rts/Adjustor.c
 @@ -49,7 +49,7 @@ Haskell side.
- 
+
  #if defined(i386_HOST_ARCH)
  extern void adjustorCode(void);
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
@@ -104,16 +104,16 @@ index d360cfe..ab7ede7 100644
 @@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
  extern void obscure_ccall_ret_code(void);
  #endif
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
- 
+
  /* !!! !!! WARNING: !!! !!!
 @@ -318,7 +318,7 @@ typedef struct AdjustorStub {
  } AdjustorStub;
  #endif
- 
+
 -#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  static int totalArgumentSize(char *typeString)
@@ -131,10 +131,10 @@ index d360cfe..ab7ede7 100644
 @@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
          }
      }
- 
+
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-         
+
  #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
  #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
 @@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
@@ -151,9 +151,9 @@ index 2795b83..63cfe91 100644
 --- a/rts/AdjustorAsm.S
 +++ b/rts/AdjustorAsm.S
 @@ -2,7 +2,7 @@
- 
+
  /* ******************************** PowerPC ******************************** */
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
@@ -166,34 +166,31 @@ index 934926e..2ff8662 100644
 @@ -717,7 +717,7 @@ StgRunIsImplementedInAssembler(void)
     Everything is in assembler, so we don't have to deal with GCC...
     -------------------------------------------------------------------------- */
- 
+
 -#if defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
- 
+
  static void GNUC3_ATTRIBUTE(used)
  StgRunIsImplementedInAssembler(void)
 @@ -842,7 +842,7 @@ StgRunIsImplementedInAssembler(void)
- 
+
  #endif
- 
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
  /* -----------------------------------------------------------------------------
     PowerPC 64 little endian architecture
- 
+
 diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
 index 9274a44..3b4fc33 100644
 --- a/rts/StgCRunAsm.S
 +++ b/rts/StgCRunAsm.S
-@@ -1,7 +1,7 @@
- #include "ghcconfig.h"
- #include "rts/Constants.h"
- 
+@@ -5,7 +5,7 @@
+  * then functions StgRun/StgReturn are implemented in file StgCRun.c */
+ #if !defined(USE_MINIINTERPRETER)
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
- # ifdef linux_HOST_OS
+ # if defined(linux_HOST_OS)
  # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
  	.file	"StgCRun.c"
--- 
-2.30.0
-
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 0b1440b2f6d9..c6acfa79e75d 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,8 +1,8 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.8.4
-revision=2
+version=8.10.4
+revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
 hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
@@ -10,11 +10,11 @@ hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
 makedepends="libnuma-devel"
 depends="perl gcc libffi-devel gmp-devel libnuma-devel"
 short_desc="Glorious Haskell Compiler"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d
+checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
 patch_args="-Np1"
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"

From 40374990acd5b6cd9bdef01dd0889de79aef76e4 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 28 Feb 2021 18:34:26 +0100
Subject: [PATCH 02/11] 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 000000000000..63965ca12d44
--- /dev/null
+++ b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
@@ -0,0 +1,43 @@
+--- bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
++++ 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 1dd08f07fb44..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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]\."
-                        #  >= 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 f8b18f32cdb2..99ebb54427fe 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 <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=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 --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
 }

From 2b02e32fe30aa49882342c64dde9d6d79e59f642 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 12:37:23 +0100
Subject: [PATCH 03/11] ghc-bin: update to 8.10.4

Take over maintainership of orphaned package.
---
 srcpkgs/ghc-bin/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 9101601358b9..eacbca4e74f8 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,13 +1,13 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.8.4
+version=8.10.4
 revision=1
 archs="i686* x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
 short_desc="Glorious Haskell Compiler - precompiled binaries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 nostrip=yes
@@ -15,17 +15,17 @@ noshlibprovides=yes
 conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
-	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb8-linux.tar.xz"
-	checksum=51a36892f1264744195274187298d13ac62bce2da86d4ddf76d8054ab90f2feb
+	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
+	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=779647d3f4e6e39da9e13b2559319ede76b4fff1107e4dc369a09aadeecad971
+	checksum=56e53f46ad53e6640753d608d01228528fca8ccec01b09bba6ad3b6890a18994
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0
+	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
 	;;
 i686-musl)
 	distfiles="https://distfiles.voidlinux.de/ghc-${version}-i386-unknown-linux-musl.tar.xz"

From c2a77025feed786f6ac6f3ccbd8a5c7da6b715b4 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 15:11:29 +0100
Subject: [PATCH 04/11] stack: update to 2.5.1.1

---
 srcpkgs/stack/patches/datakinds.patch | 14 ------
 srcpkgs/stack/patches/ghc-8.8.4.patch | 70 ---------------------------
 srcpkgs/stack/patches/ppc.patch       | 18 +++----
 srcpkgs/stack/template                | 10 ++--
 4 files changed, 14 insertions(+), 98 deletions(-)
 delete mode 100644 srcpkgs/stack/patches/datakinds.patch
 delete mode 100644 srcpkgs/stack/patches/ghc-8.8.4.patch

diff --git a/srcpkgs/stack/patches/datakinds.patch b/srcpkgs/stack/patches/datakinds.patch
deleted file mode 100644
index 1c06480515f7..000000000000
--- a/srcpkgs/stack/patches/datakinds.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Stack/Storage/User.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/User.hs	2020-12-06 20:51:06.632607164 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
---- src/Stack/Storage/Project.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/Project.hs	2020-12-06 21:55:21.349484738 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch
deleted file mode 100644
index 6b55c176e150..000000000000
--- a/srcpkgs/stack/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- masterdir/builddir/stack-2.5.1/stack.cabal	2020-10-17 17:19:10.724179166 +0200
-+++ stack.cabal	2020-10-17 17:18:03.803498792 +0200
-@@ -234,6 +234,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -272,7 +273,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -359,6 +360,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -396,7 +398,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -480,6 +482,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -518,7 +521,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , optparse-generic
-     , pantry >=0.5.1.3
-     , path
-@@ -609,6 +612,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -647,7 +651,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
diff --git a/srcpkgs/stack/patches/ppc.patch b/srcpkgs/stack/patches/ppc.patch
index 1b5bc191b47c..724aaaf3a65c 100644
--- a/srcpkgs/stack/patches/ppc.patch
+++ b/srcpkgs/stack/patches/ppc.patch
@@ -7,7 +7,7 @@
 +import              System.Endian (getSystemEndianness, Endianness (..))
  import              System.Uname (getRelease)
  import              Data.List.Split (splitOn)
-@@ -1264,4 +1265,9 @@ getOSKey platform =
+@@ -1264,6 +1265,11 @@ getOSKey platform =
          Platform X86_64                Cabal.Windows -> return "windows64"
          Platform Arm                   Cabal.Linux   -> return "linux-armv7"
          Platform AArch64               Cabal.Linux   -> return "linux-aarch64"
@@ -21,11 +21,11 @@
  downloadFromInfo
 --- stack.cabal
 +++ stack.cabal
-@@ -235,6 +235,7 @@ library
-       , conduit
-       , conduit-extra
-       , containers
-+      , cpu >=0.1.2
-       , cryptonite
-       , cryptonite-conduit
-       , deepseq
+@@ -244,6 +244,7 @@
+         conduit >=1.3.1.2,
+         conduit-extra >=1.3.4,
+         containers >=0.6.0.1,
++        cpu >=0.1.2,
+         cryptonite >=0.25,
+         cryptonite-conduit >=0.2.2,
+         deepseq >=1.4.4.0,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 257aba10e50d..66da6618e77d 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.5.1
+version=2.5.1.1
 revision=1
-_stackage="lts-16.13"
+_stackage="lts-17.5"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -10,10 +10,10 @@ short_desc="Cross-platform program for developing Haskell projects"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://haskellstack.org"
-distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
+distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076
- b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58"
+checksum="ccf3ef6dff0412fe8409ef2cfbdf48cad65150f64aec7696725c75881827b539
+ d03bee7e51bbdec5053573f94f644a6baeb140cdd95dbe47261e03c04306b252"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 45cb74fc9759810e913a86e6780b64b1801c4e27 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 16 Mar 2021 17:41:58 +0100
Subject: [PATCH 05/11] xmobar: bump for ghc 8.10.4

---
 srcpkgs/xmobar/files/stack.yaml | 2 +-
 srcpkgs/xmobar/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 7bc4bf189d23..52fd0e3e49fe 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 81ae92fd2940..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.37
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From e54307ee30e73ed307c196ef590d393ee9a7c892 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:03:10 +0100
Subject: [PATCH 06/11] hlint: update to 3.2.7

---
 srcpkgs/hlint/files/stack.yaml   |  7 -------
 srcpkgs/hlint/patches/data.patch | 10 ++++------
 srcpkgs/hlint/template           | 10 +++++-----
 3 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/hlint/files/stack.yaml

diff --git a/srcpkgs/hlint/files/stack.yaml b/srcpkgs/hlint/files/stack.yaml
deleted file mode 100644
index 12aead6562c5..000000000000
--- a/srcpkgs/hlint/files/stack.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-resolver: lts-16.13
-packages: [.]
-extra-deps:
-  - ghc-lib-parser-8.8.4.20200716
-  - ghc-lib-parser-ex-8.8.5.8
-ghc-options:
-    "$locals": -Wunused-imports -Worphans -Wunused-top-binds -Wunused-local-binds -Wincomplete-patterns
diff --git a/srcpkgs/hlint/patches/data.patch b/srcpkgs/hlint/patches/data.patch
index bdfac204f477..c73b376e5df7 100644
--- a/srcpkgs/hlint/patches/data.patch
+++ b/srcpkgs/hlint/patches/data.patch
@@ -1,13 +1,11 @@
-diff --git src/CmdLine.hs src/CmdLine.hs
-index 8c3d530..ccf7aac 100644
 --- src/CmdLine.hs
 +++ src/CmdLine.hs
-@@ -52,7 +52,7 @@ automatic cmd = case cmd of
+@@ -58,7 +58,7 @@
                  b <- doesDirectoryExist x
-                 if b then return cmd{cmdDataDir=x} else do
+                 if b then pure cmd{cmdDataDir=x} else do
                      exe <- getExecutablePath
--                    return cmd{cmdDataDir = takeDirectory exe </> "data"}
-+                    return cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
+-                    pure cmd{cmdDataDir = takeDirectory exe </> "data"}
++                    pure cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
          git cmd
              | cmdGit cmd = do
                  mgit <- findExecutable "git"
diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index 16fbb03ce2b9..fb30f947a452 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,16 +1,16 @@
 # Template file for 'hlint'
 pkgname=hlint
-version=2.2.11
-revision=2
+version=3.2.7
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
-homepage="https://github.com/ndmitchell/${pkgname}"
+homepage="https://github.com/ndmitchell/hlint"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=207539d3627efd3caed9e6fd3b1aeb8f1eb64553f1f9f166090adbf2fb71e172
+checksum=fcdeefcc79a52206add44b409abcab48c5fe2adff9d5aff077acbc43c702b54e
 nocross=yes # Can't yet cross compile Haskell
 nopie_files="/usr/bin/hlint"
 

From 5622d038a130716bba46d4d2fd8f7e6c46547484 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:43:37 +0100
Subject: [PATCH 07/11] kmonad: bump for ghc 8.10.4

---
 srcpkgs/kmonad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index 13e8845581ae..8c34a920ba7d 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,9 +1,9 @@
 # Template file for 'kmonad'
 pkgname=kmonad
 version=0.4.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage=lts-16.13
+stackage=lts-17.5
 short_desc="Keyboard remapping utility providing qmk-like functionality"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"

From 02ed4b0c964678af952bb3d437e72b26c0a56836 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 16:21:35 +0100
Subject: [PATCH 08/11] hoogle: bump for ghc 8.10.4

---
 srcpkgs/hoogle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 4305ac4ae6e8..eafda8747cdf 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,9 +1,9 @@
 # Template file for 'hoogle'
 pkgname=hoogle
 version=5.0.18.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="zlib-devel"
 short_desc="Haskell API search engine"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From 687066585bef2f80652f93646af137cb9026d0b8 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 11:18:37 +0100
Subject: [PATCH 09/11] cgrep: bump for ghc 8.10.4

---
 srcpkgs/cgrep/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index 7b4047614a71..15eda3bafd0e 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,12 +1,12 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.6.33
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.18"
+stackage="lts-17.5"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="https://awgn.github.io/cgrep/"
 distfiles="https://github.com/awgn/${pkgname}/archive/v${version}.tar.gz"

From 67a9c11f6e6829ceb16ecb04f9858af9d5ad5597 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 15:03:05 +0100
Subject: [PATCH 10/11] debug-me: bump for ghc 8.10.4

---
 srcpkgs/debug-me/files/stack.yaml                     |  2 +-
 .../patches/{ghc8.8.3.patch => ghc8.10.4.patch}       | 11 +++++++++++
 srcpkgs/debug-me/template                             |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 rename srcpkgs/debug-me/patches/{ghc8.8.3.patch => ghc8.10.4.patch} (70%)

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index 9c88cea9ab3c..ecff9d9d18f2 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - '.'
-resolver: lts-16.13
+resolver: lts-17.5
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/patches/ghc8.8.3.patch b/srcpkgs/debug-me/patches/ghc8.10.4.patch
similarity index 70%
rename from srcpkgs/debug-me/patches/ghc8.8.3.patch
rename to srcpkgs/debug-me/patches/ghc8.10.4.patch
index f1779331c5a9..9cc19db63be3 100644
--- a/srcpkgs/debug-me/patches/ghc8.8.3.patch
+++ b/srcpkgs/debug-me/patches/ghc8.10.4.patch
@@ -20,3 +20,14 @@
  		defaultSettings
 
  checkEnv :: ServerOpts -> IO ServerOpts
+--- debug-me.cabal
++++ debug-me.cabal
+@@ -64,7 +64,7 @@
+     , stm-chans (>= 3.0)
+     , posix-pty (>= 0.2.1)
+     , terminal-size (>= 0.3)
+-    , aeson (>= 0.11 && < 1.5)
++    , aeson (>= 0.11 && < 1.6)
+     , sandi (>= 0.4)
+     , text (>= 1.2.2)
+     , optparse-applicative (>= 0.12)
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 3df514e0be48..797c52f1f479 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -1,7 +1,7 @@
 # Template file for 'debug-me'
 pkgname=debug-me
 version=1.20200820
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"

From f7f4460bb189b5d4a95a91215b9fe2f009153d20 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 20 Mar 2021 11:26:04 +0100
Subject: [PATCH 11/11] darcs: bump for ghc 8.10.4

---
 srcpkgs/darcs/files/stack.yaml | 2 +-
 srcpkgs/darcs/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index 3766e74cccb0..cfc1efb94d53 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index bdbe3f14cc6f..6aa45fa21535 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.3
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (6 preceding siblings ...)
  2021-03-20 13:03 ` slotThe
@ 2021-03-25  7:57 ` slotThe
  2021-03-25  7:58 ` slotThe
                   ` (30 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-03-25  7:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3024 bytes --]

There is an updated pull request by slotThe against master on the void-packages repository

https://github.com/slotThe/void-packages ghc-8.10.4
https://github.com/void-linux/void-packages/pull/29506

[WIP] GHC 8.10.4
It's that time of the year again!

- [X] ghc; I took over as maintainer here, @leahneukirchen said that was okay on IRC (cc'ing here to make sure)
- [ ] ghc-bin; took over as mainainer of orphaned package.
    - [X] x86_64-musl; [Link here](https://www34.zippyshare.com/d/yvtjb7uJ/38780/ghc-8.10.4-x86_64-void-linux-musl.tar.xz)
    - [ ] i686-musl
    cc @q66 for these
    - [ ] ppc64le
    - [ ] ppc64le-musl
- [X] cabal-install
- [X] stack
 
Rebuild literally every single haskell package we have and see if anything's broken:

- [ ] git-mediate
- [x] kmonad
- [x] cgrep; took over as mainainer of orphaned package.
- [x] debug-me
- [x] hlint
- [x] hoogle
- [x] darcs
- [ ] shellcheck
- [ ] git-annex
- [ ] hledger
- [ ] pandoc
- [x] xmobar
- [ ] HLS

For the following two I'd like to fix #6414 while we're at it.  Because stack can't install libraries globally, this would involve either removing these packages entirely and advising users to install them in their own [stack or cabal projects](https://github.com/xmonad/xmonad-testing), or finding a way to build them with cabal and updating ghc's data base accordingly.  This would probably use `v1` commands, as we don't want to nuke our users db if we update xmonad. Cc @xaltsc as the current maintainer and @chilledfrogs as someone who might want to tackle this (if I read the IRC discussion correctly). 

- [ ] xmonad
- [ ] xmonad-contrib

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/29506.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghc-8.10.4-29506.patch --]
[-- Type: text/x-diff, Size: 29560 bytes --]

From 42f34d3da820d46fabe371221f59f836683e8de7 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 31 Jan 2021 14:31:24 +0100
Subject: [PATCH 01/12] ghc: update to 8.10.4

The change of maintainership was okay-ed by Leah.
---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch | 41 +++++++++++-------------
 srcpkgs/ghc/template                     |  8 ++---
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index ac353ed417e5..c9bd2583abe0 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -85,7 +85,7 @@ index ec3c18a..0359be7 100644
 +        in Right [ 0x3D800000 .|. hi16 w32,
 +                   0x618C0000 .|. lo16 w32,
 +                   0x7D8903A6, 0x4E800420 ]
- 
+
      ArchPPC64LE ->
          -- The ABI requires r12 to point to the function's entry point.
 diff --git a/rts/Adjustor.c b/rts/Adjustor.c
@@ -93,7 +93,7 @@ index d360cfe..ab7ede7 100644
 --- a/rts/Adjustor.c
 +++ b/rts/Adjustor.c
 @@ -49,7 +49,7 @@ Haskell side.
- 
+
  #if defined(i386_HOST_ARCH)
  extern void adjustorCode(void);
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
@@ -104,16 +104,16 @@ index d360cfe..ab7ede7 100644
 @@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
  extern void obscure_ccall_ret_code(void);
  #endif
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
- 
+
  /* !!! !!! WARNING: !!! !!!
 @@ -318,7 +318,7 @@ typedef struct AdjustorStub {
  } AdjustorStub;
  #endif
- 
+
 -#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  static int totalArgumentSize(char *typeString)
@@ -131,10 +131,10 @@ index d360cfe..ab7ede7 100644
 @@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
          }
      }
- 
+
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-         
+
  #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
  #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
 @@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
@@ -151,9 +151,9 @@ index 2795b83..63cfe91 100644
 --- a/rts/AdjustorAsm.S
 +++ b/rts/AdjustorAsm.S
 @@ -2,7 +2,7 @@
- 
+
  /* ******************************** PowerPC ******************************** */
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
@@ -166,34 +166,31 @@ index 934926e..2ff8662 100644
 @@ -717,7 +717,7 @@ StgRunIsImplementedInAssembler(void)
     Everything is in assembler, so we don't have to deal with GCC...
     -------------------------------------------------------------------------- */
- 
+
 -#if defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
- 
+
  static void GNUC3_ATTRIBUTE(used)
  StgRunIsImplementedInAssembler(void)
 @@ -842,7 +842,7 @@ StgRunIsImplementedInAssembler(void)
- 
+
  #endif
- 
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
  /* -----------------------------------------------------------------------------
     PowerPC 64 little endian architecture
- 
+
 diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
 index 9274a44..3b4fc33 100644
 --- a/rts/StgCRunAsm.S
 +++ b/rts/StgCRunAsm.S
-@@ -1,7 +1,7 @@
- #include "ghcconfig.h"
- #include "rts/Constants.h"
- 
+@@ -5,7 +5,7 @@
+  * then functions StgRun/StgReturn are implemented in file StgCRun.c */
+ #if !defined(USE_MINIINTERPRETER)
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
- # ifdef linux_HOST_OS
+ # if defined(linux_HOST_OS)
  # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
  	.file	"StgCRun.c"
--- 
-2.30.0
-
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 0b1440b2f6d9..c6acfa79e75d 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,8 +1,8 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.8.4
-revision=2
+version=8.10.4
+revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
 hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
@@ -10,11 +10,11 @@ hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
 makedepends="libnuma-devel"
 depends="perl gcc libffi-devel gmp-devel libnuma-devel"
 short_desc="Glorious Haskell Compiler"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d
+checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
 patch_args="-Np1"
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"

From 40374990acd5b6cd9bdef01dd0889de79aef76e4 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 28 Feb 2021 18:34:26 +0100
Subject: [PATCH 02/12] 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 000000000000..63965ca12d44
--- /dev/null
+++ b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
@@ -0,0 +1,43 @@
+--- bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
++++ 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 1dd08f07fb44..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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]\."
-                        #  >= 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 f8b18f32cdb2..99ebb54427fe 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 <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=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 --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
 }

From 2b02e32fe30aa49882342c64dde9d6d79e59f642 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 12:37:23 +0100
Subject: [PATCH 03/12] ghc-bin: update to 8.10.4

Take over maintainership of orphaned package.
---
 srcpkgs/ghc-bin/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 9101601358b9..eacbca4e74f8 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,13 +1,13 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.8.4
+version=8.10.4
 revision=1
 archs="i686* x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
 short_desc="Glorious Haskell Compiler - precompiled binaries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 nostrip=yes
@@ -15,17 +15,17 @@ noshlibprovides=yes
 conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
-	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb8-linux.tar.xz"
-	checksum=51a36892f1264744195274187298d13ac62bce2da86d4ddf76d8054ab90f2feb
+	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
+	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=779647d3f4e6e39da9e13b2559319ede76b4fff1107e4dc369a09aadeecad971
+	checksum=56e53f46ad53e6640753d608d01228528fca8ccec01b09bba6ad3b6890a18994
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0
+	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
 	;;
 i686-musl)
 	distfiles="https://distfiles.voidlinux.de/ghc-${version}-i386-unknown-linux-musl.tar.xz"

From c2a77025feed786f6ac6f3ccbd8a5c7da6b715b4 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 15:11:29 +0100
Subject: [PATCH 04/12] stack: update to 2.5.1.1

---
 srcpkgs/stack/patches/datakinds.patch | 14 ------
 srcpkgs/stack/patches/ghc-8.8.4.patch | 70 ---------------------------
 srcpkgs/stack/patches/ppc.patch       | 18 +++----
 srcpkgs/stack/template                | 10 ++--
 4 files changed, 14 insertions(+), 98 deletions(-)
 delete mode 100644 srcpkgs/stack/patches/datakinds.patch
 delete mode 100644 srcpkgs/stack/patches/ghc-8.8.4.patch

diff --git a/srcpkgs/stack/patches/datakinds.patch b/srcpkgs/stack/patches/datakinds.patch
deleted file mode 100644
index 1c06480515f7..000000000000
--- a/srcpkgs/stack/patches/datakinds.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Stack/Storage/User.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/User.hs	2020-12-06 20:51:06.632607164 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
---- src/Stack/Storage/Project.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/Project.hs	2020-12-06 21:55:21.349484738 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch
deleted file mode 100644
index 6b55c176e150..000000000000
--- a/srcpkgs/stack/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- masterdir/builddir/stack-2.5.1/stack.cabal	2020-10-17 17:19:10.724179166 +0200
-+++ stack.cabal	2020-10-17 17:18:03.803498792 +0200
-@@ -234,6 +234,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -272,7 +273,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -359,6 +360,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -396,7 +398,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -480,6 +482,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -518,7 +521,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , optparse-generic
-     , pantry >=0.5.1.3
-     , path
-@@ -609,6 +612,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -647,7 +651,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
diff --git a/srcpkgs/stack/patches/ppc.patch b/srcpkgs/stack/patches/ppc.patch
index 1b5bc191b47c..724aaaf3a65c 100644
--- a/srcpkgs/stack/patches/ppc.patch
+++ b/srcpkgs/stack/patches/ppc.patch
@@ -7,7 +7,7 @@
 +import              System.Endian (getSystemEndianness, Endianness (..))
  import              System.Uname (getRelease)
  import              Data.List.Split (splitOn)
-@@ -1264,4 +1265,9 @@ getOSKey platform =
+@@ -1264,6 +1265,11 @@ getOSKey platform =
          Platform X86_64                Cabal.Windows -> return "windows64"
          Platform Arm                   Cabal.Linux   -> return "linux-armv7"
          Platform AArch64               Cabal.Linux   -> return "linux-aarch64"
@@ -21,11 +21,11 @@
  downloadFromInfo
 --- stack.cabal
 +++ stack.cabal
-@@ -235,6 +235,7 @@ library
-       , conduit
-       , conduit-extra
-       , containers
-+      , cpu >=0.1.2
-       , cryptonite
-       , cryptonite-conduit
-       , deepseq
+@@ -244,6 +244,7 @@
+         conduit >=1.3.1.2,
+         conduit-extra >=1.3.4,
+         containers >=0.6.0.1,
++        cpu >=0.1.2,
+         cryptonite >=0.25,
+         cryptonite-conduit >=0.2.2,
+         deepseq >=1.4.4.0,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 257aba10e50d..66da6618e77d 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.5.1
+version=2.5.1.1
 revision=1
-_stackage="lts-16.13"
+_stackage="lts-17.5"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -10,10 +10,10 @@ short_desc="Cross-platform program for developing Haskell projects"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://haskellstack.org"
-distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
+distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076
- b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58"
+checksum="ccf3ef6dff0412fe8409ef2cfbdf48cad65150f64aec7696725c75881827b539
+ d03bee7e51bbdec5053573f94f644a6baeb140cdd95dbe47261e03c04306b252"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 45cb74fc9759810e913a86e6780b64b1801c4e27 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 16 Mar 2021 17:41:58 +0100
Subject: [PATCH 05/12] xmobar: bump for ghc 8.10.4

---
 srcpkgs/xmobar/files/stack.yaml | 2 +-
 srcpkgs/xmobar/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 7bc4bf189d23..52fd0e3e49fe 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 81ae92fd2940..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.37
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From e54307ee30e73ed307c196ef590d393ee9a7c892 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:03:10 +0100
Subject: [PATCH 06/12] hlint: update to 3.2.7

---
 srcpkgs/hlint/files/stack.yaml   |  7 -------
 srcpkgs/hlint/patches/data.patch | 10 ++++------
 srcpkgs/hlint/template           | 10 +++++-----
 3 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/hlint/files/stack.yaml

diff --git a/srcpkgs/hlint/files/stack.yaml b/srcpkgs/hlint/files/stack.yaml
deleted file mode 100644
index 12aead6562c5..000000000000
--- a/srcpkgs/hlint/files/stack.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-resolver: lts-16.13
-packages: [.]
-extra-deps:
-  - ghc-lib-parser-8.8.4.20200716
-  - ghc-lib-parser-ex-8.8.5.8
-ghc-options:
-    "$locals": -Wunused-imports -Worphans -Wunused-top-binds -Wunused-local-binds -Wincomplete-patterns
diff --git a/srcpkgs/hlint/patches/data.patch b/srcpkgs/hlint/patches/data.patch
index bdfac204f477..c73b376e5df7 100644
--- a/srcpkgs/hlint/patches/data.patch
+++ b/srcpkgs/hlint/patches/data.patch
@@ -1,13 +1,11 @@
-diff --git src/CmdLine.hs src/CmdLine.hs
-index 8c3d530..ccf7aac 100644
 --- src/CmdLine.hs
 +++ src/CmdLine.hs
-@@ -52,7 +52,7 @@ automatic cmd = case cmd of
+@@ -58,7 +58,7 @@
                  b <- doesDirectoryExist x
-                 if b then return cmd{cmdDataDir=x} else do
+                 if b then pure cmd{cmdDataDir=x} else do
                      exe <- getExecutablePath
--                    return cmd{cmdDataDir = takeDirectory exe </> "data"}
-+                    return cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
+-                    pure cmd{cmdDataDir = takeDirectory exe </> "data"}
++                    pure cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
          git cmd
              | cmdGit cmd = do
                  mgit <- findExecutable "git"
diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index 16fbb03ce2b9..fb30f947a452 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,16 +1,16 @@
 # Template file for 'hlint'
 pkgname=hlint
-version=2.2.11
-revision=2
+version=3.2.7
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
-homepage="https://github.com/ndmitchell/${pkgname}"
+homepage="https://github.com/ndmitchell/hlint"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=207539d3627efd3caed9e6fd3b1aeb8f1eb64553f1f9f166090adbf2fb71e172
+checksum=fcdeefcc79a52206add44b409abcab48c5fe2adff9d5aff077acbc43c702b54e
 nocross=yes # Can't yet cross compile Haskell
 nopie_files="/usr/bin/hlint"
 

From 5622d038a130716bba46d4d2fd8f7e6c46547484 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:43:37 +0100
Subject: [PATCH 07/12] kmonad: bump for ghc 8.10.4

---
 srcpkgs/kmonad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index 13e8845581ae..8c34a920ba7d 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,9 +1,9 @@
 # Template file for 'kmonad'
 pkgname=kmonad
 version=0.4.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage=lts-16.13
+stackage=lts-17.5
 short_desc="Keyboard remapping utility providing qmk-like functionality"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"

From 02ed4b0c964678af952bb3d437e72b26c0a56836 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 16:21:35 +0100
Subject: [PATCH 08/12] hoogle: bump for ghc 8.10.4

---
 srcpkgs/hoogle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 4305ac4ae6e8..eafda8747cdf 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,9 +1,9 @@
 # Template file for 'hoogle'
 pkgname=hoogle
 version=5.0.18.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="zlib-devel"
 short_desc="Haskell API search engine"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From 687066585bef2f80652f93646af137cb9026d0b8 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 11:18:37 +0100
Subject: [PATCH 09/12] cgrep: bump for ghc 8.10.4

---
 srcpkgs/cgrep/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index 7b4047614a71..15eda3bafd0e 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,12 +1,12 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.6.33
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.18"
+stackage="lts-17.5"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="https://awgn.github.io/cgrep/"
 distfiles="https://github.com/awgn/${pkgname}/archive/v${version}.tar.gz"

From 67a9c11f6e6829ceb16ecb04f9858af9d5ad5597 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 15:03:05 +0100
Subject: [PATCH 10/12] debug-me: bump for ghc 8.10.4

---
 srcpkgs/debug-me/files/stack.yaml                     |  2 +-
 .../patches/{ghc8.8.3.patch => ghc8.10.4.patch}       | 11 +++++++++++
 srcpkgs/debug-me/template                             |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 rename srcpkgs/debug-me/patches/{ghc8.8.3.patch => ghc8.10.4.patch} (70%)

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index 9c88cea9ab3c..ecff9d9d18f2 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - '.'
-resolver: lts-16.13
+resolver: lts-17.5
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/patches/ghc8.8.3.patch b/srcpkgs/debug-me/patches/ghc8.10.4.patch
similarity index 70%
rename from srcpkgs/debug-me/patches/ghc8.8.3.patch
rename to srcpkgs/debug-me/patches/ghc8.10.4.patch
index f1779331c5a9..9cc19db63be3 100644
--- a/srcpkgs/debug-me/patches/ghc8.8.3.patch
+++ b/srcpkgs/debug-me/patches/ghc8.10.4.patch
@@ -20,3 +20,14 @@
  		defaultSettings
 
  checkEnv :: ServerOpts -> IO ServerOpts
+--- debug-me.cabal
++++ debug-me.cabal
+@@ -64,7 +64,7 @@
+     , stm-chans (>= 3.0)
+     , posix-pty (>= 0.2.1)
+     , terminal-size (>= 0.3)
+-    , aeson (>= 0.11 && < 1.5)
++    , aeson (>= 0.11 && < 1.6)
+     , sandi (>= 0.4)
+     , text (>= 1.2.2)
+     , optparse-applicative (>= 0.12)
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 3df514e0be48..797c52f1f479 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -1,7 +1,7 @@
 # Template file for 'debug-me'
 pkgname=debug-me
 version=1.20200820
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"

From f7f4460bb189b5d4a95a91215b9fe2f009153d20 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 20 Mar 2021 11:26:04 +0100
Subject: [PATCH 11/12] darcs: bump for ghc 8.10.4

---
 srcpkgs/darcs/files/stack.yaml | 2 +-
 srcpkgs/darcs/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index 3766e74cccb0..cfc1efb94d53 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index bdbe3f14cc6f..6aa45fa21535 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.3
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From 05cbaeb3f322be8d0d4f8092601827660c4713e5 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 08:56:29 +0100
Subject: [PATCH 12/12] hledger: bump for ghc 8.10.4

---
 srcpkgs/hledger/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template
index aaad04b778c0..7abbef812aa2 100644
--- a/srcpkgs/hledger/template
+++ b/srcpkgs/hledger/template
@@ -1,8 +1,9 @@
 # Template file for 'hledger'
 pkgname=hledger
 version=1.20.4
-revision=1
+revision=2
 build_style=haskell-stack
+stackage="lts-17.5"
 makedepends="zlib-devel ncurses-devel"
 short_desc="Simple, precise, plain text accounting"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (7 preceding siblings ...)
  2021-03-25  7:57 ` slotThe
@ 2021-03-25  7:58 ` slotThe
  2021-03-25  7:59 ` slotThe
                   ` (29 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-03-25  7:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3024 bytes --]

There is an updated pull request by slotThe against master on the void-packages repository

https://github.com/slotThe/void-packages ghc-8.10.4
https://github.com/void-linux/void-packages/pull/29506

[WIP] GHC 8.10.4
It's that time of the year again!

- [X] ghc; I took over as maintainer here, @leahneukirchen said that was okay on IRC (cc'ing here to make sure)
- [ ] ghc-bin; took over as mainainer of orphaned package.
    - [X] x86_64-musl; [Link here](https://www34.zippyshare.com/d/yvtjb7uJ/38780/ghc-8.10.4-x86_64-void-linux-musl.tar.xz)
    - [ ] i686-musl
    cc @q66 for these
    - [ ] ppc64le
    - [ ] ppc64le-musl
- [X] cabal-install
- [X] stack
 
Rebuild literally every single haskell package we have and see if anything's broken:

- [ ] git-mediate
- [x] kmonad
- [x] cgrep; took over as mainainer of orphaned package.
- [x] debug-me
- [x] hlint
- [x] hoogle
- [x] darcs
- [ ] shellcheck
- [ ] git-annex
- [ ] hledger
- [ ] pandoc
- [x] xmobar
- [ ] HLS

For the following two I'd like to fix #6414 while we're at it.  Because stack can't install libraries globally, this would involve either removing these packages entirely and advising users to install them in their own [stack or cabal projects](https://github.com/xmonad/xmonad-testing), or finding a way to build them with cabal and updating ghc's data base accordingly.  This would probably use `v1` commands, as we don't want to nuke our users db if we update xmonad. Cc @xaltsc as the current maintainer and @chilledfrogs as someone who might want to tackle this (if I read the IRC discussion correctly). 

- [ ] xmonad
- [ ] xmonad-contrib

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/29506.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghc-8.10.4-29506.patch --]
[-- Type: text/x-diff, Size: 29560 bytes --]

From 42f34d3da820d46fabe371221f59f836683e8de7 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 31 Jan 2021 14:31:24 +0100
Subject: [PATCH 01/12] ghc: update to 8.10.4

The change of maintainership was okay-ed by Leah.
---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch | 41 +++++++++++-------------
 srcpkgs/ghc/template                     |  8 ++---
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index ac353ed417e5..c9bd2583abe0 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -85,7 +85,7 @@ index ec3c18a..0359be7 100644
 +        in Right [ 0x3D800000 .|. hi16 w32,
 +                   0x618C0000 .|. lo16 w32,
 +                   0x7D8903A6, 0x4E800420 ]
- 
+
      ArchPPC64LE ->
          -- The ABI requires r12 to point to the function's entry point.
 diff --git a/rts/Adjustor.c b/rts/Adjustor.c
@@ -93,7 +93,7 @@ index d360cfe..ab7ede7 100644
 --- a/rts/Adjustor.c
 +++ b/rts/Adjustor.c
 @@ -49,7 +49,7 @@ Haskell side.
- 
+
  #if defined(i386_HOST_ARCH)
  extern void adjustorCode(void);
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
@@ -104,16 +104,16 @@ index d360cfe..ab7ede7 100644
 @@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
  extern void obscure_ccall_ret_code(void);
  #endif
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
- 
+
  /* !!! !!! WARNING: !!! !!!
 @@ -318,7 +318,7 @@ typedef struct AdjustorStub {
  } AdjustorStub;
  #endif
- 
+
 -#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  static int totalArgumentSize(char *typeString)
@@ -131,10 +131,10 @@ index d360cfe..ab7ede7 100644
 @@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
          }
      }
- 
+
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-         
+
  #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
  #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
 @@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
@@ -151,9 +151,9 @@ index 2795b83..63cfe91 100644
 --- a/rts/AdjustorAsm.S
 +++ b/rts/AdjustorAsm.S
 @@ -2,7 +2,7 @@
- 
+
  /* ******************************** PowerPC ******************************** */
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
@@ -166,34 +166,31 @@ index 934926e..2ff8662 100644
 @@ -717,7 +717,7 @@ StgRunIsImplementedInAssembler(void)
     Everything is in assembler, so we don't have to deal with GCC...
     -------------------------------------------------------------------------- */
- 
+
 -#if defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
- 
+
  static void GNUC3_ATTRIBUTE(used)
  StgRunIsImplementedInAssembler(void)
 @@ -842,7 +842,7 @@ StgRunIsImplementedInAssembler(void)
- 
+
  #endif
- 
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
  /* -----------------------------------------------------------------------------
     PowerPC 64 little endian architecture
- 
+
 diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
 index 9274a44..3b4fc33 100644
 --- a/rts/StgCRunAsm.S
 +++ b/rts/StgCRunAsm.S
-@@ -1,7 +1,7 @@
- #include "ghcconfig.h"
- #include "rts/Constants.h"
- 
+@@ -5,7 +5,7 @@
+  * then functions StgRun/StgReturn are implemented in file StgCRun.c */
+ #if !defined(USE_MINIINTERPRETER)
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
- # ifdef linux_HOST_OS
+ # if defined(linux_HOST_OS)
  # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
  	.file	"StgCRun.c"
--- 
-2.30.0
-
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 0b1440b2f6d9..c6acfa79e75d 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,8 +1,8 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.8.4
-revision=2
+version=8.10.4
+revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
 hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
@@ -10,11 +10,11 @@ hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
 makedepends="libnuma-devel"
 depends="perl gcc libffi-devel gmp-devel libnuma-devel"
 short_desc="Glorious Haskell Compiler"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d
+checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
 patch_args="-Np1"
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"

From 40374990acd5b6cd9bdef01dd0889de79aef76e4 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 28 Feb 2021 18:34:26 +0100
Subject: [PATCH 02/12] 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 000000000000..63965ca12d44
--- /dev/null
+++ b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
@@ -0,0 +1,43 @@
+--- bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
++++ 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 1dd08f07fb44..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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]\."
-                        #  >= 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 f8b18f32cdb2..99ebb54427fe 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 <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=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 --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
 }

From 2b02e32fe30aa49882342c64dde9d6d79e59f642 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 12:37:23 +0100
Subject: [PATCH 03/12] ghc-bin: update to 8.10.4

Take over maintainership of orphaned package.
---
 srcpkgs/ghc-bin/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 9101601358b9..eacbca4e74f8 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,13 +1,13 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.8.4
+version=8.10.4
 revision=1
 archs="i686* x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
 short_desc="Glorious Haskell Compiler - precompiled binaries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 nostrip=yes
@@ -15,17 +15,17 @@ noshlibprovides=yes
 conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
-	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb8-linux.tar.xz"
-	checksum=51a36892f1264744195274187298d13ac62bce2da86d4ddf76d8054ab90f2feb
+	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
+	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=779647d3f4e6e39da9e13b2559319ede76b4fff1107e4dc369a09aadeecad971
+	checksum=56e53f46ad53e6640753d608d01228528fca8ccec01b09bba6ad3b6890a18994
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0
+	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
 	;;
 i686-musl)
 	distfiles="https://distfiles.voidlinux.de/ghc-${version}-i386-unknown-linux-musl.tar.xz"

From c2a77025feed786f6ac6f3ccbd8a5c7da6b715b4 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 15:11:29 +0100
Subject: [PATCH 04/12] stack: update to 2.5.1.1

---
 srcpkgs/stack/patches/datakinds.patch | 14 ------
 srcpkgs/stack/patches/ghc-8.8.4.patch | 70 ---------------------------
 srcpkgs/stack/patches/ppc.patch       | 18 +++----
 srcpkgs/stack/template                | 10 ++--
 4 files changed, 14 insertions(+), 98 deletions(-)
 delete mode 100644 srcpkgs/stack/patches/datakinds.patch
 delete mode 100644 srcpkgs/stack/patches/ghc-8.8.4.patch

diff --git a/srcpkgs/stack/patches/datakinds.patch b/srcpkgs/stack/patches/datakinds.patch
deleted file mode 100644
index 1c06480515f7..000000000000
--- a/srcpkgs/stack/patches/datakinds.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Stack/Storage/User.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/User.hs	2020-12-06 20:51:06.632607164 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
---- src/Stack/Storage/Project.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/Project.hs	2020-12-06 21:55:21.349484738 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch
deleted file mode 100644
index 6b55c176e150..000000000000
--- a/srcpkgs/stack/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- masterdir/builddir/stack-2.5.1/stack.cabal	2020-10-17 17:19:10.724179166 +0200
-+++ stack.cabal	2020-10-17 17:18:03.803498792 +0200
-@@ -234,6 +234,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -272,7 +273,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -359,6 +360,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -396,7 +398,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -480,6 +482,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -518,7 +521,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , optparse-generic
-     , pantry >=0.5.1.3
-     , path
-@@ -609,6 +612,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -647,7 +651,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
diff --git a/srcpkgs/stack/patches/ppc.patch b/srcpkgs/stack/patches/ppc.patch
index 1b5bc191b47c..724aaaf3a65c 100644
--- a/srcpkgs/stack/patches/ppc.patch
+++ b/srcpkgs/stack/patches/ppc.patch
@@ -7,7 +7,7 @@
 +import              System.Endian (getSystemEndianness, Endianness (..))
  import              System.Uname (getRelease)
  import              Data.List.Split (splitOn)
-@@ -1264,4 +1265,9 @@ getOSKey platform =
+@@ -1264,6 +1265,11 @@ getOSKey platform =
          Platform X86_64                Cabal.Windows -> return "windows64"
          Platform Arm                   Cabal.Linux   -> return "linux-armv7"
          Platform AArch64               Cabal.Linux   -> return "linux-aarch64"
@@ -21,11 +21,11 @@
  downloadFromInfo
 --- stack.cabal
 +++ stack.cabal
-@@ -235,6 +235,7 @@ library
-       , conduit
-       , conduit-extra
-       , containers
-+      , cpu >=0.1.2
-       , cryptonite
-       , cryptonite-conduit
-       , deepseq
+@@ -244,6 +244,7 @@
+         conduit >=1.3.1.2,
+         conduit-extra >=1.3.4,
+         containers >=0.6.0.1,
++        cpu >=0.1.2,
+         cryptonite >=0.25,
+         cryptonite-conduit >=0.2.2,
+         deepseq >=1.4.4.0,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 257aba10e50d..66da6618e77d 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.5.1
+version=2.5.1.1
 revision=1
-_stackage="lts-16.13"
+_stackage="lts-17.5"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -10,10 +10,10 @@ short_desc="Cross-platform program for developing Haskell projects"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://haskellstack.org"
-distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
+distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076
- b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58"
+checksum="ccf3ef6dff0412fe8409ef2cfbdf48cad65150f64aec7696725c75881827b539
+ d03bee7e51bbdec5053573f94f644a6baeb140cdd95dbe47261e03c04306b252"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 45cb74fc9759810e913a86e6780b64b1801c4e27 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 16 Mar 2021 17:41:58 +0100
Subject: [PATCH 05/12] xmobar: bump for ghc 8.10.4

---
 srcpkgs/xmobar/files/stack.yaml | 2 +-
 srcpkgs/xmobar/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 7bc4bf189d23..52fd0e3e49fe 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 81ae92fd2940..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.37
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From e54307ee30e73ed307c196ef590d393ee9a7c892 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:03:10 +0100
Subject: [PATCH 06/12] hlint: update to 3.2.7

---
 srcpkgs/hlint/files/stack.yaml   |  7 -------
 srcpkgs/hlint/patches/data.patch | 10 ++++------
 srcpkgs/hlint/template           | 10 +++++-----
 3 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/hlint/files/stack.yaml

diff --git a/srcpkgs/hlint/files/stack.yaml b/srcpkgs/hlint/files/stack.yaml
deleted file mode 100644
index 12aead6562c5..000000000000
--- a/srcpkgs/hlint/files/stack.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-resolver: lts-16.13
-packages: [.]
-extra-deps:
-  - ghc-lib-parser-8.8.4.20200716
-  - ghc-lib-parser-ex-8.8.5.8
-ghc-options:
-    "$locals": -Wunused-imports -Worphans -Wunused-top-binds -Wunused-local-binds -Wincomplete-patterns
diff --git a/srcpkgs/hlint/patches/data.patch b/srcpkgs/hlint/patches/data.patch
index bdfac204f477..c73b376e5df7 100644
--- a/srcpkgs/hlint/patches/data.patch
+++ b/srcpkgs/hlint/patches/data.patch
@@ -1,13 +1,11 @@
-diff --git src/CmdLine.hs src/CmdLine.hs
-index 8c3d530..ccf7aac 100644
 --- src/CmdLine.hs
 +++ src/CmdLine.hs
-@@ -52,7 +52,7 @@ automatic cmd = case cmd of
+@@ -58,7 +58,7 @@
                  b <- doesDirectoryExist x
-                 if b then return cmd{cmdDataDir=x} else do
+                 if b then pure cmd{cmdDataDir=x} else do
                      exe <- getExecutablePath
--                    return cmd{cmdDataDir = takeDirectory exe </> "data"}
-+                    return cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
+-                    pure cmd{cmdDataDir = takeDirectory exe </> "data"}
++                    pure cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
          git cmd
              | cmdGit cmd = do
                  mgit <- findExecutable "git"
diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index 16fbb03ce2b9..fb30f947a452 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,16 +1,16 @@
 # Template file for 'hlint'
 pkgname=hlint
-version=2.2.11
-revision=2
+version=3.2.7
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
-homepage="https://github.com/ndmitchell/${pkgname}"
+homepage="https://github.com/ndmitchell/hlint"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=207539d3627efd3caed9e6fd3b1aeb8f1eb64553f1f9f166090adbf2fb71e172
+checksum=fcdeefcc79a52206add44b409abcab48c5fe2adff9d5aff077acbc43c702b54e
 nocross=yes # Can't yet cross compile Haskell
 nopie_files="/usr/bin/hlint"
 

From 5622d038a130716bba46d4d2fd8f7e6c46547484 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:43:37 +0100
Subject: [PATCH 07/12] kmonad: bump for ghc 8.10.4

---
 srcpkgs/kmonad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index 13e8845581ae..8c34a920ba7d 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,9 +1,9 @@
 # Template file for 'kmonad'
 pkgname=kmonad
 version=0.4.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage=lts-16.13
+stackage=lts-17.5
 short_desc="Keyboard remapping utility providing qmk-like functionality"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"

From 02ed4b0c964678af952bb3d437e72b26c0a56836 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 16:21:35 +0100
Subject: [PATCH 08/12] hoogle: bump for ghc 8.10.4

---
 srcpkgs/hoogle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 4305ac4ae6e8..eafda8747cdf 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,9 +1,9 @@
 # Template file for 'hoogle'
 pkgname=hoogle
 version=5.0.18.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="zlib-devel"
 short_desc="Haskell API search engine"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From 687066585bef2f80652f93646af137cb9026d0b8 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 11:18:37 +0100
Subject: [PATCH 09/12] cgrep: bump for ghc 8.10.4

---
 srcpkgs/cgrep/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index 7b4047614a71..15eda3bafd0e 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,12 +1,12 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.6.33
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.18"
+stackage="lts-17.5"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="https://awgn.github.io/cgrep/"
 distfiles="https://github.com/awgn/${pkgname}/archive/v${version}.tar.gz"

From 67a9c11f6e6829ceb16ecb04f9858af9d5ad5597 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 15:03:05 +0100
Subject: [PATCH 10/12] debug-me: bump for ghc 8.10.4

---
 srcpkgs/debug-me/files/stack.yaml                     |  2 +-
 .../patches/{ghc8.8.3.patch => ghc8.10.4.patch}       | 11 +++++++++++
 srcpkgs/debug-me/template                             |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 rename srcpkgs/debug-me/patches/{ghc8.8.3.patch => ghc8.10.4.patch} (70%)

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index 9c88cea9ab3c..ecff9d9d18f2 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - '.'
-resolver: lts-16.13
+resolver: lts-17.5
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/patches/ghc8.8.3.patch b/srcpkgs/debug-me/patches/ghc8.10.4.patch
similarity index 70%
rename from srcpkgs/debug-me/patches/ghc8.8.3.patch
rename to srcpkgs/debug-me/patches/ghc8.10.4.patch
index f1779331c5a9..9cc19db63be3 100644
--- a/srcpkgs/debug-me/patches/ghc8.8.3.patch
+++ b/srcpkgs/debug-me/patches/ghc8.10.4.patch
@@ -20,3 +20,14 @@
  		defaultSettings
 
  checkEnv :: ServerOpts -> IO ServerOpts
+--- debug-me.cabal
++++ debug-me.cabal
+@@ -64,7 +64,7 @@
+     , stm-chans (>= 3.0)
+     , posix-pty (>= 0.2.1)
+     , terminal-size (>= 0.3)
+-    , aeson (>= 0.11 && < 1.5)
++    , aeson (>= 0.11 && < 1.6)
+     , sandi (>= 0.4)
+     , text (>= 1.2.2)
+     , optparse-applicative (>= 0.12)
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 3df514e0be48..797c52f1f479 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -1,7 +1,7 @@
 # Template file for 'debug-me'
 pkgname=debug-me
 version=1.20200820
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"

From f7f4460bb189b5d4a95a91215b9fe2f009153d20 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 20 Mar 2021 11:26:04 +0100
Subject: [PATCH 11/12] darcs: bump for ghc 8.10.4

---
 srcpkgs/darcs/files/stack.yaml | 2 +-
 srcpkgs/darcs/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index 3766e74cccb0..cfc1efb94d53 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index bdbe3f14cc6f..6aa45fa21535 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.3
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From 05cbaeb3f322be8d0d4f8092601827660c4713e5 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 08:56:29 +0100
Subject: [PATCH 12/12] hledger: bump for ghc 8.10.4

---
 srcpkgs/hledger/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template
index aaad04b778c0..7abbef812aa2 100644
--- a/srcpkgs/hledger/template
+++ b/srcpkgs/hledger/template
@@ -1,8 +1,9 @@
 # Template file for 'hledger'
 pkgname=hledger
 version=1.20.4
-revision=1
+revision=2
 build_style=haskell-stack
+stackage="lts-17.5"
 makedepends="zlib-devel ncurses-devel"
 short_desc="Simple, precise, plain text accounting"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (8 preceding siblings ...)
  2021-03-25  7:58 ` slotThe
@ 2021-03-25  7:59 ` slotThe
  2021-03-25  8:02 ` slotThe
                   ` (28 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-03-25  7:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3024 bytes --]

There is an updated pull request by slotThe against master on the void-packages repository

https://github.com/slotThe/void-packages ghc-8.10.4
https://github.com/void-linux/void-packages/pull/29506

[WIP] GHC 8.10.4
It's that time of the year again!

- [X] ghc; I took over as maintainer here, @leahneukirchen said that was okay on IRC (cc'ing here to make sure)
- [ ] ghc-bin; took over as mainainer of orphaned package.
    - [X] x86_64-musl; [Link here](https://www34.zippyshare.com/d/yvtjb7uJ/38780/ghc-8.10.4-x86_64-void-linux-musl.tar.xz)
    - [ ] i686-musl
    cc @q66 for these
    - [ ] ppc64le
    - [ ] ppc64le-musl
- [X] cabal-install
- [X] stack
 
Rebuild literally every single haskell package we have and see if anything's broken:

- [ ] git-mediate
- [x] kmonad
- [x] cgrep; took over as mainainer of orphaned package.
- [x] debug-me
- [x] hlint
- [x] hoogle
- [x] darcs
- [ ] shellcheck
- [ ] git-annex
- [ ] hledger
- [ ] pandoc
- [x] xmobar
- [ ] HLS

For the following two I'd like to fix #6414 while we're at it.  Because stack can't install libraries globally, this would involve either removing these packages entirely and advising users to install them in their own [stack or cabal projects](https://github.com/xmonad/xmonad-testing), or finding a way to build them with cabal and updating ghc's data base accordingly.  This would probably use `v1` commands, as we don't want to nuke our users db if we update xmonad. Cc @xaltsc as the current maintainer and @chilledfrogs as someone who might want to tackle this (if I read the IRC discussion correctly). 

- [ ] xmonad
- [ ] xmonad-contrib

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/29506.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghc-8.10.4-29506.patch --]
[-- Type: text/x-diff, Size: 29977 bytes --]

From 42f34d3da820d46fabe371221f59f836683e8de7 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 31 Jan 2021 14:31:24 +0100
Subject: [PATCH 01/12] ghc: update to 8.10.4

The change of maintainership was okay-ed by Leah.
---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch | 41 +++++++++++-------------
 srcpkgs/ghc/template                     |  8 ++---
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index ac353ed417e5..c9bd2583abe0 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -85,7 +85,7 @@ index ec3c18a..0359be7 100644
 +        in Right [ 0x3D800000 .|. hi16 w32,
 +                   0x618C0000 .|. lo16 w32,
 +                   0x7D8903A6, 0x4E800420 ]
- 
+
      ArchPPC64LE ->
          -- The ABI requires r12 to point to the function's entry point.
 diff --git a/rts/Adjustor.c b/rts/Adjustor.c
@@ -93,7 +93,7 @@ index d360cfe..ab7ede7 100644
 --- a/rts/Adjustor.c
 +++ b/rts/Adjustor.c
 @@ -49,7 +49,7 @@ Haskell side.
- 
+
  #if defined(i386_HOST_ARCH)
  extern void adjustorCode(void);
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
@@ -104,16 +104,16 @@ index d360cfe..ab7ede7 100644
 @@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
  extern void obscure_ccall_ret_code(void);
  #endif
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
- 
+
  /* !!! !!! WARNING: !!! !!!
 @@ -318,7 +318,7 @@ typedef struct AdjustorStub {
  } AdjustorStub;
  #endif
- 
+
 -#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  static int totalArgumentSize(char *typeString)
@@ -131,10 +131,10 @@ index d360cfe..ab7ede7 100644
 @@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
          }
      }
- 
+
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-         
+
  #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
  #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
 @@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
@@ -151,9 +151,9 @@ index 2795b83..63cfe91 100644
 --- a/rts/AdjustorAsm.S
 +++ b/rts/AdjustorAsm.S
 @@ -2,7 +2,7 @@
- 
+
  /* ******************************** PowerPC ******************************** */
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
@@ -166,34 +166,31 @@ index 934926e..2ff8662 100644
 @@ -717,7 +717,7 @@ StgRunIsImplementedInAssembler(void)
     Everything is in assembler, so we don't have to deal with GCC...
     -------------------------------------------------------------------------- */
- 
+
 -#if defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
- 
+
  static void GNUC3_ATTRIBUTE(used)
  StgRunIsImplementedInAssembler(void)
 @@ -842,7 +842,7 @@ StgRunIsImplementedInAssembler(void)
- 
+
  #endif
- 
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
  /* -----------------------------------------------------------------------------
     PowerPC 64 little endian architecture
- 
+
 diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
 index 9274a44..3b4fc33 100644
 --- a/rts/StgCRunAsm.S
 +++ b/rts/StgCRunAsm.S
-@@ -1,7 +1,7 @@
- #include "ghcconfig.h"
- #include "rts/Constants.h"
- 
+@@ -5,7 +5,7 @@
+  * then functions StgRun/StgReturn are implemented in file StgCRun.c */
+ #if !defined(USE_MINIINTERPRETER)
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
- # ifdef linux_HOST_OS
+ # if defined(linux_HOST_OS)
  # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
  	.file	"StgCRun.c"
--- 
-2.30.0
-
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 0b1440b2f6d9..c6acfa79e75d 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,8 +1,8 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.8.4
-revision=2
+version=8.10.4
+revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
 hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
@@ -10,11 +10,11 @@ hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
 makedepends="libnuma-devel"
 depends="perl gcc libffi-devel gmp-devel libnuma-devel"
 short_desc="Glorious Haskell Compiler"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d
+checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
 patch_args="-Np1"
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"

From 40374990acd5b6cd9bdef01dd0889de79aef76e4 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 28 Feb 2021 18:34:26 +0100
Subject: [PATCH 02/12] 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 000000000000..63965ca12d44
--- /dev/null
+++ b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
@@ -0,0 +1,43 @@
+--- bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
++++ 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 1dd08f07fb44..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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]\."
-                        #  >= 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 f8b18f32cdb2..99ebb54427fe 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 <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=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 --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
 }

From 2b02e32fe30aa49882342c64dde9d6d79e59f642 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 12:37:23 +0100
Subject: [PATCH 03/12] ghc-bin: update to 8.10.4

Take over maintainership of orphaned package.
---
 srcpkgs/ghc-bin/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 9101601358b9..eacbca4e74f8 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,13 +1,13 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.8.4
+version=8.10.4
 revision=1
 archs="i686* x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
 short_desc="Glorious Haskell Compiler - precompiled binaries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 nostrip=yes
@@ -15,17 +15,17 @@ noshlibprovides=yes
 conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
-	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb8-linux.tar.xz"
-	checksum=51a36892f1264744195274187298d13ac62bce2da86d4ddf76d8054ab90f2feb
+	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
+	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=779647d3f4e6e39da9e13b2559319ede76b4fff1107e4dc369a09aadeecad971
+	checksum=56e53f46ad53e6640753d608d01228528fca8ccec01b09bba6ad3b6890a18994
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0
+	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
 	;;
 i686-musl)
 	distfiles="https://distfiles.voidlinux.de/ghc-${version}-i386-unknown-linux-musl.tar.xz"

From c2a77025feed786f6ac6f3ccbd8a5c7da6b715b4 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 15:11:29 +0100
Subject: [PATCH 04/12] stack: update to 2.5.1.1

---
 srcpkgs/stack/patches/datakinds.patch | 14 ------
 srcpkgs/stack/patches/ghc-8.8.4.patch | 70 ---------------------------
 srcpkgs/stack/patches/ppc.patch       | 18 +++----
 srcpkgs/stack/template                | 10 ++--
 4 files changed, 14 insertions(+), 98 deletions(-)
 delete mode 100644 srcpkgs/stack/patches/datakinds.patch
 delete mode 100644 srcpkgs/stack/patches/ghc-8.8.4.patch

diff --git a/srcpkgs/stack/patches/datakinds.patch b/srcpkgs/stack/patches/datakinds.patch
deleted file mode 100644
index 1c06480515f7..000000000000
--- a/srcpkgs/stack/patches/datakinds.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Stack/Storage/User.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/User.hs	2020-12-06 20:51:06.632607164 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
---- src/Stack/Storage/Project.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/Project.hs	2020-12-06 21:55:21.349484738 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch
deleted file mode 100644
index 6b55c176e150..000000000000
--- a/srcpkgs/stack/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- masterdir/builddir/stack-2.5.1/stack.cabal	2020-10-17 17:19:10.724179166 +0200
-+++ stack.cabal	2020-10-17 17:18:03.803498792 +0200
-@@ -234,6 +234,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -272,7 +273,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -359,6 +360,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -396,7 +398,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -480,6 +482,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -518,7 +521,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , optparse-generic
-     , pantry >=0.5.1.3
-     , path
-@@ -609,6 +612,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -647,7 +651,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
diff --git a/srcpkgs/stack/patches/ppc.patch b/srcpkgs/stack/patches/ppc.patch
index 1b5bc191b47c..724aaaf3a65c 100644
--- a/srcpkgs/stack/patches/ppc.patch
+++ b/srcpkgs/stack/patches/ppc.patch
@@ -7,7 +7,7 @@
 +import              System.Endian (getSystemEndianness, Endianness (..))
  import              System.Uname (getRelease)
  import              Data.List.Split (splitOn)
-@@ -1264,4 +1265,9 @@ getOSKey platform =
+@@ -1264,6 +1265,11 @@ getOSKey platform =
          Platform X86_64                Cabal.Windows -> return "windows64"
          Platform Arm                   Cabal.Linux   -> return "linux-armv7"
          Platform AArch64               Cabal.Linux   -> return "linux-aarch64"
@@ -21,11 +21,11 @@
  downloadFromInfo
 --- stack.cabal
 +++ stack.cabal
-@@ -235,6 +235,7 @@ library
-       , conduit
-       , conduit-extra
-       , containers
-+      , cpu >=0.1.2
-       , cryptonite
-       , cryptonite-conduit
-       , deepseq
+@@ -244,6 +244,7 @@
+         conduit >=1.3.1.2,
+         conduit-extra >=1.3.4,
+         containers >=0.6.0.1,
++        cpu >=0.1.2,
+         cryptonite >=0.25,
+         cryptonite-conduit >=0.2.2,
+         deepseq >=1.4.4.0,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 257aba10e50d..66da6618e77d 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.5.1
+version=2.5.1.1
 revision=1
-_stackage="lts-16.13"
+_stackage="lts-17.5"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -10,10 +10,10 @@ short_desc="Cross-platform program for developing Haskell projects"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://haskellstack.org"
-distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
+distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076
- b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58"
+checksum="ccf3ef6dff0412fe8409ef2cfbdf48cad65150f64aec7696725c75881827b539
+ d03bee7e51bbdec5053573f94f644a6baeb140cdd95dbe47261e03c04306b252"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 45cb74fc9759810e913a86e6780b64b1801c4e27 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 16 Mar 2021 17:41:58 +0100
Subject: [PATCH 05/12] xmobar: bump for ghc 8.10.4

---
 srcpkgs/xmobar/files/stack.yaml | 2 +-
 srcpkgs/xmobar/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 7bc4bf189d23..52fd0e3e49fe 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 81ae92fd2940..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.37
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From e54307ee30e73ed307c196ef590d393ee9a7c892 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:03:10 +0100
Subject: [PATCH 06/12] hlint: update to 3.2.7

---
 srcpkgs/hlint/files/stack.yaml   |  7 -------
 srcpkgs/hlint/patches/data.patch | 10 ++++------
 srcpkgs/hlint/template           | 10 +++++-----
 3 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/hlint/files/stack.yaml

diff --git a/srcpkgs/hlint/files/stack.yaml b/srcpkgs/hlint/files/stack.yaml
deleted file mode 100644
index 12aead6562c5..000000000000
--- a/srcpkgs/hlint/files/stack.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-resolver: lts-16.13
-packages: [.]
-extra-deps:
-  - ghc-lib-parser-8.8.4.20200716
-  - ghc-lib-parser-ex-8.8.5.8
-ghc-options:
-    "$locals": -Wunused-imports -Worphans -Wunused-top-binds -Wunused-local-binds -Wincomplete-patterns
diff --git a/srcpkgs/hlint/patches/data.patch b/srcpkgs/hlint/patches/data.patch
index bdfac204f477..c73b376e5df7 100644
--- a/srcpkgs/hlint/patches/data.patch
+++ b/srcpkgs/hlint/patches/data.patch
@@ -1,13 +1,11 @@
-diff --git src/CmdLine.hs src/CmdLine.hs
-index 8c3d530..ccf7aac 100644
 --- src/CmdLine.hs
 +++ src/CmdLine.hs
-@@ -52,7 +52,7 @@ automatic cmd = case cmd of
+@@ -58,7 +58,7 @@
                  b <- doesDirectoryExist x
-                 if b then return cmd{cmdDataDir=x} else do
+                 if b then pure cmd{cmdDataDir=x} else do
                      exe <- getExecutablePath
--                    return cmd{cmdDataDir = takeDirectory exe </> "data"}
-+                    return cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
+-                    pure cmd{cmdDataDir = takeDirectory exe </> "data"}
++                    pure cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
          git cmd
              | cmdGit cmd = do
                  mgit <- findExecutable "git"
diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index 16fbb03ce2b9..fb30f947a452 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,16 +1,16 @@
 # Template file for 'hlint'
 pkgname=hlint
-version=2.2.11
-revision=2
+version=3.2.7
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
-homepage="https://github.com/ndmitchell/${pkgname}"
+homepage="https://github.com/ndmitchell/hlint"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=207539d3627efd3caed9e6fd3b1aeb8f1eb64553f1f9f166090adbf2fb71e172
+checksum=fcdeefcc79a52206add44b409abcab48c5fe2adff9d5aff077acbc43c702b54e
 nocross=yes # Can't yet cross compile Haskell
 nopie_files="/usr/bin/hlint"
 

From 5622d038a130716bba46d4d2fd8f7e6c46547484 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:43:37 +0100
Subject: [PATCH 07/12] kmonad: bump for ghc 8.10.4

---
 srcpkgs/kmonad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index 13e8845581ae..8c34a920ba7d 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,9 +1,9 @@
 # Template file for 'kmonad'
 pkgname=kmonad
 version=0.4.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage=lts-16.13
+stackage=lts-17.5
 short_desc="Keyboard remapping utility providing qmk-like functionality"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"

From 02ed4b0c964678af952bb3d437e72b26c0a56836 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 16:21:35 +0100
Subject: [PATCH 08/12] hoogle: bump for ghc 8.10.4

---
 srcpkgs/hoogle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 4305ac4ae6e8..eafda8747cdf 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,9 +1,9 @@
 # Template file for 'hoogle'
 pkgname=hoogle
 version=5.0.18.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="zlib-devel"
 short_desc="Haskell API search engine"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From 687066585bef2f80652f93646af137cb9026d0b8 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 11:18:37 +0100
Subject: [PATCH 09/12] cgrep: bump for ghc 8.10.4

---
 srcpkgs/cgrep/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index 7b4047614a71..15eda3bafd0e 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,12 +1,12 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.6.33
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.18"
+stackage="lts-17.5"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="https://awgn.github.io/cgrep/"
 distfiles="https://github.com/awgn/${pkgname}/archive/v${version}.tar.gz"

From 67a9c11f6e6829ceb16ecb04f9858af9d5ad5597 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 15:03:05 +0100
Subject: [PATCH 10/12] debug-me: bump for ghc 8.10.4

---
 srcpkgs/debug-me/files/stack.yaml                     |  2 +-
 .../patches/{ghc8.8.3.patch => ghc8.10.4.patch}       | 11 +++++++++++
 srcpkgs/debug-me/template                             |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 rename srcpkgs/debug-me/patches/{ghc8.8.3.patch => ghc8.10.4.patch} (70%)

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index 9c88cea9ab3c..ecff9d9d18f2 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - '.'
-resolver: lts-16.13
+resolver: lts-17.5
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/patches/ghc8.8.3.patch b/srcpkgs/debug-me/patches/ghc8.10.4.patch
similarity index 70%
rename from srcpkgs/debug-me/patches/ghc8.8.3.patch
rename to srcpkgs/debug-me/patches/ghc8.10.4.patch
index f1779331c5a9..9cc19db63be3 100644
--- a/srcpkgs/debug-me/patches/ghc8.8.3.patch
+++ b/srcpkgs/debug-me/patches/ghc8.10.4.patch
@@ -20,3 +20,14 @@
  		defaultSettings
 
  checkEnv :: ServerOpts -> IO ServerOpts
+--- debug-me.cabal
++++ debug-me.cabal
+@@ -64,7 +64,7 @@
+     , stm-chans (>= 3.0)
+     , posix-pty (>= 0.2.1)
+     , terminal-size (>= 0.3)
+-    , aeson (>= 0.11 && < 1.5)
++    , aeson (>= 0.11 && < 1.6)
+     , sandi (>= 0.4)
+     , text (>= 1.2.2)
+     , optparse-applicative (>= 0.12)
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 3df514e0be48..797c52f1f479 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -1,7 +1,7 @@
 # Template file for 'debug-me'
 pkgname=debug-me
 version=1.20200820
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"

From f7f4460bb189b5d4a95a91215b9fe2f009153d20 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 20 Mar 2021 11:26:04 +0100
Subject: [PATCH 11/12] darcs: bump for ghc 8.10.4

---
 srcpkgs/darcs/files/stack.yaml | 2 +-
 srcpkgs/darcs/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index 3766e74cccb0..cfc1efb94d53 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index bdbe3f14cc6f..6aa45fa21535 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.3
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From b78e4ab2f7a8cc8be0a921acd43145cdad8f003a Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 08:56:29 +0100
Subject: [PATCH 12/12] hledger: bump for ghc 8.10.4

---
 srcpkgs/hledger/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template
index aaad04b778c0..42b8c67a94ba 100644
--- a/srcpkgs/hledger/template
+++ b/srcpkgs/hledger/template
@@ -1,7 +1,7 @@
 # Template file for 'hledger'
 pkgname=hledger
-version=1.20.4
-revision=1
+version=1.21
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel ncurses-devel"
 short_desc="Simple, precise, plain text accounting"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
 homepage="http://hledger.org/"
 changelog="https://hackage.haskell.org/package/hledger-${version}/changelog"
 distfiles="https://github.com/simonmichael/${pkgname}/archive/${version}.tar.gz"
-checksum=1213854ee7cf94913652706139b4c7f619af4394f5e70856b859f3c0ed07b2a4
+checksum=55a83947852ff088b244447ae0d0d96b8902d867b9b0773ebd1dab2e64e98ecd
 nopie_files="/usr/bin/hledger"
 nocross=yes # Can't yet cross compile Haskell
 

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (9 preceding siblings ...)
  2021-03-25  7:59 ` slotThe
@ 2021-03-25  8:02 ` slotThe
  2021-03-25 10:16 ` slotThe
                   ` (27 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-03-25  8:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3024 bytes --]

There is an updated pull request by slotThe against master on the void-packages repository

https://github.com/slotThe/void-packages ghc-8.10.4
https://github.com/void-linux/void-packages/pull/29506

[WIP] GHC 8.10.4
It's that time of the year again!

- [X] ghc; I took over as maintainer here, @leahneukirchen said that was okay on IRC (cc'ing here to make sure)
- [ ] ghc-bin; took over as mainainer of orphaned package.
    - [X] x86_64-musl; [Link here](https://www34.zippyshare.com/d/yvtjb7uJ/38780/ghc-8.10.4-x86_64-void-linux-musl.tar.xz)
    - [ ] i686-musl
    cc @q66 for these
    - [ ] ppc64le
    - [ ] ppc64le-musl
- [X] cabal-install
- [X] stack
 
Rebuild literally every single haskell package we have and see if anything's broken:

- [ ] git-mediate
- [x] kmonad
- [x] cgrep; took over as mainainer of orphaned package.
- [x] debug-me
- [x] hlint
- [x] hoogle
- [x] darcs
- [ ] shellcheck
- [ ] git-annex
- [ ] hledger
- [ ] pandoc
- [x] xmobar
- [ ] HLS

For the following two I'd like to fix #6414 while we're at it.  Because stack can't install libraries globally, this would involve either removing these packages entirely and advising users to install them in their own [stack or cabal projects](https://github.com/xmonad/xmonad-testing), or finding a way to build them with cabal and updating ghc's data base accordingly.  This would probably use `v1` commands, as we don't want to nuke our users db if we update xmonad. Cc @xaltsc as the current maintainer and @chilledfrogs as someone who might want to tackle this (if I read the IRC discussion correctly). 

- [ ] xmonad
- [ ] xmonad-contrib

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/29506.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghc-8.10.4-29506.patch --]
[-- Type: text/x-diff, Size: 29511 bytes --]

From 9e1074e5ab3fa5f1c8270daf94476cd2f10d3763 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 31 Jan 2021 14:31:24 +0100
Subject: [PATCH 01/12] ghc: update to 8.10.4

The change of maintainership was okay-ed by Leah.
---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch | 41 +++++++++++-------------
 srcpkgs/ghc/template                     |  8 ++---
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index ac353ed417e5..c9bd2583abe0 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -85,7 +85,7 @@ index ec3c18a..0359be7 100644
 +        in Right [ 0x3D800000 .|. hi16 w32,
 +                   0x618C0000 .|. lo16 w32,
 +                   0x7D8903A6, 0x4E800420 ]
- 
+
      ArchPPC64LE ->
          -- The ABI requires r12 to point to the function's entry point.
 diff --git a/rts/Adjustor.c b/rts/Adjustor.c
@@ -93,7 +93,7 @@ index d360cfe..ab7ede7 100644
 --- a/rts/Adjustor.c
 +++ b/rts/Adjustor.c
 @@ -49,7 +49,7 @@ Haskell side.
- 
+
  #if defined(i386_HOST_ARCH)
  extern void adjustorCode(void);
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
@@ -104,16 +104,16 @@ index d360cfe..ab7ede7 100644
 @@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
  extern void obscure_ccall_ret_code(void);
  #endif
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
- 
+
  /* !!! !!! WARNING: !!! !!!
 @@ -318,7 +318,7 @@ typedef struct AdjustorStub {
  } AdjustorStub;
  #endif
- 
+
 -#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  static int totalArgumentSize(char *typeString)
@@ -131,10 +131,10 @@ index d360cfe..ab7ede7 100644
 @@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
          }
      }
- 
+
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-         
+
  #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
  #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
 @@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
@@ -151,9 +151,9 @@ index 2795b83..63cfe91 100644
 --- a/rts/AdjustorAsm.S
 +++ b/rts/AdjustorAsm.S
 @@ -2,7 +2,7 @@
- 
+
  /* ******************************** PowerPC ******************************** */
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
@@ -166,34 +166,31 @@ index 934926e..2ff8662 100644
 @@ -717,7 +717,7 @@ StgRunIsImplementedInAssembler(void)
     Everything is in assembler, so we don't have to deal with GCC...
     -------------------------------------------------------------------------- */
- 
+
 -#if defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
- 
+
  static void GNUC3_ATTRIBUTE(used)
  StgRunIsImplementedInAssembler(void)
 @@ -842,7 +842,7 @@ StgRunIsImplementedInAssembler(void)
- 
+
  #endif
- 
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
  /* -----------------------------------------------------------------------------
     PowerPC 64 little endian architecture
- 
+
 diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
 index 9274a44..3b4fc33 100644
 --- a/rts/StgCRunAsm.S
 +++ b/rts/StgCRunAsm.S
-@@ -1,7 +1,7 @@
- #include "ghcconfig.h"
- #include "rts/Constants.h"
- 
+@@ -5,7 +5,7 @@
+  * then functions StgRun/StgReturn are implemented in file StgCRun.c */
+ #if !defined(USE_MINIINTERPRETER)
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
- # ifdef linux_HOST_OS
+ # if defined(linux_HOST_OS)
  # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
  	.file	"StgCRun.c"
--- 
-2.30.0
-
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 0b1440b2f6d9..c6acfa79e75d 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,8 +1,8 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.8.4
-revision=2
+version=8.10.4
+revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
 hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
@@ -10,11 +10,11 @@ hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
 makedepends="libnuma-devel"
 depends="perl gcc libffi-devel gmp-devel libnuma-devel"
 short_desc="Glorious Haskell Compiler"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d
+checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
 patch_args="-Np1"
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"

From 5b9b267f65b772c8949edc4f9bba668efdfff239 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 28 Feb 2021 18:34:26 +0100
Subject: [PATCH 02/12] 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 000000000000..63965ca12d44
--- /dev/null
+++ b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
@@ -0,0 +1,43 @@
+--- bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
++++ 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 1dd08f07fb44..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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]\."
-                        #  >= 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 2c15789b1f9d..99ebb54427fe 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 <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=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
 }

From 38e932e399073a6ddeac1b878540e31178f4bc70 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 12:37:23 +0100
Subject: [PATCH 03/12] ghc-bin: update to 8.10.4

Take over maintainership of orphaned package.
---
 srcpkgs/ghc-bin/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 9101601358b9..eacbca4e74f8 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,13 +1,13 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.8.4
+version=8.10.4
 revision=1
 archs="i686* x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
 short_desc="Glorious Haskell Compiler - precompiled binaries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 nostrip=yes
@@ -15,17 +15,17 @@ noshlibprovides=yes
 conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
-	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb8-linux.tar.xz"
-	checksum=51a36892f1264744195274187298d13ac62bce2da86d4ddf76d8054ab90f2feb
+	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
+	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=779647d3f4e6e39da9e13b2559319ede76b4fff1107e4dc369a09aadeecad971
+	checksum=56e53f46ad53e6640753d608d01228528fca8ccec01b09bba6ad3b6890a18994
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0
+	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
 	;;
 i686-musl)
 	distfiles="https://distfiles.voidlinux.de/ghc-${version}-i386-unknown-linux-musl.tar.xz"

From b1ec1361fdbe97eae96335d3e1851c938930e773 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 15:11:29 +0100
Subject: [PATCH 04/12] stack: update to 2.5.1.1

---
 srcpkgs/stack/patches/datakinds.patch | 14 ------
 srcpkgs/stack/patches/ghc-8.8.4.patch | 70 ---------------------------
 srcpkgs/stack/patches/ppc.patch       | 18 +++----
 srcpkgs/stack/template                | 10 ++--
 4 files changed, 14 insertions(+), 98 deletions(-)
 delete mode 100644 srcpkgs/stack/patches/datakinds.patch
 delete mode 100644 srcpkgs/stack/patches/ghc-8.8.4.patch

diff --git a/srcpkgs/stack/patches/datakinds.patch b/srcpkgs/stack/patches/datakinds.patch
deleted file mode 100644
index 1c06480515f7..000000000000
--- a/srcpkgs/stack/patches/datakinds.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Stack/Storage/User.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/User.hs	2020-12-06 20:51:06.632607164 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
---- src/Stack/Storage/Project.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/Project.hs	2020-12-06 21:55:21.349484738 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch
deleted file mode 100644
index 6b55c176e150..000000000000
--- a/srcpkgs/stack/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- masterdir/builddir/stack-2.5.1/stack.cabal	2020-10-17 17:19:10.724179166 +0200
-+++ stack.cabal	2020-10-17 17:18:03.803498792 +0200
-@@ -234,6 +234,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -272,7 +273,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -359,6 +360,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -396,7 +398,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -480,6 +482,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -518,7 +521,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , optparse-generic
-     , pantry >=0.5.1.3
-     , path
-@@ -609,6 +612,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -647,7 +651,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
diff --git a/srcpkgs/stack/patches/ppc.patch b/srcpkgs/stack/patches/ppc.patch
index 1b5bc191b47c..724aaaf3a65c 100644
--- a/srcpkgs/stack/patches/ppc.patch
+++ b/srcpkgs/stack/patches/ppc.patch
@@ -7,7 +7,7 @@
 +import              System.Endian (getSystemEndianness, Endianness (..))
  import              System.Uname (getRelease)
  import              Data.List.Split (splitOn)
-@@ -1264,4 +1265,9 @@ getOSKey platform =
+@@ -1264,6 +1265,11 @@ getOSKey platform =
          Platform X86_64                Cabal.Windows -> return "windows64"
          Platform Arm                   Cabal.Linux   -> return "linux-armv7"
          Platform AArch64               Cabal.Linux   -> return "linux-aarch64"
@@ -21,11 +21,11 @@
  downloadFromInfo
 --- stack.cabal
 +++ stack.cabal
-@@ -235,6 +235,7 @@ library
-       , conduit
-       , conduit-extra
-       , containers
-+      , cpu >=0.1.2
-       , cryptonite
-       , cryptonite-conduit
-       , deepseq
+@@ -244,6 +244,7 @@
+         conduit >=1.3.1.2,
+         conduit-extra >=1.3.4,
+         containers >=0.6.0.1,
++        cpu >=0.1.2,
+         cryptonite >=0.25,
+         cryptonite-conduit >=0.2.2,
+         deepseq >=1.4.4.0,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 257aba10e50d..66da6618e77d 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.5.1
+version=2.5.1.1
 revision=1
-_stackage="lts-16.13"
+_stackage="lts-17.5"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -10,10 +10,10 @@ short_desc="Cross-platform program for developing Haskell projects"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://haskellstack.org"
-distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
+distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076
- b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58"
+checksum="ccf3ef6dff0412fe8409ef2cfbdf48cad65150f64aec7696725c75881827b539
+ d03bee7e51bbdec5053573f94f644a6baeb140cdd95dbe47261e03c04306b252"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From c6c890ddc1971ce73d02daba9b44dd93d04453a0 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 16 Mar 2021 17:41:58 +0100
Subject: [PATCH 05/12] xmobar: bump for ghc 8.10.4

---
 srcpkgs/xmobar/files/stack.yaml | 2 +-
 srcpkgs/xmobar/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 7bc4bf189d23..52fd0e3e49fe 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 81ae92fd2940..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.37
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From bb1fc87dcd1384cc0576b79ebae2e52d208dc6b5 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:03:10 +0100
Subject: [PATCH 06/12] hlint: update to 3.2.7

---
 srcpkgs/hlint/files/stack.yaml   |  7 -------
 srcpkgs/hlint/patches/data.patch | 10 ++++------
 srcpkgs/hlint/template           | 10 +++++-----
 3 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/hlint/files/stack.yaml

diff --git a/srcpkgs/hlint/files/stack.yaml b/srcpkgs/hlint/files/stack.yaml
deleted file mode 100644
index 12aead6562c5..000000000000
--- a/srcpkgs/hlint/files/stack.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-resolver: lts-16.13
-packages: [.]
-extra-deps:
-  - ghc-lib-parser-8.8.4.20200716
-  - ghc-lib-parser-ex-8.8.5.8
-ghc-options:
-    "$locals": -Wunused-imports -Worphans -Wunused-top-binds -Wunused-local-binds -Wincomplete-patterns
diff --git a/srcpkgs/hlint/patches/data.patch b/srcpkgs/hlint/patches/data.patch
index bdfac204f477..c73b376e5df7 100644
--- a/srcpkgs/hlint/patches/data.patch
+++ b/srcpkgs/hlint/patches/data.patch
@@ -1,13 +1,11 @@
-diff --git src/CmdLine.hs src/CmdLine.hs
-index 8c3d530..ccf7aac 100644
 --- src/CmdLine.hs
 +++ src/CmdLine.hs
-@@ -52,7 +52,7 @@ automatic cmd = case cmd of
+@@ -58,7 +58,7 @@
                  b <- doesDirectoryExist x
-                 if b then return cmd{cmdDataDir=x} else do
+                 if b then pure cmd{cmdDataDir=x} else do
                      exe <- getExecutablePath
--                    return cmd{cmdDataDir = takeDirectory exe </> "data"}
-+                    return cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
+-                    pure cmd{cmdDataDir = takeDirectory exe </> "data"}
++                    pure cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
          git cmd
              | cmdGit cmd = do
                  mgit <- findExecutable "git"
diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index 16fbb03ce2b9..fb30f947a452 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,16 +1,16 @@
 # Template file for 'hlint'
 pkgname=hlint
-version=2.2.11
-revision=2
+version=3.2.7
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
-homepage="https://github.com/ndmitchell/${pkgname}"
+homepage="https://github.com/ndmitchell/hlint"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=207539d3627efd3caed9e6fd3b1aeb8f1eb64553f1f9f166090adbf2fb71e172
+checksum=fcdeefcc79a52206add44b409abcab48c5fe2adff9d5aff077acbc43c702b54e
 nocross=yes # Can't yet cross compile Haskell
 nopie_files="/usr/bin/hlint"
 

From 06c76d0b976af165abe75fca01ad1ada605fd253 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:43:37 +0100
Subject: [PATCH 07/12] kmonad: bump for ghc 8.10.4

---
 srcpkgs/kmonad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index 13e8845581ae..8c34a920ba7d 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,9 +1,9 @@
 # Template file for 'kmonad'
 pkgname=kmonad
 version=0.4.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage=lts-16.13
+stackage=lts-17.5
 short_desc="Keyboard remapping utility providing qmk-like functionality"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"

From 5e285010a6a561542365269543173945c52ab46f Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 16:21:35 +0100
Subject: [PATCH 08/12] hoogle: bump for ghc 8.10.4

---
 srcpkgs/hoogle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 4305ac4ae6e8..eafda8747cdf 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,9 +1,9 @@
 # Template file for 'hoogle'
 pkgname=hoogle
 version=5.0.18.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="zlib-devel"
 short_desc="Haskell API search engine"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From fd0d8152a4b473ecf8db8e9b693c325ad915fdd1 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 11:18:37 +0100
Subject: [PATCH 09/12] cgrep: bump for ghc 8.10.4

---
 srcpkgs/cgrep/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index 7b4047614a71..15eda3bafd0e 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,12 +1,12 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.6.33
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.18"
+stackage="lts-17.5"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="https://awgn.github.io/cgrep/"
 distfiles="https://github.com/awgn/${pkgname}/archive/v${version}.tar.gz"

From 6079c9e4322201c9a0a3411bc15650f0fb1a9394 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 15:03:05 +0100
Subject: [PATCH 10/12] debug-me: bump for ghc 8.10.4

---
 srcpkgs/debug-me/files/stack.yaml                     |  2 +-
 .../patches/{ghc8.8.3.patch => ghc8.10.4.patch}       | 11 +++++++++++
 srcpkgs/debug-me/template                             |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 rename srcpkgs/debug-me/patches/{ghc8.8.3.patch => ghc8.10.4.patch} (70%)

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index 9c88cea9ab3c..ecff9d9d18f2 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - '.'
-resolver: lts-16.13
+resolver: lts-17.5
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/patches/ghc8.8.3.patch b/srcpkgs/debug-me/patches/ghc8.10.4.patch
similarity index 70%
rename from srcpkgs/debug-me/patches/ghc8.8.3.patch
rename to srcpkgs/debug-me/patches/ghc8.10.4.patch
index f1779331c5a9..9cc19db63be3 100644
--- a/srcpkgs/debug-me/patches/ghc8.8.3.patch
+++ b/srcpkgs/debug-me/patches/ghc8.10.4.patch
@@ -20,3 +20,14 @@
  		defaultSettings
 
  checkEnv :: ServerOpts -> IO ServerOpts
+--- debug-me.cabal
++++ debug-me.cabal
+@@ -64,7 +64,7 @@
+     , stm-chans (>= 3.0)
+     , posix-pty (>= 0.2.1)
+     , terminal-size (>= 0.3)
+-    , aeson (>= 0.11 && < 1.5)
++    , aeson (>= 0.11 && < 1.6)
+     , sandi (>= 0.4)
+     , text (>= 1.2.2)
+     , optparse-applicative (>= 0.12)
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 3df514e0be48..797c52f1f479 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -1,7 +1,7 @@
 # Template file for 'debug-me'
 pkgname=debug-me
 version=1.20200820
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"

From d14d2aaf3eb6eb3a7a584faf60d8d96a14354f74 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 20 Mar 2021 11:26:04 +0100
Subject: [PATCH 11/12] darcs: bump for ghc 8.10.4

---
 srcpkgs/darcs/files/stack.yaml | 2 +-
 srcpkgs/darcs/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index 3766e74cccb0..cfc1efb94d53 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index bdbe3f14cc6f..6aa45fa21535 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.3
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From 9540e99205c5970d3915335d3266f99d24ee2467 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 08:56:29 +0100
Subject: [PATCH 12/12] hledger: bump for ghc 8.10.4

---
 srcpkgs/hledger/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template
index b34e8ccd4652..1727a49252b7 100644
--- a/srcpkgs/hledger/template
+++ b/srcpkgs/hledger/template
@@ -1,7 +1,7 @@
 # Template file for 'hledger'
 pkgname=hledger
 version=1.21
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel ncurses-devel"
 short_desc="Simple, precise, plain text accounting"

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (10 preceding siblings ...)
  2021-03-25  8:02 ` slotThe
@ 2021-03-25 10:16 ` slotThe
  2021-03-25 16:44 ` slotThe
                   ` (26 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-03-25 10:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3024 bytes --]

There is an updated pull request by slotThe against master on the void-packages repository

https://github.com/slotThe/void-packages ghc-8.10.4
https://github.com/void-linux/void-packages/pull/29506

[WIP] GHC 8.10.4
It's that time of the year again!

- [X] ghc; I took over as maintainer here, @leahneukirchen said that was okay on IRC (cc'ing here to make sure)
- [ ] ghc-bin; took over as mainainer of orphaned package.
    - [X] x86_64-musl; [Link here](https://www34.zippyshare.com/d/yvtjb7uJ/38780/ghc-8.10.4-x86_64-void-linux-musl.tar.xz)
    - [ ] i686-musl
    cc @q66 for these
    - [ ] ppc64le
    - [ ] ppc64le-musl
- [X] cabal-install
- [X] stack
 
Rebuild literally every single haskell package we have and see if anything's broken:

- [ ] git-mediate
- [x] kmonad
- [x] cgrep; took over as mainainer of orphaned package.
- [x] debug-me
- [x] hlint
- [x] hoogle
- [x] darcs
- [ ] shellcheck
- [ ] git-annex
- [x] hledger
- [ ] pandoc
- [x] xmobar
- [ ] HLS

For the following two I'd like to fix #6414 while we're at it.  Because stack can't install libraries globally, this would involve either removing these packages entirely and advising users to install them in their own [stack or cabal projects](https://github.com/xmonad/xmonad-testing), or finding a way to build them with cabal and updating ghc's data base accordingly.  This would probably use `v1` commands, as we don't want to nuke our users db if we update xmonad. Cc @xaltsc as the current maintainer and @chilledfrogs as someone who might want to tackle this (if I read the IRC discussion correctly). 

- [ ] xmonad
- [ ] xmonad-contrib

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/29506.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghc-8.10.4-29506.patch --]
[-- Type: text/x-diff, Size: 33823 bytes --]

From 9e1074e5ab3fa5f1c8270daf94476cd2f10d3763 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 31 Jan 2021 14:31:24 +0100
Subject: [PATCH 01/14] ghc: update to 8.10.4

The change of maintainership was okay-ed by Leah.
---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch | 41 +++++++++++-------------
 srcpkgs/ghc/template                     |  8 ++---
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index ac353ed417e5..c9bd2583abe0 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -85,7 +85,7 @@ index ec3c18a..0359be7 100644
 +        in Right [ 0x3D800000 .|. hi16 w32,
 +                   0x618C0000 .|. lo16 w32,
 +                   0x7D8903A6, 0x4E800420 ]
- 
+
      ArchPPC64LE ->
          -- The ABI requires r12 to point to the function's entry point.
 diff --git a/rts/Adjustor.c b/rts/Adjustor.c
@@ -93,7 +93,7 @@ index d360cfe..ab7ede7 100644
 --- a/rts/Adjustor.c
 +++ b/rts/Adjustor.c
 @@ -49,7 +49,7 @@ Haskell side.
- 
+
  #if defined(i386_HOST_ARCH)
  extern void adjustorCode(void);
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
@@ -104,16 +104,16 @@ index d360cfe..ab7ede7 100644
 @@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
  extern void obscure_ccall_ret_code(void);
  #endif
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
- 
+
  /* !!! !!! WARNING: !!! !!!
 @@ -318,7 +318,7 @@ typedef struct AdjustorStub {
  } AdjustorStub;
  #endif
- 
+
 -#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  static int totalArgumentSize(char *typeString)
@@ -131,10 +131,10 @@ index d360cfe..ab7ede7 100644
 @@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
          }
      }
- 
+
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-         
+
  #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
  #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
 @@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
@@ -151,9 +151,9 @@ index 2795b83..63cfe91 100644
 --- a/rts/AdjustorAsm.S
 +++ b/rts/AdjustorAsm.S
 @@ -2,7 +2,7 @@
- 
+
  /* ******************************** PowerPC ******************************** */
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
@@ -166,34 +166,31 @@ index 934926e..2ff8662 100644
 @@ -717,7 +717,7 @@ StgRunIsImplementedInAssembler(void)
     Everything is in assembler, so we don't have to deal with GCC...
     -------------------------------------------------------------------------- */
- 
+
 -#if defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
- 
+
  static void GNUC3_ATTRIBUTE(used)
  StgRunIsImplementedInAssembler(void)
 @@ -842,7 +842,7 @@ StgRunIsImplementedInAssembler(void)
- 
+
  #endif
- 
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
  /* -----------------------------------------------------------------------------
     PowerPC 64 little endian architecture
- 
+
 diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
 index 9274a44..3b4fc33 100644
 --- a/rts/StgCRunAsm.S
 +++ b/rts/StgCRunAsm.S
-@@ -1,7 +1,7 @@
- #include "ghcconfig.h"
- #include "rts/Constants.h"
- 
+@@ -5,7 +5,7 @@
+  * then functions StgRun/StgReturn are implemented in file StgCRun.c */
+ #if !defined(USE_MINIINTERPRETER)
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
- # ifdef linux_HOST_OS
+ # if defined(linux_HOST_OS)
  # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
  	.file	"StgCRun.c"
--- 
-2.30.0
-
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 0b1440b2f6d9..c6acfa79e75d 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,8 +1,8 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.8.4
-revision=2
+version=8.10.4
+revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
 hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
@@ -10,11 +10,11 @@ hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
 makedepends="libnuma-devel"
 depends="perl gcc libffi-devel gmp-devel libnuma-devel"
 short_desc="Glorious Haskell Compiler"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d
+checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
 patch_args="-Np1"
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"

From 5b9b267f65b772c8949edc4f9bba668efdfff239 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 28 Feb 2021 18:34:26 +0100
Subject: [PATCH 02/14] 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 000000000000..63965ca12d44
--- /dev/null
+++ b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
@@ -0,0 +1,43 @@
+--- bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
++++ 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 1dd08f07fb44..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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]\."
-                        #  >= 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 2c15789b1f9d..99ebb54427fe 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 <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=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
 }

From 38e932e399073a6ddeac1b878540e31178f4bc70 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 12:37:23 +0100
Subject: [PATCH 03/14] ghc-bin: update to 8.10.4

Take over maintainership of orphaned package.
---
 srcpkgs/ghc-bin/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 9101601358b9..eacbca4e74f8 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,13 +1,13 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.8.4
+version=8.10.4
 revision=1
 archs="i686* x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
 short_desc="Glorious Haskell Compiler - precompiled binaries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 nostrip=yes
@@ -15,17 +15,17 @@ noshlibprovides=yes
 conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
-	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb8-linux.tar.xz"
-	checksum=51a36892f1264744195274187298d13ac62bce2da86d4ddf76d8054ab90f2feb
+	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
+	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=779647d3f4e6e39da9e13b2559319ede76b4fff1107e4dc369a09aadeecad971
+	checksum=56e53f46ad53e6640753d608d01228528fca8ccec01b09bba6ad3b6890a18994
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0
+	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
 	;;
 i686-musl)
 	distfiles="https://distfiles.voidlinux.de/ghc-${version}-i386-unknown-linux-musl.tar.xz"

From b1ec1361fdbe97eae96335d3e1851c938930e773 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 15:11:29 +0100
Subject: [PATCH 04/14] stack: update to 2.5.1.1

---
 srcpkgs/stack/patches/datakinds.patch | 14 ------
 srcpkgs/stack/patches/ghc-8.8.4.patch | 70 ---------------------------
 srcpkgs/stack/patches/ppc.patch       | 18 +++----
 srcpkgs/stack/template                | 10 ++--
 4 files changed, 14 insertions(+), 98 deletions(-)
 delete mode 100644 srcpkgs/stack/patches/datakinds.patch
 delete mode 100644 srcpkgs/stack/patches/ghc-8.8.4.patch

diff --git a/srcpkgs/stack/patches/datakinds.patch b/srcpkgs/stack/patches/datakinds.patch
deleted file mode 100644
index 1c06480515f7..000000000000
--- a/srcpkgs/stack/patches/datakinds.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Stack/Storage/User.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/User.hs	2020-12-06 20:51:06.632607164 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
---- src/Stack/Storage/Project.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/Project.hs	2020-12-06 21:55:21.349484738 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch
deleted file mode 100644
index 6b55c176e150..000000000000
--- a/srcpkgs/stack/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- masterdir/builddir/stack-2.5.1/stack.cabal	2020-10-17 17:19:10.724179166 +0200
-+++ stack.cabal	2020-10-17 17:18:03.803498792 +0200
-@@ -234,6 +234,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -272,7 +273,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -359,6 +360,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -396,7 +398,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -480,6 +482,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -518,7 +521,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , optparse-generic
-     , pantry >=0.5.1.3
-     , path
-@@ -609,6 +612,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -647,7 +651,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
diff --git a/srcpkgs/stack/patches/ppc.patch b/srcpkgs/stack/patches/ppc.patch
index 1b5bc191b47c..724aaaf3a65c 100644
--- a/srcpkgs/stack/patches/ppc.patch
+++ b/srcpkgs/stack/patches/ppc.patch
@@ -7,7 +7,7 @@
 +import              System.Endian (getSystemEndianness, Endianness (..))
  import              System.Uname (getRelease)
  import              Data.List.Split (splitOn)
-@@ -1264,4 +1265,9 @@ getOSKey platform =
+@@ -1264,6 +1265,11 @@ getOSKey platform =
          Platform X86_64                Cabal.Windows -> return "windows64"
          Platform Arm                   Cabal.Linux   -> return "linux-armv7"
          Platform AArch64               Cabal.Linux   -> return "linux-aarch64"
@@ -21,11 +21,11 @@
  downloadFromInfo
 --- stack.cabal
 +++ stack.cabal
-@@ -235,6 +235,7 @@ library
-       , conduit
-       , conduit-extra
-       , containers
-+      , cpu >=0.1.2
-       , cryptonite
-       , cryptonite-conduit
-       , deepseq
+@@ -244,6 +244,7 @@
+         conduit >=1.3.1.2,
+         conduit-extra >=1.3.4,
+         containers >=0.6.0.1,
++        cpu >=0.1.2,
+         cryptonite >=0.25,
+         cryptonite-conduit >=0.2.2,
+         deepseq >=1.4.4.0,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 257aba10e50d..66da6618e77d 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.5.1
+version=2.5.1.1
 revision=1
-_stackage="lts-16.13"
+_stackage="lts-17.5"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -10,10 +10,10 @@ short_desc="Cross-platform program for developing Haskell projects"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://haskellstack.org"
-distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
+distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076
- b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58"
+checksum="ccf3ef6dff0412fe8409ef2cfbdf48cad65150f64aec7696725c75881827b539
+ d03bee7e51bbdec5053573f94f644a6baeb140cdd95dbe47261e03c04306b252"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From c6c890ddc1971ce73d02daba9b44dd93d04453a0 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 16 Mar 2021 17:41:58 +0100
Subject: [PATCH 05/14] xmobar: bump for ghc 8.10.4

---
 srcpkgs/xmobar/files/stack.yaml | 2 +-
 srcpkgs/xmobar/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 7bc4bf189d23..52fd0e3e49fe 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 81ae92fd2940..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.37
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From bb1fc87dcd1384cc0576b79ebae2e52d208dc6b5 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:03:10 +0100
Subject: [PATCH 06/14] hlint: update to 3.2.7

---
 srcpkgs/hlint/files/stack.yaml   |  7 -------
 srcpkgs/hlint/patches/data.patch | 10 ++++------
 srcpkgs/hlint/template           | 10 +++++-----
 3 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/hlint/files/stack.yaml

diff --git a/srcpkgs/hlint/files/stack.yaml b/srcpkgs/hlint/files/stack.yaml
deleted file mode 100644
index 12aead6562c5..000000000000
--- a/srcpkgs/hlint/files/stack.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-resolver: lts-16.13
-packages: [.]
-extra-deps:
-  - ghc-lib-parser-8.8.4.20200716
-  - ghc-lib-parser-ex-8.8.5.8
-ghc-options:
-    "$locals": -Wunused-imports -Worphans -Wunused-top-binds -Wunused-local-binds -Wincomplete-patterns
diff --git a/srcpkgs/hlint/patches/data.patch b/srcpkgs/hlint/patches/data.patch
index bdfac204f477..c73b376e5df7 100644
--- a/srcpkgs/hlint/patches/data.patch
+++ b/srcpkgs/hlint/patches/data.patch
@@ -1,13 +1,11 @@
-diff --git src/CmdLine.hs src/CmdLine.hs
-index 8c3d530..ccf7aac 100644
 --- src/CmdLine.hs
 +++ src/CmdLine.hs
-@@ -52,7 +52,7 @@ automatic cmd = case cmd of
+@@ -58,7 +58,7 @@
                  b <- doesDirectoryExist x
-                 if b then return cmd{cmdDataDir=x} else do
+                 if b then pure cmd{cmdDataDir=x} else do
                      exe <- getExecutablePath
--                    return cmd{cmdDataDir = takeDirectory exe </> "data"}
-+                    return cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
+-                    pure cmd{cmdDataDir = takeDirectory exe </> "data"}
++                    pure cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
          git cmd
              | cmdGit cmd = do
                  mgit <- findExecutable "git"
diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index 16fbb03ce2b9..fb30f947a452 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,16 +1,16 @@
 # Template file for 'hlint'
 pkgname=hlint
-version=2.2.11
-revision=2
+version=3.2.7
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
-homepage="https://github.com/ndmitchell/${pkgname}"
+homepage="https://github.com/ndmitchell/hlint"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=207539d3627efd3caed9e6fd3b1aeb8f1eb64553f1f9f166090adbf2fb71e172
+checksum=fcdeefcc79a52206add44b409abcab48c5fe2adff9d5aff077acbc43c702b54e
 nocross=yes # Can't yet cross compile Haskell
 nopie_files="/usr/bin/hlint"
 

From 06c76d0b976af165abe75fca01ad1ada605fd253 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:43:37 +0100
Subject: [PATCH 07/14] kmonad: bump for ghc 8.10.4

---
 srcpkgs/kmonad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index 13e8845581ae..8c34a920ba7d 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,9 +1,9 @@
 # Template file for 'kmonad'
 pkgname=kmonad
 version=0.4.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage=lts-16.13
+stackage=lts-17.5
 short_desc="Keyboard remapping utility providing qmk-like functionality"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"

From 5e285010a6a561542365269543173945c52ab46f Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 16:21:35 +0100
Subject: [PATCH 08/14] hoogle: bump for ghc 8.10.4

---
 srcpkgs/hoogle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 4305ac4ae6e8..eafda8747cdf 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,9 +1,9 @@
 # Template file for 'hoogle'
 pkgname=hoogle
 version=5.0.18.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="zlib-devel"
 short_desc="Haskell API search engine"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From fd0d8152a4b473ecf8db8e9b693c325ad915fdd1 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 11:18:37 +0100
Subject: [PATCH 09/14] cgrep: bump for ghc 8.10.4

---
 srcpkgs/cgrep/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index 7b4047614a71..15eda3bafd0e 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,12 +1,12 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.6.33
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.18"
+stackage="lts-17.5"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="https://awgn.github.io/cgrep/"
 distfiles="https://github.com/awgn/${pkgname}/archive/v${version}.tar.gz"

From 6079c9e4322201c9a0a3411bc15650f0fb1a9394 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 15:03:05 +0100
Subject: [PATCH 10/14] debug-me: bump for ghc 8.10.4

---
 srcpkgs/debug-me/files/stack.yaml                     |  2 +-
 .../patches/{ghc8.8.3.patch => ghc8.10.4.patch}       | 11 +++++++++++
 srcpkgs/debug-me/template                             |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 rename srcpkgs/debug-me/patches/{ghc8.8.3.patch => ghc8.10.4.patch} (70%)

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index 9c88cea9ab3c..ecff9d9d18f2 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - '.'
-resolver: lts-16.13
+resolver: lts-17.5
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/patches/ghc8.8.3.patch b/srcpkgs/debug-me/patches/ghc8.10.4.patch
similarity index 70%
rename from srcpkgs/debug-me/patches/ghc8.8.3.patch
rename to srcpkgs/debug-me/patches/ghc8.10.4.patch
index f1779331c5a9..9cc19db63be3 100644
--- a/srcpkgs/debug-me/patches/ghc8.8.3.patch
+++ b/srcpkgs/debug-me/patches/ghc8.10.4.patch
@@ -20,3 +20,14 @@
  		defaultSettings
 
  checkEnv :: ServerOpts -> IO ServerOpts
+--- debug-me.cabal
++++ debug-me.cabal
+@@ -64,7 +64,7 @@
+     , stm-chans (>= 3.0)
+     , posix-pty (>= 0.2.1)
+     , terminal-size (>= 0.3)
+-    , aeson (>= 0.11 && < 1.5)
++    , aeson (>= 0.11 && < 1.6)
+     , sandi (>= 0.4)
+     , text (>= 1.2.2)
+     , optparse-applicative (>= 0.12)
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 3df514e0be48..797c52f1f479 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -1,7 +1,7 @@
 # Template file for 'debug-me'
 pkgname=debug-me
 version=1.20200820
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"

From d14d2aaf3eb6eb3a7a584faf60d8d96a14354f74 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 20 Mar 2021 11:26:04 +0100
Subject: [PATCH 11/14] darcs: bump for ghc 8.10.4

---
 srcpkgs/darcs/files/stack.yaml | 2 +-
 srcpkgs/darcs/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index 3766e74cccb0..cfc1efb94d53 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index bdbe3f14cc6f..6aa45fa21535 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.3
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From 9540e99205c5970d3915335d3266f99d24ee2467 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 08:56:29 +0100
Subject: [PATCH 12/14] hledger: bump for ghc 8.10.4

---
 srcpkgs/hledger/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template
index b34e8ccd4652..1727a49252b7 100644
--- a/srcpkgs/hledger/template
+++ b/srcpkgs/hledger/template
@@ -1,7 +1,7 @@
 # Template file for 'hledger'
 pkgname=hledger
 version=1.21
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel ncurses-devel"
 short_desc="Simple, precise, plain text accounting"

From 7edcf8bd0ba256d682ffaacd29e7f8d91a5c3388 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 10:57:42 +0100
Subject: [PATCH 13/14] pandoc: update to 2.11.4

Citeproc support is build in now.
---
 srcpkgs/pandoc/files/stack.yaml | 31 -------------------------------
 srcpkgs/pandoc/template         | 15 +++++----------
 2 files changed, 5 insertions(+), 41 deletions(-)
 delete mode 100644 srcpkgs/pandoc/files/stack.yaml

diff --git a/srcpkgs/pandoc/files/stack.yaml b/srcpkgs/pandoc/files/stack.yaml
deleted file mode 100644
index 47bf3bb1b5e4..000000000000
--- a/srcpkgs/pandoc/files/stack.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-resolver: lts-16.20
-
-packages:
-  - ./pandoc-2.10.1
-  - ./pandoc-citeproc-0.17.0.1
-  - ./pandoc-sidenote-0.20.0
-
-flags:
-  pandoc:
-    trypandoc: false
-    embed_data_files: true
-    static: false
-  pandoc-citeproc:
-    bibutils: true
-    embed_data_files: true
-    unicode_collation: false
-    test_citeproc: false
-    debug: false
-
-extra-deps:
-  - pandoc-types-1.21
-  - haddock-library-1.9.0
-  - regex-pcre-builtin-0.95.1.2.8.43
-  - hslua-1.1.2
-  - jira-wiki-markup-1.3.2
-  - commonmark-0.1.0.1
-  - commonmark-extensions-0.2.0.0
-  - commonmark-pandoc-0.2.0.0
-
-ghc-options:
-   "$locals": -fhide-source-paths -Wno-missing-home-modules
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 7d7fbdc4b72b..54f21076a2e1 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,15 +1,15 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.10.1
-revision=3
-_citeproc_version=0.17.0.1
+version=2.11.4
+revision=1
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
+stackage="lts-17.5"
 make_build_args="
- --flag pandoc:embed_data_files --flag pandoc-citeproc:embed_data_files
+ --flag pandoc:embed_data_files --flag pandoc:embed_data_files
  --flag=hslua:system-lua --flag=hslua:pkg-config"
 hostmakedepends="pkg-config unzip wget"
 makedepends="zlib-devel lua53-devel tar"
@@ -18,17 +18,14 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, MIT"
 homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
- http://hackage.haskell.org/package/${pkgname}-citeproc-${_citeproc_version}/${pkgname}-citeproc-${_citeproc_version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="938a4c9b0a7ed3de886c73af4052913b0ac9e4aa12b435bd2afd09670bd3229a
- f3e5ce3d1d21c27178f2fc69580750e3ce97fc5f962f2d01f7b6aa2e090c2342
+checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
 nopie_files="
  /usr/bin/pandoc
- /usr/bin/pandoc-citeproc
  /usr/bin/pandoc-sidenote
 "
 
@@ -38,8 +35,6 @@ post_extract() {
 }
 post_install() {
 	vman pandoc-${version}/man/pandoc.1
-	vman pandoc-citeproc-${_citeproc_version}/man/man1/pandoc-citeproc.1
 	vlicense pandoc-${version}/COPYRIGHT LICENSE.pandoc
-	vlicense pandoc-citeproc-${_citeproc_version}/LICENSE LICENSE.pandoc-citeproc
 	vlicense pandoc-sidenote-${_sidenote_version}/LICENSE LICENSE.pandoc-sidenote
 }

From b9f2956e072205ee40aa2c2a7718afe0c1bb54cc Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 11:16:14 +0100
Subject: [PATCH 14/14] shellcheck: bump for ghc 8.10.4

---
 srcpkgs/shellcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 83bcd922ab70..4678289eaa14 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,9 +1,9 @@
 # Template file for 'shellcheck'
 pkgname=shellcheck
 version=0.7.1
-revision=3
+revision=4
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 hostmakedepends="pandoc"
 short_desc="Static analysis tool for shell scripts"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (11 preceding siblings ...)
  2021-03-25 10:16 ` slotThe
@ 2021-03-25 16:44 ` slotThe
  2021-03-30 10:12 ` slotThe
                   ` (25 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-03-25 16:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3024 bytes --]

There is an updated pull request by slotThe against master on the void-packages repository

https://github.com/slotThe/void-packages ghc-8.10.4
https://github.com/void-linux/void-packages/pull/29506

[WIP] GHC 8.10.4
It's that time of the year again!

- [X] ghc; I took over as maintainer here, @leahneukirchen said that was okay on IRC (cc'ing here to make sure)
- [ ] ghc-bin; took over as mainainer of orphaned package.
    - [X] x86_64-musl; [Link here](https://www34.zippyshare.com/d/yvtjb7uJ/38780/ghc-8.10.4-x86_64-void-linux-musl.tar.xz)
    - [ ] i686-musl
    cc @q66 for these
    - [ ] ppc64le
    - [ ] ppc64le-musl
- [X] cabal-install
- [X] stack
 
Rebuild literally every single haskell package we have and see if anything's broken:

- [ ] git-mediate
- [x] kmonad
- [x] cgrep; took over as mainainer of orphaned package.
- [x] debug-me
- [x] hlint
- [x] hoogle
- [x] darcs
- [x] shellcheck
- [ ] git-annex
- [x] hledger
- [x] pandoc
- [x] xmobar
- [ ] HLS

For the following two I'd like to fix #6414 while we're at it.  Because stack can't install libraries globally, this would involve either removing these packages entirely and advising users to install them in their own [stack or cabal projects](https://github.com/xmonad/xmonad-testing), or finding a way to build them with cabal and updating ghc's data base accordingly.  This would probably use `v1` commands, as we don't want to nuke our users db if we update xmonad. Cc @xaltsc as the current maintainer and @chilledfrogs as someone who might want to tackle this (if I read the IRC discussion correctly). 

- [ ] xmonad
- [ ] xmonad-contrib

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/29506.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghc-8.10.4-29506.patch --]
[-- Type: text/x-diff, Size: 37840 bytes --]

From 9e1074e5ab3fa5f1c8270daf94476cd2f10d3763 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 31 Jan 2021 14:31:24 +0100
Subject: [PATCH 01/16] ghc: update to 8.10.4

The change of maintainership was okay-ed by Leah.
---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch | 41 +++++++++++-------------
 srcpkgs/ghc/template                     |  8 ++---
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index ac353ed417e5..c9bd2583abe0 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -85,7 +85,7 @@ index ec3c18a..0359be7 100644
 +        in Right [ 0x3D800000 .|. hi16 w32,
 +                   0x618C0000 .|. lo16 w32,
 +                   0x7D8903A6, 0x4E800420 ]
- 
+
      ArchPPC64LE ->
          -- The ABI requires r12 to point to the function's entry point.
 diff --git a/rts/Adjustor.c b/rts/Adjustor.c
@@ -93,7 +93,7 @@ index d360cfe..ab7ede7 100644
 --- a/rts/Adjustor.c
 +++ b/rts/Adjustor.c
 @@ -49,7 +49,7 @@ Haskell side.
- 
+
  #if defined(i386_HOST_ARCH)
  extern void adjustorCode(void);
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
@@ -104,16 +104,16 @@ index d360cfe..ab7ede7 100644
 @@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
  extern void obscure_ccall_ret_code(void);
  #endif
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
- 
+
  /* !!! !!! WARNING: !!! !!!
 @@ -318,7 +318,7 @@ typedef struct AdjustorStub {
  } AdjustorStub;
  #endif
- 
+
 -#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  static int totalArgumentSize(char *typeString)
@@ -131,10 +131,10 @@ index d360cfe..ab7ede7 100644
 @@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
          }
      }
- 
+
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-         
+
  #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
  #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
 @@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
@@ -151,9 +151,9 @@ index 2795b83..63cfe91 100644
 --- a/rts/AdjustorAsm.S
 +++ b/rts/AdjustorAsm.S
 @@ -2,7 +2,7 @@
- 
+
  /* ******************************** PowerPC ******************************** */
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
@@ -166,34 +166,31 @@ index 934926e..2ff8662 100644
 @@ -717,7 +717,7 @@ StgRunIsImplementedInAssembler(void)
     Everything is in assembler, so we don't have to deal with GCC...
     -------------------------------------------------------------------------- */
- 
+
 -#if defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
- 
+
  static void GNUC3_ATTRIBUTE(used)
  StgRunIsImplementedInAssembler(void)
 @@ -842,7 +842,7 @@ StgRunIsImplementedInAssembler(void)
- 
+
  #endif
- 
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
  /* -----------------------------------------------------------------------------
     PowerPC 64 little endian architecture
- 
+
 diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
 index 9274a44..3b4fc33 100644
 --- a/rts/StgCRunAsm.S
 +++ b/rts/StgCRunAsm.S
-@@ -1,7 +1,7 @@
- #include "ghcconfig.h"
- #include "rts/Constants.h"
- 
+@@ -5,7 +5,7 @@
+  * then functions StgRun/StgReturn are implemented in file StgCRun.c */
+ #if !defined(USE_MINIINTERPRETER)
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
- # ifdef linux_HOST_OS
+ # if defined(linux_HOST_OS)
  # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
  	.file	"StgCRun.c"
--- 
-2.30.0
-
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 0b1440b2f6d9..c6acfa79e75d 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,8 +1,8 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.8.4
-revision=2
+version=8.10.4
+revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
 hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
@@ -10,11 +10,11 @@ hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
 makedepends="libnuma-devel"
 depends="perl gcc libffi-devel gmp-devel libnuma-devel"
 short_desc="Glorious Haskell Compiler"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d
+checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
 patch_args="-Np1"
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"

From 5b9b267f65b772c8949edc4f9bba668efdfff239 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 28 Feb 2021 18:34:26 +0100
Subject: [PATCH 02/16] 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 000000000000..63965ca12d44
--- /dev/null
+++ b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
@@ -0,0 +1,43 @@
+--- bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
++++ 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 1dd08f07fb44..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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]\."
-                        #  >= 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 2c15789b1f9d..99ebb54427fe 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 <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=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
 }

From 38e932e399073a6ddeac1b878540e31178f4bc70 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 12:37:23 +0100
Subject: [PATCH 03/16] ghc-bin: update to 8.10.4

Take over maintainership of orphaned package.
---
 srcpkgs/ghc-bin/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 9101601358b9..eacbca4e74f8 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,13 +1,13 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.8.4
+version=8.10.4
 revision=1
 archs="i686* x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
 short_desc="Glorious Haskell Compiler - precompiled binaries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 nostrip=yes
@@ -15,17 +15,17 @@ noshlibprovides=yes
 conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
-	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb8-linux.tar.xz"
-	checksum=51a36892f1264744195274187298d13ac62bce2da86d4ddf76d8054ab90f2feb
+	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
+	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=779647d3f4e6e39da9e13b2559319ede76b4fff1107e4dc369a09aadeecad971
+	checksum=56e53f46ad53e6640753d608d01228528fca8ccec01b09bba6ad3b6890a18994
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0
+	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
 	;;
 i686-musl)
 	distfiles="https://distfiles.voidlinux.de/ghc-${version}-i386-unknown-linux-musl.tar.xz"

From b1ec1361fdbe97eae96335d3e1851c938930e773 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 15:11:29 +0100
Subject: [PATCH 04/16] stack: update to 2.5.1.1

---
 srcpkgs/stack/patches/datakinds.patch | 14 ------
 srcpkgs/stack/patches/ghc-8.8.4.patch | 70 ---------------------------
 srcpkgs/stack/patches/ppc.patch       | 18 +++----
 srcpkgs/stack/template                | 10 ++--
 4 files changed, 14 insertions(+), 98 deletions(-)
 delete mode 100644 srcpkgs/stack/patches/datakinds.patch
 delete mode 100644 srcpkgs/stack/patches/ghc-8.8.4.patch

diff --git a/srcpkgs/stack/patches/datakinds.patch b/srcpkgs/stack/patches/datakinds.patch
deleted file mode 100644
index 1c06480515f7..000000000000
--- a/srcpkgs/stack/patches/datakinds.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Stack/Storage/User.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/User.hs	2020-12-06 20:51:06.632607164 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
---- src/Stack/Storage/Project.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/Project.hs	2020-12-06 21:55:21.349484738 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch
deleted file mode 100644
index 6b55c176e150..000000000000
--- a/srcpkgs/stack/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- masterdir/builddir/stack-2.5.1/stack.cabal	2020-10-17 17:19:10.724179166 +0200
-+++ stack.cabal	2020-10-17 17:18:03.803498792 +0200
-@@ -234,6 +234,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -272,7 +273,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -359,6 +360,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -396,7 +398,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -480,6 +482,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -518,7 +521,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , optparse-generic
-     , pantry >=0.5.1.3
-     , path
-@@ -609,6 +612,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -647,7 +651,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
diff --git a/srcpkgs/stack/patches/ppc.patch b/srcpkgs/stack/patches/ppc.patch
index 1b5bc191b47c..724aaaf3a65c 100644
--- a/srcpkgs/stack/patches/ppc.patch
+++ b/srcpkgs/stack/patches/ppc.patch
@@ -7,7 +7,7 @@
 +import              System.Endian (getSystemEndianness, Endianness (..))
  import              System.Uname (getRelease)
  import              Data.List.Split (splitOn)
-@@ -1264,4 +1265,9 @@ getOSKey platform =
+@@ -1264,6 +1265,11 @@ getOSKey platform =
          Platform X86_64                Cabal.Windows -> return "windows64"
          Platform Arm                   Cabal.Linux   -> return "linux-armv7"
          Platform AArch64               Cabal.Linux   -> return "linux-aarch64"
@@ -21,11 +21,11 @@
  downloadFromInfo
 --- stack.cabal
 +++ stack.cabal
-@@ -235,6 +235,7 @@ library
-       , conduit
-       , conduit-extra
-       , containers
-+      , cpu >=0.1.2
-       , cryptonite
-       , cryptonite-conduit
-       , deepseq
+@@ -244,6 +244,7 @@
+         conduit >=1.3.1.2,
+         conduit-extra >=1.3.4,
+         containers >=0.6.0.1,
++        cpu >=0.1.2,
+         cryptonite >=0.25,
+         cryptonite-conduit >=0.2.2,
+         deepseq >=1.4.4.0,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 257aba10e50d..66da6618e77d 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.5.1
+version=2.5.1.1
 revision=1
-_stackage="lts-16.13"
+_stackage="lts-17.5"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -10,10 +10,10 @@ short_desc="Cross-platform program for developing Haskell projects"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://haskellstack.org"
-distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
+distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076
- b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58"
+checksum="ccf3ef6dff0412fe8409ef2cfbdf48cad65150f64aec7696725c75881827b539
+ d03bee7e51bbdec5053573f94f644a6baeb140cdd95dbe47261e03c04306b252"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From c6c890ddc1971ce73d02daba9b44dd93d04453a0 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 16 Mar 2021 17:41:58 +0100
Subject: [PATCH 05/16] xmobar: bump for ghc 8.10.4

---
 srcpkgs/xmobar/files/stack.yaml | 2 +-
 srcpkgs/xmobar/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 7bc4bf189d23..52fd0e3e49fe 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 81ae92fd2940..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.37
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From bb1fc87dcd1384cc0576b79ebae2e52d208dc6b5 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:03:10 +0100
Subject: [PATCH 06/16] hlint: update to 3.2.7

---
 srcpkgs/hlint/files/stack.yaml   |  7 -------
 srcpkgs/hlint/patches/data.patch | 10 ++++------
 srcpkgs/hlint/template           | 10 +++++-----
 3 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/hlint/files/stack.yaml

diff --git a/srcpkgs/hlint/files/stack.yaml b/srcpkgs/hlint/files/stack.yaml
deleted file mode 100644
index 12aead6562c5..000000000000
--- a/srcpkgs/hlint/files/stack.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-resolver: lts-16.13
-packages: [.]
-extra-deps:
-  - ghc-lib-parser-8.8.4.20200716
-  - ghc-lib-parser-ex-8.8.5.8
-ghc-options:
-    "$locals": -Wunused-imports -Worphans -Wunused-top-binds -Wunused-local-binds -Wincomplete-patterns
diff --git a/srcpkgs/hlint/patches/data.patch b/srcpkgs/hlint/patches/data.patch
index bdfac204f477..c73b376e5df7 100644
--- a/srcpkgs/hlint/patches/data.patch
+++ b/srcpkgs/hlint/patches/data.patch
@@ -1,13 +1,11 @@
-diff --git src/CmdLine.hs src/CmdLine.hs
-index 8c3d530..ccf7aac 100644
 --- src/CmdLine.hs
 +++ src/CmdLine.hs
-@@ -52,7 +52,7 @@ automatic cmd = case cmd of
+@@ -58,7 +58,7 @@
                  b <- doesDirectoryExist x
-                 if b then return cmd{cmdDataDir=x} else do
+                 if b then pure cmd{cmdDataDir=x} else do
                      exe <- getExecutablePath
--                    return cmd{cmdDataDir = takeDirectory exe </> "data"}
-+                    return cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
+-                    pure cmd{cmdDataDir = takeDirectory exe </> "data"}
++                    pure cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
          git cmd
              | cmdGit cmd = do
                  mgit <- findExecutable "git"
diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index 16fbb03ce2b9..fb30f947a452 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,16 +1,16 @@
 # Template file for 'hlint'
 pkgname=hlint
-version=2.2.11
-revision=2
+version=3.2.7
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
-homepage="https://github.com/ndmitchell/${pkgname}"
+homepage="https://github.com/ndmitchell/hlint"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=207539d3627efd3caed9e6fd3b1aeb8f1eb64553f1f9f166090adbf2fb71e172
+checksum=fcdeefcc79a52206add44b409abcab48c5fe2adff9d5aff077acbc43c702b54e
 nocross=yes # Can't yet cross compile Haskell
 nopie_files="/usr/bin/hlint"
 

From 06c76d0b976af165abe75fca01ad1ada605fd253 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:43:37 +0100
Subject: [PATCH 07/16] kmonad: bump for ghc 8.10.4

---
 srcpkgs/kmonad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index 13e8845581ae..8c34a920ba7d 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,9 +1,9 @@
 # Template file for 'kmonad'
 pkgname=kmonad
 version=0.4.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage=lts-16.13
+stackage=lts-17.5
 short_desc="Keyboard remapping utility providing qmk-like functionality"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"

From 5e285010a6a561542365269543173945c52ab46f Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 16:21:35 +0100
Subject: [PATCH 08/16] hoogle: bump for ghc 8.10.4

---
 srcpkgs/hoogle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 4305ac4ae6e8..eafda8747cdf 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,9 +1,9 @@
 # Template file for 'hoogle'
 pkgname=hoogle
 version=5.0.18.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="zlib-devel"
 short_desc="Haskell API search engine"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From fd0d8152a4b473ecf8db8e9b693c325ad915fdd1 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 11:18:37 +0100
Subject: [PATCH 09/16] cgrep: bump for ghc 8.10.4

---
 srcpkgs/cgrep/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index 7b4047614a71..15eda3bafd0e 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,12 +1,12 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.6.33
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.18"
+stackage="lts-17.5"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="https://awgn.github.io/cgrep/"
 distfiles="https://github.com/awgn/${pkgname}/archive/v${version}.tar.gz"

From 6079c9e4322201c9a0a3411bc15650f0fb1a9394 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 15:03:05 +0100
Subject: [PATCH 10/16] debug-me: bump for ghc 8.10.4

---
 srcpkgs/debug-me/files/stack.yaml                     |  2 +-
 .../patches/{ghc8.8.3.patch => ghc8.10.4.patch}       | 11 +++++++++++
 srcpkgs/debug-me/template                             |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 rename srcpkgs/debug-me/patches/{ghc8.8.3.patch => ghc8.10.4.patch} (70%)

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index 9c88cea9ab3c..ecff9d9d18f2 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - '.'
-resolver: lts-16.13
+resolver: lts-17.5
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/patches/ghc8.8.3.patch b/srcpkgs/debug-me/patches/ghc8.10.4.patch
similarity index 70%
rename from srcpkgs/debug-me/patches/ghc8.8.3.patch
rename to srcpkgs/debug-me/patches/ghc8.10.4.patch
index f1779331c5a9..9cc19db63be3 100644
--- a/srcpkgs/debug-me/patches/ghc8.8.3.patch
+++ b/srcpkgs/debug-me/patches/ghc8.10.4.patch
@@ -20,3 +20,14 @@
  		defaultSettings
 
  checkEnv :: ServerOpts -> IO ServerOpts
+--- debug-me.cabal
++++ debug-me.cabal
+@@ -64,7 +64,7 @@
+     , stm-chans (>= 3.0)
+     , posix-pty (>= 0.2.1)
+     , terminal-size (>= 0.3)
+-    , aeson (>= 0.11 && < 1.5)
++    , aeson (>= 0.11 && < 1.6)
+     , sandi (>= 0.4)
+     , text (>= 1.2.2)
+     , optparse-applicative (>= 0.12)
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 3df514e0be48..797c52f1f479 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -1,7 +1,7 @@
 # Template file for 'debug-me'
 pkgname=debug-me
 version=1.20200820
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"

From d14d2aaf3eb6eb3a7a584faf60d8d96a14354f74 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 20 Mar 2021 11:26:04 +0100
Subject: [PATCH 11/16] darcs: bump for ghc 8.10.4

---
 srcpkgs/darcs/files/stack.yaml | 2 +-
 srcpkgs/darcs/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index 3766e74cccb0..cfc1efb94d53 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index bdbe3f14cc6f..6aa45fa21535 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.3
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From 9540e99205c5970d3915335d3266f99d24ee2467 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 08:56:29 +0100
Subject: [PATCH 12/16] hledger: bump for ghc 8.10.4

---
 srcpkgs/hledger/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template
index b34e8ccd4652..1727a49252b7 100644
--- a/srcpkgs/hledger/template
+++ b/srcpkgs/hledger/template
@@ -1,7 +1,7 @@
 # Template file for 'hledger'
 pkgname=hledger
 version=1.21
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel ncurses-devel"
 short_desc="Simple, precise, plain text accounting"

From 7edcf8bd0ba256d682ffaacd29e7f8d91a5c3388 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 10:57:42 +0100
Subject: [PATCH 13/16] pandoc: update to 2.11.4

Citeproc support is build in now.
---
 srcpkgs/pandoc/files/stack.yaml | 31 -------------------------------
 srcpkgs/pandoc/template         | 15 +++++----------
 2 files changed, 5 insertions(+), 41 deletions(-)
 delete mode 100644 srcpkgs/pandoc/files/stack.yaml

diff --git a/srcpkgs/pandoc/files/stack.yaml b/srcpkgs/pandoc/files/stack.yaml
deleted file mode 100644
index 47bf3bb1b5e4..000000000000
--- a/srcpkgs/pandoc/files/stack.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-resolver: lts-16.20
-
-packages:
-  - ./pandoc-2.10.1
-  - ./pandoc-citeproc-0.17.0.1
-  - ./pandoc-sidenote-0.20.0
-
-flags:
-  pandoc:
-    trypandoc: false
-    embed_data_files: true
-    static: false
-  pandoc-citeproc:
-    bibutils: true
-    embed_data_files: true
-    unicode_collation: false
-    test_citeproc: false
-    debug: false
-
-extra-deps:
-  - pandoc-types-1.21
-  - haddock-library-1.9.0
-  - regex-pcre-builtin-0.95.1.2.8.43
-  - hslua-1.1.2
-  - jira-wiki-markup-1.3.2
-  - commonmark-0.1.0.1
-  - commonmark-extensions-0.2.0.0
-  - commonmark-pandoc-0.2.0.0
-
-ghc-options:
-   "$locals": -fhide-source-paths -Wno-missing-home-modules
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 7d7fbdc4b72b..54f21076a2e1 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,15 +1,15 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.10.1
-revision=3
-_citeproc_version=0.17.0.1
+version=2.11.4
+revision=1
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
+stackage="lts-17.5"
 make_build_args="
- --flag pandoc:embed_data_files --flag pandoc-citeproc:embed_data_files
+ --flag pandoc:embed_data_files --flag pandoc:embed_data_files
  --flag=hslua:system-lua --flag=hslua:pkg-config"
 hostmakedepends="pkg-config unzip wget"
 makedepends="zlib-devel lua53-devel tar"
@@ -18,17 +18,14 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, MIT"
 homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
- http://hackage.haskell.org/package/${pkgname}-citeproc-${_citeproc_version}/${pkgname}-citeproc-${_citeproc_version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="938a4c9b0a7ed3de886c73af4052913b0ac9e4aa12b435bd2afd09670bd3229a
- f3e5ce3d1d21c27178f2fc69580750e3ce97fc5f962f2d01f7b6aa2e090c2342
+checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
 nopie_files="
  /usr/bin/pandoc
- /usr/bin/pandoc-citeproc
  /usr/bin/pandoc-sidenote
 "
 
@@ -38,8 +35,6 @@ post_extract() {
 }
 post_install() {
 	vman pandoc-${version}/man/pandoc.1
-	vman pandoc-citeproc-${_citeproc_version}/man/man1/pandoc-citeproc.1
 	vlicense pandoc-${version}/COPYRIGHT LICENSE.pandoc
-	vlicense pandoc-citeproc-${_citeproc_version}/LICENSE LICENSE.pandoc-citeproc
 	vlicense pandoc-sidenote-${_sidenote_version}/LICENSE LICENSE.pandoc-sidenote
 }

From b9f2956e072205ee40aa2c2a7718afe0c1bb54cc Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 11:16:14 +0100
Subject: [PATCH 14/16] shellcheck: bump for ghc 8.10.4

---
 srcpkgs/shellcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 83bcd922ab70..4678289eaa14 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,9 +1,9 @@
 # Template file for 'shellcheck'
 pkgname=shellcheck
 version=0.7.1
-revision=3
+revision=4
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 hostmakedepends="pandoc"
 short_desc="Static analysis tool for shell scripts"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

From 3bf15bf40921b0c0eba659ebbc933ec9e76f12c4 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 16:07:47 +0100
Subject: [PATCH 15/16] git-mediate: update to 1.0.8.1

---
 srcpkgs/git-mediate/patches/ghc8.8.3.patch | 19 -------------------
 srcpkgs/git-mediate/template               |  8 ++++----
 2 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/git-mediate/patches/ghc8.8.3.patch

diff --git a/srcpkgs/git-mediate/patches/ghc8.8.3.patch b/srcpkgs/git-mediate/patches/ghc8.8.3.patch
deleted file mode 100644
index 7928b61ef3a4..000000000000
--- a/srcpkgs/git-mediate/patches/ghc8.8.3.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- git-mediate.cabal	2001-09-09 03:46:40.000000000 +0200
-+++ git-mediate.cabal	2020-03-30 15:32:48.959537620 +0200
-@@ -72,7 +72,7 @@
-   ghc-options:         -O2 -Wall
-   -- other-extensions:
-   build-depends:       base >=4.8 && <5
--                     , base-compat >= 0.8.2 && < 0.11
-+                     , base-compat >= 0.8.2 && < 0.12
-                      , mtl >=2.1
-                      , directory >=1.2
-                      , process >=1.2
-@@ -80,6 +80,6 @@
-                      , unix-compat >=0.4.2.0
-                      , Diff >=0.4
-                      , ansi-terminal >=0.6.2
--                     , optparse-applicative >=0.11 && <0.15
-+                     , optparse-applicative >=0.11 && <0.16
-   hs-source-dirs:      src
-   default-language:    Haskell2010
diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template
index aa3979d3435a..971a6236224f 100644
--- a/srcpkgs/git-mediate/template
+++ b/srcpkgs/git-mediate/template
@@ -1,15 +1,15 @@
 # Template file for 'git-mediate'
 pkgname=git-mediate
-version=1.0.8
-revision=4
+version=1.0.8.1
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 depends="git"
 short_desc="Tool to help resolving git conflicts"
 maintainer="Peter Wang <novalazy@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/Peaker/git-mediate"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=81220f7e20a3913bc147b69681666ad22e60e5b759a1becad78ee28dcad8013d
+checksum=ee44841d37ded70cbcd8edd1e233a344d0118295e0bd2f0c6983ed00f619c467
 nocross=yes
 nopie_files="/usr/bin/git-mediate"

From f8126941c58f7b0bad17341140d29a65c799305e Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 16:11:25 +0100
Subject: [PATCH 16/16] git-annex: update to 8.20210310

---
 srcpkgs/git-annex/files/stack.yaml | 3 ++-
 srcpkgs/git-annex/template         | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
index 9a2294440b5d..671443617003 100644
--- a/srcpkgs/git-annex/files/stack.yaml
+++ b/srcpkgs/git-annex/files/stack.yaml
@@ -27,4 +27,5 @@ extra-deps:
  - network-3.1.0.1
 explicit-setup-deps:
   git-annex: true
-resolver: lts-16.13
+resolver: lts-17.5
+allow-newer: true
diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template
index 3d4df760667b..babba714fff1 100644
--- a/srcpkgs/git-annex/template
+++ b/srcpkgs/git-annex/template
@@ -1,6 +1,6 @@
 # Template file for 'git-annex'
 pkgname=git-annex
-version=8.20210223
+version=8.20210310
 revision=1
 build_style=haskell-stack
 makedepends="curl file-devel gnupg2 gnutls-devel gsasl-devel libxml2-devel
@@ -12,7 +12,7 @@ maintainer="Evan Deaubl <evan@deaubl.name>"
 license="AGPL-3.0-or-later, MIT, BSD-2-Clause, GPL-3.0-or-later, custom:Expat, custom:MIT-twitter, GPL-2.0-only, custom:icon-license"
 homepage="http://git-annex.branchable.com"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=62a09f98c96dd2a66605aaf6b7f00573a33997f3ef568ffb0d2dc17609719d1f
+checksum=dd0ae1cac40c97490e0699c68a341b5bff6fcb38e733df83b67c442a7eca97a8
 nopie_files="/usr/bin/git-annex"
 nocross=yes
 

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (12 preceding siblings ...)
  2021-03-25 16:44 ` slotThe
@ 2021-03-30 10:12 ` slotThe
  2021-03-30 15:22 ` leahneukirchen
                   ` (24 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-03-30 10:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3059 bytes --]

There is an updated pull request by slotThe against master on the void-packages repository

https://github.com/slotThe/void-packages ghc-8.10.4
https://github.com/void-linux/void-packages/pull/29506

[WIP] GHC 8.10.4
It's that time of the year again!

- [X] ghc; I took over as maintainer here, @leahneukirchen said that was okay on IRC (cc'ing here to make sure)
- [ ] ghc-bin; took over as mainainer of orphaned package.
    - [X] x86_64-musl; [Link here](https://www34.zippyshare.com/d/yvtjb7uJ/38780/ghc-8.10.4-x86_64-void-linux-musl.tar.xz)
    - [ ] i686-musl
    cc @q66 for these
    - [ ] ppc64le
    - [ ] ppc64le-musl
- [X] cabal-install
- [X] stack
 
Rebuild literally every single haskell package we have and see if anything's broken:

- [x] git-mediate
- [x] kmonad
- [x] cgrep; took over as mainainer of orphaned package.
- [x] debug-me
- [x] hlint
- [x] hoogle
- [x] darcs
- [x] shellcheck
- [x] git-annex
- [x] hledger
- [x] pandoc
- [x] xmobar
- [ ] HLS; this is #27961 once that's merged

For the following two I'd like to fix #6414 while we're at it.  Because stack can't install libraries globally, this would involve either removing these packages entirely and advising users to install them in their own [stack or cabal projects](https://github.com/xmonad/xmonad-testing), or finding a way to build them with cabal and updating ghc's data base accordingly.  This would probably use `v1` commands, as we don't want to nuke our users db if we update xmonad. Cc @xaltsc as the current maintainer and @chilledfrogs as someone who might want to tackle this (if I read the IRC discussion correctly). 

- [ ] xmonad
- [ ] xmonad-contrib

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/29506.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghc-8.10.4-29506.patch --]
[-- Type: text/x-diff, Size: 38991 bytes --]

From a2189b4b61d39d0f9d7eb63144c2691bcfe5b79d Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 31 Jan 2021 14:31:24 +0100
Subject: [PATCH 01/17] ghc: update to 8.10.4

The change of maintainership was okay-ed by Leah.
---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch | 41 +++++++++++-------------
 srcpkgs/ghc/template                     |  8 ++---
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index ac353ed417e5..c9bd2583abe0 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -85,7 +85,7 @@ index ec3c18a..0359be7 100644
 +        in Right [ 0x3D800000 .|. hi16 w32,
 +                   0x618C0000 .|. lo16 w32,
 +                   0x7D8903A6, 0x4E800420 ]
- 
+
      ArchPPC64LE ->
          -- The ABI requires r12 to point to the function's entry point.
 diff --git a/rts/Adjustor.c b/rts/Adjustor.c
@@ -93,7 +93,7 @@ index d360cfe..ab7ede7 100644
 --- a/rts/Adjustor.c
 +++ b/rts/Adjustor.c
 @@ -49,7 +49,7 @@ Haskell side.
- 
+
  #if defined(i386_HOST_ARCH)
  extern void adjustorCode(void);
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
@@ -104,16 +104,16 @@ index d360cfe..ab7ede7 100644
 @@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
  extern void obscure_ccall_ret_code(void);
  #endif
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
- 
+
  /* !!! !!! WARNING: !!! !!!
 @@ -318,7 +318,7 @@ typedef struct AdjustorStub {
  } AdjustorStub;
  #endif
- 
+
 -#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  static int totalArgumentSize(char *typeString)
@@ -131,10 +131,10 @@ index d360cfe..ab7ede7 100644
 @@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
          }
      }
- 
+
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-         
+
  #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
  #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
 @@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
@@ -151,9 +151,9 @@ index 2795b83..63cfe91 100644
 --- a/rts/AdjustorAsm.S
 +++ b/rts/AdjustorAsm.S
 @@ -2,7 +2,7 @@
- 
+
  /* ******************************** PowerPC ******************************** */
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
@@ -166,34 +166,31 @@ index 934926e..2ff8662 100644
 @@ -717,7 +717,7 @@ StgRunIsImplementedInAssembler(void)
     Everything is in assembler, so we don't have to deal with GCC...
     -------------------------------------------------------------------------- */
- 
+
 -#if defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
- 
+
  static void GNUC3_ATTRIBUTE(used)
  StgRunIsImplementedInAssembler(void)
 @@ -842,7 +842,7 @@ StgRunIsImplementedInAssembler(void)
- 
+
  #endif
- 
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
  /* -----------------------------------------------------------------------------
     PowerPC 64 little endian architecture
- 
+
 diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
 index 9274a44..3b4fc33 100644
 --- a/rts/StgCRunAsm.S
 +++ b/rts/StgCRunAsm.S
-@@ -1,7 +1,7 @@
- #include "ghcconfig.h"
- #include "rts/Constants.h"
- 
+@@ -5,7 +5,7 @@
+  * then functions StgRun/StgReturn are implemented in file StgCRun.c */
+ #if !defined(USE_MINIINTERPRETER)
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
- # ifdef linux_HOST_OS
+ # if defined(linux_HOST_OS)
  # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
  	.file	"StgCRun.c"
--- 
-2.30.0
-
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 0b1440b2f6d9..c6acfa79e75d 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,8 +1,8 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.8.4
-revision=2
+version=8.10.4
+revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
 hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
@@ -10,11 +10,11 @@ hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
 makedepends="libnuma-devel"
 depends="perl gcc libffi-devel gmp-devel libnuma-devel"
 short_desc="Glorious Haskell Compiler"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d
+checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
 patch_args="-Np1"
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"

From 7509dfbbff9839eb18ba36bdefdd9f9d5f930b98 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 28 Feb 2021 18:34:26 +0100
Subject: [PATCH 02/17] 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 000000000000..63965ca12d44
--- /dev/null
+++ b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
@@ -0,0 +1,43 @@
+--- bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
++++ 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 1dd08f07fb44..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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]\."
-                        #  >= 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 2c15789b1f9d..99ebb54427fe 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 <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=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
 }

From de7ad87dda42adcc123883d038d72bbbfaca3a70 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 12:37:23 +0100
Subject: [PATCH 03/17] ghc-bin: update to 8.10.4

Take over maintainership of orphaned package.
---
 srcpkgs/ghc-bin/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 9101601358b9..eacbca4e74f8 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,13 +1,13 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.8.4
+version=8.10.4
 revision=1
 archs="i686* x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
 short_desc="Glorious Haskell Compiler - precompiled binaries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 nostrip=yes
@@ -15,17 +15,17 @@ noshlibprovides=yes
 conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
-	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb8-linux.tar.xz"
-	checksum=51a36892f1264744195274187298d13ac62bce2da86d4ddf76d8054ab90f2feb
+	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
+	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=779647d3f4e6e39da9e13b2559319ede76b4fff1107e4dc369a09aadeecad971
+	checksum=56e53f46ad53e6640753d608d01228528fca8ccec01b09bba6ad3b6890a18994
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0
+	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
 	;;
 i686-musl)
 	distfiles="https://distfiles.voidlinux.de/ghc-${version}-i386-unknown-linux-musl.tar.xz"

From dd6b36fa17c32b79f6e9a0fcf1618faedf92b23e Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 15:11:29 +0100
Subject: [PATCH 04/17] stack: update to 2.5.1.1

---
 srcpkgs/stack/patches/datakinds.patch | 14 ------
 srcpkgs/stack/patches/ghc-8.8.4.patch | 70 ---------------------------
 srcpkgs/stack/patches/ppc.patch       | 18 +++----
 srcpkgs/stack/template                | 10 ++--
 4 files changed, 14 insertions(+), 98 deletions(-)
 delete mode 100644 srcpkgs/stack/patches/datakinds.patch
 delete mode 100644 srcpkgs/stack/patches/ghc-8.8.4.patch

diff --git a/srcpkgs/stack/patches/datakinds.patch b/srcpkgs/stack/patches/datakinds.patch
deleted file mode 100644
index 1c06480515f7..000000000000
--- a/srcpkgs/stack/patches/datakinds.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Stack/Storage/User.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/User.hs	2020-12-06 20:51:06.632607164 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
---- src/Stack/Storage/Project.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/Project.hs	2020-12-06 21:55:21.349484738 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch
deleted file mode 100644
index 6b55c176e150..000000000000
--- a/srcpkgs/stack/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- masterdir/builddir/stack-2.5.1/stack.cabal	2020-10-17 17:19:10.724179166 +0200
-+++ stack.cabal	2020-10-17 17:18:03.803498792 +0200
-@@ -234,6 +234,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -272,7 +273,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -359,6 +360,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -396,7 +398,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -480,6 +482,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -518,7 +521,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , optparse-generic
-     , pantry >=0.5.1.3
-     , path
-@@ -609,6 +612,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -647,7 +651,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
diff --git a/srcpkgs/stack/patches/ppc.patch b/srcpkgs/stack/patches/ppc.patch
index 1b5bc191b47c..724aaaf3a65c 100644
--- a/srcpkgs/stack/patches/ppc.patch
+++ b/srcpkgs/stack/patches/ppc.patch
@@ -7,7 +7,7 @@
 +import              System.Endian (getSystemEndianness, Endianness (..))
  import              System.Uname (getRelease)
  import              Data.List.Split (splitOn)
-@@ -1264,4 +1265,9 @@ getOSKey platform =
+@@ -1264,6 +1265,11 @@ getOSKey platform =
          Platform X86_64                Cabal.Windows -> return "windows64"
          Platform Arm                   Cabal.Linux   -> return "linux-armv7"
          Platform AArch64               Cabal.Linux   -> return "linux-aarch64"
@@ -21,11 +21,11 @@
  downloadFromInfo
 --- stack.cabal
 +++ stack.cabal
-@@ -235,6 +235,7 @@ library
-       , conduit
-       , conduit-extra
-       , containers
-+      , cpu >=0.1.2
-       , cryptonite
-       , cryptonite-conduit
-       , deepseq
+@@ -244,6 +244,7 @@
+         conduit >=1.3.1.2,
+         conduit-extra >=1.3.4,
+         containers >=0.6.0.1,
++        cpu >=0.1.2,
+         cryptonite >=0.25,
+         cryptonite-conduit >=0.2.2,
+         deepseq >=1.4.4.0,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 257aba10e50d..66da6618e77d 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.5.1
+version=2.5.1.1
 revision=1
-_stackage="lts-16.13"
+_stackage="lts-17.5"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -10,10 +10,10 @@ short_desc="Cross-platform program for developing Haskell projects"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://haskellstack.org"
-distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
+distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076
- b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58"
+checksum="ccf3ef6dff0412fe8409ef2cfbdf48cad65150f64aec7696725c75881827b539
+ d03bee7e51bbdec5053573f94f644a6baeb140cdd95dbe47261e03c04306b252"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 65cb9e9b17e1211436b02dbdf03e42d858d5af4b Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 16 Mar 2021 17:41:58 +0100
Subject: [PATCH 05/17] xmobar: bump for ghc 8.10.4

---
 srcpkgs/xmobar/files/stack.yaml | 2 +-
 srcpkgs/xmobar/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 7bc4bf189d23..52fd0e3e49fe 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 81ae92fd2940..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.37
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From d5b61e85614a9f8b0a209a7899c1fb71e191886d Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:03:10 +0100
Subject: [PATCH 06/17] hlint: update to 3.2.7

---
 srcpkgs/hlint/files/stack.yaml   |  7 -------
 srcpkgs/hlint/patches/data.patch | 10 ++++------
 srcpkgs/hlint/template           | 10 +++++-----
 3 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/hlint/files/stack.yaml

diff --git a/srcpkgs/hlint/files/stack.yaml b/srcpkgs/hlint/files/stack.yaml
deleted file mode 100644
index 12aead6562c5..000000000000
--- a/srcpkgs/hlint/files/stack.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-resolver: lts-16.13
-packages: [.]
-extra-deps:
-  - ghc-lib-parser-8.8.4.20200716
-  - ghc-lib-parser-ex-8.8.5.8
-ghc-options:
-    "$locals": -Wunused-imports -Worphans -Wunused-top-binds -Wunused-local-binds -Wincomplete-patterns
diff --git a/srcpkgs/hlint/patches/data.patch b/srcpkgs/hlint/patches/data.patch
index bdfac204f477..c73b376e5df7 100644
--- a/srcpkgs/hlint/patches/data.patch
+++ b/srcpkgs/hlint/patches/data.patch
@@ -1,13 +1,11 @@
-diff --git src/CmdLine.hs src/CmdLine.hs
-index 8c3d530..ccf7aac 100644
 --- src/CmdLine.hs
 +++ src/CmdLine.hs
-@@ -52,7 +52,7 @@ automatic cmd = case cmd of
+@@ -58,7 +58,7 @@
                  b <- doesDirectoryExist x
-                 if b then return cmd{cmdDataDir=x} else do
+                 if b then pure cmd{cmdDataDir=x} else do
                      exe <- getExecutablePath
--                    return cmd{cmdDataDir = takeDirectory exe </> "data"}
-+                    return cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
+-                    pure cmd{cmdDataDir = takeDirectory exe </> "data"}
++                    pure cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
          git cmd
              | cmdGit cmd = do
                  mgit <- findExecutable "git"
diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index 16fbb03ce2b9..fb30f947a452 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,16 +1,16 @@
 # Template file for 'hlint'
 pkgname=hlint
-version=2.2.11
-revision=2
+version=3.2.7
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
-homepage="https://github.com/ndmitchell/${pkgname}"
+homepage="https://github.com/ndmitchell/hlint"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=207539d3627efd3caed9e6fd3b1aeb8f1eb64553f1f9f166090adbf2fb71e172
+checksum=fcdeefcc79a52206add44b409abcab48c5fe2adff9d5aff077acbc43c702b54e
 nocross=yes # Can't yet cross compile Haskell
 nopie_files="/usr/bin/hlint"
 

From 8e7766bf76aceeb9527e202416d580e414164ba5 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:43:37 +0100
Subject: [PATCH 07/17] kmonad: bump for ghc 8.10.4

---
 srcpkgs/kmonad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index 13e8845581ae..8c34a920ba7d 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,9 +1,9 @@
 # Template file for 'kmonad'
 pkgname=kmonad
 version=0.4.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage=lts-16.13
+stackage=lts-17.5
 short_desc="Keyboard remapping utility providing qmk-like functionality"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"

From 7f92080d64c88777c325921fc9c19cc7634e317b Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 16:21:35 +0100
Subject: [PATCH 08/17] hoogle: bump for ghc 8.10.4

---
 srcpkgs/hoogle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 4305ac4ae6e8..eafda8747cdf 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,9 +1,9 @@
 # Template file for 'hoogle'
 pkgname=hoogle
 version=5.0.18.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="zlib-devel"
 short_desc="Haskell API search engine"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From 0a911c187996a2b209db26d043d0c317143134b8 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 11:18:37 +0100
Subject: [PATCH 09/17] cgrep: bump for ghc 8.10.4

---
 srcpkgs/cgrep/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index 7b4047614a71..15eda3bafd0e 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,12 +1,12 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.6.33
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.18"
+stackage="lts-17.5"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="https://awgn.github.io/cgrep/"
 distfiles="https://github.com/awgn/${pkgname}/archive/v${version}.tar.gz"

From 69100f185f38fcd257a93b292b76399ba326611f Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 15:03:05 +0100
Subject: [PATCH 10/17] debug-me: bump for ghc 8.10.4

---
 srcpkgs/debug-me/files/stack.yaml                     |  2 +-
 .../patches/{ghc8.8.3.patch => ghc8.10.4.patch}       | 11 +++++++++++
 srcpkgs/debug-me/template                             |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 rename srcpkgs/debug-me/patches/{ghc8.8.3.patch => ghc8.10.4.patch} (70%)

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index 9c88cea9ab3c..ecff9d9d18f2 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - '.'
-resolver: lts-16.13
+resolver: lts-17.5
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/patches/ghc8.8.3.patch b/srcpkgs/debug-me/patches/ghc8.10.4.patch
similarity index 70%
rename from srcpkgs/debug-me/patches/ghc8.8.3.patch
rename to srcpkgs/debug-me/patches/ghc8.10.4.patch
index f1779331c5a9..9cc19db63be3 100644
--- a/srcpkgs/debug-me/patches/ghc8.8.3.patch
+++ b/srcpkgs/debug-me/patches/ghc8.10.4.patch
@@ -20,3 +20,14 @@
  		defaultSettings
 
  checkEnv :: ServerOpts -> IO ServerOpts
+--- debug-me.cabal
++++ debug-me.cabal
+@@ -64,7 +64,7 @@
+     , stm-chans (>= 3.0)
+     , posix-pty (>= 0.2.1)
+     , terminal-size (>= 0.3)
+-    , aeson (>= 0.11 && < 1.5)
++    , aeson (>= 0.11 && < 1.6)
+     , sandi (>= 0.4)
+     , text (>= 1.2.2)
+     , optparse-applicative (>= 0.12)
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 3df514e0be48..797c52f1f479 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -1,7 +1,7 @@
 # Template file for 'debug-me'
 pkgname=debug-me
 version=1.20200820
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"

From d87ea2b4bf4478332ae29c702efc72a837dca7a6 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 20 Mar 2021 11:26:04 +0100
Subject: [PATCH 11/17] darcs: bump for ghc 8.10.4

---
 srcpkgs/darcs/files/stack.yaml | 2 +-
 srcpkgs/darcs/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index 3766e74cccb0..cfc1efb94d53 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index bdbe3f14cc6f..6aa45fa21535 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.3
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From 1b65953db93709eae6698f31e9469780c17b51f8 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 08:56:29 +0100
Subject: [PATCH 12/17] hledger: bump for ghc 8.10.4

---
 srcpkgs/hledger/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template
index b34e8ccd4652..1727a49252b7 100644
--- a/srcpkgs/hledger/template
+++ b/srcpkgs/hledger/template
@@ -1,7 +1,7 @@
 # Template file for 'hledger'
 pkgname=hledger
 version=1.21
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel ncurses-devel"
 short_desc="Simple, precise, plain text accounting"

From 32fce4f2e0dd276131ed46e88a1f831000d7a688 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 10:57:42 +0100
Subject: [PATCH 13/17] pandoc: update to 2.11.4

Citeproc support is build in now.
---
 srcpkgs/pandoc/files/stack.yaml | 31 -------------------------------
 srcpkgs/pandoc/template         | 15 +++++----------
 2 files changed, 5 insertions(+), 41 deletions(-)
 delete mode 100644 srcpkgs/pandoc/files/stack.yaml

diff --git a/srcpkgs/pandoc/files/stack.yaml b/srcpkgs/pandoc/files/stack.yaml
deleted file mode 100644
index 47bf3bb1b5e4..000000000000
--- a/srcpkgs/pandoc/files/stack.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-resolver: lts-16.20
-
-packages:
-  - ./pandoc-2.10.1
-  - ./pandoc-citeproc-0.17.0.1
-  - ./pandoc-sidenote-0.20.0
-
-flags:
-  pandoc:
-    trypandoc: false
-    embed_data_files: true
-    static: false
-  pandoc-citeproc:
-    bibutils: true
-    embed_data_files: true
-    unicode_collation: false
-    test_citeproc: false
-    debug: false
-
-extra-deps:
-  - pandoc-types-1.21
-  - haddock-library-1.9.0
-  - regex-pcre-builtin-0.95.1.2.8.43
-  - hslua-1.1.2
-  - jira-wiki-markup-1.3.2
-  - commonmark-0.1.0.1
-  - commonmark-extensions-0.2.0.0
-  - commonmark-pandoc-0.2.0.0
-
-ghc-options:
-   "$locals": -fhide-source-paths -Wno-missing-home-modules
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 7d7fbdc4b72b..54f21076a2e1 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,15 +1,15 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.10.1
-revision=3
-_citeproc_version=0.17.0.1
+version=2.11.4
+revision=1
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
+stackage="lts-17.5"
 make_build_args="
- --flag pandoc:embed_data_files --flag pandoc-citeproc:embed_data_files
+ --flag pandoc:embed_data_files --flag pandoc:embed_data_files
  --flag=hslua:system-lua --flag=hslua:pkg-config"
 hostmakedepends="pkg-config unzip wget"
 makedepends="zlib-devel lua53-devel tar"
@@ -18,17 +18,14 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, MIT"
 homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
- http://hackage.haskell.org/package/${pkgname}-citeproc-${_citeproc_version}/${pkgname}-citeproc-${_citeproc_version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="938a4c9b0a7ed3de886c73af4052913b0ac9e4aa12b435bd2afd09670bd3229a
- f3e5ce3d1d21c27178f2fc69580750e3ce97fc5f962f2d01f7b6aa2e090c2342
+checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
 nopie_files="
  /usr/bin/pandoc
- /usr/bin/pandoc-citeproc
  /usr/bin/pandoc-sidenote
 "
 
@@ -38,8 +35,6 @@ post_extract() {
 }
 post_install() {
 	vman pandoc-${version}/man/pandoc.1
-	vman pandoc-citeproc-${_citeproc_version}/man/man1/pandoc-citeproc.1
 	vlicense pandoc-${version}/COPYRIGHT LICENSE.pandoc
-	vlicense pandoc-citeproc-${_citeproc_version}/LICENSE LICENSE.pandoc-citeproc
 	vlicense pandoc-sidenote-${_sidenote_version}/LICENSE LICENSE.pandoc-sidenote
 }

From 7bc58ed2a311c9e08bf32387699ded32a7896f69 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 11:16:14 +0100
Subject: [PATCH 14/17] shellcheck: bump for ghc 8.10.4

---
 srcpkgs/shellcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 83bcd922ab70..4678289eaa14 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,9 +1,9 @@
 # Template file for 'shellcheck'
 pkgname=shellcheck
 version=0.7.1
-revision=3
+revision=4
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 hostmakedepends="pandoc"
 short_desc="Static analysis tool for shell scripts"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

From 0e3bcd675e314f0300d2bb8426be83bac10a8362 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 16:07:47 +0100
Subject: [PATCH 15/17] git-mediate: update to 1.0.8.1

---
 srcpkgs/git-mediate/patches/ghc8.8.3.patch | 19 -------------------
 srcpkgs/git-mediate/template               |  8 ++++----
 2 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/git-mediate/patches/ghc8.8.3.patch

diff --git a/srcpkgs/git-mediate/patches/ghc8.8.3.patch b/srcpkgs/git-mediate/patches/ghc8.8.3.patch
deleted file mode 100644
index 7928b61ef3a4..000000000000
--- a/srcpkgs/git-mediate/patches/ghc8.8.3.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- git-mediate.cabal	2001-09-09 03:46:40.000000000 +0200
-+++ git-mediate.cabal	2020-03-30 15:32:48.959537620 +0200
-@@ -72,7 +72,7 @@
-   ghc-options:         -O2 -Wall
-   -- other-extensions:
-   build-depends:       base >=4.8 && <5
--                     , base-compat >= 0.8.2 && < 0.11
-+                     , base-compat >= 0.8.2 && < 0.12
-                      , mtl >=2.1
-                      , directory >=1.2
-                      , process >=1.2
-@@ -80,6 +80,6 @@
-                      , unix-compat >=0.4.2.0
-                      , Diff >=0.4
-                      , ansi-terminal >=0.6.2
--                     , optparse-applicative >=0.11 && <0.15
-+                     , optparse-applicative >=0.11 && <0.16
-   hs-source-dirs:      src
-   default-language:    Haskell2010
diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template
index aa3979d3435a..971a6236224f 100644
--- a/srcpkgs/git-mediate/template
+++ b/srcpkgs/git-mediate/template
@@ -1,15 +1,15 @@
 # Template file for 'git-mediate'
 pkgname=git-mediate
-version=1.0.8
-revision=4
+version=1.0.8.1
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 depends="git"
 short_desc="Tool to help resolving git conflicts"
 maintainer="Peter Wang <novalazy@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/Peaker/git-mediate"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=81220f7e20a3913bc147b69681666ad22e60e5b759a1becad78ee28dcad8013d
+checksum=ee44841d37ded70cbcd8edd1e233a344d0118295e0bd2f0c6983ed00f619c467
 nocross=yes
 nopie_files="/usr/bin/git-mediate"

From 4dfe9ac4ffc98b6ef08d56511be472702d8f6b13 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 16:11:25 +0100
Subject: [PATCH 16/17] git-annex: update to 8.20210310

---
 srcpkgs/git-annex/files/stack.yaml | 3 ++-
 srcpkgs/git-annex/template         | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
index 9a2294440b5d..671443617003 100644
--- a/srcpkgs/git-annex/files/stack.yaml
+++ b/srcpkgs/git-annex/files/stack.yaml
@@ -27,4 +27,5 @@ extra-deps:
  - network-3.1.0.1
 explicit-setup-deps:
   git-annex: true
-resolver: lts-16.13
+resolver: lts-17.5
+allow-newer: true
diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template
index 3d4df760667b..babba714fff1 100644
--- a/srcpkgs/git-annex/template
+++ b/srcpkgs/git-annex/template
@@ -1,6 +1,6 @@
 # Template file for 'git-annex'
 pkgname=git-annex
-version=8.20210223
+version=8.20210310
 revision=1
 build_style=haskell-stack
 makedepends="curl file-devel gnupg2 gnutls-devel gsasl-devel libxml2-devel
@@ -12,7 +12,7 @@ maintainer="Evan Deaubl <evan@deaubl.name>"
 license="AGPL-3.0-or-later, MIT, BSD-2-Clause, GPL-3.0-or-later, custom:Expat, custom:MIT-twitter, GPL-2.0-only, custom:icon-license"
 homepage="http://git-annex.branchable.com"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=62a09f98c96dd2a66605aaf6b7f00573a33997f3ef568ffb0d2dc17609719d1f
+checksum=dd0ae1cac40c97490e0699c68a341b5bff6fcb38e733df83b67c442a7eca97a8
 nopie_files="/usr/bin/git-annex"
 nocross=yes
 

From e122c7e63f0d1f457aff0abcebfbe6afaf9e707c Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 30 Mar 2021 12:11:45 +0200
Subject: [PATCH 17/17] haskell-language-server: bump for ghc 8.10.4

---
 srcpkgs/haskell-language-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index 438c760f0a1f..7afa89c452f7 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,12 +1,12 @@
 # Template file for 'haskell-language-server'
 pkgname=haskell-language-server
 version=1.0.0
-revision=1
+revision=2
 # GHC only panics on i686
 # https://github.com/void-linux/void-packages/pull/27961/checks?check_run_id=2181519625#step:8:5936
 archs="~i686"
 build_style="haskell-stack"
-make_build_args="--stack-yaml stack-8.8.4.yaml"
+make_build_args="--stack-yaml stack-8.10.4.yaml"
 makedepends="ncurses-devel ncurses-libtinfo-devel icu-devel zlib-devel"
 short_desc="Integration of ghcide and haskell-ide-engine"
 maintainer="Wayne Van Son <waynevanson@gmail.com>"

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (13 preceding siblings ...)
  2021-03-30 10:12 ` slotThe
@ 2021-03-30 15:22 ` leahneukirchen
  2021-04-01 12:20 ` [PR PATCH] [Updated] " slotThe
                   ` (23 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: leahneukirchen @ 2021-03-30 15:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 185 bytes --]

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/29506#issuecomment-810350870

Comment:
If you want you can adopt pandoc too.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (14 preceding siblings ...)
  2021-03-30 15:22 ` leahneukirchen
@ 2021-04-01 12:20 ` slotThe
  2021-04-13 11:04 ` slotThe
                   ` (22 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-04-01 12:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3059 bytes --]

There is an updated pull request by slotThe against master on the void-packages repository

https://github.com/slotThe/void-packages ghc-8.10.4
https://github.com/void-linux/void-packages/pull/29506

[WIP] GHC 8.10.4
It's that time of the year again!

- [X] ghc; I took over as maintainer here, @leahneukirchen said that was okay on IRC (cc'ing here to make sure)
- [ ] ghc-bin; took over as mainainer of orphaned package.
    - [X] x86_64-musl; [Link here](https://www34.zippyshare.com/d/yvtjb7uJ/38780/ghc-8.10.4-x86_64-void-linux-musl.tar.xz)
    - [ ] i686-musl
    cc @q66 for these
    - [ ] ppc64le
    - [ ] ppc64le-musl
- [X] cabal-install
- [X] stack
 
Rebuild literally every single haskell package we have and see if anything's broken:

- [x] git-mediate
- [x] kmonad
- [x] cgrep; took over as mainainer of orphaned package.
- [x] debug-me
- [x] hlint
- [x] hoogle
- [x] darcs
- [x] shellcheck
- [x] git-annex
- [x] hledger
- [x] pandoc
- [x] xmobar
- [x] HLS; this is #27961 once that's merged

For the following two I'd like to fix #6414 while we're at it.  Because stack can't install libraries globally, this would involve either removing these packages entirely and advising users to install them in their own [stack or cabal projects](https://github.com/xmonad/xmonad-testing), or finding a way to build them with cabal and updating ghc's data base accordingly.  This would probably use `v1` commands, as we don't want to nuke our users db if we update xmonad. Cc @xaltsc as the current maintainer and @chilledfrogs as someone who might want to tackle this (if I read the IRC discussion correctly). 

- [ ] xmonad
- [ ] xmonad-contrib

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/29506.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghc-8.10.4-29506.patch --]
[-- Type: text/x-diff, Size: 39160 bytes --]

From a2189b4b61d39d0f9d7eb63144c2691bcfe5b79d Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 31 Jan 2021 14:31:24 +0100
Subject: [PATCH 01/17] ghc: update to 8.10.4

The change of maintainership was okay-ed by Leah.
---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch | 41 +++++++++++-------------
 srcpkgs/ghc/template                     |  8 ++---
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index ac353ed417e5..c9bd2583abe0 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -85,7 +85,7 @@ index ec3c18a..0359be7 100644
 +        in Right [ 0x3D800000 .|. hi16 w32,
 +                   0x618C0000 .|. lo16 w32,
 +                   0x7D8903A6, 0x4E800420 ]
- 
+
      ArchPPC64LE ->
          -- The ABI requires r12 to point to the function's entry point.
 diff --git a/rts/Adjustor.c b/rts/Adjustor.c
@@ -93,7 +93,7 @@ index d360cfe..ab7ede7 100644
 --- a/rts/Adjustor.c
 +++ b/rts/Adjustor.c
 @@ -49,7 +49,7 @@ Haskell side.
- 
+
  #if defined(i386_HOST_ARCH)
  extern void adjustorCode(void);
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
@@ -104,16 +104,16 @@ index d360cfe..ab7ede7 100644
 @@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
  extern void obscure_ccall_ret_code(void);
  #endif
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
- 
+
  /* !!! !!! WARNING: !!! !!!
 @@ -318,7 +318,7 @@ typedef struct AdjustorStub {
  } AdjustorStub;
  #endif
- 
+
 -#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  static int totalArgumentSize(char *typeString)
@@ -131,10 +131,10 @@ index d360cfe..ab7ede7 100644
 @@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
          }
      }
- 
+
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-         
+
  #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
  #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
 @@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
@@ -151,9 +151,9 @@ index 2795b83..63cfe91 100644
 --- a/rts/AdjustorAsm.S
 +++ b/rts/AdjustorAsm.S
 @@ -2,7 +2,7 @@
- 
+
  /* ******************************** PowerPC ******************************** */
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
@@ -166,34 +166,31 @@ index 934926e..2ff8662 100644
 @@ -717,7 +717,7 @@ StgRunIsImplementedInAssembler(void)
     Everything is in assembler, so we don't have to deal with GCC...
     -------------------------------------------------------------------------- */
- 
+
 -#if defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
- 
+
  static void GNUC3_ATTRIBUTE(used)
  StgRunIsImplementedInAssembler(void)
 @@ -842,7 +842,7 @@ StgRunIsImplementedInAssembler(void)
- 
+
  #endif
- 
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
  /* -----------------------------------------------------------------------------
     PowerPC 64 little endian architecture
- 
+
 diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
 index 9274a44..3b4fc33 100644
 --- a/rts/StgCRunAsm.S
 +++ b/rts/StgCRunAsm.S
-@@ -1,7 +1,7 @@
- #include "ghcconfig.h"
- #include "rts/Constants.h"
- 
+@@ -5,7 +5,7 @@
+  * then functions StgRun/StgReturn are implemented in file StgCRun.c */
+ #if !defined(USE_MINIINTERPRETER)
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
- # ifdef linux_HOST_OS
+ # if defined(linux_HOST_OS)
  # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
  	.file	"StgCRun.c"
--- 
-2.30.0
-
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 0b1440b2f6d9..c6acfa79e75d 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,8 +1,8 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.8.4
-revision=2
+version=8.10.4
+revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
 hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
@@ -10,11 +10,11 @@ hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
 makedepends="libnuma-devel"
 depends="perl gcc libffi-devel gmp-devel libnuma-devel"
 short_desc="Glorious Haskell Compiler"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d
+checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
 patch_args="-Np1"
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"

From 7509dfbbff9839eb18ba36bdefdd9f9d5f930b98 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 28 Feb 2021 18:34:26 +0100
Subject: [PATCH 02/17] 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 000000000000..63965ca12d44
--- /dev/null
+++ b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
@@ -0,0 +1,43 @@
+--- bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
++++ 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 1dd08f07fb44..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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]\."
-                        #  >= 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 2c15789b1f9d..99ebb54427fe 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 <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=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
 }

From de7ad87dda42adcc123883d038d72bbbfaca3a70 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 12:37:23 +0100
Subject: [PATCH 03/17] ghc-bin: update to 8.10.4

Take over maintainership of orphaned package.
---
 srcpkgs/ghc-bin/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 9101601358b9..eacbca4e74f8 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,13 +1,13 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.8.4
+version=8.10.4
 revision=1
 archs="i686* x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
 short_desc="Glorious Haskell Compiler - precompiled binaries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 nostrip=yes
@@ -15,17 +15,17 @@ noshlibprovides=yes
 conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
-	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb8-linux.tar.xz"
-	checksum=51a36892f1264744195274187298d13ac62bce2da86d4ddf76d8054ab90f2feb
+	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
+	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=779647d3f4e6e39da9e13b2559319ede76b4fff1107e4dc369a09aadeecad971
+	checksum=56e53f46ad53e6640753d608d01228528fca8ccec01b09bba6ad3b6890a18994
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0
+	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
 	;;
 i686-musl)
 	distfiles="https://distfiles.voidlinux.de/ghc-${version}-i386-unknown-linux-musl.tar.xz"

From dd6b36fa17c32b79f6e9a0fcf1618faedf92b23e Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 15:11:29 +0100
Subject: [PATCH 04/17] stack: update to 2.5.1.1

---
 srcpkgs/stack/patches/datakinds.patch | 14 ------
 srcpkgs/stack/patches/ghc-8.8.4.patch | 70 ---------------------------
 srcpkgs/stack/patches/ppc.patch       | 18 +++----
 srcpkgs/stack/template                | 10 ++--
 4 files changed, 14 insertions(+), 98 deletions(-)
 delete mode 100644 srcpkgs/stack/patches/datakinds.patch
 delete mode 100644 srcpkgs/stack/patches/ghc-8.8.4.patch

diff --git a/srcpkgs/stack/patches/datakinds.patch b/srcpkgs/stack/patches/datakinds.patch
deleted file mode 100644
index 1c06480515f7..000000000000
--- a/srcpkgs/stack/patches/datakinds.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Stack/Storage/User.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/User.hs	2020-12-06 20:51:06.632607164 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
---- src/Stack/Storage/Project.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/Project.hs	2020-12-06 21:55:21.349484738 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch
deleted file mode 100644
index 6b55c176e150..000000000000
--- a/srcpkgs/stack/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- masterdir/builddir/stack-2.5.1/stack.cabal	2020-10-17 17:19:10.724179166 +0200
-+++ stack.cabal	2020-10-17 17:18:03.803498792 +0200
-@@ -234,6 +234,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -272,7 +273,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -359,6 +360,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -396,7 +398,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -480,6 +482,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -518,7 +521,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , optparse-generic
-     , pantry >=0.5.1.3
-     , path
-@@ -609,6 +612,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -647,7 +651,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
diff --git a/srcpkgs/stack/patches/ppc.patch b/srcpkgs/stack/patches/ppc.patch
index 1b5bc191b47c..724aaaf3a65c 100644
--- a/srcpkgs/stack/patches/ppc.patch
+++ b/srcpkgs/stack/patches/ppc.patch
@@ -7,7 +7,7 @@
 +import              System.Endian (getSystemEndianness, Endianness (..))
  import              System.Uname (getRelease)
  import              Data.List.Split (splitOn)
-@@ -1264,4 +1265,9 @@ getOSKey platform =
+@@ -1264,6 +1265,11 @@ getOSKey platform =
          Platform X86_64                Cabal.Windows -> return "windows64"
          Platform Arm                   Cabal.Linux   -> return "linux-armv7"
          Platform AArch64               Cabal.Linux   -> return "linux-aarch64"
@@ -21,11 +21,11 @@
  downloadFromInfo
 --- stack.cabal
 +++ stack.cabal
-@@ -235,6 +235,7 @@ library
-       , conduit
-       , conduit-extra
-       , containers
-+      , cpu >=0.1.2
-       , cryptonite
-       , cryptonite-conduit
-       , deepseq
+@@ -244,6 +244,7 @@
+         conduit >=1.3.1.2,
+         conduit-extra >=1.3.4,
+         containers >=0.6.0.1,
++        cpu >=0.1.2,
+         cryptonite >=0.25,
+         cryptonite-conduit >=0.2.2,
+         deepseq >=1.4.4.0,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 257aba10e50d..66da6618e77d 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.5.1
+version=2.5.1.1
 revision=1
-_stackage="lts-16.13"
+_stackage="lts-17.5"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -10,10 +10,10 @@ short_desc="Cross-platform program for developing Haskell projects"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://haskellstack.org"
-distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
+distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076
- b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58"
+checksum="ccf3ef6dff0412fe8409ef2cfbdf48cad65150f64aec7696725c75881827b539
+ d03bee7e51bbdec5053573f94f644a6baeb140cdd95dbe47261e03c04306b252"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 65cb9e9b17e1211436b02dbdf03e42d858d5af4b Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 16 Mar 2021 17:41:58 +0100
Subject: [PATCH 05/17] xmobar: bump for ghc 8.10.4

---
 srcpkgs/xmobar/files/stack.yaml | 2 +-
 srcpkgs/xmobar/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 7bc4bf189d23..52fd0e3e49fe 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 81ae92fd2940..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.37
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From d5b61e85614a9f8b0a209a7899c1fb71e191886d Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:03:10 +0100
Subject: [PATCH 06/17] hlint: update to 3.2.7

---
 srcpkgs/hlint/files/stack.yaml   |  7 -------
 srcpkgs/hlint/patches/data.patch | 10 ++++------
 srcpkgs/hlint/template           | 10 +++++-----
 3 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/hlint/files/stack.yaml

diff --git a/srcpkgs/hlint/files/stack.yaml b/srcpkgs/hlint/files/stack.yaml
deleted file mode 100644
index 12aead6562c5..000000000000
--- a/srcpkgs/hlint/files/stack.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-resolver: lts-16.13
-packages: [.]
-extra-deps:
-  - ghc-lib-parser-8.8.4.20200716
-  - ghc-lib-parser-ex-8.8.5.8
-ghc-options:
-    "$locals": -Wunused-imports -Worphans -Wunused-top-binds -Wunused-local-binds -Wincomplete-patterns
diff --git a/srcpkgs/hlint/patches/data.patch b/srcpkgs/hlint/patches/data.patch
index bdfac204f477..c73b376e5df7 100644
--- a/srcpkgs/hlint/patches/data.patch
+++ b/srcpkgs/hlint/patches/data.patch
@@ -1,13 +1,11 @@
-diff --git src/CmdLine.hs src/CmdLine.hs
-index 8c3d530..ccf7aac 100644
 --- src/CmdLine.hs
 +++ src/CmdLine.hs
-@@ -52,7 +52,7 @@ automatic cmd = case cmd of
+@@ -58,7 +58,7 @@
                  b <- doesDirectoryExist x
-                 if b then return cmd{cmdDataDir=x} else do
+                 if b then pure cmd{cmdDataDir=x} else do
                      exe <- getExecutablePath
--                    return cmd{cmdDataDir = takeDirectory exe </> "data"}
-+                    return cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
+-                    pure cmd{cmdDataDir = takeDirectory exe </> "data"}
++                    pure cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
          git cmd
              | cmdGit cmd = do
                  mgit <- findExecutable "git"
diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index 16fbb03ce2b9..fb30f947a452 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,16 +1,16 @@
 # Template file for 'hlint'
 pkgname=hlint
-version=2.2.11
-revision=2
+version=3.2.7
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
-homepage="https://github.com/ndmitchell/${pkgname}"
+homepage="https://github.com/ndmitchell/hlint"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=207539d3627efd3caed9e6fd3b1aeb8f1eb64553f1f9f166090adbf2fb71e172
+checksum=fcdeefcc79a52206add44b409abcab48c5fe2adff9d5aff077acbc43c702b54e
 nocross=yes # Can't yet cross compile Haskell
 nopie_files="/usr/bin/hlint"
 

From 8e7766bf76aceeb9527e202416d580e414164ba5 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:43:37 +0100
Subject: [PATCH 07/17] kmonad: bump for ghc 8.10.4

---
 srcpkgs/kmonad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index 13e8845581ae..8c34a920ba7d 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,9 +1,9 @@
 # Template file for 'kmonad'
 pkgname=kmonad
 version=0.4.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage=lts-16.13
+stackage=lts-17.5
 short_desc="Keyboard remapping utility providing qmk-like functionality"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"

From 7f92080d64c88777c325921fc9c19cc7634e317b Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 16:21:35 +0100
Subject: [PATCH 08/17] hoogle: bump for ghc 8.10.4

---
 srcpkgs/hoogle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 4305ac4ae6e8..eafda8747cdf 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,9 +1,9 @@
 # Template file for 'hoogle'
 pkgname=hoogle
 version=5.0.18.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="zlib-devel"
 short_desc="Haskell API search engine"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From 0a911c187996a2b209db26d043d0c317143134b8 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 11:18:37 +0100
Subject: [PATCH 09/17] cgrep: bump for ghc 8.10.4

---
 srcpkgs/cgrep/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index 7b4047614a71..15eda3bafd0e 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,12 +1,12 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.6.33
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.18"
+stackage="lts-17.5"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="https://awgn.github.io/cgrep/"
 distfiles="https://github.com/awgn/${pkgname}/archive/v${version}.tar.gz"

From 69100f185f38fcd257a93b292b76399ba326611f Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 15:03:05 +0100
Subject: [PATCH 10/17] debug-me: bump for ghc 8.10.4

---
 srcpkgs/debug-me/files/stack.yaml                     |  2 +-
 .../patches/{ghc8.8.3.patch => ghc8.10.4.patch}       | 11 +++++++++++
 srcpkgs/debug-me/template                             |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 rename srcpkgs/debug-me/patches/{ghc8.8.3.patch => ghc8.10.4.patch} (70%)

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index 9c88cea9ab3c..ecff9d9d18f2 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - '.'
-resolver: lts-16.13
+resolver: lts-17.5
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/patches/ghc8.8.3.patch b/srcpkgs/debug-me/patches/ghc8.10.4.patch
similarity index 70%
rename from srcpkgs/debug-me/patches/ghc8.8.3.patch
rename to srcpkgs/debug-me/patches/ghc8.10.4.patch
index f1779331c5a9..9cc19db63be3 100644
--- a/srcpkgs/debug-me/patches/ghc8.8.3.patch
+++ b/srcpkgs/debug-me/patches/ghc8.10.4.patch
@@ -20,3 +20,14 @@
  		defaultSettings
 
  checkEnv :: ServerOpts -> IO ServerOpts
+--- debug-me.cabal
++++ debug-me.cabal
+@@ -64,7 +64,7 @@
+     , stm-chans (>= 3.0)
+     , posix-pty (>= 0.2.1)
+     , terminal-size (>= 0.3)
+-    , aeson (>= 0.11 && < 1.5)
++    , aeson (>= 0.11 && < 1.6)
+     , sandi (>= 0.4)
+     , text (>= 1.2.2)
+     , optparse-applicative (>= 0.12)
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 3df514e0be48..797c52f1f479 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -1,7 +1,7 @@
 # Template file for 'debug-me'
 pkgname=debug-me
 version=1.20200820
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"

From d87ea2b4bf4478332ae29c702efc72a837dca7a6 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 20 Mar 2021 11:26:04 +0100
Subject: [PATCH 11/17] darcs: bump for ghc 8.10.4

---
 srcpkgs/darcs/files/stack.yaml | 2 +-
 srcpkgs/darcs/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index 3766e74cccb0..cfc1efb94d53 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index bdbe3f14cc6f..6aa45fa21535 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.3
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From 1b65953db93709eae6698f31e9469780c17b51f8 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 08:56:29 +0100
Subject: [PATCH 12/17] hledger: bump for ghc 8.10.4

---
 srcpkgs/hledger/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template
index b34e8ccd4652..1727a49252b7 100644
--- a/srcpkgs/hledger/template
+++ b/srcpkgs/hledger/template
@@ -1,7 +1,7 @@
 # Template file for 'hledger'
 pkgname=hledger
 version=1.21
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel ncurses-devel"
 short_desc="Simple, precise, plain text accounting"

From d0518b187db4f9a371822809ff2a4c221f9807ba Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 10:57:42 +0100
Subject: [PATCH 13/17] pandoc: update to 2.11.4

Citeproc support is build in now.  The change of maintainership was
suggested by Leah.
---
 srcpkgs/pandoc/files/stack.yaml | 31 -------------------------------
 srcpkgs/pandoc/template         | 17 ++++++-----------
 2 files changed, 6 insertions(+), 42 deletions(-)
 delete mode 100644 srcpkgs/pandoc/files/stack.yaml

diff --git a/srcpkgs/pandoc/files/stack.yaml b/srcpkgs/pandoc/files/stack.yaml
deleted file mode 100644
index 47bf3bb1b5e4..000000000000
--- a/srcpkgs/pandoc/files/stack.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-resolver: lts-16.20
-
-packages:
-  - ./pandoc-2.10.1
-  - ./pandoc-citeproc-0.17.0.1
-  - ./pandoc-sidenote-0.20.0
-
-flags:
-  pandoc:
-    trypandoc: false
-    embed_data_files: true
-    static: false
-  pandoc-citeproc:
-    bibutils: true
-    embed_data_files: true
-    unicode_collation: false
-    test_citeproc: false
-    debug: false
-
-extra-deps:
-  - pandoc-types-1.21
-  - haddock-library-1.9.0
-  - regex-pcre-builtin-0.95.1.2.8.43
-  - hslua-1.1.2
-  - jira-wiki-markup-1.3.2
-  - commonmark-0.1.0.1
-  - commonmark-extensions-0.2.0.0
-  - commonmark-pandoc-0.2.0.0
-
-ghc-options:
-   "$locals": -fhide-source-paths -Wno-missing-home-modules
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 7d7fbdc4b72b..db7d63a03113 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,34 +1,31 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.10.1
-revision=3
-_citeproc_version=0.17.0.1
+version=2.11.4
+revision=1
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
+stackage="lts-17.5"
 make_build_args="
- --flag pandoc:embed_data_files --flag pandoc-citeproc:embed_data_files
+ --flag pandoc:embed_data_files --flag pandoc:embed_data_files
  --flag=hslua:system-lua --flag=hslua:pkg-config"
 hostmakedepends="pkg-config unzip wget"
 makedepends="zlib-devel lua53-devel tar"
 short_desc="Universal converter between markup formats (with citeproc support)"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, MIT"
 homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
- http://hackage.haskell.org/package/${pkgname}-citeproc-${_citeproc_version}/${pkgname}-citeproc-${_citeproc_version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="938a4c9b0a7ed3de886c73af4052913b0ac9e4aa12b435bd2afd09670bd3229a
- f3e5ce3d1d21c27178f2fc69580750e3ce97fc5f962f2d01f7b6aa2e090c2342
+checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
 nopie_files="
  /usr/bin/pandoc
- /usr/bin/pandoc-citeproc
  /usr/bin/pandoc-sidenote
 "
 
@@ -38,8 +35,6 @@ post_extract() {
 }
 post_install() {
 	vman pandoc-${version}/man/pandoc.1
-	vman pandoc-citeproc-${_citeproc_version}/man/man1/pandoc-citeproc.1
 	vlicense pandoc-${version}/COPYRIGHT LICENSE.pandoc
-	vlicense pandoc-citeproc-${_citeproc_version}/LICENSE LICENSE.pandoc-citeproc
 	vlicense pandoc-sidenote-${_sidenote_version}/LICENSE LICENSE.pandoc-sidenote
 }

From fd6913e53a0b7cb5a2c6cdc19d829e98b5a688d0 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 11:16:14 +0100
Subject: [PATCH 14/17] shellcheck: bump for ghc 8.10.4

---
 srcpkgs/shellcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 83bcd922ab70..4678289eaa14 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,9 +1,9 @@
 # Template file for 'shellcheck'
 pkgname=shellcheck
 version=0.7.1
-revision=3
+revision=4
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 hostmakedepends="pandoc"
 short_desc="Static analysis tool for shell scripts"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

From 97570d116a8cf2fab71f6f2c182be055a34c9e56 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 16:07:47 +0100
Subject: [PATCH 15/17] git-mediate: update to 1.0.8.1

---
 srcpkgs/git-mediate/patches/ghc8.8.3.patch | 19 -------------------
 srcpkgs/git-mediate/template               |  8 ++++----
 2 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/git-mediate/patches/ghc8.8.3.patch

diff --git a/srcpkgs/git-mediate/patches/ghc8.8.3.patch b/srcpkgs/git-mediate/patches/ghc8.8.3.patch
deleted file mode 100644
index 7928b61ef3a4..000000000000
--- a/srcpkgs/git-mediate/patches/ghc8.8.3.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- git-mediate.cabal	2001-09-09 03:46:40.000000000 +0200
-+++ git-mediate.cabal	2020-03-30 15:32:48.959537620 +0200
-@@ -72,7 +72,7 @@
-   ghc-options:         -O2 -Wall
-   -- other-extensions:
-   build-depends:       base >=4.8 && <5
--                     , base-compat >= 0.8.2 && < 0.11
-+                     , base-compat >= 0.8.2 && < 0.12
-                      , mtl >=2.1
-                      , directory >=1.2
-                      , process >=1.2
-@@ -80,6 +80,6 @@
-                      , unix-compat >=0.4.2.0
-                      , Diff >=0.4
-                      , ansi-terminal >=0.6.2
--                     , optparse-applicative >=0.11 && <0.15
-+                     , optparse-applicative >=0.11 && <0.16
-   hs-source-dirs:      src
-   default-language:    Haskell2010
diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template
index aa3979d3435a..971a6236224f 100644
--- a/srcpkgs/git-mediate/template
+++ b/srcpkgs/git-mediate/template
@@ -1,15 +1,15 @@
 # Template file for 'git-mediate'
 pkgname=git-mediate
-version=1.0.8
-revision=4
+version=1.0.8.1
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 depends="git"
 short_desc="Tool to help resolving git conflicts"
 maintainer="Peter Wang <novalazy@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/Peaker/git-mediate"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=81220f7e20a3913bc147b69681666ad22e60e5b759a1becad78ee28dcad8013d
+checksum=ee44841d37ded70cbcd8edd1e233a344d0118295e0bd2f0c6983ed00f619c467
 nocross=yes
 nopie_files="/usr/bin/git-mediate"

From 6e1c52782d06ed147999bb5f26c20049c9d32d32 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 16:11:25 +0100
Subject: [PATCH 16/17] git-annex: update to 8.20210310

---
 srcpkgs/git-annex/files/stack.yaml | 3 ++-
 srcpkgs/git-annex/template         | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
index 9a2294440b5d..671443617003 100644
--- a/srcpkgs/git-annex/files/stack.yaml
+++ b/srcpkgs/git-annex/files/stack.yaml
@@ -27,4 +27,5 @@ extra-deps:
  - network-3.1.0.1
 explicit-setup-deps:
   git-annex: true
-resolver: lts-16.13
+resolver: lts-17.5
+allow-newer: true
diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template
index 3d4df760667b..babba714fff1 100644
--- a/srcpkgs/git-annex/template
+++ b/srcpkgs/git-annex/template
@@ -1,6 +1,6 @@
 # Template file for 'git-annex'
 pkgname=git-annex
-version=8.20210223
+version=8.20210310
 revision=1
 build_style=haskell-stack
 makedepends="curl file-devel gnupg2 gnutls-devel gsasl-devel libxml2-devel
@@ -12,7 +12,7 @@ maintainer="Evan Deaubl <evan@deaubl.name>"
 license="AGPL-3.0-or-later, MIT, BSD-2-Clause, GPL-3.0-or-later, custom:Expat, custom:MIT-twitter, GPL-2.0-only, custom:icon-license"
 homepage="http://git-annex.branchable.com"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=62a09f98c96dd2a66605aaf6b7f00573a33997f3ef568ffb0d2dc17609719d1f
+checksum=dd0ae1cac40c97490e0699c68a341b5bff6fcb38e733df83b67c442a7eca97a8
 nopie_files="/usr/bin/git-annex"
 nocross=yes
 

From 7c04deb58c97f6147f2aba2b32a4951154d2f58f Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 30 Mar 2021 12:11:45 +0200
Subject: [PATCH 17/17] haskell-language-server: bump for ghc 8.10.4

---
 srcpkgs/haskell-language-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index 438c760f0a1f..7afa89c452f7 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,12 +1,12 @@
 # Template file for 'haskell-language-server'
 pkgname=haskell-language-server
 version=1.0.0
-revision=1
+revision=2
 # GHC only panics on i686
 # https://github.com/void-linux/void-packages/pull/27961/checks?check_run_id=2181519625#step:8:5936
 archs="~i686"
 build_style="haskell-stack"
-make_build_args="--stack-yaml stack-8.8.4.yaml"
+make_build_args="--stack-yaml stack-8.10.4.yaml"
 makedepends="ncurses-devel ncurses-libtinfo-devel icu-devel zlib-devel"
 short_desc="Integration of ghcide and haskell-ide-engine"
 maintainer="Wayne Van Son <waynevanson@gmail.com>"

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (15 preceding siblings ...)
  2021-04-01 12:20 ` [PR PATCH] [Updated] " slotThe
@ 2021-04-13 11:04 ` slotThe
  2021-04-21  8:04 ` slotThe
                   ` (21 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-04-13 11:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3059 bytes --]

There is an updated pull request by slotThe against master on the void-packages repository

https://github.com/slotThe/void-packages ghc-8.10.4
https://github.com/void-linux/void-packages/pull/29506

[WIP] GHC 8.10.4
It's that time of the year again!

- [X] ghc; I took over as maintainer here, @leahneukirchen said that was okay on IRC (cc'ing here to make sure)
- [ ] ghc-bin; took over as mainainer of orphaned package.
    - [X] x86_64-musl; [Link here](https://www34.zippyshare.com/d/yvtjb7uJ/38780/ghc-8.10.4-x86_64-void-linux-musl.tar.xz)
    - [ ] i686-musl
    cc @q66 for these
    - [ ] ppc64le
    - [ ] ppc64le-musl
- [X] cabal-install
- [X] stack
 
Rebuild literally every single haskell package we have and see if anything's broken:

- [x] git-mediate
- [x] kmonad
- [x] cgrep; took over as mainainer of orphaned package.
- [x] debug-me
- [x] hlint
- [x] hoogle
- [x] darcs
- [x] shellcheck
- [x] git-annex
- [x] hledger
- [x] pandoc
- [x] xmobar
- [x] HLS; this is #27961 once that's merged

For the following two I'd like to fix #6414 while we're at it.  Because stack can't install libraries globally, this would involve either removing these packages entirely and advising users to install them in their own [stack or cabal projects](https://github.com/xmonad/xmonad-testing), or finding a way to build them with cabal and updating ghc's data base accordingly.  This would probably use `v1` commands, as we don't want to nuke our users db if we update xmonad. Cc @xaltsc as the current maintainer and @chilledfrogs as someone who might want to tackle this (if I read the IRC discussion correctly). 

- [ ] xmonad
- [ ] xmonad-contrib

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/29506.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghc-8.10.4-29506.patch --]
[-- Type: text/x-diff, Size: 37587 bytes --]

From bdcfe1099df07bbb2d92c321ffa067f2f264903c Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 31 Jan 2021 14:31:24 +0100
Subject: [PATCH 01/17] ghc: update to 8.10.4

The change of maintainership was okay-ed by Leah.
---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch | 41 +++++++++++-------------
 srcpkgs/ghc/template                     |  8 ++---
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index ac353ed417e5..c9bd2583abe0 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -85,7 +85,7 @@ index ec3c18a..0359be7 100644
 +        in Right [ 0x3D800000 .|. hi16 w32,
 +                   0x618C0000 .|. lo16 w32,
 +                   0x7D8903A6, 0x4E800420 ]
- 
+
      ArchPPC64LE ->
          -- The ABI requires r12 to point to the function's entry point.
 diff --git a/rts/Adjustor.c b/rts/Adjustor.c
@@ -93,7 +93,7 @@ index d360cfe..ab7ede7 100644
 --- a/rts/Adjustor.c
 +++ b/rts/Adjustor.c
 @@ -49,7 +49,7 @@ Haskell side.
- 
+
  #if defined(i386_HOST_ARCH)
  extern void adjustorCode(void);
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
@@ -104,16 +104,16 @@ index d360cfe..ab7ede7 100644
 @@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
  extern void obscure_ccall_ret_code(void);
  #endif
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
- 
+
  /* !!! !!! WARNING: !!! !!!
 @@ -318,7 +318,7 @@ typedef struct AdjustorStub {
  } AdjustorStub;
  #endif
- 
+
 -#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  static int totalArgumentSize(char *typeString)
@@ -131,10 +131,10 @@ index d360cfe..ab7ede7 100644
 @@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
          }
      }
- 
+
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-         
+
  #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
  #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
 @@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
@@ -151,9 +151,9 @@ index 2795b83..63cfe91 100644
 --- a/rts/AdjustorAsm.S
 +++ b/rts/AdjustorAsm.S
 @@ -2,7 +2,7 @@
- 
+
  /* ******************************** PowerPC ******************************** */
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
@@ -166,34 +166,31 @@ index 934926e..2ff8662 100644
 @@ -717,7 +717,7 @@ StgRunIsImplementedInAssembler(void)
     Everything is in assembler, so we don't have to deal with GCC...
     -------------------------------------------------------------------------- */
- 
+
 -#if defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
- 
+
  static void GNUC3_ATTRIBUTE(used)
  StgRunIsImplementedInAssembler(void)
 @@ -842,7 +842,7 @@ StgRunIsImplementedInAssembler(void)
- 
+
  #endif
- 
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
  /* -----------------------------------------------------------------------------
     PowerPC 64 little endian architecture
- 
+
 diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
 index 9274a44..3b4fc33 100644
 --- a/rts/StgCRunAsm.S
 +++ b/rts/StgCRunAsm.S
-@@ -1,7 +1,7 @@
- #include "ghcconfig.h"
- #include "rts/Constants.h"
- 
+@@ -5,7 +5,7 @@
+  * then functions StgRun/StgReturn are implemented in file StgCRun.c */
+ #if !defined(USE_MINIINTERPRETER)
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
- # ifdef linux_HOST_OS
+ # if defined(linux_HOST_OS)
  # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
  	.file	"StgCRun.c"
--- 
-2.30.0
-
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 0b1440b2f6d9..c6acfa79e75d 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,8 +1,8 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.8.4
-revision=2
+version=8.10.4
+revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
 hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
@@ -10,11 +10,11 @@ hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
 makedepends="libnuma-devel"
 depends="perl gcc libffi-devel gmp-devel libnuma-devel"
 short_desc="Glorious Haskell Compiler"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d
+checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
 patch_args="-Np1"
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"

From bc2b597a72b0864682d3206d87fe916d98cd86ac Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 28 Feb 2021 18:34:26 +0100
Subject: [PATCH 02/17] 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 000000000000..63965ca12d44
--- /dev/null
+++ b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
@@ -0,0 +1,43 @@
+--- bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
++++ 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 1dd08f07fb44..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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]\."
-                        #  >= 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 2c15789b1f9d..99ebb54427fe 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 <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=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
 }

From e26e87471d81e0e15f5f3a0afa408df03584cf91 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 12:37:23 +0100
Subject: [PATCH 03/17] ghc-bin: update to 8.10.4

Take over maintainership of orphaned package.
---
 srcpkgs/ghc-bin/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 9101601358b9..eacbca4e74f8 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,13 +1,13 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.8.4
+version=8.10.4
 revision=1
 archs="i686* x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
 short_desc="Glorious Haskell Compiler - precompiled binaries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 nostrip=yes
@@ -15,17 +15,17 @@ noshlibprovides=yes
 conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
-	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb8-linux.tar.xz"
-	checksum=51a36892f1264744195274187298d13ac62bce2da86d4ddf76d8054ab90f2feb
+	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
+	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=779647d3f4e6e39da9e13b2559319ede76b4fff1107e4dc369a09aadeecad971
+	checksum=56e53f46ad53e6640753d608d01228528fca8ccec01b09bba6ad3b6890a18994
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0
+	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
 	;;
 i686-musl)
 	distfiles="https://distfiles.voidlinux.de/ghc-${version}-i386-unknown-linux-musl.tar.xz"

From caf3a033c3e842bf4dd0de661963518861e04243 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 15:11:29 +0100
Subject: [PATCH 04/17] stack: update to 2.5.1.1

---
 srcpkgs/stack/patches/datakinds.patch | 14 ------
 srcpkgs/stack/patches/ghc-8.8.4.patch | 70 ---------------------------
 srcpkgs/stack/patches/ppc.patch       | 18 +++----
 srcpkgs/stack/template                | 10 ++--
 4 files changed, 14 insertions(+), 98 deletions(-)
 delete mode 100644 srcpkgs/stack/patches/datakinds.patch
 delete mode 100644 srcpkgs/stack/patches/ghc-8.8.4.patch

diff --git a/srcpkgs/stack/patches/datakinds.patch b/srcpkgs/stack/patches/datakinds.patch
deleted file mode 100644
index 1c06480515f7..000000000000
--- a/srcpkgs/stack/patches/datakinds.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Stack/Storage/User.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/User.hs	2020-12-06 20:51:06.632607164 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
---- src/Stack/Storage/Project.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/Project.hs	2020-12-06 21:55:21.349484738 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch
deleted file mode 100644
index 6b55c176e150..000000000000
--- a/srcpkgs/stack/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- masterdir/builddir/stack-2.5.1/stack.cabal	2020-10-17 17:19:10.724179166 +0200
-+++ stack.cabal	2020-10-17 17:18:03.803498792 +0200
-@@ -234,6 +234,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -272,7 +273,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -359,6 +360,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -396,7 +398,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -480,6 +482,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -518,7 +521,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , optparse-generic
-     , pantry >=0.5.1.3
-     , path
-@@ -609,6 +612,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -647,7 +651,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
diff --git a/srcpkgs/stack/patches/ppc.patch b/srcpkgs/stack/patches/ppc.patch
index 1b5bc191b47c..724aaaf3a65c 100644
--- a/srcpkgs/stack/patches/ppc.patch
+++ b/srcpkgs/stack/patches/ppc.patch
@@ -7,7 +7,7 @@
 +import              System.Endian (getSystemEndianness, Endianness (..))
  import              System.Uname (getRelease)
  import              Data.List.Split (splitOn)
-@@ -1264,4 +1265,9 @@ getOSKey platform =
+@@ -1264,6 +1265,11 @@ getOSKey platform =
          Platform X86_64                Cabal.Windows -> return "windows64"
          Platform Arm                   Cabal.Linux   -> return "linux-armv7"
          Platform AArch64               Cabal.Linux   -> return "linux-aarch64"
@@ -21,11 +21,11 @@
  downloadFromInfo
 --- stack.cabal
 +++ stack.cabal
-@@ -235,6 +235,7 @@ library
-       , conduit
-       , conduit-extra
-       , containers
-+      , cpu >=0.1.2
-       , cryptonite
-       , cryptonite-conduit
-       , deepseq
+@@ -244,6 +244,7 @@
+         conduit >=1.3.1.2,
+         conduit-extra >=1.3.4,
+         containers >=0.6.0.1,
++        cpu >=0.1.2,
+         cryptonite >=0.25,
+         cryptonite-conduit >=0.2.2,
+         deepseq >=1.4.4.0,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 257aba10e50d..66da6618e77d 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.5.1
+version=2.5.1.1
 revision=1
-_stackage="lts-16.13"
+_stackage="lts-17.5"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -10,10 +10,10 @@ short_desc="Cross-platform program for developing Haskell projects"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://haskellstack.org"
-distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
+distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076
- b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58"
+checksum="ccf3ef6dff0412fe8409ef2cfbdf48cad65150f64aec7696725c75881827b539
+ d03bee7e51bbdec5053573f94f644a6baeb140cdd95dbe47261e03c04306b252"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From eb82b084af7790d2d63baf289c07197556a6c3bd Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 16 Mar 2021 17:41:58 +0100
Subject: [PATCH 05/17] xmobar: bump for ghc 8.10.4

---
 srcpkgs/xmobar/files/stack.yaml | 2 +-
 srcpkgs/xmobar/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 7bc4bf189d23..52fd0e3e49fe 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 81ae92fd2940..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.37
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From a90e365dff9de65f9d73619afb1ef1940b834d98 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:03:10 +0100
Subject: [PATCH 06/17] hlint: update to 3.2.7

---
 srcpkgs/hlint/files/stack.yaml   |  7 -------
 srcpkgs/hlint/patches/data.patch | 10 ++++------
 srcpkgs/hlint/template           | 10 +++++-----
 3 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/hlint/files/stack.yaml

diff --git a/srcpkgs/hlint/files/stack.yaml b/srcpkgs/hlint/files/stack.yaml
deleted file mode 100644
index 12aead6562c5..000000000000
--- a/srcpkgs/hlint/files/stack.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-resolver: lts-16.13
-packages: [.]
-extra-deps:
-  - ghc-lib-parser-8.8.4.20200716
-  - ghc-lib-parser-ex-8.8.5.8
-ghc-options:
-    "$locals": -Wunused-imports -Worphans -Wunused-top-binds -Wunused-local-binds -Wincomplete-patterns
diff --git a/srcpkgs/hlint/patches/data.patch b/srcpkgs/hlint/patches/data.patch
index bdfac204f477..c73b376e5df7 100644
--- a/srcpkgs/hlint/patches/data.patch
+++ b/srcpkgs/hlint/patches/data.patch
@@ -1,13 +1,11 @@
-diff --git src/CmdLine.hs src/CmdLine.hs
-index 8c3d530..ccf7aac 100644
 --- src/CmdLine.hs
 +++ src/CmdLine.hs
-@@ -52,7 +52,7 @@ automatic cmd = case cmd of
+@@ -58,7 +58,7 @@
                  b <- doesDirectoryExist x
-                 if b then return cmd{cmdDataDir=x} else do
+                 if b then pure cmd{cmdDataDir=x} else do
                      exe <- getExecutablePath
--                    return cmd{cmdDataDir = takeDirectory exe </> "data"}
-+                    return cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
+-                    pure cmd{cmdDataDir = takeDirectory exe </> "data"}
++                    pure cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
          git cmd
              | cmdGit cmd = do
                  mgit <- findExecutable "git"
diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index 16fbb03ce2b9..fb30f947a452 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,16 +1,16 @@
 # Template file for 'hlint'
 pkgname=hlint
-version=2.2.11
-revision=2
+version=3.2.7
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
-homepage="https://github.com/ndmitchell/${pkgname}"
+homepage="https://github.com/ndmitchell/hlint"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=207539d3627efd3caed9e6fd3b1aeb8f1eb64553f1f9f166090adbf2fb71e172
+checksum=fcdeefcc79a52206add44b409abcab48c5fe2adff9d5aff077acbc43c702b54e
 nocross=yes # Can't yet cross compile Haskell
 nopie_files="/usr/bin/hlint"
 

From 0887ae709f699e5465f20553fa9ca4c1f0c40be6 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:43:37 +0100
Subject: [PATCH 07/17] kmonad: bump for ghc 8.10.4

---
 srcpkgs/kmonad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index 13e8845581ae..8c34a920ba7d 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,9 +1,9 @@
 # Template file for 'kmonad'
 pkgname=kmonad
 version=0.4.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage=lts-16.13
+stackage=lts-17.5
 short_desc="Keyboard remapping utility providing qmk-like functionality"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"

From b08b814b8cc5cf4eb0f6843225b5a0a3637459fc Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 16:21:35 +0100
Subject: [PATCH 08/17] hoogle: bump for ghc 8.10.4

---
 srcpkgs/hoogle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 4305ac4ae6e8..eafda8747cdf 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,9 +1,9 @@
 # Template file for 'hoogle'
 pkgname=hoogle
 version=5.0.18.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="zlib-devel"
 short_desc="Haskell API search engine"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From 0b0e17f8c0390ff84f809f0624b35816846e9dd1 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 11:18:37 +0100
Subject: [PATCH 09/17] cgrep: bump for ghc 8.10.4

---
 srcpkgs/cgrep/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index 7b4047614a71..15eda3bafd0e 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,12 +1,12 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.6.33
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.18"
+stackage="lts-17.5"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="https://awgn.github.io/cgrep/"
 distfiles="https://github.com/awgn/${pkgname}/archive/v${version}.tar.gz"

From 46dd60040d972a67b5c6b9a19e0b17c2a0bacea7 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 15:03:05 +0100
Subject: [PATCH 10/17] debug-me: bump for ghc 8.10.4

---
 srcpkgs/debug-me/files/stack.yaml                     |  2 +-
 .../patches/{ghc8.8.3.patch => ghc8.10.4.patch}       | 11 +++++++++++
 srcpkgs/debug-me/template                             |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 rename srcpkgs/debug-me/patches/{ghc8.8.3.patch => ghc8.10.4.patch} (70%)

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index 9c88cea9ab3c..ecff9d9d18f2 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - '.'
-resolver: lts-16.13
+resolver: lts-17.5
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/patches/ghc8.8.3.patch b/srcpkgs/debug-me/patches/ghc8.10.4.patch
similarity index 70%
rename from srcpkgs/debug-me/patches/ghc8.8.3.patch
rename to srcpkgs/debug-me/patches/ghc8.10.4.patch
index f1779331c5a9..9cc19db63be3 100644
--- a/srcpkgs/debug-me/patches/ghc8.8.3.patch
+++ b/srcpkgs/debug-me/patches/ghc8.10.4.patch
@@ -20,3 +20,14 @@
  		defaultSettings
 
  checkEnv :: ServerOpts -> IO ServerOpts
+--- debug-me.cabal
++++ debug-me.cabal
+@@ -64,7 +64,7 @@
+     , stm-chans (>= 3.0)
+     , posix-pty (>= 0.2.1)
+     , terminal-size (>= 0.3)
+-    , aeson (>= 0.11 && < 1.5)
++    , aeson (>= 0.11 && < 1.6)
+     , sandi (>= 0.4)
+     , text (>= 1.2.2)
+     , optparse-applicative (>= 0.12)
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 3df514e0be48..797c52f1f479 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -1,7 +1,7 @@
 # Template file for 'debug-me'
 pkgname=debug-me
 version=1.20200820
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"

From 15df64f528d39372c06401b6cd61309a608009de Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 20 Mar 2021 11:26:04 +0100
Subject: [PATCH 11/17] darcs: bump for ghc 8.10.4

---
 srcpkgs/darcs/files/stack.yaml | 2 +-
 srcpkgs/darcs/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index 3766e74cccb0..cfc1efb94d53 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index bdbe3f14cc6f..6aa45fa21535 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.3
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From 667a2c372032d05322e16020242f50522683b50f Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 08:56:29 +0100
Subject: [PATCH 12/17] hledger: bump for ghc 8.10.4

---
 srcpkgs/hledger/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template
index b34e8ccd4652..1727a49252b7 100644
--- a/srcpkgs/hledger/template
+++ b/srcpkgs/hledger/template
@@ -1,7 +1,7 @@
 # Template file for 'hledger'
 pkgname=hledger
 version=1.21
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel ncurses-devel"
 short_desc="Simple, precise, plain text accounting"

From c2dff48cec8ef45b105a3b56b7d5b979e5b5ded1 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 10:57:42 +0100
Subject: [PATCH 13/17] pandoc: bump for ghc 8.10.4

Citeproc support is build in now.  The change of maintainership was
suggested by Leah.
---
 srcpkgs/pandoc/files/stack.yaml | 23 -----------------------
 srcpkgs/pandoc/template         |  5 +++--
 2 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/pandoc/files/stack.yaml

diff --git a/srcpkgs/pandoc/files/stack.yaml b/srcpkgs/pandoc/files/stack.yaml
deleted file mode 100644
index 82a5fcaded3f..000000000000
--- a/srcpkgs/pandoc/files/stack.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-resolver: lts-17.9
-
-packages:
-  - ./pandoc-2.11.4
-  - ./pandoc-sidenote-0.20.0
-
-flags:
-  pandoc:
-    trypandoc: false
-    embed_data_files: true
-
-extra-deps:
-  - pandoc-types-1.22
-  - haddock-library-1.9.0
-  - regex-pcre-builtin-0.95.2.3.8.43
-  - hslua-1.2.0
-  - jira-wiki-markup-1.3.4
-  - commonmark-0.1.1.4
-  - commonmark-extensions-0.2.0.4
-  - commonmark-pandoc-0.2.0.1
-
-ghc-options:
-   "$locals": -fhide-source-paths -Wno-missing-home-modules
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index ad233dd0aaf3..8f2a9952d847 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,18 +2,19 @@
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
 version=2.11.4
-revision=1
+revision=2
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
+stackage="lts-17.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
 hostmakedepends="pkg-config unzip wget"
 makedepends="zlib-devel lua53-devel tar"
 short_desc="Universal converter between markup formats"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, MIT"
 homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz

From 55e30cca80e581fdd66ea6845c3b3f3b26a4ab73 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 11:16:14 +0100
Subject: [PATCH 14/17] shellcheck: bump for ghc 8.10.4

---
 srcpkgs/shellcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 83bcd922ab70..4678289eaa14 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,9 +1,9 @@
 # Template file for 'shellcheck'
 pkgname=shellcheck
 version=0.7.1
-revision=3
+revision=4
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 hostmakedepends="pandoc"
 short_desc="Static analysis tool for shell scripts"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

From 5796bb39a5f34ce9ac10ac84e51c576d3de5df0d Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 16:07:47 +0100
Subject: [PATCH 15/17] git-mediate: update to 1.0.8.1

---
 srcpkgs/git-mediate/patches/ghc8.8.3.patch | 19 -------------------
 srcpkgs/git-mediate/template               |  8 ++++----
 2 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/git-mediate/patches/ghc8.8.3.patch

diff --git a/srcpkgs/git-mediate/patches/ghc8.8.3.patch b/srcpkgs/git-mediate/patches/ghc8.8.3.patch
deleted file mode 100644
index 7928b61ef3a4..000000000000
--- a/srcpkgs/git-mediate/patches/ghc8.8.3.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- git-mediate.cabal	2001-09-09 03:46:40.000000000 +0200
-+++ git-mediate.cabal	2020-03-30 15:32:48.959537620 +0200
-@@ -72,7 +72,7 @@
-   ghc-options:         -O2 -Wall
-   -- other-extensions:
-   build-depends:       base >=4.8 && <5
--                     , base-compat >= 0.8.2 && < 0.11
-+                     , base-compat >= 0.8.2 && < 0.12
-                      , mtl >=2.1
-                      , directory >=1.2
-                      , process >=1.2
-@@ -80,6 +80,6 @@
-                      , unix-compat >=0.4.2.0
-                      , Diff >=0.4
-                      , ansi-terminal >=0.6.2
--                     , optparse-applicative >=0.11 && <0.15
-+                     , optparse-applicative >=0.11 && <0.16
-   hs-source-dirs:      src
-   default-language:    Haskell2010
diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template
index aa3979d3435a..971a6236224f 100644
--- a/srcpkgs/git-mediate/template
+++ b/srcpkgs/git-mediate/template
@@ -1,15 +1,15 @@
 # Template file for 'git-mediate'
 pkgname=git-mediate
-version=1.0.8
-revision=4
+version=1.0.8.1
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 depends="git"
 short_desc="Tool to help resolving git conflicts"
 maintainer="Peter Wang <novalazy@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/Peaker/git-mediate"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=81220f7e20a3913bc147b69681666ad22e60e5b759a1becad78ee28dcad8013d
+checksum=ee44841d37ded70cbcd8edd1e233a344d0118295e0bd2f0c6983ed00f619c467
 nocross=yes
 nopie_files="/usr/bin/git-mediate"

From ab0a7098dd751eadf5107a4a08f71325c8426d7e Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 16:11:25 +0100
Subject: [PATCH 16/17] git-annex: update to 8.20210310

---
 srcpkgs/git-annex/files/stack.yaml | 3 ++-
 srcpkgs/git-annex/template         | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
index 9a2294440b5d..671443617003 100644
--- a/srcpkgs/git-annex/files/stack.yaml
+++ b/srcpkgs/git-annex/files/stack.yaml
@@ -27,4 +27,5 @@ extra-deps:
  - network-3.1.0.1
 explicit-setup-deps:
   git-annex: true
-resolver: lts-16.13
+resolver: lts-17.5
+allow-newer: true
diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template
index 3d4df760667b..babba714fff1 100644
--- a/srcpkgs/git-annex/template
+++ b/srcpkgs/git-annex/template
@@ -1,6 +1,6 @@
 # Template file for 'git-annex'
 pkgname=git-annex
-version=8.20210223
+version=8.20210310
 revision=1
 build_style=haskell-stack
 makedepends="curl file-devel gnupg2 gnutls-devel gsasl-devel libxml2-devel
@@ -12,7 +12,7 @@ maintainer="Evan Deaubl <evan@deaubl.name>"
 license="AGPL-3.0-or-later, MIT, BSD-2-Clause, GPL-3.0-or-later, custom:Expat, custom:MIT-twitter, GPL-2.0-only, custom:icon-license"
 homepage="http://git-annex.branchable.com"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=62a09f98c96dd2a66605aaf6b7f00573a33997f3ef568ffb0d2dc17609719d1f
+checksum=dd0ae1cac40c97490e0699c68a341b5bff6fcb38e733df83b67c442a7eca97a8
 nopie_files="/usr/bin/git-annex"
 nocross=yes
 

From 4dfb29591b1159407addce850957a2d39d0115b8 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 30 Mar 2021 12:11:45 +0200
Subject: [PATCH 17/17] haskell-language-server: bump for ghc 8.10.4

---
 srcpkgs/haskell-language-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index 438c760f0a1f..7afa89c452f7 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,12 +1,12 @@
 # Template file for 'haskell-language-server'
 pkgname=haskell-language-server
 version=1.0.0
-revision=1
+revision=2
 # GHC only panics on i686
 # https://github.com/void-linux/void-packages/pull/27961/checks?check_run_id=2181519625#step:8:5936
 archs="~i686"
 build_style="haskell-stack"
-make_build_args="--stack-yaml stack-8.8.4.yaml"
+make_build_args="--stack-yaml stack-8.10.4.yaml"
 makedepends="ncurses-devel ncurses-libtinfo-devel icu-devel zlib-devel"
 short_desc="Integration of ghcide and haskell-ide-engine"
 maintainer="Wayne Van Son <waynevanson@gmail.com>"

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (16 preceding siblings ...)
  2021-04-13 11:04 ` slotThe
@ 2021-04-21  8:04 ` slotThe
  2021-04-22  5:44 ` slotThe
                   ` (20 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-04-21  8:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3059 bytes --]

There is an updated pull request by slotThe against master on the void-packages repository

https://github.com/slotThe/void-packages ghc-8.10.4
https://github.com/void-linux/void-packages/pull/29506

[WIP] GHC 8.10.4
It's that time of the year again!

- [X] ghc; I took over as maintainer here, @leahneukirchen said that was okay on IRC (cc'ing here to make sure)
- [ ] ghc-bin; took over as mainainer of orphaned package.
    - [X] x86_64-musl; [Link here](https://www34.zippyshare.com/d/yvtjb7uJ/38780/ghc-8.10.4-x86_64-void-linux-musl.tar.xz)
    - [ ] i686-musl
    cc @q66 for these
    - [ ] ppc64le
    - [ ] ppc64le-musl
- [X] cabal-install
- [X] stack
 
Rebuild literally every single haskell package we have and see if anything's broken:

- [x] git-mediate
- [x] kmonad
- [x] cgrep; took over as mainainer of orphaned package.
- [x] debug-me
- [x] hlint
- [x] hoogle
- [x] darcs
- [x] shellcheck
- [x] git-annex
- [x] hledger
- [x] pandoc
- [x] xmobar
- [x] HLS; this is #27961 once that's merged

For the following two I'd like to fix #6414 while we're at it.  Because stack can't install libraries globally, this would involve either removing these packages entirely and advising users to install them in their own [stack or cabal projects](https://github.com/xmonad/xmonad-testing), or finding a way to build them with cabal and updating ghc's data base accordingly.  This would probably use `v1` commands, as we don't want to nuke our users db if we update xmonad. Cc @xaltsc as the current maintainer and @chilledfrogs as someone who might want to tackle this (if I read the IRC discussion correctly). 

- [ ] xmonad
- [ ] xmonad-contrib

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/29506.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghc-8.10.4-29506.patch --]
[-- Type: text/x-diff, Size: 36601 bytes --]

From ef7169156978ec77238941ce525b990b0f4f4aa7 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 31 Jan 2021 14:31:24 +0100
Subject: [PATCH 01/17] ghc: update to 8.10.4

The change of maintainership was okay-ed by Leah.
---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch | 41 +++++++++++-------------
 srcpkgs/ghc/template                     |  8 ++---
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index ac353ed417e5..c9bd2583abe0 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -85,7 +85,7 @@ index ec3c18a..0359be7 100644
 +        in Right [ 0x3D800000 .|. hi16 w32,
 +                   0x618C0000 .|. lo16 w32,
 +                   0x7D8903A6, 0x4E800420 ]
- 
+
      ArchPPC64LE ->
          -- The ABI requires r12 to point to the function's entry point.
 diff --git a/rts/Adjustor.c b/rts/Adjustor.c
@@ -93,7 +93,7 @@ index d360cfe..ab7ede7 100644
 --- a/rts/Adjustor.c
 +++ b/rts/Adjustor.c
 @@ -49,7 +49,7 @@ Haskell side.
- 
+
  #if defined(i386_HOST_ARCH)
  extern void adjustorCode(void);
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
@@ -104,16 +104,16 @@ index d360cfe..ab7ede7 100644
 @@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
  extern void obscure_ccall_ret_code(void);
  #endif
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
- 
+
  /* !!! !!! WARNING: !!! !!!
 @@ -318,7 +318,7 @@ typedef struct AdjustorStub {
  } AdjustorStub;
  #endif
- 
+
 -#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  static int totalArgumentSize(char *typeString)
@@ -131,10 +131,10 @@ index d360cfe..ab7ede7 100644
 @@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
          }
      }
- 
+
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-         
+
  #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
  #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
 @@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
@@ -151,9 +151,9 @@ index 2795b83..63cfe91 100644
 --- a/rts/AdjustorAsm.S
 +++ b/rts/AdjustorAsm.S
 @@ -2,7 +2,7 @@
- 
+
  /* ******************************** PowerPC ******************************** */
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
@@ -166,34 +166,31 @@ index 934926e..2ff8662 100644
 @@ -717,7 +717,7 @@ StgRunIsImplementedInAssembler(void)
     Everything is in assembler, so we don't have to deal with GCC...
     -------------------------------------------------------------------------- */
- 
+
 -#if defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
- 
+
  static void GNUC3_ATTRIBUTE(used)
  StgRunIsImplementedInAssembler(void)
 @@ -842,7 +842,7 @@ StgRunIsImplementedInAssembler(void)
- 
+
  #endif
- 
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
  /* -----------------------------------------------------------------------------
     PowerPC 64 little endian architecture
- 
+
 diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
 index 9274a44..3b4fc33 100644
 --- a/rts/StgCRunAsm.S
 +++ b/rts/StgCRunAsm.S
-@@ -1,7 +1,7 @@
- #include "ghcconfig.h"
- #include "rts/Constants.h"
- 
+@@ -5,7 +5,7 @@
+  * then functions StgRun/StgReturn are implemented in file StgCRun.c */
+ #if !defined(USE_MINIINTERPRETER)
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
- # ifdef linux_HOST_OS
+ # if defined(linux_HOST_OS)
  # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
  	.file	"StgCRun.c"
--- 
-2.30.0
-
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 0b1440b2f6d9..c6acfa79e75d 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,8 +1,8 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.8.4
-revision=2
+version=8.10.4
+revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
 hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
@@ -10,11 +10,11 @@ hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
 makedepends="libnuma-devel"
 depends="perl gcc libffi-devel gmp-devel libnuma-devel"
 short_desc="Glorious Haskell Compiler"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d
+checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
 patch_args="-Np1"
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"

From e5f7574c8b28fee0e4b0042dac7832d45fd444e6 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 28 Feb 2021 18:34:26 +0100
Subject: [PATCH 02/17] 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 000000000000..63965ca12d44
--- /dev/null
+++ b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
@@ -0,0 +1,43 @@
+--- bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
++++ 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 1dd08f07fb44..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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]\."
-                        #  >= 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 2c15789b1f9d..99ebb54427fe 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 <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=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
 }

From a33a0924693b54caa60238e92d141fbcac05ea17 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 12:37:23 +0100
Subject: [PATCH 03/17] ghc-bin: update to 8.10.4

Take over maintainership of orphaned package.
---
 srcpkgs/ghc-bin/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 9101601358b9..eacbca4e74f8 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,13 +1,13 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.8.4
+version=8.10.4
 revision=1
 archs="i686* x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
 short_desc="Glorious Haskell Compiler - precompiled binaries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 nostrip=yes
@@ -15,17 +15,17 @@ noshlibprovides=yes
 conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
-	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb8-linux.tar.xz"
-	checksum=51a36892f1264744195274187298d13ac62bce2da86d4ddf76d8054ab90f2feb
+	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
+	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=779647d3f4e6e39da9e13b2559319ede76b4fff1107e4dc369a09aadeecad971
+	checksum=56e53f46ad53e6640753d608d01228528fca8ccec01b09bba6ad3b6890a18994
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0
+	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
 	;;
 i686-musl)
 	distfiles="https://distfiles.voidlinux.de/ghc-${version}-i386-unknown-linux-musl.tar.xz"

From 96dc0246ead2237aa9090d98d712326c7a4708be Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 15:11:29 +0100
Subject: [PATCH 04/17] stack: update to 2.5.1.1

---
 srcpkgs/stack/patches/datakinds.patch | 14 ------
 srcpkgs/stack/patches/ghc-8.8.4.patch | 70 ---------------------------
 srcpkgs/stack/patches/ppc.patch       | 18 +++----
 srcpkgs/stack/template                | 10 ++--
 4 files changed, 14 insertions(+), 98 deletions(-)
 delete mode 100644 srcpkgs/stack/patches/datakinds.patch
 delete mode 100644 srcpkgs/stack/patches/ghc-8.8.4.patch

diff --git a/srcpkgs/stack/patches/datakinds.patch b/srcpkgs/stack/patches/datakinds.patch
deleted file mode 100644
index 1c06480515f7..000000000000
--- a/srcpkgs/stack/patches/datakinds.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Stack/Storage/User.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/User.hs	2020-12-06 20:51:06.632607164 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
---- src/Stack/Storage/Project.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/Project.hs	2020-12-06 21:55:21.349484738 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch
deleted file mode 100644
index 6b55c176e150..000000000000
--- a/srcpkgs/stack/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- masterdir/builddir/stack-2.5.1/stack.cabal	2020-10-17 17:19:10.724179166 +0200
-+++ stack.cabal	2020-10-17 17:18:03.803498792 +0200
-@@ -234,6 +234,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -272,7 +273,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -359,6 +360,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -396,7 +398,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -480,6 +482,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -518,7 +521,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , optparse-generic
-     , pantry >=0.5.1.3
-     , path
-@@ -609,6 +612,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -647,7 +651,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
diff --git a/srcpkgs/stack/patches/ppc.patch b/srcpkgs/stack/patches/ppc.patch
index 1b5bc191b47c..724aaaf3a65c 100644
--- a/srcpkgs/stack/patches/ppc.patch
+++ b/srcpkgs/stack/patches/ppc.patch
@@ -7,7 +7,7 @@
 +import              System.Endian (getSystemEndianness, Endianness (..))
  import              System.Uname (getRelease)
  import              Data.List.Split (splitOn)
-@@ -1264,4 +1265,9 @@ getOSKey platform =
+@@ -1264,6 +1265,11 @@ getOSKey platform =
          Platform X86_64                Cabal.Windows -> return "windows64"
          Platform Arm                   Cabal.Linux   -> return "linux-armv7"
          Platform AArch64               Cabal.Linux   -> return "linux-aarch64"
@@ -21,11 +21,11 @@
  downloadFromInfo
 --- stack.cabal
 +++ stack.cabal
-@@ -235,6 +235,7 @@ library
-       , conduit
-       , conduit-extra
-       , containers
-+      , cpu >=0.1.2
-       , cryptonite
-       , cryptonite-conduit
-       , deepseq
+@@ -244,6 +244,7 @@
+         conduit >=1.3.1.2,
+         conduit-extra >=1.3.4,
+         containers >=0.6.0.1,
++        cpu >=0.1.2,
+         cryptonite >=0.25,
+         cryptonite-conduit >=0.2.2,
+         deepseq >=1.4.4.0,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 257aba10e50d..66da6618e77d 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.5.1
+version=2.5.1.1
 revision=1
-_stackage="lts-16.13"
+_stackage="lts-17.5"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -10,10 +10,10 @@ short_desc="Cross-platform program for developing Haskell projects"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://haskellstack.org"
-distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
+distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076
- b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58"
+checksum="ccf3ef6dff0412fe8409ef2cfbdf48cad65150f64aec7696725c75881827b539
+ d03bee7e51bbdec5053573f94f644a6baeb140cdd95dbe47261e03c04306b252"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 5cc9e167b32fab5cf85f4bf5bd1685cee20dcdbf Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 16 Mar 2021 17:41:58 +0100
Subject: [PATCH 05/17] xmobar: bump for ghc 8.10.4

---
 srcpkgs/xmobar/files/stack.yaml | 2 +-
 srcpkgs/xmobar/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 7bc4bf189d23..52fd0e3e49fe 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 81ae92fd2940..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.37
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From 0316c6b9c3286c9ea84b940be468623414ce82ab Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:03:10 +0100
Subject: [PATCH 06/17] hlint: update to 3.2.7

---
 srcpkgs/hlint/files/stack.yaml   |  7 -------
 srcpkgs/hlint/patches/data.patch | 10 ++++------
 srcpkgs/hlint/template           | 10 +++++-----
 3 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/hlint/files/stack.yaml

diff --git a/srcpkgs/hlint/files/stack.yaml b/srcpkgs/hlint/files/stack.yaml
deleted file mode 100644
index 12aead6562c5..000000000000
--- a/srcpkgs/hlint/files/stack.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-resolver: lts-16.13
-packages: [.]
-extra-deps:
-  - ghc-lib-parser-8.8.4.20200716
-  - ghc-lib-parser-ex-8.8.5.8
-ghc-options:
-    "$locals": -Wunused-imports -Worphans -Wunused-top-binds -Wunused-local-binds -Wincomplete-patterns
diff --git a/srcpkgs/hlint/patches/data.patch b/srcpkgs/hlint/patches/data.patch
index bdfac204f477..c73b376e5df7 100644
--- a/srcpkgs/hlint/patches/data.patch
+++ b/srcpkgs/hlint/patches/data.patch
@@ -1,13 +1,11 @@
-diff --git src/CmdLine.hs src/CmdLine.hs
-index 8c3d530..ccf7aac 100644
 --- src/CmdLine.hs
 +++ src/CmdLine.hs
-@@ -52,7 +52,7 @@ automatic cmd = case cmd of
+@@ -58,7 +58,7 @@
                  b <- doesDirectoryExist x
-                 if b then return cmd{cmdDataDir=x} else do
+                 if b then pure cmd{cmdDataDir=x} else do
                      exe <- getExecutablePath
--                    return cmd{cmdDataDir = takeDirectory exe </> "data"}
-+                    return cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
+-                    pure cmd{cmdDataDir = takeDirectory exe </> "data"}
++                    pure cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
          git cmd
              | cmdGit cmd = do
                  mgit <- findExecutable "git"
diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index 16fbb03ce2b9..fb30f947a452 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,16 +1,16 @@
 # Template file for 'hlint'
 pkgname=hlint
-version=2.2.11
-revision=2
+version=3.2.7
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
-homepage="https://github.com/ndmitchell/${pkgname}"
+homepage="https://github.com/ndmitchell/hlint"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=207539d3627efd3caed9e6fd3b1aeb8f1eb64553f1f9f166090adbf2fb71e172
+checksum=fcdeefcc79a52206add44b409abcab48c5fe2adff9d5aff077acbc43c702b54e
 nocross=yes # Can't yet cross compile Haskell
 nopie_files="/usr/bin/hlint"
 

From 6e9d496e20d1e1e6e754e126e027df19d682f3f5 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:43:37 +0100
Subject: [PATCH 07/17] kmonad: bump for ghc 8.10.4

---
 srcpkgs/kmonad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index 13e8845581ae..8c34a920ba7d 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,9 +1,9 @@
 # Template file for 'kmonad'
 pkgname=kmonad
 version=0.4.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage=lts-16.13
+stackage=lts-17.5
 short_desc="Keyboard remapping utility providing qmk-like functionality"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"

From dfb8182c09c184bb6afaa6c412abb5f23b2ad15b Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 16:21:35 +0100
Subject: [PATCH 08/17] hoogle: bump for ghc 8.10.4

---
 srcpkgs/hoogle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 4305ac4ae6e8..eafda8747cdf 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,9 +1,9 @@
 # Template file for 'hoogle'
 pkgname=hoogle
 version=5.0.18.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="zlib-devel"
 short_desc="Haskell API search engine"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From 4a012d8fbcadbaae8b6669b7e5c9238c5cf44157 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 11:18:37 +0100
Subject: [PATCH 09/17] cgrep: bump for ghc 8.10.4

---
 srcpkgs/cgrep/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index 7b4047614a71..15eda3bafd0e 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,12 +1,12 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.6.33
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.18"
+stackage="lts-17.5"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="https://awgn.github.io/cgrep/"
 distfiles="https://github.com/awgn/${pkgname}/archive/v${version}.tar.gz"

From ed6d71bf2ed9c5667c5ba34ee722a620b780a3bf Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 15:03:05 +0100
Subject: [PATCH 10/17] debug-me: bump for ghc 8.10.4

---
 srcpkgs/debug-me/files/stack.yaml                     |  2 +-
 .../patches/{ghc8.8.3.patch => ghc8.10.4.patch}       | 11 +++++++++++
 srcpkgs/debug-me/template                             |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 rename srcpkgs/debug-me/patches/{ghc8.8.3.patch => ghc8.10.4.patch} (70%)

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index 9c88cea9ab3c..ecff9d9d18f2 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - '.'
-resolver: lts-16.13
+resolver: lts-17.5
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/patches/ghc8.8.3.patch b/srcpkgs/debug-me/patches/ghc8.10.4.patch
similarity index 70%
rename from srcpkgs/debug-me/patches/ghc8.8.3.patch
rename to srcpkgs/debug-me/patches/ghc8.10.4.patch
index f1779331c5a9..9cc19db63be3 100644
--- a/srcpkgs/debug-me/patches/ghc8.8.3.patch
+++ b/srcpkgs/debug-me/patches/ghc8.10.4.patch
@@ -20,3 +20,14 @@
  		defaultSettings
 
  checkEnv :: ServerOpts -> IO ServerOpts
+--- debug-me.cabal
++++ debug-me.cabal
+@@ -64,7 +64,7 @@
+     , stm-chans (>= 3.0)
+     , posix-pty (>= 0.2.1)
+     , terminal-size (>= 0.3)
+-    , aeson (>= 0.11 && < 1.5)
++    , aeson (>= 0.11 && < 1.6)
+     , sandi (>= 0.4)
+     , text (>= 1.2.2)
+     , optparse-applicative (>= 0.12)
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 3df514e0be48..797c52f1f479 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -1,7 +1,7 @@
 # Template file for 'debug-me'
 pkgname=debug-me
 version=1.20200820
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"

From a44a50c1ccb77d524fbe65c4c60a492211da1f16 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 20 Mar 2021 11:26:04 +0100
Subject: [PATCH 11/17] darcs: bump for ghc 8.10.4

---
 srcpkgs/darcs/files/stack.yaml | 2 +-
 srcpkgs/darcs/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index 3766e74cccb0..cfc1efb94d53 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index bdbe3f14cc6f..6aa45fa21535 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.3
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From cb86fa5d3f865f887fc3b4ff0d52524100b8bb35 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 08:56:29 +0100
Subject: [PATCH 12/17] hledger: bump for ghc 8.10.4

---
 srcpkgs/hledger/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template
index b34e8ccd4652..1727a49252b7 100644
--- a/srcpkgs/hledger/template
+++ b/srcpkgs/hledger/template
@@ -1,7 +1,7 @@
 # Template file for 'hledger'
 pkgname=hledger
 version=1.21
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel ncurses-devel"
 short_desc="Simple, precise, plain text accounting"

From 41ef2681ed145ac00857ed8e936cc0bded783ac3 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 10:57:42 +0100
Subject: [PATCH 13/17] pandoc: bump for ghc 8.10.4

Citeproc support is build in now.  The change of maintainership was
suggested by Leah.
---
 srcpkgs/pandoc/files/stack.yaml | 23 -----------------------
 srcpkgs/pandoc/template         |  5 +++--
 2 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/pandoc/files/stack.yaml

diff --git a/srcpkgs/pandoc/files/stack.yaml b/srcpkgs/pandoc/files/stack.yaml
deleted file mode 100644
index 82a5fcaded3f..000000000000
--- a/srcpkgs/pandoc/files/stack.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-resolver: lts-17.9
-
-packages:
-  - ./pandoc-2.11.4
-  - ./pandoc-sidenote-0.20.0
-
-flags:
-  pandoc:
-    trypandoc: false
-    embed_data_files: true
-
-extra-deps:
-  - pandoc-types-1.22
-  - haddock-library-1.9.0
-  - regex-pcre-builtin-0.95.2.3.8.43
-  - hslua-1.2.0
-  - jira-wiki-markup-1.3.4
-  - commonmark-0.1.1.4
-  - commonmark-extensions-0.2.0.4
-  - commonmark-pandoc-0.2.0.1
-
-ghc-options:
-   "$locals": -fhide-source-paths -Wno-missing-home-modules
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index ad233dd0aaf3..8f2a9952d847 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,18 +2,19 @@
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
 version=2.11.4
-revision=1
+revision=2
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
+stackage="lts-17.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
 hostmakedepends="pkg-config unzip wget"
 makedepends="zlib-devel lua53-devel tar"
 short_desc="Universal converter between markup formats"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, MIT"
 homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz

From af837a353ff9101b8c4aed1ebb8252659982e66a Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 11:16:14 +0100
Subject: [PATCH 14/17] shellcheck: bump for ghc 8.10.4

---
 srcpkgs/shellcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 83bcd922ab70..4678289eaa14 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,9 +1,9 @@
 # Template file for 'shellcheck'
 pkgname=shellcheck
 version=0.7.1
-revision=3
+revision=4
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 hostmakedepends="pandoc"
 short_desc="Static analysis tool for shell scripts"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

From 07920a02036202d91d7c86346a9b780acf97e3c9 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 16:07:47 +0100
Subject: [PATCH 15/17] git-mediate: update to 1.0.8.1

---
 srcpkgs/git-mediate/patches/ghc8.8.3.patch | 19 -------------------
 srcpkgs/git-mediate/template               |  8 ++++----
 2 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/git-mediate/patches/ghc8.8.3.patch

diff --git a/srcpkgs/git-mediate/patches/ghc8.8.3.patch b/srcpkgs/git-mediate/patches/ghc8.8.3.patch
deleted file mode 100644
index 7928b61ef3a4..000000000000
--- a/srcpkgs/git-mediate/patches/ghc8.8.3.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- git-mediate.cabal	2001-09-09 03:46:40.000000000 +0200
-+++ git-mediate.cabal	2020-03-30 15:32:48.959537620 +0200
-@@ -72,7 +72,7 @@
-   ghc-options:         -O2 -Wall
-   -- other-extensions:
-   build-depends:       base >=4.8 && <5
--                     , base-compat >= 0.8.2 && < 0.11
-+                     , base-compat >= 0.8.2 && < 0.12
-                      , mtl >=2.1
-                      , directory >=1.2
-                      , process >=1.2
-@@ -80,6 +80,6 @@
-                      , unix-compat >=0.4.2.0
-                      , Diff >=0.4
-                      , ansi-terminal >=0.6.2
--                     , optparse-applicative >=0.11 && <0.15
-+                     , optparse-applicative >=0.11 && <0.16
-   hs-source-dirs:      src
-   default-language:    Haskell2010
diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template
index aa3979d3435a..971a6236224f 100644
--- a/srcpkgs/git-mediate/template
+++ b/srcpkgs/git-mediate/template
@@ -1,15 +1,15 @@
 # Template file for 'git-mediate'
 pkgname=git-mediate
-version=1.0.8
-revision=4
+version=1.0.8.1
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 depends="git"
 short_desc="Tool to help resolving git conflicts"
 maintainer="Peter Wang <novalazy@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/Peaker/git-mediate"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=81220f7e20a3913bc147b69681666ad22e60e5b759a1becad78ee28dcad8013d
+checksum=ee44841d37ded70cbcd8edd1e233a344d0118295e0bd2f0c6983ed00f619c467
 nocross=yes
 nopie_files="/usr/bin/git-mediate"

From 6f0742645509588e294c8273bd349a642b52df27 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 16:11:25 +0100
Subject: [PATCH 16/17] git-annex: bump for ghc 8.10.4

---
 srcpkgs/git-annex/files/stack.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
index a6d4f6aeee64..5d457bebde83 100644
--- a/srcpkgs/git-annex/files/stack.yaml
+++ b/srcpkgs/git-annex/files/stack.yaml
@@ -28,4 +28,5 @@ extra-deps:
  - network-3.1.0.1
 explicit-setup-deps:
   git-annex: true
-resolver: lts-16.27
+resolver: lts-17.5
+allow-newer: true

From 91009c22e1beac0a0e7efecfa4a247fb89cf4bdb Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 30 Mar 2021 12:11:45 +0200
Subject: [PATCH 17/17] haskell-language-server: bump for ghc 8.10.4

---
 srcpkgs/haskell-language-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index 438c760f0a1f..7afa89c452f7 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,12 +1,12 @@
 # Template file for 'haskell-language-server'
 pkgname=haskell-language-server
 version=1.0.0
-revision=1
+revision=2
 # GHC only panics on i686
 # https://github.com/void-linux/void-packages/pull/27961/checks?check_run_id=2181519625#step:8:5936
 archs="~i686"
 build_style="haskell-stack"
-make_build_args="--stack-yaml stack-8.8.4.yaml"
+make_build_args="--stack-yaml stack-8.10.4.yaml"
 makedepends="ncurses-devel ncurses-libtinfo-devel icu-devel zlib-devel"
 short_desc="Integration of ghcide and haskell-ide-engine"
 maintainer="Wayne Van Son <waynevanson@gmail.com>"

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (17 preceding siblings ...)
  2021-04-21  8:04 ` slotThe
@ 2021-04-22  5:44 ` slotThe
  2021-04-22 19:42 ` mobinmob
                   ` (19 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-04-22  5:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3253 bytes --]

There is an updated pull request by slotThe against master on the void-packages repository

https://github.com/slotThe/void-packages ghc-8.10.4
https://github.com/void-linux/void-packages/pull/29506

[WIP] GHC 8.10.4
It's that time of the year again!

- [X] ghc; I took over as maintainer here, @leahneukirchen said that was okay on IRC (cc'ing here to make sure)
- [ ] ghc-bin; took over as mainainer of orphaned package.
    - [X] x86_64-musl; [Link here](https://www34.zippyshare.com/d/yvtjb7uJ/38780/ghc-8.10.4-x86_64-void-linux-musl.tar.xz)
    - [ ] i686-musl [Cautious link](https://www42.zippyshare.com/d/wOOz0Zsx/29048/ghc-8.10.4-i386-unknown-linux.tar.xz) **WARNING**: I don't know if I did this correctly, so It'd be nice if someone could test this
    cc @q66 for these
    - [ ] ppc64le
    - [ ] ppc64le-musl
- [X] cabal-install
- [X] stack
 
Rebuild literally every single haskell package we have and see if anything's broken:

- [x] git-mediate
- [x] kmonad
- [x] cgrep; took over as mainainer of orphaned package.
- [x] debug-me
- [x] hlint
- [x] hoogle
- [x] darcs
- [x] shellcheck
- [x] git-annex
- [x] hledger
- [x] pandoc
- [x] xmobar
- [x] HLS; this is #27961 once that's merged

For the following two I'd like to fix #6414 while we're at it.  Because stack can't install libraries globally, this would involve either removing these packages entirely and advising users to install them in their own [stack or cabal projects](https://github.com/xmonad/xmonad-testing), or finding a way to build them with cabal and updating ghc's data base accordingly.  This would probably use `v1` commands, as we don't want to nuke our users db if we update xmonad. Cc @xaltsc as the current maintainer and @chilledfrogs as someone who might want to tackle this (if I read the IRC discussion correctly). 

- [ ] xmonad
- [ ] xmonad-contrib

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/29506.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghc-8.10.4-29506.patch --]
[-- Type: text/x-diff, Size: 36875 bytes --]

From ef7169156978ec77238941ce525b990b0f4f4aa7 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 31 Jan 2021 14:31:24 +0100
Subject: [PATCH 01/17] ghc: update to 8.10.4

The change of maintainership was okay-ed by Leah.
---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch | 41 +++++++++++-------------
 srcpkgs/ghc/template                     |  8 ++---
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index ac353ed417e5..c9bd2583abe0 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -85,7 +85,7 @@ index ec3c18a..0359be7 100644
 +        in Right [ 0x3D800000 .|. hi16 w32,
 +                   0x618C0000 .|. lo16 w32,
 +                   0x7D8903A6, 0x4E800420 ]
- 
+
      ArchPPC64LE ->
          -- The ABI requires r12 to point to the function's entry point.
 diff --git a/rts/Adjustor.c b/rts/Adjustor.c
@@ -93,7 +93,7 @@ index d360cfe..ab7ede7 100644
 --- a/rts/Adjustor.c
 +++ b/rts/Adjustor.c
 @@ -49,7 +49,7 @@ Haskell side.
- 
+
  #if defined(i386_HOST_ARCH)
  extern void adjustorCode(void);
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
@@ -104,16 +104,16 @@ index d360cfe..ab7ede7 100644
 @@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
  extern void obscure_ccall_ret_code(void);
  #endif
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
- 
+
  /* !!! !!! WARNING: !!! !!!
 @@ -318,7 +318,7 @@ typedef struct AdjustorStub {
  } AdjustorStub;
  #endif
- 
+
 -#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  static int totalArgumentSize(char *typeString)
@@ -131,10 +131,10 @@ index d360cfe..ab7ede7 100644
 @@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
          }
      }
- 
+
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-         
+
  #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
  #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
 @@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
@@ -151,9 +151,9 @@ index 2795b83..63cfe91 100644
 --- a/rts/AdjustorAsm.S
 +++ b/rts/AdjustorAsm.S
 @@ -2,7 +2,7 @@
- 
+
  /* ******************************** PowerPC ******************************** */
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
@@ -166,34 +166,31 @@ index 934926e..2ff8662 100644
 @@ -717,7 +717,7 @@ StgRunIsImplementedInAssembler(void)
     Everything is in assembler, so we don't have to deal with GCC...
     -------------------------------------------------------------------------- */
- 
+
 -#if defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
- 
+
  static void GNUC3_ATTRIBUTE(used)
  StgRunIsImplementedInAssembler(void)
 @@ -842,7 +842,7 @@ StgRunIsImplementedInAssembler(void)
- 
+
  #endif
- 
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
  /* -----------------------------------------------------------------------------
     PowerPC 64 little endian architecture
- 
+
 diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
 index 9274a44..3b4fc33 100644
 --- a/rts/StgCRunAsm.S
 +++ b/rts/StgCRunAsm.S
-@@ -1,7 +1,7 @@
- #include "ghcconfig.h"
- #include "rts/Constants.h"
- 
+@@ -5,7 +5,7 @@
+  * then functions StgRun/StgReturn are implemented in file StgCRun.c */
+ #if !defined(USE_MINIINTERPRETER)
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
- # ifdef linux_HOST_OS
+ # if defined(linux_HOST_OS)
  # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
  	.file	"StgCRun.c"
--- 
-2.30.0
-
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 0b1440b2f6d9..c6acfa79e75d 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,8 +1,8 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.8.4
-revision=2
+version=8.10.4
+revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
 hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
@@ -10,11 +10,11 @@ hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
 makedepends="libnuma-devel"
 depends="perl gcc libffi-devel gmp-devel libnuma-devel"
 short_desc="Glorious Haskell Compiler"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d
+checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
 patch_args="-Np1"
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"

From e5f7574c8b28fee0e4b0042dac7832d45fd444e6 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 28 Feb 2021 18:34:26 +0100
Subject: [PATCH 02/17] 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 000000000000..63965ca12d44
--- /dev/null
+++ b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
@@ -0,0 +1,43 @@
+--- bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
++++ 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 1dd08f07fb44..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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]\."
-                        #  >= 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 2c15789b1f9d..99ebb54427fe 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 <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=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
 }

From f44b8ce4cf69c44ad1f7d9532b14f4b7fba15cfc Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 12:37:23 +0100
Subject: [PATCH 03/17] ghc-bin: update to 8.10.4

Take over maintainership of orphaned package.
---
 srcpkgs/ghc-bin/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 9101601358b9..bf512350fd86 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,13 +1,13 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.8.4
+version=8.10.4
 revision=1
 archs="i686* x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
 short_desc="Glorious Haskell Compiler - precompiled binaries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 nostrip=yes
@@ -15,21 +15,21 @@ noshlibprovides=yes
 conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
-	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb8-linux.tar.xz"
-	checksum=51a36892f1264744195274187298d13ac62bce2da86d4ddf76d8054ab90f2feb
+	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
+	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=779647d3f4e6e39da9e13b2559319ede76b4fff1107e4dc369a09aadeecad971
+	checksum=56e53f46ad53e6640753d608d01228528fca8ccec01b09bba6ad3b6890a18994
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0
+	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
 	;;
 i686-musl)
 	distfiles="https://distfiles.voidlinux.de/ghc-${version}-i386-unknown-linux-musl.tar.xz"
-	checksum=8d84fbab62b3712bdcfb92f7d258a0d15d8295397d84b48716a3c625f09be782
+	checksum=05363642430c9c5f6368f0c1873c7521b75cf2eacd8c4a55e69939e685d4acdd
 	;;
 ppc64le)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz"

From ff9465265f8e95ac2156054e8574890e32434191 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 15:11:29 +0100
Subject: [PATCH 04/17] stack: update to 2.5.1.1

---
 srcpkgs/stack/patches/datakinds.patch | 14 ------
 srcpkgs/stack/patches/ghc-8.8.4.patch | 70 ---------------------------
 srcpkgs/stack/patches/ppc.patch       | 18 +++----
 srcpkgs/stack/template                | 10 ++--
 4 files changed, 14 insertions(+), 98 deletions(-)
 delete mode 100644 srcpkgs/stack/patches/datakinds.patch
 delete mode 100644 srcpkgs/stack/patches/ghc-8.8.4.patch

diff --git a/srcpkgs/stack/patches/datakinds.patch b/srcpkgs/stack/patches/datakinds.patch
deleted file mode 100644
index 1c06480515f7..000000000000
--- a/srcpkgs/stack/patches/datakinds.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Stack/Storage/User.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/User.hs	2020-12-06 20:51:06.632607164 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
---- src/Stack/Storage/Project.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/Project.hs	2020-12-06 21:55:21.349484738 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch
deleted file mode 100644
index 6b55c176e150..000000000000
--- a/srcpkgs/stack/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- masterdir/builddir/stack-2.5.1/stack.cabal	2020-10-17 17:19:10.724179166 +0200
-+++ stack.cabal	2020-10-17 17:18:03.803498792 +0200
-@@ -234,6 +234,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -272,7 +273,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -359,6 +360,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -396,7 +398,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -480,6 +482,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -518,7 +521,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , optparse-generic
-     , pantry >=0.5.1.3
-     , path
-@@ -609,6 +612,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -647,7 +651,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
diff --git a/srcpkgs/stack/patches/ppc.patch b/srcpkgs/stack/patches/ppc.patch
index 1b5bc191b47c..724aaaf3a65c 100644
--- a/srcpkgs/stack/patches/ppc.patch
+++ b/srcpkgs/stack/patches/ppc.patch
@@ -7,7 +7,7 @@
 +import              System.Endian (getSystemEndianness, Endianness (..))
  import              System.Uname (getRelease)
  import              Data.List.Split (splitOn)
-@@ -1264,4 +1265,9 @@ getOSKey platform =
+@@ -1264,6 +1265,11 @@ getOSKey platform =
          Platform X86_64                Cabal.Windows -> return "windows64"
          Platform Arm                   Cabal.Linux   -> return "linux-armv7"
          Platform AArch64               Cabal.Linux   -> return "linux-aarch64"
@@ -21,11 +21,11 @@
  downloadFromInfo
 --- stack.cabal
 +++ stack.cabal
-@@ -235,6 +235,7 @@ library
-       , conduit
-       , conduit-extra
-       , containers
-+      , cpu >=0.1.2
-       , cryptonite
-       , cryptonite-conduit
-       , deepseq
+@@ -244,6 +244,7 @@
+         conduit >=1.3.1.2,
+         conduit-extra >=1.3.4,
+         containers >=0.6.0.1,
++        cpu >=0.1.2,
+         cryptonite >=0.25,
+         cryptonite-conduit >=0.2.2,
+         deepseq >=1.4.4.0,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 257aba10e50d..66da6618e77d 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.5.1
+version=2.5.1.1
 revision=1
-_stackage="lts-16.13"
+_stackage="lts-17.5"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -10,10 +10,10 @@ short_desc="Cross-platform program for developing Haskell projects"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://haskellstack.org"
-distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
+distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076
- b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58"
+checksum="ccf3ef6dff0412fe8409ef2cfbdf48cad65150f64aec7696725c75881827b539
+ d03bee7e51bbdec5053573f94f644a6baeb140cdd95dbe47261e03c04306b252"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 0c300efc4c20acf26eca7723a370581587788b86 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 16 Mar 2021 17:41:58 +0100
Subject: [PATCH 05/17] xmobar: bump for ghc 8.10.4

---
 srcpkgs/xmobar/files/stack.yaml | 2 +-
 srcpkgs/xmobar/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 7bc4bf189d23..52fd0e3e49fe 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 81ae92fd2940..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.37
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From 29e6192dcf2d6ff0479d1a61502b08f1a1737bf2 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:03:10 +0100
Subject: [PATCH 06/17] hlint: update to 3.2.7

---
 srcpkgs/hlint/files/stack.yaml   |  7 -------
 srcpkgs/hlint/patches/data.patch | 10 ++++------
 srcpkgs/hlint/template           | 10 +++++-----
 3 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/hlint/files/stack.yaml

diff --git a/srcpkgs/hlint/files/stack.yaml b/srcpkgs/hlint/files/stack.yaml
deleted file mode 100644
index 12aead6562c5..000000000000
--- a/srcpkgs/hlint/files/stack.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-resolver: lts-16.13
-packages: [.]
-extra-deps:
-  - ghc-lib-parser-8.8.4.20200716
-  - ghc-lib-parser-ex-8.8.5.8
-ghc-options:
-    "$locals": -Wunused-imports -Worphans -Wunused-top-binds -Wunused-local-binds -Wincomplete-patterns
diff --git a/srcpkgs/hlint/patches/data.patch b/srcpkgs/hlint/patches/data.patch
index bdfac204f477..c73b376e5df7 100644
--- a/srcpkgs/hlint/patches/data.patch
+++ b/srcpkgs/hlint/patches/data.patch
@@ -1,13 +1,11 @@
-diff --git src/CmdLine.hs src/CmdLine.hs
-index 8c3d530..ccf7aac 100644
 --- src/CmdLine.hs
 +++ src/CmdLine.hs
-@@ -52,7 +52,7 @@ automatic cmd = case cmd of
+@@ -58,7 +58,7 @@
                  b <- doesDirectoryExist x
-                 if b then return cmd{cmdDataDir=x} else do
+                 if b then pure cmd{cmdDataDir=x} else do
                      exe <- getExecutablePath
--                    return cmd{cmdDataDir = takeDirectory exe </> "data"}
-+                    return cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
+-                    pure cmd{cmdDataDir = takeDirectory exe </> "data"}
++                    pure cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
          git cmd
              | cmdGit cmd = do
                  mgit <- findExecutable "git"
diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index 16fbb03ce2b9..fb30f947a452 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,16 +1,16 @@
 # Template file for 'hlint'
 pkgname=hlint
-version=2.2.11
-revision=2
+version=3.2.7
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
-homepage="https://github.com/ndmitchell/${pkgname}"
+homepage="https://github.com/ndmitchell/hlint"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=207539d3627efd3caed9e6fd3b1aeb8f1eb64553f1f9f166090adbf2fb71e172
+checksum=fcdeefcc79a52206add44b409abcab48c5fe2adff9d5aff077acbc43c702b54e
 nocross=yes # Can't yet cross compile Haskell
 nopie_files="/usr/bin/hlint"
 

From bbb1b87010354e6cf75bddc51ec31836a792bd9f Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:43:37 +0100
Subject: [PATCH 07/17] kmonad: bump for ghc 8.10.4

---
 srcpkgs/kmonad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index 13e8845581ae..8c34a920ba7d 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,9 +1,9 @@
 # Template file for 'kmonad'
 pkgname=kmonad
 version=0.4.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage=lts-16.13
+stackage=lts-17.5
 short_desc="Keyboard remapping utility providing qmk-like functionality"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"

From 875ad6a6b3070ec885883212a2b94cb51d1a262e Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 16:21:35 +0100
Subject: [PATCH 08/17] hoogle: bump for ghc 8.10.4

---
 srcpkgs/hoogle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 4305ac4ae6e8..eafda8747cdf 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,9 +1,9 @@
 # Template file for 'hoogle'
 pkgname=hoogle
 version=5.0.18.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="zlib-devel"
 short_desc="Haskell API search engine"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From f9865c1778164eca481d93fa2ac8feba04e8b5fd Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 11:18:37 +0100
Subject: [PATCH 09/17] cgrep: bump for ghc 8.10.4

---
 srcpkgs/cgrep/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index 7b4047614a71..15eda3bafd0e 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,12 +1,12 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.6.33
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.18"
+stackage="lts-17.5"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="https://awgn.github.io/cgrep/"
 distfiles="https://github.com/awgn/${pkgname}/archive/v${version}.tar.gz"

From b0a6ee60172accd5edb31a2b33e00f1434e77e4d Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 15:03:05 +0100
Subject: [PATCH 10/17] debug-me: bump for ghc 8.10.4

---
 srcpkgs/debug-me/files/stack.yaml                     |  2 +-
 .../patches/{ghc8.8.3.patch => ghc8.10.4.patch}       | 11 +++++++++++
 srcpkgs/debug-me/template                             |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 rename srcpkgs/debug-me/patches/{ghc8.8.3.patch => ghc8.10.4.patch} (70%)

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index 9c88cea9ab3c..ecff9d9d18f2 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - '.'
-resolver: lts-16.13
+resolver: lts-17.5
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/patches/ghc8.8.3.patch b/srcpkgs/debug-me/patches/ghc8.10.4.patch
similarity index 70%
rename from srcpkgs/debug-me/patches/ghc8.8.3.patch
rename to srcpkgs/debug-me/patches/ghc8.10.4.patch
index f1779331c5a9..9cc19db63be3 100644
--- a/srcpkgs/debug-me/patches/ghc8.8.3.patch
+++ b/srcpkgs/debug-me/patches/ghc8.10.4.patch
@@ -20,3 +20,14 @@
  		defaultSettings
 
  checkEnv :: ServerOpts -> IO ServerOpts
+--- debug-me.cabal
++++ debug-me.cabal
+@@ -64,7 +64,7 @@
+     , stm-chans (>= 3.0)
+     , posix-pty (>= 0.2.1)
+     , terminal-size (>= 0.3)
+-    , aeson (>= 0.11 && < 1.5)
++    , aeson (>= 0.11 && < 1.6)
+     , sandi (>= 0.4)
+     , text (>= 1.2.2)
+     , optparse-applicative (>= 0.12)
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 3df514e0be48..797c52f1f479 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -1,7 +1,7 @@
 # Template file for 'debug-me'
 pkgname=debug-me
 version=1.20200820
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"

From 7c382043c117ad97671f901df51fece76d6ea1de Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 20 Mar 2021 11:26:04 +0100
Subject: [PATCH 11/17] darcs: bump for ghc 8.10.4

---
 srcpkgs/darcs/files/stack.yaml | 2 +-
 srcpkgs/darcs/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index 3766e74cccb0..cfc1efb94d53 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index bdbe3f14cc6f..6aa45fa21535 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.3
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From c1db77a1d6565a5d552c2d2bc07608a9a973280d Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 08:56:29 +0100
Subject: [PATCH 12/17] hledger: bump for ghc 8.10.4

---
 srcpkgs/hledger/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template
index b34e8ccd4652..1727a49252b7 100644
--- a/srcpkgs/hledger/template
+++ b/srcpkgs/hledger/template
@@ -1,7 +1,7 @@
 # Template file for 'hledger'
 pkgname=hledger
 version=1.21
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel ncurses-devel"
 short_desc="Simple, precise, plain text accounting"

From defee4e8a14cd3e8964995c537e0ef1e5e7d71d3 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 10:57:42 +0100
Subject: [PATCH 13/17] pandoc: bump for ghc 8.10.4

Citeproc support is build in now.  The change of maintainership was
suggested by Leah.
---
 srcpkgs/pandoc/files/stack.yaml | 23 -----------------------
 srcpkgs/pandoc/template         |  5 +++--
 2 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/pandoc/files/stack.yaml

diff --git a/srcpkgs/pandoc/files/stack.yaml b/srcpkgs/pandoc/files/stack.yaml
deleted file mode 100644
index 82a5fcaded3f..000000000000
--- a/srcpkgs/pandoc/files/stack.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-resolver: lts-17.9
-
-packages:
-  - ./pandoc-2.11.4
-  - ./pandoc-sidenote-0.20.0
-
-flags:
-  pandoc:
-    trypandoc: false
-    embed_data_files: true
-
-extra-deps:
-  - pandoc-types-1.22
-  - haddock-library-1.9.0
-  - regex-pcre-builtin-0.95.2.3.8.43
-  - hslua-1.2.0
-  - jira-wiki-markup-1.3.4
-  - commonmark-0.1.1.4
-  - commonmark-extensions-0.2.0.4
-  - commonmark-pandoc-0.2.0.1
-
-ghc-options:
-   "$locals": -fhide-source-paths -Wno-missing-home-modules
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index ad233dd0aaf3..8f2a9952d847 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,18 +2,19 @@
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
 version=2.11.4
-revision=1
+revision=2
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
+stackage="lts-17.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
 hostmakedepends="pkg-config unzip wget"
 makedepends="zlib-devel lua53-devel tar"
 short_desc="Universal converter between markup formats"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, MIT"
 homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz

From 944099b020be5a2d5c0dce04cb2726afcd11bfcf Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 11:16:14 +0100
Subject: [PATCH 14/17] shellcheck: bump for ghc 8.10.4

---
 srcpkgs/shellcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 83bcd922ab70..4678289eaa14 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,9 +1,9 @@
 # Template file for 'shellcheck'
 pkgname=shellcheck
 version=0.7.1
-revision=3
+revision=4
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 hostmakedepends="pandoc"
 short_desc="Static analysis tool for shell scripts"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

From 5f48db6a36240127ced455bad639d237375999cc Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 16:07:47 +0100
Subject: [PATCH 15/17] git-mediate: update to 1.0.8.1

---
 srcpkgs/git-mediate/patches/ghc8.8.3.patch | 19 -------------------
 srcpkgs/git-mediate/template               |  8 ++++----
 2 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/git-mediate/patches/ghc8.8.3.patch

diff --git a/srcpkgs/git-mediate/patches/ghc8.8.3.patch b/srcpkgs/git-mediate/patches/ghc8.8.3.patch
deleted file mode 100644
index 7928b61ef3a4..000000000000
--- a/srcpkgs/git-mediate/patches/ghc8.8.3.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- git-mediate.cabal	2001-09-09 03:46:40.000000000 +0200
-+++ git-mediate.cabal	2020-03-30 15:32:48.959537620 +0200
-@@ -72,7 +72,7 @@
-   ghc-options:         -O2 -Wall
-   -- other-extensions:
-   build-depends:       base >=4.8 && <5
--                     , base-compat >= 0.8.2 && < 0.11
-+                     , base-compat >= 0.8.2 && < 0.12
-                      , mtl >=2.1
-                      , directory >=1.2
-                      , process >=1.2
-@@ -80,6 +80,6 @@
-                      , unix-compat >=0.4.2.0
-                      , Diff >=0.4
-                      , ansi-terminal >=0.6.2
--                     , optparse-applicative >=0.11 && <0.15
-+                     , optparse-applicative >=0.11 && <0.16
-   hs-source-dirs:      src
-   default-language:    Haskell2010
diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template
index aa3979d3435a..971a6236224f 100644
--- a/srcpkgs/git-mediate/template
+++ b/srcpkgs/git-mediate/template
@@ -1,15 +1,15 @@
 # Template file for 'git-mediate'
 pkgname=git-mediate
-version=1.0.8
-revision=4
+version=1.0.8.1
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 depends="git"
 short_desc="Tool to help resolving git conflicts"
 maintainer="Peter Wang <novalazy@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/Peaker/git-mediate"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=81220f7e20a3913bc147b69681666ad22e60e5b759a1becad78ee28dcad8013d
+checksum=ee44841d37ded70cbcd8edd1e233a344d0118295e0bd2f0c6983ed00f619c467
 nocross=yes
 nopie_files="/usr/bin/git-mediate"

From 455f4b47c2ebc3bfe08513ca5bb167f70cfb9f9d Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 16:11:25 +0100
Subject: [PATCH 16/17] git-annex: bump for ghc 8.10.4

---
 srcpkgs/git-annex/files/stack.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
index a6d4f6aeee64..5d457bebde83 100644
--- a/srcpkgs/git-annex/files/stack.yaml
+++ b/srcpkgs/git-annex/files/stack.yaml
@@ -28,4 +28,5 @@ extra-deps:
  - network-3.1.0.1
 explicit-setup-deps:
   git-annex: true
-resolver: lts-16.27
+resolver: lts-17.5
+allow-newer: true

From e1b952e2a20ab7c9afd554d088363a60d28e5009 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 30 Mar 2021 12:11:45 +0200
Subject: [PATCH 17/17] haskell-language-server: bump for ghc 8.10.4

---
 srcpkgs/haskell-language-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index 438c760f0a1f..7afa89c452f7 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,12 +1,12 @@
 # Template file for 'haskell-language-server'
 pkgname=haskell-language-server
 version=1.0.0
-revision=1
+revision=2
 # GHC only panics on i686
 # https://github.com/void-linux/void-packages/pull/27961/checks?check_run_id=2181519625#step:8:5936
 archs="~i686"
 build_style="haskell-stack"
-make_build_args="--stack-yaml stack-8.8.4.yaml"
+make_build_args="--stack-yaml stack-8.10.4.yaml"
 makedepends="ncurses-devel ncurses-libtinfo-devel icu-devel zlib-devel"
 short_desc="Integration of ghcide and haskell-ide-engine"
 maintainer="Wayne Van Son <waynevanson@gmail.com>"

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (18 preceding siblings ...)
  2021-04-22  5:44 ` slotThe
@ 2021-04-22 19:42 ` mobinmob
  2021-04-22 19:42 ` mobinmob
                   ` (18 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: mobinmob @ 2021-04-22 19:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 187 bytes --]

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/29506#issuecomment-825135057

Comment:
@slotThe Can you update shellcheck? Thanks :)

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (19 preceding siblings ...)
  2021-04-22 19:42 ` mobinmob
@ 2021-04-22 19:42 ` mobinmob
  2021-04-27  8:02 ` slotThe
                   ` (17 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: mobinmob @ 2021-04-22 19:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 197 bytes --]

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/29506#issuecomment-825135057

Comment:
@slotThe Can you update shellcheck in the PR? Thanks :)

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (20 preceding siblings ...)
  2021-04-22 19:42 ` mobinmob
@ 2021-04-27  8:02 ` slotThe
  2021-04-28  7:42 ` [PR PATCH] [Updated] " slotThe
                   ` (16 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-04-27  8:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 438 bytes --]

New comment by slotThe on void-packages repository

https://github.com/void-linux/void-packages/pull/29506#issuecomment-827403374

Comment:
Seems to have already been done in c74f45f4407575622cc3b5830edaf82834767392, I'll rebuild and then rebase. 

@q66 friendly ping for the ppc stuff :) 

If no one finds themselves for the xmonad packages I'd say we drop them.  I think installing directly via `stack` is to be preferred anyways. 

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (21 preceding siblings ...)
  2021-04-27  8:02 ` slotThe
@ 2021-04-28  7:42 ` slotThe
  2021-04-30 22:58 ` q66
                   ` (15 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-04-28  7:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3253 bytes --]

There is an updated pull request by slotThe against master on the void-packages repository

https://github.com/slotThe/void-packages ghc-8.10.4
https://github.com/void-linux/void-packages/pull/29506

[WIP] GHC 8.10.4
It's that time of the year again!

- [X] ghc; I took over as maintainer here, @leahneukirchen said that was okay on IRC (cc'ing here to make sure)
- [ ] ghc-bin; took over as mainainer of orphaned package.
    - [X] x86_64-musl; [Link here](https://www34.zippyshare.com/d/yvtjb7uJ/38780/ghc-8.10.4-x86_64-void-linux-musl.tar.xz)
    - [ ] i686-musl [Cautious link](https://www42.zippyshare.com/d/wOOz0Zsx/29048/ghc-8.10.4-i386-unknown-linux.tar.xz) **WARNING**: I don't know if I did this correctly, so It'd be nice if someone could test this
    cc @q66 for these
    - [ ] ppc64le
    - [ ] ppc64le-musl
- [X] cabal-install
- [X] stack
 
Rebuild literally every single haskell package we have and see if anything's broken:

- [x] git-mediate
- [x] kmonad
- [x] cgrep; took over as mainainer of orphaned package.
- [x] debug-me
- [x] hlint
- [x] hoogle
- [x] darcs
- [x] shellcheck
- [x] git-annex
- [x] hledger
- [x] pandoc
- [x] xmobar
- [x] HLS; this is #27961 once that's merged

For the following two I'd like to fix #6414 while we're at it.  Because stack can't install libraries globally, this would involve either removing these packages entirely and advising users to install them in their own [stack or cabal projects](https://github.com/xmonad/xmonad-testing), or finding a way to build them with cabal and updating ghc's data base accordingly.  This would probably use `v1` commands, as we don't want to nuke our users db if we update xmonad. Cc @xaltsc as the current maintainer and @chilledfrogs as someone who might want to tackle this (if I read the IRC discussion correctly). 

- [ ] xmonad
- [ ] xmonad-contrib

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/29506.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghc-8.10.4-29506.patch --]
[-- Type: text/x-diff, Size: 36875 bytes --]

From bcb8d0e15a58e092d4db9226ed390e9d4bc71a5c Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 31 Jan 2021 14:31:24 +0100
Subject: [PATCH 01/17] ghc: update to 8.10.4

The change of maintainership was okay-ed by Leah.
---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch | 41 +++++++++++-------------
 srcpkgs/ghc/template                     |  8 ++---
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index ac353ed417e5..c9bd2583abe0 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -85,7 +85,7 @@ index ec3c18a..0359be7 100644
 +        in Right [ 0x3D800000 .|. hi16 w32,
 +                   0x618C0000 .|. lo16 w32,
 +                   0x7D8903A6, 0x4E800420 ]
- 
+
      ArchPPC64LE ->
          -- The ABI requires r12 to point to the function's entry point.
 diff --git a/rts/Adjustor.c b/rts/Adjustor.c
@@ -93,7 +93,7 @@ index d360cfe..ab7ede7 100644
 --- a/rts/Adjustor.c
 +++ b/rts/Adjustor.c
 @@ -49,7 +49,7 @@ Haskell side.
- 
+
  #if defined(i386_HOST_ARCH)
  extern void adjustorCode(void);
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
@@ -104,16 +104,16 @@ index d360cfe..ab7ede7 100644
 @@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
  extern void obscure_ccall_ret_code(void);
  #endif
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
- 
+
  /* !!! !!! WARNING: !!! !!!
 @@ -318,7 +318,7 @@ typedef struct AdjustorStub {
  } AdjustorStub;
  #endif
- 
+
 -#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  static int totalArgumentSize(char *typeString)
@@ -131,10 +131,10 @@ index d360cfe..ab7ede7 100644
 @@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
          }
      }
- 
+
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-         
+
  #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
  #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
 @@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
@@ -151,9 +151,9 @@ index 2795b83..63cfe91 100644
 --- a/rts/AdjustorAsm.S
 +++ b/rts/AdjustorAsm.S
 @@ -2,7 +2,7 @@
- 
+
  /* ******************************** PowerPC ******************************** */
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
@@ -166,34 +166,31 @@ index 934926e..2ff8662 100644
 @@ -717,7 +717,7 @@ StgRunIsImplementedInAssembler(void)
     Everything is in assembler, so we don't have to deal with GCC...
     -------------------------------------------------------------------------- */
- 
+
 -#if defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
- 
+
  static void GNUC3_ATTRIBUTE(used)
  StgRunIsImplementedInAssembler(void)
 @@ -842,7 +842,7 @@ StgRunIsImplementedInAssembler(void)
- 
+
  #endif
- 
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
  /* -----------------------------------------------------------------------------
     PowerPC 64 little endian architecture
- 
+
 diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
 index 9274a44..3b4fc33 100644
 --- a/rts/StgCRunAsm.S
 +++ b/rts/StgCRunAsm.S
-@@ -1,7 +1,7 @@
- #include "ghcconfig.h"
- #include "rts/Constants.h"
- 
+@@ -5,7 +5,7 @@
+  * then functions StgRun/StgReturn are implemented in file StgCRun.c */
+ #if !defined(USE_MINIINTERPRETER)
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
- # ifdef linux_HOST_OS
+ # if defined(linux_HOST_OS)
  # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
  	.file	"StgCRun.c"
--- 
-2.30.0
-
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 0b1440b2f6d9..c6acfa79e75d 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,8 +1,8 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.8.4
-revision=2
+version=8.10.4
+revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
 hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
@@ -10,11 +10,11 @@ hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
 makedepends="libnuma-devel"
 depends="perl gcc libffi-devel gmp-devel libnuma-devel"
 short_desc="Glorious Haskell Compiler"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d
+checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
 patch_args="-Np1"
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"

From 58c45b5bf4263b886eef01ca8a3d1fda14730808 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 28 Feb 2021 18:34:26 +0100
Subject: [PATCH 02/17] 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 000000000000..63965ca12d44
--- /dev/null
+++ b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
@@ -0,0 +1,43 @@
+--- bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
++++ 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 1dd08f07fb44..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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]\."
-                        #  >= 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 2c15789b1f9d..99ebb54427fe 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 <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=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
 }

From 7062c9b9e5efb7e638831cc798c5e4c0be9ae033 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 12:37:23 +0100
Subject: [PATCH 03/17] ghc-bin: update to 8.10.4

Take over maintainership of orphaned package.
---
 srcpkgs/ghc-bin/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 9101601358b9..bf512350fd86 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,13 +1,13 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.8.4
+version=8.10.4
 revision=1
 archs="i686* x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
 short_desc="Glorious Haskell Compiler - precompiled binaries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 nostrip=yes
@@ -15,21 +15,21 @@ noshlibprovides=yes
 conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
-	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb8-linux.tar.xz"
-	checksum=51a36892f1264744195274187298d13ac62bce2da86d4ddf76d8054ab90f2feb
+	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
+	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=779647d3f4e6e39da9e13b2559319ede76b4fff1107e4dc369a09aadeecad971
+	checksum=56e53f46ad53e6640753d608d01228528fca8ccec01b09bba6ad3b6890a18994
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0
+	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
 	;;
 i686-musl)
 	distfiles="https://distfiles.voidlinux.de/ghc-${version}-i386-unknown-linux-musl.tar.xz"
-	checksum=8d84fbab62b3712bdcfb92f7d258a0d15d8295397d84b48716a3c625f09be782
+	checksum=05363642430c9c5f6368f0c1873c7521b75cf2eacd8c4a55e69939e685d4acdd
 	;;
 ppc64le)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz"

From 6582741c18060b65e0236b2b1e7dbd600a2af665 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 15:11:29 +0100
Subject: [PATCH 04/17] stack: update to 2.5.1.1

---
 srcpkgs/stack/patches/datakinds.patch | 14 ------
 srcpkgs/stack/patches/ghc-8.8.4.patch | 70 ---------------------------
 srcpkgs/stack/patches/ppc.patch       | 18 +++----
 srcpkgs/stack/template                | 10 ++--
 4 files changed, 14 insertions(+), 98 deletions(-)
 delete mode 100644 srcpkgs/stack/patches/datakinds.patch
 delete mode 100644 srcpkgs/stack/patches/ghc-8.8.4.patch

diff --git a/srcpkgs/stack/patches/datakinds.patch b/srcpkgs/stack/patches/datakinds.patch
deleted file mode 100644
index 1c06480515f7..000000000000
--- a/srcpkgs/stack/patches/datakinds.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Stack/Storage/User.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/User.hs	2020-12-06 20:51:06.632607164 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
---- src/Stack/Storage/Project.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/Project.hs	2020-12-06 21:55:21.349484738 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch
deleted file mode 100644
index 6b55c176e150..000000000000
--- a/srcpkgs/stack/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- masterdir/builddir/stack-2.5.1/stack.cabal	2020-10-17 17:19:10.724179166 +0200
-+++ stack.cabal	2020-10-17 17:18:03.803498792 +0200
-@@ -234,6 +234,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -272,7 +273,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -359,6 +360,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -396,7 +398,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -480,6 +482,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -518,7 +521,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , optparse-generic
-     , pantry >=0.5.1.3
-     , path
-@@ -609,6 +612,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -647,7 +651,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
diff --git a/srcpkgs/stack/patches/ppc.patch b/srcpkgs/stack/patches/ppc.patch
index 1b5bc191b47c..724aaaf3a65c 100644
--- a/srcpkgs/stack/patches/ppc.patch
+++ b/srcpkgs/stack/patches/ppc.patch
@@ -7,7 +7,7 @@
 +import              System.Endian (getSystemEndianness, Endianness (..))
  import              System.Uname (getRelease)
  import              Data.List.Split (splitOn)
-@@ -1264,4 +1265,9 @@ getOSKey platform =
+@@ -1264,6 +1265,11 @@ getOSKey platform =
          Platform X86_64                Cabal.Windows -> return "windows64"
          Platform Arm                   Cabal.Linux   -> return "linux-armv7"
          Platform AArch64               Cabal.Linux   -> return "linux-aarch64"
@@ -21,11 +21,11 @@
  downloadFromInfo
 --- stack.cabal
 +++ stack.cabal
-@@ -235,6 +235,7 @@ library
-       , conduit
-       , conduit-extra
-       , containers
-+      , cpu >=0.1.2
-       , cryptonite
-       , cryptonite-conduit
-       , deepseq
+@@ -244,6 +244,7 @@
+         conduit >=1.3.1.2,
+         conduit-extra >=1.3.4,
+         containers >=0.6.0.1,
++        cpu >=0.1.2,
+         cryptonite >=0.25,
+         cryptonite-conduit >=0.2.2,
+         deepseq >=1.4.4.0,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 257aba10e50d..66da6618e77d 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.5.1
+version=2.5.1.1
 revision=1
-_stackage="lts-16.13"
+_stackage="lts-17.5"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -10,10 +10,10 @@ short_desc="Cross-platform program for developing Haskell projects"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://haskellstack.org"
-distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
+distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076
- b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58"
+checksum="ccf3ef6dff0412fe8409ef2cfbdf48cad65150f64aec7696725c75881827b539
+ d03bee7e51bbdec5053573f94f644a6baeb140cdd95dbe47261e03c04306b252"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From b42f7e62c448185f8bbbc57ea5d6539cf6ab87fc Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 16 Mar 2021 17:41:58 +0100
Subject: [PATCH 05/17] xmobar: bump for ghc 8.10.4

---
 srcpkgs/xmobar/files/stack.yaml | 2 +-
 srcpkgs/xmobar/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 7bc4bf189d23..52fd0e3e49fe 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 81ae92fd2940..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.37
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From e18a46edcb23dc33618bc1c7573f781ca5eb8aed Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:03:10 +0100
Subject: [PATCH 06/17] hlint: update to 3.2.7

---
 srcpkgs/hlint/files/stack.yaml   |  7 -------
 srcpkgs/hlint/patches/data.patch | 10 ++++------
 srcpkgs/hlint/template           | 10 +++++-----
 3 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/hlint/files/stack.yaml

diff --git a/srcpkgs/hlint/files/stack.yaml b/srcpkgs/hlint/files/stack.yaml
deleted file mode 100644
index 12aead6562c5..000000000000
--- a/srcpkgs/hlint/files/stack.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-resolver: lts-16.13
-packages: [.]
-extra-deps:
-  - ghc-lib-parser-8.8.4.20200716
-  - ghc-lib-parser-ex-8.8.5.8
-ghc-options:
-    "$locals": -Wunused-imports -Worphans -Wunused-top-binds -Wunused-local-binds -Wincomplete-patterns
diff --git a/srcpkgs/hlint/patches/data.patch b/srcpkgs/hlint/patches/data.patch
index bdfac204f477..c73b376e5df7 100644
--- a/srcpkgs/hlint/patches/data.patch
+++ b/srcpkgs/hlint/patches/data.patch
@@ -1,13 +1,11 @@
-diff --git src/CmdLine.hs src/CmdLine.hs
-index 8c3d530..ccf7aac 100644
 --- src/CmdLine.hs
 +++ src/CmdLine.hs
-@@ -52,7 +52,7 @@ automatic cmd = case cmd of
+@@ -58,7 +58,7 @@
                  b <- doesDirectoryExist x
-                 if b then return cmd{cmdDataDir=x} else do
+                 if b then pure cmd{cmdDataDir=x} else do
                      exe <- getExecutablePath
--                    return cmd{cmdDataDir = takeDirectory exe </> "data"}
-+                    return cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
+-                    pure cmd{cmdDataDir = takeDirectory exe </> "data"}
++                    pure cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
          git cmd
              | cmdGit cmd = do
                  mgit <- findExecutable "git"
diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index 16fbb03ce2b9..fb30f947a452 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,16 +1,16 @@
 # Template file for 'hlint'
 pkgname=hlint
-version=2.2.11
-revision=2
+version=3.2.7
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
-homepage="https://github.com/ndmitchell/${pkgname}"
+homepage="https://github.com/ndmitchell/hlint"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=207539d3627efd3caed9e6fd3b1aeb8f1eb64553f1f9f166090adbf2fb71e172
+checksum=fcdeefcc79a52206add44b409abcab48c5fe2adff9d5aff077acbc43c702b54e
 nocross=yes # Can't yet cross compile Haskell
 nopie_files="/usr/bin/hlint"
 

From d9808fdc48d4b80f8fe3cd50a778faba5bafdd7b Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:43:37 +0100
Subject: [PATCH 07/17] kmonad: bump for ghc 8.10.4

---
 srcpkgs/kmonad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index 13e8845581ae..8c34a920ba7d 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,9 +1,9 @@
 # Template file for 'kmonad'
 pkgname=kmonad
 version=0.4.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage=lts-16.13
+stackage=lts-17.5
 short_desc="Keyboard remapping utility providing qmk-like functionality"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"

From 9b6131f955e46dc8e6cbe1122306211b80e122c8 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 16:21:35 +0100
Subject: [PATCH 08/17] hoogle: bump for ghc 8.10.4

---
 srcpkgs/hoogle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 4305ac4ae6e8..eafda8747cdf 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,9 +1,9 @@
 # Template file for 'hoogle'
 pkgname=hoogle
 version=5.0.18.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="zlib-devel"
 short_desc="Haskell API search engine"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From 1a253b7d6bbab29074a5cc19eaf04db278dc0909 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 11:18:37 +0100
Subject: [PATCH 09/17] cgrep: bump for ghc 8.10.4

---
 srcpkgs/cgrep/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index 7b4047614a71..15eda3bafd0e 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,12 +1,12 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.6.33
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.18"
+stackage="lts-17.5"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="https://awgn.github.io/cgrep/"
 distfiles="https://github.com/awgn/${pkgname}/archive/v${version}.tar.gz"

From 0af9af703352f4a4ff19641bb320a61b4bca3b5e Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 15:03:05 +0100
Subject: [PATCH 10/17] debug-me: bump for ghc 8.10.4

---
 srcpkgs/debug-me/files/stack.yaml                     |  2 +-
 .../patches/{ghc8.8.3.patch => ghc8.10.4.patch}       | 11 +++++++++++
 srcpkgs/debug-me/template                             |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 rename srcpkgs/debug-me/patches/{ghc8.8.3.patch => ghc8.10.4.patch} (70%)

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index 9c88cea9ab3c..ecff9d9d18f2 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - '.'
-resolver: lts-16.13
+resolver: lts-17.5
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/patches/ghc8.8.3.patch b/srcpkgs/debug-me/patches/ghc8.10.4.patch
similarity index 70%
rename from srcpkgs/debug-me/patches/ghc8.8.3.patch
rename to srcpkgs/debug-me/patches/ghc8.10.4.patch
index f1779331c5a9..9cc19db63be3 100644
--- a/srcpkgs/debug-me/patches/ghc8.8.3.patch
+++ b/srcpkgs/debug-me/patches/ghc8.10.4.patch
@@ -20,3 +20,14 @@
  		defaultSettings
 
  checkEnv :: ServerOpts -> IO ServerOpts
+--- debug-me.cabal
++++ debug-me.cabal
+@@ -64,7 +64,7 @@
+     , stm-chans (>= 3.0)
+     , posix-pty (>= 0.2.1)
+     , terminal-size (>= 0.3)
+-    , aeson (>= 0.11 && < 1.5)
++    , aeson (>= 0.11 && < 1.6)
+     , sandi (>= 0.4)
+     , text (>= 1.2.2)
+     , optparse-applicative (>= 0.12)
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 3df514e0be48..797c52f1f479 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -1,7 +1,7 @@
 # Template file for 'debug-me'
 pkgname=debug-me
 version=1.20200820
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"

From 5417ab6ade531136197df1a876f38761c98980cf Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 20 Mar 2021 11:26:04 +0100
Subject: [PATCH 11/17] darcs: bump for ghc 8.10.4

---
 srcpkgs/darcs/files/stack.yaml | 2 +-
 srcpkgs/darcs/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index 3766e74cccb0..cfc1efb94d53 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index bdbe3f14cc6f..6aa45fa21535 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.3
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From 8b848720a1835c1d2e5626932f9ed6e15312e3f7 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 08:56:29 +0100
Subject: [PATCH 12/17] hledger: bump for ghc 8.10.4

---
 srcpkgs/hledger/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template
index b34e8ccd4652..1727a49252b7 100644
--- a/srcpkgs/hledger/template
+++ b/srcpkgs/hledger/template
@@ -1,7 +1,7 @@
 # Template file for 'hledger'
 pkgname=hledger
 version=1.21
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel ncurses-devel"
 short_desc="Simple, precise, plain text accounting"

From d7f8059f539656dd559d6582d0cb27a0c0efa548 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 10:57:42 +0100
Subject: [PATCH 13/17] pandoc: bump for ghc 8.10.4

Citeproc support is build in now.  The change of maintainership was
suggested by Leah.
---
 srcpkgs/pandoc/files/stack.yaml | 23 -----------------------
 srcpkgs/pandoc/template         |  5 +++--
 2 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/pandoc/files/stack.yaml

diff --git a/srcpkgs/pandoc/files/stack.yaml b/srcpkgs/pandoc/files/stack.yaml
deleted file mode 100644
index 82a5fcaded3f..000000000000
--- a/srcpkgs/pandoc/files/stack.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-resolver: lts-17.9
-
-packages:
-  - ./pandoc-2.11.4
-  - ./pandoc-sidenote-0.20.0
-
-flags:
-  pandoc:
-    trypandoc: false
-    embed_data_files: true
-
-extra-deps:
-  - pandoc-types-1.22
-  - haddock-library-1.9.0
-  - regex-pcre-builtin-0.95.2.3.8.43
-  - hslua-1.2.0
-  - jira-wiki-markup-1.3.4
-  - commonmark-0.1.1.4
-  - commonmark-extensions-0.2.0.4
-  - commonmark-pandoc-0.2.0.1
-
-ghc-options:
-   "$locals": -fhide-source-paths -Wno-missing-home-modules
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index ad233dd0aaf3..8f2a9952d847 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,18 +2,19 @@
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
 version=2.11.4
-revision=1
+revision=2
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
+stackage="lts-17.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
 hostmakedepends="pkg-config unzip wget"
 makedepends="zlib-devel lua53-devel tar"
 short_desc="Universal converter between markup formats"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, MIT"
 homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz

From b440e882ab4d9cbbc4f08be829208f281b4c9afd Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 11:16:14 +0100
Subject: [PATCH 14/17] shellcheck: bump for ghc 8.10.4

---
 srcpkgs/shellcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 33381c2dac8f..76d479a12fca 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,9 +1,9 @@
 # Template file for 'shellcheck'
 pkgname=shellcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 hostmakedepends="pandoc"
 short_desc="Static analysis tool for shell scripts"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

From 405cd5afdfe5607ea16a435eee8c8c65ba22a865 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 16:07:47 +0100
Subject: [PATCH 15/17] git-mediate: update to 1.0.8.1

---
 srcpkgs/git-mediate/patches/ghc8.8.3.patch | 19 -------------------
 srcpkgs/git-mediate/template               |  8 ++++----
 2 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/git-mediate/patches/ghc8.8.3.patch

diff --git a/srcpkgs/git-mediate/patches/ghc8.8.3.patch b/srcpkgs/git-mediate/patches/ghc8.8.3.patch
deleted file mode 100644
index 7928b61ef3a4..000000000000
--- a/srcpkgs/git-mediate/patches/ghc8.8.3.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- git-mediate.cabal	2001-09-09 03:46:40.000000000 +0200
-+++ git-mediate.cabal	2020-03-30 15:32:48.959537620 +0200
-@@ -72,7 +72,7 @@
-   ghc-options:         -O2 -Wall
-   -- other-extensions:
-   build-depends:       base >=4.8 && <5
--                     , base-compat >= 0.8.2 && < 0.11
-+                     , base-compat >= 0.8.2 && < 0.12
-                      , mtl >=2.1
-                      , directory >=1.2
-                      , process >=1.2
-@@ -80,6 +80,6 @@
-                      , unix-compat >=0.4.2.0
-                      , Diff >=0.4
-                      , ansi-terminal >=0.6.2
--                     , optparse-applicative >=0.11 && <0.15
-+                     , optparse-applicative >=0.11 && <0.16
-   hs-source-dirs:      src
-   default-language:    Haskell2010
diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template
index aa3979d3435a..971a6236224f 100644
--- a/srcpkgs/git-mediate/template
+++ b/srcpkgs/git-mediate/template
@@ -1,15 +1,15 @@
 # Template file for 'git-mediate'
 pkgname=git-mediate
-version=1.0.8
-revision=4
+version=1.0.8.1
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 depends="git"
 short_desc="Tool to help resolving git conflicts"
 maintainer="Peter Wang <novalazy@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/Peaker/git-mediate"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=81220f7e20a3913bc147b69681666ad22e60e5b759a1becad78ee28dcad8013d
+checksum=ee44841d37ded70cbcd8edd1e233a344d0118295e0bd2f0c6983ed00f619c467
 nocross=yes
 nopie_files="/usr/bin/git-mediate"

From d857817322feb332660125e7751227ae5decdc49 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 16:11:25 +0100
Subject: [PATCH 16/17] git-annex: bump for ghc 8.10.4

---
 srcpkgs/git-annex/files/stack.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
index a6d4f6aeee64..5d457bebde83 100644
--- a/srcpkgs/git-annex/files/stack.yaml
+++ b/srcpkgs/git-annex/files/stack.yaml
@@ -28,4 +28,5 @@ extra-deps:
  - network-3.1.0.1
 explicit-setup-deps:
   git-annex: true
-resolver: lts-16.27
+resolver: lts-17.5
+allow-newer: true

From eb09193484b024b18c81fde1fb9108e1c4e0b9b6 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 30 Mar 2021 12:11:45 +0200
Subject: [PATCH 17/17] haskell-language-server: bump for ghc 8.10.4

---
 srcpkgs/haskell-language-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index 438c760f0a1f..7afa89c452f7 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,12 +1,12 @@
 # Template file for 'haskell-language-server'
 pkgname=haskell-language-server
 version=1.0.0
-revision=1
+revision=2
 # GHC only panics on i686
 # https://github.com/void-linux/void-packages/pull/27961/checks?check_run_id=2181519625#step:8:5936
 archs="~i686"
 build_style="haskell-stack"
-make_build_args="--stack-yaml stack-8.8.4.yaml"
+make_build_args="--stack-yaml stack-8.10.4.yaml"
 makedepends="ncurses-devel ncurses-libtinfo-devel icu-devel zlib-devel"
 short_desc="Integration of ghcide and haskell-ide-engine"
 maintainer="Wayne Van Son <waynevanson@gmail.com>"

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (22 preceding siblings ...)
  2021-04-28  7:42 ` [PR PATCH] [Updated] " slotThe
@ 2021-04-30 22:58 ` q66
  2021-05-20 15:30 ` slotThe
                   ` (14 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: q66 @ 2021-04-30 22:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 240 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/29506#issuecomment-830444681

Comment:
sorry, i haven't been able to get to this - i should be able to soon though, within the next two weeks.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (23 preceding siblings ...)
  2021-04-30 22:58 ` q66
@ 2021-05-20 15:30 ` slotThe
  2021-05-20 17:32 ` q66
                   ` (13 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-05-20 15:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 877 bytes --]

New comment by slotThe on void-packages repository

https://github.com/void-linux/void-packages/pull/29506#issuecomment-845223038

Comment:
Oh, I completely forgot about this pr... 

In the meantime, stack got updated, so we should probably bump that as well.  All that's left to be done is then 

  - Bump stack
  - Check if I built `ghc-bin` correctly on i686-musl (I don't remember why I was so careful when adding this, but I suppose there were reasons)
  - Build everything for ppc (@q66)
  - Upload the binaries that need it 
  - Decide what we want to do with the xmonad packages.  I personally would be in favour of dropping them if no one steps up; installing xmonad via stack is preferable anyways, in my opinion.  The new xmonad tutorial (xmonad/xmonad/pull/278) includes instructions for getting set up with stack and I can confirm that they work on Void. 

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (24 preceding siblings ...)
  2021-05-20 15:30 ` slotThe
@ 2021-05-20 17:32 ` q66
  2021-05-20 17:53 ` [PR PATCH] [Updated] " slotThe
                   ` (12 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: q66 @ 2021-05-20 17:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 251 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/29506#issuecomment-845317686

Comment:
i will be handling rust early next week, and i should be able to do ghc afterwards, so next weekend should be okay

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (25 preceding siblings ...)
  2021-05-20 17:32 ` q66
@ 2021-05-20 17:53 ` slotThe
  2021-06-05 15:07 ` slotThe
                   ` (11 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-05-20 17:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3253 bytes --]

There is an updated pull request by slotThe against master on the void-packages repository

https://github.com/slotThe/void-packages ghc-8.10.4
https://github.com/void-linux/void-packages/pull/29506

[WIP] GHC 8.10.4
It's that time of the year again!

- [X] ghc; I took over as maintainer here, @leahneukirchen said that was okay on IRC (cc'ing here to make sure)
- [ ] ghc-bin; took over as mainainer of orphaned package.
    - [X] x86_64-musl; [Link here](https://www34.zippyshare.com/d/yvtjb7uJ/38780/ghc-8.10.4-x86_64-void-linux-musl.tar.xz)
    - [ ] i686-musl [Cautious link](https://www42.zippyshare.com/d/wOOz0Zsx/29048/ghc-8.10.4-i386-unknown-linux.tar.xz) **WARNING**: I don't know if I did this correctly, so It'd be nice if someone could test this
    cc @q66 for these
    - [ ] ppc64le
    - [ ] ppc64le-musl
- [X] cabal-install
- [X] stack
 
Rebuild literally every single haskell package we have and see if anything's broken:

- [x] git-mediate
- [x] kmonad
- [x] cgrep; took over as mainainer of orphaned package.
- [x] debug-me
- [x] hlint
- [x] hoogle
- [x] darcs
- [x] shellcheck
- [x] git-annex
- [x] hledger
- [x] pandoc
- [x] xmobar
- [x] HLS; this is #27961 once that's merged

For the following two I'd like to fix #6414 while we're at it.  Because stack can't install libraries globally, this would involve either removing these packages entirely and advising users to install them in their own [stack or cabal projects](https://github.com/xmonad/xmonad-testing), or finding a way to build them with cabal and updating ghc's data base accordingly.  This would probably use `v1` commands, as we don't want to nuke our users db if we update xmonad. Cc @xaltsc as the current maintainer and @chilledfrogs as someone who might want to tackle this (if I read the IRC discussion correctly). 

- [ ] xmonad
- [ ] xmonad-contrib

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/29506.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghc-8.10.4-29506.patch --]
[-- Type: text/x-diff, Size: 37482 bytes --]

From bcb8d0e15a58e092d4db9226ed390e9d4bc71a5c Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 31 Jan 2021 14:31:24 +0100
Subject: [PATCH 01/17] ghc: update to 8.10.4

The change of maintainership was okay-ed by Leah.
---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch | 41 +++++++++++-------------
 srcpkgs/ghc/template                     |  8 ++---
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index ac353ed417e5..c9bd2583abe0 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -85,7 +85,7 @@ index ec3c18a..0359be7 100644
 +        in Right [ 0x3D800000 .|. hi16 w32,
 +                   0x618C0000 .|. lo16 w32,
 +                   0x7D8903A6, 0x4E800420 ]
- 
+
      ArchPPC64LE ->
          -- The ABI requires r12 to point to the function's entry point.
 diff --git a/rts/Adjustor.c b/rts/Adjustor.c
@@ -93,7 +93,7 @@ index d360cfe..ab7ede7 100644
 --- a/rts/Adjustor.c
 +++ b/rts/Adjustor.c
 @@ -49,7 +49,7 @@ Haskell side.
- 
+
  #if defined(i386_HOST_ARCH)
  extern void adjustorCode(void);
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
@@ -104,16 +104,16 @@ index d360cfe..ab7ede7 100644
 @@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
  extern void obscure_ccall_ret_code(void);
  #endif
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
- 
+
  /* !!! !!! WARNING: !!! !!!
 @@ -318,7 +318,7 @@ typedef struct AdjustorStub {
  } AdjustorStub;
  #endif
- 
+
 -#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  static int totalArgumentSize(char *typeString)
@@ -131,10 +131,10 @@ index d360cfe..ab7ede7 100644
 @@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
          }
      }
- 
+
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-         
+
  #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
  #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
 @@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
@@ -151,9 +151,9 @@ index 2795b83..63cfe91 100644
 --- a/rts/AdjustorAsm.S
 +++ b/rts/AdjustorAsm.S
 @@ -2,7 +2,7 @@
- 
+
  /* ******************************** PowerPC ******************************** */
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
@@ -166,34 +166,31 @@ index 934926e..2ff8662 100644
 @@ -717,7 +717,7 @@ StgRunIsImplementedInAssembler(void)
     Everything is in assembler, so we don't have to deal with GCC...
     -------------------------------------------------------------------------- */
- 
+
 -#if defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
- 
+
  static void GNUC3_ATTRIBUTE(used)
  StgRunIsImplementedInAssembler(void)
 @@ -842,7 +842,7 @@ StgRunIsImplementedInAssembler(void)
- 
+
  #endif
- 
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
  /* -----------------------------------------------------------------------------
     PowerPC 64 little endian architecture
- 
+
 diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
 index 9274a44..3b4fc33 100644
 --- a/rts/StgCRunAsm.S
 +++ b/rts/StgCRunAsm.S
-@@ -1,7 +1,7 @@
- #include "ghcconfig.h"
- #include "rts/Constants.h"
- 
+@@ -5,7 +5,7 @@
+  * then functions StgRun/StgReturn are implemented in file StgCRun.c */
+ #if !defined(USE_MINIINTERPRETER)
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
- # ifdef linux_HOST_OS
+ # if defined(linux_HOST_OS)
  # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
  	.file	"StgCRun.c"
--- 
-2.30.0
-
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 0b1440b2f6d9..c6acfa79e75d 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,8 +1,8 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.8.4
-revision=2
+version=8.10.4
+revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
 hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
@@ -10,11 +10,11 @@ hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
 makedepends="libnuma-devel"
 depends="perl gcc libffi-devel gmp-devel libnuma-devel"
 short_desc="Glorious Haskell Compiler"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d
+checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
 patch_args="-Np1"
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"

From 58c45b5bf4263b886eef01ca8a3d1fda14730808 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 28 Feb 2021 18:34:26 +0100
Subject: [PATCH 02/17] 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 000000000000..63965ca12d44
--- /dev/null
+++ b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
@@ -0,0 +1,43 @@
+--- bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
++++ 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 1dd08f07fb44..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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]\."
-                        #  >= 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 2c15789b1f9d..99ebb54427fe 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 <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=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
 }

From 7062c9b9e5efb7e638831cc798c5e4c0be9ae033 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 12:37:23 +0100
Subject: [PATCH 03/17] ghc-bin: update to 8.10.4

Take over maintainership of orphaned package.
---
 srcpkgs/ghc-bin/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 9101601358b9..bf512350fd86 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,13 +1,13 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.8.4
+version=8.10.4
 revision=1
 archs="i686* x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
 short_desc="Glorious Haskell Compiler - precompiled binaries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 nostrip=yes
@@ -15,21 +15,21 @@ noshlibprovides=yes
 conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
-	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb8-linux.tar.xz"
-	checksum=51a36892f1264744195274187298d13ac62bce2da86d4ddf76d8054ab90f2feb
+	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
+	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=779647d3f4e6e39da9e13b2559319ede76b4fff1107e4dc369a09aadeecad971
+	checksum=56e53f46ad53e6640753d608d01228528fca8ccec01b09bba6ad3b6890a18994
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0
+	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
 	;;
 i686-musl)
 	distfiles="https://distfiles.voidlinux.de/ghc-${version}-i386-unknown-linux-musl.tar.xz"
-	checksum=8d84fbab62b3712bdcfb92f7d258a0d15d8295397d84b48716a3c625f09be782
+	checksum=05363642430c9c5f6368f0c1873c7521b75cf2eacd8c4a55e69939e685d4acdd
 	;;
 ppc64le)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz"

From 3921b82bf8e4136738b7f13a6b6c120a5afc1e58 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 15:11:29 +0100
Subject: [PATCH 04/17] stack: update to 2.7.1

---
 srcpkgs/stack/patches/datakinds.patch | 14 ------
 srcpkgs/stack/patches/ghc-8.8.4.patch | 70 ---------------------------
 srcpkgs/stack/patches/ppc.patch       | 25 +++++-----
 srcpkgs/stack/template                | 10 ++--
 4 files changed, 18 insertions(+), 101 deletions(-)
 delete mode 100644 srcpkgs/stack/patches/datakinds.patch
 delete mode 100644 srcpkgs/stack/patches/ghc-8.8.4.patch

diff --git a/srcpkgs/stack/patches/datakinds.patch b/srcpkgs/stack/patches/datakinds.patch
deleted file mode 100644
index 1c06480515f7..000000000000
--- a/srcpkgs/stack/patches/datakinds.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Stack/Storage/User.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/User.hs	2020-12-06 20:51:06.632607164 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
---- src/Stack/Storage/Project.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/Project.hs	2020-12-06 21:55:21.349484738 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch
deleted file mode 100644
index 6b55c176e150..000000000000
--- a/srcpkgs/stack/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- masterdir/builddir/stack-2.5.1/stack.cabal	2020-10-17 17:19:10.724179166 +0200
-+++ stack.cabal	2020-10-17 17:18:03.803498792 +0200
-@@ -234,6 +234,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -272,7 +273,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -359,6 +360,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -396,7 +398,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -480,6 +482,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -518,7 +521,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , optparse-generic
-     , pantry >=0.5.1.3
-     , path
-@@ -609,6 +612,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -647,7 +651,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
diff --git a/srcpkgs/stack/patches/ppc.patch b/srcpkgs/stack/patches/ppc.patch
index 1b5bc191b47c..64ad365c47d2 100644
--- a/srcpkgs/stack/patches/ppc.patch
+++ b/srcpkgs/stack/patches/ppc.patch
@@ -1,13 +1,14 @@
 --- src/Stack/Setup.hs
 +++ src/Stack/Setup.hs
-@@ -95,5 +95,6 @@ import              System.IO.Error (isPermissionError)
+@@ -91,6 +91,7 @@
  import              System.FilePath (searchPathSeparator)
  import qualified    System.FilePath as FP
  import              System.Permissions (setFileExecutable)
 +import              System.Endian (getSystemEndianness, Endianness (..))
  import              System.Uname (getRelease)
  import              Data.List.Split (splitOn)
-@@ -1264,4 +1265,9 @@ getOSKey platform =
+ 
+@@ -1241,6 +1242,11 @@
          Platform X86_64                Cabal.Windows -> return "windows64"
          Platform Arm                   Cabal.Linux   -> return "linux-armv7"
          Platform AArch64               Cabal.Linux   -> return "linux-aarch64"
@@ -16,16 +17,16 @@
 +            case getSystemEndianness of
 +                LittleEndian -> return "linux-powerpc64le"
 +                BigEndian    -> return "linux-powerpc64"
+         Platform Sparc                 Cabal.Linux   -> return "linux-sparc"
          Platform arch os -> throwM $ UnsupportedSetupCombo os arch
-
- downloadFromInfo
+ 
 --- stack.cabal
 +++ stack.cabal
-@@ -235,6 +235,7 @@ library
-       , conduit
-       , conduit-extra
-       , containers
-+      , cpu >=0.1.2
-       , cryptonite
-       , cryptonite-conduit
-       , deepseq
+@@ -246,6 +246,7 @@
+         conduit >=1.3.4.1,
+         conduit-extra >=1.3.5,
+         containers >=0.6.2.1,
++        cpu >=0.1.2,
+         cryptonite >=0.27,
+         cryptonite-conduit >=0.2.2,
+         deepseq >=1.4.4.0,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 257aba10e50d..b95bf9ec59e9 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.5.1
+version=2.7.1
 revision=1
-_stackage="lts-16.13"
+_stackage="lts-17.5"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -10,10 +10,10 @@ short_desc="Cross-platform program for developing Haskell projects"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://haskellstack.org"
-distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
+distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076
- b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58"
+checksum="605bd8368b6fef9323ea71b79b08dd62270c49089a86b79fe67355f6b82cbc26
+ d03bee7e51bbdec5053573f94f644a6baeb140cdd95dbe47261e03c04306b252"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 297ea56650017cb4f03c6400870ae0184a40ae4e Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 16 Mar 2021 17:41:58 +0100
Subject: [PATCH 05/17] xmobar: bump for ghc 8.10.4

---
 srcpkgs/xmobar/files/stack.yaml | 2 +-
 srcpkgs/xmobar/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 7bc4bf189d23..52fd0e3e49fe 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 81ae92fd2940..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.37
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From db20107b43584c18dc703a85bc23e55ac9cc5c61 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:03:10 +0100
Subject: [PATCH 06/17] hlint: update to 3.2.7

---
 srcpkgs/hlint/files/stack.yaml   |  7 -------
 srcpkgs/hlint/patches/data.patch | 10 ++++------
 srcpkgs/hlint/template           | 10 +++++-----
 3 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/hlint/files/stack.yaml

diff --git a/srcpkgs/hlint/files/stack.yaml b/srcpkgs/hlint/files/stack.yaml
deleted file mode 100644
index 12aead6562c5..000000000000
--- a/srcpkgs/hlint/files/stack.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-resolver: lts-16.13
-packages: [.]
-extra-deps:
-  - ghc-lib-parser-8.8.4.20200716
-  - ghc-lib-parser-ex-8.8.5.8
-ghc-options:
-    "$locals": -Wunused-imports -Worphans -Wunused-top-binds -Wunused-local-binds -Wincomplete-patterns
diff --git a/srcpkgs/hlint/patches/data.patch b/srcpkgs/hlint/patches/data.patch
index bdfac204f477..c73b376e5df7 100644
--- a/srcpkgs/hlint/patches/data.patch
+++ b/srcpkgs/hlint/patches/data.patch
@@ -1,13 +1,11 @@
-diff --git src/CmdLine.hs src/CmdLine.hs
-index 8c3d530..ccf7aac 100644
 --- src/CmdLine.hs
 +++ src/CmdLine.hs
-@@ -52,7 +52,7 @@ automatic cmd = case cmd of
+@@ -58,7 +58,7 @@
                  b <- doesDirectoryExist x
-                 if b then return cmd{cmdDataDir=x} else do
+                 if b then pure cmd{cmdDataDir=x} else do
                      exe <- getExecutablePath
--                    return cmd{cmdDataDir = takeDirectory exe </> "data"}
-+                    return cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
+-                    pure cmd{cmdDataDir = takeDirectory exe </> "data"}
++                    pure cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
          git cmd
              | cmdGit cmd = do
                  mgit <- findExecutable "git"
diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index 16fbb03ce2b9..fb30f947a452 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,16 +1,16 @@
 # Template file for 'hlint'
 pkgname=hlint
-version=2.2.11
-revision=2
+version=3.2.7
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
-homepage="https://github.com/ndmitchell/${pkgname}"
+homepage="https://github.com/ndmitchell/hlint"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=207539d3627efd3caed9e6fd3b1aeb8f1eb64553f1f9f166090adbf2fb71e172
+checksum=fcdeefcc79a52206add44b409abcab48c5fe2adff9d5aff077acbc43c702b54e
 nocross=yes # Can't yet cross compile Haskell
 nopie_files="/usr/bin/hlint"
 

From 759dbcfb6e493c2e7a54b83609c7031022d0b44f Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:43:37 +0100
Subject: [PATCH 07/17] kmonad: bump for ghc 8.10.4

---
 srcpkgs/kmonad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index 13e8845581ae..8c34a920ba7d 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,9 +1,9 @@
 # Template file for 'kmonad'
 pkgname=kmonad
 version=0.4.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage=lts-16.13
+stackage=lts-17.5
 short_desc="Keyboard remapping utility providing qmk-like functionality"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"

From 77bea581c295a6f8fdaf24dd870dd274753e8a6f Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 16:21:35 +0100
Subject: [PATCH 08/17] hoogle: bump for ghc 8.10.4

---
 srcpkgs/hoogle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 4305ac4ae6e8..eafda8747cdf 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,9 +1,9 @@
 # Template file for 'hoogle'
 pkgname=hoogle
 version=5.0.18.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="zlib-devel"
 short_desc="Haskell API search engine"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From ff6bcc76f5fa2220691f7a0c8e5ebbcee37990e3 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 11:18:37 +0100
Subject: [PATCH 09/17] cgrep: bump for ghc 8.10.4

---
 srcpkgs/cgrep/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index 7b4047614a71..15eda3bafd0e 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,12 +1,12 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.6.33
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.18"
+stackage="lts-17.5"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="https://awgn.github.io/cgrep/"
 distfiles="https://github.com/awgn/${pkgname}/archive/v${version}.tar.gz"

From 5aa33f10541923ff58e39e91a1829bb42e8ec850 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 15:03:05 +0100
Subject: [PATCH 10/17] debug-me: bump for ghc 8.10.4

---
 srcpkgs/debug-me/files/stack.yaml                     |  2 +-
 .../patches/{ghc8.8.3.patch => ghc8.10.4.patch}       | 11 +++++++++++
 srcpkgs/debug-me/template                             |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 rename srcpkgs/debug-me/patches/{ghc8.8.3.patch => ghc8.10.4.patch} (70%)

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index 9c88cea9ab3c..ecff9d9d18f2 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - '.'
-resolver: lts-16.13
+resolver: lts-17.5
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/patches/ghc8.8.3.patch b/srcpkgs/debug-me/patches/ghc8.10.4.patch
similarity index 70%
rename from srcpkgs/debug-me/patches/ghc8.8.3.patch
rename to srcpkgs/debug-me/patches/ghc8.10.4.patch
index f1779331c5a9..9cc19db63be3 100644
--- a/srcpkgs/debug-me/patches/ghc8.8.3.patch
+++ b/srcpkgs/debug-me/patches/ghc8.10.4.patch
@@ -20,3 +20,14 @@
  		defaultSettings
 
  checkEnv :: ServerOpts -> IO ServerOpts
+--- debug-me.cabal
++++ debug-me.cabal
+@@ -64,7 +64,7 @@
+     , stm-chans (>= 3.0)
+     , posix-pty (>= 0.2.1)
+     , terminal-size (>= 0.3)
+-    , aeson (>= 0.11 && < 1.5)
++    , aeson (>= 0.11 && < 1.6)
+     , sandi (>= 0.4)
+     , text (>= 1.2.2)
+     , optparse-applicative (>= 0.12)
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 3df514e0be48..797c52f1f479 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -1,7 +1,7 @@
 # Template file for 'debug-me'
 pkgname=debug-me
 version=1.20200820
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"

From e4e59cfecf61fd261284b562b5fe0ecbbb446111 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 20 Mar 2021 11:26:04 +0100
Subject: [PATCH 11/17] darcs: bump for ghc 8.10.4

---
 srcpkgs/darcs/files/stack.yaml | 2 +-
 srcpkgs/darcs/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index 3766e74cccb0..cfc1efb94d53 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index bdbe3f14cc6f..6aa45fa21535 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.3
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From cd256ca401d559fd4eb4de5459d83bf25642f56e Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 08:56:29 +0100
Subject: [PATCH 12/17] hledger: bump for ghc 8.10.4

---
 srcpkgs/hledger/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template
index b34e8ccd4652..1727a49252b7 100644
--- a/srcpkgs/hledger/template
+++ b/srcpkgs/hledger/template
@@ -1,7 +1,7 @@
 # Template file for 'hledger'
 pkgname=hledger
 version=1.21
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel ncurses-devel"
 short_desc="Simple, precise, plain text accounting"

From c3189fc60cb90c8cee56b42149889c327a552c08 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 10:57:42 +0100
Subject: [PATCH 13/17] pandoc: bump for ghc 8.10.4

Citeproc support is build in now.  The change of maintainership was
suggested by Leah.
---
 srcpkgs/pandoc/files/stack.yaml | 23 -----------------------
 srcpkgs/pandoc/template         |  5 +++--
 2 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/pandoc/files/stack.yaml

diff --git a/srcpkgs/pandoc/files/stack.yaml b/srcpkgs/pandoc/files/stack.yaml
deleted file mode 100644
index 82a5fcaded3f..000000000000
--- a/srcpkgs/pandoc/files/stack.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-resolver: lts-17.9
-
-packages:
-  - ./pandoc-2.11.4
-  - ./pandoc-sidenote-0.20.0
-
-flags:
-  pandoc:
-    trypandoc: false
-    embed_data_files: true
-
-extra-deps:
-  - pandoc-types-1.22
-  - haddock-library-1.9.0
-  - regex-pcre-builtin-0.95.2.3.8.43
-  - hslua-1.2.0
-  - jira-wiki-markup-1.3.4
-  - commonmark-0.1.1.4
-  - commonmark-extensions-0.2.0.4
-  - commonmark-pandoc-0.2.0.1
-
-ghc-options:
-   "$locals": -fhide-source-paths -Wno-missing-home-modules
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index ad233dd0aaf3..8f2a9952d847 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,18 +2,19 @@
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
 version=2.11.4
-revision=1
+revision=2
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
+stackage="lts-17.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
 hostmakedepends="pkg-config unzip wget"
 makedepends="zlib-devel lua53-devel tar"
 short_desc="Universal converter between markup formats"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, MIT"
 homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz

From 82ca6c770926ade0f679d22944d44f8917229cd9 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 11:16:14 +0100
Subject: [PATCH 14/17] shellcheck: bump for ghc 8.10.4

---
 srcpkgs/shellcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 33381c2dac8f..76d479a12fca 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,9 +1,9 @@
 # Template file for 'shellcheck'
 pkgname=shellcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 hostmakedepends="pandoc"
 short_desc="Static analysis tool for shell scripts"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

From d0b4eafaa7cad1a7e7f1323e4f45ea3e5372f8a7 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 16:07:47 +0100
Subject: [PATCH 15/17] git-mediate: update to 1.0.8.1

---
 srcpkgs/git-mediate/patches/ghc8.8.3.patch | 19 -------------------
 srcpkgs/git-mediate/template               |  8 ++++----
 2 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/git-mediate/patches/ghc8.8.3.patch

diff --git a/srcpkgs/git-mediate/patches/ghc8.8.3.patch b/srcpkgs/git-mediate/patches/ghc8.8.3.patch
deleted file mode 100644
index 7928b61ef3a4..000000000000
--- a/srcpkgs/git-mediate/patches/ghc8.8.3.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- git-mediate.cabal	2001-09-09 03:46:40.000000000 +0200
-+++ git-mediate.cabal	2020-03-30 15:32:48.959537620 +0200
-@@ -72,7 +72,7 @@
-   ghc-options:         -O2 -Wall
-   -- other-extensions:
-   build-depends:       base >=4.8 && <5
--                     , base-compat >= 0.8.2 && < 0.11
-+                     , base-compat >= 0.8.2 && < 0.12
-                      , mtl >=2.1
-                      , directory >=1.2
-                      , process >=1.2
-@@ -80,6 +80,6 @@
-                      , unix-compat >=0.4.2.0
-                      , Diff >=0.4
-                      , ansi-terminal >=0.6.2
--                     , optparse-applicative >=0.11 && <0.15
-+                     , optparse-applicative >=0.11 && <0.16
-   hs-source-dirs:      src
-   default-language:    Haskell2010
diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template
index aa3979d3435a..971a6236224f 100644
--- a/srcpkgs/git-mediate/template
+++ b/srcpkgs/git-mediate/template
@@ -1,15 +1,15 @@
 # Template file for 'git-mediate'
 pkgname=git-mediate
-version=1.0.8
-revision=4
+version=1.0.8.1
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 depends="git"
 short_desc="Tool to help resolving git conflicts"
 maintainer="Peter Wang <novalazy@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/Peaker/git-mediate"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=81220f7e20a3913bc147b69681666ad22e60e5b759a1becad78ee28dcad8013d
+checksum=ee44841d37ded70cbcd8edd1e233a344d0118295e0bd2f0c6983ed00f619c467
 nocross=yes
 nopie_files="/usr/bin/git-mediate"

From 5076fc6c244ba7726b0145b905ff6cb5449cbead Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 16:11:25 +0100
Subject: [PATCH 16/17] git-annex: bump for ghc 8.10.4

---
 srcpkgs/git-annex/files/stack.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
index a6d4f6aeee64..5d457bebde83 100644
--- a/srcpkgs/git-annex/files/stack.yaml
+++ b/srcpkgs/git-annex/files/stack.yaml
@@ -28,4 +28,5 @@ extra-deps:
  - network-3.1.0.1
 explicit-setup-deps:
   git-annex: true
-resolver: lts-16.27
+resolver: lts-17.5
+allow-newer: true

From 04ddbac67ce18c0af9f7fe988e1386182d4320b9 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 30 Mar 2021 12:11:45 +0200
Subject: [PATCH 17/17] haskell-language-server: bump for ghc 8.10.4

---
 srcpkgs/haskell-language-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index 438c760f0a1f..7afa89c452f7 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,12 +1,12 @@
 # Template file for 'haskell-language-server'
 pkgname=haskell-language-server
 version=1.0.0
-revision=1
+revision=2
 # GHC only panics on i686
 # https://github.com/void-linux/void-packages/pull/27961/checks?check_run_id=2181519625#step:8:5936
 archs="~i686"
 build_style="haskell-stack"
-make_build_args="--stack-yaml stack-8.8.4.yaml"
+make_build_args="--stack-yaml stack-8.10.4.yaml"
 makedepends="ncurses-devel ncurses-libtinfo-devel icu-devel zlib-devel"
 short_desc="Integration of ghcide and haskell-ide-engine"
 maintainer="Wayne Van Son <waynevanson@gmail.com>"

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (26 preceding siblings ...)
  2021-05-20 17:53 ` [PR PATCH] [Updated] " slotThe
@ 2021-06-05 15:07 ` slotThe
  2021-06-07  7:35 ` slotThe
                   ` (10 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-06-05 15:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3253 bytes --]

There is an updated pull request by slotThe against master on the void-packages repository

https://github.com/slotThe/void-packages ghc-8.10.4
https://github.com/void-linux/void-packages/pull/29506

[WIP] GHC 8.10.4
It's that time of the year again!

- [X] ghc; I took over as maintainer here, @leahneukirchen said that was okay on IRC (cc'ing here to make sure)
- [ ] ghc-bin; took over as mainainer of orphaned package.
    - [X] x86_64-musl; [Link here](https://www34.zippyshare.com/d/yvtjb7uJ/38780/ghc-8.10.4-x86_64-void-linux-musl.tar.xz)
    - [ ] i686-musl [Cautious link](https://www42.zippyshare.com/d/wOOz0Zsx/29048/ghc-8.10.4-i386-unknown-linux.tar.xz) **WARNING**: I don't know if I did this correctly, so It'd be nice if someone could test this
    cc @q66 for these
    - [ ] ppc64le
    - [ ] ppc64le-musl
- [X] cabal-install
- [X] stack
 
Rebuild literally every single haskell package we have and see if anything's broken:

- [x] git-mediate
- [x] kmonad
- [x] cgrep; took over as mainainer of orphaned package.
- [x] debug-me
- [x] hlint
- [x] hoogle
- [x] darcs
- [x] shellcheck
- [x] git-annex
- [x] hledger
- [x] pandoc
- [x] xmobar
- [x] HLS; this is #27961 once that's merged

For the following two I'd like to fix #6414 while we're at it.  Because stack can't install libraries globally, this would involve either removing these packages entirely and advising users to install them in their own [stack or cabal projects](https://github.com/xmonad/xmonad-testing), or finding a way to build them with cabal and updating ghc's data base accordingly.  This would probably use `v1` commands, as we don't want to nuke our users db if we update xmonad. Cc @xaltsc as the current maintainer and @chilledfrogs as someone who might want to tackle this (if I read the IRC discussion correctly). 

- [ ] xmonad
- [ ] xmonad-contrib

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/29506.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghc-8.10.4-29506.patch --]
[-- Type: text/x-diff, Size: 37482 bytes --]

From 979f448407f627b68bea6f2fbc3045dc9ad848ab Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 31 Jan 2021 14:31:24 +0100
Subject: [PATCH 01/17] ghc: update to 8.10.4

The change of maintainership was okay-ed by Leah.
---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch | 41 +++++++++++-------------
 srcpkgs/ghc/template                     |  8 ++---
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index ac353ed417e5..c9bd2583abe0 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -85,7 +85,7 @@ index ec3c18a..0359be7 100644
 +        in Right [ 0x3D800000 .|. hi16 w32,
 +                   0x618C0000 .|. lo16 w32,
 +                   0x7D8903A6, 0x4E800420 ]
- 
+
      ArchPPC64LE ->
          -- The ABI requires r12 to point to the function's entry point.
 diff --git a/rts/Adjustor.c b/rts/Adjustor.c
@@ -93,7 +93,7 @@ index d360cfe..ab7ede7 100644
 --- a/rts/Adjustor.c
 +++ b/rts/Adjustor.c
 @@ -49,7 +49,7 @@ Haskell side.
- 
+
  #if defined(i386_HOST_ARCH)
  extern void adjustorCode(void);
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
@@ -104,16 +104,16 @@ index d360cfe..ab7ede7 100644
 @@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
  extern void obscure_ccall_ret_code(void);
  #endif
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
- 
+
  /* !!! !!! WARNING: !!! !!!
 @@ -318,7 +318,7 @@ typedef struct AdjustorStub {
  } AdjustorStub;
  #endif
- 
+
 -#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  static int totalArgumentSize(char *typeString)
@@ -131,10 +131,10 @@ index d360cfe..ab7ede7 100644
 @@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
          }
      }
- 
+
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-         
+
  #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
  #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
 @@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
@@ -151,9 +151,9 @@ index 2795b83..63cfe91 100644
 --- a/rts/AdjustorAsm.S
 +++ b/rts/AdjustorAsm.S
 @@ -2,7 +2,7 @@
- 
+
  /* ******************************** PowerPC ******************************** */
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
@@ -166,34 +166,31 @@ index 934926e..2ff8662 100644
 @@ -717,7 +717,7 @@ StgRunIsImplementedInAssembler(void)
     Everything is in assembler, so we don't have to deal with GCC...
     -------------------------------------------------------------------------- */
- 
+
 -#if defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
- 
+
  static void GNUC3_ATTRIBUTE(used)
  StgRunIsImplementedInAssembler(void)
 @@ -842,7 +842,7 @@ StgRunIsImplementedInAssembler(void)
- 
+
  #endif
- 
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
  /* -----------------------------------------------------------------------------
     PowerPC 64 little endian architecture
- 
+
 diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
 index 9274a44..3b4fc33 100644
 --- a/rts/StgCRunAsm.S
 +++ b/rts/StgCRunAsm.S
-@@ -1,7 +1,7 @@
- #include "ghcconfig.h"
- #include "rts/Constants.h"
- 
+@@ -5,7 +5,7 @@
+  * then functions StgRun/StgReturn are implemented in file StgCRun.c */
+ #if !defined(USE_MINIINTERPRETER)
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
- # ifdef linux_HOST_OS
+ # if defined(linux_HOST_OS)
  # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
  	.file	"StgCRun.c"
--- 
-2.30.0
-
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 0b1440b2f6d9..c6acfa79e75d 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,8 +1,8 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.8.4
-revision=2
+version=8.10.4
+revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
 hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
@@ -10,11 +10,11 @@ hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
 makedepends="libnuma-devel"
 depends="perl gcc libffi-devel gmp-devel libnuma-devel"
 short_desc="Glorious Haskell Compiler"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d
+checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
 patch_args="-Np1"
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"

From 3e8a60c31ec002e4ae049d843424710d5c30143a Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 28 Feb 2021 18:34:26 +0100
Subject: [PATCH 02/17] 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 000000000000..63965ca12d44
--- /dev/null
+++ b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
@@ -0,0 +1,43 @@
+--- bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
++++ 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 1dd08f07fb44..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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]\."
-                        #  >= 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 2c15789b1f9d..99ebb54427fe 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 <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=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
 }

From 0b626a8c08b513edc28c59378cb93a0fab1f6b56 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 12:37:23 +0100
Subject: [PATCH 03/17] ghc-bin: update to 8.10.4

Take over maintainership of orphaned package.
---
 srcpkgs/ghc-bin/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 9101601358b9..bf512350fd86 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,13 +1,13 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.8.4
+version=8.10.4
 revision=1
 archs="i686* x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
 short_desc="Glorious Haskell Compiler - precompiled binaries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 nostrip=yes
@@ -15,21 +15,21 @@ noshlibprovides=yes
 conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
-	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb8-linux.tar.xz"
-	checksum=51a36892f1264744195274187298d13ac62bce2da86d4ddf76d8054ab90f2feb
+	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
+	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=779647d3f4e6e39da9e13b2559319ede76b4fff1107e4dc369a09aadeecad971
+	checksum=56e53f46ad53e6640753d608d01228528fca8ccec01b09bba6ad3b6890a18994
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0
+	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
 	;;
 i686-musl)
 	distfiles="https://distfiles.voidlinux.de/ghc-${version}-i386-unknown-linux-musl.tar.xz"
-	checksum=8d84fbab62b3712bdcfb92f7d258a0d15d8295397d84b48716a3c625f09be782
+	checksum=05363642430c9c5f6368f0c1873c7521b75cf2eacd8c4a55e69939e685d4acdd
 	;;
 ppc64le)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz"

From d44cf0eee82acd5b46d11f80c54b7d1026680f81 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 15:11:29 +0100
Subject: [PATCH 04/17] stack: update to 2.7.1

---
 srcpkgs/stack/patches/datakinds.patch | 14 ------
 srcpkgs/stack/patches/ghc-8.8.4.patch | 70 ---------------------------
 srcpkgs/stack/patches/ppc.patch       | 25 +++++-----
 srcpkgs/stack/template                | 10 ++--
 4 files changed, 18 insertions(+), 101 deletions(-)
 delete mode 100644 srcpkgs/stack/patches/datakinds.patch
 delete mode 100644 srcpkgs/stack/patches/ghc-8.8.4.patch

diff --git a/srcpkgs/stack/patches/datakinds.patch b/srcpkgs/stack/patches/datakinds.patch
deleted file mode 100644
index 1c06480515f7..000000000000
--- a/srcpkgs/stack/patches/datakinds.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Stack/Storage/User.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/User.hs	2020-12-06 20:51:06.632607164 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
---- src/Stack/Storage/Project.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/Project.hs	2020-12-06 21:55:21.349484738 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch
deleted file mode 100644
index 6b55c176e150..000000000000
--- a/srcpkgs/stack/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- masterdir/builddir/stack-2.5.1/stack.cabal	2020-10-17 17:19:10.724179166 +0200
-+++ stack.cabal	2020-10-17 17:18:03.803498792 +0200
-@@ -234,6 +234,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -272,7 +273,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -359,6 +360,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -396,7 +398,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -480,6 +482,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -518,7 +521,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , optparse-generic
-     , pantry >=0.5.1.3
-     , path
-@@ -609,6 +612,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -647,7 +651,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
diff --git a/srcpkgs/stack/patches/ppc.patch b/srcpkgs/stack/patches/ppc.patch
index 1b5bc191b47c..64ad365c47d2 100644
--- a/srcpkgs/stack/patches/ppc.patch
+++ b/srcpkgs/stack/patches/ppc.patch
@@ -1,13 +1,14 @@
 --- src/Stack/Setup.hs
 +++ src/Stack/Setup.hs
-@@ -95,5 +95,6 @@ import              System.IO.Error (isPermissionError)
+@@ -91,6 +91,7 @@
  import              System.FilePath (searchPathSeparator)
  import qualified    System.FilePath as FP
  import              System.Permissions (setFileExecutable)
 +import              System.Endian (getSystemEndianness, Endianness (..))
  import              System.Uname (getRelease)
  import              Data.List.Split (splitOn)
-@@ -1264,4 +1265,9 @@ getOSKey platform =
+ 
+@@ -1241,6 +1242,11 @@
          Platform X86_64                Cabal.Windows -> return "windows64"
          Platform Arm                   Cabal.Linux   -> return "linux-armv7"
          Platform AArch64               Cabal.Linux   -> return "linux-aarch64"
@@ -16,16 +17,16 @@
 +            case getSystemEndianness of
 +                LittleEndian -> return "linux-powerpc64le"
 +                BigEndian    -> return "linux-powerpc64"
+         Platform Sparc                 Cabal.Linux   -> return "linux-sparc"
          Platform arch os -> throwM $ UnsupportedSetupCombo os arch
-
- downloadFromInfo
+ 
 --- stack.cabal
 +++ stack.cabal
-@@ -235,6 +235,7 @@ library
-       , conduit
-       , conduit-extra
-       , containers
-+      , cpu >=0.1.2
-       , cryptonite
-       , cryptonite-conduit
-       , deepseq
+@@ -246,6 +246,7 @@
+         conduit >=1.3.4.1,
+         conduit-extra >=1.3.5,
+         containers >=0.6.2.1,
++        cpu >=0.1.2,
+         cryptonite >=0.27,
+         cryptonite-conduit >=0.2.2,
+         deepseq >=1.4.4.0,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 257aba10e50d..b95bf9ec59e9 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.5.1
+version=2.7.1
 revision=1
-_stackage="lts-16.13"
+_stackage="lts-17.5"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -10,10 +10,10 @@ short_desc="Cross-platform program for developing Haskell projects"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://haskellstack.org"
-distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
+distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076
- b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58"
+checksum="605bd8368b6fef9323ea71b79b08dd62270c49089a86b79fe67355f6b82cbc26
+ d03bee7e51bbdec5053573f94f644a6baeb140cdd95dbe47261e03c04306b252"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 19f4e832405b55344dc468aa7df24899f4dc7b7e Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 16 Mar 2021 17:41:58 +0100
Subject: [PATCH 05/17] xmobar: bump for ghc 8.10.4

---
 srcpkgs/xmobar/files/stack.yaml | 2 +-
 srcpkgs/xmobar/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 7bc4bf189d23..52fd0e3e49fe 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 81ae92fd2940..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.37
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From 0e075bc53e4dd951d5c74cfc59d7c97b4746229a Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:03:10 +0100
Subject: [PATCH 06/17] hlint: update to 3.2.7

---
 srcpkgs/hlint/files/stack.yaml   |  7 -------
 srcpkgs/hlint/patches/data.patch | 10 ++++------
 srcpkgs/hlint/template           | 10 +++++-----
 3 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/hlint/files/stack.yaml

diff --git a/srcpkgs/hlint/files/stack.yaml b/srcpkgs/hlint/files/stack.yaml
deleted file mode 100644
index 12aead6562c5..000000000000
--- a/srcpkgs/hlint/files/stack.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-resolver: lts-16.13
-packages: [.]
-extra-deps:
-  - ghc-lib-parser-8.8.4.20200716
-  - ghc-lib-parser-ex-8.8.5.8
-ghc-options:
-    "$locals": -Wunused-imports -Worphans -Wunused-top-binds -Wunused-local-binds -Wincomplete-patterns
diff --git a/srcpkgs/hlint/patches/data.patch b/srcpkgs/hlint/patches/data.patch
index bdfac204f477..c73b376e5df7 100644
--- a/srcpkgs/hlint/patches/data.patch
+++ b/srcpkgs/hlint/patches/data.patch
@@ -1,13 +1,11 @@
-diff --git src/CmdLine.hs src/CmdLine.hs
-index 8c3d530..ccf7aac 100644
 --- src/CmdLine.hs
 +++ src/CmdLine.hs
-@@ -52,7 +52,7 @@ automatic cmd = case cmd of
+@@ -58,7 +58,7 @@
                  b <- doesDirectoryExist x
-                 if b then return cmd{cmdDataDir=x} else do
+                 if b then pure cmd{cmdDataDir=x} else do
                      exe <- getExecutablePath
--                    return cmd{cmdDataDir = takeDirectory exe </> "data"}
-+                    return cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
+-                    pure cmd{cmdDataDir = takeDirectory exe </> "data"}
++                    pure cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
          git cmd
              | cmdGit cmd = do
                  mgit <- findExecutable "git"
diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index 16fbb03ce2b9..fb30f947a452 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,16 +1,16 @@
 # Template file for 'hlint'
 pkgname=hlint
-version=2.2.11
-revision=2
+version=3.2.7
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
-homepage="https://github.com/ndmitchell/${pkgname}"
+homepage="https://github.com/ndmitchell/hlint"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=207539d3627efd3caed9e6fd3b1aeb8f1eb64553f1f9f166090adbf2fb71e172
+checksum=fcdeefcc79a52206add44b409abcab48c5fe2adff9d5aff077acbc43c702b54e
 nocross=yes # Can't yet cross compile Haskell
 nopie_files="/usr/bin/hlint"
 

From 3b7c9d0faf6aad627e1d409a19156378f53266d4 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:43:37 +0100
Subject: [PATCH 07/17] kmonad: bump for ghc 8.10.4

---
 srcpkgs/kmonad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index 13e8845581ae..8c34a920ba7d 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,9 +1,9 @@
 # Template file for 'kmonad'
 pkgname=kmonad
 version=0.4.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage=lts-16.13
+stackage=lts-17.5
 short_desc="Keyboard remapping utility providing qmk-like functionality"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"

From 240e207f423cd33ef08d5018e3757fb394d4c630 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 16:21:35 +0100
Subject: [PATCH 08/17] hoogle: bump for ghc 8.10.4

---
 srcpkgs/hoogle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 4305ac4ae6e8..eafda8747cdf 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,9 +1,9 @@
 # Template file for 'hoogle'
 pkgname=hoogle
 version=5.0.18.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="zlib-devel"
 short_desc="Haskell API search engine"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From f58d67fa0890447bec49db9351f737ff6d2a3cd8 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 11:18:37 +0100
Subject: [PATCH 09/17] cgrep: bump for ghc 8.10.4

---
 srcpkgs/cgrep/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index 7b4047614a71..15eda3bafd0e 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,12 +1,12 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.6.33
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.18"
+stackage="lts-17.5"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="https://awgn.github.io/cgrep/"
 distfiles="https://github.com/awgn/${pkgname}/archive/v${version}.tar.gz"

From d9e1afff965a75a100c760a7969939499066b387 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 15:03:05 +0100
Subject: [PATCH 10/17] debug-me: bump for ghc 8.10.4

---
 srcpkgs/debug-me/files/stack.yaml                     |  2 +-
 .../patches/{ghc8.8.3.patch => ghc8.10.4.patch}       | 11 +++++++++++
 srcpkgs/debug-me/template                             |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 rename srcpkgs/debug-me/patches/{ghc8.8.3.patch => ghc8.10.4.patch} (70%)

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index 9c88cea9ab3c..ecff9d9d18f2 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - '.'
-resolver: lts-16.13
+resolver: lts-17.5
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/patches/ghc8.8.3.patch b/srcpkgs/debug-me/patches/ghc8.10.4.patch
similarity index 70%
rename from srcpkgs/debug-me/patches/ghc8.8.3.patch
rename to srcpkgs/debug-me/patches/ghc8.10.4.patch
index f1779331c5a9..9cc19db63be3 100644
--- a/srcpkgs/debug-me/patches/ghc8.8.3.patch
+++ b/srcpkgs/debug-me/patches/ghc8.10.4.patch
@@ -20,3 +20,14 @@
  		defaultSettings
 
  checkEnv :: ServerOpts -> IO ServerOpts
+--- debug-me.cabal
++++ debug-me.cabal
+@@ -64,7 +64,7 @@
+     , stm-chans (>= 3.0)
+     , posix-pty (>= 0.2.1)
+     , terminal-size (>= 0.3)
+-    , aeson (>= 0.11 && < 1.5)
++    , aeson (>= 0.11 && < 1.6)
+     , sandi (>= 0.4)
+     , text (>= 1.2.2)
+     , optparse-applicative (>= 0.12)
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 3df514e0be48..797c52f1f479 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -1,7 +1,7 @@
 # Template file for 'debug-me'
 pkgname=debug-me
 version=1.20200820
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"

From 9632172e77c05292d7171f50facbdc760969aa3a Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 20 Mar 2021 11:26:04 +0100
Subject: [PATCH 11/17] darcs: bump for ghc 8.10.4

---
 srcpkgs/darcs/files/stack.yaml | 2 +-
 srcpkgs/darcs/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index 41b5f081bd71..f5ca6078ed75 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.31
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index 42a29eb6872c..e6baa7c3354a 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.4
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From 798bf87434bd3b4de7ddab001b12ffcd9ae36b90 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 08:56:29 +0100
Subject: [PATCH 12/17] hledger: bump for ghc 8.10.4

---
 srcpkgs/hledger/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template
index b34e8ccd4652..1727a49252b7 100644
--- a/srcpkgs/hledger/template
+++ b/srcpkgs/hledger/template
@@ -1,7 +1,7 @@
 # Template file for 'hledger'
 pkgname=hledger
 version=1.21
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel ncurses-devel"
 short_desc="Simple, precise, plain text accounting"

From 6398942278229727fd13c53dc6c02cd910a1f584 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 10:57:42 +0100
Subject: [PATCH 13/17] pandoc: bump for ghc 8.10.4

Citeproc support is build in now.  The change of maintainership was
suggested by Leah.
---
 srcpkgs/pandoc/files/stack.yaml | 23 -----------------------
 srcpkgs/pandoc/template         |  5 +++--
 2 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/pandoc/files/stack.yaml

diff --git a/srcpkgs/pandoc/files/stack.yaml b/srcpkgs/pandoc/files/stack.yaml
deleted file mode 100644
index 82a5fcaded3f..000000000000
--- a/srcpkgs/pandoc/files/stack.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-resolver: lts-17.9
-
-packages:
-  - ./pandoc-2.11.4
-  - ./pandoc-sidenote-0.20.0
-
-flags:
-  pandoc:
-    trypandoc: false
-    embed_data_files: true
-
-extra-deps:
-  - pandoc-types-1.22
-  - haddock-library-1.9.0
-  - regex-pcre-builtin-0.95.2.3.8.43
-  - hslua-1.2.0
-  - jira-wiki-markup-1.3.4
-  - commonmark-0.1.1.4
-  - commonmark-extensions-0.2.0.4
-  - commonmark-pandoc-0.2.0.1
-
-ghc-options:
-   "$locals": -fhide-source-paths -Wno-missing-home-modules
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index ad233dd0aaf3..8f2a9952d847 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,18 +2,19 @@
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
 version=2.11.4
-revision=1
+revision=2
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
+stackage="lts-17.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
 hostmakedepends="pkg-config unzip wget"
 makedepends="zlib-devel lua53-devel tar"
 short_desc="Universal converter between markup formats"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, MIT"
 homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz

From 3195f1a2c431a996224352eeb42153bf91d06b90 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 11:16:14 +0100
Subject: [PATCH 14/17] shellcheck: bump for ghc 8.10.4

---
 srcpkgs/shellcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 33381c2dac8f..76d479a12fca 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,9 +1,9 @@
 # Template file for 'shellcheck'
 pkgname=shellcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 hostmakedepends="pandoc"
 short_desc="Static analysis tool for shell scripts"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

From da52eadf4c8f8d72fa6f8f9aeaf99dd52b8bb67e Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 16:07:47 +0100
Subject: [PATCH 15/17] git-mediate: update to 1.0.8.1

---
 srcpkgs/git-mediate/patches/ghc8.8.3.patch | 19 -------------------
 srcpkgs/git-mediate/template               |  8 ++++----
 2 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/git-mediate/patches/ghc8.8.3.patch

diff --git a/srcpkgs/git-mediate/patches/ghc8.8.3.patch b/srcpkgs/git-mediate/patches/ghc8.8.3.patch
deleted file mode 100644
index 7928b61ef3a4..000000000000
--- a/srcpkgs/git-mediate/patches/ghc8.8.3.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- git-mediate.cabal	2001-09-09 03:46:40.000000000 +0200
-+++ git-mediate.cabal	2020-03-30 15:32:48.959537620 +0200
-@@ -72,7 +72,7 @@
-   ghc-options:         -O2 -Wall
-   -- other-extensions:
-   build-depends:       base >=4.8 && <5
--                     , base-compat >= 0.8.2 && < 0.11
-+                     , base-compat >= 0.8.2 && < 0.12
-                      , mtl >=2.1
-                      , directory >=1.2
-                      , process >=1.2
-@@ -80,6 +80,6 @@
-                      , unix-compat >=0.4.2.0
-                      , Diff >=0.4
-                      , ansi-terminal >=0.6.2
--                     , optparse-applicative >=0.11 && <0.15
-+                     , optparse-applicative >=0.11 && <0.16
-   hs-source-dirs:      src
-   default-language:    Haskell2010
diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template
index aa3979d3435a..971a6236224f 100644
--- a/srcpkgs/git-mediate/template
+++ b/srcpkgs/git-mediate/template
@@ -1,15 +1,15 @@
 # Template file for 'git-mediate'
 pkgname=git-mediate
-version=1.0.8
-revision=4
+version=1.0.8.1
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 depends="git"
 short_desc="Tool to help resolving git conflicts"
 maintainer="Peter Wang <novalazy@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/Peaker/git-mediate"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=81220f7e20a3913bc147b69681666ad22e60e5b759a1becad78ee28dcad8013d
+checksum=ee44841d37ded70cbcd8edd1e233a344d0118295e0bd2f0c6983ed00f619c467
 nocross=yes
 nopie_files="/usr/bin/git-mediate"

From 94281b52e62893961128d32da2428267a14c4448 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 16:11:25 +0100
Subject: [PATCH 16/17] git-annex: bump for ghc 8.10.4

---
 srcpkgs/git-annex/files/stack.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
index a6d4f6aeee64..5d457bebde83 100644
--- a/srcpkgs/git-annex/files/stack.yaml
+++ b/srcpkgs/git-annex/files/stack.yaml
@@ -28,4 +28,5 @@ extra-deps:
  - network-3.1.0.1
 explicit-setup-deps:
   git-annex: true
-resolver: lts-16.27
+resolver: lts-17.5
+allow-newer: true

From ae904c89d2f243325cef3d863e3655ecc97934c9 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 30 Mar 2021 12:11:45 +0200
Subject: [PATCH 17/17] haskell-language-server: bump for ghc 8.10.4

---
 srcpkgs/haskell-language-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index 438c760f0a1f..7afa89c452f7 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,12 +1,12 @@
 # Template file for 'haskell-language-server'
 pkgname=haskell-language-server
 version=1.0.0
-revision=1
+revision=2
 # GHC only panics on i686
 # https://github.com/void-linux/void-packages/pull/27961/checks?check_run_id=2181519625#step:8:5936
 archs="~i686"
 build_style="haskell-stack"
-make_build_args="--stack-yaml stack-8.8.4.yaml"
+make_build_args="--stack-yaml stack-8.10.4.yaml"
 makedepends="ncurses-devel ncurses-libtinfo-devel icu-devel zlib-devel"
 short_desc="Integration of ghcide and haskell-ide-engine"
 maintainer="Wayne Van Son <waynevanson@gmail.com>"

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (27 preceding siblings ...)
  2021-06-05 15:07 ` slotThe
@ 2021-06-07  7:35 ` slotThe
  2021-06-07 10:40 ` Johnnynator
                   ` (9 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-06-07  7:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 158 bytes --]

New comment by slotThe on void-packages repository

https://github.com/void-linux/void-packages/pull/29506#issuecomment-855675949

Comment:
@q66 any updates?

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (28 preceding siblings ...)
  2021-06-07  7:35 ` slotThe
@ 2021-06-07 10:40 ` Johnnynator
  2021-06-07 11:11 ` [PR PATCH] [Updated] " slotThe
                   ` (8 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: Johnnynator @ 2021-06-07 10:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 332 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/29506#issuecomment-855816813

Comment:
@slotThe your x86_64-musl distfile link is broken. (You can also reuse the one I have up here: https://void.johnnynator.dev/distfiles (ignore the aarch64 ones, ghc is kinda broken there))

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (29 preceding siblings ...)
  2021-06-07 10:40 ` Johnnynator
@ 2021-06-07 11:11 ` slotThe
  2021-06-07 11:12 ` slotThe
                   ` (7 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-06-07 11:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3253 bytes --]

There is an updated pull request by slotThe against master on the void-packages repository

https://github.com/slotThe/void-packages ghc-8.10.4
https://github.com/void-linux/void-packages/pull/29506

[WIP] GHC 8.10.4
It's that time of the year again!

- [X] ghc; I took over as maintainer here, @leahneukirchen said that was okay on IRC (cc'ing here to make sure)
- [ ] ghc-bin; took over as mainainer of orphaned package.
    - [X] x86_64-musl; [Link here](https://www34.zippyshare.com/d/yvtjb7uJ/38780/ghc-8.10.4-x86_64-void-linux-musl.tar.xz)
    - [ ] i686-musl [Cautious link](https://www42.zippyshare.com/d/wOOz0Zsx/29048/ghc-8.10.4-i386-unknown-linux.tar.xz) **WARNING**: I don't know if I did this correctly, so It'd be nice if someone could test this
    cc @q66 for these
    - [ ] ppc64le
    - [ ] ppc64le-musl
- [X] cabal-install
- [X] stack
 
Rebuild literally every single haskell package we have and see if anything's broken:

- [x] git-mediate
- [x] kmonad
- [x] cgrep; took over as mainainer of orphaned package.
- [x] debug-me
- [x] hlint
- [x] hoogle
- [x] darcs
- [x] shellcheck
- [x] git-annex
- [x] hledger
- [x] pandoc
- [x] xmobar
- [x] HLS; this is #27961 once that's merged

For the following two I'd like to fix #6414 while we're at it.  Because stack can't install libraries globally, this would involve either removing these packages entirely and advising users to install them in their own [stack or cabal projects](https://github.com/xmonad/xmonad-testing), or finding a way to build them with cabal and updating ghc's data base accordingly.  This would probably use `v1` commands, as we don't want to nuke our users db if we update xmonad. Cc @xaltsc as the current maintainer and @chilledfrogs as someone who might want to tackle this (if I read the IRC discussion correctly). 

- [ ] xmonad
- [ ] xmonad-contrib

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/29506.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghc-8.10.4-29506.patch --]
[-- Type: text/x-diff, Size: 37482 bytes --]

From 979f448407f627b68bea6f2fbc3045dc9ad848ab Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 31 Jan 2021 14:31:24 +0100
Subject: [PATCH 01/17] ghc: update to 8.10.4

The change of maintainership was okay-ed by Leah.
---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch | 41 +++++++++++-------------
 srcpkgs/ghc/template                     |  8 ++---
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index ac353ed417e5..c9bd2583abe0 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -85,7 +85,7 @@ index ec3c18a..0359be7 100644
 +        in Right [ 0x3D800000 .|. hi16 w32,
 +                   0x618C0000 .|. lo16 w32,
 +                   0x7D8903A6, 0x4E800420 ]
- 
+
      ArchPPC64LE ->
          -- The ABI requires r12 to point to the function's entry point.
 diff --git a/rts/Adjustor.c b/rts/Adjustor.c
@@ -93,7 +93,7 @@ index d360cfe..ab7ede7 100644
 --- a/rts/Adjustor.c
 +++ b/rts/Adjustor.c
 @@ -49,7 +49,7 @@ Haskell side.
- 
+
  #if defined(i386_HOST_ARCH)
  extern void adjustorCode(void);
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
@@ -104,16 +104,16 @@ index d360cfe..ab7ede7 100644
 @@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
  extern void obscure_ccall_ret_code(void);
  #endif
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
- 
+
  /* !!! !!! WARNING: !!! !!!
 @@ -318,7 +318,7 @@ typedef struct AdjustorStub {
  } AdjustorStub;
  #endif
- 
+
 -#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  static int totalArgumentSize(char *typeString)
@@ -131,10 +131,10 @@ index d360cfe..ab7ede7 100644
 @@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
          }
      }
- 
+
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-         
+
  #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
  #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
 @@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
@@ -151,9 +151,9 @@ index 2795b83..63cfe91 100644
 --- a/rts/AdjustorAsm.S
 +++ b/rts/AdjustorAsm.S
 @@ -2,7 +2,7 @@
- 
+
  /* ******************************** PowerPC ******************************** */
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
@@ -166,34 +166,31 @@ index 934926e..2ff8662 100644
 @@ -717,7 +717,7 @@ StgRunIsImplementedInAssembler(void)
     Everything is in assembler, so we don't have to deal with GCC...
     -------------------------------------------------------------------------- */
- 
+
 -#if defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
- 
+
  static void GNUC3_ATTRIBUTE(used)
  StgRunIsImplementedInAssembler(void)
 @@ -842,7 +842,7 @@ StgRunIsImplementedInAssembler(void)
- 
+
  #endif
- 
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
  /* -----------------------------------------------------------------------------
     PowerPC 64 little endian architecture
- 
+
 diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
 index 9274a44..3b4fc33 100644
 --- a/rts/StgCRunAsm.S
 +++ b/rts/StgCRunAsm.S
-@@ -1,7 +1,7 @@
- #include "ghcconfig.h"
- #include "rts/Constants.h"
- 
+@@ -5,7 +5,7 @@
+  * then functions StgRun/StgReturn are implemented in file StgCRun.c */
+ #if !defined(USE_MINIINTERPRETER)
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
- # ifdef linux_HOST_OS
+ # if defined(linux_HOST_OS)
  # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
  	.file	"StgCRun.c"
--- 
-2.30.0
-
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 0b1440b2f6d9..c6acfa79e75d 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,8 +1,8 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.8.4
-revision=2
+version=8.10.4
+revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
 hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
@@ -10,11 +10,11 @@ hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
 makedepends="libnuma-devel"
 depends="perl gcc libffi-devel gmp-devel libnuma-devel"
 short_desc="Glorious Haskell Compiler"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d
+checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
 patch_args="-Np1"
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"

From 3e8a60c31ec002e4ae049d843424710d5c30143a Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 28 Feb 2021 18:34:26 +0100
Subject: [PATCH 02/17] 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 000000000000..63965ca12d44
--- /dev/null
+++ b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
@@ -0,0 +1,43 @@
+--- bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
++++ 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 1dd08f07fb44..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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]\."
-                        #  >= 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 2c15789b1f9d..99ebb54427fe 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 <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=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
 }

From 8a0850bac1b9a3faf3ee3b88c76aba1dee46d5f7 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 12:37:23 +0100
Subject: [PATCH 03/17] ghc-bin: update to 8.10.4

Take over maintainership of orphaned package.
---
 srcpkgs/ghc-bin/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 9101601358b9..f6301c9818ef 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,13 +1,13 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.8.4
+version=8.10.4
 revision=1
 archs="i686* x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
 short_desc="Glorious Haskell Compiler - precompiled binaries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 nostrip=yes
@@ -15,21 +15,21 @@ noshlibprovides=yes
 conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
-	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb8-linux.tar.xz"
-	checksum=51a36892f1264744195274187298d13ac62bce2da86d4ddf76d8054ab90f2feb
+	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
+	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=779647d3f4e6e39da9e13b2559319ede76b4fff1107e4dc369a09aadeecad971
+	checksum=246485f18ceccaadaece6450ed7af46dd6b4d5d33e0b8dd1647c64dd8e50dc60
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0
+	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
 	;;
 i686-musl)
 	distfiles="https://distfiles.voidlinux.de/ghc-${version}-i386-unknown-linux-musl.tar.xz"
-	checksum=8d84fbab62b3712bdcfb92f7d258a0d15d8295397d84b48716a3c625f09be782
+	checksum=05363642430c9c5f6368f0c1873c7521b75cf2eacd8c4a55e69939e685d4acdd
 	;;
 ppc64le)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz"

From 18ea1f39fbe756ee7e8b297b76967c7a703ec30a Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 15:11:29 +0100
Subject: [PATCH 04/17] stack: update to 2.7.1

---
 srcpkgs/stack/patches/datakinds.patch | 14 ------
 srcpkgs/stack/patches/ghc-8.8.4.patch | 70 ---------------------------
 srcpkgs/stack/patches/ppc.patch       | 25 +++++-----
 srcpkgs/stack/template                | 10 ++--
 4 files changed, 18 insertions(+), 101 deletions(-)
 delete mode 100644 srcpkgs/stack/patches/datakinds.patch
 delete mode 100644 srcpkgs/stack/patches/ghc-8.8.4.patch

diff --git a/srcpkgs/stack/patches/datakinds.patch b/srcpkgs/stack/patches/datakinds.patch
deleted file mode 100644
index 1c06480515f7..000000000000
--- a/srcpkgs/stack/patches/datakinds.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Stack/Storage/User.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/User.hs	2020-12-06 20:51:06.632607164 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
---- src/Stack/Storage/Project.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/Project.hs	2020-12-06 21:55:21.349484738 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch
deleted file mode 100644
index 6b55c176e150..000000000000
--- a/srcpkgs/stack/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- masterdir/builddir/stack-2.5.1/stack.cabal	2020-10-17 17:19:10.724179166 +0200
-+++ stack.cabal	2020-10-17 17:18:03.803498792 +0200
-@@ -234,6 +234,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -272,7 +273,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -359,6 +360,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -396,7 +398,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -480,6 +482,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -518,7 +521,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , optparse-generic
-     , pantry >=0.5.1.3
-     , path
-@@ -609,6 +612,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -647,7 +651,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
diff --git a/srcpkgs/stack/patches/ppc.patch b/srcpkgs/stack/patches/ppc.patch
index 1b5bc191b47c..64ad365c47d2 100644
--- a/srcpkgs/stack/patches/ppc.patch
+++ b/srcpkgs/stack/patches/ppc.patch
@@ -1,13 +1,14 @@
 --- src/Stack/Setup.hs
 +++ src/Stack/Setup.hs
-@@ -95,5 +95,6 @@ import              System.IO.Error (isPermissionError)
+@@ -91,6 +91,7 @@
  import              System.FilePath (searchPathSeparator)
  import qualified    System.FilePath as FP
  import              System.Permissions (setFileExecutable)
 +import              System.Endian (getSystemEndianness, Endianness (..))
  import              System.Uname (getRelease)
  import              Data.List.Split (splitOn)
-@@ -1264,4 +1265,9 @@ getOSKey platform =
+ 
+@@ -1241,6 +1242,11 @@
          Platform X86_64                Cabal.Windows -> return "windows64"
          Platform Arm                   Cabal.Linux   -> return "linux-armv7"
          Platform AArch64               Cabal.Linux   -> return "linux-aarch64"
@@ -16,16 +17,16 @@
 +            case getSystemEndianness of
 +                LittleEndian -> return "linux-powerpc64le"
 +                BigEndian    -> return "linux-powerpc64"
+         Platform Sparc                 Cabal.Linux   -> return "linux-sparc"
          Platform arch os -> throwM $ UnsupportedSetupCombo os arch
-
- downloadFromInfo
+ 
 --- stack.cabal
 +++ stack.cabal
-@@ -235,6 +235,7 @@ library
-       , conduit
-       , conduit-extra
-       , containers
-+      , cpu >=0.1.2
-       , cryptonite
-       , cryptonite-conduit
-       , deepseq
+@@ -246,6 +246,7 @@
+         conduit >=1.3.4.1,
+         conduit-extra >=1.3.5,
+         containers >=0.6.2.1,
++        cpu >=0.1.2,
+         cryptonite >=0.27,
+         cryptonite-conduit >=0.2.2,
+         deepseq >=1.4.4.0,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 257aba10e50d..b95bf9ec59e9 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.5.1
+version=2.7.1
 revision=1
-_stackage="lts-16.13"
+_stackage="lts-17.5"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -10,10 +10,10 @@ short_desc="Cross-platform program for developing Haskell projects"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://haskellstack.org"
-distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
+distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076
- b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58"
+checksum="605bd8368b6fef9323ea71b79b08dd62270c49089a86b79fe67355f6b82cbc26
+ d03bee7e51bbdec5053573f94f644a6baeb140cdd95dbe47261e03c04306b252"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 9dc80e044d3b6bc88291d6f37b797cdea1d6fec6 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 16 Mar 2021 17:41:58 +0100
Subject: [PATCH 05/17] xmobar: bump for ghc 8.10.4

---
 srcpkgs/xmobar/files/stack.yaml | 2 +-
 srcpkgs/xmobar/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 7bc4bf189d23..52fd0e3e49fe 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 81ae92fd2940..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.37
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From 4dbc0d8b3d7dc59e7ad597d1a5d036220e4b0478 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:03:10 +0100
Subject: [PATCH 06/17] hlint: update to 3.2.7

---
 srcpkgs/hlint/files/stack.yaml   |  7 -------
 srcpkgs/hlint/patches/data.patch | 10 ++++------
 srcpkgs/hlint/template           | 10 +++++-----
 3 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/hlint/files/stack.yaml

diff --git a/srcpkgs/hlint/files/stack.yaml b/srcpkgs/hlint/files/stack.yaml
deleted file mode 100644
index 12aead6562c5..000000000000
--- a/srcpkgs/hlint/files/stack.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-resolver: lts-16.13
-packages: [.]
-extra-deps:
-  - ghc-lib-parser-8.8.4.20200716
-  - ghc-lib-parser-ex-8.8.5.8
-ghc-options:
-    "$locals": -Wunused-imports -Worphans -Wunused-top-binds -Wunused-local-binds -Wincomplete-patterns
diff --git a/srcpkgs/hlint/patches/data.patch b/srcpkgs/hlint/patches/data.patch
index bdfac204f477..c73b376e5df7 100644
--- a/srcpkgs/hlint/patches/data.patch
+++ b/srcpkgs/hlint/patches/data.patch
@@ -1,13 +1,11 @@
-diff --git src/CmdLine.hs src/CmdLine.hs
-index 8c3d530..ccf7aac 100644
 --- src/CmdLine.hs
 +++ src/CmdLine.hs
-@@ -52,7 +52,7 @@ automatic cmd = case cmd of
+@@ -58,7 +58,7 @@
                  b <- doesDirectoryExist x
-                 if b then return cmd{cmdDataDir=x} else do
+                 if b then pure cmd{cmdDataDir=x} else do
                      exe <- getExecutablePath
--                    return cmd{cmdDataDir = takeDirectory exe </> "data"}
-+                    return cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
+-                    pure cmd{cmdDataDir = takeDirectory exe </> "data"}
++                    pure cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
          git cmd
              | cmdGit cmd = do
                  mgit <- findExecutable "git"
diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index 16fbb03ce2b9..fb30f947a452 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,16 +1,16 @@
 # Template file for 'hlint'
 pkgname=hlint
-version=2.2.11
-revision=2
+version=3.2.7
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
-homepage="https://github.com/ndmitchell/${pkgname}"
+homepage="https://github.com/ndmitchell/hlint"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=207539d3627efd3caed9e6fd3b1aeb8f1eb64553f1f9f166090adbf2fb71e172
+checksum=fcdeefcc79a52206add44b409abcab48c5fe2adff9d5aff077acbc43c702b54e
 nocross=yes # Can't yet cross compile Haskell
 nopie_files="/usr/bin/hlint"
 

From 8777bbe0743f5520848b5d1a3410729e608393b8 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:43:37 +0100
Subject: [PATCH 07/17] kmonad: bump for ghc 8.10.4

---
 srcpkgs/kmonad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index 13e8845581ae..8c34a920ba7d 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,9 +1,9 @@
 # Template file for 'kmonad'
 pkgname=kmonad
 version=0.4.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage=lts-16.13
+stackage=lts-17.5
 short_desc="Keyboard remapping utility providing qmk-like functionality"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"

From 892c5881db60336cc2bd779d49fc4d8ad879302e Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 16:21:35 +0100
Subject: [PATCH 08/17] hoogle: bump for ghc 8.10.4

---
 srcpkgs/hoogle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 4305ac4ae6e8..eafda8747cdf 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,9 +1,9 @@
 # Template file for 'hoogle'
 pkgname=hoogle
 version=5.0.18.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="zlib-devel"
 short_desc="Haskell API search engine"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From d398a2512bdb8b78c682398cc6de763c9b21569a Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 11:18:37 +0100
Subject: [PATCH 09/17] cgrep: bump for ghc 8.10.4

---
 srcpkgs/cgrep/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index 7b4047614a71..15eda3bafd0e 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,12 +1,12 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.6.33
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.18"
+stackage="lts-17.5"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="https://awgn.github.io/cgrep/"
 distfiles="https://github.com/awgn/${pkgname}/archive/v${version}.tar.gz"

From 94f1b2249583ead2463f88579f801edbb291ab5d Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 15:03:05 +0100
Subject: [PATCH 10/17] debug-me: bump for ghc 8.10.4

---
 srcpkgs/debug-me/files/stack.yaml                     |  2 +-
 .../patches/{ghc8.8.3.patch => ghc8.10.4.patch}       | 11 +++++++++++
 srcpkgs/debug-me/template                             |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 rename srcpkgs/debug-me/patches/{ghc8.8.3.patch => ghc8.10.4.patch} (70%)

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index 9c88cea9ab3c..ecff9d9d18f2 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - '.'
-resolver: lts-16.13
+resolver: lts-17.5
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/patches/ghc8.8.3.patch b/srcpkgs/debug-me/patches/ghc8.10.4.patch
similarity index 70%
rename from srcpkgs/debug-me/patches/ghc8.8.3.patch
rename to srcpkgs/debug-me/patches/ghc8.10.4.patch
index f1779331c5a9..9cc19db63be3 100644
--- a/srcpkgs/debug-me/patches/ghc8.8.3.patch
+++ b/srcpkgs/debug-me/patches/ghc8.10.4.patch
@@ -20,3 +20,14 @@
  		defaultSettings
 
  checkEnv :: ServerOpts -> IO ServerOpts
+--- debug-me.cabal
++++ debug-me.cabal
+@@ -64,7 +64,7 @@
+     , stm-chans (>= 3.0)
+     , posix-pty (>= 0.2.1)
+     , terminal-size (>= 0.3)
+-    , aeson (>= 0.11 && < 1.5)
++    , aeson (>= 0.11 && < 1.6)
+     , sandi (>= 0.4)
+     , text (>= 1.2.2)
+     , optparse-applicative (>= 0.12)
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 3df514e0be48..797c52f1f479 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -1,7 +1,7 @@
 # Template file for 'debug-me'
 pkgname=debug-me
 version=1.20200820
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"

From 6fe2835a15152b046c3270d7257c7e0fc4462806 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 20 Mar 2021 11:26:04 +0100
Subject: [PATCH 11/17] darcs: bump for ghc 8.10.4

---
 srcpkgs/darcs/files/stack.yaml | 2 +-
 srcpkgs/darcs/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index 41b5f081bd71..f5ca6078ed75 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.31
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index 42a29eb6872c..e6baa7c3354a 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.4
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From 7c7e36be2bc76f67ca72dc3cc8f47317da865b05 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 08:56:29 +0100
Subject: [PATCH 12/17] hledger: bump for ghc 8.10.4

---
 srcpkgs/hledger/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template
index b34e8ccd4652..1727a49252b7 100644
--- a/srcpkgs/hledger/template
+++ b/srcpkgs/hledger/template
@@ -1,7 +1,7 @@
 # Template file for 'hledger'
 pkgname=hledger
 version=1.21
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel ncurses-devel"
 short_desc="Simple, precise, plain text accounting"

From c6739c9ca87a9cc84ac6d31ff8a1c6ee0c9d97d7 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 10:57:42 +0100
Subject: [PATCH 13/17] pandoc: bump for ghc 8.10.4

Citeproc support is build in now.  The change of maintainership was
suggested by Leah.
---
 srcpkgs/pandoc/files/stack.yaml | 23 -----------------------
 srcpkgs/pandoc/template         |  5 +++--
 2 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/pandoc/files/stack.yaml

diff --git a/srcpkgs/pandoc/files/stack.yaml b/srcpkgs/pandoc/files/stack.yaml
deleted file mode 100644
index 82a5fcaded3f..000000000000
--- a/srcpkgs/pandoc/files/stack.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-resolver: lts-17.9
-
-packages:
-  - ./pandoc-2.11.4
-  - ./pandoc-sidenote-0.20.0
-
-flags:
-  pandoc:
-    trypandoc: false
-    embed_data_files: true
-
-extra-deps:
-  - pandoc-types-1.22
-  - haddock-library-1.9.0
-  - regex-pcre-builtin-0.95.2.3.8.43
-  - hslua-1.2.0
-  - jira-wiki-markup-1.3.4
-  - commonmark-0.1.1.4
-  - commonmark-extensions-0.2.0.4
-  - commonmark-pandoc-0.2.0.1
-
-ghc-options:
-   "$locals": -fhide-source-paths -Wno-missing-home-modules
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index ad233dd0aaf3..8f2a9952d847 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,18 +2,19 @@
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
 version=2.11.4
-revision=1
+revision=2
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
+stackage="lts-17.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
 hostmakedepends="pkg-config unzip wget"
 makedepends="zlib-devel lua53-devel tar"
 short_desc="Universal converter between markup formats"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, MIT"
 homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz

From bcfda4b9b19574b8d1f6e869d58bc341c216c2be Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 11:16:14 +0100
Subject: [PATCH 14/17] shellcheck: bump for ghc 8.10.4

---
 srcpkgs/shellcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 33381c2dac8f..76d479a12fca 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,9 +1,9 @@
 # Template file for 'shellcheck'
 pkgname=shellcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 hostmakedepends="pandoc"
 short_desc="Static analysis tool for shell scripts"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

From cd5682c5104d9b19c988847e9382e279b7b62104 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 16:07:47 +0100
Subject: [PATCH 15/17] git-mediate: update to 1.0.8.1

---
 srcpkgs/git-mediate/patches/ghc8.8.3.patch | 19 -------------------
 srcpkgs/git-mediate/template               |  8 ++++----
 2 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/git-mediate/patches/ghc8.8.3.patch

diff --git a/srcpkgs/git-mediate/patches/ghc8.8.3.patch b/srcpkgs/git-mediate/patches/ghc8.8.3.patch
deleted file mode 100644
index 7928b61ef3a4..000000000000
--- a/srcpkgs/git-mediate/patches/ghc8.8.3.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- git-mediate.cabal	2001-09-09 03:46:40.000000000 +0200
-+++ git-mediate.cabal	2020-03-30 15:32:48.959537620 +0200
-@@ -72,7 +72,7 @@
-   ghc-options:         -O2 -Wall
-   -- other-extensions:
-   build-depends:       base >=4.8 && <5
--                     , base-compat >= 0.8.2 && < 0.11
-+                     , base-compat >= 0.8.2 && < 0.12
-                      , mtl >=2.1
-                      , directory >=1.2
-                      , process >=1.2
-@@ -80,6 +80,6 @@
-                      , unix-compat >=0.4.2.0
-                      , Diff >=0.4
-                      , ansi-terminal >=0.6.2
--                     , optparse-applicative >=0.11 && <0.15
-+                     , optparse-applicative >=0.11 && <0.16
-   hs-source-dirs:      src
-   default-language:    Haskell2010
diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template
index aa3979d3435a..971a6236224f 100644
--- a/srcpkgs/git-mediate/template
+++ b/srcpkgs/git-mediate/template
@@ -1,15 +1,15 @@
 # Template file for 'git-mediate'
 pkgname=git-mediate
-version=1.0.8
-revision=4
+version=1.0.8.1
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 depends="git"
 short_desc="Tool to help resolving git conflicts"
 maintainer="Peter Wang <novalazy@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/Peaker/git-mediate"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=81220f7e20a3913bc147b69681666ad22e60e5b759a1becad78ee28dcad8013d
+checksum=ee44841d37ded70cbcd8edd1e233a344d0118295e0bd2f0c6983ed00f619c467
 nocross=yes
 nopie_files="/usr/bin/git-mediate"

From faf0fc05134e3823ce3cb9208a7deca1803d164e Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 16:11:25 +0100
Subject: [PATCH 16/17] git-annex: bump for ghc 8.10.4

---
 srcpkgs/git-annex/files/stack.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
index a6d4f6aeee64..5d457bebde83 100644
--- a/srcpkgs/git-annex/files/stack.yaml
+++ b/srcpkgs/git-annex/files/stack.yaml
@@ -28,4 +28,5 @@ extra-deps:
  - network-3.1.0.1
 explicit-setup-deps:
   git-annex: true
-resolver: lts-16.27
+resolver: lts-17.5
+allow-newer: true

From 25f37a196179366881373741abf9a9f6631eaeb3 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 30 Mar 2021 12:11:45 +0200
Subject: [PATCH 17/17] haskell-language-server: bump for ghc 8.10.4

---
 srcpkgs/haskell-language-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index 438c760f0a1f..7afa89c452f7 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,12 +1,12 @@
 # Template file for 'haskell-language-server'
 pkgname=haskell-language-server
 version=1.0.0
-revision=1
+revision=2
 # GHC only panics on i686
 # https://github.com/void-linux/void-packages/pull/27961/checks?check_run_id=2181519625#step:8:5936
 archs="~i686"
 build_style="haskell-stack"
-make_build_args="--stack-yaml stack-8.8.4.yaml"
+make_build_args="--stack-yaml stack-8.10.4.yaml"
 makedepends="ncurses-devel ncurses-libtinfo-devel icu-devel zlib-devel"
 short_desc="Integration of ghcide and haskell-ide-engine"
 maintainer="Wayne Van Son <waynevanson@gmail.com>"

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (30 preceding siblings ...)
  2021-06-07 11:11 ` [PR PATCH] [Updated] " slotThe
@ 2021-06-07 11:12 ` slotThe
  2021-06-07 13:23 ` leahneukirchen
                   ` (6 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-06-07 11:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 475 bytes --]

New comment by slotThe on void-packages repository

https://github.com/void-linux/void-packages/pull/29506#issuecomment-855836150

Comment:
> @slotThe your x86_64-musl distfile link is broken. (You can also reuse the one I have up here: https://void.johnnynator.dev/distfiles (ignore the aarch64 ones, ghc is kinda broken there))

Oh, the hoster must prune links after a few months; thanks for the heads up.  I swapped out the checksum and will link to your file in the OP

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (31 preceding siblings ...)
  2021-06-07 11:12 ` slotThe
@ 2021-06-07 13:23 ` leahneukirchen
  2021-06-16 18:45 ` [PR PATCH] [Updated] " slotThe
                   ` (5 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: leahneukirchen @ 2021-06-07 13:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 198 bytes --]

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/29506#issuecomment-855924684

Comment:
The hoster died and his server was terminated. :'(

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (32 preceding siblings ...)
  2021-06-07 13:23 ` leahneukirchen
@ 2021-06-16 18:45 ` slotThe
  2021-06-16 18:45 ` slotThe
                   ` (4 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-06-16 18:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3246 bytes --]

There is an updated pull request by slotThe against master on the void-packages repository

https://github.com/slotThe/void-packages ghc-8.10.4
https://github.com/void-linux/void-packages/pull/29506

[WIP] GHC 8.10.4
It's that time of the year again!

- [X] ghc; I took over as maintainer here, @leahneukirchen said that was okay on IRC (cc'ing here to make sure)
- [ ] ghc-bin; took over as mainainer of orphaned package.
    - [X] x86_64-musl; [Link here](https://void.johnnynator.dev/distfiles/ghc-8.10.4-x86_64-void-linux-musl.tar.xz)
    - [ ] i686-musl [Cautious link](https://www42.zippyshare.com/d/wOOz0Zsx/29048/ghc-8.10.4-i386-unknown-linux.tar.xz) **WARNING**: I don't know if I did this correctly, so It'd be nice if someone could test this
    cc @q66 for these
    - [ ] ppc64le
    - [ ] ppc64le-musl
- [X] cabal-install
- [X] stack
 
Rebuild literally every single haskell package we have and see if anything's broken:

- [x] git-mediate
- [x] kmonad
- [x] cgrep; took over as mainainer of orphaned package.
- [x] debug-me
- [x] hlint
- [x] hoogle
- [x] darcs
- [x] shellcheck
- [x] git-annex
- [x] hledger
- [x] pandoc
- [x] xmobar
- [x] HLS; this is #27961 once that's merged

For the following two I'd like to fix #6414 while we're at it.  Because stack can't install libraries globally, this would involve either removing these packages entirely and advising users to install them in their own [stack or cabal projects](https://github.com/xmonad/xmonad-testing), or finding a way to build them with cabal and updating ghc's data base accordingly.  This would probably use `v1` commands, as we don't want to nuke our users db if we update xmonad. Cc @xaltsc as the current maintainer and @chilledfrogs as someone who might want to tackle this (if I read the IRC discussion correctly). 

- [ ] xmonad
- [ ] xmonad-contrib

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/29506.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghc-8.10.4-29506.patch --]
[-- Type: text/x-diff, Size: 37219 bytes --]

From cb65f15824463feda937df7d9240b0a5a6d75dd6 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 31 Jan 2021 14:31:24 +0100
Subject: [PATCH 01/17] ghc: update to 8.10.4

The change of maintainership was okay-ed by Leah.
---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch | 41 +++++++++++-------------
 srcpkgs/ghc/template                     |  8 ++---
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index ac353ed417e5..c9bd2583abe0 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -85,7 +85,7 @@ index ec3c18a..0359be7 100644
 +        in Right [ 0x3D800000 .|. hi16 w32,
 +                   0x618C0000 .|. lo16 w32,
 +                   0x7D8903A6, 0x4E800420 ]
- 
+
      ArchPPC64LE ->
          -- The ABI requires r12 to point to the function's entry point.
 diff --git a/rts/Adjustor.c b/rts/Adjustor.c
@@ -93,7 +93,7 @@ index d360cfe..ab7ede7 100644
 --- a/rts/Adjustor.c
 +++ b/rts/Adjustor.c
 @@ -49,7 +49,7 @@ Haskell side.
- 
+
  #if defined(i386_HOST_ARCH)
  extern void adjustorCode(void);
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
@@ -104,16 +104,16 @@ index d360cfe..ab7ede7 100644
 @@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
  extern void obscure_ccall_ret_code(void);
  #endif
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
- 
+
  /* !!! !!! WARNING: !!! !!!
 @@ -318,7 +318,7 @@ typedef struct AdjustorStub {
  } AdjustorStub;
  #endif
- 
+
 -#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  static int totalArgumentSize(char *typeString)
@@ -131,10 +131,10 @@ index d360cfe..ab7ede7 100644
 @@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
          }
      }
- 
+
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-         
+
  #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
  #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
 @@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
@@ -151,9 +151,9 @@ index 2795b83..63cfe91 100644
 --- a/rts/AdjustorAsm.S
 +++ b/rts/AdjustorAsm.S
 @@ -2,7 +2,7 @@
- 
+
  /* ******************************** PowerPC ******************************** */
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
@@ -166,34 +166,31 @@ index 934926e..2ff8662 100644
 @@ -717,7 +717,7 @@ StgRunIsImplementedInAssembler(void)
     Everything is in assembler, so we don't have to deal with GCC...
     -------------------------------------------------------------------------- */
- 
+
 -#if defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
- 
+
  static void GNUC3_ATTRIBUTE(used)
  StgRunIsImplementedInAssembler(void)
 @@ -842,7 +842,7 @@ StgRunIsImplementedInAssembler(void)
- 
+
  #endif
- 
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
  /* -----------------------------------------------------------------------------
     PowerPC 64 little endian architecture
- 
+
 diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
 index 9274a44..3b4fc33 100644
 --- a/rts/StgCRunAsm.S
 +++ b/rts/StgCRunAsm.S
-@@ -1,7 +1,7 @@
- #include "ghcconfig.h"
- #include "rts/Constants.h"
- 
+@@ -5,7 +5,7 @@
+  * then functions StgRun/StgReturn are implemented in file StgCRun.c */
+ #if !defined(USE_MINIINTERPRETER)
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
- # ifdef linux_HOST_OS
+ # if defined(linux_HOST_OS)
  # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
  	.file	"StgCRun.c"
--- 
-2.30.0
-
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 0b1440b2f6d9..c6acfa79e75d 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,8 +1,8 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.8.4
-revision=2
+version=8.10.4
+revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
 hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
@@ -10,11 +10,11 @@ hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
 makedepends="libnuma-devel"
 depends="perl gcc libffi-devel gmp-devel libnuma-devel"
 short_desc="Glorious Haskell Compiler"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d
+checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
 patch_args="-Np1"
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"

From 46e74fe531be493a045a7ec8e8fae9ad6e60602c Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 28 Feb 2021 18:34:26 +0100
Subject: [PATCH 02/17] 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 000000000000..63965ca12d44
--- /dev/null
+++ b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
@@ -0,0 +1,43 @@
+--- bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
++++ 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 1dd08f07fb44..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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]\."
-                        #  >= 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 2c15789b1f9d..99ebb54427fe 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 <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=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
 }

From 31133b450c5a0423f2fca3d3ce4b8f4499a6f68e Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 12:37:23 +0100
Subject: [PATCH 03/17] ghc-bin: update to 8.10.4

Take over maintainership of orphaned package.
---
 srcpkgs/ghc-bin/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index b50c14854018..bdc4cc0ef253 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,13 +1,13 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.8.4
+version=8.10.4
 revision=1
 archs="i686 x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
 short_desc="Glorious Haskell Compiler - precompiled binaries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 nostrip=yes
@@ -15,17 +15,17 @@ noshlibprovides=yes
 conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
-	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb8-linux.tar.xz"
-	checksum=51a36892f1264744195274187298d13ac62bce2da86d4ddf76d8054ab90f2feb
+	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
+	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=779647d3f4e6e39da9e13b2559319ede76b4fff1107e4dc369a09aadeecad971
+	checksum=246485f18ceccaadaece6450ed7af46dd6b4d5d33e0b8dd1647c64dd8e50dc60
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0
+	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
 	;;
 ppc64le)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz"

From 6afba81807d038491d93319b7b9748a48ad1444d Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 15:11:29 +0100
Subject: [PATCH 04/17] stack: update to 2.7.1

---
 srcpkgs/stack/patches/datakinds.patch | 14 ------
 srcpkgs/stack/patches/ghc-8.8.4.patch | 70 ---------------------------
 srcpkgs/stack/patches/ppc.patch       | 25 +++++-----
 srcpkgs/stack/template                | 10 ++--
 4 files changed, 18 insertions(+), 101 deletions(-)
 delete mode 100644 srcpkgs/stack/patches/datakinds.patch
 delete mode 100644 srcpkgs/stack/patches/ghc-8.8.4.patch

diff --git a/srcpkgs/stack/patches/datakinds.patch b/srcpkgs/stack/patches/datakinds.patch
deleted file mode 100644
index 1c06480515f7..000000000000
--- a/srcpkgs/stack/patches/datakinds.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Stack/Storage/User.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/User.hs	2020-12-06 20:51:06.632607164 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
---- src/Stack/Storage/Project.hs	2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/Project.hs	2020-12-06 21:55:21.349484738 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch
deleted file mode 100644
index 6b55c176e150..000000000000
--- a/srcpkgs/stack/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- masterdir/builddir/stack-2.5.1/stack.cabal	2020-10-17 17:19:10.724179166 +0200
-+++ stack.cabal	2020-10-17 17:18:03.803498792 +0200
-@@ -234,6 +234,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -272,7 +273,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -359,6 +360,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -396,7 +398,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -480,6 +482,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -518,7 +521,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , optparse-generic
-     , pantry >=0.5.1.3
-     , path
-@@ -609,6 +612,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -647,7 +651,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
diff --git a/srcpkgs/stack/patches/ppc.patch b/srcpkgs/stack/patches/ppc.patch
index 1b5bc191b47c..64ad365c47d2 100644
--- a/srcpkgs/stack/patches/ppc.patch
+++ b/srcpkgs/stack/patches/ppc.patch
@@ -1,13 +1,14 @@
 --- src/Stack/Setup.hs
 +++ src/Stack/Setup.hs
-@@ -95,5 +95,6 @@ import              System.IO.Error (isPermissionError)
+@@ -91,6 +91,7 @@
  import              System.FilePath (searchPathSeparator)
  import qualified    System.FilePath as FP
  import              System.Permissions (setFileExecutable)
 +import              System.Endian (getSystemEndianness, Endianness (..))
  import              System.Uname (getRelease)
  import              Data.List.Split (splitOn)
-@@ -1264,4 +1265,9 @@ getOSKey platform =
+ 
+@@ -1241,6 +1242,11 @@
          Platform X86_64                Cabal.Windows -> return "windows64"
          Platform Arm                   Cabal.Linux   -> return "linux-armv7"
          Platform AArch64               Cabal.Linux   -> return "linux-aarch64"
@@ -16,16 +17,16 @@
 +            case getSystemEndianness of
 +                LittleEndian -> return "linux-powerpc64le"
 +                BigEndian    -> return "linux-powerpc64"
+         Platform Sparc                 Cabal.Linux   -> return "linux-sparc"
          Platform arch os -> throwM $ UnsupportedSetupCombo os arch
-
- downloadFromInfo
+ 
 --- stack.cabal
 +++ stack.cabal
-@@ -235,6 +235,7 @@ library
-       , conduit
-       , conduit-extra
-       , containers
-+      , cpu >=0.1.2
-       , cryptonite
-       , cryptonite-conduit
-       , deepseq
+@@ -246,6 +246,7 @@
+         conduit >=1.3.4.1,
+         conduit-extra >=1.3.5,
+         containers >=0.6.2.1,
++        cpu >=0.1.2,
+         cryptonite >=0.27,
+         cryptonite-conduit >=0.2.2,
+         deepseq >=1.4.4.0,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 257aba10e50d..b95bf9ec59e9 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.5.1
+version=2.7.1
 revision=1
-_stackage="lts-16.13"
+_stackage="lts-17.5"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -10,10 +10,10 @@ short_desc="Cross-platform program for developing Haskell projects"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://haskellstack.org"
-distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
+distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076
- b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58"
+checksum="605bd8368b6fef9323ea71b79b08dd62270c49089a86b79fe67355f6b82cbc26
+ d03bee7e51bbdec5053573f94f644a6baeb140cdd95dbe47261e03c04306b252"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 03cf76b8fb22b00a83e40af2b6bc8a99d61d62f5 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 16 Mar 2021 17:41:58 +0100
Subject: [PATCH 05/17] xmobar: bump for ghc 8.10.4

---
 srcpkgs/xmobar/files/stack.yaml | 2 +-
 srcpkgs/xmobar/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 7bc4bf189d23..52fd0e3e49fe 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 81ae92fd2940..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.37
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From bde414325c08824e89d08209371b0ec1d86b58a4 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:03:10 +0100
Subject: [PATCH 06/17] hlint: update to 3.2.7

---
 srcpkgs/hlint/files/stack.yaml   |  7 -------
 srcpkgs/hlint/patches/data.patch | 10 ++++------
 srcpkgs/hlint/template           | 10 +++++-----
 3 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/hlint/files/stack.yaml

diff --git a/srcpkgs/hlint/files/stack.yaml b/srcpkgs/hlint/files/stack.yaml
deleted file mode 100644
index 12aead6562c5..000000000000
--- a/srcpkgs/hlint/files/stack.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-resolver: lts-16.13
-packages: [.]
-extra-deps:
-  - ghc-lib-parser-8.8.4.20200716
-  - ghc-lib-parser-ex-8.8.5.8
-ghc-options:
-    "$locals": -Wunused-imports -Worphans -Wunused-top-binds -Wunused-local-binds -Wincomplete-patterns
diff --git a/srcpkgs/hlint/patches/data.patch b/srcpkgs/hlint/patches/data.patch
index bdfac204f477..c73b376e5df7 100644
--- a/srcpkgs/hlint/patches/data.patch
+++ b/srcpkgs/hlint/patches/data.patch
@@ -1,13 +1,11 @@
-diff --git src/CmdLine.hs src/CmdLine.hs
-index 8c3d530..ccf7aac 100644
 --- src/CmdLine.hs
 +++ src/CmdLine.hs
-@@ -52,7 +52,7 @@ automatic cmd = case cmd of
+@@ -58,7 +58,7 @@
                  b <- doesDirectoryExist x
-                 if b then return cmd{cmdDataDir=x} else do
+                 if b then pure cmd{cmdDataDir=x} else do
                      exe <- getExecutablePath
--                    return cmd{cmdDataDir = takeDirectory exe </> "data"}
-+                    return cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
+-                    pure cmd{cmdDataDir = takeDirectory exe </> "data"}
++                    pure cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
          git cmd
              | cmdGit cmd = do
                  mgit <- findExecutable "git"
diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index 16fbb03ce2b9..fb30f947a452 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,16 +1,16 @@
 # Template file for 'hlint'
 pkgname=hlint
-version=2.2.11
-revision=2
+version=3.2.7
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
-homepage="https://github.com/ndmitchell/${pkgname}"
+homepage="https://github.com/ndmitchell/hlint"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=207539d3627efd3caed9e6fd3b1aeb8f1eb64553f1f9f166090adbf2fb71e172
+checksum=fcdeefcc79a52206add44b409abcab48c5fe2adff9d5aff077acbc43c702b54e
 nocross=yes # Can't yet cross compile Haskell
 nopie_files="/usr/bin/hlint"
 

From f62c7a77bc7f9ac0f98c3f14f1ba662578fd028f Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:43:37 +0100
Subject: [PATCH 07/17] kmonad: bump for ghc 8.10.4

---
 srcpkgs/kmonad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index 13e8845581ae..8c34a920ba7d 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,9 +1,9 @@
 # Template file for 'kmonad'
 pkgname=kmonad
 version=0.4.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage=lts-16.13
+stackage=lts-17.5
 short_desc="Keyboard remapping utility providing qmk-like functionality"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"

From 22a7d0fb3dca511f3853cbe81e3388504acd6642 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 16:21:35 +0100
Subject: [PATCH 08/17] hoogle: bump for ghc 8.10.4

---
 srcpkgs/hoogle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 4305ac4ae6e8..eafda8747cdf 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,9 +1,9 @@
 # Template file for 'hoogle'
 pkgname=hoogle
 version=5.0.18.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="zlib-devel"
 short_desc="Haskell API search engine"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From ce93641220463cc664b92aee77859cdda6370909 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 11:18:37 +0100
Subject: [PATCH 09/17] cgrep: bump for ghc 8.10.4

---
 srcpkgs/cgrep/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index 7b4047614a71..15eda3bafd0e 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,12 +1,12 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.6.33
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.18"
+stackage="lts-17.5"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="https://awgn.github.io/cgrep/"
 distfiles="https://github.com/awgn/${pkgname}/archive/v${version}.tar.gz"

From 42cb9c571e0272a2d94953d015166e9a7b00886f Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 15:03:05 +0100
Subject: [PATCH 10/17] debug-me: bump for ghc 8.10.4

---
 srcpkgs/debug-me/files/stack.yaml                     |  2 +-
 .../patches/{ghc8.8.3.patch => ghc8.10.4.patch}       | 11 +++++++++++
 srcpkgs/debug-me/template                             |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 rename srcpkgs/debug-me/patches/{ghc8.8.3.patch => ghc8.10.4.patch} (70%)

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index 9c88cea9ab3c..ecff9d9d18f2 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - '.'
-resolver: lts-16.13
+resolver: lts-17.5
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/patches/ghc8.8.3.patch b/srcpkgs/debug-me/patches/ghc8.10.4.patch
similarity index 70%
rename from srcpkgs/debug-me/patches/ghc8.8.3.patch
rename to srcpkgs/debug-me/patches/ghc8.10.4.patch
index f1779331c5a9..9cc19db63be3 100644
--- a/srcpkgs/debug-me/patches/ghc8.8.3.patch
+++ b/srcpkgs/debug-me/patches/ghc8.10.4.patch
@@ -20,3 +20,14 @@
  		defaultSettings
 
  checkEnv :: ServerOpts -> IO ServerOpts
+--- debug-me.cabal
++++ debug-me.cabal
+@@ -64,7 +64,7 @@
+     , stm-chans (>= 3.0)
+     , posix-pty (>= 0.2.1)
+     , terminal-size (>= 0.3)
+-    , aeson (>= 0.11 && < 1.5)
++    , aeson (>= 0.11 && < 1.6)
+     , sandi (>= 0.4)
+     , text (>= 1.2.2)
+     , optparse-applicative (>= 0.12)
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 3df514e0be48..797c52f1f479 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -1,7 +1,7 @@
 # Template file for 'debug-me'
 pkgname=debug-me
 version=1.20200820
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"

From 22546a28c703c7cd63d7ba76108cbc595be6fc66 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 20 Mar 2021 11:26:04 +0100
Subject: [PATCH 11/17] darcs: bump for ghc 8.10.4

---
 srcpkgs/darcs/files/stack.yaml | 2 +-
 srcpkgs/darcs/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index 41b5f081bd71..f5ca6078ed75 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.31
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index 42a29eb6872c..e6baa7c3354a 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.4
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From 8acf6fe740cbb9e999294ce309993cea45d50fc3 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 08:56:29 +0100
Subject: [PATCH 12/17] hledger: bump for ghc 8.10.4

---
 srcpkgs/hledger/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template
index b34e8ccd4652..1727a49252b7 100644
--- a/srcpkgs/hledger/template
+++ b/srcpkgs/hledger/template
@@ -1,7 +1,7 @@
 # Template file for 'hledger'
 pkgname=hledger
 version=1.21
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel ncurses-devel"
 short_desc="Simple, precise, plain text accounting"

From 95ec0516ebc3e9b13c0e969e4b8d6e4549f9d0d0 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 10:57:42 +0100
Subject: [PATCH 13/17] pandoc: bump for ghc 8.10.4

Citeproc support is build in now.  The change of maintainership was
suggested by Leah.
---
 srcpkgs/pandoc/files/stack.yaml | 23 -----------------------
 srcpkgs/pandoc/template         |  5 +++--
 2 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/pandoc/files/stack.yaml

diff --git a/srcpkgs/pandoc/files/stack.yaml b/srcpkgs/pandoc/files/stack.yaml
deleted file mode 100644
index 82a5fcaded3f..000000000000
--- a/srcpkgs/pandoc/files/stack.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-resolver: lts-17.9
-
-packages:
-  - ./pandoc-2.11.4
-  - ./pandoc-sidenote-0.20.0
-
-flags:
-  pandoc:
-    trypandoc: false
-    embed_data_files: true
-
-extra-deps:
-  - pandoc-types-1.22
-  - haddock-library-1.9.0
-  - regex-pcre-builtin-0.95.2.3.8.43
-  - hslua-1.2.0
-  - jira-wiki-markup-1.3.4
-  - commonmark-0.1.1.4
-  - commonmark-extensions-0.2.0.4
-  - commonmark-pandoc-0.2.0.1
-
-ghc-options:
-   "$locals": -fhide-source-paths -Wno-missing-home-modules
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index ad233dd0aaf3..8f2a9952d847 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,18 +2,19 @@
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
 version=2.11.4
-revision=1
+revision=2
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
+stackage="lts-17.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
 hostmakedepends="pkg-config unzip wget"
 makedepends="zlib-devel lua53-devel tar"
 short_desc="Universal converter between markup formats"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, MIT"
 homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz

From 5ba5fbe664a22e8970b0ed59c41d71e5e794fdb5 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 11:16:14 +0100
Subject: [PATCH 14/17] shellcheck: bump for ghc 8.10.4

---
 srcpkgs/shellcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 33381c2dac8f..76d479a12fca 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,9 +1,9 @@
 # Template file for 'shellcheck'
 pkgname=shellcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 hostmakedepends="pandoc"
 short_desc="Static analysis tool for shell scripts"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

From 96a424df019765192e75ceb4609e40d0c1b6dd42 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 16:07:47 +0100
Subject: [PATCH 15/17] git-mediate: update to 1.0.8.1

---
 srcpkgs/git-mediate/patches/ghc8.8.3.patch | 19 -------------------
 srcpkgs/git-mediate/template               |  8 ++++----
 2 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/git-mediate/patches/ghc8.8.3.patch

diff --git a/srcpkgs/git-mediate/patches/ghc8.8.3.patch b/srcpkgs/git-mediate/patches/ghc8.8.3.patch
deleted file mode 100644
index 7928b61ef3a4..000000000000
--- a/srcpkgs/git-mediate/patches/ghc8.8.3.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- git-mediate.cabal	2001-09-09 03:46:40.000000000 +0200
-+++ git-mediate.cabal	2020-03-30 15:32:48.959537620 +0200
-@@ -72,7 +72,7 @@
-   ghc-options:         -O2 -Wall
-   -- other-extensions:
-   build-depends:       base >=4.8 && <5
--                     , base-compat >= 0.8.2 && < 0.11
-+                     , base-compat >= 0.8.2 && < 0.12
-                      , mtl >=2.1
-                      , directory >=1.2
-                      , process >=1.2
-@@ -80,6 +80,6 @@
-                      , unix-compat >=0.4.2.0
-                      , Diff >=0.4
-                      , ansi-terminal >=0.6.2
--                     , optparse-applicative >=0.11 && <0.15
-+                     , optparse-applicative >=0.11 && <0.16
-   hs-source-dirs:      src
-   default-language:    Haskell2010
diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template
index aa3979d3435a..971a6236224f 100644
--- a/srcpkgs/git-mediate/template
+++ b/srcpkgs/git-mediate/template
@@ -1,15 +1,15 @@
 # Template file for 'git-mediate'
 pkgname=git-mediate
-version=1.0.8
-revision=4
+version=1.0.8.1
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 depends="git"
 short_desc="Tool to help resolving git conflicts"
 maintainer="Peter Wang <novalazy@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/Peaker/git-mediate"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=81220f7e20a3913bc147b69681666ad22e60e5b759a1becad78ee28dcad8013d
+checksum=ee44841d37ded70cbcd8edd1e233a344d0118295e0bd2f0c6983ed00f619c467
 nocross=yes
 nopie_files="/usr/bin/git-mediate"

From fc7dd47f09500e5005ba76300a888bea1efb51d9 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 16:11:25 +0100
Subject: [PATCH 16/17] git-annex: bump for ghc 8.10.4

---
 srcpkgs/git-annex/files/stack.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
index a6d4f6aeee64..5d457bebde83 100644
--- a/srcpkgs/git-annex/files/stack.yaml
+++ b/srcpkgs/git-annex/files/stack.yaml
@@ -28,4 +28,5 @@ extra-deps:
  - network-3.1.0.1
 explicit-setup-deps:
   git-annex: true
-resolver: lts-16.27
+resolver: lts-17.5
+allow-newer: true

From 1c9843cc9d77359a31bbac7db719d00fcd4c6ae7 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 30 Mar 2021 12:11:45 +0200
Subject: [PATCH 17/17] haskell-language-server: bump for ghc 8.10.4

---
 srcpkgs/haskell-language-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index 438c760f0a1f..7afa89c452f7 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,12 +1,12 @@
 # Template file for 'haskell-language-server'
 pkgname=haskell-language-server
 version=1.0.0
-revision=1
+revision=2
 # GHC only panics on i686
 # https://github.com/void-linux/void-packages/pull/27961/checks?check_run_id=2181519625#step:8:5936
 archs="~i686"
 build_style="haskell-stack"
-make_build_args="--stack-yaml stack-8.8.4.yaml"
+make_build_args="--stack-yaml stack-8.10.4.yaml"
 makedepends="ncurses-devel ncurses-libtinfo-devel icu-devel zlib-devel"
 short_desc="Integration of ghcide and haskell-ide-engine"
 maintainer="Wayne Van Son <waynevanson@gmail.com>"

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (33 preceding siblings ...)
  2021-06-16 18:45 ` [PR PATCH] [Updated] " slotThe
@ 2021-06-16 18:45 ` slotThe
  2021-06-24  6:44 ` [PR PATCH] [Updated] " slotThe
                   ` (3 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-06-16 18:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 156 bytes --]

New comment by slotThe on void-packages repository

https://github.com/void-linux/void-packages/pull/29506#issuecomment-862623872

Comment:
(just a rebase)

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (34 preceding siblings ...)
  2021-06-16 18:45 ` slotThe
@ 2021-06-24  6:44 ` slotThe
  2021-06-24  6:46 ` slotThe
                   ` (2 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-06-24  6:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3031 bytes --]

There is an updated pull request by slotThe against master on the void-packages repository

https://github.com/slotThe/void-packages ghc-8.10.4
https://github.com/void-linux/void-packages/pull/29506

[WIP] GHC 8.10.4
It's that time of the year again!

- [X] ghc; I took over as maintainer here, @leahneukirchen said that was okay on IRC (cc'ing here to make sure)
- [ ] ghc-bin; took over as mainainer of orphaned package.
    - [X] x86_64-musl; [Link here](https://void.johnnynator.dev/distfiles/ghc-8.10.4-x86_64-void-linux-musl.tar.xz)
    cc @q66 for these
    - [ ] ppc64le
    - [ ] ppc64le-musl
- [X] cabal-install
- [X] stack
 
Rebuild literally every single haskell package we have and see if anything's broken:

- [x] git-mediate
- [x] kmonad
- [x] cgrep; took over as mainainer of orphaned package.
- [x] debug-me
- [x] hlint
- [x] hoogle
- [x] darcs
- [x] shellcheck
- [x] git-annex
- [x] hledger
- [x] pandoc
- [x] xmobar
- [x] HLS; this is #27961 once that's merged

For the following two I'd like to fix #6414 while we're at it.  Because stack can't install libraries globally, this would involve either removing these packages entirely and advising users to install them in their own [stack or cabal projects](https://github.com/xmonad/xmonad-testing), or finding a way to build them with cabal and updating ghc's data base accordingly.  This would probably use `v1` commands, as we don't want to nuke our users db if we update xmonad. Cc @xaltsc as the current maintainer and @chilledfrogs as someone who might want to tackle this (if I read the IRC discussion correctly). 

- [ ] xmonad
- [ ] xmonad-contrib

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/29506.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghc-8.10.4-29506.patch --]
[-- Type: text/x-diff, Size: 37403 bytes --]

From f71aaa7b06f28a152695e3d491e2cee29dd198c8 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 31 Jan 2021 14:31:24 +0100
Subject: [PATCH 01/17] ghc: update to 8.10.4

The change of maintainership was okay-ed by Leah.
---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch | 41 +++++++++++-------------
 srcpkgs/ghc/template                     |  8 ++---
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index ac353ed417e5..c9bd2583abe0 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -85,7 +85,7 @@ index ec3c18a..0359be7 100644
 +        in Right [ 0x3D800000 .|. hi16 w32,
 +                   0x618C0000 .|. lo16 w32,
 +                   0x7D8903A6, 0x4E800420 ]
- 
+
      ArchPPC64LE ->
          -- The ABI requires r12 to point to the function's entry point.
 diff --git a/rts/Adjustor.c b/rts/Adjustor.c
@@ -93,7 +93,7 @@ index d360cfe..ab7ede7 100644
 --- a/rts/Adjustor.c
 +++ b/rts/Adjustor.c
 @@ -49,7 +49,7 @@ Haskell side.
- 
+
  #if defined(i386_HOST_ARCH)
  extern void adjustorCode(void);
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
@@ -104,16 +104,16 @@ index d360cfe..ab7ede7 100644
 @@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
  extern void obscure_ccall_ret_code(void);
  #endif
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
- 
+
  /* !!! !!! WARNING: !!! !!!
 @@ -318,7 +318,7 @@ typedef struct AdjustorStub {
  } AdjustorStub;
  #endif
- 
+
 -#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  static int totalArgumentSize(char *typeString)
@@ -131,10 +131,10 @@ index d360cfe..ab7ede7 100644
 @@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
          }
      }
- 
+
 -#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-         
+
  #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
  #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
 @@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
@@ -151,9 +151,9 @@ index 2795b83..63cfe91 100644
 --- a/rts/AdjustorAsm.S
 +++ b/rts/AdjustorAsm.S
 @@ -2,7 +2,7 @@
- 
+
  /* ******************************** PowerPC ******************************** */
- 
+
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
@@ -166,34 +166,31 @@ index 934926e..2ff8662 100644
 @@ -717,7 +717,7 @@ StgRunIsImplementedInAssembler(void)
     Everything is in assembler, so we don't have to deal with GCC...
     -------------------------------------------------------------------------- */
- 
+
 -#if defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
- 
+
  static void GNUC3_ATTRIBUTE(used)
  StgRunIsImplementedInAssembler(void)
 @@ -842,7 +842,7 @@ StgRunIsImplementedInAssembler(void)
- 
+
  #endif
- 
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
  /* -----------------------------------------------------------------------------
     PowerPC 64 little endian architecture
- 
+
 diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
 index 9274a44..3b4fc33 100644
 --- a/rts/StgCRunAsm.S
 +++ b/rts/StgCRunAsm.S
-@@ -1,7 +1,7 @@
- #include "ghcconfig.h"
- #include "rts/Constants.h"
- 
+@@ -5,7 +5,7 @@
+  * then functions StgRun/StgReturn are implemented in file StgCRun.c */
+ #if !defined(USE_MINIINTERPRETER)
+
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
- # ifdef linux_HOST_OS
+ # if defined(linux_HOST_OS)
  # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
  	.file	"StgCRun.c"
--- 
-2.30.0
-
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 082c56f70358..3bb7aa59f705 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,8 +1,8 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.8.4
-revision=2
+version=8.10.4
+revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
 hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
@@ -10,11 +10,11 @@ hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
 makedepends="libnuma-devel"
 depends="perl gcc libffi-devel gmp-devel libnuma-devel"
 short_desc="Glorious Haskell Compiler"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d
+checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"
 _bindir="/usr/lib/${pkgname}-${version}/bin"

From 009870d1ac47df99f3e5167743c143389031d5a4 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 28 Feb 2021 18:34:26 +0100
Subject: [PATCH 02/17] 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 000000000000..63965ca12d44
--- /dev/null
+++ b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
@@ -0,0 +1,43 @@
+--- bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
++++ 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 f80c72add1da..000000000000
--- 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 2c15789b1f9d..99ebb54427fe 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 <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=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
 }

From d87e82524fa19a432c873675a9aa53237a144300 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 12:37:23 +0100
Subject: [PATCH 03/17] ghc-bin: update to 8.10.4

Take over maintainership of orphaned package.
---
 srcpkgs/ghc-bin/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index b50c14854018..bdc4cc0ef253 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,13 +1,13 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.8.4
+version=8.10.4
 revision=1
 archs="i686 x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
 short_desc="Glorious Haskell Compiler - precompiled binaries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 nostrip=yes
@@ -15,17 +15,17 @@ noshlibprovides=yes
 conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
-	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb8-linux.tar.xz"
-	checksum=51a36892f1264744195274187298d13ac62bce2da86d4ddf76d8054ab90f2feb
+	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
+	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=779647d3f4e6e39da9e13b2559319ede76b4fff1107e4dc369a09aadeecad971
+	checksum=246485f18ceccaadaece6450ed7af46dd6b4d5d33e0b8dd1647c64dd8e50dc60
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0
+	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
 	;;
 ppc64le)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz"

From 5e48d1d2499ce716338fe68d04eb6a8b2b71ae2f Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 15:11:29 +0100
Subject: [PATCH 04/17] stack: update to 2.7.1

---
 srcpkgs/stack/patches/datakinds.patch | 14 ------
 srcpkgs/stack/patches/ghc-8.8.4.patch | 70 ---------------------------
 srcpkgs/stack/patches/ppc.patch       | 31 ++++++------
 srcpkgs/stack/template                | 10 ++--
 4 files changed, 21 insertions(+), 104 deletions(-)
 delete mode 100644 srcpkgs/stack/patches/datakinds.patch
 delete mode 100644 srcpkgs/stack/patches/ghc-8.8.4.patch

diff --git a/srcpkgs/stack/patches/datakinds.patch b/srcpkgs/stack/patches/datakinds.patch
deleted file mode 100644
index 6da5cf5d61c2..000000000000
--- a/srcpkgs/stack/patches/datakinds.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/Stack/Storage/User.hs	2020-10-15 15:51:28.000000000 +0200
-+++ b/src/Stack/Storage/User.hs	2020-12-06 20:51:06.632607164 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
---- a/src/Stack/Storage/Project.hs	2020-10-15 15:51:28.000000000 +0200
-+++ b/src/Stack/Storage/Project.hs	2020-12-06 21:55:21.349484738 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch
deleted file mode 100644
index e4cd0618da16..000000000000
--- a/srcpkgs/stack/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- a/masterdir/builddir/stack-2.5.1/stack.cabal	2020-10-17 17:19:10.724179166 +0200
-+++ b/stack.cabal	2020-10-17 17:18:03.803498792 +0200
-@@ -234,6 +234,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -272,7 +273,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -359,6 +360,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -396,7 +398,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
-@@ -480,6 +482,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -518,7 +521,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , optparse-generic
-     , pantry >=0.5.1.3
-     , path
-@@ -609,6 +612,7 @@
-     , base >=4.10 && <5
-     , base64-bytestring
-     , bytestring
-+    , base16-bytestring == 0.1.1.7
-     , casa-client
-     , casa-types
-     , colour
-@@ -647,7 +651,7 @@
-     , neat-interpolation
-     , network-uri
-     , open-browser
--    , optparse-applicative
-+    , optparse-applicative == 0.15.1.0
-     , pantry >=0.5.1.3
-     , path
-     , path-io
diff --git a/srcpkgs/stack/patches/ppc.patch b/srcpkgs/stack/patches/ppc.patch
index ef661e16b5b8..19c0ebf5c4d0 100644
--- a/srcpkgs/stack/patches/ppc.patch
+++ b/srcpkgs/stack/patches/ppc.patch
@@ -1,13 +1,14 @@
---- a/src/Stack/Setup.hs
-+++ b/src/Stack/Setup.hs
-@@ -95,5 +95,6 @@ import              System.IO.Error (isPermissionError)
+--- src/Stack/Setup.hs
++++ src/Stack/Setup.hs
+@@ -91,6 +91,7 @@
  import              System.FilePath (searchPathSeparator)
  import qualified    System.FilePath as FP
  import              System.Permissions (setFileExecutable)
 +import              System.Endian (getSystemEndianness, Endianness (..))
  import              System.Uname (getRelease)
  import              Data.List.Split (splitOn)
-@@ -1264,4 +1265,9 @@ getOSKey platform =
+
+@@ -1241,6 +1242,11 @@
          Platform X86_64                Cabal.Windows -> return "windows64"
          Platform Arm                   Cabal.Linux   -> return "linux-armv7"
          Platform AArch64               Cabal.Linux   -> return "linux-aarch64"
@@ -16,16 +17,16 @@
 +            case getSystemEndianness of
 +                LittleEndian -> return "linux-powerpc64le"
 +                BigEndian    -> return "linux-powerpc64"
+         Platform Sparc                 Cabal.Linux   -> return "linux-sparc"
          Platform arch os -> throwM $ UnsupportedSetupCombo os arch
 
- downloadFromInfo
---- a/stack.cabal
-+++ b/stack.cabal
-@@ -235,6 +235,7 @@ library
-       , conduit
-       , conduit-extra
-       , containers
-+      , cpu >=0.1.2
-       , cryptonite
-       , cryptonite-conduit
-       , deepseq
+--- stack.cabal
++++ stack.cabal
+@@ -246,6 +246,7 @@
+         conduit >=1.3.4.1,
+         conduit-extra >=1.3.5,
+         containers >=0.6.2.1,
++        cpu >=0.1.2,
+         cryptonite >=0.27,
+         cryptonite-conduit >=0.2.2,
+         deepseq >=1.4.4.0,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 257aba10e50d..b95bf9ec59e9 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.5.1
+version=2.7.1
 revision=1
-_stackage="lts-16.13"
+_stackage="lts-17.5"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -10,10 +10,10 @@ short_desc="Cross-platform program for developing Haskell projects"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://haskellstack.org"
-distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
+distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076
- b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58"
+checksum="605bd8368b6fef9323ea71b79b08dd62270c49089a86b79fe67355f6b82cbc26
+ d03bee7e51bbdec5053573f94f644a6baeb140cdd95dbe47261e03c04306b252"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 0579754dc29d768a79828c840dbb7e0ea614e4d7 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 16 Mar 2021 17:41:58 +0100
Subject: [PATCH 05/17] xmobar: bump for ghc 8.10.4

---
 srcpkgs/xmobar/files/stack.yaml | 2 +-
 srcpkgs/xmobar/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 7bc4bf189d23..52fd0e3e49fe 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 81ae92fd2940..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.37
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From 97ca5e32c98ee8224d90d208d83abe703cbdc66a Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:03:10 +0100
Subject: [PATCH 06/17] hlint: update to 3.2.7

---
 srcpkgs/hlint/files/stack.yaml   |  7 -------
 srcpkgs/hlint/patches/data.patch | 14 ++++++--------
 srcpkgs/hlint/template           | 10 +++++-----
 3 files changed, 11 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/hlint/files/stack.yaml

diff --git a/srcpkgs/hlint/files/stack.yaml b/srcpkgs/hlint/files/stack.yaml
deleted file mode 100644
index 12aead6562c5..000000000000
--- a/srcpkgs/hlint/files/stack.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-resolver: lts-16.13
-packages: [.]
-extra-deps:
-  - ghc-lib-parser-8.8.4.20200716
-  - ghc-lib-parser-ex-8.8.5.8
-ghc-options:
-    "$locals": -Wunused-imports -Worphans -Wunused-top-binds -Wunused-local-binds -Wincomplete-patterns
diff --git a/srcpkgs/hlint/patches/data.patch b/srcpkgs/hlint/patches/data.patch
index 27553e9fbedd..c73b376e5df7 100644
--- a/srcpkgs/hlint/patches/data.patch
+++ b/srcpkgs/hlint/patches/data.patch
@@ -1,13 +1,11 @@
-diff --git src/CmdLine.hs src/CmdLine.hs
-index 8c3d530..ccf7aac 100644
---- a/src/CmdLine.hs
-+++ b/src/CmdLine.hs
-@@ -52,7 +52,7 @@ automatic cmd = case cmd of
+--- src/CmdLine.hs
++++ src/CmdLine.hs
+@@ -58,7 +58,7 @@
                  b <- doesDirectoryExist x
-                 if b then return cmd{cmdDataDir=x} else do
+                 if b then pure cmd{cmdDataDir=x} else do
                      exe <- getExecutablePath
--                    return cmd{cmdDataDir = takeDirectory exe </> "data"}
-+                    return cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
+-                    pure cmd{cmdDataDir = takeDirectory exe </> "data"}
++                    pure cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
          git cmd
              | cmdGit cmd = do
                  mgit <- findExecutable "git"
diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index 16fbb03ce2b9..fb30f947a452 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,16 +1,16 @@
 # Template file for 'hlint'
 pkgname=hlint
-version=2.2.11
-revision=2
+version=3.2.7
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
-homepage="https://github.com/ndmitchell/${pkgname}"
+homepage="https://github.com/ndmitchell/hlint"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=207539d3627efd3caed9e6fd3b1aeb8f1eb64553f1f9f166090adbf2fb71e172
+checksum=fcdeefcc79a52206add44b409abcab48c5fe2adff9d5aff077acbc43c702b54e
 nocross=yes # Can't yet cross compile Haskell
 nopie_files="/usr/bin/hlint"
 

From 95a3fe9bb43810005bd52111bc6991472d4e3fc0 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:43:37 +0100
Subject: [PATCH 07/17] kmonad: bump for ghc 8.10.4

---
 srcpkgs/kmonad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index 13e8845581ae..8c34a920ba7d 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,9 +1,9 @@
 # Template file for 'kmonad'
 pkgname=kmonad
 version=0.4.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage=lts-16.13
+stackage=lts-17.5
 short_desc="Keyboard remapping utility providing qmk-like functionality"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"

From 792e316c9918c4561823ba2027ee1a173072e7ee Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 16:21:35 +0100
Subject: [PATCH 08/17] hoogle: bump for ghc 8.10.4

---
 srcpkgs/hoogle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 4305ac4ae6e8..eafda8747cdf 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,9 +1,9 @@
 # Template file for 'hoogle'
 pkgname=hoogle
 version=5.0.18.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 makedepends="zlib-devel"
 short_desc="Haskell API search engine"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From e234f8235a3a3db1daf5c684497f4514f1dc3400 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 11:18:37 +0100
Subject: [PATCH 09/17] cgrep: bump for ghc 8.10.4

---
 srcpkgs/cgrep/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index 7b4047614a71..15eda3bafd0e 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,12 +1,12 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.6.33
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.18"
+stackage="lts-17.5"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="https://awgn.github.io/cgrep/"
 distfiles="https://github.com/awgn/${pkgname}/archive/v${version}.tar.gz"

From b31cd76992d18a2753b38f0919025aa02c9da9bf Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 15:03:05 +0100
Subject: [PATCH 10/17] debug-me: bump for ghc 8.10.4

---
 srcpkgs/debug-me/files/stack.yaml                     |  2 +-
 .../patches/{ghc8.8.3.patch => ghc8.10.4.patch}       | 11 +++++++++++
 srcpkgs/debug-me/template                             |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 rename srcpkgs/debug-me/patches/{ghc8.8.3.patch => ghc8.10.4.patch} (70%)

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index 9c88cea9ab3c..ecff9d9d18f2 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - '.'
-resolver: lts-16.13
+resolver: lts-17.5
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/patches/ghc8.8.3.patch b/srcpkgs/debug-me/patches/ghc8.10.4.patch
similarity index 70%
rename from srcpkgs/debug-me/patches/ghc8.8.3.patch
rename to srcpkgs/debug-me/patches/ghc8.10.4.patch
index dc9be027822f..fd1e03458968 100644
--- a/srcpkgs/debug-me/patches/ghc8.8.3.patch
+++ b/srcpkgs/debug-me/patches/ghc8.10.4.patch
@@ -20,3 +20,14 @@
  		defaultSettings
 
  checkEnv :: ServerOpts -> IO ServerOpts
+--- debug-me.cabal
++++ debug-me.cabal
+@@ -64,7 +64,7 @@
+     , stm-chans (>= 3.0)
+     , posix-pty (>= 0.2.1)
+     , terminal-size (>= 0.3)
+-    , aeson (>= 0.11 && < 1.5)
++    , aeson (>= 0.11 && < 1.6)
+     , sandi (>= 0.4)
+     , text (>= 1.2.2)
+     , optparse-applicative (>= 0.12)
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 3df514e0be48..797c52f1f479 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -1,7 +1,7 @@
 # Template file for 'debug-me'
 pkgname=debug-me
 version=1.20200820
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"

From 1f43a0385729562f5acb7854d1d90e642ca83153 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 20 Mar 2021 11:26:04 +0100
Subject: [PATCH 11/17] darcs: bump for ghc 8.10.4

---
 srcpkgs/darcs/files/stack.yaml | 2 +-
 srcpkgs/darcs/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index 41b5f081bd71..f5ca6078ed75 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.31
+resolver: lts-17.5
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index 42a29eb6872c..e6baa7c3354a 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.4
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From d5bb9f3c86c0760bbae3382dd7997dfd7f0e4cc8 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 08:56:29 +0100
Subject: [PATCH 12/17] hledger: bump for ghc 8.10.4

---
 srcpkgs/hledger/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template
index b34e8ccd4652..1727a49252b7 100644
--- a/srcpkgs/hledger/template
+++ b/srcpkgs/hledger/template
@@ -1,7 +1,7 @@
 # Template file for 'hledger'
 pkgname=hledger
 version=1.21
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel ncurses-devel"
 short_desc="Simple, precise, plain text accounting"

From c1a468a84417f13bc5911fd81e5afb95ff8ee940 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 10:57:42 +0100
Subject: [PATCH 13/17] pandoc: bump for ghc 8.10.4

Citeproc support is build in now.  The change of maintainership was
suggested by Leah.
---
 srcpkgs/pandoc/files/stack.yaml | 23 -----------------------
 srcpkgs/pandoc/template         |  5 +++--
 2 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/pandoc/files/stack.yaml

diff --git a/srcpkgs/pandoc/files/stack.yaml b/srcpkgs/pandoc/files/stack.yaml
deleted file mode 100644
index 82a5fcaded3f..000000000000
--- a/srcpkgs/pandoc/files/stack.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-resolver: lts-17.9
-
-packages:
-  - ./pandoc-2.11.4
-  - ./pandoc-sidenote-0.20.0
-
-flags:
-  pandoc:
-    trypandoc: false
-    embed_data_files: true
-
-extra-deps:
-  - pandoc-types-1.22
-  - haddock-library-1.9.0
-  - regex-pcre-builtin-0.95.2.3.8.43
-  - hslua-1.2.0
-  - jira-wiki-markup-1.3.4
-  - commonmark-0.1.1.4
-  - commonmark-extensions-0.2.0.4
-  - commonmark-pandoc-0.2.0.1
-
-ghc-options:
-   "$locals": -fhide-source-paths -Wno-missing-home-modules
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index ad233dd0aaf3..8f2a9952d847 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,18 +2,19 @@
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
 version=2.11.4
-revision=1
+revision=2
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
+stackage="lts-17.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
 hostmakedepends="pkg-config unzip wget"
 makedepends="zlib-devel lua53-devel tar"
 short_desc="Universal converter between markup formats"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, MIT"
 homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz

From c24cbf5560a3b41ecf3ef2e9e6218eeebe60aac9 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 11:16:14 +0100
Subject: [PATCH 14/17] shellcheck: bump for ghc 8.10.4

---
 srcpkgs/shellcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 33381c2dac8f..76d479a12fca 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,9 +1,9 @@
 # Template file for 'shellcheck'
 pkgname=shellcheck
 version=0.7.2
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 hostmakedepends="pandoc"
 short_desc="Static analysis tool for shell scripts"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

From 1c552d7adb61f5895d27a0123e54f487e5ebcacf Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 16:07:47 +0100
Subject: [PATCH 15/17] git-mediate: update to 1.0.8.1

---
 srcpkgs/git-mediate/patches/ghc8.8.3.patch | 19 -------------------
 srcpkgs/git-mediate/template               |  8 ++++----
 2 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/git-mediate/patches/ghc8.8.3.patch

diff --git a/srcpkgs/git-mediate/patches/ghc8.8.3.patch b/srcpkgs/git-mediate/patches/ghc8.8.3.patch
deleted file mode 100644
index 5920ea01474c..000000000000
--- a/srcpkgs/git-mediate/patches/ghc8.8.3.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/git-mediate.cabal	2001-09-09 03:46:40.000000000 +0200
-+++ b/git-mediate.cabal	2020-03-30 15:32:48.959537620 +0200
-@@ -72,7 +72,7 @@
-   ghc-options:         -O2 -Wall
-   -- other-extensions:
-   build-depends:       base >=4.8 && <5
--                     , base-compat >= 0.8.2 && < 0.11
-+                     , base-compat >= 0.8.2 && < 0.12
-                      , mtl >=2.1
-                      , directory >=1.2
-                      , process >=1.2
-@@ -80,6 +80,6 @@
-                      , unix-compat >=0.4.2.0
-                      , Diff >=0.4
-                      , ansi-terminal >=0.6.2
--                     , optparse-applicative >=0.11 && <0.15
-+                     , optparse-applicative >=0.11 && <0.16
-   hs-source-dirs:      src
-   default-language:    Haskell2010
diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template
index aa3979d3435a..971a6236224f 100644
--- a/srcpkgs/git-mediate/template
+++ b/srcpkgs/git-mediate/template
@@ -1,15 +1,15 @@
 # Template file for 'git-mediate'
 pkgname=git-mediate
-version=1.0.8
-revision=4
+version=1.0.8.1
+revision=1
 build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
 depends="git"
 short_desc="Tool to help resolving git conflicts"
 maintainer="Peter Wang <novalazy@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/Peaker/git-mediate"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=81220f7e20a3913bc147b69681666ad22e60e5b759a1becad78ee28dcad8013d
+checksum=ee44841d37ded70cbcd8edd1e233a344d0118295e0bd2f0c6983ed00f619c467
 nocross=yes
 nopie_files="/usr/bin/git-mediate"

From 0bcfabff67f23e9cb8ff219f1b47117a5abd7a56 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 16:11:25 +0100
Subject: [PATCH 16/17] git-annex: bump for ghc 8.10.4

---
 srcpkgs/git-annex/files/stack.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
index a6d4f6aeee64..5d457bebde83 100644
--- a/srcpkgs/git-annex/files/stack.yaml
+++ b/srcpkgs/git-annex/files/stack.yaml
@@ -28,4 +28,5 @@ extra-deps:
  - network-3.1.0.1
 explicit-setup-deps:
   git-annex: true
-resolver: lts-16.27
+resolver: lts-17.5
+allow-newer: true

From 2a0863ba79283eb2063652727975648a87b0f0bc Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 30 Mar 2021 12:11:45 +0200
Subject: [PATCH 17/17] haskell-language-server: bump for ghc 8.10.4

---
 srcpkgs/haskell-language-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index 438c760f0a1f..7afa89c452f7 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,12 +1,12 @@
 # Template file for 'haskell-language-server'
 pkgname=haskell-language-server
 version=1.0.0
-revision=1
+revision=2
 # GHC only panics on i686
 # https://github.com/void-linux/void-packages/pull/27961/checks?check_run_id=2181519625#step:8:5936
 archs="~i686"
 build_style="haskell-stack"
-make_build_args="--stack-yaml stack-8.8.4.yaml"
+make_build_args="--stack-yaml stack-8.10.4.yaml"
 makedepends="ncurses-devel ncurses-libtinfo-devel icu-devel zlib-devel"
 short_desc="Integration of ghcide and haskell-ide-engine"
 maintainer="Wayne Van Son <waynevanson@gmail.com>"

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (35 preceding siblings ...)
  2021-06-24  6:44 ` [PR PATCH] [Updated] " slotThe
@ 2021-06-24  6:46 ` slotThe
  2021-07-04 23:10 ` q66
  2021-07-27 10:47 ` [PR PATCH] [Closed]: " q66
  38 siblings, 0 replies; 40+ messages in thread
From: slotThe @ 2021-06-24  6:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

New comment by slotThe on void-packages repository

https://github.com/void-linux/void-packages/pull/29506#issuecomment-867385016

Comment:
(another rebase)

@q66 do you know when you'll be getting to this?  

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (36 preceding siblings ...)
  2021-06-24  6:46 ` slotThe
@ 2021-07-04 23:10 ` q66
  2021-07-27 10:47 ` [PR PATCH] [Closed]: " q66
  38 siblings, 0 replies; 40+ messages in thread
From: q66 @ 2021-07-04 23:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 186 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/29506#issuecomment-873680728

Comment:
rust is done now, I will be getting to this next 

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Closed]: [WIP] GHC 8.10.4
  2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
                   ` (37 preceding siblings ...)
  2021-07-04 23:10 ` q66
@ 2021-07-27 10:47 ` q66
  38 siblings, 0 replies; 40+ messages in thread
From: q66 @ 2021-07-27 10:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2872 bytes --]

There's a closed pull request on the void-packages repository

[WIP] GHC 8.10.4
https://github.com/void-linux/void-packages/pull/29506

Description:
It's that time of the year again!

- [X] ghc; I took over as maintainer here, @leahneukirchen said that was okay on IRC (cc'ing here to make sure)
- [ ] ghc-bin; took over as mainainer of orphaned package.
    - [X] x86_64-musl; [Link here](https://void.johnnynator.dev/distfiles/ghc-8.10.4-x86_64-void-linux-musl.tar.xz)
    cc @q66 for these
    - [ ] ppc64le
    - [ ] ppc64le-musl
- [X] cabal-install
- [X] stack
 
Rebuild literally every single haskell package we have and see if anything's broken:

- [x] git-mediate
- [x] kmonad
- [x] cgrep; took over as mainainer of orphaned package.
- [x] debug-me
- [x] hlint
- [x] hoogle
- [x] darcs
- [x] shellcheck
- [x] git-annex
- [x] hledger
- [x] pandoc
- [x] xmobar
- [x] HLS; this is #27961 once that's merged

For the following two I'd like to fix #6414 while we're at it.  Because stack can't install libraries globally, this would involve either removing these packages entirely and advising users to install them in their own [stack or cabal projects](https://github.com/xmonad/xmonad-testing), or finding a way to build them with cabal and updating ghc's data base accordingly.  This would probably use `v1` commands, as we don't want to nuke our users db if we update xmonad. Cc @xaltsc as the current maintainer and @chilledfrogs as someone who might want to tackle this (if I read the IRC discussion correctly). 

- [ ] xmonad
- [ ] xmonad-contrib

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

[ci skip]


^ permalink raw reply	[flat|nested] 40+ messages in thread

end of thread, other threads:[~2021-07-27 10:47 UTC | newest]

Thread overview: 40+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-16 10:48 [PR PATCH] [WIP] GHC 8.10.4 slotThe
2021-03-16 16:44 ` [PR PATCH] [Updated] " slotThe
2021-03-16 17:23 ` slotThe
2021-03-17 17:00 ` leahneukirchen
2021-03-18  7:47 ` [PR PATCH] [Updated] " slotThe
2021-03-18  8:09 ` slotThe
2021-03-19 14:08 ` slotThe
2021-03-20 13:03 ` slotThe
2021-03-25  7:57 ` slotThe
2021-03-25  7:58 ` slotThe
2021-03-25  7:59 ` slotThe
2021-03-25  8:02 ` slotThe
2021-03-25 10:16 ` slotThe
2021-03-25 16:44 ` slotThe
2021-03-30 10:12 ` slotThe
2021-03-30 15:22 ` leahneukirchen
2021-04-01 12:20 ` [PR PATCH] [Updated] " slotThe
2021-04-13 11:04 ` slotThe
2021-04-21  8:04 ` slotThe
2021-04-22  5:44 ` slotThe
2021-04-22 19:42 ` mobinmob
2021-04-22 19:42 ` mobinmob
2021-04-27  8:02 ` slotThe
2021-04-28  7:42 ` [PR PATCH] [Updated] " slotThe
2021-04-30 22:58 ` q66
2021-05-20 15:30 ` slotThe
2021-05-20 17:32 ` q66
2021-05-20 17:53 ` [PR PATCH] [Updated] " slotThe
2021-06-05 15:07 ` slotThe
2021-06-07  7:35 ` slotThe
2021-06-07 10:40 ` Johnnynator
2021-06-07 11:11 ` [PR PATCH] [Updated] " slotThe
2021-06-07 11:12 ` slotThe
2021-06-07 13:23 ` leahneukirchen
2021-06-16 18:45 ` [PR PATCH] [Updated] " slotThe
2021-06-16 18:45 ` slotThe
2021-06-24  6:44 ` [PR PATCH] [Updated] " slotThe
2021-06-24  6:46 ` slotThe
2021-07-04 23:10 ` q66
2021-07-27 10:47 ` [PR PATCH] [Closed]: " q66

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).