[PR PATCH] [RFC] build-style/haskell-stack: place stack root in /host to make it persistent

[PR PATCH] [RFC] build-style/haskell-stack: place stack root in /host to make it persistent

[tornaria]

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

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

https://github.com/tornaria/void-packages stack-root
https://github.com/void-linux/void-packages/pull/49526

[RFC] build-style/haskell-stack: place stack root in /host to make it persistent
Similar to `CARGO_HOME=/host/cargo` maybe we should set `STACK_ROOT=/host/stack`.

@leahneukirchen any thoughts?

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->


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

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

From a604cfd7efea30e37b1037a899fcc3b396a0a1d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 25 Mar 2024 12:35:53 -0300
Subject: [PATCH] build-style/haskell-stack: place stack root in /host to make
 it persistent

---
 common/build-style/haskell-stack.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/build-style/haskell-stack.sh b/common/build-style/haskell-stack.sh
index 2a28ffc9881168..8131d60db009e9 100644
--- a/common/build-style/haskell-stack.sh
+++ b/common/build-style/haskell-stack.sh
@@ -20,11 +20,11 @@ do_build() {
 			msg_error "Stackage version not set in \$stackage.\n"
 		fi
 		msg_normal "Using stackage resolver ${stackage}.\n"
-		STACK_ROOT="$wrksrc/.stack" \
+		STACK_ROOT="/host/stack" \
 			stack init ${_stack_args} --force --resolver ${stackage}
 	fi
 
-	STACK_ROOT="$wrksrc/.stack" stack ${_stack_args} ${makejobs} build \
+	STACK_ROOT="/host/stack" stack ${_stack_args} ${makejobs} build \
 		${make_build_args}
 }
 
@@ -32,6 +32,6 @@ do_install() {
 	local _stack_args="--system-ghc --skip-ghc-check"
 
 	vmkdir usr/bin
-	STACK_ROOT="$wrksrc/.stack" stack ${_stack_args} install \
+	STACK_ROOT="/host/stack" stack ${_stack_args} install \
 	       	${make_build_args} --local-bin-path=${DESTDIR}/usr/bin
 }

Re: [RFC] build-style/haskell-stack: place stack root in /host to make it persistent

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/49526#issuecomment-2018803312

Comment:
I would prefer subdirs within /host/stack for arch-specific stuff

Re: [PR PATCH] [Updated] [RFC] build-style/haskell-stack: place stack root in /host to make it persistent

[tornaria]

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

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

https://github.com/tornaria/void-packages stack-root
https://github.com/void-linux/void-packages/pull/49526

[RFC] build-style/haskell-stack: place stack root in /host to make it persistent
Similar to `CARGO_HOME=/host/cargo` maybe we should set `STACK_ROOT=/host/stack`.

@leahneukirchen any thoughts?

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->


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

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

From 2c9bba91c3f30500f4255a8a7440bc06545721fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 25 Mar 2024 12:35:53 -0300
Subject: [PATCH] build-style/haskell-stack: place stack root in /host to make
 it persistent

---
 common/build-style/haskell-stack.sh | 10 ++++++----
 srcpkgs/mpfr/update                 |  2 +-
 srcpkgs/netperf/template            |  1 +
 srcpkgs/python3-hypothesis/update   |  3 ++-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/common/build-style/haskell-stack.sh b/common/build-style/haskell-stack.sh
index 2a28ffc9881168..e2aec607499b57 100644
--- a/common/build-style/haskell-stack.sh
+++ b/common/build-style/haskell-stack.sh
@@ -4,6 +4,9 @@
 # make_build_args="stack-build-flags"
 # stackage="lts-X.Y"  # or include a stack.yaml in $FILESDIR
 #
+
+export STACK_ROOT="/host/stack/${XBPS_TARGET_MACHINE}"
+
 do_build() {
 	# use --skip-ghc-check to really force stack to use the ghc in the system
 	# --system-ghc still downloads if stackage ghc version does not match ours
@@ -20,11 +23,10 @@ do_build() {
 			msg_error "Stackage version not set in \$stackage.\n"
 		fi
 		msg_normal "Using stackage resolver ${stackage}.\n"
-		STACK_ROOT="$wrksrc/.stack" \
-			stack init ${_stack_args} --force --resolver ${stackage}
+		stack init ${_stack_args} --force --resolver ${stackage}
 	fi
 
-	STACK_ROOT="$wrksrc/.stack" stack ${_stack_args} ${makejobs} build \
+	stack ${_stack_args} ${makejobs} build  --ghc-options ${makejobs} \
 		${make_build_args}
 }
 
@@ -32,6 +34,6 @@ do_install() {
 	local _stack_args="--system-ghc --skip-ghc-check"
 
 	vmkdir usr/bin
-	STACK_ROOT="$wrksrc/.stack" stack ${_stack_args} install \
+	stack ${_stack_args} install \
 	       	${make_build_args} --local-bin-path=${DESTDIR}/usr/bin
 }
diff --git a/srcpkgs/mpfr/update b/srcpkgs/mpfr/update
index a899a5fdc8acf9..66506e4a88595d 100644
--- a/srcpkgs/mpfr/update
+++ b/srcpkgs/mpfr/update
@@ -1 +1 @@
-site="http://www.mpfr.org/mpfr-current/"
+site="https://www.mpfr.org/mpfr-current/"
diff --git a/srcpkgs/netperf/template b/srcpkgs/netperf/template
index 3d7bc656262c3c..bca924724a083a 100644
--- a/srcpkgs/netperf/template
+++ b/srcpkgs/netperf/template
@@ -3,6 +3,7 @@ pkgname=netperf
 version=2.7.0
 revision=1
 build_style=gnu-configure
+configure_args=--enable-demo
 short_desc="Network benchmarking tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:Proprietary"
diff --git a/srcpkgs/python3-hypothesis/update b/srcpkgs/python3-hypothesis/update
index 3c99b323e612e8..c10e110b82b8be 100644
--- a/srcpkgs/python3-hypothesis/update
+++ b/srcpkgs/python3-hypothesis/update
@@ -1,2 +1,3 @@
 pkgname=hypothesis-python
-pattern="${pkgname}-\K[0-9.]+\.0(?=\.tar\.gz)"
+#pattern="${pkgname}-\K[0-9.]+\.0(?=\.tar\.gz)"
+ignore="*.[1-9] *[13579].0"

Re: [PR REVIEW] [RFC] build-style/haskell-stack: place stack root in /host to make it persistent

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/49526#discussion_r1538411525

Comment:
We don't put environment variables here. Use `common/environment/build-style/haskell-stack.sh`

Re: [RFC] build-style/haskell-stack: place stack root in /host to make it persistent

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/49526#issuecomment-2019180423

Comment:
unrelated changes seem to have snuck in?

Re: [PR PATCH] [Updated] [RFC] build-style/haskell-stack: place stack root in /host to make it persistent

[tornaria]

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

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

https://github.com/tornaria/void-packages stack-root
https://github.com/void-linux/void-packages/pull/49526

[RFC] build-style/haskell-stack: place stack root in /host to make it persistent
Similar to `CARGO_HOME=/host/cargo` maybe we should set `STACK_ROOT=/host/stack`.

@leahneukirchen any thoughts?

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->


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

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

From ec42cf33926cffef4f0b8934004bd51426e38ff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 25 Mar 2024 21:45:20 -0300
Subject: [PATCH] build-style/haskell-stack: place stack root in /host to make
 it persistent

---
 common/build-style/haskell-stack.sh             | 7 +++----
 common/environment/build-style/haskell-stack.sh | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/build-style/haskell-stack.sh b/common/build-style/haskell-stack.sh
index 2a28ffc9881168..327183df96a17c 100644
--- a/common/build-style/haskell-stack.sh
+++ b/common/build-style/haskell-stack.sh
@@ -20,11 +20,10 @@ do_build() {
 			msg_error "Stackage version not set in \$stackage.\n"
 		fi
 		msg_normal "Using stackage resolver ${stackage}.\n"
-		STACK_ROOT="$wrksrc/.stack" \
-			stack init ${_stack_args} --force --resolver ${stackage}
+		stack init ${_stack_args} --force --resolver ${stackage}
 	fi
 
-	STACK_ROOT="$wrksrc/.stack" stack ${_stack_args} ${makejobs} build \
+	stack ${_stack_args} ${makejobs} build  --ghc-options ${makejobs} \
 		${make_build_args}
 }
 
@@ -32,6 +31,6 @@ do_install() {
 	local _stack_args="--system-ghc --skip-ghc-check"
 
 	vmkdir usr/bin
-	STACK_ROOT="$wrksrc/.stack" stack ${_stack_args} install \
+	stack ${_stack_args} install \
 	       	${make_build_args} --local-bin-path=${DESTDIR}/usr/bin
 }
diff --git a/common/environment/build-style/haskell-stack.sh b/common/environment/build-style/haskell-stack.sh
index 6b47c121512378..4356b6a7247349 100644
--- a/common/environment/build-style/haskell-stack.sh
+++ b/common/environment/build-style/haskell-stack.sh
@@ -1 +1,3 @@
 hostmakedepends+=" ghc stack"
+
+export STACK_ROOT="/host/stack/${XBPS_TARGET_MACHINE}"

Re: [RFC] build-style/haskell-stack: place stack root in /host to make it persistent

[tornaria]

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/49526#issuecomment-2019194853

Comment:
Thanks for the feedback. If you think this is a good idea, I'll be testing it for a bit while I try to finish the update of pandoc.

Disclaimer: I haven't used haskell too much in the last 20 years, I sure don't know anything about cabal, stack, etc.

Re: [PR PATCH] [Updated] [RFC] build-style/haskell-stack: place stack root in /host to make it persistent

[tornaria]

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

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

https://github.com/tornaria/void-packages stack-root
https://github.com/void-linux/void-packages/pull/49526

[RFC] build-style/haskell-stack: place stack root in /host to make it persistent
Similar to `CARGO_HOME=/host/cargo` maybe we should set `STACK_ROOT=/host/stack`.

@leahneukirchen any thoughts?

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->


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

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

From 96637bf80e24b060abf6556d362f2ce6ce19532f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 25 Mar 2024 21:45:20 -0300
Subject: [PATCH] build-style/haskell-stack: place stack root in /host to make
 it persistent

---
 common/build-style/haskell-stack.sh             | 7 +++----
 common/environment/build-style/haskell-stack.sh | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/build-style/haskell-stack.sh b/common/build-style/haskell-stack.sh
index 2a28ffc9881168..ca2a9fbeefc7e6 100644
--- a/common/build-style/haskell-stack.sh
+++ b/common/build-style/haskell-stack.sh
@@ -20,11 +20,10 @@ do_build() {
 			msg_error "Stackage version not set in \$stackage.\n"
 		fi
 		msg_normal "Using stackage resolver ${stackage}.\n"
-		STACK_ROOT="$wrksrc/.stack" \
-			stack init ${_stack_args} --force --resolver ${stackage}
+		stack init ${_stack_args} --force --resolver ${stackage}
 	fi
 
-	STACK_ROOT="$wrksrc/.stack" stack ${_stack_args} ${makejobs} build \
+	stack ${_stack_args} ${makejobs} build --ghc-options ${makejobs} \
 		${make_build_args}
 }
 
@@ -32,6 +31,6 @@ do_install() {
 	local _stack_args="--system-ghc --skip-ghc-check"
 
 	vmkdir usr/bin
-	STACK_ROOT="$wrksrc/.stack" stack ${_stack_args} install \
+	stack ${_stack_args} install \
 	       	${make_build_args} --local-bin-path=${DESTDIR}/usr/bin
 }
diff --git a/common/environment/build-style/haskell-stack.sh b/common/environment/build-style/haskell-stack.sh
index 6b47c121512378..4356b6a7247349 100644
--- a/common/environment/build-style/haskell-stack.sh
+++ b/common/environment/build-style/haskell-stack.sh
@@ -1 +1,3 @@
 hostmakedepends+=" ghc stack"
+
+export STACK_ROOT="/host/stack/${XBPS_TARGET_MACHINE}"

Re: [RFC] build-style/haskell-stack: place stack root in /host to make it persistent

[0x5c]

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

New comment by 0x5c on void-packages repository

https://github.com/void-linux/void-packages/pull/49526#issuecomment-2019724004

Comment:
[`CARGO_HOME`](https://doc.rust-lang.org/cargo/guide/cargo-home.html) only contains the registry, the crate cache (downloaded source contents only), some configs, and binaries installed with `cargo install` (not applicable here), so no build artifact gets placed there within a package build.

Is that also the case with stack?

Re: [RFC] build-style/haskell-stack: place stack root in /host to make it persistent

[tornaria]

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/49526#issuecomment-2021150796

Comment:
I think `STACK_ROOT` contains build artifacts. Not for the current package you are building, but only for all the dependencies taken from stackage. IOW, if you build pandoc again, it's source will be recompiled each time, but the dependencies will be built only the first time (for each architecture).

It also seems to contain the registry and downloaded sources, but it's not obvious to me how to share this between architectures while having binaries separate (especially x86_64 vs x86_64-musl which they are both named `x86_64-linux` for stack, but are not compatible).

This seems to be working ok, but I'll test a bit more. I do have pandoc update working on x86_64 but it's failing on musl (this was fixed before in #36292 but it's not obvious to me how to bring the fix forward).