snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

stack: add more version constraints to fix build

This commit is contained in:
oreo639 2024-01-26 22:17:03 -08:00
parent 785ee2bac2
commit d45e528aa5
6 changed files with 167 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
srcpkgs/stack/patches/fix-build-text.patch Normal file
View File

@ -0,0 +1,20 @@
--- a/src/Stack/Build/Execute.hs
+++ b/src/Stack/Build/Execute.hs
@@ -26,7 +26,7 @@ import Control.Concurrent.Exec
import Control.Concurrent.STM (check)
import Stack.Prelude hiding (Display (..))
import Crypto.Hash
-import Data.Attoparsec.Text hiding (try)
+import Data.Attoparsec.Text as P hiding (try)
import qualified Data.ByteArray as Mem (convert)
import qualified Data.ByteString as S
import qualified Data.ByteString.Builder
@@ -2160,7 +2160,7 @@ mungeBuildOutput excludeTHLoading makeAb
lineCol = char ':'
>> choice
[ num >> char ':' >> num >> optional (char '-' >> num) >> return ()
- , char '(' >> num >> char ',' >> num >> string ")-(" >> num >> char ',' >> num >> char ')' >> return ()
+ , char '(' >> num >> char ',' >> num >> P.string ")-(" >> num >> char ',' >> num >> char ')' >> return ()
]
>> char ':'
>> return ()

26
srcpkgs/stack/patches/hsubparser.patch Normal file
View File

@ -0,0 +1,26 @@
Adapted from: https://github.com/commercialhaskell/stack/commit/4afcf774d2a821e69b6a1afca67bf34341c84e85
--- a/src/Options/Applicative/Complicated.hs
+++ b/src/Options/Applicative/Complicated.hs
@@ -136,20 +136,9 @@ complicatedParser commandMetavar commonP
(,) <$>
commonParser <*>
case runWriter (runExceptT commandParser) of
- (Right (),d) -> hsubparser' commandMetavar d
+ (Right (), m) -> hsubparser (m <> metavar commandMetavar)
(Left b,_) -> pure (b,mempty)
--- | Subparser with @--help@ argument. Borrowed with slight modification
--- from Options.Applicative.Extra.
-hsubparser' :: String -> Mod CommandFields a -> Parser a
-hsubparser' commandMetavar m = mkParser d g rdr
- where
- Mod _ d g = metavar commandMetavar `mappend` m
- (groupName, cmds, subs) = mkCommand m
- rdr = CmdReader groupName cmds (fmap add_helper . subs)
- add_helper pinfo = pinfo
- { infoParser = infoParser pinfo <**> helpOption }
-
-- | Non-hidden help option.
helpOption :: Parser (a -> a)
helpOption =

40
srcpkgs/stack/patches/http-download.patch Normal file
View File

@ -0,0 +1,40 @@
constrain http-download to prevent build failures
--- a/stack.cabal
+++ b/stack.cabal
@@ -267,7 +267,7 @@ library
http-client >=0.6.4.1,
http-client-tls >=0.3.5.3,
http-conduit >=2.3.8,
- http-download >=0.2.0.0,
+ http-download >=0.2.0.0 && <0.2.1,
http-types >=0.12.3,
memory >=0.15.0,
microlens >=0.4.11.2,
@@ -393,7 +393,7 @@ executable stack
http-client >=0.6.4.1,
http-client-tls >=0.3.5.3,
http-conduit >=2.3.8,
- http-download >=0.2.0.0,
+ http-download >=0.2.0.0 && <0.2.1,
http-types >=0.12.3,
memory >=0.15.0,
microlens >=0.4.11.2,
@@ -522,7 +522,7 @@ executable stack-integration-test
http-client >=0.6.4.1,
http-client-tls >=0.3.5.3,
http-conduit >=2.3.8,
- http-download >=0.2.0.0,
+ http-download >=0.2.0.0 && <0.2.1,
http-types >=0.12.3,
memory >=0.15.0,
microlens >=0.4.11.2,
@@ -658,7 +658,7 @@ test-suite stack-test
http-client >=0.6.4.1,
http-client-tls >=0.3.5.3,
http-conduit >=2.3.8,
- http-download >=0.2.0.0,
+ http-download >=0.2.0.0 && <0.2.1,
http-types >=0.12.3,
memory >=0.15.0,
microlens >=0.4.11.2,

40
srcpkgs/stack/patches/pantry.patch Normal file
View File

@ -0,0 +1,40 @@
constrain pantry to prevent build failures
--- a/stack.cabal
+++ b/stack.cabal
@@ -279,7 +279,7 @@ library
network-uri >=2.6.4.1,
open-browser >=0.2.1.0,
optparse-applicative >=0.14.3.0,
- pantry >=0.5.3,
+ pantry >=0.5.3 && <0.6.0,
path >=0.7.0,
path-io >=1.6.3,
persistent >=2.11.0.4 && <2.14.0.0,
@@ -405,7 +405,7 @@ executable stack
network-uri >=2.6.4.1,
open-browser >=0.2.1.0,
optparse-applicative >=0.14.3.0,
- pantry >=0.5.3,
+ pantry >=0.5.3 && <0.6.0,
path >=0.7.0,
path-io >=1.6.3,
persistent >=2.11.0.4 && <2.14.0.0,
@@ -535,7 +535,7 @@ executable stack-integration-test
open-browser >=0.2.1.0,
optparse-applicative >=0.14.3.0,
optparse-generic >=1.3.1,
- pantry >=0.5.3,
+ pantry >=0.5.3 && <0.6.0,
path >=0.7.0,
path-io >=1.6.3,
persistent >=2.11.0.4 && <2.14.0.0,
@@ -670,7 +670,7 @@ test-suite stack-test
network-uri >=2.6.4.1,
open-browser >=0.2.1.0,
optparse-applicative >=0.14.3.0,
- pantry >=0.5.3,
+ pantry >=0.5.3 && <0.6.0,
path >=0.7.0,
path-io >=1.6.3,
persistent >=2.11.0.4 && <2.14.0.0,

40
srcpkgs/stack/patches/unix-compat.patch Normal file
View File

@ -0,0 +1,40 @@
constrain unix-compat version to prevent build failures
--- a/stack.cabal
+++ b/stack.cabal
@@ -307,7 +308,7 @@ library
transformers >=0.5.6.2,
typed-process >=0.2.6.0,
unicode-transforms >=0.3.7.1,
- unix-compat >=0.5.3,
+ unix-compat >=0.5.3 && < 0.7,
unliftio >=0.2.18,
unordered-containers >=0.2.14.0,
vector >=0.12.1.2,
@@ -434,7 +435,7 @@ executable stack
transformers >=0.5.6.2,
typed-process >=0.2.6.0,
unicode-transforms >=0.3.7.1,
- unix-compat >=0.5.3,
+ unix-compat >=0.5.3 && < 0.7,
unliftio >=0.2.18,
unordered-containers >=0.2.14.0,
vector >=0.12.1.2,
@@ -563,7 +564,7 @@ executable stack-integration-test
transformers >=0.5.6.2,
typed-process >=0.2.6.0,
unicode-transforms >=0.3.7.1,
- unix-compat >=0.5.3,
+ unix-compat >=0.5.3 && < 0.7,
unliftio >=0.2.18,
unordered-containers >=0.2.14.0,
vector >=0.12.1.2,
@@ -701,7 +702,7 @@ test-suite stack-test
transformers >=0.5.6.2,
typed-process >=0.2.6.0,
unicode-transforms >=0.3.7.1,
- unix-compat >=0.5.3,
+ unix-compat >=0.5.3 && < 0.7,
unliftio >=0.2.18,
unordered-containers >=0.2.14.0,
vector >=0.12.1.2,

2
srcpkgs/stack/template
View File

@ -13,7 +13,7 @@ homepage="https://haskellstack.org"
distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
checksum="9ddd44c2a62e9404194d69e7dc1c94e707910620316b66d6ac0b3201a8f37e80
e1de952bb6f62573e5c211df99ce6bb684c4cae7845f16c347ce9aa503d6374f"
2e836f769693cde2592963f200c97a3e8a87eb58777fa4289d7c3c671f971186"
skip_extraction="cabal.config-${_stackage}"
nocross=yes
nopie_files="/usr/bin/stack"