[PR PATCH] cabal-install/stack: disable ofd-locking.

[PR PATCH] cabal-install/stack: disable ofd-locking.

[leahneukirchen]

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

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

https://github.com/leahneukirchen/void-packages lukko-fix
https://github.com/void-linux/void-packages/pull/32228

cabal-install/stack: disable ofd-locking.
Closes #32221.

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

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

From bb216081dabb32f4bc3ada2573ed7dbfb55a585a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 28 Jul 2021 14:46:08 +0200
Subject: [PATCH 1/3] cabal-install: disable ofd-locking on i686.

Broken upstream, see https://github.com/haskellari/lukko/issues/15
---
 srcpkgs/cabal-install/template | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/cabal-install/template b/srcpkgs/cabal-install/template
index 99ebb54427fe..18ce63f254c7 100644
--- a/srcpkgs/cabal-install/template
+++ b/srcpkgs/cabal-install/template
@@ -1,7 +1,7 @@
 # Template file for 'cabal-install'
 pkgname=cabal-install
 version=3.4.0.0
-revision=1
+revision=2
 wrksrc=cabal-${pkgname}-${version}
 hostmakedepends="ghc curl tar which"
 makedepends="gmp-devel libffi-devel zlib-devel python3"
@@ -15,6 +15,14 @@ checksum=e4fbd5eb1d77400746a993679181f159aa415a37b931b26d67f5602f63ce971c
 nopie_files="/usr/bin/cabal"
 nocross=yes
 
+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 ;;
+	esac
+}
+
 do_build() {
 	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.1.json
 }

From 57be995c460d212daeba0f6c646fdea51bf37395 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 28 Jul 2021 14:46:44 +0200
Subject: [PATCH 2/3] stack: disable ofd-locking in lukko.

https://github.com/haskellari/lukko/issues/15
https://github.com/commercialhaskell/stack/issues/5589
---
 srcpkgs/stack/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index b95bf9ec59e9..0d34d0ab9e2d 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,7 +1,7 @@
 # Template file for 'stack'
 pkgname=stack
 version=2.7.1
-revision=1
+revision=2
 _stackage="lts-17.5"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
@@ -21,7 +21,8 @@ nopie_files="/usr/bin/stack"
 do_build() {
 	cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/cabal.config-${_stackage} cabal.config
 	HOME=$PWD cabal update
-	HOME=$PWD cabal new-build ${makejobs} --flag disable-git-info
+	HOME=$PWD cabal new-build ${makejobs} --flag disable-git-info \
+		--constraint 'lukko -ofd-locking'  # https://github.com/haskell/cabal/issues/7313
 }
 
 do_install() {

From 6cd0910ddb8c2fdce5c107002ea46f0b2c51dbb9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 28 Jul 2021 14:47:28 +0200
Subject: [PATCH 3/3] darcs: unbreak i686.

Closes #32221.
---
 common/environment/build-style/haskell-stack.sh | 2 --
 srcpkgs/darcs/template                          | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/common/environment/build-style/haskell-stack.sh b/common/environment/build-style/haskell-stack.sh
index fe26447f2335..6b47c1215123 100644
--- a/common/environment/build-style/haskell-stack.sh
+++ b/common/environment/build-style/haskell-stack.sh
@@ -1,3 +1 @@
 hostmakedepends+=" ghc stack"
-# https://build.voidlinux.org/builders/i686_builder/builds/33611/steps/shell_3/logs/stdio
-archs+=" ~i686*"
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index 1cdee2e089fe..e6baa7c3354a 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -14,10 +14,6 @@ checksum=e4166252bc403ffc2518edff48801796b8dab73fd9e0da1fcdda916b207fbe1d
 nopie_files="/usr/bin/darcs"
 nocross=yes
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) broken="https://build.voidlinux.org/builders/i686_builder/builds/33610/steps/shell_3/logs/stdio" ;;
-esac
-
 post_install() {
 	vinstall contrib/darcs_completion 644 usr/share/bash-completion/completions
 

Re: [PR PATCH] [Merged]: cabal-install/stack: disable ofd-locking.

[leahneukirchen]

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

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

cabal-install/stack: disable ofd-locking.
https://github.com/void-linux/void-packages/pull/32228

Description:
Closes #32221.