[arch-commits] Commit in stack/trunk (PKGBUILD conduit-extra-1.2.0.patch)
Felix Yan
felixonmars at archlinux.org
Thu Oct 26 07:09:15 UTC 2017
Date: Thursday, October 26, 2017 @ 07:09:14
Author: felixonmars
Revision: 264406
upgpkg: stack 1.5.99.20171022-1
rebuild with conduit-extra,1.2.0
Added:
stack/trunk/conduit-extra-1.2.0.patch
Modified:
stack/trunk/PKGBUILD
---------------------------+
PKGBUILD | 53 +++++++++++++++++--------------
conduit-extra-1.2.0.patch | 73 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 102 insertions(+), 24 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-10-26 06:20:41 UTC (rev 264405)
+++ PKGBUILD 2017-10-26 07:09:14 UTC (rev 264406)
@@ -3,9 +3,9 @@
# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
pkgname=stack
-pkgver=1.5.1.20170916
-_commit=4de4a450e426f70a5e5f127d7e7568f556ec9404
-pkgrel=12
+pkgver=1.5.99.20171022
+_commit=7bddfaf7f9f8cd9ec1c710fa83e77262e494eee4
+pkgrel=1
pkgdesc="The Haskell Tool Stack"
url="https://github.com/commercialhaskell/stack"
license=("custom:BSD3")
@@ -32,36 +32,41 @@
conflicts=('haskell-stack')
replaces=('haskell-stack')
install="stack.install"
-source=("$pkgname-$pkgver.tar.gz::https://github.com/commercialhaskell/stack/archive/$_commit.tar.gz")
-sha512sums=('6bb019c61e89631d83704fe3215d2cb7c790d150ad5b8a2e8e3863ad644aea5306aa4bb02bd64f9a6164bf540f5b98d042f30712029e1f5e314a4b6766d2b931')
+source=("$pkgname-$_commit.tar.gz::https://github.com/commercialhaskell/stack/archive/$_commit.tar.gz"
+ conduit-extra-1.2.0.patch)
+sha512sums=('a40f54f6ec020826315098aaed75037b9da6543a132f1f39a31dfb40a394557b3157f0b4bd00f43cf97be5fa4d72cce54e9cdbc28e1f33244dda08d6cd0b63d2'
+ '7b10127222a93a2a3891f55219e388ed4f5484dc285ad858a163835eba583ba09367831a1b4e70da430dbc21e70d06ea2cd3c1491a2c957c862302d3584aea39')
prepare() {
- mv $pkgname-$_commit $pkgname-$pkgver
+ mv $pkgname-$_commit $pkgname-$pkgver
+
+ cd $pkgname-$pkgver
+ patch -p1 -i ../conduit-extra-1.2.0.patch
}
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "${srcdir}/${pkgname}-${pkgver}"
- runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
- --prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
- --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid \
- -f-disable-git-info -f-integration-tests -f-static -f-hide-dependency-versions
- runhaskell Setup build
- runhaskell Setup register --gen-script
- runhaskell Setup unregister --gen-script
- sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
- sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+ runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+ --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid \
+ -f-disable-git-info -f-integration-tests -f-static -f-hide-dependency-versions
+ runhaskell Setup build
+ runhaskell Setup register --gen-script
+ runhaskell Setup unregister --gen-script
+ sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+ sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "${srcdir}/${pkgname}-${pkgver}"
- install -D -m744 register.sh "${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
- install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
- runhaskell Setup copy --destdir="${pkgdir}"
- install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+ install -D -m744 register.sh "${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+ install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+ runhaskell Setup copy --destdir="${pkgdir}"
+ install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
- LD_PRELOAD=$(ls "$pkgdir"/usr/lib/libHSstack-*-ghc*.so) "${pkgdir}"/usr/bin/stack --bash-completion-script /usr/bin/stack > stack_completion_script
- install -Dm644 stack_completion_script "${pkgdir}/usr/share/bash-completion/completions/stack"
+ LD_PRELOAD=$(ls "$pkgdir"/usr/lib/libHSstack-*-ghc*.so) "${pkgdir}"/usr/bin/stack --bash-completion-script /usr/bin/stack > stack_completion_script
+ install -Dm644 stack_completion_script "${pkgdir}/usr/share/bash-completion/completions/stack"
}
Added: conduit-extra-1.2.0.patch
===================================================================
--- conduit-extra-1.2.0.patch (rev 0)
+++ conduit-extra-1.2.0.patch 2017-10-26 07:09:14 UTC (rev 264406)
@@ -0,0 +1,73 @@
+commit 6ae91cd88fe276eb6d5dd517760395b2d0d180a0
+Author: Felix Yan <felixonmars at archlinux.org>
+Date: Thu Oct 26 14:48:08 2017 +0800
+
+ Support conduit-extra 1.2.0
+
+diff --git a/doc/GUIDE.md b/doc/GUIDE.md
+index c741338b..8dfbfc1f 100644
+--- a/doc/GUIDE.md
++++ b/doc/GUIDE.md
+@@ -1085,7 +1085,7 @@ The following changes will be made to stack.yaml:
+ - aeson-0.10.0.0
+ - aeson-compat-0.3.0.0
+ - attoparsec-0.13.0.1
+- - conduit-extra-1.1.9.2
++ - conduit-extra-1.2.0
+ - email-validate-2.2.0
+ - hex-0.1.2
+ - http-api-data-0.2.2
+@@ -2039,11 +2039,11 @@ image:
+ and then run `stack image container` and then `docker images` to list
+ the images.
+
+-Note that the executable will be built in the development environment
+-and copied to the container, so the dev OS must match that of the
++Note that the executable will be built in the development environment
++and copied to the container, so the dev OS must match that of the
+ container OS. This is easily accomplished using [Docker integration](docker_integration.md),
+-under which the exe emitted by `stack build` will be built on the
+-Docker container, not the local OS.
++under which the exe emitted by `stack build` will be built on the
++Docker container, not the local OS.
+
+ The executable will be stored under `/usr/local/bin/<your-project>-exe`
+ in the running container.
+diff --git a/src/Data/Attoparsec/Interpreter.hs b/src/Data/Attoparsec/Interpreter.hs
+index ca9285e1..02b5a971 100644
+--- a/src/Data/Attoparsec/Interpreter.hs
++++ b/src/Data/Attoparsec/Interpreter.hs
+@@ -146,9 +146,9 @@ getInterpreterArgs file = do
+
+ decodeError e =
+ case e of
+- ParseError ctxs _ (Position line col) ->
++ ParseError ctxs _ (Position line col offset) ->
+ if null ctxs
+ then "Parse error"
+ else ("Expecting " ++ intercalate " or " ctxs)
+- ++ " at line " ++ show line ++ ", column " ++ show col
++ ++ " at line " ++ show line ++ ", column " ++ show col ++ ", offset " ++ show offset
+ DivergentParser -> "Divergent parser"
+diff --git a/stack.cabal b/stack.cabal
+index d29ab9df..1e0418cc 100644
+--- a/stack.cabal
++++ b/stack.cabal
+@@ -198,7 +198,7 @@ library
+ , bytestring >= 0.10.4.0
+ , clock >= 0.7.2
+ , conduit >= 1.2.8
+- , conduit-extra >= 1.1.14
++ , conduit-extra >= 1.2.0
+ , containers >= 0.5.5.1
+ , cryptonite >= 0.19 && < 0.25
+ , cryptonite-conduit >= 0.1 && < 0.3
+@@ -389,7 +389,7 @@ test-suite stack-integration-test
+ , base >= 4.7 && < 5
+ , bytestring >= 0.10.4.0
+ , conduit >= 1.2.8
+- , conduit-extra >= 1.1.14
++ , conduit-extra >= 1.2.0
+ , containers >= 0.5.5.1
+ , directory >= 1.2.1.0 && < 1.4
+ , filepath >= 1.3.0.2
More information about the arch-commits
mailing list