Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] cabal-install: update to 3.2.0.0.
@ 2020-09-01 22:37 mlugg
  2020-09-14 19:28 ` mlugg
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: mlugg @ 2020-09-01 22:37 UTC (permalink / raw)
  To: ml

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

There is a new pull request by mlugg against master on the void-packages repository

https://github.com/mlugg/void-packages master
https://github.com/void-linux/void-packages/pull/24596

cabal-install: update to 3.2.0.0.
Many of the patches previously being applied look to be in the fetched sources now. Removing these patches (and changing the checksum) was enough to make a working build.

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

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

From 49c9c7e603b0047ad9fee6726f179168d8ef4ddb Mon Sep 17 00:00:00 2001
From: mlugg <mlugg@mlugg.co.uk>
Date: Tue, 1 Sep 2020 23:29:28 +0100
Subject: [PATCH] cabal-install: update to 3.2.0.0.

---
 srcpkgs/cabal-install/patches/ghc-8.8.3.patch | 30 +++-------------
 srcpkgs/cabal-install/patches/http.patch      | 36 -------------------
 srcpkgs/cabal-install/template                |  4 +--
 3 files changed, 6 insertions(+), 64 deletions(-)
 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.3.patch
index 137e502c371..7f2b48ba569 100644
--- a/srcpkgs/cabal-install/patches/ghc-8.8.3.patch
+++ b/srcpkgs/cabal-install/patches/ghc-8.8.3.patch
@@ -38,36 +38,14 @@
                         # 0.2.2.*
  ED25519_VER="0.0.5.0"; ED25519_VER_REGEXP="0\.0\.?"
                         # 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
+ 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..c7c5c17dfca 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,7 +10,7 @@ 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() {

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

* Re: cabal-install: update to 3.2.0.0.
  2020-09-01 22:37 [PR PATCH] cabal-install: update to 3.2.0.0 mlugg
@ 2020-09-14 19:28 ` mlugg
  2020-09-14 19:28 ` [PR PATCH] [Closed]: " mlugg
  2020-09-14 19:28 ` mlugg
  2 siblings, 0 replies; 4+ messages in thread
From: mlugg @ 2020-09-14 19:28 UTC (permalink / raw)
  To: ml

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

New comment by mlugg on void-packages repository

https://github.com/void-linux/void-packages/pull/24596#issuecomment-692264995

Comment:
To be superceded by #24852 

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

* Re: [PR PATCH] [Closed]: cabal-install: update to 3.2.0.0.
  2020-09-01 22:37 [PR PATCH] cabal-install: update to 3.2.0.0 mlugg
  2020-09-14 19:28 ` mlugg
@ 2020-09-14 19:28 ` mlugg
  2020-09-14 19:28 ` mlugg
  2 siblings, 0 replies; 4+ messages in thread
From: mlugg @ 2020-09-14 19:28 UTC (permalink / raw)
  To: ml

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

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

cabal-install: update to 3.2.0.0.
https://github.com/void-linux/void-packages/pull/24596

Description:
Many of the patches previously being applied look to be in the fetched sources now. Removing these patches (and changing the checksum) was enough to make a working build.

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

* Re: cabal-install: update to 3.2.0.0.
  2020-09-01 22:37 [PR PATCH] cabal-install: update to 3.2.0.0 mlugg
  2020-09-14 19:28 ` mlugg
  2020-09-14 19:28 ` [PR PATCH] [Closed]: " mlugg
@ 2020-09-14 19:28 ` mlugg
  2 siblings, 0 replies; 4+ messages in thread
From: mlugg @ 2020-09-14 19:28 UTC (permalink / raw)
  To: ml

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

New comment by mlugg on void-packages repository

https://github.com/void-linux/void-packages/pull/24596#issuecomment-692264995

Comment:
To be superseded by #24852 

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

end of thread, other threads:[~2020-09-14 19:28 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-01 22:37 [PR PATCH] cabal-install: update to 3.2.0.0 mlugg
2020-09-14 19:28 ` mlugg
2020-09-14 19:28 ` [PR PATCH] [Closed]: " mlugg
2020-09-14 19:28 ` mlugg

Github messages for voidlinux

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.vuxu.org/voidlinux-github

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 voidlinux-github voidlinux-github/ http://inbox.vuxu.org/voidlinux-github \
		voidlinux-github@inbox.vuxu.org
	public-inbox-index voidlinux-github

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git