[arch-commits] Commit in stack/trunk (PKGBUILD http-client-0.5.patch)
Date: Friday, September 16, 2016 @ 13:47:14
Author: felixonmars
Revision: 189650
upgpkg: stack 1.2.0-1
rebuild with QuickCheck-2.9.2, aeson-compat-0.3.6, aeson-pretty-0.8.2,
attoparsec-0.13.1.0, conduit-combinators-1.0.6, cryptonite-0.20, darcs-2.12.4,
generic-deriving-1.11.1, hOpenPGP-2.5.2, hpack-0.15.0, hasktags-0.69.2.1,
hoogle-5.0.4, hopenpgp-tools-0.19.3, http-client-0.5.3.2,
http-client-tls-0.3.2, http-conduit-2.2.2. math-functions-0.2.0.2.
mono-traversable-1.0.1, optparse-applicative-0.13.0.0, stack-1.2.0, x509-1.6.4,
x509-validation-1.6.4, yaml-0.8.18.6, zip-archive-0.3.0.5
Modified:
stack/trunk/PKGBUILD
Deleted:
stack/trunk/http-client-0.5.patch
---+
PKGBUILD | 68 ++-
http-client-0.5.patch | 438
2 files changed, 22 insertions(+), 484 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-09-16 12:58:16 UTC (rev 189649)
+++ PKGBUILD2016-09-16 13:47:14 UTC (rev 189650)
@@ -4,61 +4,37 @@
pkgbase=stack
pkgname=(stack haskell-stack)
-pkgver=1.1.2
-pkgrel=23
+pkgver=1.2.0
+pkgrel=1
pkgdesc="The Haskell Tool Stack"
url="https://github.com/commercialhaskell/stack;
license=("custom:BSD3")
arch=('i686' 'x86_64')
-makedepends=("ghc=8.0.1" "haskell-aeson" "haskell-ansi-terminal"
"haskell-async"
- "haskell-attoparsec" "haskell-base-compat"
"haskell-base16-bytestring"
+makedepends=("ghc=8.0.1" "haskell-aeson" "haskell-annotated-wl-pprint"
"haskell-ansi-terminal"
+ "haskell-async" "haskell-attoparsec" "haskell-base-compat"
"haskell-base16-bytestring"
"haskell-base64-bytestring" "haskell-binary-tagged"
"haskell-blaze-builder"
- "haskell-byteable" "haskell-conduit" "haskell-conduit-extra"
"haskell-cryptohash"
- "haskell-cryptohash-conduit" "haskell-edit-distance"
"haskell-either"
- "haskell-enclosed-exceptions" "haskell-errors"
"haskell-exceptions" "haskell-extra"
- "haskell-fast-logger" "haskell-filelock" "haskell-fsnotify"
"haskell-generic-deriving"
- "haskell-gitrev" "haskell-hashable" "haskell-hastache"
"haskell-hit"
- "haskell-http-client" "haskell-http-client-tls"
"haskell-http-conduit"
- "haskell-http-types" "haskell-hpack" "haskell-lifted-base"
"haskell-microlens"
- "haskell-monad-control" "haskell-monad-logger"
"haskell-monad-unlift" "haskell-mtl"
- "haskell-open-browser" "haskell-optparse-applicative"
"haskell-optparse-simple"
- "haskell-path" "haskell-path-io" "haskell-persistent"
"haskell-persistent-sqlite"
+ "haskell-byteable" "haskell-clock" "haskell-conduit"
"haskell-conduit-extra"
+ "haskell-cryptohash" "haskell-cryptohash-conduit"
"haskell-edit-distance"
+ "haskell-either" "haskell-enclosed-exceptions" "haskell-errors"
"haskell-exceptions"
+ "haskell-extra" "haskell-fast-logger" "haskell-filelock"
"haskell-fsnotify"
+ "haskell-generic-deriving" "haskell-gitrev" "haskell-hashable"
"haskell-hastache"
+ "haskell-hit" "haskell-http-client" "haskell-http-client-tls"
"haskell-http-conduit"
+ "haskell-http-types" "haskell-hpack" "haskell-lifted-async"
"haskell-lifted-base"
+ "haskell-microlens" "haskell-monad-control" "haskell-monad-logger"
+ "haskell-monad-unlift" "haskell-mtl" "haskell-open-browser"
+ "haskell-optparse-applicative" "haskell-optparse-simple"
"haskell-path"
+ "haskell-path-io" "haskell-persistent" "haskell-persistent-sqlite"
"haskell-persistent-template" "haskell-project-template"
"haskell-regex-applicative-text" "haskell-resourcet"
"haskell-retry" "haskell-safe"
- "haskell-semigroups" "haskell-split" "haskell-stm"
"haskell-streaming-commons"
- "haskell-tar" "haskell-temporary" "haskell-text"
"haskell-text-binary" "haskell-tls"
- "haskell-transformers-base" "haskell-unix-compat"
"haskell-unordered-containers"
+ "haskell-semigroups" "haskell-split" "haskell-stm" "haskell-store"
+ "haskell-streaming-commons" "haskell-tar" "haskell-temporary"
"haskell-text"
+ "haskell-text-binary" "haskell-tls" "haskell-transformers-base"
+ "haskell-unicode-transforms" "haskell-unix-compat"
"haskell-unordered-containers"
"haskell-vector" "haskell-vector-binary-instances" "haskell-yaml"
"haskell-zip-archive" "haskell-zlib")
-source=("http://hackage.haskell.org/packages/archive/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz;
-http-client-0.5.patch)
-sha256sums=('fc836b24fdeac54244fc79b6775d5edee146b7e552ad8e69596c7cc2f2b10625'
-'01f2d69bda507a7b0660495a1a196a07123e8c36321c4204b0a137bf5737fa38')
[arch-commits] Commit in stack/trunk (PKGBUILD http-client-0.5.patch)
Date: Wednesday, July 27, 2016 @ 05:45:13
Author: felixonmars
Revision: 184476
upgpkg: stack 1.1.2-13
Added:
stack/trunk/http-client-0.5.patch
Modified:
stack/trunk/PKGBUILD
---+
PKGBUILD | 16 +
http-client-0.5.patch | 438
2 files changed, 451 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-07-27 05:30:41 UTC (rev 184475)
+++ PKGBUILD2016-07-27 05:45:13 UTC (rev 184476)
@@ -5,7 +5,7 @@
pkgbase=stack
pkgname=(stack haskell-stack)
pkgver=1.1.2
-pkgrel=12
+pkgrel=13
pkgdesc="The Haskell Tool Stack"
url="https://github.com/commercialhaskell/stack;
license=("custom:BSD3")
@@ -30,8 +30,10 @@
"haskell-transformers-base" "haskell-unix-compat"
"haskell-unordered-containers"
"haskell-vector" "haskell-vector-binary-instances" "haskell-yaml"
"haskell-zip-archive" "haskell-zlib")
-source=("http://hackage.haskell.org/packages/archive/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz;)
-sha256sums=('fc836b24fdeac54244fc79b6775d5edee146b7e552ad8e69596c7cc2f2b10625')
+source=("http://hackage.haskell.org/packages/archive/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz;
+http-client-0.5.patch)
+sha256sums=('fc836b24fdeac54244fc79b6775d5edee146b7e552ad8e69596c7cc2f2b10625'
+'01f2d69bda507a7b0660495a1a196a07123e8c36321c4204b0a137bf5737fa38')
prepare() {
sed -e 's/zip-archive >=0.2.3.7 && <0.3,/zip-archive >=0.2.3.7 \&\&
<0.4,/' \
@@ -43,7 +45,15 @@
-e 's/transformers >=0.3.0.0 && <0.5,/transformers >=0.3.0.0 \&\&
<0.6,/' \
-e 's/transformers >=0.4.2.0 && <0.5/transformers >=0.4.2.0 \&\&
<0.6/' \
-e 's/monad-unlift >=0.1.2.0 && <0.2,/monad-unlift >=0.1.2.0 \&\&
<0.3,/' \
+-e 's/http-client >=0.4.17 && <0.5,/http-client >=0.4.17 \&\& <0.6,/' \
+-e 's/http-client >=0.4.28 && <0.5,/http-client >=0.4.28 \&\& <0.6,/' \
+-e 's/http-client-tls >=0.2.2 && <0.3,/http-client-tls >=0.2.2 \&\&
<0.4,/' \
+-e 's/http-conduit >=2.1.7 && <2.2,/http-conduit >=2.1.7 \&\& <2.3,/' \
+-e 's/extra >=1.4.6 && <1.5,/extra >=1.4.6 \&\& <1.6,/' \
-i ${pkgbase}-${pkgver}/${pkgbase}.cabal
+
+cd $pkgbase-$pkgver
+patch -p1 -i ../http-client-0.5.patch
}
build() {
Added: http-client-0.5.patch
===
--- http-client-0.5.patch (rev 0)
+++ http-client-0.5.patch 2016-07-27 05:45:13 UTC (rev 184476)
@@ -0,0 +1,438 @@
+From f40d403587c923c92dad2c80f74f0f4e837297de Mon Sep 17 00:00:00 2001
+From: Simon Jakobi
+Date: Wed, 6 Jul 2016 00:09:36 +0200
+Subject: [PATCH 1/2] Use http-client-0.5.0, http-conduit-2.2.0,
+ http-client-tls-0.3.0
+
+Closes https://github.com/commercialhaskell/stack/issues/2332.
+---
+ src/Network/HTTP/Download.hs | 10 +-
+ src/Stack/BuildPlan.hs | 16 +---
+ src/Stack/Config.hs| 6 +++---
+ src/Stack/Fetch.hs | 2 +-
+ src/Stack/New.hs | 10 --
+ src/Stack/PackageIndex.hs | 2 +-
+ src/Stack/Setup.hs | 4 ++--
+ src/Stack/Sig/Sign.hs | 2 +-
+ src/Stack/Types/Config.hs | 4 ++--
+ src/Stack/Types/TemplateName.hs| 4 ++--
+ src/Stack/Upload.hs| 7 +++
+ src/test/Network/HTTP/Download/VerifiedSpec.hs | 4 ++--
+ stack-7.8.yaml | 8
+ stack-8.0.yaml | 3 +++
+ stack.cabal| 6 +++---
+ stack.yaml | 3 +++
+ 16 files changed, 48 insertions(+), 43 deletions(-)
+
+diff --git a/src/Network/HTTP/Download.hs b/src/Network/HTTP/Download.hs
+index c12f713..92724b8 100644
+--- a/src/Network/HTTP/Download.hs
b/src/Network/HTTP/Download.hs
+@@ -16,7 +16,7 @@ module Network.HTTP.Download
+ , download
+ , redownload
+ , downloadJSON
+-, parseUrl
++, parseUrlThrow
+ , liftHTTP
+ , ask
+ , getHttpManager
+@@ -46,10 +46,10 @@ import Data.Monoid ((<>))
+ import Data.Text.Encoding.Error(lenientDecode)
+ import Data.Text.Encoding (decodeUtf8With)
+ import Data.Typeable (Typeable)
+-import Network.HTTP.Client (path)
++import Network.HTTP.Client (path, checkResponse)
+ import Network.HTTP.Client.Conduit (HasHttpManager, Manager,
Request,
+- Response, checkStatus,
+- getHttpManager, parseUrl,
++
