Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [WIP] GHC 8.8.4
@ 2020-09-12 17:40 slotThe
  2020-09-12 18:06 ` [PR PATCH] [Updated] " slotThe
                   ` (13 more replies)
  0 siblings, 14 replies; 15+ messages in thread
From: slotThe @ 2020-09-12 17:40 UTC (permalink / raw)
  To: ml

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

There is a new 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
- [ ] ghc-bin
    - [X] musl
    - [ ] ppc64le
    - [ ] upload
- [X] cabal-install
- [X] stack
 
Rebuild literally every single haskell package we have and see if anything's broken:

- [ ]   git-mediate
- [ ]   xmonad-contrib
- [ ]   kmonad
- [ ]   cgrep
- [ ]   debug-me
- [ ]   hlint
- [ ]   hoogle
- [ ]   xmonad
- [ ]   darcs
- [ ]   shellcheck
- [ ]   git-annex
- [ ]   hledger
- [ ]   pandoc
- [ ]   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: 9358 bytes --]

From 5025813c3d5cf7a0385a70c1721a2999528ac76d Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 12 Sep 2020 14:48:44 +0200
Subject: [PATCH 1/3] 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 7ff387605ba5725723194d290e4f61becedceabd Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 12 Sep 2020 16:19:38 +0200
Subject: [PATCH 2/3] 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 b05a781a970249292d9583f697b4aee6d840fd7e Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 12 Sep 2020 17:46:31 +0200
Subject: [PATCH 3/3] stack: update to 2.3.3

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

diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index d33a2404a8f..bfa4ba5d9cd 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.3.3
 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,8 +12,8 @@ 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="57042c0c7b53a6f8dba7f31679e9049c28351a86b8bc2786f7e37eda4733634e
+ b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

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

end of thread, other threads:[~2020-10-21  3:44 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-12 17:40 [PR PATCH] [WIP] GHC 8.8.4 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
2020-10-21  3:34 ` [PR PATCH] [Merged]: " q66
2020-10-21  3:44 ` q66

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).