Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [WIP] GHC 8.10.7
@ 2021-10-31 16:44 slotThe
  2021-11-02  7:56 ` [PR PATCH] [Updated] " slotThe
                   ` (18 more replies)
  0 siblings, 19 replies; 20+ messages in thread
From: slotThe @ 2021-10-31 16:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3338 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.7
https://github.com/void-linux/void-packages/pull/33850

[WIP] GHC 8.10.7
The 8.10.x release flood seems to have stopped; time for the fun part to begin!

- [x] ghc
- [ ] ghc-bin
    - [x] x86_64-musl ([Link](https://download1079.mediafire.com/1l9xm9fxv0ig/2pajfh1y79zf5if/ghc-8.10.7-x86_64-void-linux-musl.tar.xz))
    cc @q66 for the following
    - [ ] 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; took over as mainainer of orphaned package.
- [ ] debug-me
- [x] hlint
- [x] hoogle
- [x] darcs
- [ ] shellcheck
- [ ] git-annex
- [x] hledger
- [ ] pandoc
- [x] xmobar
- [x] haskell-language-server

I saw that the `xmonad` and `xmonad-contrib` packages are still in the repos, so maybe this slipped through the cracks for the 8.10.4 bump.  I'll quote from last time:

> 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, 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).

Since we're more or less talking about system wide installs anyways, these are much better addressed (imo) with [cabal-env](https://github.com/phadej/cabal-extras) or [stack](https://github.com/xmonad/xmonad/blob/master/INSTALL.md).

- [ ] REMOVE/DEPRECATE xmonad
- [ ] REMOVE/DEPRECATE 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.)
- [ ] 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/33850.patch is attached

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

From 509bb0e58f66fdf458cd1af4b238271f5e614100 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 9 Oct 2021 15:35:58 +0200
Subject: [PATCH 01/11] ghc: update to 8.10.7

---
 srcpkgs/ghc/patches/sphinx-unicode.patch | 17 -----------------
 srcpkgs/ghc/template                     |  4 ++--
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/ghc/patches/sphinx-unicode.patch

diff --git a/srcpkgs/ghc/patches/sphinx-unicode.patch b/srcpkgs/ghc/patches/sphinx-unicode.patch
deleted file mode 100644
index 0286b9c2bd31..000000000000
--- a/srcpkgs/ghc/patches/sphinx-unicode.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -rpU2 ghc-8.8.4-orig/docs/users_guide/conf.py ghc-8.8.4/docs/users_guide/conf.py
---- ghc-8.8.4-orig/docs/users_guide/conf.py	2020-07-08 16:43:03.000000000 +0000
-+++ ghc-8.8.4/docs/users_guide/conf.py	2021-07-10 20:25:33.536928487 +0000
-@@ -78,5 +78,5 @@ latex_elements = {
-     'inputenc': '',
-     'utf8extra': '',
--    'preamble': '''
-+    'preamble': r'''
- \usepackage{fontspec}
- \usepackage{makeidx}
-@@ -84,5 +84,5 @@ latex_elements = {
- \setromanfont{DejaVu Serif}
- \setmonofont{DejaVu Sans Mono}
--\setlength{\\tymin}{45pt}
-+\setlength{\tymin}{45pt}
- ''',
- }
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 3bb7aa59f705..b8b16f67b433 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,7 +1,7 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.10.4
+version=8.10.7
 revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ 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=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
+checksum=e3eef6229ce9908dfe1ea41436befb0455fefb1932559e860ad4c606b0d03c9d
 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 4a740aced3b421b6ef78709e04af70aef486f4f8 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 10 Oct 2021 17:33:05 +0200
Subject: [PATCH 02/11] cabal-install: update to 3.6.2.0

As of version 3.6.0.0, Cabal does not issue separate versions of
`cabal-install` on GitHub anymore.  Hence, we have to change the
respective paths and wrksrc directories.
---
 .../patches/ghc-8.10.4-build.diff             | 43 -------------------
 srcpkgs/cabal-install/template                | 14 +++---
 2 files changed, 7 insertions(+), 50 deletions(-)
 delete mode 100644 srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff

diff --git a/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
deleted file mode 100644
index a3eaaa90f4f1..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
-+++ b/bootstrap/linux-8.10.1.json	2021-02-28 18:54:36.417761219 +0100
-@@ -14,7 +14,7 @@
-         },
-         {
-             "package": "base",
--            "version": "4.14.0.0"
-+            "version": "4.14.1.0"
-         },
-         {
-             "package": "array",
-@@ -26,7 +26,7 @@
-         },
-         {
-             "package": "bytestring",
--            "version": "0.10.10.0"
-+            "version": "0.10.12.0"
-         },
-         {
-             "package": "containers",
-@@ -62,7 +62,7 @@
-         },
-         {
-             "package": "text",
--            "version": "1.2.3.2"
-+            "version": "1.2.4.1"
-         },
-         {
-             "package": "parsec",
-@@ -74,11 +74,11 @@
-         },
-         {
-             "package": "process",
--            "version": "1.6.8.2"
-+            "version": "1.6.9.0"
-         },
-         {
-             "package": "ghc-boot-th",
--            "version": "8.10.1"
-+            "version": "8.10.4"
-         },
-         {
-             "package": "template-haskell",
diff --git a/srcpkgs/cabal-install/template b/srcpkgs/cabal-install/template
index 18ce63f254c7..d6d718709993 100644
--- a/srcpkgs/cabal-install/template
+++ b/srcpkgs/cabal-install/template
@@ -1,8 +1,8 @@
 # Template file for 'cabal-install'
 pkgname=cabal-install
-version=3.4.0.0
-revision=2
-wrksrc=cabal-${pkgname}-${version}
+version=3.6.2.0
+revision=1
+wrksrc=cabal-Cabal-v${version}
 hostmakedepends="ghc curl tar which"
 makedepends="gmp-devel libffi-devel zlib-devel python3"
 depends="ghc"
@@ -10,8 +10,8 @@ short_desc="Command-line interface for Cabal and Hackage"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://hackage.haskell.org/package/cabal-install"
-distfiles="https://github.com/haskell/cabal/archive/${pkgname}-${version}.tar.gz"
-checksum=e4fbd5eb1d77400746a993679181f159aa415a37b931b26d67f5602f63ce971c
+distfiles="https://github.com/haskell/cabal/archive/Cabal-v${version}.tar.gz"
+checksum=dcf31e82cd85ea3236be18cc36c68058948994579ea7de18f99175821dbbcb64
 nopie_files="/usr/bin/cabal"
 nocross=yes
 
@@ -19,12 +19,12 @@ post_patch() {
 	case "${XBPS_TARGET_MACHINE}" in
 	i686*)
 		# https://github.com/haskell/cabal/issues/7313
-		vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.1.json ;;
+		vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.7.json ;;
 	esac
 }
 
 do_build() {
-	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.1.json
+	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.7.json
 }
 do_install() {
 	vbin _build/bin/cabal

From 32ff7307e72d647846ebdb450fed1e6f936872da Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Mon, 25 Oct 2021 10:39:23 +0200
Subject: [PATCH 03/11] stack: bump for lts-18.14

This is the most recent stackage resolver for GHC 8.10.7.
---
 srcpkgs/stack/patches/SimpleRepo.patch | 18 ++++++++++++++++++
 srcpkgs/stack/template                 |  6 +++---
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/stack/patches/SimpleRepo.patch

diff --git a/srcpkgs/stack/patches/SimpleRepo.patch b/srcpkgs/stack/patches/SimpleRepo.patch
new file mode 100644
index 000000000000..df85d5b942be
--- /dev/null
+++ b/srcpkgs/stack/patches/SimpleRepo.patch
@@ -0,0 +1,18 @@
+--- a/src/Stack/Setup.hs
++++ b/src/Stack/Setup.hs
+@@ -837,9 +837,8 @@
+    if compilerTool `elem` installed
+      then return (compilerTool,CompilerBuildStandard)
+      else do
+-       let repo = Repo
+-            { repoCommit = commitId
+-            , repoUrl    = url
+-            , repoType   = RepoGit
+-            , repoSubdir = mempty
++       let repo = SimpleRepo
++            { sRepoCommit = commitId
++            , sRepoUrl    = url
++            , sRepoType   = RepoGit
+             }
+
+        -- clone the repository and execute the given commands
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index f9d573ef5bfd..d7015a5ddd1c 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
 version=2.7.3
-revision=1
-_stackage="lts-18.5"
+revision=2
+_stackage="lts-18.14"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -13,7 +13,7 @@ homepage="https://haskellstack.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
 checksum="47caf8818352c7f663eb0364f48b1f4d80832ae25c31ca483416a4b74c2c5b44
- 322bc85f38bf6726af6e588dde381d72f0c3e89970939b6a7b5b975cabd05d1a"
+ 78577c091074d78f9d6e09d6e31e7fc8ac2ddbb0dbc4ac65c606adcac4957d7f"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 1804369a1b7919d6106999ddbc7858e1fe54bf6c Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 27 Oct 2021 19:01:39 +0200
Subject: [PATCH 04/11] ghc-bin: update to 8.10.7

---
 srcpkgs/ghc-bin/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index df74043ea188..dec19fef877c 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.10.4
+version=8.10.7
 revision=1
 archs="i686 x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
@@ -16,16 +16,16 @@ 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-deb9-linux.tar.xz"
-	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
+	checksum=ced9870ea351af64fb48274b81a664cdb6a9266775f1598a79cbb6fdd5770a23
 	;;
 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=246485f18ceccaadaece6450ed7af46dd6b4d5d33e0b8dd1647c64dd8e50dc60
+	checksum=52f6492f39f13890f4ecd83784724ae9fff7a02fdc624a56c49872c912608a50
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
+	checksum=fbfc1ef194f4e7a4c0da8c11cc69b17458a4b928b609b3622c97acc4acd5c5ab
 	;;
 ppc64le)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz"

From d58dc11c9da85509a58a05b5c6a21fd3882315a5 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:05:38 +0200
Subject: [PATCH 05/11] kmonad: bump for ghc 8.10.7

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

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

From 53eb4504e35e4740a4193716f7d7ac2ccbdcb831 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:28:25 +0200
Subject: [PATCH 06/11] haskell-language-server: update to 1.4.0

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

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index ff0782a54ddb..0182c9b95757 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,16 +1,16 @@
 # Template file for 'haskell-language-server'
 pkgname=haskell-language-server
-version=1.3.0
+version=1.4.0
 revision=1
 build_style="haskell-stack"
-make_build_args="--stack-yaml stack-8.10.4.yaml"
+make_build_args="--stack-yaml stack-8.10.7.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>"
 license="Apache-2.0"
 homepage="https://github.com/haskell/haskell-language-server"
 distfiles="https://github.com/haskell/haskell-language-server/archive/${version}.tar.gz"
-checksum=9be31ead3fb1c0ca761de80185a23665dfe167457baaba642cf62885df98f6a1
+checksum=c5d7dbf7fae9aa3ed2c1184b49e82d8ac623ca786494ef6602cfe11735d28db0
 nopie_files="
  /usr/bin/haskell-language-server
  /usr/bin/haskell-language-server-wrapper

From 9d6a2b6661b356f82510779588655b9ec397bebc Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:37:59 +0200
Subject: [PATCH 07/11] xmobar: bump for ghc 8.10.7

---
 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 52fd0e3e49fe..47544eb729d8 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-17.5
+resolver: lts-18.13
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 708899ad4e24..b97c9f268d68 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.39
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From c2eec1f3851648ab9d278ca6b0752582ba984e43 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:39:46 +0200
Subject: [PATCH 08/11] hledger: bump for ghc 8.10.7

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

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

From 93239cc2bf4b7dc1bd2c235e2fce511990a8507a Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:40:29 +0200
Subject: [PATCH 09/11] hoogle: bump for ghc 8.10.7

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

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

From 32b1885194160784dfadc3bff4550585915e3856 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:41:54 +0200
Subject: [PATCH 10/11] hlint: bump for ghc 8.10.7

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

diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index fb30f947a452..fd72c1bbea58 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,9 +1,9 @@
 # Template file for 'hlint'
 pkgname=hlint
 version=3.2.7
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From e6ae637f07b8899f84ad3ed0965a6c7da101a931 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:42:42 +0200
Subject: [PATCH 11/11] darcs: bump for ghc 8.10.7

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

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index f5ca6078ed75..5ae0f5313b8d 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,5 +1,7 @@
-resolver: lts-17.5
+resolver: lts-18.14
 packages:
 - .
 extra-deps:
 - graphviz-2999.20.1.0
+- constraints-0.12@sha256:7edf1e72a92d0a6761da634f08be9123dfcc0dcec11c269cbf465a09721c3481,2322
+- cryptonite-0.27@sha256:c3a9c8ce11e654a9d5bee827b089d4b50587272828d0c52a85362a58667a916c,18163
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index e6baa7c3354a..fbd2d35d6383 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.4
-revision=2
+revision=3
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

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

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.7
  2021-10-31 16:44 [PR PATCH] [WIP] GHC 8.10.7 slotThe
@ 2021-11-02  7:56 ` slotThe
  2021-11-03 18:18 ` slotThe
                   ` (17 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: slotThe @ 2021-11-02  7:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3343 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.7
https://github.com/void-linux/void-packages/pull/33850

[WIP] GHC 8.10.7
The 8.10.x release flood seems to have stopped; time for the fun part to begin!

- [x] ghc
- [ ] ghc-bin
    - [x] x86_64-musl ([Link](https://download1079.mediafire.com/1l9xm9fxv0ig/2pajfh1y79zf5if/ghc-8.10.7-x86_64-void-linux-musl.tar.xz))
    cc @q66 for the following
    - [ ] 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; took over as mainainer of orphaned package.
- [ ] debug-me
- [x] hlint
- [x] hoogle
- [x] darcs
- [ ] shellcheck
- [ ] git-annex
- [x] hledger
- [ ] pandoc
- [x] xmobar
- [x] haskell-language-server

I saw that the `xmonad` and `xmonad-contrib` packages are still in the repos, so maybe this slipped through the cracks for the 8.10.4 bump.  I'll quote from last time:

> 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, 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).

Since we're more or less talking about system wide installs anyways, these are much better addressed (imo) with [cabal-env](https://github.com/phadej/cabal-extras) or [stack](https://github.com/xmonad/xmonad/blob/master/INSTALL.md).

- [ ] REMOVE/DEPRECATE xmonad
- [ ] REMOVE/DEPRECATE 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.)
- [ ] 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/33850.patch is attached

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

From 509bb0e58f66fdf458cd1af4b238271f5e614100 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 9 Oct 2021 15:35:58 +0200
Subject: [PATCH 01/12] ghc: update to 8.10.7

---
 srcpkgs/ghc/patches/sphinx-unicode.patch | 17 -----------------
 srcpkgs/ghc/template                     |  4 ++--
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/ghc/patches/sphinx-unicode.patch

diff --git a/srcpkgs/ghc/patches/sphinx-unicode.patch b/srcpkgs/ghc/patches/sphinx-unicode.patch
deleted file mode 100644
index 0286b9c2bd31..000000000000
--- a/srcpkgs/ghc/patches/sphinx-unicode.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -rpU2 ghc-8.8.4-orig/docs/users_guide/conf.py ghc-8.8.4/docs/users_guide/conf.py
---- ghc-8.8.4-orig/docs/users_guide/conf.py	2020-07-08 16:43:03.000000000 +0000
-+++ ghc-8.8.4/docs/users_guide/conf.py	2021-07-10 20:25:33.536928487 +0000
-@@ -78,5 +78,5 @@ latex_elements = {
-     'inputenc': '',
-     'utf8extra': '',
--    'preamble': '''
-+    'preamble': r'''
- \usepackage{fontspec}
- \usepackage{makeidx}
-@@ -84,5 +84,5 @@ latex_elements = {
- \setromanfont{DejaVu Serif}
- \setmonofont{DejaVu Sans Mono}
--\setlength{\\tymin}{45pt}
-+\setlength{\tymin}{45pt}
- ''',
- }
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 3bb7aa59f705..b8b16f67b433 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,7 +1,7 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.10.4
+version=8.10.7
 revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ 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=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
+checksum=e3eef6229ce9908dfe1ea41436befb0455fefb1932559e860ad4c606b0d03c9d
 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 4a740aced3b421b6ef78709e04af70aef486f4f8 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 10 Oct 2021 17:33:05 +0200
Subject: [PATCH 02/12] cabal-install: update to 3.6.2.0

As of version 3.6.0.0, Cabal does not issue separate versions of
`cabal-install` on GitHub anymore.  Hence, we have to change the
respective paths and wrksrc directories.
---
 .../patches/ghc-8.10.4-build.diff             | 43 -------------------
 srcpkgs/cabal-install/template                | 14 +++---
 2 files changed, 7 insertions(+), 50 deletions(-)
 delete mode 100644 srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff

diff --git a/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
deleted file mode 100644
index a3eaaa90f4f1..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
-+++ b/bootstrap/linux-8.10.1.json	2021-02-28 18:54:36.417761219 +0100
-@@ -14,7 +14,7 @@
-         },
-         {
-             "package": "base",
--            "version": "4.14.0.0"
-+            "version": "4.14.1.0"
-         },
-         {
-             "package": "array",
-@@ -26,7 +26,7 @@
-         },
-         {
-             "package": "bytestring",
--            "version": "0.10.10.0"
-+            "version": "0.10.12.0"
-         },
-         {
-             "package": "containers",
-@@ -62,7 +62,7 @@
-         },
-         {
-             "package": "text",
--            "version": "1.2.3.2"
-+            "version": "1.2.4.1"
-         },
-         {
-             "package": "parsec",
-@@ -74,11 +74,11 @@
-         },
-         {
-             "package": "process",
--            "version": "1.6.8.2"
-+            "version": "1.6.9.0"
-         },
-         {
-             "package": "ghc-boot-th",
--            "version": "8.10.1"
-+            "version": "8.10.4"
-         },
-         {
-             "package": "template-haskell",
diff --git a/srcpkgs/cabal-install/template b/srcpkgs/cabal-install/template
index 18ce63f254c7..d6d718709993 100644
--- a/srcpkgs/cabal-install/template
+++ b/srcpkgs/cabal-install/template
@@ -1,8 +1,8 @@
 # Template file for 'cabal-install'
 pkgname=cabal-install
-version=3.4.0.0
-revision=2
-wrksrc=cabal-${pkgname}-${version}
+version=3.6.2.0
+revision=1
+wrksrc=cabal-Cabal-v${version}
 hostmakedepends="ghc curl tar which"
 makedepends="gmp-devel libffi-devel zlib-devel python3"
 depends="ghc"
@@ -10,8 +10,8 @@ short_desc="Command-line interface for Cabal and Hackage"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://hackage.haskell.org/package/cabal-install"
-distfiles="https://github.com/haskell/cabal/archive/${pkgname}-${version}.tar.gz"
-checksum=e4fbd5eb1d77400746a993679181f159aa415a37b931b26d67f5602f63ce971c
+distfiles="https://github.com/haskell/cabal/archive/Cabal-v${version}.tar.gz"
+checksum=dcf31e82cd85ea3236be18cc36c68058948994579ea7de18f99175821dbbcb64
 nopie_files="/usr/bin/cabal"
 nocross=yes
 
@@ -19,12 +19,12 @@ post_patch() {
 	case "${XBPS_TARGET_MACHINE}" in
 	i686*)
 		# https://github.com/haskell/cabal/issues/7313
-		vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.1.json ;;
+		vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.7.json ;;
 	esac
 }
 
 do_build() {
-	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.1.json
+	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.7.json
 }
 do_install() {
 	vbin _build/bin/cabal

From 32ff7307e72d647846ebdb450fed1e6f936872da Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Mon, 25 Oct 2021 10:39:23 +0200
Subject: [PATCH 03/12] stack: bump for lts-18.14

This is the most recent stackage resolver for GHC 8.10.7.
---
 srcpkgs/stack/patches/SimpleRepo.patch | 18 ++++++++++++++++++
 srcpkgs/stack/template                 |  6 +++---
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/stack/patches/SimpleRepo.patch

diff --git a/srcpkgs/stack/patches/SimpleRepo.patch b/srcpkgs/stack/patches/SimpleRepo.patch
new file mode 100644
index 000000000000..df85d5b942be
--- /dev/null
+++ b/srcpkgs/stack/patches/SimpleRepo.patch
@@ -0,0 +1,18 @@
+--- a/src/Stack/Setup.hs
++++ b/src/Stack/Setup.hs
+@@ -837,9 +837,8 @@
+    if compilerTool `elem` installed
+      then return (compilerTool,CompilerBuildStandard)
+      else do
+-       let repo = Repo
+-            { repoCommit = commitId
+-            , repoUrl    = url
+-            , repoType   = RepoGit
+-            , repoSubdir = mempty
++       let repo = SimpleRepo
++            { sRepoCommit = commitId
++            , sRepoUrl    = url
++            , sRepoType   = RepoGit
+             }
+
+        -- clone the repository and execute the given commands
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index f9d573ef5bfd..d7015a5ddd1c 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
 version=2.7.3
-revision=1
-_stackage="lts-18.5"
+revision=2
+_stackage="lts-18.14"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -13,7 +13,7 @@ homepage="https://haskellstack.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
 checksum="47caf8818352c7f663eb0364f48b1f4d80832ae25c31ca483416a4b74c2c5b44
- 322bc85f38bf6726af6e588dde381d72f0c3e89970939b6a7b5b975cabd05d1a"
+ 78577c091074d78f9d6e09d6e31e7fc8ac2ddbb0dbc4ac65c606adcac4957d7f"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 1804369a1b7919d6106999ddbc7858e1fe54bf6c Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 27 Oct 2021 19:01:39 +0200
Subject: [PATCH 04/12] ghc-bin: update to 8.10.7

---
 srcpkgs/ghc-bin/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index df74043ea188..dec19fef877c 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.10.4
+version=8.10.7
 revision=1
 archs="i686 x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
@@ -16,16 +16,16 @@ 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-deb9-linux.tar.xz"
-	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
+	checksum=ced9870ea351af64fb48274b81a664cdb6a9266775f1598a79cbb6fdd5770a23
 	;;
 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=246485f18ceccaadaece6450ed7af46dd6b4d5d33e0b8dd1647c64dd8e50dc60
+	checksum=52f6492f39f13890f4ecd83784724ae9fff7a02fdc624a56c49872c912608a50
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
+	checksum=fbfc1ef194f4e7a4c0da8c11cc69b17458a4b928b609b3622c97acc4acd5c5ab
 	;;
 ppc64le)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz"

From d58dc11c9da85509a58a05b5c6a21fd3882315a5 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:05:38 +0200
Subject: [PATCH 05/12] kmonad: bump for ghc 8.10.7

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

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

From 53eb4504e35e4740a4193716f7d7ac2ccbdcb831 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:28:25 +0200
Subject: [PATCH 06/12] haskell-language-server: update to 1.4.0

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

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index ff0782a54ddb..0182c9b95757 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,16 +1,16 @@
 # Template file for 'haskell-language-server'
 pkgname=haskell-language-server
-version=1.3.0
+version=1.4.0
 revision=1
 build_style="haskell-stack"
-make_build_args="--stack-yaml stack-8.10.4.yaml"
+make_build_args="--stack-yaml stack-8.10.7.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>"
 license="Apache-2.0"
 homepage="https://github.com/haskell/haskell-language-server"
 distfiles="https://github.com/haskell/haskell-language-server/archive/${version}.tar.gz"
-checksum=9be31ead3fb1c0ca761de80185a23665dfe167457baaba642cf62885df98f6a1
+checksum=c5d7dbf7fae9aa3ed2c1184b49e82d8ac623ca786494ef6602cfe11735d28db0
 nopie_files="
  /usr/bin/haskell-language-server
  /usr/bin/haskell-language-server-wrapper

From 9d6a2b6661b356f82510779588655b9ec397bebc Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:37:59 +0200
Subject: [PATCH 07/12] xmobar: bump for ghc 8.10.7

---
 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 52fd0e3e49fe..47544eb729d8 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-17.5
+resolver: lts-18.13
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 708899ad4e24..b97c9f268d68 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.39
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From c2eec1f3851648ab9d278ca6b0752582ba984e43 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:39:46 +0200
Subject: [PATCH 08/12] hledger: bump for ghc 8.10.7

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

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

From 93239cc2bf4b7dc1bd2c235e2fce511990a8507a Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:40:29 +0200
Subject: [PATCH 09/12] hoogle: bump for ghc 8.10.7

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

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

From 32b1885194160784dfadc3bff4550585915e3856 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:41:54 +0200
Subject: [PATCH 10/12] hlint: bump for ghc 8.10.7

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

diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index fb30f947a452..fd72c1bbea58 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,9 +1,9 @@
 # Template file for 'hlint'
 pkgname=hlint
 version=3.2.7
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From e6ae637f07b8899f84ad3ed0965a6c7da101a931 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:42:42 +0200
Subject: [PATCH 11/12] darcs: bump for ghc 8.10.7

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

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index f5ca6078ed75..5ae0f5313b8d 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,5 +1,7 @@
-resolver: lts-17.5
+resolver: lts-18.14
 packages:
 - .
 extra-deps:
 - graphviz-2999.20.1.0
+- constraints-0.12@sha256:7edf1e72a92d0a6761da634f08be9123dfcc0dcec11c269cbf465a09721c3481,2322
+- cryptonite-0.27@sha256:c3a9c8ce11e654a9d5bee827b089d4b50587272828d0c52a85362a58667a916c,18163
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index e6baa7c3354a..fbd2d35d6383 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.4
-revision=2
+revision=3
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From f404d1063b90b22369540b1a4a3512d935ffc2ce Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 2 Nov 2021 08:57:33 +0100
Subject: [PATCH 12/12] shellcheck: bump for ghc 8.10.7

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

diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 76d479a12fca..c08d97395eca 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,9 +1,9 @@
 # Template file for 'shellcheck'
 pkgname=shellcheck
 version=0.7.2
-revision=2
+revision=3
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.13"
 hostmakedepends="pandoc"
 short_desc="Static analysis tool for shell scripts"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

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

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.7
  2021-10-31 16:44 [PR PATCH] [WIP] GHC 8.10.7 slotThe
  2021-11-02  7:56 ` [PR PATCH] [Updated] " slotThe
@ 2021-11-03 18:18 ` slotThe
  2021-11-04 12:15 ` xaltsc
                   ` (16 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: slotThe @ 2021-11-03 18:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3298 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.7
https://github.com/void-linux/void-packages/pull/33850

[WIP] GHC 8.10.7
The 8.10.x release flood seems to have stopped; time for the fun part to begin!

- [x] ghc
- [ ] ghc-bin
    - [x] x86_64-musl ([Link](https://download1079.mediafire.com/1l9xm9fxv0ig/2pajfh1y79zf5if/ghc-8.10.7-x86_64-void-linux-musl.tar.xz))
    cc @q66 for the following
    - [ ] 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
- [x] darcs
- [x] shellcheck
- [ ] git-annex
- [x] hledger
- [ ] pandoc
- [x] xmobar
- [x] haskell-language-server

I saw that the `xmonad` and `xmonad-contrib` packages are still in the repos, so maybe this slipped through the cracks for the 8.10.4 bump.  I'll quote from last time:

> 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, 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).

Since we're more or less talking about system wide installs anyways, these are much better addressed (imo) with [cabal-env](https://github.com/phadej/cabal-extras) or [stack](https://github.com/xmonad/xmonad/blob/master/INSTALL.md).

- [ ] REMOVE/DEPRECATE xmonad
- [ ] REMOVE/DEPRECATE 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.)
- [ ] 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/33850.patch is attached

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

From 509bb0e58f66fdf458cd1af4b238271f5e614100 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 9 Oct 2021 15:35:58 +0200
Subject: [PATCH 01/14] ghc: update to 8.10.7

---
 srcpkgs/ghc/patches/sphinx-unicode.patch | 17 -----------------
 srcpkgs/ghc/template                     |  4 ++--
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/ghc/patches/sphinx-unicode.patch

diff --git a/srcpkgs/ghc/patches/sphinx-unicode.patch b/srcpkgs/ghc/patches/sphinx-unicode.patch
deleted file mode 100644
index 0286b9c2bd31..000000000000
--- a/srcpkgs/ghc/patches/sphinx-unicode.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -rpU2 ghc-8.8.4-orig/docs/users_guide/conf.py ghc-8.8.4/docs/users_guide/conf.py
---- ghc-8.8.4-orig/docs/users_guide/conf.py	2020-07-08 16:43:03.000000000 +0000
-+++ ghc-8.8.4/docs/users_guide/conf.py	2021-07-10 20:25:33.536928487 +0000
-@@ -78,5 +78,5 @@ latex_elements = {
-     'inputenc': '',
-     'utf8extra': '',
--    'preamble': '''
-+    'preamble': r'''
- \usepackage{fontspec}
- \usepackage{makeidx}
-@@ -84,5 +84,5 @@ latex_elements = {
- \setromanfont{DejaVu Serif}
- \setmonofont{DejaVu Sans Mono}
--\setlength{\\tymin}{45pt}
-+\setlength{\tymin}{45pt}
- ''',
- }
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 3bb7aa59f705..b8b16f67b433 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,7 +1,7 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.10.4
+version=8.10.7
 revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ 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=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
+checksum=e3eef6229ce9908dfe1ea41436befb0455fefb1932559e860ad4c606b0d03c9d
 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 4a740aced3b421b6ef78709e04af70aef486f4f8 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 10 Oct 2021 17:33:05 +0200
Subject: [PATCH 02/14] cabal-install: update to 3.6.2.0

As of version 3.6.0.0, Cabal does not issue separate versions of
`cabal-install` on GitHub anymore.  Hence, we have to change the
respective paths and wrksrc directories.
---
 .../patches/ghc-8.10.4-build.diff             | 43 -------------------
 srcpkgs/cabal-install/template                | 14 +++---
 2 files changed, 7 insertions(+), 50 deletions(-)
 delete mode 100644 srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff

diff --git a/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
deleted file mode 100644
index a3eaaa90f4f1..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
-+++ b/bootstrap/linux-8.10.1.json	2021-02-28 18:54:36.417761219 +0100
-@@ -14,7 +14,7 @@
-         },
-         {
-             "package": "base",
--            "version": "4.14.0.0"
-+            "version": "4.14.1.0"
-         },
-         {
-             "package": "array",
-@@ -26,7 +26,7 @@
-         },
-         {
-             "package": "bytestring",
--            "version": "0.10.10.0"
-+            "version": "0.10.12.0"
-         },
-         {
-             "package": "containers",
-@@ -62,7 +62,7 @@
-         },
-         {
-             "package": "text",
--            "version": "1.2.3.2"
-+            "version": "1.2.4.1"
-         },
-         {
-             "package": "parsec",
-@@ -74,11 +74,11 @@
-         },
-         {
-             "package": "process",
--            "version": "1.6.8.2"
-+            "version": "1.6.9.0"
-         },
-         {
-             "package": "ghc-boot-th",
--            "version": "8.10.1"
-+            "version": "8.10.4"
-         },
-         {
-             "package": "template-haskell",
diff --git a/srcpkgs/cabal-install/template b/srcpkgs/cabal-install/template
index 18ce63f254c7..d6d718709993 100644
--- a/srcpkgs/cabal-install/template
+++ b/srcpkgs/cabal-install/template
@@ -1,8 +1,8 @@
 # Template file for 'cabal-install'
 pkgname=cabal-install
-version=3.4.0.0
-revision=2
-wrksrc=cabal-${pkgname}-${version}
+version=3.6.2.0
+revision=1
+wrksrc=cabal-Cabal-v${version}
 hostmakedepends="ghc curl tar which"
 makedepends="gmp-devel libffi-devel zlib-devel python3"
 depends="ghc"
@@ -10,8 +10,8 @@ short_desc="Command-line interface for Cabal and Hackage"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://hackage.haskell.org/package/cabal-install"
-distfiles="https://github.com/haskell/cabal/archive/${pkgname}-${version}.tar.gz"
-checksum=e4fbd5eb1d77400746a993679181f159aa415a37b931b26d67f5602f63ce971c
+distfiles="https://github.com/haskell/cabal/archive/Cabal-v${version}.tar.gz"
+checksum=dcf31e82cd85ea3236be18cc36c68058948994579ea7de18f99175821dbbcb64
 nopie_files="/usr/bin/cabal"
 nocross=yes
 
@@ -19,12 +19,12 @@ post_patch() {
 	case "${XBPS_TARGET_MACHINE}" in
 	i686*)
 		# https://github.com/haskell/cabal/issues/7313
-		vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.1.json ;;
+		vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.7.json ;;
 	esac
 }
 
 do_build() {
-	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.1.json
+	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.7.json
 }
 do_install() {
 	vbin _build/bin/cabal

From 32ff7307e72d647846ebdb450fed1e6f936872da Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Mon, 25 Oct 2021 10:39:23 +0200
Subject: [PATCH 03/14] stack: bump for lts-18.14

This is the most recent stackage resolver for GHC 8.10.7.
---
 srcpkgs/stack/patches/SimpleRepo.patch | 18 ++++++++++++++++++
 srcpkgs/stack/template                 |  6 +++---
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/stack/patches/SimpleRepo.patch

diff --git a/srcpkgs/stack/patches/SimpleRepo.patch b/srcpkgs/stack/patches/SimpleRepo.patch
new file mode 100644
index 000000000000..df85d5b942be
--- /dev/null
+++ b/srcpkgs/stack/patches/SimpleRepo.patch
@@ -0,0 +1,18 @@
+--- a/src/Stack/Setup.hs
++++ b/src/Stack/Setup.hs
+@@ -837,9 +837,8 @@
+    if compilerTool `elem` installed
+      then return (compilerTool,CompilerBuildStandard)
+      else do
+-       let repo = Repo
+-            { repoCommit = commitId
+-            , repoUrl    = url
+-            , repoType   = RepoGit
+-            , repoSubdir = mempty
++       let repo = SimpleRepo
++            { sRepoCommit = commitId
++            , sRepoUrl    = url
++            , sRepoType   = RepoGit
+             }
+
+        -- clone the repository and execute the given commands
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index f9d573ef5bfd..d7015a5ddd1c 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
 version=2.7.3
-revision=1
-_stackage="lts-18.5"
+revision=2
+_stackage="lts-18.14"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -13,7 +13,7 @@ homepage="https://haskellstack.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
 checksum="47caf8818352c7f663eb0364f48b1f4d80832ae25c31ca483416a4b74c2c5b44
- 322bc85f38bf6726af6e588dde381d72f0c3e89970939b6a7b5b975cabd05d1a"
+ 78577c091074d78f9d6e09d6e31e7fc8ac2ddbb0dbc4ac65c606adcac4957d7f"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 1804369a1b7919d6106999ddbc7858e1fe54bf6c Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 27 Oct 2021 19:01:39 +0200
Subject: [PATCH 04/14] ghc-bin: update to 8.10.7

---
 srcpkgs/ghc-bin/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index df74043ea188..dec19fef877c 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.10.4
+version=8.10.7
 revision=1
 archs="i686 x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
@@ -16,16 +16,16 @@ 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-deb9-linux.tar.xz"
-	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
+	checksum=ced9870ea351af64fb48274b81a664cdb6a9266775f1598a79cbb6fdd5770a23
 	;;
 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=246485f18ceccaadaece6450ed7af46dd6b4d5d33e0b8dd1647c64dd8e50dc60
+	checksum=52f6492f39f13890f4ecd83784724ae9fff7a02fdc624a56c49872c912608a50
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
+	checksum=fbfc1ef194f4e7a4c0da8c11cc69b17458a4b928b609b3622c97acc4acd5c5ab
 	;;
 ppc64le)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz"

From d58dc11c9da85509a58a05b5c6a21fd3882315a5 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:05:38 +0200
Subject: [PATCH 05/14] kmonad: bump for ghc 8.10.7

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

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

From 53eb4504e35e4740a4193716f7d7ac2ccbdcb831 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:28:25 +0200
Subject: [PATCH 06/14] haskell-language-server: update to 1.4.0

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

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index ff0782a54ddb..0182c9b95757 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,16 +1,16 @@
 # Template file for 'haskell-language-server'
 pkgname=haskell-language-server
-version=1.3.0
+version=1.4.0
 revision=1
 build_style="haskell-stack"
-make_build_args="--stack-yaml stack-8.10.4.yaml"
+make_build_args="--stack-yaml stack-8.10.7.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>"
 license="Apache-2.0"
 homepage="https://github.com/haskell/haskell-language-server"
 distfiles="https://github.com/haskell/haskell-language-server/archive/${version}.tar.gz"
-checksum=9be31ead3fb1c0ca761de80185a23665dfe167457baaba642cf62885df98f6a1
+checksum=c5d7dbf7fae9aa3ed2c1184b49e82d8ac623ca786494ef6602cfe11735d28db0
 nopie_files="
  /usr/bin/haskell-language-server
  /usr/bin/haskell-language-server-wrapper

From 9d6a2b6661b356f82510779588655b9ec397bebc Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:37:59 +0200
Subject: [PATCH 07/14] xmobar: bump for ghc 8.10.7

---
 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 52fd0e3e49fe..47544eb729d8 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-17.5
+resolver: lts-18.13
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 708899ad4e24..b97c9f268d68 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.39
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From c2eec1f3851648ab9d278ca6b0752582ba984e43 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:39:46 +0200
Subject: [PATCH 08/14] hledger: bump for ghc 8.10.7

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

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

From 93239cc2bf4b7dc1bd2c235e2fce511990a8507a Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:40:29 +0200
Subject: [PATCH 09/14] hoogle: bump for ghc 8.10.7

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

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

From 32b1885194160784dfadc3bff4550585915e3856 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:41:54 +0200
Subject: [PATCH 10/14] hlint: bump for ghc 8.10.7

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

diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index fb30f947a452..fd72c1bbea58 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,9 +1,9 @@
 # Template file for 'hlint'
 pkgname=hlint
 version=3.2.7
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From e6ae637f07b8899f84ad3ed0965a6c7da101a931 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:42:42 +0200
Subject: [PATCH 11/14] darcs: bump for ghc 8.10.7

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

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index f5ca6078ed75..5ae0f5313b8d 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,5 +1,7 @@
-resolver: lts-17.5
+resolver: lts-18.14
 packages:
 - .
 extra-deps:
 - graphviz-2999.20.1.0
+- constraints-0.12@sha256:7edf1e72a92d0a6761da634f08be9123dfcc0dcec11c269cbf465a09721c3481,2322
+- cryptonite-0.27@sha256:c3a9c8ce11e654a9d5bee827b089d4b50587272828d0c52a85362a58667a916c,18163
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index e6baa7c3354a..fbd2d35d6383 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.4
-revision=2
+revision=3
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From f404d1063b90b22369540b1a4a3512d935ffc2ce Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 2 Nov 2021 08:57:33 +0100
Subject: [PATCH 12/14] shellcheck: bump for ghc 8.10.7

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

diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 76d479a12fca..c08d97395eca 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,9 +1,9 @@
 # Template file for 'shellcheck'
 pkgname=shellcheck
 version=0.7.2
-revision=2
+revision=3
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.13"
 hostmakedepends="pandoc"
 short_desc="Static analysis tool for shell scripts"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

From e103edf531d16741df7c146d3ff9952e9be5c521 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 08:35:15 +0100
Subject: [PATCH 13/14] pandoc: bump for ghc 8.10.7

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

diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index d84e94c7b93b..4e43f154a751 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,12 +2,12 @@
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
 version=2.14.0.3
-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-18.5"
+stackage="lts-18.14"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"

From 134f3dc14f7e7afa0372ae37957280eed995f91f Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 19:17:39 +0100
Subject: [PATCH 14/14] cgrep: bump for ghc 8.10.7

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

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index 15eda3bafd0e..783745c8cb2a 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,9 +1,9 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.6.33
-revision=2
+revision=3
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
 maintainer="slotThe <soliditsallgood@mailbox.org>"

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

* Re: [WIP] GHC 8.10.7
  2021-10-31 16:44 [PR PATCH] [WIP] GHC 8.10.7 slotThe
  2021-11-02  7:56 ` [PR PATCH] [Updated] " slotThe
  2021-11-03 18:18 ` slotThe
@ 2021-11-04 12:15 ` xaltsc
  2021-11-05  6:23 ` [PR PATCH] [Updated] " slotThe
                   ` (15 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: xaltsc @ 2021-11-04 12:15 UTC (permalink / raw)
  To: ml

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

New comment by xaltsc on void-packages repository

https://github.com/void-linux/void-packages/pull/33850#issuecomment-960777286

Comment:
Just fyi If you haven't skimmed through the issue concerning xmonad and xmobar, I've abandonned the maintainership of xmo* because I'm clearly incompetent in these matters.

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

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.7
  2021-10-31 16:44 [PR PATCH] [WIP] GHC 8.10.7 slotThe
                   ` (2 preceding siblings ...)
  2021-11-04 12:15 ` xaltsc
@ 2021-11-05  6:23 ` slotThe
  2021-11-05  6:26 ` slotThe
                   ` (14 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: slotThe @ 2021-11-05  6:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3298 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.7
https://github.com/void-linux/void-packages/pull/33850

[WIP] GHC 8.10.7
The 8.10.x release flood seems to have stopped; time for the fun part to begin!

- [x] ghc
- [ ] ghc-bin
    - [x] x86_64-musl ([Link](https://download1079.mediafire.com/1l9xm9fxv0ig/2pajfh1y79zf5if/ghc-8.10.7-x86_64-void-linux-musl.tar.xz))
    cc @q66 for the following
    - [ ] 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
- [ ] debug-me
- [x] hlint
- [x] hoogle
- [x] darcs
- [x] shellcheck
- [ ] git-annex
- [x] hledger
- [x] pandoc
- [x] xmobar
- [x] haskell-language-server

I saw that the `xmonad` and `xmonad-contrib` packages are still in the repos, so maybe this slipped through the cracks for the 8.10.4 bump.  I'll quote from last time:

> 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, 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).

Since we're more or less talking about system wide installs anyways, these are much better addressed (imo) with [cabal-env](https://github.com/phadej/cabal-extras) or [stack](https://github.com/xmonad/xmonad/blob/master/INSTALL.md).

- [ ] REMOVE/DEPRECATE xmonad
- [ ] REMOVE/DEPRECATE 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.)
- [ ] 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/33850.patch is attached

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

From 509bb0e58f66fdf458cd1af4b238271f5e614100 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 9 Oct 2021 15:35:58 +0200
Subject: [PATCH 01/17] ghc: update to 8.10.7

---
 srcpkgs/ghc/patches/sphinx-unicode.patch | 17 -----------------
 srcpkgs/ghc/template                     |  4 ++--
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/ghc/patches/sphinx-unicode.patch

diff --git a/srcpkgs/ghc/patches/sphinx-unicode.patch b/srcpkgs/ghc/patches/sphinx-unicode.patch
deleted file mode 100644
index 0286b9c2bd31..000000000000
--- a/srcpkgs/ghc/patches/sphinx-unicode.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -rpU2 ghc-8.8.4-orig/docs/users_guide/conf.py ghc-8.8.4/docs/users_guide/conf.py
---- ghc-8.8.4-orig/docs/users_guide/conf.py	2020-07-08 16:43:03.000000000 +0000
-+++ ghc-8.8.4/docs/users_guide/conf.py	2021-07-10 20:25:33.536928487 +0000
-@@ -78,5 +78,5 @@ latex_elements = {
-     'inputenc': '',
-     'utf8extra': '',
--    'preamble': '''
-+    'preamble': r'''
- \usepackage{fontspec}
- \usepackage{makeidx}
-@@ -84,5 +84,5 @@ latex_elements = {
- \setromanfont{DejaVu Serif}
- \setmonofont{DejaVu Sans Mono}
--\setlength{\\tymin}{45pt}
-+\setlength{\tymin}{45pt}
- ''',
- }
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 3bb7aa59f705..b8b16f67b433 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,7 +1,7 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.10.4
+version=8.10.7
 revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ 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=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
+checksum=e3eef6229ce9908dfe1ea41436befb0455fefb1932559e860ad4c606b0d03c9d
 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 4a740aced3b421b6ef78709e04af70aef486f4f8 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 10 Oct 2021 17:33:05 +0200
Subject: [PATCH 02/17] cabal-install: update to 3.6.2.0

As of version 3.6.0.0, Cabal does not issue separate versions of
`cabal-install` on GitHub anymore.  Hence, we have to change the
respective paths and wrksrc directories.
---
 .../patches/ghc-8.10.4-build.diff             | 43 -------------------
 srcpkgs/cabal-install/template                | 14 +++---
 2 files changed, 7 insertions(+), 50 deletions(-)
 delete mode 100644 srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff

diff --git a/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
deleted file mode 100644
index a3eaaa90f4f1..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
-+++ b/bootstrap/linux-8.10.1.json	2021-02-28 18:54:36.417761219 +0100
-@@ -14,7 +14,7 @@
-         },
-         {
-             "package": "base",
--            "version": "4.14.0.0"
-+            "version": "4.14.1.0"
-         },
-         {
-             "package": "array",
-@@ -26,7 +26,7 @@
-         },
-         {
-             "package": "bytestring",
--            "version": "0.10.10.0"
-+            "version": "0.10.12.0"
-         },
-         {
-             "package": "containers",
-@@ -62,7 +62,7 @@
-         },
-         {
-             "package": "text",
--            "version": "1.2.3.2"
-+            "version": "1.2.4.1"
-         },
-         {
-             "package": "parsec",
-@@ -74,11 +74,11 @@
-         },
-         {
-             "package": "process",
--            "version": "1.6.8.2"
-+            "version": "1.6.9.0"
-         },
-         {
-             "package": "ghc-boot-th",
--            "version": "8.10.1"
-+            "version": "8.10.4"
-         },
-         {
-             "package": "template-haskell",
diff --git a/srcpkgs/cabal-install/template b/srcpkgs/cabal-install/template
index 18ce63f254c7..d6d718709993 100644
--- a/srcpkgs/cabal-install/template
+++ b/srcpkgs/cabal-install/template
@@ -1,8 +1,8 @@
 # Template file for 'cabal-install'
 pkgname=cabal-install
-version=3.4.0.0
-revision=2
-wrksrc=cabal-${pkgname}-${version}
+version=3.6.2.0
+revision=1
+wrksrc=cabal-Cabal-v${version}
 hostmakedepends="ghc curl tar which"
 makedepends="gmp-devel libffi-devel zlib-devel python3"
 depends="ghc"
@@ -10,8 +10,8 @@ short_desc="Command-line interface for Cabal and Hackage"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://hackage.haskell.org/package/cabal-install"
-distfiles="https://github.com/haskell/cabal/archive/${pkgname}-${version}.tar.gz"
-checksum=e4fbd5eb1d77400746a993679181f159aa415a37b931b26d67f5602f63ce971c
+distfiles="https://github.com/haskell/cabal/archive/Cabal-v${version}.tar.gz"
+checksum=dcf31e82cd85ea3236be18cc36c68058948994579ea7de18f99175821dbbcb64
 nopie_files="/usr/bin/cabal"
 nocross=yes
 
@@ -19,12 +19,12 @@ post_patch() {
 	case "${XBPS_TARGET_MACHINE}" in
 	i686*)
 		# https://github.com/haskell/cabal/issues/7313
-		vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.1.json ;;
+		vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.7.json ;;
 	esac
 }
 
 do_build() {
-	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.1.json
+	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.7.json
 }
 do_install() {
 	vbin _build/bin/cabal

From 32ff7307e72d647846ebdb450fed1e6f936872da Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Mon, 25 Oct 2021 10:39:23 +0200
Subject: [PATCH 03/17] stack: bump for lts-18.14

This is the most recent stackage resolver for GHC 8.10.7.
---
 srcpkgs/stack/patches/SimpleRepo.patch | 18 ++++++++++++++++++
 srcpkgs/stack/template                 |  6 +++---
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/stack/patches/SimpleRepo.patch

diff --git a/srcpkgs/stack/patches/SimpleRepo.patch b/srcpkgs/stack/patches/SimpleRepo.patch
new file mode 100644
index 000000000000..df85d5b942be
--- /dev/null
+++ b/srcpkgs/stack/patches/SimpleRepo.patch
@@ -0,0 +1,18 @@
+--- a/src/Stack/Setup.hs
++++ b/src/Stack/Setup.hs
+@@ -837,9 +837,8 @@
+    if compilerTool `elem` installed
+      then return (compilerTool,CompilerBuildStandard)
+      else do
+-       let repo = Repo
+-            { repoCommit = commitId
+-            , repoUrl    = url
+-            , repoType   = RepoGit
+-            , repoSubdir = mempty
++       let repo = SimpleRepo
++            { sRepoCommit = commitId
++            , sRepoUrl    = url
++            , sRepoType   = RepoGit
+             }
+
+        -- clone the repository and execute the given commands
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index f9d573ef5bfd..d7015a5ddd1c 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
 version=2.7.3
-revision=1
-_stackage="lts-18.5"
+revision=2
+_stackage="lts-18.14"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -13,7 +13,7 @@ homepage="https://haskellstack.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
 checksum="47caf8818352c7f663eb0364f48b1f4d80832ae25c31ca483416a4b74c2c5b44
- 322bc85f38bf6726af6e588dde381d72f0c3e89970939b6a7b5b975cabd05d1a"
+ 78577c091074d78f9d6e09d6e31e7fc8ac2ddbb0dbc4ac65c606adcac4957d7f"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 1804369a1b7919d6106999ddbc7858e1fe54bf6c Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 27 Oct 2021 19:01:39 +0200
Subject: [PATCH 04/17] ghc-bin: update to 8.10.7

---
 srcpkgs/ghc-bin/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index df74043ea188..dec19fef877c 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.10.4
+version=8.10.7
 revision=1
 archs="i686 x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
@@ -16,16 +16,16 @@ 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-deb9-linux.tar.xz"
-	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
+	checksum=ced9870ea351af64fb48274b81a664cdb6a9266775f1598a79cbb6fdd5770a23
 	;;
 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=246485f18ceccaadaece6450ed7af46dd6b4d5d33e0b8dd1647c64dd8e50dc60
+	checksum=52f6492f39f13890f4ecd83784724ae9fff7a02fdc624a56c49872c912608a50
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
+	checksum=fbfc1ef194f4e7a4c0da8c11cc69b17458a4b928b609b3622c97acc4acd5c5ab
 	;;
 ppc64le)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz"

From d58dc11c9da85509a58a05b5c6a21fd3882315a5 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:05:38 +0200
Subject: [PATCH 05/17] kmonad: bump for ghc 8.10.7

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

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

From 53eb4504e35e4740a4193716f7d7ac2ccbdcb831 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:28:25 +0200
Subject: [PATCH 06/17] haskell-language-server: update to 1.4.0

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

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index ff0782a54ddb..0182c9b95757 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,16 +1,16 @@
 # Template file for 'haskell-language-server'
 pkgname=haskell-language-server
-version=1.3.0
+version=1.4.0
 revision=1
 build_style="haskell-stack"
-make_build_args="--stack-yaml stack-8.10.4.yaml"
+make_build_args="--stack-yaml stack-8.10.7.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>"
 license="Apache-2.0"
 homepage="https://github.com/haskell/haskell-language-server"
 distfiles="https://github.com/haskell/haskell-language-server/archive/${version}.tar.gz"
-checksum=9be31ead3fb1c0ca761de80185a23665dfe167457baaba642cf62885df98f6a1
+checksum=c5d7dbf7fae9aa3ed2c1184b49e82d8ac623ca786494ef6602cfe11735d28db0
 nopie_files="
  /usr/bin/haskell-language-server
  /usr/bin/haskell-language-server-wrapper

From 9d6a2b6661b356f82510779588655b9ec397bebc Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:37:59 +0200
Subject: [PATCH 07/17] xmobar: bump for ghc 8.10.7

---
 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 52fd0e3e49fe..47544eb729d8 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-17.5
+resolver: lts-18.13
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 708899ad4e24..b97c9f268d68 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.39
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From c2eec1f3851648ab9d278ca6b0752582ba984e43 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:39:46 +0200
Subject: [PATCH 08/17] hledger: bump for ghc 8.10.7

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

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

From 93239cc2bf4b7dc1bd2c235e2fce511990a8507a Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:40:29 +0200
Subject: [PATCH 09/17] hoogle: bump for ghc 8.10.7

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

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

From 32b1885194160784dfadc3bff4550585915e3856 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:41:54 +0200
Subject: [PATCH 10/17] hlint: bump for ghc 8.10.7

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

diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index fb30f947a452..fd72c1bbea58 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,9 +1,9 @@
 # Template file for 'hlint'
 pkgname=hlint
 version=3.2.7
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From e6ae637f07b8899f84ad3ed0965a6c7da101a931 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:42:42 +0200
Subject: [PATCH 11/17] darcs: bump for ghc 8.10.7

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

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index f5ca6078ed75..5ae0f5313b8d 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,5 +1,7 @@
-resolver: lts-17.5
+resolver: lts-18.14
 packages:
 - .
 extra-deps:
 - graphviz-2999.20.1.0
+- constraints-0.12@sha256:7edf1e72a92d0a6761da634f08be9123dfcc0dcec11c269cbf465a09721c3481,2322
+- cryptonite-0.27@sha256:c3a9c8ce11e654a9d5bee827b089d4b50587272828d0c52a85362a58667a916c,18163
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index e6baa7c3354a..fbd2d35d6383 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.4
-revision=2
+revision=3
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From f404d1063b90b22369540b1a4a3512d935ffc2ce Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 2 Nov 2021 08:57:33 +0100
Subject: [PATCH 12/17] shellcheck: bump for ghc 8.10.7

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

diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 76d479a12fca..c08d97395eca 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,9 +1,9 @@
 # Template file for 'shellcheck'
 pkgname=shellcheck
 version=0.7.2
-revision=2
+revision=3
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.13"
 hostmakedepends="pandoc"
 short_desc="Static analysis tool for shell scripts"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

From e103edf531d16741df7c146d3ff9952e9be5c521 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 08:35:15 +0100
Subject: [PATCH 13/17] pandoc: bump for ghc 8.10.7

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

diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index d84e94c7b93b..4e43f154a751 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,12 +2,12 @@
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
 version=2.14.0.3
-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-18.5"
+stackage="lts-18.14"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"

From 134f3dc14f7e7afa0372ae37957280eed995f91f Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 19:17:39 +0100
Subject: [PATCH 14/17] cgrep: bump for ghc 8.10.7

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

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index 15eda3bafd0e..783745c8cb2a 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,9 +1,9 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.6.33
-revision=2
+revision=3
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
 maintainer="slotThe <soliditsallgood@mailbox.org>"

From fe690caed0d3a296dfc29c0ab10e632874ca9aa1 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 21:11:14 +0100
Subject: [PATCH 15/17] git-mediate: bump for ghc 8.10.7

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

diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template
index 971a6236224f..0c9ec10241e5 100644
--- a/srcpkgs/git-mediate/template
+++ b/srcpkgs/git-mediate/template
@@ -1,9 +1,9 @@
 # Template file for 'git-mediate'
 pkgname=git-mediate
 version=1.0.8.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 depends="git"
 short_desc="Tool to help resolving git conflicts"
 maintainer="Peter Wang <novalazy@gmail.com>"

From 4d3f400606f76bc539da9e37e5414a80c0624c34 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 4 Nov 2021 09:34:26 +0100
Subject: [PATCH 16/17] debug-me: bump for ghc 8.10.7

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

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index ecff9d9d18f2..ad8b055bb33e 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - '.'
-resolver: lts-17.5
+resolver: lts-18.14
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 797c52f1f479..86ac0037311a 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=2
+revision=3
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"

From 3b69b755f1a35e1193b02fb9e5964b10f943d8a0 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 5 Nov 2021 07:22:52 +0100
Subject: [PATCH 17/17] git-annex: update to 8.20211028

---
 srcpkgs/git-annex/files/stack.yaml       | 32 ------------------------
 srcpkgs/git-annex/patches/ghc8.8.3.patch | 18 -------------
 srcpkgs/git-annex/template               |  6 ++---
 3 files changed, 3 insertions(+), 53 deletions(-)
 delete mode 100644 srcpkgs/git-annex/files/stack.yaml
 delete mode 100644 srcpkgs/git-annex/patches/ghc8.8.3.patch

diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
deleted file mode 100644
index 5d457bebde83..000000000000
--- a/srcpkgs/git-annex/files/stack.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-flags:
-  git-annex:
-    production: true
-    assistant: true
-    pairing: true
-    torrentparser: true
-    webapp: true
-    magicmime: false
-    dbus: false
-    debuglocks: false
-    benchmark: false
-    networkbsd: false
-    gitlfs: true
-    httpclientrestricted: true
-packages:
-- '.'
-extra-deps:
- - IfElse-0.85
- - aws-0.22
- - bloomfilter-2.0.1.0
- - filepath-bytestring-1.4.2.1.6
- - git-lfs-1.1.0
- - http-client-restricted-0.0.3
- - network-multicast-0.3.2
- - sandi-0.5
- - torrent-10000.1.1
- - bencode-0.6.1.1
- - network-3.1.0.1
-explicit-setup-deps:
-  git-annex: true
-resolver: lts-17.5
-allow-newer: true
diff --git a/srcpkgs/git-annex/patches/ghc8.8.3.patch b/srcpkgs/git-annex/patches/ghc8.8.3.patch
deleted file mode 100644
index 27a1739c1119..000000000000
--- a/srcpkgs/git-annex/patches/ghc8.8.3.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/git-annex.cabal	2020-04-01 21:09:23.653315424 +0200
-+++ b/git-annex.cabal	2020-04-01 20:50:23.080838029 +0200
-@@ -304,6 +304,7 @@
-   Build-Depends:
-    base (>= 4.11.1.0 && < 5.0),
-    network-uri (>= 2.6),
-+   network-bsd,
-    optparse-applicative (>= 0.14.1),
-    containers (>= 0.5.8),
-    exceptions (>= 0.6),
-@@ -404,3 +404,3 @@ if flag(NetworkBSD)
-     Build-Depends: network-bsd, network (>= 3.0.0.0)
-   else
--    Build-Depends: network (< 3.0.0.0), network (>= 2.6.3.0)
-+    Build-Depends: network (< 3.2.0.0), network (>= 2.6.3.0)
-
-   if flag(S3)
-     Build-Depends: aws (>= 0.20)
diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template
index cdcd6bb0f83c..1cf2ab14789f 100644
--- a/srcpkgs/git-annex/template
+++ b/srcpkgs/git-annex/template
@@ -1,10 +1,10 @@
 # Template file for 'git-annex'
 pkgname=git-annex
-version=8.20210330
+version=8.20211028
 revision=1
 build_style=haskell-stack
 makedepends="curl file-devel gnupg2 gnutls-devel gsasl-devel libxml2-devel
- lsof rsync git"
+ lsof rsync git ncurses-devel"
 # depends are utilities required by git-annex
 depends="git rsync curl lsof gnupg2"
 short_desc="Git addon for managing large files"
@@ -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=17109144b2aadfab79fa0e193df3e0c02fd80f738a5ed6eccb0d11692bedb01d
+checksum=cf5efe15e68d467daad673bec10037a27a78da7e4af9b4a85e10980bd90ace2d
 nopie_files="/usr/bin/git-annex"
 nocross=yes
 

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

* Re: [WIP] GHC 8.10.7
  2021-10-31 16:44 [PR PATCH] [WIP] GHC 8.10.7 slotThe
                   ` (3 preceding siblings ...)
  2021-11-05  6:23 ` [PR PATCH] [Updated] " slotThe
@ 2021-11-05  6:26 ` slotThe
  2021-11-08 19:11 ` Chocimier
                   ` (13 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: slotThe @ 2021-11-05  6:26 UTC (permalink / raw)
  To: ml

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

New comment by slotThe on void-packages repository

https://github.com/void-linux/void-packages/pull/33850#issuecomment-961655821

Comment:
Oh, right; I should have probably checked out the issue again.  Then this is essentially waiting for https://github.com/void-linux/void-packages/pull/33749 to be merged

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

* Re: [WIP] GHC 8.10.7
  2021-10-31 16:44 [PR PATCH] [WIP] GHC 8.10.7 slotThe
                   ` (4 preceding siblings ...)
  2021-11-05  6:26 ` slotThe
@ 2021-11-08 19:11 ` Chocimier
  2021-11-10 11:05 ` [PR PATCH] [Updated] " slotThe
                   ` (12 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: Chocimier @ 2021-11-08 19:11 UTC (permalink / raw)
  To: ml

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

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/33850#issuecomment-963487471

Comment:
xmonad removal in #33749 is merged.

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

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.7
  2021-10-31 16:44 [PR PATCH] [WIP] GHC 8.10.7 slotThe
                   ` (5 preceding siblings ...)
  2021-11-08 19:11 ` Chocimier
@ 2021-11-10 11:05 ` slotThe
  2021-11-10 11:06 ` slotThe
                   ` (11 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: slotThe @ 2021-11-10 11:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2346 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.7
https://github.com/void-linux/void-packages/pull/33850

[WIP] GHC 8.10.7
The 8.10.x release flood seems to have stopped; time for the fun part to begin!

- [x] ghc
- [ ] ghc-bin
    - [x] x86_64-musl ([Link](https://download1079.mediafire.com/1l9xm9fxv0ig/2pajfh1y79zf5if/ghc-8.10.7-x86_64-void-linux-musl.tar.xz))
    cc @q66 for the following
    - [ ] 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
- [x] debug-me
- [x] hlint
- [x] hoogle
- [x] darcs
- [x] shellcheck
- [x] git-annex
- [x] hledger
- [x] pandoc
- [x] xmobar
- [x] haskell-language-server

Other things to do:

- [x] Merge https://github.com/void-linux/void-packages/pull/33749

<!-- 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.)
- [ ] 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/33850.patch is attached

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

From 55c7237bbeab38ef2fd8dc09a0f0a17bffef6534 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 9 Oct 2021 15:35:58 +0200
Subject: [PATCH 01/17] ghc: update to 8.10.7

---
 srcpkgs/ghc/patches/sphinx-unicode.patch | 17 -----------------
 srcpkgs/ghc/template                     |  4 ++--
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/ghc/patches/sphinx-unicode.patch

diff --git a/srcpkgs/ghc/patches/sphinx-unicode.patch b/srcpkgs/ghc/patches/sphinx-unicode.patch
deleted file mode 100644
index 0286b9c2bd31..000000000000
--- a/srcpkgs/ghc/patches/sphinx-unicode.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -rpU2 ghc-8.8.4-orig/docs/users_guide/conf.py ghc-8.8.4/docs/users_guide/conf.py
---- ghc-8.8.4-orig/docs/users_guide/conf.py	2020-07-08 16:43:03.000000000 +0000
-+++ ghc-8.8.4/docs/users_guide/conf.py	2021-07-10 20:25:33.536928487 +0000
-@@ -78,5 +78,5 @@ latex_elements = {
-     'inputenc': '',
-     'utf8extra': '',
--    'preamble': '''
-+    'preamble': r'''
- \usepackage{fontspec}
- \usepackage{makeidx}
-@@ -84,5 +84,5 @@ latex_elements = {
- \setromanfont{DejaVu Serif}
- \setmonofont{DejaVu Sans Mono}
--\setlength{\\tymin}{45pt}
-+\setlength{\tymin}{45pt}
- ''',
- }
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 3bb7aa59f705..b8b16f67b433 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,7 +1,7 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.10.4
+version=8.10.7
 revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ 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=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
+checksum=e3eef6229ce9908dfe1ea41436befb0455fefb1932559e860ad4c606b0d03c9d
 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 d018806b29e33e6fb65cf78d139dbc3f71217843 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 10 Oct 2021 17:33:05 +0200
Subject: [PATCH 02/17] cabal-install: update to 3.6.2.0

As of version 3.6.0.0, Cabal does not issue separate versions of
`cabal-install` on GitHub anymore.  Hence, we have to change the
respective paths and wrksrc directories.
---
 .../patches/ghc-8.10.4-build.diff             | 43 -------------------
 srcpkgs/cabal-install/template                | 14 +++---
 2 files changed, 7 insertions(+), 50 deletions(-)
 delete mode 100644 srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff

diff --git a/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
deleted file mode 100644
index a3eaaa90f4f1..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
-+++ b/bootstrap/linux-8.10.1.json	2021-02-28 18:54:36.417761219 +0100
-@@ -14,7 +14,7 @@
-         },
-         {
-             "package": "base",
--            "version": "4.14.0.0"
-+            "version": "4.14.1.0"
-         },
-         {
-             "package": "array",
-@@ -26,7 +26,7 @@
-         },
-         {
-             "package": "bytestring",
--            "version": "0.10.10.0"
-+            "version": "0.10.12.0"
-         },
-         {
-             "package": "containers",
-@@ -62,7 +62,7 @@
-         },
-         {
-             "package": "text",
--            "version": "1.2.3.2"
-+            "version": "1.2.4.1"
-         },
-         {
-             "package": "parsec",
-@@ -74,11 +74,11 @@
-         },
-         {
-             "package": "process",
--            "version": "1.6.8.2"
-+            "version": "1.6.9.0"
-         },
-         {
-             "package": "ghc-boot-th",
--            "version": "8.10.1"
-+            "version": "8.10.4"
-         },
-         {
-             "package": "template-haskell",
diff --git a/srcpkgs/cabal-install/template b/srcpkgs/cabal-install/template
index 18ce63f254c7..d6d718709993 100644
--- a/srcpkgs/cabal-install/template
+++ b/srcpkgs/cabal-install/template
@@ -1,8 +1,8 @@
 # Template file for 'cabal-install'
 pkgname=cabal-install
-version=3.4.0.0
-revision=2
-wrksrc=cabal-${pkgname}-${version}
+version=3.6.2.0
+revision=1
+wrksrc=cabal-Cabal-v${version}
 hostmakedepends="ghc curl tar which"
 makedepends="gmp-devel libffi-devel zlib-devel python3"
 depends="ghc"
@@ -10,8 +10,8 @@ short_desc="Command-line interface for Cabal and Hackage"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://hackage.haskell.org/package/cabal-install"
-distfiles="https://github.com/haskell/cabal/archive/${pkgname}-${version}.tar.gz"
-checksum=e4fbd5eb1d77400746a993679181f159aa415a37b931b26d67f5602f63ce971c
+distfiles="https://github.com/haskell/cabal/archive/Cabal-v${version}.tar.gz"
+checksum=dcf31e82cd85ea3236be18cc36c68058948994579ea7de18f99175821dbbcb64
 nopie_files="/usr/bin/cabal"
 nocross=yes
 
@@ -19,12 +19,12 @@ post_patch() {
 	case "${XBPS_TARGET_MACHINE}" in
 	i686*)
 		# https://github.com/haskell/cabal/issues/7313
-		vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.1.json ;;
+		vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.7.json ;;
 	esac
 }
 
 do_build() {
-	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.1.json
+	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.7.json
 }
 do_install() {
 	vbin _build/bin/cabal

From 5cb07511cd3d3d1189efed6e82ec76a4ad0bcf2d Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Mon, 25 Oct 2021 10:39:23 +0200
Subject: [PATCH 03/17] stack: bump for lts-18.14

This is the most recent stackage resolver for GHC 8.10.7.
---
 srcpkgs/stack/patches/SimpleRepo.patch | 18 ++++++++++++++++++
 srcpkgs/stack/template                 |  6 +++---
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/stack/patches/SimpleRepo.patch

diff --git a/srcpkgs/stack/patches/SimpleRepo.patch b/srcpkgs/stack/patches/SimpleRepo.patch
new file mode 100644
index 000000000000..df85d5b942be
--- /dev/null
+++ b/srcpkgs/stack/patches/SimpleRepo.patch
@@ -0,0 +1,18 @@
+--- a/src/Stack/Setup.hs
++++ b/src/Stack/Setup.hs
+@@ -837,9 +837,8 @@
+    if compilerTool `elem` installed
+      then return (compilerTool,CompilerBuildStandard)
+      else do
+-       let repo = Repo
+-            { repoCommit = commitId
+-            , repoUrl    = url
+-            , repoType   = RepoGit
+-            , repoSubdir = mempty
++       let repo = SimpleRepo
++            { sRepoCommit = commitId
++            , sRepoUrl    = url
++            , sRepoType   = RepoGit
+             }
+
+        -- clone the repository and execute the given commands
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index f9d573ef5bfd..d7015a5ddd1c 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
 version=2.7.3
-revision=1
-_stackage="lts-18.5"
+revision=2
+_stackage="lts-18.14"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -13,7 +13,7 @@ homepage="https://haskellstack.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
 checksum="47caf8818352c7f663eb0364f48b1f4d80832ae25c31ca483416a4b74c2c5b44
- 322bc85f38bf6726af6e588dde381d72f0c3e89970939b6a7b5b975cabd05d1a"
+ 78577c091074d78f9d6e09d6e31e7fc8ac2ddbb0dbc4ac65c606adcac4957d7f"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 872073174cb033ebbb9bc4ddb30fd10efa00b251 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 27 Oct 2021 19:01:39 +0200
Subject: [PATCH 04/17] ghc-bin: update to 8.10.7

---
 srcpkgs/ghc-bin/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index df74043ea188..dec19fef877c 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.10.4
+version=8.10.7
 revision=1
 archs="i686 x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
@@ -16,16 +16,16 @@ 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-deb9-linux.tar.xz"
-	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
+	checksum=ced9870ea351af64fb48274b81a664cdb6a9266775f1598a79cbb6fdd5770a23
 	;;
 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=246485f18ceccaadaece6450ed7af46dd6b4d5d33e0b8dd1647c64dd8e50dc60
+	checksum=52f6492f39f13890f4ecd83784724ae9fff7a02fdc624a56c49872c912608a50
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
+	checksum=fbfc1ef194f4e7a4c0da8c11cc69b17458a4b928b609b3622c97acc4acd5c5ab
 	;;
 ppc64le)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz"

From 2c27249a3b84a378bac5a65d2e4c38a0fb86b5d0 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:05:38 +0200
Subject: [PATCH 05/17] kmonad: bump for ghc 8.10.7

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

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

From 86e3ca2d750bc8be7e796e596550bfd186afe5f9 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:28:25 +0200
Subject: [PATCH 06/17] haskell-language-server: update to 1.4.0

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

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index ff0782a54ddb..0182c9b95757 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,16 +1,16 @@
 # Template file for 'haskell-language-server'
 pkgname=haskell-language-server
-version=1.3.0
+version=1.4.0
 revision=1
 build_style="haskell-stack"
-make_build_args="--stack-yaml stack-8.10.4.yaml"
+make_build_args="--stack-yaml stack-8.10.7.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>"
 license="Apache-2.0"
 homepage="https://github.com/haskell/haskell-language-server"
 distfiles="https://github.com/haskell/haskell-language-server/archive/${version}.tar.gz"
-checksum=9be31ead3fb1c0ca761de80185a23665dfe167457baaba642cf62885df98f6a1
+checksum=c5d7dbf7fae9aa3ed2c1184b49e82d8ac623ca786494ef6602cfe11735d28db0
 nopie_files="
  /usr/bin/haskell-language-server
  /usr/bin/haskell-language-server-wrapper

From ddeef00d27f9e5554dc757b759f6b85468381ea8 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:37:59 +0200
Subject: [PATCH 07/17] xmobar: bump for ghc 8.10.7

---
 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 52fd0e3e49fe..47544eb729d8 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-17.5
+resolver: lts-18.13
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 708899ad4e24..b97c9f268d68 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.39
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From b9917abef2c65d35219747b1e316ec174cf08cac Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:39:46 +0200
Subject: [PATCH 08/17] hledger: bump for ghc 8.10.7

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

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

From 76121cde2394ee4bb9780622ecdd11bf265168e0 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:40:29 +0200
Subject: [PATCH 09/17] hoogle: bump for ghc 8.10.7

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

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

From f6440fe311171f2134f64ce1a631a9cd55a59ed0 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:41:54 +0200
Subject: [PATCH 10/17] hlint: bump for ghc 8.10.7

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

diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index fb30f947a452..fd72c1bbea58 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,9 +1,9 @@
 # Template file for 'hlint'
 pkgname=hlint
 version=3.2.7
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From b308618b400e9abe0e946e95ec1feb4aece1d42a Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:42:42 +0200
Subject: [PATCH 11/17] darcs: bump for ghc 8.10.7

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

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index f5ca6078ed75..5ae0f5313b8d 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,5 +1,7 @@
-resolver: lts-17.5
+resolver: lts-18.14
 packages:
 - .
 extra-deps:
 - graphviz-2999.20.1.0
+- constraints-0.12@sha256:7edf1e72a92d0a6761da634f08be9123dfcc0dcec11c269cbf465a09721c3481,2322
+- cryptonite-0.27@sha256:c3a9c8ce11e654a9d5bee827b089d4b50587272828d0c52a85362a58667a916c,18163
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index e6baa7c3354a..fbd2d35d6383 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.4
-revision=2
+revision=3
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From c70542b15f7856be57d140f6bd3331298afb9cbe Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 2 Nov 2021 08:57:33 +0100
Subject: [PATCH 12/17] shellcheck: bump for ghc 8.10.7

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

diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 08e64456eda9..70eee6c2854b 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,9 +1,9 @@
 # Template file for 'shellcheck'
 pkgname=shellcheck
 version=0.8.0
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 hostmakedepends="pandoc"
 short_desc="Static analysis tool for shell scripts"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

From 9da213823dd2d756e2efa03f2910f0bd5e2d1f86 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 08:35:15 +0100
Subject: [PATCH 13/17] pandoc: bump for ghc 8.10.7

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

diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index d84e94c7b93b..4e43f154a751 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,12 +2,12 @@
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
 version=2.14.0.3
-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-18.5"
+stackage="lts-18.14"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"

From c592d57fbe88d524e7397065cc75fa7d94169a09 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 19:17:39 +0100
Subject: [PATCH 14/17] cgrep: bump for ghc 8.10.7

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

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index 15eda3bafd0e..783745c8cb2a 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,9 +1,9 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.6.33
-revision=2
+revision=3
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
 maintainer="slotThe <soliditsallgood@mailbox.org>"

From 6d2e144eed5b59003e6e0fa97797388e992c5949 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 21:11:14 +0100
Subject: [PATCH 15/17] git-mediate: bump for ghc 8.10.7

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

diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template
index 971a6236224f..0c9ec10241e5 100644
--- a/srcpkgs/git-mediate/template
+++ b/srcpkgs/git-mediate/template
@@ -1,9 +1,9 @@
 # Template file for 'git-mediate'
 pkgname=git-mediate
 version=1.0.8.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 depends="git"
 short_desc="Tool to help resolving git conflicts"
 maintainer="Peter Wang <novalazy@gmail.com>"

From 23af1cae0384e6559e53b3e6d027fb836454c080 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 4 Nov 2021 09:34:26 +0100
Subject: [PATCH 16/17] debug-me: bump for ghc 8.10.7

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

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index ecff9d9d18f2..ad8b055bb33e 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - '.'
-resolver: lts-17.5
+resolver: lts-18.14
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 797c52f1f479..86ac0037311a 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=2
+revision=3
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"

From 3637196da075d8107e806bee85455e7e8dabacc3 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 5 Nov 2021 07:22:52 +0100
Subject: [PATCH 17/17] git-annex: update to 8.20211028

---
 srcpkgs/git-annex/files/stack.yaml       | 32 ------------------------
 srcpkgs/git-annex/patches/ghc8.8.3.patch | 18 -------------
 srcpkgs/git-annex/template               |  6 ++---
 3 files changed, 3 insertions(+), 53 deletions(-)
 delete mode 100644 srcpkgs/git-annex/files/stack.yaml
 delete mode 100644 srcpkgs/git-annex/patches/ghc8.8.3.patch

diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
deleted file mode 100644
index 5d457bebde83..000000000000
--- a/srcpkgs/git-annex/files/stack.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-flags:
-  git-annex:
-    production: true
-    assistant: true
-    pairing: true
-    torrentparser: true
-    webapp: true
-    magicmime: false
-    dbus: false
-    debuglocks: false
-    benchmark: false
-    networkbsd: false
-    gitlfs: true
-    httpclientrestricted: true
-packages:
-- '.'
-extra-deps:
- - IfElse-0.85
- - aws-0.22
- - bloomfilter-2.0.1.0
- - filepath-bytestring-1.4.2.1.6
- - git-lfs-1.1.0
- - http-client-restricted-0.0.3
- - network-multicast-0.3.2
- - sandi-0.5
- - torrent-10000.1.1
- - bencode-0.6.1.1
- - network-3.1.0.1
-explicit-setup-deps:
-  git-annex: true
-resolver: lts-17.5
-allow-newer: true
diff --git a/srcpkgs/git-annex/patches/ghc8.8.3.patch b/srcpkgs/git-annex/patches/ghc8.8.3.patch
deleted file mode 100644
index 27a1739c1119..000000000000
--- a/srcpkgs/git-annex/patches/ghc8.8.3.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/git-annex.cabal	2020-04-01 21:09:23.653315424 +0200
-+++ b/git-annex.cabal	2020-04-01 20:50:23.080838029 +0200
-@@ -304,6 +304,7 @@
-   Build-Depends:
-    base (>= 4.11.1.0 && < 5.0),
-    network-uri (>= 2.6),
-+   network-bsd,
-    optparse-applicative (>= 0.14.1),
-    containers (>= 0.5.8),
-    exceptions (>= 0.6),
-@@ -404,3 +404,3 @@ if flag(NetworkBSD)
-     Build-Depends: network-bsd, network (>= 3.0.0.0)
-   else
--    Build-Depends: network (< 3.0.0.0), network (>= 2.6.3.0)
-+    Build-Depends: network (< 3.2.0.0), network (>= 2.6.3.0)
-
-   if flag(S3)
-     Build-Depends: aws (>= 0.20)
diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template
index cdcd6bb0f83c..1cf2ab14789f 100644
--- a/srcpkgs/git-annex/template
+++ b/srcpkgs/git-annex/template
@@ -1,10 +1,10 @@
 # Template file for 'git-annex'
 pkgname=git-annex
-version=8.20210330
+version=8.20211028
 revision=1
 build_style=haskell-stack
 makedepends="curl file-devel gnupg2 gnutls-devel gsasl-devel libxml2-devel
- lsof rsync git"
+ lsof rsync git ncurses-devel"
 # depends are utilities required by git-annex
 depends="git rsync curl lsof gnupg2"
 short_desc="Git addon for managing large files"
@@ -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=17109144b2aadfab79fa0e193df3e0c02fd80f738a5ed6eccb0d11692bedb01d
+checksum=cf5efe15e68d467daad673bec10037a27a78da7e4af9b4a85e10980bd90ace2d
 nopie_files="/usr/bin/git-annex"
 nocross=yes
 

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

* Re: [WIP] GHC 8.10.7
  2021-10-31 16:44 [PR PATCH] [WIP] GHC 8.10.7 slotThe
                   ` (6 preceding siblings ...)
  2021-11-10 11:05 ` [PR PATCH] [Updated] " slotThe
@ 2021-11-10 11:06 ` slotThe
  2021-11-15 10:54 ` slotThe
                   ` (10 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: slotThe @ 2021-11-10 11:06 UTC (permalink / raw)
  To: ml

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

New comment by slotThe on void-packages repository

https://github.com/void-linux/void-packages/pull/33850#issuecomment-965023321

Comment:
(rebased for shellcheck)

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

* Re: [WIP] GHC 8.10.7
  2021-10-31 16:44 [PR PATCH] [WIP] GHC 8.10.7 slotThe
                   ` (7 preceding siblings ...)
  2021-11-10 11:06 ` slotThe
@ 2021-11-15 10:54 ` slotThe
  2022-01-26 10:13 ` [PR PATCH] [Updated] " slotThe
                   ` (9 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: slotThe @ 2021-11-15 10:54 UTC (permalink / raw)
  To: ml

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

New comment by slotThe on void-packages repository

https://github.com/void-linux/void-packages/pull/33850#issuecomment-968770601

Comment:
@q66 I'll be rebuilding the core stack (heh) on musl one more time this coming week, but apart from that I think only the ppc stuff is still outstanding

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

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.7
  2021-10-31 16:44 [PR PATCH] [WIP] GHC 8.10.7 slotThe
                   ` (8 preceding siblings ...)
  2021-11-15 10:54 ` slotThe
@ 2022-01-26 10:13 ` slotThe
  2022-01-26 10:15 ` slotThe
                   ` (8 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: slotThe @ 2022-01-26 10:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2367 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.7
https://github.com/void-linux/void-packages/pull/33850

[WIP] GHC 8.10.7
The 8.10.x release flood seems to have stopped; time for the fun part to begin!

- [x] ghc
- [ ] ghc-bin
    - [x] x86_64-musl (**Not uploaded to alpha.de yet** [Link](https://www.mediafire.com/file/i2385lbvjbmzx3l/ghc-8.10.7-x86_64-void-linux-musl.tar.xz/file))
    cc @q66 for the following
    - [ ] 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
- [x] debug-me
- [x] hlint
- [x] hoogle
- [x] darcs
- [x] shellcheck
- [x] git-annex
- [x] hledger
- [x] pandoc
- [x] xmobar
- [x] haskell-language-server

Other things to do:

- [x] Merge https://github.com/void-linux/void-packages/pull/33749

<!-- 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.)
- [ ] 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/33850.patch is attached

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

From 85d036bf4ef10c4b90bf6e6cd7bf339887b5605c Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 9 Oct 2021 15:35:58 +0200
Subject: [PATCH 01/17] ghc: update to 8.10.7

---
 srcpkgs/ghc/patches/sphinx-unicode.patch | 17 -----------------
 srcpkgs/ghc/template                     |  4 ++--
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/ghc/patches/sphinx-unicode.patch

diff --git a/srcpkgs/ghc/patches/sphinx-unicode.patch b/srcpkgs/ghc/patches/sphinx-unicode.patch
deleted file mode 100644
index 0286b9c2bd31..000000000000
--- a/srcpkgs/ghc/patches/sphinx-unicode.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -rpU2 ghc-8.8.4-orig/docs/users_guide/conf.py ghc-8.8.4/docs/users_guide/conf.py
---- ghc-8.8.4-orig/docs/users_guide/conf.py	2020-07-08 16:43:03.000000000 +0000
-+++ ghc-8.8.4/docs/users_guide/conf.py	2021-07-10 20:25:33.536928487 +0000
-@@ -78,5 +78,5 @@ latex_elements = {
-     'inputenc': '',
-     'utf8extra': '',
--    'preamble': '''
-+    'preamble': r'''
- \usepackage{fontspec}
- \usepackage{makeidx}
-@@ -84,5 +84,5 @@ latex_elements = {
- \setromanfont{DejaVu Serif}
- \setmonofont{DejaVu Sans Mono}
--\setlength{\\tymin}{45pt}
-+\setlength{\tymin}{45pt}
- ''',
- }
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 3bb7aa59f705..b8b16f67b433 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,7 +1,7 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.10.4
+version=8.10.7
 revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ 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=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
+checksum=e3eef6229ce9908dfe1ea41436befb0455fefb1932559e860ad4c606b0d03c9d
 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 95e696219b2ac544245de24d7f13312645a27398 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 10 Oct 2021 17:33:05 +0200
Subject: [PATCH 02/17] cabal-install: update to 3.6.2.0

As of version 3.6.0.0, Cabal does not issue separate versions of
`cabal-install` on GitHub anymore.  Hence, we have to change the
respective paths and wrksrc directories.
---
 .../patches/ghc-8.10.4-build.diff             | 43 -------------------
 srcpkgs/cabal-install/template                | 14 +++---
 2 files changed, 7 insertions(+), 50 deletions(-)
 delete mode 100644 srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff

diff --git a/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
deleted file mode 100644
index a3eaaa90f4f1..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
-+++ b/bootstrap/linux-8.10.1.json	2021-02-28 18:54:36.417761219 +0100
-@@ -14,7 +14,7 @@
-         },
-         {
-             "package": "base",
--            "version": "4.14.0.0"
-+            "version": "4.14.1.0"
-         },
-         {
-             "package": "array",
-@@ -26,7 +26,7 @@
-         },
-         {
-             "package": "bytestring",
--            "version": "0.10.10.0"
-+            "version": "0.10.12.0"
-         },
-         {
-             "package": "containers",
-@@ -62,7 +62,7 @@
-         },
-         {
-             "package": "text",
--            "version": "1.2.3.2"
-+            "version": "1.2.4.1"
-         },
-         {
-             "package": "parsec",
-@@ -74,11 +74,11 @@
-         },
-         {
-             "package": "process",
--            "version": "1.6.8.2"
-+            "version": "1.6.9.0"
-         },
-         {
-             "package": "ghc-boot-th",
--            "version": "8.10.1"
-+            "version": "8.10.4"
-         },
-         {
-             "package": "template-haskell",
diff --git a/srcpkgs/cabal-install/template b/srcpkgs/cabal-install/template
index 18ce63f254c7..d6d718709993 100644
--- a/srcpkgs/cabal-install/template
+++ b/srcpkgs/cabal-install/template
@@ -1,8 +1,8 @@
 # Template file for 'cabal-install'
 pkgname=cabal-install
-version=3.4.0.0
-revision=2
-wrksrc=cabal-${pkgname}-${version}
+version=3.6.2.0
+revision=1
+wrksrc=cabal-Cabal-v${version}
 hostmakedepends="ghc curl tar which"
 makedepends="gmp-devel libffi-devel zlib-devel python3"
 depends="ghc"
@@ -10,8 +10,8 @@ short_desc="Command-line interface for Cabal and Hackage"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://hackage.haskell.org/package/cabal-install"
-distfiles="https://github.com/haskell/cabal/archive/${pkgname}-${version}.tar.gz"
-checksum=e4fbd5eb1d77400746a993679181f159aa415a37b931b26d67f5602f63ce971c
+distfiles="https://github.com/haskell/cabal/archive/Cabal-v${version}.tar.gz"
+checksum=dcf31e82cd85ea3236be18cc36c68058948994579ea7de18f99175821dbbcb64
 nopie_files="/usr/bin/cabal"
 nocross=yes
 
@@ -19,12 +19,12 @@ post_patch() {
 	case "${XBPS_TARGET_MACHINE}" in
 	i686*)
 		# https://github.com/haskell/cabal/issues/7313
-		vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.1.json ;;
+		vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.7.json ;;
 	esac
 }
 
 do_build() {
-	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.1.json
+	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.7.json
 }
 do_install() {
 	vbin _build/bin/cabal

From cf6938e74a43f50b0b9b5270f5cc0c315ba52d5d Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Mon, 25 Oct 2021 10:39:23 +0200
Subject: [PATCH 03/17] stack: bump for lts-18.14

This is the most recent stackage resolver for GHC 8.10.7.
---
 srcpkgs/stack/patches/SimpleRepo.patch | 18 ++++++++++++++++++
 srcpkgs/stack/template                 |  6 +++---
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/stack/patches/SimpleRepo.patch

diff --git a/srcpkgs/stack/patches/SimpleRepo.patch b/srcpkgs/stack/patches/SimpleRepo.patch
new file mode 100644
index 000000000000..df85d5b942be
--- /dev/null
+++ b/srcpkgs/stack/patches/SimpleRepo.patch
@@ -0,0 +1,18 @@
+--- a/src/Stack/Setup.hs
++++ b/src/Stack/Setup.hs
+@@ -837,9 +837,8 @@
+    if compilerTool `elem` installed
+      then return (compilerTool,CompilerBuildStandard)
+      else do
+-       let repo = Repo
+-            { repoCommit = commitId
+-            , repoUrl    = url
+-            , repoType   = RepoGit
+-            , repoSubdir = mempty
++       let repo = SimpleRepo
++            { sRepoCommit = commitId
++            , sRepoUrl    = url
++            , sRepoType   = RepoGit
+             }
+
+        -- clone the repository and execute the given commands
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index f9d573ef5bfd..d7015a5ddd1c 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
 version=2.7.3
-revision=1
-_stackage="lts-18.5"
+revision=2
+_stackage="lts-18.14"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -13,7 +13,7 @@ homepage="https://haskellstack.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
 checksum="47caf8818352c7f663eb0364f48b1f4d80832ae25c31ca483416a4b74c2c5b44
- 322bc85f38bf6726af6e588dde381d72f0c3e89970939b6a7b5b975cabd05d1a"
+ 78577c091074d78f9d6e09d6e31e7fc8ac2ddbb0dbc4ac65c606adcac4957d7f"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 3bcd192f33817b573108b765278742e2fd1aab16 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 27 Oct 2021 19:01:39 +0200
Subject: [PATCH 04/17] ghc-bin: update to 8.10.7

---
 srcpkgs/ghc-bin/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index df74043ea188..dec19fef877c 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.10.4
+version=8.10.7
 revision=1
 archs="i686 x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
@@ -16,16 +16,16 @@ 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-deb9-linux.tar.xz"
-	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
+	checksum=ced9870ea351af64fb48274b81a664cdb6a9266775f1598a79cbb6fdd5770a23
 	;;
 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=246485f18ceccaadaece6450ed7af46dd6b4d5d33e0b8dd1647c64dd8e50dc60
+	checksum=52f6492f39f13890f4ecd83784724ae9fff7a02fdc624a56c49872c912608a50
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
+	checksum=fbfc1ef194f4e7a4c0da8c11cc69b17458a4b928b609b3622c97acc4acd5c5ab
 	;;
 ppc64le)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz"

From 71bf803d576370ac2ee343596b9b22dfe0bae1e3 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:05:38 +0200
Subject: [PATCH 05/17] kmonad: bump for ghc 8.10.7

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

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

From 34b2de04b5317a010eaea00d9ca5e5417c62cee8 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:28:25 +0200
Subject: [PATCH 06/17] haskell-language-server: update to 1.4.0

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

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index ff0782a54ddb..0182c9b95757 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,16 +1,16 @@
 # Template file for 'haskell-language-server'
 pkgname=haskell-language-server
-version=1.3.0
+version=1.4.0
 revision=1
 build_style="haskell-stack"
-make_build_args="--stack-yaml stack-8.10.4.yaml"
+make_build_args="--stack-yaml stack-8.10.7.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>"
 license="Apache-2.0"
 homepage="https://github.com/haskell/haskell-language-server"
 distfiles="https://github.com/haskell/haskell-language-server/archive/${version}.tar.gz"
-checksum=9be31ead3fb1c0ca761de80185a23665dfe167457baaba642cf62885df98f6a1
+checksum=c5d7dbf7fae9aa3ed2c1184b49e82d8ac623ca786494ef6602cfe11735d28db0
 nopie_files="
  /usr/bin/haskell-language-server
  /usr/bin/haskell-language-server-wrapper

From c681eee9da07284a58e7a100f593038ddb03051b Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:37:59 +0200
Subject: [PATCH 07/17] xmobar: bump for ghc 8.10.7

---
 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 52fd0e3e49fe..47544eb729d8 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-17.5
+resolver: lts-18.13
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 708899ad4e24..b97c9f268d68 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.39
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From 5def484405969b560f79249f77815e5321596dbe Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:39:46 +0200
Subject: [PATCH 08/17] hledger: bump for ghc 8.10.7

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

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

From dc31370a7280f989dd76cd09fdc9c30bea7e6b36 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:40:29 +0200
Subject: [PATCH 09/17] hoogle: bump for ghc 8.10.7

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

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

From b1b7b6ad85814812cf9e879f10e5585001f698f6 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:41:54 +0200
Subject: [PATCH 10/17] hlint: bump for ghc 8.10.7

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

diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index fb30f947a452..fd72c1bbea58 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,9 +1,9 @@
 # Template file for 'hlint'
 pkgname=hlint
 version=3.2.7
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From 53989744c69e7ffcd00153bd02607e06f3ba8d8f Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:42:42 +0200
Subject: [PATCH 11/17] darcs: bump for ghc 8.10.7

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

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index f5ca6078ed75..5ae0f5313b8d 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,5 +1,7 @@
-resolver: lts-17.5
+resolver: lts-18.14
 packages:
 - .
 extra-deps:
 - graphviz-2999.20.1.0
+- constraints-0.12@sha256:7edf1e72a92d0a6761da634f08be9123dfcc0dcec11c269cbf465a09721c3481,2322
+- cryptonite-0.27@sha256:c3a9c8ce11e654a9d5bee827b089d4b50587272828d0c52a85362a58667a916c,18163
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index e6baa7c3354a..fbd2d35d6383 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.4
-revision=2
+revision=3
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From d56f992218202808a82d463bbb7844eb7cecd082 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 2 Nov 2021 08:57:33 +0100
Subject: [PATCH 12/17] shellcheck: bump for ghc 8.10.7

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

diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 08e64456eda9..70eee6c2854b 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,9 +1,9 @@
 # Template file for 'shellcheck'
 pkgname=shellcheck
 version=0.8.0
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 hostmakedepends="pandoc"
 short_desc="Static analysis tool for shell scripts"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

From af1647ecd8515b2cc4edf5ab51bdc682b60ad07b Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 08:35:15 +0100
Subject: [PATCH 13/17] pandoc: bump for ghc 8.10.7

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

diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index d84e94c7b93b..4e43f154a751 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,12 +2,12 @@
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
 version=2.14.0.3
-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-18.5"
+stackage="lts-18.14"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"

From 9af0d75d7bdcd007f477c74411030d720aba515d Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 19:17:39 +0100
Subject: [PATCH 14/17] cgrep: bump for ghc 8.10.7

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

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index c987e67725b0..e57106f3fa26 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,9 +1,9 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.7.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-18.6"
+stackage="lts-18.15"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
 maintainer="slotThe <soliditsallgood@mailbox.org>"

From c7d906f7be26ffcf988aca180638306b9dac05e1 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 21:11:14 +0100
Subject: [PATCH 15/17] git-mediate: bump for ghc 8.10.7

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

diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template
index 971a6236224f..0c9ec10241e5 100644
--- a/srcpkgs/git-mediate/template
+++ b/srcpkgs/git-mediate/template
@@ -1,9 +1,9 @@
 # Template file for 'git-mediate'
 pkgname=git-mediate
 version=1.0.8.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 depends="git"
 short_desc="Tool to help resolving git conflicts"
 maintainer="Peter Wang <novalazy@gmail.com>"

From 787445da6a52e6a061bf8be9dd5926c86f86f49f Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 4 Nov 2021 09:34:26 +0100
Subject: [PATCH 16/17] debug-me: bump for ghc 8.10.7

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

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index ecff9d9d18f2..ad8b055bb33e 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - '.'
-resolver: lts-17.5
+resolver: lts-18.14
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 797c52f1f479..86ac0037311a 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=2
+revision=3
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"

From b32217bf85fdbee56a76a1bbb17b93f6e1329e1c Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 5 Nov 2021 07:22:52 +0100
Subject: [PATCH 17/17] git-annex: update to 8.20211028

---
 srcpkgs/git-annex/files/stack.yaml       | 32 ------------------------
 srcpkgs/git-annex/patches/ghc8.8.3.patch | 18 -------------
 srcpkgs/git-annex/template               |  6 ++---
 3 files changed, 3 insertions(+), 53 deletions(-)
 delete mode 100644 srcpkgs/git-annex/files/stack.yaml
 delete mode 100644 srcpkgs/git-annex/patches/ghc8.8.3.patch

diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
deleted file mode 100644
index 5d457bebde83..000000000000
--- a/srcpkgs/git-annex/files/stack.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-flags:
-  git-annex:
-    production: true
-    assistant: true
-    pairing: true
-    torrentparser: true
-    webapp: true
-    magicmime: false
-    dbus: false
-    debuglocks: false
-    benchmark: false
-    networkbsd: false
-    gitlfs: true
-    httpclientrestricted: true
-packages:
-- '.'
-extra-deps:
- - IfElse-0.85
- - aws-0.22
- - bloomfilter-2.0.1.0
- - filepath-bytestring-1.4.2.1.6
- - git-lfs-1.1.0
- - http-client-restricted-0.0.3
- - network-multicast-0.3.2
- - sandi-0.5
- - torrent-10000.1.1
- - bencode-0.6.1.1
- - network-3.1.0.1
-explicit-setup-deps:
-  git-annex: true
-resolver: lts-17.5
-allow-newer: true
diff --git a/srcpkgs/git-annex/patches/ghc8.8.3.patch b/srcpkgs/git-annex/patches/ghc8.8.3.patch
deleted file mode 100644
index 27a1739c1119..000000000000
--- a/srcpkgs/git-annex/patches/ghc8.8.3.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/git-annex.cabal	2020-04-01 21:09:23.653315424 +0200
-+++ b/git-annex.cabal	2020-04-01 20:50:23.080838029 +0200
-@@ -304,6 +304,7 @@
-   Build-Depends:
-    base (>= 4.11.1.0 && < 5.0),
-    network-uri (>= 2.6),
-+   network-bsd,
-    optparse-applicative (>= 0.14.1),
-    containers (>= 0.5.8),
-    exceptions (>= 0.6),
-@@ -404,3 +404,3 @@ if flag(NetworkBSD)
-     Build-Depends: network-bsd, network (>= 3.0.0.0)
-   else
--    Build-Depends: network (< 3.0.0.0), network (>= 2.6.3.0)
-+    Build-Depends: network (< 3.2.0.0), network (>= 2.6.3.0)
-
-   if flag(S3)
-     Build-Depends: aws (>= 0.20)
diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template
index cdcd6bb0f83c..1cf2ab14789f 100644
--- a/srcpkgs/git-annex/template
+++ b/srcpkgs/git-annex/template
@@ -1,10 +1,10 @@
 # Template file for 'git-annex'
 pkgname=git-annex
-version=8.20210330
+version=8.20211028
 revision=1
 build_style=haskell-stack
 makedepends="curl file-devel gnupg2 gnutls-devel gsasl-devel libxml2-devel
- lsof rsync git"
+ lsof rsync git ncurses-devel"
 # depends are utilities required by git-annex
 depends="git rsync curl lsof gnupg2"
 short_desc="Git addon for managing large files"
@@ -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=17109144b2aadfab79fa0e193df3e0c02fd80f738a5ed6eccb0d11692bedb01d
+checksum=cf5efe15e68d467daad673bec10037a27a78da7e4af9b4a85e10980bd90ace2d
 nopie_files="/usr/bin/git-annex"
 nocross=yes
 

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

* Re: [WIP] GHC 8.10.7
  2021-10-31 16:44 [PR PATCH] [WIP] GHC 8.10.7 slotThe
                   ` (9 preceding siblings ...)
  2022-01-26 10:13 ` [PR PATCH] [Updated] " slotThe
@ 2022-01-26 10:15 ` slotThe
  2022-01-26 15:42 ` q66
                   ` (7 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: slotThe @ 2022-01-26 10:15 UTC (permalink / raw)
  To: ml

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

New comment by slotThe on void-packages repository

https://github.com/void-linux/void-packages/pull/33850#issuecomment-1022056270

Comment:
(rebased on top of `master`)

Also friendly ping @q66 

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

* Re: [WIP] GHC 8.10.7
  2021-10-31 16:44 [PR PATCH] [WIP] GHC 8.10.7 slotThe
                   ` (10 preceding siblings ...)
  2022-01-26 10:15 ` slotThe
@ 2022-01-26 15:42 ` q66
  2022-01-26 16:05 ` slotThe
                   ` (6 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: q66 @ 2022-01-26 15:42 UTC (permalink / raw)
  To: ml

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

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/33850#issuecomment-1022324318

Comment:
oh, you should've pinged me sooner about this, i had too much to do and entirely forgot about this one...

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

* Re: [WIP] GHC 8.10.7
  2021-10-31 16:44 [PR PATCH] [WIP] GHC 8.10.7 slotThe
                   ` (11 preceding siblings ...)
  2022-01-26 15:42 ` q66
@ 2022-01-26 16:05 ` slotThe
  2022-02-22 19:22 ` [PR PATCH] [Updated] " slotThe
                   ` (5 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: slotThe @ 2022-01-26 16:05 UTC (permalink / raw)
  To: ml

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

New comment by slotThe on void-packages repository

https://github.com/void-linux/void-packages/pull/33850#issuecomment-1022347184

Comment:
Tbh I also completely forgot about this due to holidays and some other things happening, so no worries :)

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

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.7
  2021-10-31 16:44 [PR PATCH] [WIP] GHC 8.10.7 slotThe
                   ` (12 preceding siblings ...)
  2022-01-26 16:05 ` slotThe
@ 2022-02-22 19:22 ` slotThe
  2022-02-22 20:14 ` slotThe
                   ` (4 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: slotThe @ 2022-02-22 19:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2367 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.7
https://github.com/void-linux/void-packages/pull/33850

[WIP] GHC 8.10.7
The 8.10.x release flood seems to have stopped; time for the fun part to begin!

- [x] ghc
- [ ] ghc-bin
    - [x] x86_64-musl (**Not uploaded to alpha.de yet** [Link](https://www.mediafire.com/file/i2385lbvjbmzx3l/ghc-8.10.7-x86_64-void-linux-musl.tar.xz/file))
    cc @q66 for the following
    - [ ] 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
- [x] debug-me
- [x] hlint
- [x] hoogle
- [x] darcs
- [x] shellcheck
- [x] git-annex
- [x] hledger
- [x] pandoc
- [x] xmobar
- [x] haskell-language-server

Other things to do:

- [x] Merge https://github.com/void-linux/void-packages/pull/33749

<!-- 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.)
- [ ] 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/33850.patch is attached

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

From 7e4146f6a400bd6af3bda7d0593bbed682058b08 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 9 Oct 2021 15:35:58 +0200
Subject: [PATCH 01/17] ghc: update to 8.10.7

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

diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 3bb7aa59f705..b8b16f67b433 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,7 +1,7 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.10.4
+version=8.10.7
 revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ 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=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
+checksum=e3eef6229ce9908dfe1ea41436befb0455fefb1932559e860ad4c606b0d03c9d
 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 27d5851d864840edf82843e460314ad29442c3fd Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 10 Oct 2021 17:33:05 +0200
Subject: [PATCH 02/17] cabal-install: update to 3.6.2.0

As of version 3.6.0.0, Cabal does not issue separate versions of
`cabal-install` on GitHub anymore.  Hence, we have to change the
respective paths and wrksrc directories.
---
 .../patches/ghc-8.10.4-build.diff             | 43 -------------------
 srcpkgs/cabal-install/template                | 14 +++---
 2 files changed, 7 insertions(+), 50 deletions(-)
 delete mode 100644 srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff

diff --git a/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
deleted file mode 100644
index a3eaaa90f4f1..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
-+++ b/bootstrap/linux-8.10.1.json	2021-02-28 18:54:36.417761219 +0100
-@@ -14,7 +14,7 @@
-         },
-         {
-             "package": "base",
--            "version": "4.14.0.0"
-+            "version": "4.14.1.0"
-         },
-         {
-             "package": "array",
-@@ -26,7 +26,7 @@
-         },
-         {
-             "package": "bytestring",
--            "version": "0.10.10.0"
-+            "version": "0.10.12.0"
-         },
-         {
-             "package": "containers",
-@@ -62,7 +62,7 @@
-         },
-         {
-             "package": "text",
--            "version": "1.2.3.2"
-+            "version": "1.2.4.1"
-         },
-         {
-             "package": "parsec",
-@@ -74,11 +74,11 @@
-         },
-         {
-             "package": "process",
--            "version": "1.6.8.2"
-+            "version": "1.6.9.0"
-         },
-         {
-             "package": "ghc-boot-th",
--            "version": "8.10.1"
-+            "version": "8.10.4"
-         },
-         {
-             "package": "template-haskell",
diff --git a/srcpkgs/cabal-install/template b/srcpkgs/cabal-install/template
index 18ce63f254c7..d6d718709993 100644
--- a/srcpkgs/cabal-install/template
+++ b/srcpkgs/cabal-install/template
@@ -1,8 +1,8 @@
 # Template file for 'cabal-install'
 pkgname=cabal-install
-version=3.4.0.0
-revision=2
-wrksrc=cabal-${pkgname}-${version}
+version=3.6.2.0
+revision=1
+wrksrc=cabal-Cabal-v${version}
 hostmakedepends="ghc curl tar which"
 makedepends="gmp-devel libffi-devel zlib-devel python3"
 depends="ghc"
@@ -10,8 +10,8 @@ short_desc="Command-line interface for Cabal and Hackage"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://hackage.haskell.org/package/cabal-install"
-distfiles="https://github.com/haskell/cabal/archive/${pkgname}-${version}.tar.gz"
-checksum=e4fbd5eb1d77400746a993679181f159aa415a37b931b26d67f5602f63ce971c
+distfiles="https://github.com/haskell/cabal/archive/Cabal-v${version}.tar.gz"
+checksum=dcf31e82cd85ea3236be18cc36c68058948994579ea7de18f99175821dbbcb64
 nopie_files="/usr/bin/cabal"
 nocross=yes
 
@@ -19,12 +19,12 @@ post_patch() {
 	case "${XBPS_TARGET_MACHINE}" in
 	i686*)
 		# https://github.com/haskell/cabal/issues/7313
-		vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.1.json ;;
+		vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.7.json ;;
 	esac
 }
 
 do_build() {
-	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.1.json
+	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.7.json
 }
 do_install() {
 	vbin _build/bin/cabal

From 26c9a2d324783b6e5164e34154353421d367c785 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Mon, 25 Oct 2021 10:39:23 +0200
Subject: [PATCH 03/17] stack: bump for lts-18.14

This is the most recent stackage resolver for GHC 8.10.7.
---
 srcpkgs/stack/patches/SimpleRepo.patch | 18 ++++++++++++++++++
 srcpkgs/stack/template                 |  6 +++---
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/stack/patches/SimpleRepo.patch

diff --git a/srcpkgs/stack/patches/SimpleRepo.patch b/srcpkgs/stack/patches/SimpleRepo.patch
new file mode 100644
index 000000000000..df85d5b942be
--- /dev/null
+++ b/srcpkgs/stack/patches/SimpleRepo.patch
@@ -0,0 +1,18 @@
+--- a/src/Stack/Setup.hs
++++ b/src/Stack/Setup.hs
+@@ -837,9 +837,8 @@
+    if compilerTool `elem` installed
+      then return (compilerTool,CompilerBuildStandard)
+      else do
+-       let repo = Repo
+-            { repoCommit = commitId
+-            , repoUrl    = url
+-            , repoType   = RepoGit
+-            , repoSubdir = mempty
++       let repo = SimpleRepo
++            { sRepoCommit = commitId
++            , sRepoUrl    = url
++            , sRepoType   = RepoGit
+             }
+
+        -- clone the repository and execute the given commands
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index f9d573ef5bfd..d7015a5ddd1c 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
 version=2.7.3
-revision=1
-_stackage="lts-18.5"
+revision=2
+_stackage="lts-18.14"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -13,7 +13,7 @@ homepage="https://haskellstack.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
 checksum="47caf8818352c7f663eb0364f48b1f4d80832ae25c31ca483416a4b74c2c5b44
- 322bc85f38bf6726af6e588dde381d72f0c3e89970939b6a7b5b975cabd05d1a"
+ 78577c091074d78f9d6e09d6e31e7fc8ac2ddbb0dbc4ac65c606adcac4957d7f"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 7c417e17ba3841537156cd30061d82542a9567ff Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 27 Oct 2021 19:01:39 +0200
Subject: [PATCH 04/17] ghc-bin: update to 8.10.7

---
 srcpkgs/ghc-bin/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index df74043ea188..dec19fef877c 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.10.4
+version=8.10.7
 revision=1
 archs="i686 x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
@@ -16,16 +16,16 @@ 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-deb9-linux.tar.xz"
-	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
+	checksum=ced9870ea351af64fb48274b81a664cdb6a9266775f1598a79cbb6fdd5770a23
 	;;
 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=246485f18ceccaadaece6450ed7af46dd6b4d5d33e0b8dd1647c64dd8e50dc60
+	checksum=52f6492f39f13890f4ecd83784724ae9fff7a02fdc624a56c49872c912608a50
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
+	checksum=fbfc1ef194f4e7a4c0da8c11cc69b17458a4b928b609b3622c97acc4acd5c5ab
 	;;
 ppc64le)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz"

From ad0bb877938d5f5bbfd16359a1a19f5e6710d847 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:05:38 +0200
Subject: [PATCH 05/17] kmonad: bump for ghc 8.10.7

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

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

From eec4d5e620173039921ad9b41e4bbe4e3e0dc927 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:28:25 +0200
Subject: [PATCH 06/17] haskell-language-server: update to 1.4.0

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

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index ff0782a54ddb..0182c9b95757 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,16 +1,16 @@
 # Template file for 'haskell-language-server'
 pkgname=haskell-language-server
-version=1.3.0
+version=1.4.0
 revision=1
 build_style="haskell-stack"
-make_build_args="--stack-yaml stack-8.10.4.yaml"
+make_build_args="--stack-yaml stack-8.10.7.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>"
 license="Apache-2.0"
 homepage="https://github.com/haskell/haskell-language-server"
 distfiles="https://github.com/haskell/haskell-language-server/archive/${version}.tar.gz"
-checksum=9be31ead3fb1c0ca761de80185a23665dfe167457baaba642cf62885df98f6a1
+checksum=c5d7dbf7fae9aa3ed2c1184b49e82d8ac623ca786494ef6602cfe11735d28db0
 nopie_files="
  /usr/bin/haskell-language-server
  /usr/bin/haskell-language-server-wrapper

From ff7d3155c23c90267c47552bb5972272f346508a Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:37:59 +0200
Subject: [PATCH 07/17] xmobar: bump for ghc 8.10.7

---
 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 52fd0e3e49fe..47544eb729d8 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-17.5
+resolver: lts-18.13
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 708899ad4e24..b97c9f268d68 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.39
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From 42d0e6c6a0091f5010977dacc1a55adcbcb1a43a Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:39:46 +0200
Subject: [PATCH 08/17] hledger: bump for ghc 8.10.7

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

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

From 03ca0a2199a937ca46daa8102382837cea16d5a7 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:40:29 +0200
Subject: [PATCH 09/17] hoogle: bump for ghc 8.10.7

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

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

From 844454baf58c98759cd03b81e792cf7e497bf56e Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:41:54 +0200
Subject: [PATCH 10/17] hlint: bump for ghc 8.10.7

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

diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index fb30f947a452..fd72c1bbea58 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,9 +1,9 @@
 # Template file for 'hlint'
 pkgname=hlint
 version=3.2.7
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From 6ea6ae9868bbfa416c35c1eae433a84766c7f923 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:42:42 +0200
Subject: [PATCH 11/17] darcs: bump for ghc 8.10.7

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

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index f5ca6078ed75..5ae0f5313b8d 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,5 +1,7 @@
-resolver: lts-17.5
+resolver: lts-18.14
 packages:
 - .
 extra-deps:
 - graphviz-2999.20.1.0
+- constraints-0.12@sha256:7edf1e72a92d0a6761da634f08be9123dfcc0dcec11c269cbf465a09721c3481,2322
+- cryptonite-0.27@sha256:c3a9c8ce11e654a9d5bee827b089d4b50587272828d0c52a85362a58667a916c,18163
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index ddf0cdbb0d1b..f9fcac534d46 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.5
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From 5d68c82c79c768dc6ca7e70ce43219167c093dd6 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 2 Nov 2021 08:57:33 +0100
Subject: [PATCH 12/17] shellcheck: bump for ghc 8.10.7

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

diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 08e64456eda9..70eee6c2854b 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,9 +1,9 @@
 # Template file for 'shellcheck'
 pkgname=shellcheck
 version=0.8.0
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 hostmakedepends="pandoc"
 short_desc="Static analysis tool for shell scripts"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

From d286a53e3bb8a0e308dd3e5885937871d37050de Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 08:35:15 +0100
Subject: [PATCH 13/17] pandoc: bump for ghc 8.10.7

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

diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index d84e94c7b93b..4e43f154a751 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,12 +2,12 @@
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
 version=2.14.0.3
-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-18.5"
+stackage="lts-18.14"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"

From b63815be78e5529d834c86fd7d8a5a5ed8c08b36 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 19:17:39 +0100
Subject: [PATCH 14/17] cgrep: bump for ghc 8.10.7

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

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index c987e67725b0..e57106f3fa26 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,9 +1,9 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.7.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-18.6"
+stackage="lts-18.15"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
 maintainer="slotThe <soliditsallgood@mailbox.org>"

From 5d60f6f8915e11e654f89d8ac64c78747db8648b Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 21:11:14 +0100
Subject: [PATCH 15/17] git-mediate: bump for ghc 8.10.7

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

diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template
index 971a6236224f..0c9ec10241e5 100644
--- a/srcpkgs/git-mediate/template
+++ b/srcpkgs/git-mediate/template
@@ -1,9 +1,9 @@
 # Template file for 'git-mediate'
 pkgname=git-mediate
 version=1.0.8.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 depends="git"
 short_desc="Tool to help resolving git conflicts"
 maintainer="Peter Wang <novalazy@gmail.com>"

From cea34092fbcd0c9e634ce59cbe62a1d8abdfba2f Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 4 Nov 2021 09:34:26 +0100
Subject: [PATCH 16/17] debug-me: bump for ghc 8.10.7

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

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index ecff9d9d18f2..ad8b055bb33e 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - '.'
-resolver: lts-17.5
+resolver: lts-18.14
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 797c52f1f479..86ac0037311a 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=2
+revision=3
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"

From 07cee4ca5d5f58767469e417bae68e33d464b8bc Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 5 Nov 2021 07:22:52 +0100
Subject: [PATCH 17/17] git-annex: update to 8.20211028

---
 srcpkgs/git-annex/files/stack.yaml       | 32 ------------------------
 srcpkgs/git-annex/patches/ghc8.8.3.patch | 18 -------------
 srcpkgs/git-annex/template               |  6 ++---
 3 files changed, 3 insertions(+), 53 deletions(-)
 delete mode 100644 srcpkgs/git-annex/files/stack.yaml
 delete mode 100644 srcpkgs/git-annex/patches/ghc8.8.3.patch

diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
deleted file mode 100644
index 5d457bebde83..000000000000
--- a/srcpkgs/git-annex/files/stack.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-flags:
-  git-annex:
-    production: true
-    assistant: true
-    pairing: true
-    torrentparser: true
-    webapp: true
-    magicmime: false
-    dbus: false
-    debuglocks: false
-    benchmark: false
-    networkbsd: false
-    gitlfs: true
-    httpclientrestricted: true
-packages:
-- '.'
-extra-deps:
- - IfElse-0.85
- - aws-0.22
- - bloomfilter-2.0.1.0
- - filepath-bytestring-1.4.2.1.6
- - git-lfs-1.1.0
- - http-client-restricted-0.0.3
- - network-multicast-0.3.2
- - sandi-0.5
- - torrent-10000.1.1
- - bencode-0.6.1.1
- - network-3.1.0.1
-explicit-setup-deps:
-  git-annex: true
-resolver: lts-17.5
-allow-newer: true
diff --git a/srcpkgs/git-annex/patches/ghc8.8.3.patch b/srcpkgs/git-annex/patches/ghc8.8.3.patch
deleted file mode 100644
index 27a1739c1119..000000000000
--- a/srcpkgs/git-annex/patches/ghc8.8.3.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/git-annex.cabal	2020-04-01 21:09:23.653315424 +0200
-+++ b/git-annex.cabal	2020-04-01 20:50:23.080838029 +0200
-@@ -304,6 +304,7 @@
-   Build-Depends:
-    base (>= 4.11.1.0 && < 5.0),
-    network-uri (>= 2.6),
-+   network-bsd,
-    optparse-applicative (>= 0.14.1),
-    containers (>= 0.5.8),
-    exceptions (>= 0.6),
-@@ -404,3 +404,3 @@ if flag(NetworkBSD)
-     Build-Depends: network-bsd, network (>= 3.0.0.0)
-   else
--    Build-Depends: network (< 3.0.0.0), network (>= 2.6.3.0)
-+    Build-Depends: network (< 3.2.0.0), network (>= 2.6.3.0)
-
-   if flag(S3)
-     Build-Depends: aws (>= 0.20)
diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template
index cdcd6bb0f83c..1cf2ab14789f 100644
--- a/srcpkgs/git-annex/template
+++ b/srcpkgs/git-annex/template
@@ -1,10 +1,10 @@
 # Template file for 'git-annex'
 pkgname=git-annex
-version=8.20210330
+version=8.20211028
 revision=1
 build_style=haskell-stack
 makedepends="curl file-devel gnupg2 gnutls-devel gsasl-devel libxml2-devel
- lsof rsync git"
+ lsof rsync git ncurses-devel"
 # depends are utilities required by git-annex
 depends="git rsync curl lsof gnupg2"
 short_desc="Git addon for managing large files"
@@ -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=17109144b2aadfab79fa0e193df3e0c02fd80f738a5ed6eccb0d11692bedb01d
+checksum=cf5efe15e68d467daad673bec10037a27a78da7e4af9b4a85e10980bd90ace2d
 nopie_files="/usr/bin/git-annex"
 nocross=yes
 

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

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.7
  2021-10-31 16:44 [PR PATCH] [WIP] GHC 8.10.7 slotThe
                   ` (13 preceding siblings ...)
  2022-02-22 19:22 ` [PR PATCH] [Updated] " slotThe
@ 2022-02-22 20:14 ` slotThe
  2022-02-28 21:50 ` q66
                   ` (3 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: slotThe @ 2022-02-22 20:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2367 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.7
https://github.com/void-linux/void-packages/pull/33850

[WIP] GHC 8.10.7
The 8.10.x release flood seems to have stopped; time for the fun part to begin!

- [x] ghc
- [ ] ghc-bin
    - [x] x86_64-musl (**Not uploaded to alpha.de yet** [Link](https://www.mediafire.com/file/i2385lbvjbmzx3l/ghc-8.10.7-x86_64-void-linux-musl.tar.xz/file))
    cc @q66 for the following
    - [ ] 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
- [x] debug-me
- [x] hlint
- [x] hoogle
- [x] darcs
- [x] shellcheck
- [x] git-annex
- [x] hledger
- [x] pandoc
- [x] xmobar
- [x] haskell-language-server

Other things to do:

- [x] Merge https://github.com/void-linux/void-packages/pull/33749

<!-- 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.)
- [ ] 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/33850.patch is attached

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

From 8b6c0e31acae13b3d333cf88cbc44909ea344509 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 9 Oct 2021 15:35:58 +0200
Subject: [PATCH 01/17] ghc: update to 8.10.7

---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch |  9 ---------
 srcpkgs/ghc/patches/sphinx-unicode.patch | 17 -----------------
 srcpkgs/ghc/template                     |  4 ++--
 3 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/ghc/patches/sphinx-unicode.patch

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index 41ad0ceb3463..275444e828b7 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -128,15 +128,6 @@ index d360cfe..ab7ede7 100644
                    STG_UNUSED
  #endif
                )
-@@ -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)
     return;
   }
diff --git a/srcpkgs/ghc/patches/sphinx-unicode.patch b/srcpkgs/ghc/patches/sphinx-unicode.patch
deleted file mode 100644
index 5a09de43bc0c..000000000000
--- a/srcpkgs/ghc/patches/sphinx-unicode.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -rpU2 ghc-8.8.4-orig/docs/users_guide/conf.py ghc-8.8.4/docs/users_guide/conf.py
---- ghc-8.8.4-orig/docs/users_guide/conf.py	2020-07-08 16:43:03.000000000 +0000
-+++ ghc-8.8.4/docs/users_guide/conf.py	2021-07-10 20:25:33.536928487 +0000
-@@ -101,5 +101,5 @@ latex_elements = {
-     'inputenc': '',
-     'utf8extra': '',
--    'preamble': '''
-+    'preamble': r'''
- \usepackage{fontspec}
- \usepackage{makeidx}
-@@ -107,5 +107,5 @@ latex_elements = {
- \setromanfont{DejaVu Serif}
- \setmonofont{DejaVu Sans Mono}
--\setlength{\\tymin}{45pt}
-+\setlength{\tymin}{45pt}
- ''',
- }
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 3bb7aa59f705..b8b16f67b433 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,7 +1,7 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.10.4
+version=8.10.7
 revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ 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=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
+checksum=e3eef6229ce9908dfe1ea41436befb0455fefb1932559e860ad4c606b0d03c9d
 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 063ee097f5dd4f47625a0aaad2ae44368dc13584 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 10 Oct 2021 17:33:05 +0200
Subject: [PATCH 02/17] cabal-install: update to 3.6.2.0

As of version 3.6.0.0, Cabal does not issue separate versions of
`cabal-install` on GitHub anymore.  Hence, we have to change the
respective paths and wrksrc directories.
---
 .../patches/ghc-8.10.4-build.diff             | 43 -------------------
 srcpkgs/cabal-install/template                | 14 +++---
 2 files changed, 7 insertions(+), 50 deletions(-)
 delete mode 100644 srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff

diff --git a/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
deleted file mode 100644
index a3eaaa90f4f1..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
-+++ b/bootstrap/linux-8.10.1.json	2021-02-28 18:54:36.417761219 +0100
-@@ -14,7 +14,7 @@
-         },
-         {
-             "package": "base",
--            "version": "4.14.0.0"
-+            "version": "4.14.1.0"
-         },
-         {
-             "package": "array",
-@@ -26,7 +26,7 @@
-         },
-         {
-             "package": "bytestring",
--            "version": "0.10.10.0"
-+            "version": "0.10.12.0"
-         },
-         {
-             "package": "containers",
-@@ -62,7 +62,7 @@
-         },
-         {
-             "package": "text",
--            "version": "1.2.3.2"
-+            "version": "1.2.4.1"
-         },
-         {
-             "package": "parsec",
-@@ -74,11 +74,11 @@
-         },
-         {
-             "package": "process",
--            "version": "1.6.8.2"
-+            "version": "1.6.9.0"
-         },
-         {
-             "package": "ghc-boot-th",
--            "version": "8.10.1"
-+            "version": "8.10.4"
-         },
-         {
-             "package": "template-haskell",
diff --git a/srcpkgs/cabal-install/template b/srcpkgs/cabal-install/template
index 18ce63f254c7..d6d718709993 100644
--- a/srcpkgs/cabal-install/template
+++ b/srcpkgs/cabal-install/template
@@ -1,8 +1,8 @@
 # Template file for 'cabal-install'
 pkgname=cabal-install
-version=3.4.0.0
-revision=2
-wrksrc=cabal-${pkgname}-${version}
+version=3.6.2.0
+revision=1
+wrksrc=cabal-Cabal-v${version}
 hostmakedepends="ghc curl tar which"
 makedepends="gmp-devel libffi-devel zlib-devel python3"
 depends="ghc"
@@ -10,8 +10,8 @@ short_desc="Command-line interface for Cabal and Hackage"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://hackage.haskell.org/package/cabal-install"
-distfiles="https://github.com/haskell/cabal/archive/${pkgname}-${version}.tar.gz"
-checksum=e4fbd5eb1d77400746a993679181f159aa415a37b931b26d67f5602f63ce971c
+distfiles="https://github.com/haskell/cabal/archive/Cabal-v${version}.tar.gz"
+checksum=dcf31e82cd85ea3236be18cc36c68058948994579ea7de18f99175821dbbcb64
 nopie_files="/usr/bin/cabal"
 nocross=yes
 
@@ -19,12 +19,12 @@ post_patch() {
 	case "${XBPS_TARGET_MACHINE}" in
 	i686*)
 		# https://github.com/haskell/cabal/issues/7313
-		vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.1.json ;;
+		vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.7.json ;;
 	esac
 }
 
 do_build() {
-	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.1.json
+	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.7.json
 }
 do_install() {
 	vbin _build/bin/cabal

From 419685cc63cb81ca33cbce21b064b08d0cad10c0 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Mon, 25 Oct 2021 10:39:23 +0200
Subject: [PATCH 03/17] stack: bump for lts-18.14

This is the most recent stackage resolver for GHC 8.10.7.
---
 srcpkgs/stack/patches/SimpleRepo.patch | 18 ++++++++++++++++++
 srcpkgs/stack/template                 |  6 +++---
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/stack/patches/SimpleRepo.patch

diff --git a/srcpkgs/stack/patches/SimpleRepo.patch b/srcpkgs/stack/patches/SimpleRepo.patch
new file mode 100644
index 000000000000..df85d5b942be
--- /dev/null
+++ b/srcpkgs/stack/patches/SimpleRepo.patch
@@ -0,0 +1,18 @@
+--- a/src/Stack/Setup.hs
++++ b/src/Stack/Setup.hs
+@@ -837,9 +837,8 @@
+    if compilerTool `elem` installed
+      then return (compilerTool,CompilerBuildStandard)
+      else do
+-       let repo = Repo
+-            { repoCommit = commitId
+-            , repoUrl    = url
+-            , repoType   = RepoGit
+-            , repoSubdir = mempty
++       let repo = SimpleRepo
++            { sRepoCommit = commitId
++            , sRepoUrl    = url
++            , sRepoType   = RepoGit
+             }
+
+        -- clone the repository and execute the given commands
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index f9d573ef5bfd..d7015a5ddd1c 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
 version=2.7.3
-revision=1
-_stackage="lts-18.5"
+revision=2
+_stackage="lts-18.14"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -13,7 +13,7 @@ homepage="https://haskellstack.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
 checksum="47caf8818352c7f663eb0364f48b1f4d80832ae25c31ca483416a4b74c2c5b44
- 322bc85f38bf6726af6e588dde381d72f0c3e89970939b6a7b5b975cabd05d1a"
+ 78577c091074d78f9d6e09d6e31e7fc8ac2ddbb0dbc4ac65c606adcac4957d7f"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 1a91c155b40bd1ea2cdee071499de787239b6092 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 27 Oct 2021 19:01:39 +0200
Subject: [PATCH 04/17] ghc-bin: update to 8.10.7

---
 srcpkgs/ghc-bin/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index df74043ea188..dec19fef877c 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.10.4
+version=8.10.7
 revision=1
 archs="i686 x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
@@ -16,16 +16,16 @@ 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-deb9-linux.tar.xz"
-	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
+	checksum=ced9870ea351af64fb48274b81a664cdb6a9266775f1598a79cbb6fdd5770a23
 	;;
 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=246485f18ceccaadaece6450ed7af46dd6b4d5d33e0b8dd1647c64dd8e50dc60
+	checksum=52f6492f39f13890f4ecd83784724ae9fff7a02fdc624a56c49872c912608a50
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
+	checksum=fbfc1ef194f4e7a4c0da8c11cc69b17458a4b928b609b3622c97acc4acd5c5ab
 	;;
 ppc64le)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz"

From ae34da78d13dff0ed9bdbea0695021df699af593 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:05:38 +0200
Subject: [PATCH 05/17] kmonad: bump for ghc 8.10.7

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

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

From 26473d74a519e83b7d282c65866a038a8789530d Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:28:25 +0200
Subject: [PATCH 06/17] haskell-language-server: update to 1.4.0

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

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index ff0782a54ddb..0182c9b95757 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,16 +1,16 @@
 # Template file for 'haskell-language-server'
 pkgname=haskell-language-server
-version=1.3.0
+version=1.4.0
 revision=1
 build_style="haskell-stack"
-make_build_args="--stack-yaml stack-8.10.4.yaml"
+make_build_args="--stack-yaml stack-8.10.7.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>"
 license="Apache-2.0"
 homepage="https://github.com/haskell/haskell-language-server"
 distfiles="https://github.com/haskell/haskell-language-server/archive/${version}.tar.gz"
-checksum=9be31ead3fb1c0ca761de80185a23665dfe167457baaba642cf62885df98f6a1
+checksum=c5d7dbf7fae9aa3ed2c1184b49e82d8ac623ca786494ef6602cfe11735d28db0
 nopie_files="
  /usr/bin/haskell-language-server
  /usr/bin/haskell-language-server-wrapper

From 85fab394783cd779b28540c51d93b79e48c11e87 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:37:59 +0200
Subject: [PATCH 07/17] xmobar: bump for ghc 8.10.7

---
 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 52fd0e3e49fe..47544eb729d8 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-17.5
+resolver: lts-18.13
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 708899ad4e24..b97c9f268d68 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.39
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From 414bd52e75d89937c2153ed981fd235acaa14663 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:39:46 +0200
Subject: [PATCH 08/17] hledger: bump for ghc 8.10.7

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

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

From f8f1410a2fd84ae355e12c66c85fca1a8f4fc26b Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:40:29 +0200
Subject: [PATCH 09/17] hoogle: bump for ghc 8.10.7

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

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

From a6cc122c82ab05e760c5801ff829f03dc0828683 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:41:54 +0200
Subject: [PATCH 10/17] hlint: bump for ghc 8.10.7

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

diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index fb30f947a452..fd72c1bbea58 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,9 +1,9 @@
 # Template file for 'hlint'
 pkgname=hlint
 version=3.2.7
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From cdd9ab3ea538eb3b1f6e89c20bc9acb089da8ef1 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:42:42 +0200
Subject: [PATCH 11/17] darcs: bump for ghc 8.10.7

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

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index f5ca6078ed75..5ae0f5313b8d 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,5 +1,7 @@
-resolver: lts-17.5
+resolver: lts-18.14
 packages:
 - .
 extra-deps:
 - graphviz-2999.20.1.0
+- constraints-0.12@sha256:7edf1e72a92d0a6761da634f08be9123dfcc0dcec11c269cbf465a09721c3481,2322
+- cryptonite-0.27@sha256:c3a9c8ce11e654a9d5bee827b089d4b50587272828d0c52a85362a58667a916c,18163
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index ddf0cdbb0d1b..f9fcac534d46 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.5
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From 2144dbf92e7b0e4717ece9da154635e1a4fdcf9c Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 2 Nov 2021 08:57:33 +0100
Subject: [PATCH 12/17] shellcheck: bump for ghc 8.10.7

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

diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 08e64456eda9..70eee6c2854b 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,9 +1,9 @@
 # Template file for 'shellcheck'
 pkgname=shellcheck
 version=0.8.0
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 hostmakedepends="pandoc"
 short_desc="Static analysis tool for shell scripts"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

From 0109948472e1a94372796698347cffd4b2714f03 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 08:35:15 +0100
Subject: [PATCH 13/17] pandoc: bump for ghc 8.10.7

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

diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index d84e94c7b93b..4e43f154a751 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,12 +2,12 @@
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
 version=2.14.0.3
-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-18.5"
+stackage="lts-18.14"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"

From dd0ffb979af4424e2b530e3b53536eb230dfb478 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 19:17:39 +0100
Subject: [PATCH 14/17] cgrep: bump for ghc 8.10.7

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

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index c987e67725b0..e57106f3fa26 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,9 +1,9 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.7.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-18.6"
+stackage="lts-18.15"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
 maintainer="slotThe <soliditsallgood@mailbox.org>"

From 2001edc2b18d9d17d8db20d6f389aa2ae0d7b206 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 21:11:14 +0100
Subject: [PATCH 15/17] git-mediate: bump for ghc 8.10.7

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

diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template
index 971a6236224f..0c9ec10241e5 100644
--- a/srcpkgs/git-mediate/template
+++ b/srcpkgs/git-mediate/template
@@ -1,9 +1,9 @@
 # Template file for 'git-mediate'
 pkgname=git-mediate
 version=1.0.8.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 depends="git"
 short_desc="Tool to help resolving git conflicts"
 maintainer="Peter Wang <novalazy@gmail.com>"

From 40781a77054d9e2d08ef0ee646cee7d9b2ad38d0 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 4 Nov 2021 09:34:26 +0100
Subject: [PATCH 16/17] debug-me: bump for ghc 8.10.7

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

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index ecff9d9d18f2..ad8b055bb33e 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - '.'
-resolver: lts-17.5
+resolver: lts-18.14
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 797c52f1f479..86ac0037311a 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=2
+revision=3
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"

From 31a3238fe852b8b870f6444f467394bfba4e61a9 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 5 Nov 2021 07:22:52 +0100
Subject: [PATCH 17/17] git-annex: update to 8.20211028

---
 srcpkgs/git-annex/files/stack.yaml       | 32 ------------------------
 srcpkgs/git-annex/patches/ghc8.8.3.patch | 18 -------------
 srcpkgs/git-annex/template               |  6 ++---
 3 files changed, 3 insertions(+), 53 deletions(-)
 delete mode 100644 srcpkgs/git-annex/files/stack.yaml
 delete mode 100644 srcpkgs/git-annex/patches/ghc8.8.3.patch

diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
deleted file mode 100644
index 5d457bebde83..000000000000
--- a/srcpkgs/git-annex/files/stack.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-flags:
-  git-annex:
-    production: true
-    assistant: true
-    pairing: true
-    torrentparser: true
-    webapp: true
-    magicmime: false
-    dbus: false
-    debuglocks: false
-    benchmark: false
-    networkbsd: false
-    gitlfs: true
-    httpclientrestricted: true
-packages:
-- '.'
-extra-deps:
- - IfElse-0.85
- - aws-0.22
- - bloomfilter-2.0.1.0
- - filepath-bytestring-1.4.2.1.6
- - git-lfs-1.1.0
- - http-client-restricted-0.0.3
- - network-multicast-0.3.2
- - sandi-0.5
- - torrent-10000.1.1
- - bencode-0.6.1.1
- - network-3.1.0.1
-explicit-setup-deps:
-  git-annex: true
-resolver: lts-17.5
-allow-newer: true
diff --git a/srcpkgs/git-annex/patches/ghc8.8.3.patch b/srcpkgs/git-annex/patches/ghc8.8.3.patch
deleted file mode 100644
index 27a1739c1119..000000000000
--- a/srcpkgs/git-annex/patches/ghc8.8.3.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/git-annex.cabal	2020-04-01 21:09:23.653315424 +0200
-+++ b/git-annex.cabal	2020-04-01 20:50:23.080838029 +0200
-@@ -304,6 +304,7 @@
-   Build-Depends:
-    base (>= 4.11.1.0 && < 5.0),
-    network-uri (>= 2.6),
-+   network-bsd,
-    optparse-applicative (>= 0.14.1),
-    containers (>= 0.5.8),
-    exceptions (>= 0.6),
-@@ -404,3 +404,3 @@ if flag(NetworkBSD)
-     Build-Depends: network-bsd, network (>= 3.0.0.0)
-   else
--    Build-Depends: network (< 3.0.0.0), network (>= 2.6.3.0)
-+    Build-Depends: network (< 3.2.0.0), network (>= 2.6.3.0)
-
-   if flag(S3)
-     Build-Depends: aws (>= 0.20)
diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template
index cdcd6bb0f83c..1cf2ab14789f 100644
--- a/srcpkgs/git-annex/template
+++ b/srcpkgs/git-annex/template
@@ -1,10 +1,10 @@
 # Template file for 'git-annex'
 pkgname=git-annex
-version=8.20210330
+version=8.20211028
 revision=1
 build_style=haskell-stack
 makedepends="curl file-devel gnupg2 gnutls-devel gsasl-devel libxml2-devel
- lsof rsync git"
+ lsof rsync git ncurses-devel"
 # depends are utilities required by git-annex
 depends="git rsync curl lsof gnupg2"
 short_desc="Git addon for managing large files"
@@ -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=17109144b2aadfab79fa0e193df3e0c02fd80f738a5ed6eccb0d11692bedb01d
+checksum=cf5efe15e68d467daad673bec10037a27a78da7e4af9b4a85e10980bd90ace2d
 nopie_files="/usr/bin/git-annex"
 nocross=yes
 

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

* Re: [WIP] GHC 8.10.7
  2021-10-31 16:44 [PR PATCH] [WIP] GHC 8.10.7 slotThe
                   ` (14 preceding siblings ...)
  2022-02-22 20:14 ` slotThe
@ 2022-02-28 21:50 ` q66
  2022-03-05  6:51 ` [PR PATCH] [Updated] " slotThe
                   ` (2 subsequent siblings)
  18 siblings, 0 replies; 20+ messages in thread
From: q66 @ 2022-02-28 21:50 UTC (permalink / raw)
  To: ml

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

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/33850#issuecomment-1054698759

Comment:
can you rebase this? i will build it once that's done, and we can finally get it merged

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

* Re: [PR PATCH] [Updated] [WIP] GHC 8.10.7
  2021-10-31 16:44 [PR PATCH] [WIP] GHC 8.10.7 slotThe
                   ` (15 preceding siblings ...)
  2022-02-28 21:50 ` q66
@ 2022-03-05  6:51 ` slotThe
  2022-03-05  6:52 ` slotThe
  2022-03-11 13:43 ` [PR PATCH] [Closed]: " q66
  18 siblings, 0 replies; 20+ messages in thread
From: slotThe @ 2022-03-05  6:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2367 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.7
https://github.com/void-linux/void-packages/pull/33850

[WIP] GHC 8.10.7
The 8.10.x release flood seems to have stopped; time for the fun part to begin!

- [x] ghc
- [ ] ghc-bin
    - [x] x86_64-musl (**Not uploaded to alpha.de yet** [Link](https://www.mediafire.com/file/i2385lbvjbmzx3l/ghc-8.10.7-x86_64-void-linux-musl.tar.xz/file))
    cc @q66 for the following
    - [ ] 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
- [x] debug-me
- [x] hlint
- [x] hoogle
- [x] darcs
- [x] shellcheck
- [x] git-annex
- [x] hledger
- [x] pandoc
- [x] xmobar
- [x] haskell-language-server

Other things to do:

- [x] Merge https://github.com/void-linux/void-packages/pull/33749

<!-- 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.)
- [ ] 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/33850.patch is attached

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

From 109907c2d1a319a5c670a66b12cef4691e0507f1 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 9 Oct 2021 15:35:58 +0200
Subject: [PATCH 01/17] ghc: update to 8.10.7

---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch |  9 ---------
 srcpkgs/ghc/patches/sphinx-unicode.patch | 17 -----------------
 srcpkgs/ghc/template                     |  4 ++--
 3 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/ghc/patches/sphinx-unicode.patch

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index 41ad0ceb3463..275444e828b7 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -128,15 +128,6 @@ index d360cfe..ab7ede7 100644
                    STG_UNUSED
  #endif
                )
-@@ -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)
     return;
   }
diff --git a/srcpkgs/ghc/patches/sphinx-unicode.patch b/srcpkgs/ghc/patches/sphinx-unicode.patch
deleted file mode 100644
index 5a09de43bc0c..000000000000
--- a/srcpkgs/ghc/patches/sphinx-unicode.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -rpU2 ghc-8.8.4-orig/docs/users_guide/conf.py ghc-8.8.4/docs/users_guide/conf.py
---- ghc-8.8.4-orig/docs/users_guide/conf.py	2020-07-08 16:43:03.000000000 +0000
-+++ ghc-8.8.4/docs/users_guide/conf.py	2021-07-10 20:25:33.536928487 +0000
-@@ -101,5 +101,5 @@ latex_elements = {
-     'inputenc': '',
-     'utf8extra': '',
--    'preamble': '''
-+    'preamble': r'''
- \usepackage{fontspec}
- \usepackage{makeidx}
-@@ -107,5 +107,5 @@ latex_elements = {
- \setromanfont{DejaVu Serif}
- \setmonofont{DejaVu Sans Mono}
--\setlength{\\tymin}{45pt}
-+\setlength{\tymin}{45pt}
- ''',
- }
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 3bb7aa59f705..b8b16f67b433 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,7 +1,7 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.10.4
+version=8.10.7
 revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ 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=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
+checksum=e3eef6229ce9908dfe1ea41436befb0455fefb1932559e860ad4c606b0d03c9d
 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 d92936afbe9a549efac4e361fc5b8ffb4b66464a Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 10 Oct 2021 17:33:05 +0200
Subject: [PATCH 02/17] cabal-install: update to 3.6.2.0

As of version 3.6.0.0, Cabal does not issue separate versions of
`cabal-install` on GitHub anymore.  Hence, we have to change the
respective paths and wrksrc directories.
---
 .../patches/ghc-8.10.4-build.diff             | 43 -------------------
 srcpkgs/cabal-install/template                | 14 +++---
 2 files changed, 7 insertions(+), 50 deletions(-)
 delete mode 100644 srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff

diff --git a/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
deleted file mode 100644
index a3eaaa90f4f1..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
-+++ b/bootstrap/linux-8.10.1.json	2021-02-28 18:54:36.417761219 +0100
-@@ -14,7 +14,7 @@
-         },
-         {
-             "package": "base",
--            "version": "4.14.0.0"
-+            "version": "4.14.1.0"
-         },
-         {
-             "package": "array",
-@@ -26,7 +26,7 @@
-         },
-         {
-             "package": "bytestring",
--            "version": "0.10.10.0"
-+            "version": "0.10.12.0"
-         },
-         {
-             "package": "containers",
-@@ -62,7 +62,7 @@
-         },
-         {
-             "package": "text",
--            "version": "1.2.3.2"
-+            "version": "1.2.4.1"
-         },
-         {
-             "package": "parsec",
-@@ -74,11 +74,11 @@
-         },
-         {
-             "package": "process",
--            "version": "1.6.8.2"
-+            "version": "1.6.9.0"
-         },
-         {
-             "package": "ghc-boot-th",
--            "version": "8.10.1"
-+            "version": "8.10.4"
-         },
-         {
-             "package": "template-haskell",
diff --git a/srcpkgs/cabal-install/template b/srcpkgs/cabal-install/template
index 18ce63f254c7..d6d718709993 100644
--- a/srcpkgs/cabal-install/template
+++ b/srcpkgs/cabal-install/template
@@ -1,8 +1,8 @@
 # Template file for 'cabal-install'
 pkgname=cabal-install
-version=3.4.0.0
-revision=2
-wrksrc=cabal-${pkgname}-${version}
+version=3.6.2.0
+revision=1
+wrksrc=cabal-Cabal-v${version}
 hostmakedepends="ghc curl tar which"
 makedepends="gmp-devel libffi-devel zlib-devel python3"
 depends="ghc"
@@ -10,8 +10,8 @@ short_desc="Command-line interface for Cabal and Hackage"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://hackage.haskell.org/package/cabal-install"
-distfiles="https://github.com/haskell/cabal/archive/${pkgname}-${version}.tar.gz"
-checksum=e4fbd5eb1d77400746a993679181f159aa415a37b931b26d67f5602f63ce971c
+distfiles="https://github.com/haskell/cabal/archive/Cabal-v${version}.tar.gz"
+checksum=dcf31e82cd85ea3236be18cc36c68058948994579ea7de18f99175821dbbcb64
 nopie_files="/usr/bin/cabal"
 nocross=yes
 
@@ -19,12 +19,12 @@ post_patch() {
 	case "${XBPS_TARGET_MACHINE}" in
 	i686*)
 		# https://github.com/haskell/cabal/issues/7313
-		vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.1.json ;;
+		vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.7.json ;;
 	esac
 }
 
 do_build() {
-	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.1.json
+	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.7.json
 }
 do_install() {
 	vbin _build/bin/cabal

From 21c01fb249f18c567741640498dd30cc8f6587b9 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Mon, 25 Oct 2021 10:39:23 +0200
Subject: [PATCH 03/17] stack: bump for lts-18.14

This is the most recent stackage resolver for GHC 8.10.7.
---
 srcpkgs/stack/patches/SimpleRepo.patch | 18 ++++++++++++++++++
 srcpkgs/stack/template                 |  6 +++---
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/stack/patches/SimpleRepo.patch

diff --git a/srcpkgs/stack/patches/SimpleRepo.patch b/srcpkgs/stack/patches/SimpleRepo.patch
new file mode 100644
index 000000000000..df85d5b942be
--- /dev/null
+++ b/srcpkgs/stack/patches/SimpleRepo.patch
@@ -0,0 +1,18 @@
+--- a/src/Stack/Setup.hs
++++ b/src/Stack/Setup.hs
+@@ -837,9 +837,8 @@
+    if compilerTool `elem` installed
+      then return (compilerTool,CompilerBuildStandard)
+      else do
+-       let repo = Repo
+-            { repoCommit = commitId
+-            , repoUrl    = url
+-            , repoType   = RepoGit
+-            , repoSubdir = mempty
++       let repo = SimpleRepo
++            { sRepoCommit = commitId
++            , sRepoUrl    = url
++            , sRepoType   = RepoGit
+             }
+
+        -- clone the repository and execute the given commands
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index f9d573ef5bfd..d7015a5ddd1c 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
 version=2.7.3
-revision=1
-_stackage="lts-18.5"
+revision=2
+_stackage="lts-18.14"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -13,7 +13,7 @@ homepage="https://haskellstack.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
 checksum="47caf8818352c7f663eb0364f48b1f4d80832ae25c31ca483416a4b74c2c5b44
- 322bc85f38bf6726af6e588dde381d72f0c3e89970939b6a7b5b975cabd05d1a"
+ 78577c091074d78f9d6e09d6e31e7fc8ac2ddbb0dbc4ac65c606adcac4957d7f"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 3b204b20fef0f354e9af8c0ca551857b9c987f23 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 27 Oct 2021 19:01:39 +0200
Subject: [PATCH 04/17] ghc-bin: update to 8.10.7

---
 srcpkgs/ghc-bin/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index df74043ea188..dec19fef877c 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.10.4
+version=8.10.7
 revision=1
 archs="i686 x86_64* ppc64le*"
 wrksrc="ghc-${version%[!0-9]}"
@@ -16,16 +16,16 @@ 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-deb9-linux.tar.xz"
-	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
+	checksum=ced9870ea351af64fb48274b81a664cdb6a9266775f1598a79cbb6fdd5770a23
 	;;
 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=246485f18ceccaadaece6450ed7af46dd6b4d5d33e0b8dd1647c64dd8e50dc60
+	checksum=52f6492f39f13890f4ecd83784724ae9fff7a02fdc624a56c49872c912608a50
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
+	checksum=fbfc1ef194f4e7a4c0da8c11cc69b17458a4b928b609b3622c97acc4acd5c5ab
 	;;
 ppc64le)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz"

From 8b854c16c76cc258d913f7b09ab6946c45fb9890 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:05:38 +0200
Subject: [PATCH 05/17] kmonad: bump for ghc 8.10.7

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

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

From e0bcc19ea33210ec0cffd4194fd080791db09926 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:28:25 +0200
Subject: [PATCH 06/17] haskell-language-server: update to 1.4.0

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

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index ff0782a54ddb..0182c9b95757 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,16 +1,16 @@
 # Template file for 'haskell-language-server'
 pkgname=haskell-language-server
-version=1.3.0
+version=1.4.0
 revision=1
 build_style="haskell-stack"
-make_build_args="--stack-yaml stack-8.10.4.yaml"
+make_build_args="--stack-yaml stack-8.10.7.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>"
 license="Apache-2.0"
 homepage="https://github.com/haskell/haskell-language-server"
 distfiles="https://github.com/haskell/haskell-language-server/archive/${version}.tar.gz"
-checksum=9be31ead3fb1c0ca761de80185a23665dfe167457baaba642cf62885df98f6a1
+checksum=c5d7dbf7fae9aa3ed2c1184b49e82d8ac623ca786494ef6602cfe11735d28db0
 nopie_files="
  /usr/bin/haskell-language-server
  /usr/bin/haskell-language-server-wrapper

From 623eac023197a61937cd17780e993479f1617757 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:37:59 +0200
Subject: [PATCH 07/17] xmobar: bump for ghc 8.10.7

---
 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 52fd0e3e49fe..47544eb729d8 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-17.5
+resolver: lts-18.13
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 708899ad4e24..b97c9f268d68 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.39
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From 74397e2ee4926a5b3606f00754b6df8a378ce7f8 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:39:46 +0200
Subject: [PATCH 08/17] hledger: bump for ghc 8.10.7

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

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

From 2678b27dae7335bad3182e539f91be438549c079 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:40:29 +0200
Subject: [PATCH 09/17] hoogle: bump for ghc 8.10.7

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

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

From 7d883d3747553e8c891501735dad65d1a0e56bd3 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:41:54 +0200
Subject: [PATCH 10/17] hlint: bump for ghc 8.10.7

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

diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index fb30f947a452..fd72c1bbea58 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,9 +1,9 @@
 # Template file for 'hlint'
 pkgname=hlint
 version=3.2.7
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From ad013aedceb7f7551920a77d4c37f2bb1cf1a984 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:42:42 +0200
Subject: [PATCH 11/17] darcs: bump for ghc 8.10.7

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

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index f5ca6078ed75..5ae0f5313b8d 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,5 +1,7 @@
-resolver: lts-17.5
+resolver: lts-18.14
 packages:
 - .
 extra-deps:
 - graphviz-2999.20.1.0
+- constraints-0.12@sha256:7edf1e72a92d0a6761da634f08be9123dfcc0dcec11c269cbf465a09721c3481,2322
+- cryptonite-0.27@sha256:c3a9c8ce11e654a9d5bee827b089d4b50587272828d0c52a85362a58667a916c,18163
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index ddf0cdbb0d1b..f9fcac534d46 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.5
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From b488528bff608efa2676e1e6ac6ca366ee8860c0 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 2 Nov 2021 08:57:33 +0100
Subject: [PATCH 12/17] shellcheck: bump for ghc 8.10.7

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

diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 08e64456eda9..70eee6c2854b 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,9 +1,9 @@
 # Template file for 'shellcheck'
 pkgname=shellcheck
 version=0.8.0
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 hostmakedepends="pandoc"
 short_desc="Static analysis tool for shell scripts"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

From 626ec3a0d4ba36203b169766b7b74be7f8811d18 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 08:35:15 +0100
Subject: [PATCH 13/17] pandoc: bump for ghc 8.10.7

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

diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 0e487510497e..8628b1d1f3c2 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,14 +2,14 @@
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
 version=2.14.0.3
-revision=2
+revision=3
 _sidenote_version=0.20.0.0
 _monad_gen_version=0.3.0.1
 _crossref_version=0.3.12.2
 _roman_numerals_version=0.5.1.5
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-18.5"
+stackage="lts-18.14"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"

From 6ab1cdb9a7430e29ab06d6826f17f9470dd49278 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 19:17:39 +0100
Subject: [PATCH 14/17] cgrep: bump for ghc 8.10.7

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

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index c987e67725b0..e57106f3fa26 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,9 +1,9 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.7.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-18.6"
+stackage="lts-18.15"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
 maintainer="slotThe <soliditsallgood@mailbox.org>"

From f6f16fbf4a912c258d073d8c48b9272cc138b020 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 21:11:14 +0100
Subject: [PATCH 15/17] git-mediate: bump for ghc 8.10.7

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

diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template
index 971a6236224f..0c9ec10241e5 100644
--- a/srcpkgs/git-mediate/template
+++ b/srcpkgs/git-mediate/template
@@ -1,9 +1,9 @@
 # Template file for 'git-mediate'
 pkgname=git-mediate
 version=1.0.8.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 depends="git"
 short_desc="Tool to help resolving git conflicts"
 maintainer="Peter Wang <novalazy@gmail.com>"

From 8f189f3a7aca3443723020908059dadd8c066ba4 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 4 Nov 2021 09:34:26 +0100
Subject: [PATCH 16/17] debug-me: bump for ghc 8.10.7

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

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index ecff9d9d18f2..ad8b055bb33e 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - '.'
-resolver: lts-17.5
+resolver: lts-18.14
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 797c52f1f479..86ac0037311a 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=2
+revision=3
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"

From 5dc21a4ff677537032dccf5a51e3f56f2979a0f0 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 5 Nov 2021 07:22:52 +0100
Subject: [PATCH 17/17] git-annex: update to 8.20211028

---
 srcpkgs/git-annex/files/stack.yaml       | 32 ------------------------
 srcpkgs/git-annex/patches/ghc8.8.3.patch | 18 -------------
 srcpkgs/git-annex/template               |  6 ++---
 3 files changed, 3 insertions(+), 53 deletions(-)
 delete mode 100644 srcpkgs/git-annex/files/stack.yaml
 delete mode 100644 srcpkgs/git-annex/patches/ghc8.8.3.patch

diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
deleted file mode 100644
index 5d457bebde83..000000000000
--- a/srcpkgs/git-annex/files/stack.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-flags:
-  git-annex:
-    production: true
-    assistant: true
-    pairing: true
-    torrentparser: true
-    webapp: true
-    magicmime: false
-    dbus: false
-    debuglocks: false
-    benchmark: false
-    networkbsd: false
-    gitlfs: true
-    httpclientrestricted: true
-packages:
-- '.'
-extra-deps:
- - IfElse-0.85
- - aws-0.22
- - bloomfilter-2.0.1.0
- - filepath-bytestring-1.4.2.1.6
- - git-lfs-1.1.0
- - http-client-restricted-0.0.3
- - network-multicast-0.3.2
- - sandi-0.5
- - torrent-10000.1.1
- - bencode-0.6.1.1
- - network-3.1.0.1
-explicit-setup-deps:
-  git-annex: true
-resolver: lts-17.5
-allow-newer: true
diff --git a/srcpkgs/git-annex/patches/ghc8.8.3.patch b/srcpkgs/git-annex/patches/ghc8.8.3.patch
deleted file mode 100644
index 27a1739c1119..000000000000
--- a/srcpkgs/git-annex/patches/ghc8.8.3.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/git-annex.cabal	2020-04-01 21:09:23.653315424 +0200
-+++ b/git-annex.cabal	2020-04-01 20:50:23.080838029 +0200
-@@ -304,6 +304,7 @@
-   Build-Depends:
-    base (>= 4.11.1.0 && < 5.0),
-    network-uri (>= 2.6),
-+   network-bsd,
-    optparse-applicative (>= 0.14.1),
-    containers (>= 0.5.8),
-    exceptions (>= 0.6),
-@@ -404,3 +404,3 @@ if flag(NetworkBSD)
-     Build-Depends: network-bsd, network (>= 3.0.0.0)
-   else
--    Build-Depends: network (< 3.0.0.0), network (>= 2.6.3.0)
-+    Build-Depends: network (< 3.2.0.0), network (>= 2.6.3.0)
-
-   if flag(S3)
-     Build-Depends: aws (>= 0.20)
diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template
index cdcd6bb0f83c..1cf2ab14789f 100644
--- a/srcpkgs/git-annex/template
+++ b/srcpkgs/git-annex/template
@@ -1,10 +1,10 @@
 # Template file for 'git-annex'
 pkgname=git-annex
-version=8.20210330
+version=8.20211028
 revision=1
 build_style=haskell-stack
 makedepends="curl file-devel gnupg2 gnutls-devel gsasl-devel libxml2-devel
- lsof rsync git"
+ lsof rsync git ncurses-devel"
 # depends are utilities required by git-annex
 depends="git rsync curl lsof gnupg2"
 short_desc="Git addon for managing large files"
@@ -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=17109144b2aadfab79fa0e193df3e0c02fd80f738a5ed6eccb0d11692bedb01d
+checksum=cf5efe15e68d467daad673bec10037a27a78da7e4af9b4a85e10980bd90ace2d
 nopie_files="/usr/bin/git-annex"
 nocross=yes
 

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

* Re: [WIP] GHC 8.10.7
  2021-10-31 16:44 [PR PATCH] [WIP] GHC 8.10.7 slotThe
                   ` (16 preceding siblings ...)
  2022-03-05  6:51 ` [PR PATCH] [Updated] " slotThe
@ 2022-03-05  6:52 ` slotThe
  2022-03-11 13:43 ` [PR PATCH] [Closed]: " q66
  18 siblings, 0 replies; 20+ messages in thread
From: slotThe @ 2022-03-05  6:52 UTC (permalink / raw)
  To: ml

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

New comment by slotThe on void-packages repository

https://github.com/void-linux/void-packages/pull/33850#issuecomment-1059708466

Comment:
> can you rebase this? i will build it once that's done, and we can finally get it merged

Sorry for the delay; should be done now!

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

* Re: [PR PATCH] [Closed]: [WIP] GHC 8.10.7
  2021-10-31 16:44 [PR PATCH] [WIP] GHC 8.10.7 slotThe
                   ` (17 preceding siblings ...)
  2022-03-05  6:52 ` slotThe
@ 2022-03-11 13:43 ` q66
  18 siblings, 0 replies; 20+ messages in thread
From: q66 @ 2022-03-11 13:43 UTC (permalink / raw)
  To: ml

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

There's a closed pull request on the void-packages repository

[WIP] GHC 8.10.7
https://github.com/void-linux/void-packages/pull/33850

Description:
The 8.10.x release flood seems to have stopped; time for the fun part to begin!

- [x] ghc
- [ ] ghc-bin
    - [x] x86_64-musl (**Not uploaded to alpha.de yet** [Link](https://www.mediafire.com/file/i2385lbvjbmzx3l/ghc-8.10.7-x86_64-void-linux-musl.tar.xz/file))
    cc @q66 for the following
    - [ ] 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
- [x] debug-me
- [x] hlint
- [x] hoogle
- [x] darcs
- [x] shellcheck
- [x] git-annex
- [x] hledger
- [x] pandoc
- [x] xmobar
- [x] haskell-language-server

Other things to do:

- [x] Merge https://github.com/void-linux/void-packages/pull/33749

<!-- 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.)
- [ ] 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] 20+ messages in thread

end of thread, other threads:[~2022-03-11 13:43 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-31 16:44 [PR PATCH] [WIP] GHC 8.10.7 slotThe
2021-11-02  7:56 ` [PR PATCH] [Updated] " slotThe
2021-11-03 18:18 ` slotThe
2021-11-04 12:15 ` xaltsc
2021-11-05  6:23 ` [PR PATCH] [Updated] " slotThe
2021-11-05  6:26 ` slotThe
2021-11-08 19:11 ` Chocimier
2021-11-10 11:05 ` [PR PATCH] [Updated] " slotThe
2021-11-10 11:06 ` slotThe
2021-11-15 10:54 ` slotThe
2022-01-26 10:13 ` [PR PATCH] [Updated] " slotThe
2022-01-26 10:15 ` slotThe
2022-01-26 15:42 ` q66
2022-01-26 16:05 ` slotThe
2022-02-22 19:22 ` [PR PATCH] [Updated] " slotThe
2022-02-22 20:14 ` slotThe
2022-02-28 21:50 ` q66
2022-03-05  6:51 ` [PR PATCH] [Updated] " slotThe
2022-03-05  6:52 ` slotThe
2022-03-11 13:43 ` [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).