Dependency upgrades; lts-8.24.

While we're here, ensure Cabal doesn't expect executable-exclusive
dependencies when the build-examples flag is set to false.
master
vi 2017-12-05 17:23:37 +01:00
parent 9fcf5bc289
commit 44b6f2dcb4
2 changed files with 38 additions and 31 deletions

View File

@ -38,17 +38,17 @@ library
Data.Text.ICU.Extras, Data.Text.ICU.Extras,
Paths_https_everywhere_rules Paths_https_everywhere_rules
build-depends: build-depends:
base >= 4.7 && < 4.9, base >= 4.7 && < 4.10,
attoparsec >= 0.12 && < 0.13, attoparsec >= 0.12 && < 0.14,
directory >= 1.2 && < 1.3, directory >= 1.2 && < 1.4,
errors >= 1.4 && < 2.1, errors >= 1.4 && < 2.2,
filepath >= 1.3 && < 1.5, filepath >= 1.3 && < 1.5,
functor-infix >= 0.0 && < 0.1, functor-infix >= 0.0 && < 0.1,
http-client >= 0.3 && < 0.5, http-client >= 0.3 && < 0.6,
lens >= 4.3 && < 4.13, lens >= 4.3 && < 4.16,
network >= 2.6 && < 2.7, network >= 2.6 && < 2.7,
network-uri >= 2.6 && < 2.7, network-uri >= 2.6 && < 2.7,
pipes >= 4.1 && < 4.2, pipes >= 4.1 && < 4.4,
string-conversions >= 0.3 && < 0.5, string-conversions >= 0.3 && < 0.5,
taggy-lens >= 0.1 && < 0.2, taggy-lens >= 0.1 && < 0.2,
text >= 1.1 && < 1.3, text >= 1.1 && < 1.3,
@ -64,18 +64,18 @@ test-suite spec
type: type:
exitcode-stdio-1.0 exitcode-stdio-1.0
build-depends: build-depends:
base >= 4.7 && < 4.9, base >= 4.7 && < 4.10,
attoparsec >= 0.12 && < 0.13, attoparsec >= 0.12 && < 0.14,
directory >= 1.2 && < 1.3, directory >= 1.2 && < 1.4,
errors >= 1.4 && < 2.1, errors >= 1.4 && < 2.2,
filepath >= 1.3 && < 1.5, filepath >= 1.3 && < 1.5,
functor-infix >= 0.0 && < 0.1, functor-infix >= 0.0 && < 0.1,
hspec >= 2.0 && < 2.2, hspec >= 2.0 && < 2.5,
http-client >= 0.3 && < 0.5, http-client >= 0.3 && < 0.6,
lens >= 4.3 && < 4.13, lens >= 4.3 && < 4.16,
network >= 2.6 && < 2.7, network >= 2.6 && < 2.7,
network-uri >= 2.6 && < 2.7, network-uri >= 2.6 && < 2.7,
pipes >= 4.1 && < 4.2, pipes >= 4.1 && < 4.4,
string-conversions >= 0.3 && < 0.5, string-conversions >= 0.3 && < 0.5,
taggy-lens >= 0.1 && < 0.2, taggy-lens >= 0.1 && < 0.2,
text >= 1.1 && < 1.3, text >= 1.1 && < 1.3,
@ -92,6 +92,15 @@ test-suite spec
-DTEST -DTEST
ghc-options: ghc-options:
-Wall -Wall
other-modules:
Data.HTTPSEverywhere.Rules.Internal,
Data.HTTPSEverywhere.Rules.Internal.Parser,
Data.HTTPSEverywhere.Rules.Internal.ParserSpec,
Data.HTTPSEverywhere.Rules.Internal.Raw,
Data.HTTPSEverywhere.Rules.Internal.Types,
Data.HTTPSEverywhere.Rules.InternalSpec,
Data.Text.ICU.Extras,
Data.Text.ICU.ExtrasSpec
flag build-examples flag build-examples
description: description:
@ -106,14 +115,17 @@ executable redirect-proxy
examples examples
main-is: main-is:
RedirectProxy.hs RedirectProxy.hs
build-depends: if flag(build-examples)
base >= 4.7 && < 4.9, build-depends:
bytestring, base >= 4.7 && < 4.10,
http-proxy, bytestring,
http-types, http-proxy,
https-everywhere-rules, http-types,
network-uri, https-everywhere-rules,
wai network-uri,
wai
if !(flag(build-examples)) if !(flag(build-examples))
buildable: buildable:
False False
default-language:
Haskell2010

View File

@ -1,11 +1,6 @@
flags: {}
packages: packages:
- . - .
- location:
git: https://github.com/erikd/http-proxy.git
commit: 3f7a4013c126215e61eeb34a2372b4bd1ef77c76
extra-deps: extra-deps:
- functor-infix-0.0.3 - functor-infix-0.0.5
- taggy-0.2.0 - http-proxy-0.1.0.5
- taggy-lens-0.1.2 resolver: lts-8.24
resolver: lts-3.12