Github messages for voidlinux
 help / color / mirror / Atom feed
From: slotThe <slotThe@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] GHC 8.8.4
Date: Tue, 20 Oct 2020 17:28:04 +0200	[thread overview]
Message-ID: <20201020152804.BEcFKNcKF0q3PHgOv3bjCrvLE7E1gu_hL2EuA1wNw1Y@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24852@inbox.vuxu.org>

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

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

https://github.com/slotThe/void-packages ghc-8.8.4
https://github.com/void-linux/void-packages/pull/24852

[WIP] GHC 8.8.4
Minor version bump in order to keep in sync with the stackage lts resolver.  *Should* go smoothly.

- [X] ghc
- [x] ghc-bin
    - [X] musl
    - [x] ppc64le
    - [ ] upload
- [X] cabal-install
- [X] stack
 
Rebuild literally every single haskell package we have and see if anything's broken:

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

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

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

From 7fb4862558ed8feb36efb9eddfbbc9d7860b2f35 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 12 Sep 2020 14:48:44 +0200
Subject: [PATCH 01/18] ghc: update to 8.8.4

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

diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index e81da479cf0..cc26f3264cc 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.8.3
+version=8.8.4
 revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.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=e0dcc0aaf3e234c5978f29e6df62947e97720ab404ec0158343df211c5480f89
+checksum=f0505e38b2235ff9f1090b51f44d6c8efd371068e5a6bb42a2a6d8b67b5ffc2d
 patch_args="-Np1"
 nocross=yes  # ask leah2 before wasting time trying to do that
 nodebug=yes  # Work around assembler error "Fatal error: duplicate .debug_line sections"

From ed12bde01815473e2fb153ec4dc126bc1d7381b8 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 12 Sep 2020 16:19:38 +0200
Subject: [PATCH 02/18] cabal-install: update to 3.2.0.0

---
 .../{ghc-8.8.3.patch => ghc-8.8.4.patch}      | 40 +++----------------
 srcpkgs/cabal-install/patches/http.patch      | 36 -----------------
 srcpkgs/cabal-install/template                |  5 +--
 3 files changed, 8 insertions(+), 73 deletions(-)
 rename srcpkgs/cabal-install/patches/{ghc-8.8.3.patch => ghc-8.8.4.patch} (53%)
 delete mode 100644 srcpkgs/cabal-install/patches/http.patch

diff --git a/srcpkgs/cabal-install/patches/ghc-8.8.3.patch b/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
similarity index 53%
rename from srcpkgs/cabal-install/patches/ghc-8.8.3.patch
rename to srcpkgs/cabal-install/patches/ghc-8.8.4.patch
index 137e502c371..1dd08f07fb4 100644
--- a/srcpkgs/cabal-install/patches/ghc-8.8.3.patch
+++ b/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
@@ -1,5 +1,5 @@
---- bootstrap.sh	2020-03-20 16:17:36.454442784 +0100
-+++ bootstrap.sh	2020-03-20 16:25:42.608415294 +0100
+--- 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]\."
@@ -8,7 +8,7 @@
 +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)"
++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]\.?"
@@ -34,40 +34,12 @@
                         # >= 0.1.1 && < 0.2
  MINTTY_VER="0.1.2";    MINTTY_VER_REGEXP="0\.1\.?"
                         # 0.1.*
-@@ -260,14 +260,14 @@
-                        # 0.2.2.*
- ED25519_VER="0.0.5.0"; ED25519_VER_REGEXP="0\.0\.?"
+@@ -262,7 +262,7 @@
                         # 0.0.*
--HACKAGE_SECURITY_VER="0.5.3.0"; HACKAGE_SECURITY_VER_REGEXP="0\.5\.((2\.[2-9]|[3-9])|3)"
--                       # >= 0.5.2 && < 0.6
-+HACKAGE_SECURITY_VER="0.6.0.0"; HACKAGE_SECURITY_VER_REGEXP="0\.6\."
-+                       # >= 0.6.*
+ 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
--ZIP_ARCHIVE_VER="0.3.3"; ZIP_ARCHIVE_REGEXP="0\.3\.[3-9]"
--                       # >= 0.3.3 && < 0.4
-+LUKKO_VER="0.1.1";     LUKKO_VER_REGEXP="0\.1\.[1-9]"
-+                       # >= 0.1.1 && <0.2
-
- HACKAGE_URL="https://hackage.haskell.org/package"
-
-@@ -471,7 +471,7 @@
- info_pkg "ed25519"           ${ED25519_VER}          ${ED25519_VER_REGEXP}
- info_pkg "tar"               ${TAR_VER}              ${TAR_VER_REGEXP}
- info_pkg "digest"            ${DIGEST_VER}           ${DIGEST_REGEXP}
--info_pkg "zip-archive"       ${ZIP_ARCHIVE_VER}      ${ZIP_ARCHIVE_REGEXP}
-+info_pkg "lukko"        ${LUKKO_VER}   ${LUKKO_REGEXP}
- info_pkg "hackage-security"  ${HACKAGE_SECURITY_VER} \
-     ${HACKAGE_SECURITY_VER_REGEXP}
-
-@@ -509,7 +509,7 @@
- do_pkg   "ed25519"           ${ED25519_VER}          ${ED25519_VER_REGEXP}
- do_pkg   "tar"               ${TAR_VER}              ${TAR_VER_REGEXP}
- do_pkg   "digest"            ${DIGEST_VER}           ${DIGEST_REGEXP}
--do_pkg   "zip-archive"       ${ZIP_ARCHIVE_VER}      ${ZIP_ARCHIVE_REGEXP}
-+do_pkg   "lukko"       ${LUKKO_VER}      ${LUKKO_REGEXP}
- do_pkg   "hackage-security"  ${HACKAGE_SECURITY_VER} \
-     ${HACKAGE_SECURITY_VER_REGEXP}
diff --git a/srcpkgs/cabal-install/patches/http.patch b/srcpkgs/cabal-install/patches/http.patch
deleted file mode 100644
index 9f4688b1a6a..00000000000
--- a/srcpkgs/cabal-install/patches/http.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- Distribution/Client/Security/HTTP.hs
-+++ Distribution/Client/Security/HTTP.hs
-@@ -35,7 +35,6 @@ import Hackage.Security.Client
- import Hackage.Security.Client.Repository.HttpLib
- import Hackage.Security.Util.Checked
- import Hackage.Security.Util.Pretty
--import qualified Hackage.Security.Util.Lens as Lens
-
- {-------------------------------------------------------------------------------
-   'HttpLib' implementation
-@@ -142,7 +141,14 @@ mkReqHeaders reqHeaders mRange = concat [
-     finalize (name, strs) = [HTTP.Header name (intercalate ", " (reverse strs))]
-
-     insert :: Eq a => a -> [b] -> [(a, [b])] -> [(a, [b])]
--    insert x y = Lens.modify (Lens.lookupM x) (++ y)
-+    insert x y = modifyAssocList x (++ y)
-+
-+    -- modify the first maching element
-+    modifyAssocList :: Eq a => a -> (b -> b) -> [(a, b)] -> [(a, b)]
-+    modifyAssocList a f = go where
-+        go []                         = []
-+        go (p@(a', b) : xs) | a == a'   = (a', f b) : xs
-+                            | otherwise = p         : go xs
-
- {-------------------------------------------------------------------------------
-   Custom exceptions
---- cabal-install.cabal
-+++ cabal-install.cabal
-@@ -336,7 +336,7 @@ executable cabal
-         time       >= 1.5.0.1  && < 1.10,
-         transformers >= 0.4.2.0 && < 0.6,
-         zlib       >= 0.5.3    && < 0.7,
--        hackage-security >= 0.5.2.2 && < 0.6,
-+        hackage-security >= 0.6.0.0 && < 0.7,
-         text       >= 1.2.3    && < 1.3,
-         parsec     >= 3.1.13.0 && < 3.2
diff --git a/srcpkgs/cabal-install/template b/srcpkgs/cabal-install/template
index da48df214f1..3a96f8669c1 100644
--- a/srcpkgs/cabal-install/template
+++ b/srcpkgs/cabal-install/template
@@ -1,6 +1,6 @@
 # Template file for 'cabal-install'
 pkgname=cabal-install
-version=3.0.0.0
+version=3.2.0.0
 revision=1
 hostmakedepends="ghc curl tar which"
 makedepends="gmp-devel libffi-devel zlib-devel"
@@ -10,11 +10,10 @@ 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=a432a7853afe96c0fd80f434bd80274601331d8c46b628cd19a0d8e96212aaf1
+checksum=a0555e895aaf17ca08453fde8b19af96725da8398e027aa43a49c1658a600cb0
 nopie_files="/usr/bin/cabal"
 
 do_build() {
-	vsed -e 's/< *4/<5/' -i $pkgname.cabal
 	PREFIX=$PWD/build sh bootstrap.sh --user
 }
 do_install() {

From 8ae70ed4c500465b6c5ae0304f83145b965a11e4 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 17 Oct 2020 19:33:19 +0200
Subject: [PATCH 03/18] stack: update to 2.5.1

---
 srcpkgs/stack/patches/ghc-8.8.4.patch | 70 +++++++++++++++++++++++++++
 srcpkgs/stack/template                | 10 ++--
 2 files changed, 75 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/stack/patches/ghc-8.8.4.patch

diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch
new file mode 100644
index 00000000000..6b55c176e15
--- /dev/null
+++ b/srcpkgs/stack/patches/ghc-8.8.4.patch
@@ -0,0 +1,70 @@
+--- 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/template b/srcpkgs/stack/template
index d33a2404a8f..257aba10e50 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.3.1
+version=2.5.1
 revision=1
-_stackage="lts-15.4"
+_stackage="lts-16.13"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -12,15 +12,15 @@ license="BSD-3-Clause"
 homepage="https://haskellstack.org"
 distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="6701ddfc6d0be0c2bf0f75c84375e41923c5617f04222c5e582e7011c7f8fb83
- 4147e6738cf6ef38cfd48048ef0992fb00e786068592e359fdb804e3d9ed4781"
+checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076
+ b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"
 
 do_build() {
 	cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/cabal.config-${_stackage} cabal.config
-	HOME=$PWD cabal update 'hackage.haskell.org,2020-04-29T20:25:58Z'
+	HOME=$PWD cabal update
 	HOME=$PWD cabal new-build ${makejobs} --flag disable-git-info
 }
 

From 2f03abccd93c9cdc8ccad4d111fab201dc824185 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 12 Sep 2020 20:02:07 +0200
Subject: [PATCH 04/18] kmonad: update to 0.4.1

---
 srcpkgs/kmonad/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index cdd2f000cef..13e8845581a 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,15 +1,15 @@
 # Template file for 'kmonad'
 pkgname=kmonad
-version=0.3.0
-revision=3
+version=0.4.1
+revision=1
 build_style=haskell-stack
-stackage=lts-15.4
+stackage=lts-16.13
 short_desc="Keyboard remapping utility providing qmk-like functionality"
-maintainer="slotThe <soliditsallgood@tuta.io>"
+maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"
 homepage="https://github.com/david-janssen/kmonad"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum="3f61c546d456354a15326558eb8025024ab3d51ef2f6ec761da5568e4473f7ec"
+checksum=cb66f0c6d4c304c7e3c48cefd0c50ea00b156ffc361e278e1fc5c6070317d927
 nopie_files="/usr/bin/kmonad"
 nocross=yes
 

From 6606a9d43aa1caa4c74d0ea08daba40e5f9fb6df Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 12 Sep 2020 20:14:11 +0200
Subject: [PATCH 05/18] xmonad: bump stack resolver to lts-16.13

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

diff --git a/srcpkgs/xmonad/template b/srcpkgs/xmonad/template
index 019bc7389ab..a9cf809c87a 100644
--- a/srcpkgs/xmonad/template
+++ b/srcpkgs/xmonad/template
@@ -1,9 +1,9 @@
 # Template file for 'xmonad'
 pkgname=xmonad
 version=0.15
-revision=4
+revision=5
 build_style=haskell-stack
-stackage=lts-15.4
+stackage=lts-16.13
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel"
 short_desc="Tiling window manager fully configurable in Haskell"
 maintainer="xaltsc <xaltsc@protonmail.ch>"

From 2541cb776f139d21cc824c49323709a44707d64f Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 12 Sep 2020 21:51:44 +0200
Subject: [PATCH 06/18] xmonad-contrib: bump stack resolver to lts-16.13

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

diff --git a/srcpkgs/xmonad-contrib/files/stack.yaml b/srcpkgs/xmonad-contrib/files/stack.yaml
index cd6bb8c0804..74227aa2e1e 100644
--- a/srcpkgs/xmonad-contrib/files/stack.yaml
+++ b/srcpkgs/xmonad-contrib/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-15.4
+resolver: lts-16.13
 packages:
   - .
 extra-deps:
diff --git a/srcpkgs/xmonad-contrib/template b/srcpkgs/xmonad-contrib/template
index ed000d7b6e8..03a4de861b5 100644
--- a/srcpkgs/xmonad-contrib/template
+++ b/srcpkgs/xmonad-contrib/template
@@ -1,7 +1,7 @@
 # Template file for 'xmonad-contrib'
 pkgname=xmonad-contrib
 version=0.16
-revision=2
+revision=3
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXft-devel libXScrnSaver-devel"

From 198b4b8d81086ea4bdaedd269edd7ecc0fbd019c Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 13 Sep 2020 08:51:20 +0200
Subject: [PATCH 07/18] cgrep: bump stack resolver to lts-16.13

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

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index d48184199e7..cc3d6625b13 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,9 +1,9 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.6.32
-revision=3
+revision=4
 build_style=haskell-stack
-stackage="lts-15.4"
+stackage="lts-16.13"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f8e5f8af689fadd5b39de266a034aea648e1008f Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 13 Sep 2020 08:51:42 +0200
Subject: [PATCH 08/18] hledger: update to 1.19.1

---
 srcpkgs/hledger/files/stack.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hledger/files/stack.yaml b/srcpkgs/hledger/files/stack.yaml
index 80b170349c8..fdb69b61aee 100644
--- a/srcpkgs/hledger/files/stack.yaml
+++ b/srcpkgs/hledger/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-15.4
+resolver: lts-16.13
 packages:
 - hledger-lib
 - hledger

From 2a6b640ac24852695deac11ea0c5506329ad793d Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 13 Sep 2020 09:26:31 +0200
Subject: [PATCH 09/18] darcs: update to 2.16.2

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

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index 2fa5ce6f3f2..fe94170c865 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-15.4
+resolver: lts-16.13
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index 7c7710f12ca..32cd048afcb 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,6 +1,6 @@
 # Template file for 'darcs'
 pkgname=darcs
-version=2.16.1
+version=2.16.2
 revision=1
 build_style=haskell-stack
 hostmakedepends="unzip"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://darcs.net/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=00efd85509724e278412ec4317ea23a5ac491833b464f64c75c39de4563c03e1
+checksum=161752851d910fb8d2168cb49b3b9bbe0571e0b622cd1d36d1ea174aa25255db
 nopie_files="/usr/bin/darcs"
 nocross=yes
 

From 841d27e2163e237fced56357469c630802b822a4 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 13 Sep 2020 12:43:02 +0200
Subject: [PATCH 10/18] pandoc: update to 2.10.1

---
 srcpkgs/pandoc/files/stack.yaml | 39 +++++++++++++++++++++++++++++++++
 srcpkgs/pandoc/template         | 13 +++++------
 2 files changed, 45 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/pandoc/files/stack.yaml

diff --git a/srcpkgs/pandoc/files/stack.yaml b/srcpkgs/pandoc/files/stack.yaml
new file mode 100644
index 00000000000..e94732d9e6d
--- /dev/null
+++ b/srcpkgs/pandoc/files/stack.yaml
@@ -0,0 +1,39 @@
+resolver: lts-16.13
+
+packages:
+  - ./pandoc-2.10.1
+
+flags:
+  pandoc:
+    trypandoc: false
+    embed_data_files: true
+    static: false
+  pandoc-citeproc:
+    bibutils: true
+    embed_data_files: true
+    unicode_collation: false
+    test_citeproc: false
+    debug: false
+
+extra-deps:
+  - pandoc-types-1.21
+  - pandoc-citeproc-0.17.0.1
+  - texmath-0.12.0.2
+  - haddock-library-1.9.0
+  - skylighting-0.8.5
+  - skylighting-core-0.8.5
+  - regex-pcre-builtin-0.95.1.2.8.43
+  - regex-base-0.94.0.0
+  - doclayout-0.3
+  - emojis-0.1
+  - hslua-1.1.2
+  - jira-wiki-markup-1.3.2
+  - HsYAML-0.2.1.0
+  - HsYAML-aeson-0.2.0.0
+  - doctemplates-0.8.2
+  - commonmark-0.1.0.1
+  - commonmark-extensions-0.2.0.0
+  - commonmark-pandoc-0.2.0.0
+
+ghc-options:
+   "$locals": -fhide-source-paths -Wno-missing-home-modules
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index fc02ba90687..b73b618e98f 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,9 +1,9 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.9.2.1
+version=2.10.1
 revision=1
-_citeproc_version=0.17
+_citeproc_version=0.17.0.1
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
@@ -11,19 +11,18 @@ build_style=haskell-stack
 make_build_args="
  --flag pandoc:embed_data_files --flag pandoc-citeproc:embed_data_files
  --flag=hslua:system-lua --flag=hslua:pkg-config"
-stackage="lts-16.0"
 hostmakedepends="pkg-config unzip wget"
-makedepends="zlib-devel lua53-devel"
+makedepends="zlib-devel lua53-devel tar"
 short_desc="Universal converter between markup formats (with citeproc support)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, MIT"
 homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  http://hackage.haskell.org/package/${pkgname}-citeproc-${_citeproc_version}/${pkgname}-citeproc-${_citeproc_version}.tar.gz
- https://github.com/jez/pandoc-sidenote/archive/${_sidenote_version}.tar.gz \
+ https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="c26d35372cf8b7d53062c9c495c0bca2ee370891c2349d3798a44f9ca33bdf57
- 47a9e7aac348d55eb935bee5ced30529974f4a680d67c38ea68be1d83edaf5b1
+checksum="938a4c9b0a7ed3de886c73af4052913b0ac9e4aa12b435bd2afd09670bd3229a
+ f3e5ce3d1d21c27178f2fc69580750e3ce97fc5f962f2d01f7b6aa2e090c2342
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes

From bdab9ffe59e1f795ea87a384da0f21f5832e2db5 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 13 Sep 2020 13:34:12 +0200
Subject: [PATCH 11/18] shellcheck: bump stack resolver to lts-16.13

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

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

From 8e14fb1a7b72eb3a1a7a1eecc7fd646b7e899e90 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Mon, 14 Sep 2020 10:23:20 +0200
Subject: [PATCH 12/18] hoogle: update to 5.0.18

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

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index a7af7020b8c..40dc26778d1 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,16 +1,16 @@
 # Template file for 'hoogle'
 pkgname=hoogle
-version=5.0.17.15
+version=5.0.18
 revision=1
 build_style=haskell-stack
-stackage="lts-15.4"
+stackage="lts-16.13"
 makedepends="zlib-devel"
 short_desc="Haskell API search engine"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
 homepage="http://hoogle.haskell.org/"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=60f0645e2478b04be4b99316a21337bd658cb6388df10f850309756b245e0168
+checksum=fa624618ccbf5772af5628b791094fa43301f1c25137e06ed65c203e0de8b4c3
 nopie_files="/usr/bin/hoogle"
 nocross=yes # Can't yet cross compile Haskell
 

From c0d75c3b2b77e9c18b10796a96e0925f7595d2d3 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Mon, 14 Sep 2020 11:17:05 +0200
Subject: [PATCH 13/18] xmobar: update to 0.36

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

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 751d01b11d0..7bc4bf189d2 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-15.4
+resolver: lts-16.13
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 09dbdcba6f0..c4934bb9591 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,6 +1,6 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.33
+version=0.36
 revision=1
 build_style=haskell-stack
 hostmakedepends="pkg-config"
@@ -15,7 +15,7 @@ maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
 homepage="http://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=289885f9abfedd878d67b5d45e6d8c550291bc702967ce2edbf115363dc623c3
+checksum=b4e9ab4a051c8b6db59397069a64ccc770459cd642cc2df81ff558ac5f53164f
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
 build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"

From 59a089e1a80addbfaeb244b9fedc22719a129dd1 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Mon, 14 Sep 2020 12:03:24 +0200
Subject: [PATCH 14/18] git-mediate: bump stack resolver to lts-16.13

---
 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 5fb8eaa6904..aa3979d3435 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
-revision=3
+revision=4
 build_style=haskell-stack
-stackage="lts-15.4"
+stackage="lts-16.13"
 depends="git"
 short_desc="Tool to help resolving git conflicts"
 maintainer="Peter Wang <novalazy@gmail.com>"

From 565e563798f794d269cee577b2da9b808ff5fe11 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Mon, 14 Sep 2020 13:10:48 +0200
Subject: [PATCH 15/18] debug-me: update to 1.20200820

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

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index bedbdedceef..9c88cea9ab3 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,9 +1,8 @@
 packages:
 - '.'
-resolver: lts-15.4
+resolver: lts-16.13
 extra-deps:
 - posix-pty-0.2.1.1
-- graphviz-2999.20.0.3
+- graphviz-2999.20.1.0
 - sandi-0.5
 - protobuf-0.2.1.3@sha256:d8ed3c73027c6b7e7583c6a94ee1835beee8a755a875b06bbf51bc667d53ab69,3048
-allow-newer: true
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 0e18fee38b5..3df514e0be4 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -1,6 +1,6 @@
 # Template file for 'debug-me'
 pkgname=debug-me
-version=1.20190926
+version=1.20200820
 revision=1
 build_style=haskell-stack
 makedepends="zlib-devel"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="AGPL-3.0-or-later"
 homepage="https://debug-me.branchable.com/"
 distfiles="https://git.joeyh.name/index.cgi/${pkgname}.git/snapshot/${pkgname}-${version}.tar.gz"
-checksum=bfce3ded4897a2939d68ae9082be30c34bc21bb5b44b744a4417cc87252e8195
+checksum=9497dc9b85a58e5c499ea25fa1bed9f4fd6cdd2f57564f52a0e4152ad4fdc102
 nocross=yes # Can't yet cross compile Haskell
 nopie_files="/usr/bin/debug-me"
 

From 8fc8fe42da9439d1afa3a62a4aca38345ff44e26 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Mon, 14 Sep 2020 15:22:24 +0200
Subject: [PATCH 16/18] git-annex: update to 8.20200908

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

diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
index 21f8938b194..9a2294440b5 100644
--- a/srcpkgs/git-annex/files/stack.yaml
+++ b/srcpkgs/git-annex/files/stack.yaml
@@ -3,8 +3,6 @@ flags:
     production: true
     assistant: true
     pairing: true
-    s3: true
-    webdav: true
     torrentparser: true
     webapp: true
     magicmime: false
@@ -12,6 +10,7 @@ flags:
     debuglocks: false
     benchmark: false
     networkbsd: false
+    gitlfs: true
 packages:
 - '.'
 extra-deps:
@@ -19,11 +18,13 @@ extra-deps:
  - 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
- - tasty-rerun-1.1.17
  - torrent-10000.1.1
- - bencode-0.6.1.1@sha256:55b2f5653738754182c124caa8ba2eb533dfaf24fa2c4c73438edee406188b22,1930
- - network-multicast-0.3.2@sha256:521547635a6afae408ec25193b3e429082dc0442668dac7ad5cea76ccee39750,979
+ - bencode-0.6.1.1
+ - network-3.1.0.1
 explicit-setup-deps:
   git-annex: true
-resolver: lts-15.4
+resolver: lts-16.13
diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template
index 5c1dfb2f25c..53a796cab1a 100644
--- a/srcpkgs/git-annex/template
+++ b/srcpkgs/git-annex/template
@@ -1,6 +1,6 @@
 # Template file for 'git-annex'
 pkgname=git-annex
-version=8.20200522
+version=8.20200908
 revision=1
 build_style=haskell-stack
 makedepends="curl file-devel gnupg2 gnutls-devel gsasl-devel libxml2-devel
@@ -12,7 +12,7 @@ maintainer="Evan Deaubl <evan@deaubl.name>"
 license="AGPL-3.0-or-later, MIT, BSD-2-Clause, GPL-3.0-or-later, custom:Expat, custom:MIT-twitter, GPL-2.0-only, custom:icon-license"
 homepage="http://git-annex.branchable.com"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=a81fd3c09126b740e586507b9327ab59f09753ea57a17509b641b29a6699e1ec
+checksum=61719d57d9389716aac9e6e12931e41b3b8a157d5fa8959201953810a88d2384
 nopie_files="/usr/bin/git-annex"
 nocross=yes
 

From 31f1f0a0e94561e258e5967650b6bd25bedfb7ea Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Mon, 14 Sep 2020 16:43:35 +0200
Subject: [PATCH 17/18] hlint: bump stack resolver to lts-16.13

---
 srcpkgs/hlint/files/stack.yaml       |  7 +++++++
 srcpkgs/hlint/patches/ghc8.8.3.patch | 13 -------------
 srcpkgs/hlint/template               |  4 ++--
 3 files changed, 9 insertions(+), 15 deletions(-)
 create mode 100644 srcpkgs/hlint/files/stack.yaml
 delete mode 100644 srcpkgs/hlint/patches/ghc8.8.3.patch

diff --git a/srcpkgs/hlint/files/stack.yaml b/srcpkgs/hlint/files/stack.yaml
new file mode 100644
index 00000000000..12aead6562c
--- /dev/null
+++ b/srcpkgs/hlint/files/stack.yaml
@@ -0,0 +1,7 @@
+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/ghc8.8.3.patch b/srcpkgs/hlint/patches/ghc8.8.3.patch
deleted file mode 100644
index 356800d31cd..00000000000
--- a/srcpkgs/hlint/patches/ghc8.8.3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- stack.yaml	2020-02-09 22:30:02.000000000 +0100
-+++ stack.yaml	2020-03-28 12:06:31.711342411 +0100
-@@ -4,8 +4,7 @@
- resolver: nightly-2019-08-07 # Don't roll to an 8.8.1 or 8.8.2 resolver because of the Windows linker bug
- packages: [.]
- extra-deps:
--  - ghc-lib-parser-8.8.2.20200205
--  - ghc-lib-parser-ex-8.8.5.1
-+  - ghc-lib-parser-8.8.3.20200224
-+  - ghc-lib-parser-ex-8.8.6.0
--  - haskell-src-exts-1.23.0
- ghc-options:
-     "$locals": -Wunused-imports -Worphans -Wunused-top-binds -Wunused-local-binds -Wincomplete-patterns
diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index 53151062add..16fbb03ce2b 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,9 +1,9 @@
 # Template file for 'hlint'
 pkgname=hlint
 version=2.2.11
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-15.4"
+stackage="lts-16.13"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From e55e67ebbf507068f3841cc94c1345c7b0daaeec Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 15 Oct 2020 08:14:57 +0200
Subject: [PATCH 18/18] ghc-bin: update to 8.8.4

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

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 34f3c81ffb3..833109ee288 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.8.3
+version=8.8.4
 revision=1
 archs="i686 x86_64* ppc64le"
 wrksrc="ghc-${version%[!0-9]}"
@@ -21,7 +21,7 @@ x86_64)
 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=50b7aff7d3d43b010e571df73e78e3c0169c671a55adbfee28753516ce1c2dc5
+	checksum=779647d3f4e6e39da9e13b2559319ede76b4fff1107e4dc369a09aadeecad971
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
@@ -29,7 +29,7 @@ i686)
 	;;
 ppc64le)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz"
-	checksum=0c8df56aa0177459894ba53375115ab76f8eed9f4b1018fae5c332bcc6b79cb4
+	checksum=4a13d36a3e3d605db02b89269ed727c3ba23c9d03b84b72c1716a910a28f8074
 	;;
 esac
 

  parent reply	other threads:[~2020-10-20 15:28 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-12 17:40 [PR PATCH] " slotThe
2020-09-12 18:06 ` [PR PATCH] [Updated] " slotThe
2020-09-12 18:14 ` slotThe
2020-09-12 19:52 ` slotThe
2020-09-14 13:30 ` slotThe
2020-09-14 14:43 ` slotThe
2020-09-25 15:43 ` q66
2020-09-25 17:19 ` slotThe
2020-10-15  3:20 ` q66
2020-10-15  6:15 ` [PR PATCH] [Updated] " slotThe
2020-10-15 11:12 ` slotThe
2020-10-17 17:40 ` slotThe
2020-10-20 15:28 ` slotThe [this message]
2020-10-21  3:34 ` [PR PATCH] [Merged]: " q66
2020-10-21  3:44 ` 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=20201020152804.BEcFKNcKF0q3PHgOv3bjCrvLE7E1gu_hL2EuA1wNw1Y@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).