* [PR PATCH] stack: update to 2.3.1, lts-15.5
@ 2020-05-28 12:26 pullmoll
2020-05-28 12:29 ` pullmoll
` (9 more replies)
0 siblings, 10 replies; 11+ messages in thread
From: pullmoll @ 2020-05-28 12:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 435 bytes --]
There is a new pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages stack
https://github.com/void-linux/void-packages/pull/22377
stack: update to 2.3.1, lts-15.5
This still fails to build with errors in src/Stack/Config.hs,
so this is WIP and not yet ready to merge.
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/22377.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-stack-22377.patch --]
[-- Type: text/x-diff, Size: 4622 bytes --]
From 05ae990c7bb8ccd37a2de9a0e742b43cba183179 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 28 May 2020 14:25:09 +0200
Subject: [PATCH] stack: update to 2.3.1, lts-15.5
This still fails to build with errors in src/Stack/Config.hs,
so this is WIP and not yet ready to merge.
[ci skip]
---
.../stack_types_resolver_disambiguate.patch | 62 +++++++++++++++++++
srcpkgs/stack/template | 8 +--
2 files changed, 66 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/stack/patches/stack_types_resolver_disambiguate.patch
diff --git a/srcpkgs/stack/patches/stack_types_resolver_disambiguate.patch b/srcpkgs/stack/patches/stack_types_resolver_disambiguate.patch
new file mode 100644
index 00000000000..93726475245
--- /dev/null
+++ b/srcpkgs/stack/patches/stack_types_resolver_disambiguate.patch
@@ -0,0 +1,62 @@
+--- src/Stack/Types/Resolver.hs 2020-04-29 01:04:43.000000000 +0200
++++ src/Stack/Types/Resolver.hs 2020-05-28 11:15:37.491947065 +0200
+@@ -68,7 +68,7 @@
+ = LTS !Int !Int
+ | Nightly !Day
+ deriving (Generic, Typeable, Show, Data, Eq)
+-instance NFData SnapName
++instance NFData Stack.Types.Resolver.SnapName
+ instance Display SnapName where
+ display = display . renderSnapName
+
+@@ -79,7 +79,7 @@
+ deriving Typeable
+ instance Exception BuildPlanTypesException
+ instance Show BuildPlanTypesException where
+- show (ParseSnapNameException t) = "Invalid snapshot name: " ++ T.unpack t
++ show (Stack.Types.Resolver.ParseSnapNameException t) = "Invalid snapshot name: " ++ T.unpack t
+ show (ParseResolverException t) = concat
+ [ "Invalid resolver value: "
+ , T.unpack t
+@@ -102,7 +102,7 @@
+-parseSnapName :: MonadThrow m => Text -> m SnapName
++parseSnapName :: MonadThrow m => Text -> m Stack.Types.Resolver.SnapName
+ parseSnapName t0 =
+ case lts <|> nightly of
+- Nothing -> throwM $ ParseSnapNameException t0
++ Nothing -> throwM $ Stack.Types.Resolver.ParseSnapNameException t0
+ Just sn -> return sn
+ where
+ lts = do
+@@ -110,10 +110,10 @@
+ Right (x, t2) <- Just $ decimal t1
+ t3 <- T.stripPrefix "." t2
+ Right (y, "") <- Just $ decimal t3
+- return $ LTS x y
++ return $ Stack.Types.Resolver.LTS x y
+ nightly = do
+ t1 <- T.stripPrefix "nightly-" t0
+- Nightly <$> readMaybe (T.unpack t1)
++ Stack.Types.Resolver.Nightly <$> readMaybe (T.unpack t1)
+
+ -- | Most recent Nightly and newest LTS version per major release.
+ data Snapshots = Snapshots
+@@ -132,7 +132,7 @@
+- case parseSnapName t of
++ case Stack.Types.Resolver.parseSnapName t of
+ Left e -> fail $ show e
+- Right (LTS _ _) -> fail "Unexpected LTS value"
+- Right (Nightly d) -> return d
++ Right (Stack.Types.Resolver.LTS _ _) -> fail "Unexpected LTS value"
++ Right (Stack.Types.Resolver.Nightly d) -> return d
+
+ isLTS = ("lts-" `T.isPrefixOf`)
+
+@@ -140,4 +140,4 @@
+- case parseSnapName t of
++ case Stack.Types.Resolver.parseSnapName t of
+ Left e -> fail $ show e
+- Right (LTS x y) -> return $ IntMap.singleton x y
+- Right (Nightly _) -> fail "Unexpected nightly value"
++ Right (Stack.Types.Resolver.LTS x y) -> return $ IntMap.singleton x y
++ Right (Stack.Types.Resolver.Nightly _) -> fail "Unexpected nightly value"
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 38817375fa2..8469d4282e2 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
# Template file for 'stack'
pkgname=stack
-version=2.3.0.1
+version=2.3.1
revision=1
-_stackage="lts-15.4"
+_stackage="lts-15.5"
hostmakedepends="cabal-install pkg-config unzip"
makedepends="zlib-devel pcre-devel"
depends="git gmp-devel iana-etc"
@@ -12,8 +12,8 @@ license="BSD-3-Clause"
homepage="https://haskellstack.org"
distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="a303a144dd3a37479e5b0fbf14d24e8d25d510bb038e413f14680ddb91036fd6
- 4147e6738cf6ef38cfd48048ef0992fb00e786068592e359fdb804e3d9ed4781"
+checksum="6701ddfc6d0be0c2bf0f75c84375e41923c5617f04222c5e582e7011c7f8fb83
+ 6faba729a0c8baf4c00eaa9e6431a846ff4ab398155dcc3558676d850cf42546"
skip_extraction="cabal.config-${_stackage}"
nocross=yes
nopie_files="/usr/bin/stack"
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: stack: update to 2.3.1, lts-15.5
2020-05-28 12:26 [PR PATCH] stack: update to 2.3.1, lts-15.5 pullmoll
@ 2020-05-28 12:29 ` pullmoll
2020-05-31 2:20 ` pullmoll
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: pullmoll @ 2020-05-28 12:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 7599 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/22377#issuecomment-635315105
Comment:
The patch to disambiguate the `LTS`, `Nightly`, and `SnapName` gets the build farther than before.
This is the current error message for `src/Stack/Config.hs`:
```
[ 68 of 109] Compiling Stack.Config ( src/Stack/Config.hs, /builddir/stack-2.3.1/dist-newstyle/build/x86_64-linux/ghc-8.8.3/stack-2.3.1/build/Stack/Config.o )
src/Stack/Config.hs:158:32: error:
• Variable not in scope:
nightlySnapshotLocation
:: time-1.9.3:Data.Time.Calendar.Days.Day -> RawSnapshotLocation
• Perhaps you meant ‘defaultSnapshotLocation’ (imported from Stack.Prelude)
|
158 | ARLatestNightly -> nightlySnapshotLocation . snapshotsNightly <$> getSnapshots
| ^^^^^^^^^^^^^^^^^^^^^^^
src/Stack/Config.hs:163:40: error:
• Variable not in scope:
ltsSnapshotLocation :: Int -> Int -> RawSnapshotLocation
• Perhaps you meant one of these:
‘snapshotLocation’ (imported from Stack.Prelude),
‘smwSnapshotLocation’ (imported from Stack.Types.SourceMap)
|
163 | Just y -> return $ ltsSnapshotLocation x y
| ^^^^^^^^^^^^^^^^^^^
src/Stack/Config.hs:169:37: error:
• Variable not in scope:
ltsSnapshotLocation :: IntMap.Key -> Int -> RawSnapshotLocation
• Perhaps you meant one of these:
‘snapshotLocation’ (imported from Stack.Prelude),
‘smwSnapshotLocation’ (imported from Stack.Types.SourceMap)
|
169 | in return $ ltsSnapshotLocation x y
| ^^^^^^^^^^^^^^^^^^^
src/Stack/Config.hs:177:24: error:
• Variable not in scope:
ltsSnapshotLocation :: IntMap.Key -> Int -> RawSnapshotLocation
• Perhaps you meant one of these:
‘snapshotLocation’ (imported from Stack.Prelude),
‘smwSnapshotLocation’ (imported from Stack.Types.SourceMap)
|
177 | let mlts = uncurry ltsSnapshotLocation <$>
| ^^^^^^^^^^^^^^^^^^^
src/Stack/Config.hs:179:23: error:
• Variable not in scope:
nightlySnapshotLocation
:: time-1.9.3:Data.Time.Calendar.Days.Day -> RawSnapshotLocation
• Perhaps you meant ‘defaultSnapshotLocation’ (imported from Stack.Prelude)
|
179 | pure $ fromMaybe (nightlySnapshotLocation (snapshotsNightly snapshots)) mlts
| ^^^^^^^^^^^^^^^^^^^^^^^
src/Stack/Config.hs:374:6: error:
• Couldn't match expected type ‘RIO env a’
with actual type ‘(PantryConfig -> RIO env0 a0) -> RIO env0 a0’
• Probable cause: ‘withPantryConfig’ is applied to too few arguments
In a stmt of a 'do' block:
withPantryConfig
pantryRoot
hsc
(maybe HpackBundled HpackCommand
$ getFirst configMonoidOverrideHpack)
clConnectionCount
(fromFirst defaultCasaRepoPrefix configMonoidCasaRepoPrefix)
defaultCasaMaxPerRequest
(\ configPantryConfig
-> initUserStorage
(configStackRoot </> relFileStorage)
(\ configUserStorage -> inner Config {..}))
In the expression:
do mstackWorkEnv <- liftIO $ lookupEnv stackWorkEnvVar
let mproject = ...
configAllowLocals = ...
configWorkDir0 <- maybe
(return relDirStackWork) (liftIO . parseRelDir) mstackWorkEnv
let configWorkDir = fromFirst configWorkDir0 configMonoidWorkDir
configLatestSnapshot
= fromFirst
"https://s3.amazonaws.com/haddock.stackage.org/snapshots.json"
configMonoidLatestSnapshot
....
....
In an equation for ‘configFromConfigMonoid’:
configFromConfigMonoid
configStackRoot
configUserConfigPath
configResolver
configProject
ConfigMonoid {..}
inner
= do mstackWorkEnv <- liftIO $ lookupEnv stackWorkEnvVar
let mproject = ...
....
configWorkDir0 <- maybe
(return relDirStackWork) (liftIO . parseRelDir) mstackWorkEnv
....
• Relevant bindings include
inner :: Config -> RIO env a (bound at src/Stack/Config.hs:193:36)
configFromConfigMonoid :: Path Abs Dir
-> Path Abs File
-> Maybe AbstractResolver
-> ProjectConfig (Project, Path Abs File)
-> ConfigMonoid
-> (Config -> RIO env a)
-> RIO env a
(bound at src/Stack/Config.hs:191:1)
|
374 | withPantryConfig
| ^^^^^^^^^^^^^^^^...
src/Stack/Config.hs:381:32: error:
• Couldn't match expected type ‘RawSnapshotLocation’
with actual type ‘RIO env a’
• In the expression:
initUserStorage
(configStackRoot </> relFileStorage)
(\ configUserStorage -> inner Config {..})
In the 7th argument of ‘withPantryConfig’, namely
‘(\ configPantryConfig
-> initUserStorage
(configStackRoot </> relFileStorage)
(\ configUserStorage -> inner Config {..}))’
In a stmt of a 'do' block:
withPantryConfig
pantryRoot
hsc
(maybe HpackBundled HpackCommand
$ getFirst configMonoidOverrideHpack)
clConnectionCount
(fromFirst defaultCasaRepoPrefix configMonoidCasaRepoPrefix)
defaultCasaMaxPerRequest
(\ configPantryConfig
-> initUserStorage
(configStackRoot </> relFileStorage)
(\ configUserStorage -> inner Config {..}))
• Relevant bindings include
inner :: Config -> RIO env a (bound at src/Stack/Config.hs:193:36)
configFromConfigMonoid :: Path Abs Dir
-> Path Abs File
-> Maybe AbstractResolver
-> ProjectConfig (Project, Path Abs File)
-> ConfigMonoid
-> (Config -> RIO env a)
-> RIO env a
(bound at src/Stack/Config.hs:191:1)
|
381 | (\configPantryConfig -> initUserStorage
| ^^^^^^^^^^^^^^^...
src/Stack/Config.hs:383:39: error:
• Couldn't match expected type ‘PantryConfig’
with actual type ‘Stack.Prelude.SnapName’
• In the ‘configPantryConfig’ field of a record
In the first argument of ‘inner’, namely ‘Config {..}’
In the expression: inner Config {..}
|
383 | (\configUserStorage -> inner Config {..}))
| ^^^^^^^^^^^
=> ERROR: stack-2.3.1_1: do_build: 'HOME=$PWD cabal new-build ${makejobs} --flag disable-git-info' exited with 1
=> ERROR: in do_build() at srcpkgs/stack/template:24
```
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: stack: update to 2.3.1, lts-15.5
2020-05-28 12:26 [PR PATCH] stack: update to 2.3.1, lts-15.5 pullmoll
2020-05-28 12:29 ` pullmoll
@ 2020-05-31 2:20 ` pullmoll
2020-05-31 2:44 ` [PR PATCH] [Updated] " pullmoll
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: pullmoll @ 2020-05-31 2:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 254 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/22377#issuecomment-636410604
Comment:
Trying with info from [this link](https://github.com/commercialhaskell/stack/issues/5298) detailing the problem.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] stack: update to 2.3.1, lts-15.5
2020-05-28 12:26 [PR PATCH] stack: update to 2.3.1, lts-15.5 pullmoll
2020-05-28 12:29 ` pullmoll
2020-05-31 2:20 ` pullmoll
@ 2020-05-31 2:44 ` pullmoll
2020-05-31 2:46 ` pullmoll
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: pullmoll @ 2020-05-31 2:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 440 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages stack
https://github.com/void-linux/void-packages/pull/22377
stack: update to 2.3.1, lts-15.5
This still fails to build with errors in src/Stack/Config.hs,
so this is WIP and not yet ready to merge.
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/22377.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-stack-22377.patch --]
[-- Type: text/x-diff, Size: 1840 bytes --]
From 516316a03bff238a08fd0bd47f27928f3db90e7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 28 May 2020 14:25:09 +0200
Subject: [PATCH] stack: update to 2.3.1, lts-15.5
Using "cabal update 'hackage.haskell.org,2020-04-29T20:25:58Z'" to
stick to the successful build report on hackage. In this case:
https://hackage.haskell.org/package/stack-2.3.1/reports/1
[ci skip]
---
srcpkgs/stack/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 38817375fa2..fb43114dfb6 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
# Template file for 'stack'
pkgname=stack
-version=2.3.0.1
+version=2.3.1
revision=1
-_stackage="lts-15.4"
+_stackage="lts-15.5"
hostmakedepends="cabal-install pkg-config unzip"
makedepends="zlib-devel pcre-devel"
depends="git gmp-devel iana-etc"
@@ -12,15 +12,15 @@ license="BSD-3-Clause"
homepage="https://haskellstack.org"
distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="a303a144dd3a37479e5b0fbf14d24e8d25d510bb038e413f14680ddb91036fd6
- 4147e6738cf6ef38cfd48048ef0992fb00e786068592e359fdb804e3d9ed4781"
+checksum="6701ddfc6d0be0c2bf0f75c84375e41923c5617f04222c5e582e7011c7f8fb83
+ 6faba729a0c8baf4c00eaa9e6431a846ff4ab398155dcc3558676d850cf42546"
skip_extraction="cabal.config-${_stackage}"
nocross=yes
nopie_files="/usr/bin/stack"
do_build() {
cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/cabal.config-${_stackage} cabal.config
- HOME=$PWD cabal new-update
+ HOME=$PWD cabal update 'hackage.haskell.org,2020-04-29T20:25:58Z'
HOME=$PWD cabal new-build ${makejobs} --flag disable-git-info
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: stack: update to 2.3.1, lts-15.5
2020-05-28 12:26 [PR PATCH] stack: update to 2.3.1, lts-15.5 pullmoll
` (2 preceding siblings ...)
2020-05-31 2:44 ` [PR PATCH] [Updated] " pullmoll
@ 2020-05-31 2:46 ` pullmoll
2020-05-31 11:04 ` [PR PATCH] [Updated] " pullmoll
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: pullmoll @ 2020-05-31 2:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 170 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/22377#issuecomment-636412421
Comment:
Successful build for x86_64.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] stack: update to 2.3.1, lts-15.5
2020-05-28 12:26 [PR PATCH] stack: update to 2.3.1, lts-15.5 pullmoll
` (3 preceding siblings ...)
2020-05-31 2:46 ` pullmoll
@ 2020-05-31 11:04 ` pullmoll
2020-05-31 11:08 ` [PR PATCH] [Updated] stack: update to 2.3.1 pullmoll
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: pullmoll @ 2020-05-31 11:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 522 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages stack
https://github.com/void-linux/void-packages/pull/22377
stack: update to 2.3.1, lts-15.5
Using "cabal update 'hackage.haskell.org,2020-04-29T20:25:58Z'" to
stick to the successful build report on hackage. In this case:
https://hackage.haskell.org/package/stack-2.3.1/reports/1
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/22377.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-stack-22377.patch --]
[-- Type: text/x-diff, Size: 1734 bytes --]
From efaa51fbb2d640bdea4c70804069633c04fb7e3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 28 May 2020 14:25:09 +0200
Subject: [PATCH] stack: update to 2.3.1
Using "cabal update 'hackage.haskell.org,2020-04-29T20:25:58Z'" to
stick to the successful build report on hackage. In this case:
https://hackage.haskell.org/package/stack-2.3.1/reports/1
[ci skip]
---
srcpkgs/stack/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 38817375fa2..a5743d970f9 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,6 +1,6 @@
# Template file for 'stack'
pkgname=stack
-version=2.3.0.1
+version=2.3.1
revision=1
_stackage="lts-15.4"
hostmakedepends="cabal-install pkg-config unzip"
@@ -12,15 +12,15 @@ license="BSD-3-Clause"
homepage="https://haskellstack.org"
distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="a303a144dd3a37479e5b0fbf14d24e8d25d510bb038e413f14680ddb91036fd6
- 4147e6738cf6ef38cfd48048ef0992fb00e786068592e359fdb804e3d9ed4781"
+checksum="6701ddfc6d0be0c2bf0f75c84375e41923c5617f04222c5e582e7011c7f8fb83
+ 6faba729a0c8baf4c00eaa9e6431a846ff4ab398155dcc3558676d850cf42546"
skip_extraction="cabal.config-${_stackage}"
nocross=yes
nopie_files="/usr/bin/stack"
do_build() {
cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/cabal.config-${_stackage} cabal.config
- HOME=$PWD cabal new-update
+ HOME=$PWD cabal update 'hackage.haskell.org,2020-04-29T20:25:58Z'
HOME=$PWD cabal new-build ${makejobs} --flag disable-git-info
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] stack: update to 2.3.1
2020-05-28 12:26 [PR PATCH] stack: update to 2.3.1, lts-15.5 pullmoll
` (4 preceding siblings ...)
2020-05-31 11:04 ` [PR PATCH] [Updated] " pullmoll
@ 2020-05-31 11:08 ` pullmoll
2020-05-31 11:13 ` pullmoll
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: pullmoll @ 2020-05-31 11:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 512 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages stack
https://github.com/void-linux/void-packages/pull/22377
stack: update to 2.3.1
Using "cabal update 'hackage.haskell.org,2020-04-29T20:25:58Z'" to
stick to the successful build report on hackage. In this case:
https://hackage.haskell.org/package/stack-2.3.1/reports/1
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/22377.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-stack-22377.patch --]
[-- Type: text/x-diff, Size: 1679 bytes --]
From 4acc2b038c0a3958de7e27036db9f0928431a32b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 28 May 2020 14:25:09 +0200
Subject: [PATCH] stack: update to 2.3.1
Using "cabal update 'hackage.haskell.org,2020-04-29T20:25:58Z'" to
stick to the successful build report on hackage. In this case:
https://hackage.haskell.org/package/stack-2.3.1/reports/1
[ci skip]
---
srcpkgs/stack/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 38817375fa2..d33a2404a8f 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,6 +1,6 @@
# Template file for 'stack'
pkgname=stack
-version=2.3.0.1
+version=2.3.1
revision=1
_stackage="lts-15.4"
hostmakedepends="cabal-install pkg-config unzip"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
homepage="https://haskellstack.org"
distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="a303a144dd3a37479e5b0fbf14d24e8d25d510bb038e413f14680ddb91036fd6
+checksum="6701ddfc6d0be0c2bf0f75c84375e41923c5617f04222c5e582e7011c7f8fb83
4147e6738cf6ef38cfd48048ef0992fb00e786068592e359fdb804e3d9ed4781"
skip_extraction="cabal.config-${_stackage}"
nocross=yes
@@ -20,7 +20,7 @@ nopie_files="/usr/bin/stack"
do_build() {
cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/cabal.config-${_stackage} cabal.config
- HOME=$PWD cabal new-update
+ HOME=$PWD cabal update 'hackage.haskell.org,2020-04-29T20:25:58Z'
HOME=$PWD cabal new-build ${makejobs} --flag disable-git-info
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: stack: update to 2.3.1
2020-05-28 12:26 [PR PATCH] stack: update to 2.3.1, lts-15.5 pullmoll
` (5 preceding siblings ...)
2020-05-31 11:08 ` [PR PATCH] [Updated] stack: update to 2.3.1 pullmoll
@ 2020-05-31 11:13 ` pullmoll
2020-05-31 11:23 ` pullmoll
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: pullmoll @ 2020-05-31 11:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 224 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/22377#issuecomment-636456618
Comment:
Keeping `lts-15.4` for now as `build_style=haskell-stack` packages use that too.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: stack: update to 2.3.1
2020-05-28 12:26 [PR PATCH] stack: update to 2.3.1, lts-15.5 pullmoll
` (6 preceding siblings ...)
2020-05-31 11:13 ` pullmoll
@ 2020-05-31 11:23 ` pullmoll
2020-05-31 11:57 ` [PR PATCH] [Updated] " pullmoll
2020-05-31 12:25 ` [PR PATCH] [Merged]: " pullmoll
9 siblings, 0 replies; 11+ messages in thread
From: pullmoll @ 2020-05-31 11:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 285 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/22377#issuecomment-636456618
Comment:
Keeping `lts-15.4` for now as `build_style=haskell-stack` packages use that too.
Do we need to revbump these packages when stack is updated?
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] stack: update to 2.3.1
2020-05-28 12:26 [PR PATCH] stack: update to 2.3.1, lts-15.5 pullmoll
` (7 preceding siblings ...)
2020-05-31 11:23 ` pullmoll
@ 2020-05-31 11:57 ` pullmoll
2020-05-31 12:25 ` [PR PATCH] [Merged]: " pullmoll
9 siblings, 0 replies; 11+ messages in thread
From: pullmoll @ 2020-05-31 11:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 512 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages stack
https://github.com/void-linux/void-packages/pull/22377
stack: update to 2.3.1
Using "cabal update 'hackage.haskell.org,2020-04-29T20:25:58Z'" to
stick to the successful build report on hackage. In this case:
https://hackage.haskell.org/package/stack-2.3.1/reports/1
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/22377.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-stack-22377.patch --]
[-- Type: text/x-diff, Size: 1679 bytes --]
From 8841d7dd9afe9e2f34e4db7b1ca5f15db30c49ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 28 May 2020 14:25:09 +0200
Subject: [PATCH] stack: update to 2.3.1
Using "cabal update 'hackage.haskell.org,2020-04-29T20:25:58Z'" to
stick to the successful build report on hackage. In this case:
https://hackage.haskell.org/package/stack-2.3.1/reports/1
[ci skip]
---
srcpkgs/stack/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 38817375fa2..d33a2404a8f 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,6 +1,6 @@
# Template file for 'stack'
pkgname=stack
-version=2.3.0.1
+version=2.3.1
revision=1
_stackage="lts-15.4"
hostmakedepends="cabal-install pkg-config unzip"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
homepage="https://haskellstack.org"
distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz
https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="a303a144dd3a37479e5b0fbf14d24e8d25d510bb038e413f14680ddb91036fd6
+checksum="6701ddfc6d0be0c2bf0f75c84375e41923c5617f04222c5e582e7011c7f8fb83
4147e6738cf6ef38cfd48048ef0992fb00e786068592e359fdb804e3d9ed4781"
skip_extraction="cabal.config-${_stackage}"
nocross=yes
@@ -20,7 +20,7 @@ nopie_files="/usr/bin/stack"
do_build() {
cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/cabal.config-${_stackage} cabal.config
- HOME=$PWD cabal new-update
+ HOME=$PWD cabal update 'hackage.haskell.org,2020-04-29T20:25:58Z'
HOME=$PWD cabal new-build ${makejobs} --flag disable-git-info
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Merged]: stack: update to 2.3.1
2020-05-28 12:26 [PR PATCH] stack: update to 2.3.1, lts-15.5 pullmoll
` (8 preceding siblings ...)
2020-05-31 11:57 ` [PR PATCH] [Updated] " pullmoll
@ 2020-05-31 12:25 ` pullmoll
9 siblings, 0 replies; 11+ messages in thread
From: pullmoll @ 2020-05-31 12:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 356 bytes --]
There's a merged pull request on the void-packages repository
stack: update to 2.3.1
https://github.com/void-linux/void-packages/pull/22377
Description:
Using "cabal update 'hackage.haskell.org,2020-04-29T20:25:58Z'" to
stick to the successful build report on hackage. In this case:
https://hackage.haskell.org/package/stack-2.3.1/reports/1
[ci skip]
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2020-05-31 12:25 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-28 12:26 [PR PATCH] stack: update to 2.3.1, lts-15.5 pullmoll
2020-05-28 12:29 ` pullmoll
2020-05-31 2:20 ` pullmoll
2020-05-31 2:44 ` [PR PATCH] [Updated] " pullmoll
2020-05-31 2:46 ` pullmoll
2020-05-31 11:04 ` [PR PATCH] [Updated] " pullmoll
2020-05-31 11:08 ` [PR PATCH] [Updated] stack: update to 2.3.1 pullmoll
2020-05-31 11:13 ` pullmoll
2020-05-31 11:23 ` pullmoll
2020-05-31 11:57 ` [PR PATCH] [Updated] " pullmoll
2020-05-31 12:25 ` [PR PATCH] [Merged]: " pullmoll
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).