From: slotThe <slotThe@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] GHC 8.10.4
Date: Sat, 05 Jun 2021 17:07:51 +0200 [thread overview]
Message-ID: <20210605150751.v0NqnyNNX7IDBeRopyE9uvVeUGJdxbGlMSTZ3A7v18o@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29506@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 3253 bytes --]
There is an updated pull request by slotThe against master on the void-packages repository
https://github.com/slotThe/void-packages ghc-8.10.4
https://github.com/void-linux/void-packages/pull/29506
[WIP] GHC 8.10.4
It's that time of the year again!
- [X] ghc; I took over as maintainer here, @leahneukirchen said that was okay on IRC (cc'ing here to make sure)
- [ ] ghc-bin; took over as mainainer of orphaned package.
- [X] x86_64-musl; [Link here](https://www34.zippyshare.com/d/yvtjb7uJ/38780/ghc-8.10.4-x86_64-void-linux-musl.tar.xz)
- [ ] i686-musl [Cautious link](https://www42.zippyshare.com/d/wOOz0Zsx/29048/ghc-8.10.4-i386-unknown-linux.tar.xz) **WARNING**: I don't know if I did this correctly, so It'd be nice if someone could test this
cc @q66 for these
- [ ] ppc64le
- [ ] ppc64le-musl
- [X] cabal-install
- [X] stack
Rebuild literally every single haskell package we have and see if anything's broken:
- [x] git-mediate
- [x] kmonad
- [x] cgrep; took over as mainainer of orphaned package.
- [x] debug-me
- [x] hlint
- [x] hoogle
- [x] darcs
- [x] shellcheck
- [x] git-annex
- [x] hledger
- [x] pandoc
- [x] xmobar
- [x] HLS; this is #27961 once that's merged
For the following two I'd like to fix #6414 while we're at it. Because stack can't install libraries globally, this would involve either removing these packages entirely and advising users to install them in their own [stack or cabal projects](https://github.com/xmonad/xmonad-testing), or finding a way to build them with cabal and updating ghc's data base accordingly. This would probably use `v1` commands, as we don't want to nuke our users db if we update xmonad. Cc @xaltsc as the current maintainer and @chilledfrogs as someone who might want to tackle this (if I read the IRC discussion correctly).
- [ ] xmonad
- [ ] xmonad-contrib
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/29506.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghc-8.10.4-29506.patch --]
[-- Type: text/x-diff, Size: 37482 bytes --]
From 979f448407f627b68bea6f2fbc3045dc9ad848ab Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 31 Jan 2021 14:31:24 +0100
Subject: [PATCH 01/17] ghc: update to 8.10.4
The change of maintainership was okay-ed by Leah.
---
srcpkgs/ghc/patches/ppc64-be-elfv2.patch | 41 +++++++++++-------------
srcpkgs/ghc/template | 8 ++---
2 files changed, 23 insertions(+), 26 deletions(-)
diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index ac353ed417e5..c9bd2583abe0 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -85,7 +85,7 @@ index ec3c18a..0359be7 100644
+ in Right [ 0x3D800000 .|. hi16 w32,
+ 0x618C0000 .|. lo16 w32,
+ 0x7D8903A6, 0x4E800420 ]
-
+
ArchPPC64LE ->
-- The ABI requires r12 to point to the function's entry point.
diff --git a/rts/Adjustor.c b/rts/Adjustor.c
@@ -93,7 +93,7 @@ index d360cfe..ab7ede7 100644
--- a/rts/Adjustor.c
+++ b/rts/Adjustor.c
@@ -49,7 +49,7 @@ Haskell side.
-
+
#if defined(i386_HOST_ARCH)
extern void adjustorCode(void);
-#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
@@ -104,16 +104,16 @@ index d360cfe..ab7ede7 100644
@@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
extern void obscure_ccall_ret_code(void);
#endif
-
+
-#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
+#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
#if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
-
+
/* !!! !!! WARNING: !!! !!!
@@ -318,7 +318,7 @@ typedef struct AdjustorStub {
} AdjustorStub;
#endif
-
+
-#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
+#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
static int totalArgumentSize(char *typeString)
@@ -131,10 +131,10 @@ index d360cfe..ab7ede7 100644
@@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
}
}
-
+
-#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
+#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-
+
#define OP_LO(op,lo) ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
#define OP_HI(op,hi) ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
@@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
@@ -151,9 +151,9 @@ index 2795b83..63cfe91 100644
--- a/rts/AdjustorAsm.S
+++ b/rts/AdjustorAsm.S
@@ -2,7 +2,7 @@
-
+
/* ******************************** PowerPC ******************************** */
-
+
-#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
+#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
#if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
@@ -166,34 +166,31 @@ index 934926e..2ff8662 100644
@@ -717,7 +717,7 @@ StgRunIsImplementedInAssembler(void)
Everything is in assembler, so we don't have to deal with GCC...
-------------------------------------------------------------------------- */
-
+
-#if defined(powerpc64_HOST_ARCH)
+#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
-
+
static void GNUC3_ATTRIBUTE(used)
StgRunIsImplementedInAssembler(void)
@@ -842,7 +842,7 @@ StgRunIsImplementedInAssembler(void)
-
+
#endif
-
+
-#if defined(powerpc64le_HOST_ARCH)
+#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
/* -----------------------------------------------------------------------------
PowerPC 64 little endian architecture
-
+
diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
index 9274a44..3b4fc33 100644
--- a/rts/StgCRunAsm.S
+++ b/rts/StgCRunAsm.S
-@@ -1,7 +1,7 @@
- #include "ghcconfig.h"
- #include "rts/Constants.h"
-
+@@ -5,7 +5,7 @@
+ * then functions StgRun/StgReturn are implemented in file StgCRun.c */
+ #if !defined(USE_MINIINTERPRETER)
+
-#if defined(powerpc64le_HOST_ARCH)
+#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
- # ifdef linux_HOST_OS
+ # if defined(linux_HOST_OS)
# define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
.file "StgCRun.c"
---
-2.30.0
-
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 0b1440b2f6d9..c6acfa79e75d 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,8 +1,8 @@
# Template file for 'ghc'
pkgname=ghc
# Keep this synchronized with http://www.stackage.org/lts
-version=8.8.4
-revision=2
+version=8.10.4
+revision=1
wrksrc="ghc-${version%[!0-9]}"
build_style=gnu-configure
hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
@@ -10,11 +10,11 @@ hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel
makedepends="libnuma-devel"
depends="perl gcc libffi-devel gmp-devel libnuma-devel"
short_desc="Glorious Haskell Compiler"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
license="BSD-3-Clause"
homepage="http://www.haskell.org/ghc/"
distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d
+checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
patch_args="-Np1"
nocross=yes # this is conditionally unset for cross bindist
nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"
From 3e8a60c31ec002e4ae049d843424710d5c30143a Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 28 Feb 2021 18:34:26 +0100
Subject: [PATCH 02/17] cabal install: update to 3.4.0.0
---
.../patches/ghc-8.10.4-build.diff | 43 ++++++++++++++++++
srcpkgs/cabal-install/patches/ghc-8.8.4.patch | 45 -------------------
srcpkgs/cabal-install/template | 16 ++++---
3 files changed, 52 insertions(+), 52 deletions(-)
create mode 100644 srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
delete mode 100644 srcpkgs/cabal-install/patches/ghc-8.8.4.patch
diff --git a/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
new file mode 100644
index 000000000000..63965ca12d44
--- /dev/null
+++ b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
@@ -0,0 +1,43 @@
+--- bootstrap/linux-8.10.1.json 2021-02-20 11:28:17.000000000 +0100
++++ bootstrap/linux-8.10.1.json 2021-02-28 18:54:36.417761219 +0100
+@@ -14,7 +14,7 @@
+ },
+ {
+ "package": "base",
+- "version": "4.14.0.0"
++ "version": "4.14.1.0"
+ },
+ {
+ "package": "array",
+@@ -26,7 +26,7 @@
+ },
+ {
+ "package": "bytestring",
+- "version": "0.10.10.0"
++ "version": "0.10.12.0"
+ },
+ {
+ "package": "containers",
+@@ -62,7 +62,7 @@
+ },
+ {
+ "package": "text",
+- "version": "1.2.3.2"
++ "version": "1.2.4.1"
+ },
+ {
+ "package": "parsec",
+@@ -74,11 +74,11 @@
+ },
+ {
+ "package": "process",
+- "version": "1.6.8.2"
++ "version": "1.6.9.0"
+ },
+ {
+ "package": "ghc-boot-th",
+- "version": "8.10.1"
++ "version": "8.10.4"
+ },
+ {
+ "package": "template-haskell",
diff --git a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch b/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
deleted file mode 100644
index 1dd08f07fb44..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- bootstrap.sh 2001-09-09 03:46:40.000000000 +0200
-+++ bootstrap.sh 2020-09-12 15:29:54.913108294 +0200
-@@ -230,19 +230,19 @@
- # >= 0.2.* && < 0.6
- MTL_VER="2.2.2"; MTL_VER_REGEXP="[2]\."
- # >= 2.0 && < 3
--HTTP_VER="4000.3.12"; HTTP_VER_REGEXP="4000\.(2\.([5-9]|1[0-9]|2[0-9])|3\.?)"
-+HTTP_VER="4000.3.14"; HTTP_VER_REGEXP="4000\.(2\.([5-9]|1[0-9]|2[0-9])|3\.?)"
- # >= 4000.2.5 < 4000.4
--ZLIB_VER="0.6.2"; ZLIB_VER_REGEXP="(0\.5\.([3-9]|1[0-9])|0\.6)"
-+ZLIB_VER="0.6.2.1"; ZLIB_VER_REGEXP="(0\.5\.([3-9]|1[0-9])|0\.6)"
- # >= 0.5.3 && <= 0.7
--TIME_VER="1.9.1" TIME_VER_REGEXP="1\.[1-9]\.?"
-+TIME_VER="1.9.3" TIME_VER_REGEXP="1\.[1-9]\.?"
- # >= 1.1 && < 1.10
- RANDOM_VER="1.1" RANDOM_VER_REGEXP="1\.[01]\.?"
- # >= 1 && < 1.2
- STM_VER="2.4.5.0"; STM_VER_REGEXP="2\."
- # == 2.*
--HASHABLE_VER="1.2.7.0"; HASHABLE_VER_REGEXP="1\."
-+HASHABLE_VER="1.3.0.0"; HASHABLE_VER_REGEXP="1\."
- # 1.*
--ASYNC_VER="2.2.1"; ASYNC_VER_REGEXP="2\."
-+ASYNC_VER="2.2.2"; ASYNC_VER_REGEXP="2\."
- # 2.*
- BASE16_BYTESTRING_VER="0.1.1.6"; BASE16_BYTESTRING_VER_REGEXP="0\.1"
- # 0.1.*
-@@ -250,7 +250,7 @@
- # >=1.0
- CRYPTOHASH_SHA256_VER="0.11.101.0"; CRYPTOHASH_SHA256_VER_REGEXP="0\.11\.?"
- # 0.11.*
--RESOLV_VER="0.1.1.1"; RESOLV_VER_REGEXP="0\.1\.[1-9]"
-+RESOLV_VER="0.1.1.3"; RESOLV_VER_REGEXP="0\.1\.[1-9]"
- # >= 0.1.1 && < 0.2
- MINTTY_VER="0.1.2"; MINTTY_VER_REGEXP="0\.1\.?"
- # 0.1.*
-@@ -262,7 +262,7 @@
- # 0.0.*
- HACKAGE_SECURITY_VER="0.6.0.0"; HACKAGE_SECURITY_VER_REGEXP="0\.6\."
- # >= 0.7.0.0 && < 0.7
--TAR_VER="0.5.1.0"; TAR_VER_REGEXP="0\.5\.([1-9]|1[0-9]|0\.[3-9]|0\.1[0-9])\.?"
-+TAR_VER="0.5.1.1"; TAR_VER_REGEXP="0\.5\.([1-9]|1[0-9]|0\.[3-9]|0\.1[0-9])\.?"
- # >= 0.5.0.3 && < 0.6
- DIGEST_VER="0.0.1.2"; DIGEST_REGEXP="0\.0\.(1\.[2-9]|[2-9]\.?)"
- # >= 0.0.1.2 && < 0.1
diff --git a/srcpkgs/cabal-install/template b/srcpkgs/cabal-install/template
index 2c15789b1f9d..99ebb54427fe 100644
--- a/srcpkgs/cabal-install/template
+++ b/srcpkgs/cabal-install/template
@@ -1,24 +1,26 @@
# Template file for 'cabal-install'
pkgname=cabal-install
-version=3.2.0.0
+version=3.4.0.0
revision=1
+wrksrc=cabal-${pkgname}-${version}
hostmakedepends="ghc curl tar which"
-makedepends="gmp-devel libffi-devel zlib-devel"
+makedepends="gmp-devel libffi-devel zlib-devel python3"
depends="ghc"
short_desc="Command-line interface for Cabal and Hackage"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="https://hackage.haskell.org/package/cabal-install"
-distfiles="https://hackage.haskell.org/packages/archive/${pkgname}/${version}/${pkgname}-${version}.tar.gz"
-checksum=a0555e895aaf17ca08453fde8b19af96725da8398e027aa43a49c1658a600cb0
+distfiles="https://github.com/haskell/cabal/archive/${pkgname}-${version}.tar.gz"
+checksum=e4fbd5eb1d77400746a993679181f159aa415a37b931b26d67f5602f63ce971c
nopie_files="/usr/bin/cabal"
nocross=yes
do_build() {
- PREFIX=$PWD/build sh bootstrap.sh --jobs ${XBPS_MAKEJOBS} --user
+ PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.1.json
}
do_install() {
- vbin build/bin/cabal
- vman build/share/man/man1/cabal.1
+ vbin _build/bin/cabal
+ PREFIX=$PWD _build/bin/cabal man --raw > cabal.1
+ vman cabal.1
vlicense LICENSE
}
From 0b626a8c08b513edc28c59378cb93a0fab1f6b56 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 12:37:23 +0100
Subject: [PATCH 03/17] ghc-bin: update to 8.10.4
Take over maintainership of orphaned package.
---
srcpkgs/ghc-bin/template | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 9101601358b9..bf512350fd86 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,13 +1,13 @@
# Template file for 'ghc-bin'
pkgname=ghc-bin
-version=8.8.4
+version=8.10.4
revision=1
archs="i686* x86_64* ppc64le*"
wrksrc="ghc-${version%[!0-9]}"
hostmakedepends="perl libffi libnuma"
depends="ncurses perl gcc libffi-devel gmp-devel"
short_desc="Glorious Haskell Compiler - precompiled binaries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
license="BSD-3-Clause"
homepage="http://www.haskell.org/ghc/"
nostrip=yes
@@ -15,21 +15,21 @@ noshlibprovides=yes
conflicts="ghc>=0 ghc-doc>=0"
case "$XBPS_TARGET_MACHINE" in
x86_64)
- distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb8-linux.tar.xz"
- checksum=51a36892f1264744195274187298d13ac62bce2da86d4ddf76d8054ab90f2feb
+ distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
+ checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
;;
x86_64-musl)
# create with "make binary-dist"
distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
- checksum=779647d3f4e6e39da9e13b2559319ede76b4fff1107e4dc369a09aadeecad971
+ checksum=56e53f46ad53e6640753d608d01228528fca8ccec01b09bba6ad3b6890a18994
;;
i686)
distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
- checksum=43dd954910c9027694312cef0aabc7774d102d0422b7172802cfb72f7d5da3a0
+ checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
;;
i686-musl)
distfiles="https://distfiles.voidlinux.de/ghc-${version}-i386-unknown-linux-musl.tar.xz"
- checksum=8d84fbab62b3712bdcfb92f7d258a0d15d8295397d84b48716a3c625f09be782
+ checksum=05363642430c9c5f6368f0c1873c7521b75cf2eacd8c4a55e69939e685d4acdd
;;
ppc64le)
distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz"
From d44cf0eee82acd5b46d11f80c54b7d1026680f81 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 12 Mar 2021 15:11:29 +0100
Subject: [PATCH 04/17] stack: update to 2.7.1
---
srcpkgs/stack/patches/datakinds.patch | 14 ------
srcpkgs/stack/patches/ghc-8.8.4.patch | 70 ---------------------------
srcpkgs/stack/patches/ppc.patch | 25 +++++-----
srcpkgs/stack/template | 10 ++--
4 files changed, 18 insertions(+), 101 deletions(-)
delete mode 100644 srcpkgs/stack/patches/datakinds.patch
delete mode 100644 srcpkgs/stack/patches/ghc-8.8.4.patch
diff --git a/srcpkgs/stack/patches/datakinds.patch b/srcpkgs/stack/patches/datakinds.patch
deleted file mode 100644
index 1c06480515f7..000000000000
--- a/srcpkgs/stack/patches/datakinds.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Stack/Storage/User.hs 2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/User.hs 2020-12-06 20:51:06.632607164 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
---- src/Stack/Storage/Project.hs 2020-10-15 15:51:28.000000000 +0200
-+++ src/Stack/Storage/Project.hs 2020-12-06 21:55:21.349484738 +0100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DataKinds #-}
- {-# LANGUAGE DerivingStrategies #-}
- {-# LANGUAGE FlexibleInstances #-}
- {-# LANGUAGE GADTs #-}
diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch
deleted file mode 100644
index 6b55c176e150..000000000000
--- a/srcpkgs/stack/patches/ghc-8.8.4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- masterdir/builddir/stack-2.5.1/stack.cabal 2020-10-17 17:19:10.724179166 +0200
-+++ stack.cabal 2020-10-17 17:18:03.803498792 +0200
-@@ -234,6 +234,7 @@
- , base >=4.10 && <5
- , base64-bytestring
- , bytestring
-+ , base16-bytestring == 0.1.1.7
- , casa-client
- , casa-types
- , colour
-@@ -272,7 +273,7 @@
- , neat-interpolation
- , network-uri
- , open-browser
-- , optparse-applicative
-+ , optparse-applicative == 0.15.1.0
- , pantry >=0.5.1.3
- , path
- , path-io
-@@ -359,6 +360,7 @@
- , base >=4.10 && <5
- , base64-bytestring
- , bytestring
-+ , base16-bytestring == 0.1.1.7
- , casa-client
- , casa-types
- , colour
-@@ -396,7 +398,7 @@
- , neat-interpolation
- , network-uri
- , open-browser
-- , optparse-applicative
-+ , optparse-applicative == 0.15.1.0
- , pantry >=0.5.1.3
- , path
- , path-io
-@@ -480,6 +482,7 @@
- , base >=4.10 && <5
- , base64-bytestring
- , bytestring
-+ , base16-bytestring == 0.1.1.7
- , casa-client
- , casa-types
- , colour
-@@ -518,7 +521,7 @@
- , neat-interpolation
- , network-uri
- , open-browser
-- , optparse-applicative
-+ , optparse-applicative == 0.15.1.0
- , optparse-generic
- , pantry >=0.5.1.3
- , path
-@@ -609,6 +612,7 @@
- , base >=4.10 && <5
- , base64-bytestring
- , bytestring
-+ , base16-bytestring == 0.1.1.7
- , casa-client
- , casa-types
- , colour
-@@ -647,7 +651,7 @@
- , neat-interpolation
- , network-uri
- , open-browser
-- , optparse-applicative
-+ , optparse-applicative == 0.15.1.0
- , pantry >=0.5.1.3
- , path
- , path-io
diff --git a/srcpkgs/stack/patches/ppc.patch b/srcpkgs/stack/patches/ppc.patch
index 1b5bc191b47c..64ad365c47d2 100644
--- a/srcpkgs/stack/patches/ppc.patch
+++ b/srcpkgs/stack/patches/ppc.patch
@@ -1,13 +1,14 @@
--- src/Stack/Setup.hs
+++ src/Stack/Setup.hs
-@@ -95,5 +95,6 @@ import System.IO.Error (isPermissionError)
+@@ -91,6 +91,7 @@
import System.FilePath (searchPathSeparator)
import qualified System.FilePath as FP
import System.Permissions (setFileExecutable)
+import System.Endian (getSystemEndianness, Endianness (..))
import System.Uname (getRelease)
import Data.List.Split (splitOn)
-@@ -1264,4 +1265,9 @@ getOSKey platform =
+
+@@ -1241,6 +1242,11 @@
Platform X86_64 Cabal.Windows -> return "windows64"
Platform Arm Cabal.Linux -> return "linux-armv7"
Platform AArch64 Cabal.Linux -> return "linux-aarch64"
@@ -16,16 +17,16 @@
+ case getSystemEndianness of
+ LittleEndian -> return "linux-powerpc64le"
+ BigEndian -> return "linux-powerpc64"
+ Platform Sparc Cabal.Linux -> return "linux-sparc"
Platform arch os -> throwM $ UnsupportedSetupCombo os arch
-
- downloadFromInfo
+
--- stack.cabal
+++ stack.cabal
-@@ -235,6 +235,7 @@ library
- , conduit
- , conduit-extra
- , containers
-+ , cpu >=0.1.2
- , cryptonite
- , cryptonite-conduit
- , deepseq
+@@ -246,6 +246,7 @@
+ conduit >=1.3.4.1,
+ conduit-extra >=1.3.5,
+ containers >=0.6.2.1,
++ cpu >=0.1.2,
+ cryptonite >=0.27,
+ cryptonite-conduit >=0.2.2,
+ deepseq >=1.4.4.0,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 257aba10e50d..b95bf9ec59e9 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
# Template file for 'stack'
pkgname=stack
-version=2.5.1
+version=2.7.1
revision=1
-_stackage="lts-16.13"
+_stackage="lts-17.5"
hostmakedepends="cabal-install pkg-config unzip"
makedepends="zlib-devel pcre-devel"
depends="git gmp-devel iana-etc"
@@ -10,10 +10,10 @@ short_desc="Cross-platform program for developing Haskell projects"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="https://haskellstack.org"
-distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
+distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076
- b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58"
+checksum="605bd8368b6fef9323ea71b79b08dd62270c49089a86b79fe67355f6b82cbc26
+ d03bee7e51bbdec5053573f94f644a6baeb140cdd95dbe47261e03c04306b252"
skip_extraction="cabal.config-${_stackage}"
nocross=yes
nopie_files="/usr/bin/stack"
From 19f4e832405b55344dc468aa7df24899f4dc7b7e Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 16 Mar 2021 17:41:58 +0100
Subject: [PATCH 05/17] xmobar: bump for ghc 8.10.4
---
srcpkgs/xmobar/files/stack.yaml | 2 +-
srcpkgs/xmobar/template | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 7bc4bf189d23..52fd0e3e49fe 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.13
+resolver: lts-17.5
packages:
- .
extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 81ae92fd2940..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
# Template file for 'xmobar'
pkgname=xmobar
version=0.37
-revision=1
+revision=2
build_style=haskell-stack
hostmakedepends="pkg-config"
makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
From 0e075bc53e4dd951d5c74cfc59d7c97b4746229a Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:03:10 +0100
Subject: [PATCH 06/17] hlint: update to 3.2.7
---
srcpkgs/hlint/files/stack.yaml | 7 -------
srcpkgs/hlint/patches/data.patch | 10 ++++------
srcpkgs/hlint/template | 10 +++++-----
3 files changed, 9 insertions(+), 18 deletions(-)
delete mode 100644 srcpkgs/hlint/files/stack.yaml
diff --git a/srcpkgs/hlint/files/stack.yaml b/srcpkgs/hlint/files/stack.yaml
deleted file mode 100644
index 12aead6562c5..000000000000
--- a/srcpkgs/hlint/files/stack.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-resolver: lts-16.13
-packages: [.]
-extra-deps:
- - ghc-lib-parser-8.8.4.20200716
- - ghc-lib-parser-ex-8.8.5.8
-ghc-options:
- "$locals": -Wunused-imports -Worphans -Wunused-top-binds -Wunused-local-binds -Wincomplete-patterns
diff --git a/srcpkgs/hlint/patches/data.patch b/srcpkgs/hlint/patches/data.patch
index bdfac204f477..c73b376e5df7 100644
--- a/srcpkgs/hlint/patches/data.patch
+++ b/srcpkgs/hlint/patches/data.patch
@@ -1,13 +1,11 @@
-diff --git src/CmdLine.hs src/CmdLine.hs
-index 8c3d530..ccf7aac 100644
--- src/CmdLine.hs
+++ src/CmdLine.hs
-@@ -52,7 +52,7 @@ automatic cmd = case cmd of
+@@ -58,7 +58,7 @@
b <- doesDirectoryExist x
- if b then return cmd{cmdDataDir=x} else do
+ if b then pure cmd{cmdDataDir=x} else do
exe <- getExecutablePath
-- return cmd{cmdDataDir = takeDirectory exe </> "data"}
-+ return cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
+- pure cmd{cmdDataDir = takeDirectory exe </> "data"}
++ pure cmd{cmdDataDir = takeDirectory exe </> "../share/hlint/data"}
git cmd
| cmdGit cmd = do
mgit <- findExecutable "git"
diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index 16fbb03ce2b9..fb30f947a452 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,16 +1,16 @@
# Template file for 'hlint'
pkgname=hlint
-version=2.2.11
-revision=2
+version=3.2.7
+revision=1
build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
makedepends="ncurses-devel"
short_desc="Haskell source code suggestions"
maintainer="Inokentiy Babushkin <twk@twki.de>"
license="BSD-3-Clause"
-homepage="https://github.com/ndmitchell/${pkgname}"
+homepage="https://github.com/ndmitchell/hlint"
distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=207539d3627efd3caed9e6fd3b1aeb8f1eb64553f1f9f166090adbf2fb71e172
+checksum=fcdeefcc79a52206add44b409abcab48c5fe2adff9d5aff077acbc43c702b54e
nocross=yes # Can't yet cross compile Haskell
nopie_files="/usr/bin/hlint"
From 3b7c9d0faf6aad627e1d409a19156378f53266d4 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 15:43:37 +0100
Subject: [PATCH 07/17] kmonad: bump for ghc 8.10.4
---
srcpkgs/kmonad/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index 13e8845581ae..8c34a920ba7d 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,9 +1,9 @@
# Template file for 'kmonad'
pkgname=kmonad
version=0.4.1
-revision=1
+revision=2
build_style=haskell-stack
-stackage=lts-16.13
+stackage=lts-17.5
short_desc="Keyboard remapping utility providing qmk-like functionality"
maintainer="slotThe <soliditsallgood@mailbox.org>"
license="MIT"
From 240e207f423cd33ef08d5018e3757fb394d4c630 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 17 Mar 2021 16:21:35 +0100
Subject: [PATCH 08/17] hoogle: bump for ghc 8.10.4
---
srcpkgs/hoogle/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 4305ac4ae6e8..eafda8747cdf 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,9 +1,9 @@
# Template file for 'hoogle'
pkgname=hoogle
version=5.0.18.1
-revision=1
+revision=2
build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
makedepends="zlib-devel"
short_desc="Haskell API search engine"
maintainer="Inokentiy Babushkin <twk@twki.de>"
From f58d67fa0890447bec49db9351f737ff6d2a3cd8 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 11:18:37 +0100
Subject: [PATCH 09/17] cgrep: bump for ghc 8.10.4
---
srcpkgs/cgrep/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index 7b4047614a71..15eda3bafd0e 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,12 +1,12 @@
# Template file for 'cgrep'
pkgname=cgrep
version=6.6.33
-revision=1
+revision=2
build_style=haskell-stack
-stackage="lts-16.18"
+stackage="lts-17.5"
makedepends="pcre-devel pkg-config"
short_desc="Context-aware grep for source codes"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
license="GPL-2.0-or-later"
homepage="https://awgn.github.io/cgrep/"
distfiles="https://github.com/awgn/${pkgname}/archive/v${version}.tar.gz"
From d9e1afff965a75a100c760a7969939499066b387 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 19 Mar 2021 15:03:05 +0100
Subject: [PATCH 10/17] debug-me: bump for ghc 8.10.4
---
srcpkgs/debug-me/files/stack.yaml | 2 +-
.../patches/{ghc8.8.3.patch => ghc8.10.4.patch} | 11 +++++++++++
srcpkgs/debug-me/template | 2 +-
3 files changed, 13 insertions(+), 2 deletions(-)
rename srcpkgs/debug-me/patches/{ghc8.8.3.patch => ghc8.10.4.patch} (70%)
diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index 9c88cea9ab3c..ecff9d9d18f2 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
packages:
- '.'
-resolver: lts-16.13
+resolver: lts-17.5
extra-deps:
- posix-pty-0.2.1.1
- graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/patches/ghc8.8.3.patch b/srcpkgs/debug-me/patches/ghc8.10.4.patch
similarity index 70%
rename from srcpkgs/debug-me/patches/ghc8.8.3.patch
rename to srcpkgs/debug-me/patches/ghc8.10.4.patch
index f1779331c5a9..9cc19db63be3 100644
--- a/srcpkgs/debug-me/patches/ghc8.8.3.patch
+++ b/srcpkgs/debug-me/patches/ghc8.10.4.patch
@@ -20,3 +20,14 @@
defaultSettings
checkEnv :: ServerOpts -> IO ServerOpts
+--- debug-me.cabal
++++ debug-me.cabal
+@@ -64,7 +64,7 @@
+ , stm-chans (>= 3.0)
+ , posix-pty (>= 0.2.1)
+ , terminal-size (>= 0.3)
+- , aeson (>= 0.11 && < 1.5)
++ , aeson (>= 0.11 && < 1.6)
+ , sandi (>= 0.4)
+ , text (>= 1.2.2)
+ , optparse-applicative (>= 0.12)
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 3df514e0be48..797c52f1f479 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -1,7 +1,7 @@
# Template file for 'debug-me'
pkgname=debug-me
version=1.20200820
-revision=1
+revision=2
build_style=haskell-stack
makedepends="zlib-devel"
short_desc="Secure remote debugging"
From 9632172e77c05292d7171f50facbdc760969aa3a Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 20 Mar 2021 11:26:04 +0100
Subject: [PATCH 11/17] darcs: bump for ghc 8.10.4
---
srcpkgs/darcs/files/stack.yaml | 2 +-
srcpkgs/darcs/template | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index 41b5f081bd71..f5ca6078ed75 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.31
+resolver: lts-17.5
packages:
- .
extra-deps:
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index 42a29eb6872c..e6baa7c3354a 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
# Template file for 'darcs'
pkgname=darcs
version=2.16.4
-revision=1
+revision=2
build_style=haskell-stack
hostmakedepends="unzip"
makedepends="zlib-devel libcurl-devel ncurses-devel"
From 798bf87434bd3b4de7ddab001b12ffcd9ae36b90 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 08:56:29 +0100
Subject: [PATCH 12/17] hledger: bump for ghc 8.10.4
---
srcpkgs/hledger/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template
index b34e8ccd4652..1727a49252b7 100644
--- a/srcpkgs/hledger/template
+++ b/srcpkgs/hledger/template
@@ -1,7 +1,7 @@
# Template file for 'hledger'
pkgname=hledger
version=1.21
-revision=1
+revision=2
build_style=haskell-stack
makedepends="zlib-devel ncurses-devel"
short_desc="Simple, precise, plain text accounting"
From 6398942278229727fd13c53dc6c02cd910a1f584 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 10:57:42 +0100
Subject: [PATCH 13/17] pandoc: bump for ghc 8.10.4
Citeproc support is build in now. The change of maintainership was
suggested by Leah.
---
srcpkgs/pandoc/files/stack.yaml | 23 -----------------------
srcpkgs/pandoc/template | 5 +++--
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/pandoc/files/stack.yaml
diff --git a/srcpkgs/pandoc/files/stack.yaml b/srcpkgs/pandoc/files/stack.yaml
deleted file mode 100644
index 82a5fcaded3f..000000000000
--- a/srcpkgs/pandoc/files/stack.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-resolver: lts-17.9
-
-packages:
- - ./pandoc-2.11.4
- - ./pandoc-sidenote-0.20.0
-
-flags:
- pandoc:
- trypandoc: false
- embed_data_files: true
-
-extra-deps:
- - pandoc-types-1.22
- - haddock-library-1.9.0
- - regex-pcre-builtin-0.95.2.3.8.43
- - hslua-1.2.0
- - jira-wiki-markup-1.3.4
- - commonmark-0.1.1.4
- - commonmark-extensions-0.2.0.4
- - commonmark-pandoc-0.2.0.1
-
-ghc-options:
- "$locals": -fhide-source-paths -Wno-missing-home-modules
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index ad233dd0aaf3..8f2a9952d847 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,18 +2,19 @@
pkgname=pandoc
# Keep in sync with http://www.stackage.org/lts
version=2.11.4
-revision=1
+revision=2
_sidenote_version=0.20.0
_monad_gen_version=0.3.0.1
create_wrksrc=yes
build_style=haskell-stack
+stackage="lts-17.5"
make_build_args="
--flag pandoc:embed_data_files --flag=hslua:system-lua
--flag=hslua:pkg-config"
hostmakedepends="pkg-config unzip wget"
makedepends="zlib-devel lua53-devel tar"
short_desc="Universal converter between markup formats"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
license="GPL-2.0-or-later, BSD-3-Clause, MIT"
homepage="http://johnmacfarlane.net/pandoc/"
distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
From 3195f1a2c431a996224352eeb42153bf91d06b90 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 11:16:14 +0100
Subject: [PATCH 14/17] shellcheck: bump for ghc 8.10.4
---
srcpkgs/shellcheck/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 33381c2dac8f..76d479a12fca 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,9 +1,9 @@
# Template file for 'shellcheck'
pkgname=shellcheck
version=0.7.2
-revision=1
+revision=2
build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
hostmakedepends="pandoc"
short_desc="Static analysis tool for shell scripts"
maintainer="Diogo Leal <diogo@diogoleal.com>"
From da52eadf4c8f8d72fa6f8f9aeaf99dd52b8bb67e Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 16:07:47 +0100
Subject: [PATCH 15/17] git-mediate: update to 1.0.8.1
---
srcpkgs/git-mediate/patches/ghc8.8.3.patch | 19 -------------------
srcpkgs/git-mediate/template | 8 ++++----
2 files changed, 4 insertions(+), 23 deletions(-)
delete mode 100644 srcpkgs/git-mediate/patches/ghc8.8.3.patch
diff --git a/srcpkgs/git-mediate/patches/ghc8.8.3.patch b/srcpkgs/git-mediate/patches/ghc8.8.3.patch
deleted file mode 100644
index 7928b61ef3a4..000000000000
--- a/srcpkgs/git-mediate/patches/ghc8.8.3.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- git-mediate.cabal 2001-09-09 03:46:40.000000000 +0200
-+++ git-mediate.cabal 2020-03-30 15:32:48.959537620 +0200
-@@ -72,7 +72,7 @@
- ghc-options: -O2 -Wall
- -- other-extensions:
- build-depends: base >=4.8 && <5
-- , base-compat >= 0.8.2 && < 0.11
-+ , base-compat >= 0.8.2 && < 0.12
- , mtl >=2.1
- , directory >=1.2
- , process >=1.2
-@@ -80,6 +80,6 @@
- , unix-compat >=0.4.2.0
- , Diff >=0.4
- , ansi-terminal >=0.6.2
-- , optparse-applicative >=0.11 && <0.15
-+ , optparse-applicative >=0.11 && <0.16
- hs-source-dirs: src
- default-language: Haskell2010
diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template
index aa3979d3435a..971a6236224f 100644
--- a/srcpkgs/git-mediate/template
+++ b/srcpkgs/git-mediate/template
@@ -1,15 +1,15 @@
# Template file for 'git-mediate'
pkgname=git-mediate
-version=1.0.8
-revision=4
+version=1.0.8.1
+revision=1
build_style=haskell-stack
-stackage="lts-16.13"
+stackage="lts-17.5"
depends="git"
short_desc="Tool to help resolving git conflicts"
maintainer="Peter Wang <novalazy@gmail.com>"
license="GPL-2.0-only"
homepage="https://github.com/Peaker/git-mediate"
distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=81220f7e20a3913bc147b69681666ad22e60e5b759a1becad78ee28dcad8013d
+checksum=ee44841d37ded70cbcd8edd1e233a344d0118295e0bd2f0c6983ed00f619c467
nocross=yes
nopie_files="/usr/bin/git-mediate"
From 94281b52e62893961128d32da2428267a14c4448 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 25 Mar 2021 16:11:25 +0100
Subject: [PATCH 16/17] git-annex: bump for ghc 8.10.4
---
srcpkgs/git-annex/files/stack.yaml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
index a6d4f6aeee64..5d457bebde83 100644
--- a/srcpkgs/git-annex/files/stack.yaml
+++ b/srcpkgs/git-annex/files/stack.yaml
@@ -28,4 +28,5 @@ extra-deps:
- network-3.1.0.1
explicit-setup-deps:
git-annex: true
-resolver: lts-16.27
+resolver: lts-17.5
+allow-newer: true
From ae904c89d2f243325cef3d863e3655ecc97934c9 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 30 Mar 2021 12:11:45 +0200
Subject: [PATCH 17/17] haskell-language-server: bump for ghc 8.10.4
---
srcpkgs/haskell-language-server/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index 438c760f0a1f..7afa89c452f7 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,12 +1,12 @@
# Template file for 'haskell-language-server'
pkgname=haskell-language-server
version=1.0.0
-revision=1
+revision=2
# GHC only panics on i686
# https://github.com/void-linux/void-packages/pull/27961/checks?check_run_id=2181519625#step:8:5936
archs="~i686"
build_style="haskell-stack"
-make_build_args="--stack-yaml stack-8.8.4.yaml"
+make_build_args="--stack-yaml stack-8.10.4.yaml"
makedepends="ncurses-devel ncurses-libtinfo-devel icu-devel zlib-devel"
short_desc="Integration of ghcide and haskell-ide-engine"
maintainer="Wayne Van Son <waynevanson@gmail.com>"
next prev parent reply other threads:[~2021-06-05 15:07 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-16 10:48 [PR PATCH] " slotThe
2021-03-16 16:44 ` [PR PATCH] [Updated] " slotThe
2021-03-16 17:23 ` slotThe
2021-03-17 17:00 ` leahneukirchen
2021-03-18 7:47 ` [PR PATCH] [Updated] " slotThe
2021-03-18 8:09 ` slotThe
2021-03-19 14:08 ` slotThe
2021-03-20 13:03 ` slotThe
2021-03-25 7:57 ` slotThe
2021-03-25 7:58 ` slotThe
2021-03-25 7:59 ` slotThe
2021-03-25 8:02 ` slotThe
2021-03-25 10:16 ` slotThe
2021-03-25 16:44 ` slotThe
2021-03-30 10:12 ` slotThe
2021-03-30 15:22 ` leahneukirchen
2021-04-01 12:20 ` [PR PATCH] [Updated] " slotThe
2021-04-13 11:04 ` slotThe
2021-04-21 8:04 ` slotThe
2021-04-22 5:44 ` slotThe
2021-04-22 19:42 ` mobinmob
2021-04-22 19:42 ` mobinmob
2021-04-27 8:02 ` slotThe
2021-04-28 7:42 ` [PR PATCH] [Updated] " slotThe
2021-04-30 22:58 ` q66
2021-05-20 15:30 ` slotThe
2021-05-20 17:32 ` q66
2021-05-20 17:53 ` [PR PATCH] [Updated] " slotThe
2021-06-05 15:07 ` slotThe [this message]
2021-06-07 7:35 ` slotThe
2021-06-07 10:40 ` Johnnynator
2021-06-07 11:11 ` [PR PATCH] [Updated] " slotThe
2021-06-07 11:12 ` slotThe
2021-06-07 13:23 ` leahneukirchen
2021-06-16 18:45 ` [PR PATCH] [Updated] " slotThe
2021-06-16 18:45 ` slotThe
2021-06-24 6:44 ` [PR PATCH] [Updated] " slotThe
2021-06-24 6:46 ` slotThe
2021-07-04 23:10 ` q66
2021-07-27 10:47 ` [PR PATCH] [Closed]: " q66
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210605150751.v0NqnyNNX7IDBeRopyE9uvVeUGJdxbGlMSTZ3A7v18o@z \
--to=slotthe@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).