use version 2.1 and specify lts without version as specified in docs

.circleci/config.yml

@@ -1,8 +1,8 @@
-version: 2
+version: 2.1
 jobs:
   build:
     docker:
-      - image: fpco/stack-build:lts-13.22
+      - image: fpco/stack-build:lts
     steps:
       - checkout
       - restore_cache:

cmd/HocusPocus.hs

@@ -4,7 +4,8 @@
 -- [magic-wormhole](https://github.com/warner/magic-wormhole).
 module Main (main) where
 
-import Protolude
+import Protolude hiding (toS)
+import Protolude.Conv (toS)
 
 import qualified Options.Applicative as Opt
 

magic-wormhole.cabal

@@ -1,9 +1,10 @@
--- This file has been generated from package.yaml by hpack version 0.28.2.
+cabal-version: 1.12
+
+-- This file has been generated from package.yaml by hpack version 0.34.2.
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 4734e9879f3640e17bc21f36a81592698c5c136e6046390958f24fbf41c1b0d7
-
+-- hash: 273916dc30dc0c12dd3ff23ca23a6303ae69f601f17b94ff7099b3b704184a
 name:           magic-wormhole
 version:        0.3.3
 synopsis:       Interact with Magic Wormhole
@@ -21,7 +22,6 @@ maintainer:     Least Authority TFA GmbH
 license:        Apache
 license-file:   LICENSE
 build-type:     Simple
-cabal-version:  >= 1.10
 data-files:
     tests/python/derive_phase_key.py
     tests/python/nacl_exchange.py
@@ -48,7 +48,7 @@ library
     , network
     , network-uri
     , pqueue
-    , protolude >=0.2
+    , protolude >=0.3.0
     , saltine
     , spake2 >=0.4
     , stm
@@ -82,7 +82,7 @@ executable hocus-pocus
     , base >=4.6 && <5
     , magic-wormhole
     , optparse-applicative
-    , protolude >=0.2
+    , protolude >=0.3.0
     , spake2 >=0.4
     , text
   default-language: Haskell2010
@@ -98,16 +98,16 @@ test-suite tasty
       aeson
     , base >=4.6 && <5
     , bytestring
-    , hedgehog >=0.6 && <1.0
+    , hedgehog >=1.0
     , magic-wormhole
     , memory
     , process
-    , protolude >=0.2
+    , protolude >=0.3.0
     , saltine
     , spake2 >=0.3
     , stm
     , tasty
-    , tasty-hedgehog >=0.2 && <1.0
+    , tasty-hedgehog >=1.0.0
     , tasty-hspec
   other-modules:
       ClientProtocol

package.yaml

@@ -25,7 +25,7 @@ default-extensions:
 
 dependencies:
   - base >= 4.6 && < 5
-  - protolude >= 0.2
+  - protolude >= 0.3.0
 
 library:
   source-dirs: src
@@ -63,15 +63,15 @@ tests:
     dependencies:
       - aeson
       - bytestring
-      - hedgehog >= 0.6 && <1.0
+      - hedgehog >= 1.0
       - magic-wormhole
       - memory
       - process
       - saltine
       - spake2 >= 0.3
       - stm
       - tasty
-      - tasty-hedgehog >= 0.2 && <1.0
+      - tasty-hedgehog >= 1.0.0
       - tasty-hspec
 
 # These are only for tests.

src/MagicWormhole/Internal/ClientProtocol.hs

@@ -22,7 +22,8 @@ module MagicWormhole.Internal.ClientProtocol
   , phasePurpose
   ) where
 
-import Protolude hiding (phase)
+import Protolude hiding (phase, toS)
+import Protolude.Conv (toS)
 
 import Crypto.Hash (SHA256(..), hashWith)
 import qualified Crypto.KDF.HKDF as HKDF

src/MagicWormhole/Internal/Messages.hs

@@ -18,7 +18,8 @@ module MagicWormhole.Internal.Messages
   , Mood(..)
   ) where
 
-import Protolude
+import Protolude hiding (toS)
+import Protolude.Conv (toS)
 
 import Control.Monad (fail)
 import Crypto.Random (MonadRandom(..))

src/MagicWormhole/Internal/Pake.hs

@@ -14,7 +14,8 @@ module MagicWormhole.Internal.Pake
   , messageBodyToSpakeBytes
   ) where
 
-import Protolude
+import Protolude hiding (toS)
+import Protolude.Conv (toS)
 
 import Control.Monad (fail)
 import Crypto.Hash (SHA256(..))

src/MagicWormhole/Internal/Versions.hs

@@ -11,7 +11,8 @@ module MagicWormhole.Internal.Versions
     , VersionsError(..)
     ) where
 
-import Protolude hiding (phase)
+import Protolude hiding (phase, toS)
+import Protolude.Conv (toS)
 
 import Data.Aeson (FromJSON, ToJSON, (.=), object, Value(..), (.:))
 import Data.Aeson.Types (typeMismatch)

stack.yaml

@@ -1,9 +1,10 @@
-resolver: lts-13.22
+resolver: lts-16.16
 
 packages:
   - .
 
 extra-deps:
 - spake2-0.4.2
-- tasty-hedgehog-0.2.0.0
-
+- protolude-0.3.0@sha256:8361b811b420585b122a7ba715aa5923834db6e8c36309bf267df2dbf66b95ef,2693
+- hedgehog-1.0.3@sha256:dd9a25bf904fe444d5de471d0933261ef2c9a1110330460e037e0fef86fac89e,4622
+- tasty-hedgehog-1.0.0.2@sha256:f491beff9461e849f5008e5a65b2c9d7f97365e170c7ae03ea170c90b6d6877c,1845

tests/Integration.hs

@@ -7,7 +7,8 @@
 -- * if magic-wormhole is not present, these tests will pass
 module Integration (tests) where
 
-import Protolude hiding (phase, stdin, stdout)
+import Protolude hiding (phase, stdin, stdout, toS)
+import Protolude.Conv (toS)
 
 import Control.Concurrent.STM.TChan
   ( newTChan