From: slotThe <slotThe@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] GHC 8.10.7
Date: Wed, 26 Jan 2022 11:13:55 +0100 [thread overview]
Message-ID: <20220126101355.u_D_OrTf3gVP_eBfhVSqRnW-ktCO0Pd0t_Fjw9B6NQY@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-33850@inbox.vuxu.org>
[-- 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
next prev parent reply other threads:[~2022-01-26 10:13 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-31 16:44 [PR PATCH] " 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 ` slotThe [this message]
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
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=20220126101355.u_D_OrTf3gVP_eBfhVSqRnW-ktCO0Pd0t_Fjw9B6NQY@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).