Merge pull request #7 from restaumatic/stackage-18.11

stackage 18.11

Author: kozak

src/Network/VCR.hs

@@ -48,7 +48,12 @@ server = execParser opts >>= run
      <> header "VCR Proxy" )
 
 run :: Options -> IO ()
-run options@Options { mode, cassettePath, port } = do
+run options = withServer options $ do
+  forever $ threadDelay 1000000000
+
+
+withServer :: Options -> IO a -> IO a
+withServer options@Options { mode, cassettePath, port } action = do
   putStrLn $ "Starting VCR proxy, mode: " <> show mode  <> ", cassette file: " <> cassettePath <>  ", listening on port: " <> show port
   case mode of
     Record endpoint -> do
@@ -60,12 +65,12 @@ run options@Options { mode, cassettePath, port } = do
     Left  err -> die $ "Cassette: " <> cassettePath <> " couldn't be decoded or found! " <> (show err)
     Right cassette -> do
       cassetteIORef <- newIORef cassette
-      withServer options cassetteIORef $ do
+      runInternal options cassetteIORef $ do
         putStrLn "VCR proxy started"
-        forever $ threadDelay 1000000000
+        action
 
-withServer :: Options -> IORef Cassette -> IO a -> IO a
-withServer Options { mode, cassettePath, port } cassetteIORef action = do
+runInternal :: Options -> IORef Cassette -> IO a -> IO a
+runInternal Options { mode, cassettePath, port } cassetteIORef action = do
   -- Set line buffering, because if we use it from a parent process, pipes are full buffered by default
   hSetBuffering stdout LineBuffering
   started <- newEmptyMVar

stack.yaml

@@ -17,7 +17,7 @@
 #
 # resolver: ./custom-snapshot.yaml
 # resolver: https://example.com/snapshots/2018-01-01.yaml
-resolver: lts-13.6
+resolver: lts-18.11
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.
@@ -38,12 +38,8 @@ packages:
 # using the same syntax as the packages field.
 # (e.g., acme-missiles-0.3)
 extra-deps:
-  - conduit-1.2.13.1
-  - conduit-extra-1.2.3.2
-  - http-conduit-2.2.4
-  - http-proxy-0.1.0.5
-  - resourcet-1.1.11
-  - streaming-commons-0.1.19
+  - git: https://github.com/erikd/http-proxy.git
+    commit: 188f73a8dd9c994878de4f1c6429f2a6aec9d1b1
 
 # Override default flag values for local packages and extra-deps
 # flags: {}

stack.yaml.lock

@@ -5,50 +5,19 @@
 
 packages:
 - completed:
-    hackage: conduit-1.2.13.1@sha256:afd4db7fe66ae7af3d418e1a932384a8dee08df2f6299cca80e53ba964ce1228,4371
+    name: http-proxy
+    version: 0.1.2.0
+    git: https://github.com/erikd/http-proxy.git
     pantry-tree:
-      size: 1191
-      sha256: c24b0058c187a98780d227072cb701efeca1571c1c88ca331e53799cc3d051fb
+      size: 1498
+      sha256: 93869630e57ad90c1a2abbd27bf2990f48dca2dc6f26108cc96d2b1ec07f4aef
+    commit: 188f73a8dd9c994878de4f1c6429f2a6aec9d1b1
   original:
-    hackage: conduit-1.2.13.1
-- completed:
-    hackage: conduit-extra-1.2.3.2@sha256:911f76ce00b87a44ed5205b092b6150f456062e8f833c645b09c9357d986c854,4793
-    pantry-tree:
-      size: 2396
-      sha256: f968c54ae1b4cd25eb5b189341c6cc1c63e69892ad21a13c93da41238964f2ec
-  original:
-    hackage: conduit-extra-1.2.3.2
-- completed:
-    hackage: http-conduit-2.2.4@sha256:0e1e8e6f9675ae3c2f17108614b2c2f792e0647f794d713db97403b664ae5a24,2903
-    pantry-tree:
-      size: 784
-      sha256: 2d094c3836b25cd0e78df65286842dbed769b623399a2d7a6bd9018a86714d6f
-  original:
-    hackage: http-conduit-2.2.4
-- completed:
-    hackage: http-proxy-0.1.0.5@sha256:7740591b0d486b21e8cd159d0d133f6c3aa6f7e086d23aa31f29b46f8dd66c28,3597
-    pantry-tree:
-      size: 674
-      sha256: b3f028039ed38fe834764cd5a9e144ed8d061cf90b4f7570051d4decdbacc098
-  original:
-    hackage: http-proxy-0.1.0.5
-- completed:
-    hackage: resourcet-1.1.11@sha256:096a3db6774a728bbe264e3e25c4e40d60e527ebd4b90c0b311deaa8d4cf4f27,1976
-    pantry-tree:
-      size: 647
-      sha256: 90955fbe978b95e7a2e1067a7c475f1918b98ba77f80fd0953225d0dd2086ee0
-  original:
-    hackage: resourcet-1.1.11
-- completed:
-    hackage: streaming-commons-0.1.19@sha256:3a02f84578f75eac1425dca877f8d697b68d379a21970c1dad96196620404803,5262
-    pantry-tree:
-      size: 3544
-      sha256: 1a064ebd5371903f8192e0486fa1aff8030acac4e5145088106456c71ef91f2b
-  original:
-    hackage: streaming-commons-0.1.19
+    git: https://github.com/erikd/http-proxy.git
+    commit: 188f73a8dd9c994878de4f1c6429f2a6aec9d1b1
 snapshots:
 - completed:
-    size: 495200
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/13/6.yaml
-    sha256: 3baf62db5746f24561641bc15aadddbf5c973a5a1d587beb9eb9ddb4cf5628eb
-  original: lts-13.6
+    size: 586041
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/11.yaml
+    sha256: ae30d25a4691c6bb32b5766c617dff24270b2b3576ebd6047d754418e9256389
+  original: lts-18.11