wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-07 07:33:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

stack: update to 2.3.0.1, stackage to lts-15.4

Browse source
This commit is contained in:
q66 2020-04-14 18:21:20 +02:00
parent b4b392d63f
commit 74aad6c6c2
2 changed files with 20 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
srcpkgs/stack/patches/ppc.patch
View file

@ -1,14 +1,13 @@
--- src/Stack/Setup.hs --- src/Stack/Setup.hs
+++ src/Stack/Setup.hs +++ src/Stack/Setup.hs
@@ -95,6 +95,7 @@ import System.IO.Error (isPermissionError) @@ -95,5 +95,6 @@ import System.IO.Error (isPermissionError)
import System.FilePath (searchPathSeparator) import System.FilePath (searchPathSeparator)
import qualified System.FilePath as FP import qualified System.FilePath as FP
import System.Permissions (setFileExecutable) import System.Permissions (setFileExecutable)
+import System.Endian (getSystemEndianness, Endianness (..)) +import System.Endian (getSystemEndianness, Endianness (..))
import Text.Printf (printf)
import System.Uname (getRelease) import System.Uname (getRelease)
import Data.List.Split (splitOn) import Data.List.Split (splitOn)
@@ -1264,6 +1265,11 @@ getOSKey platform = @@ -1264,4 +1265,9 @@ getOSKey platform =
Platform X86_64 Cabal.Windows -> return "windows64" Platform X86_64 Cabal.Windows -> return "windows64"
Platform Arm Cabal.Linux -> return "linux-armv7" Platform Arm Cabal.Linux -> return "linux-armv7"
Platform AArch64 Cabal.Linux -> return "linux-aarch64" Platform AArch64 Cabal.Linux -> return "linux-aarch64"
@ -18,15 +17,15 @@
+ LittleEndian -> return "linux-powerpc64le" + LittleEndian -> return "linux-powerpc64le"
+ BigEndian -> return "linux-powerpc64" + BigEndian -> return "linux-powerpc64"
Platform arch os -> throwM $ UnsupportedSetupCombo os arch Platform arch os -> throwM $ UnsupportedSetupCombo os arch
downloadFromInfo downloadFromInfo
--- stack.cabal --- stack.cabal
+++ stack.cabal +++ stack.cabal
@@ -235,6 +235,7 @@ library @@ -235,6 +235,7 @@ library
conduit >=1.3.0.3, , conduit
conduit-extra >=1.3.0, , conduit-extra
containers >=0.5.10.2, , containers
+ cpu >=0.1.2, + , cpu >=0.1.2
cryptonite >=0.25, , cryptonite
cryptonite-conduit >=0.2.2, , cryptonite-conduit
deepseq >=1.4.3.0, , deepseq

43
srcpkgs/stack/template
View file

@ -1,8 +1,8 @@
# Template file for 'stack' # Template file for 'stack'
pkgname=stack pkgname=stack
version=2.1.3.1 version=2.3.0.1
revision=3 revision=1
_stackage="lts-14.1" _stackage="lts-15.4"
hostmakedepends="cabal-install pkg-config unzip" hostmakedepends="cabal-install pkg-config unzip"
makedepends="zlib-devel pcre-devel" makedepends="zlib-devel pcre-devel"
depends="git gmp-devel iana-etc" depends="git gmp-devel iana-etc"
@ -10,42 +10,19 @@ short_desc="Cross-platform program for developing Haskell projects"
maintainer="Leah Neukirchen <leah@vuxu.org>" maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause" license="BSD-3-Clause"
homepage="https://haskellstack.org" homepage="https://haskellstack.org"
distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz https://github.com/commercialhaskell/stack/archive/v2.3.0.1.tar.gz
https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage} distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
http://hackage.haskell.org/package/pantry-0.2.0.0/pantry-0.2.0.0.tar.gz" https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
checksum="f983369a22a3e3af9ae09770cf34e4ba439cc7f5ef5a0e87f4db11c1ec5356e0 checksum="a303a144dd3a37479e5b0fbf14d24e8d25d510bb038e413f14680ddb91036fd6
c077d34ebe0b5139f57492770c7fd1dabb4b81df0ed842e6ca30b002d9fe78ec 4147e6738cf6ef38cfd48048ef0992fb00e786068592e359fdb804e3d9ed4781"
8cd8b4192c0a1e37666852306d588a6db03ea03363572e0e54e0e8a9aa19e2e2"
skip_extraction="cabal.config-${_stackage}" skip_extraction="cabal.config-${_stackage}"
nocross=yes nocross=yes
nopie_files="/usr/bin/stack" nopie_files="/usr/bin/stack"
_patch_exts() {
vsed -i '1s;^;{-# LANGUAGE DerivingStrategies #-}\n;' $1
vsed -i '1s;^;{-# LANGUAGE StandaloneDeriving #-}\n;' $1
}
post_extract() {
mv ../pantry-0.2.0.0 .
vsed -e 's/hackage-security/hackage-security <0.6.0.0/g' -i pantry-0.2.0.0/pantry.cabal
_patch_exts pantry-0.2.0.0/src/Pantry/Storage.hs
vsed -e 's/^- \./&\n- pantry-0.2.0.0/' -i stack.yaml
vsed -e 's/http-download >=0.1.0.0/& \&\& <0.2.0.0/g' -i stack.cabal
vsed -e 's/path >=0.6.1/& \&\& <0.7.0/g' -i stack.cabal
_patch_exts src/Stack/Storage/User.hs
_patch_exts src/Stack/Storage/Project.hs
vsed -i 's/parseRelFile (replaceExtension/parseRelFile (FilePath.replaceExtension/' \
src/Stack/Package.hs
}
do_build() { do_build() {
cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/cabal.config-${_stackage} cabal.config cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/cabal.config-${_stackage} cabal.config
HOME=$PWD cabal v2-update HOME=$PWD cabal new-update
HOME=$PWD cabal v2-build ${makejobs} --flag disable-git-info HOME=$PWD cabal new-build ${makejobs} --flag disable-git-info
} }
do_install() { do_install() {