From 44b6f2dcb4e21ca539b11773f886dc7a0e8685d1 Mon Sep 17 00:00:00 2001
From: vi <vi@computational.law>
Date: Tue, 5 Dec 2017 17:23:37 +0100
Subject: [PATCH] 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.
---
 https-everywhere-rules.cabal | 58 ++++++++++++++++++++++--------------
 stack.yaml                   | 11 ++-----
 2 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/https-everywhere-rules.cabal b/https-everywhere-rules.cabal
index 90d9dda..f0cabd1 100644
--- a/https-everywhere-rules.cabal
+++ b/https-everywhere-rules.cabal
@@ -38,17 +38,17 @@ library
     Data.Text.ICU.Extras,
     Paths_https_everywhere_rules
   build-depends:
-    base               >= 4.7  && < 4.9,
-    attoparsec         >= 0.12 && < 0.13,
-    directory          >= 1.2  && < 1.3,
-    errors             >= 1.4  && < 2.1,
+    base               >= 4.7  && < 4.10,
+    attoparsec         >= 0.12 && < 0.14,
+    directory          >= 1.2  && < 1.4,
+    errors             >= 1.4  && < 2.2,
     filepath           >= 1.3  && < 1.5,
     functor-infix      >= 0.0  && < 0.1,
-    http-client        >= 0.3  && < 0.5,
-    lens               >= 4.3  && < 4.13,
+    http-client        >= 0.3  && < 0.6,
+    lens               >= 4.3  && < 4.16,
     network            >= 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,
     taggy-lens         >= 0.1  && < 0.2,
     text               >= 1.1  && < 1.3,
@@ -64,18 +64,18 @@ test-suite spec
   type:
     exitcode-stdio-1.0
   build-depends:
-    base               >= 4.7  && < 4.9,
-    attoparsec         >= 0.12 && < 0.13,
-    directory          >= 1.2  && < 1.3,
-    errors             >= 1.4  && < 2.1,
+    base               >= 4.7  && < 4.10,
+    attoparsec         >= 0.12 && < 0.14,
+    directory          >= 1.2  && < 1.4,
+    errors             >= 1.4  && < 2.2,
     filepath           >= 1.3  && < 1.5,
     functor-infix      >= 0.0  && < 0.1,
-    hspec              >= 2.0  && < 2.2,
-    http-client        >= 0.3  && < 0.5,
-    lens               >= 4.3  && < 4.13,
+    hspec              >= 2.0  && < 2.5,
+    http-client        >= 0.3  && < 0.6,
+    lens               >= 4.3  && < 4.16,
     network            >= 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,
     taggy-lens         >= 0.1  && < 0.2,
     text               >= 1.1  && < 1.3,
@@ -92,6 +92,15 @@ test-suite spec
     -DTEST
   ghc-options:
     -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
   description:
@@ -106,14 +115,17 @@ executable redirect-proxy
     examples
   main-is:
     RedirectProxy.hs
-  build-depends:
-    base >= 4.7  && < 4.9,
-    bytestring,
-    http-proxy,
-    http-types,
-    https-everywhere-rules,
-    network-uri,
-    wai
+  if flag(build-examples)
+    build-depends:
+      base >= 4.7  && < 4.10,
+      bytestring,
+      http-proxy,
+      http-types,
+      https-everywhere-rules,
+      network-uri,
+      wai
   if !(flag(build-examples))
     buildable:
       False
+  default-language:
+    Haskell2010
\ No newline at end of file
diff --git a/stack.yaml b/stack.yaml
index 22927cf..6ba0ee1 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,11 +1,6 @@
-flags: {}
 packages:
 - .
-- location:
-    git: https://github.com/erikd/http-proxy.git
-    commit: 3f7a4013c126215e61eeb34a2372b4bd1ef77c76
 extra-deps:
-- functor-infix-0.0.3
-- taggy-0.2.0
-- taggy-lens-0.1.2
-resolver: lts-3.12
+- functor-infix-0.0.5
+- http-proxy-0.1.0.5
+resolver: lts-8.24