From 2c9bba91c3f30500f4255a8a7440bc06545721fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= 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 " 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"