[arch-commits] Commit in stack/trunk (PKGBUILD conduit-extra-1.2.0.patch)
Felix Yan
felixonmars at archlinux.org
Tue Dec 5 18:09:38 UTC 2017
Date: Tuesday, December 5, 2017 @ 18:09:36
Author: felixonmars
Revision: 272261
upgpkg: stack 1.6.0.20171202-1
rebuild with monad-logger,0.3.26 unliftio,0.2.0.0 hpack,0.20.0
Modified:
stack/trunk/PKGBUILD
Deleted:
stack/trunk/conduit-extra-1.2.0.patch
---------------------------+
PKGBUILD | 57 ++++++++++++++++++----------------
conduit-extra-1.2.0.patch | 73 --------------------------------------------
2 files changed, 30 insertions(+), 100 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-12-05 18:04:02 UTC (rev 272260)
+++ PKGBUILD 2017-12-05 18:09:36 UTC (rev 272261)
@@ -3,45 +3,48 @@
# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
pkgname=stack
-pkgver=1.5.99.20171022
-_commit=7bddfaf7f9f8cd9ec1c710fa83e77262e494eee4
-pkgrel=18
+pkgver=1.6.0.20171202
+_commit=59a9a84eddfd8743f18ada9a4f58562442cbc9e6
+pkgrel=1
pkgdesc="The Haskell Tool Stack"
url="https://github.com/commercialhaskell/stack"
license=("custom:BSD3")
arch=('x86_64')
-depends=('ghc-libs' "haskell-aeson" "haskell-annotated-wl-pprint" "haskell-ansi-terminal"
- "haskell-attoparsec" "haskell-base64-bytestring" "haskell-bindings-uname"
- "haskell-blaze-builder" "haskell-clock" "haskell-conduit" "haskell-conduit-extra"
- "haskell-cryptonite" "haskell-cryptonite-conduit" "haskell-echo" "haskell-exceptions"
- "haskell-extra" "haskell-fast-logger" "haskell-file-embed" "haskell-filelock"
- "haskell-fsnotify" "haskell-generic-deriving" "haskell-gitrev" "haskell-hackage-security"
- "haskell-hashable" "haskell-hastache" "haskell-http-client" "haskell-http-client-tls"
- "haskell-http-conduit" "haskell-http-types" "haskell-hpack" "haskell-memory"
- "haskell-microlens" "haskell-microlens-mtl" "haskell-mintty" "haskell-monad-logger"
- "haskell-mtl" "haskell-network-uri" "haskell-open-browser" "haskell-optparse-applicative"
- "haskell-optparse-simple" "haskell-path" "haskell-path-io" "haskell-persistent"
- "haskell-persistent-sqlite" "haskell-persistent-template" "haskell-pid1" "haskell-primitive"
- "haskell-project-template" "haskell-regex-applicative-text" "haskell-resourcet"
- "haskell-retry" "haskell-semigroups" "haskell-split" "haskell-stm" "haskell-store"
- "haskell-store-core" "haskell-streaming-commons" "haskell-tar" "haskell-text"
- "haskell-text-metrics" "haskell-tls" "haskell-unicode-transforms" "haskell-unix-compat"
- "haskell-unliftio" "haskell-unordered-containers" "haskell-vector" "haskell-yaml"
- "haskell-zip-archive" "haskell-zlib")
-makedepends=('ghc')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-annotated-wl-pprint' 'haskell-ansi-terminal'
+ 'haskell-async' 'haskell-attoparsec' 'haskell-base64-bytestring' 'haskell-bindings-uname'
+ 'haskell-blaze-builder' 'haskell-clock' 'haskell-conduit' 'haskell-conduit-extra'
+ 'haskell-cryptonite' 'haskell-cryptonite-conduit' 'haskell-echo' 'haskell-exceptions'
+ 'haskell-extra' 'haskell-fast-logger' 'haskell-file-embed' 'haskell-filelock'
+ 'haskell-fsnotify' 'haskell-generic-deriving' 'haskell-gitrev' 'haskell-hackage-security'
+ 'haskell-hashable' 'haskell-hastache' 'haskell-hpack' 'haskell-http-client'
+ 'haskell-http-client-tls' 'haskell-http-conduit' 'haskell-http-types' 'haskell-memory'
+ 'haskell-microlens' 'haskell-microlens-mtl' 'haskell-mintty' 'haskell-monad-logger'
+ 'haskell-mono-traversable' 'haskell-mtl' 'haskell-neat-interpolation' 'haskell-network-uri'
+ 'haskell-open-browser' 'haskell-optparse-applicative' 'haskell-optparse-simple'
+ 'haskell-path' 'haskell-path-io' 'haskell-persistent' 'haskell-persistent-sqlite'
+ 'haskell-persistent-template' 'haskell-pid1' 'haskell-primitive' 'haskell-project-template'
+ 'haskell-regex-applicative-text' 'haskell-resourcet' 'haskell-retry' 'haskell-semigroups'
+ 'haskell-split' 'haskell-stm' 'haskell-store' 'haskell-store-core'
+ 'haskell-streaming-commons' 'haskell-tar' 'haskell-temporary' 'haskell-text'
+ 'haskell-text-metrics' 'haskell-th-reify-many' 'haskell-tls' 'haskell-unicode-transforms'
+ 'haskell-unix-compat' 'haskell-unliftio' 'haskell-unordered-containers' 'haskell-vector'
+ 'haskell-yaml' 'haskell-zip-archive' 'haskell-zlib')
+makedepends=('ghc' 'haskell-quickcheck' 'haskell-hspec' 'haskell-smallcheck')
conflicts=('haskell-stack')
replaces=('haskell-stack')
install="stack.install"
source=("$pkgname-$_commit.tar.gz::https://github.com/commercialhaskell/stack/archive/$_commit.tar.gz"
- conduit-extra-1.2.0.patch)
-sha512sums=('a40f54f6ec020826315098aaed75037b9da6543a132f1f39a31dfb40a394557b3157f0b4bd00f43cf97be5fa4d72cce54e9cdbc28e1f33244dda08d6cd0b63d2'
- '7b10127222a93a2a3891f55219e388ed4f5484dc285ad858a163835eba583ba09367831a1b4e70da430dbc21e70d06ea2cd3c1491a2c957c862302d3584aea39')
+ https://github.com/commercialhaskell/stack/commit/8f5e42e8687b0d2ccc749b8f450cbf71b0ebf5a7.patch)
+sha512sums=('e90e2453a6864dae686558047c58d7e39d10dceb3a307ff8f304dd371a571f79ffd3a88603f17cd85485de8e4ec6f9fb734ff1fa3afad3a84ee293afa7dc4cf5'
+ 'c80009075bd10e742caa0d03161a36ffd4afb3bde17cc5785b8314209cdebfadbced1757e9863861bfc2c18e33d0696cedddb1667cf8a67d366f4659873b3be9')
prepare() {
mv $pkgname-$_commit $pkgname-$pkgver
cd $pkgname-$pkgver
- patch -p1 -i ../conduit-extra-1.2.0.patch
+ patch -p1 -i ../8f5e42e8687b0d2ccc749b8f450cbf71b0ebf5a7.patch
+
+ hpack
}
build() {
@@ -50,7 +53,7 @@
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
+ -f-disable-git-info -f-integration-tests -f-static -f-hide-dependency-versions -f-supported-build
runhaskell Setup build
runhaskell Setup register --gen-script
runhaskell Setup unregister --gen-script
Deleted: conduit-extra-1.2.0.patch
===================================================================
--- conduit-extra-1.2.0.patch 2017-12-05 18:04:02 UTC (rev 272260)
+++ conduit-extra-1.2.0.patch 2017-12-05 18:09:36 UTC (rev 272261)
@@ -1,73 +0,0 @@
-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