[DEVOPS-834] Apply stack2nix patch from buildkite

And stylish.diff from hydra

Author: Ben Ford

Diff for: faucet/src/Cardano/Faucet/Types/Config.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE ConstraintKinds            #-}
 {-# LANGUAGE DataKinds                  #-}
-{-# LANGUAGE DeriveAnyClass              #-}
+{-# LANGUAGE DeriveAnyClass             #-}
 {-# LANGUAGE DeriveGeneric              #-}
 {-# LANGUAGE DuplicateRecordFields      #-}
 {-# LANGUAGE FlexibleInstances          #-}
@@ -48,7 +48,7 @@ import           Cardano.Wallet.API.V1.Types (AccountIndex, Payment,
 import           Cardano.Wallet.Client (ClientError (..), WalletClient (..))
 import           Pos.Core (Address (..))
 import           Pos.Util.Mnemonic (Mnemonic)
-import Test.QuickCheck (Arbitrary(..), choose)
+import           Test.QuickCheck (Arbitrary (..), choose)
 import           Test.QuickCheck.Arbitrary.Generic
 
 import           Cardano.Faucet.Types.API
@@ -273,7 +273,7 @@ data FaucetEnv = FaucetEnv {
     -- | Client for communicating with wallet API
   , _feWalletClient  :: !(WalletClient IO)
     -- | Lock to ensure only one withdrawal at a time
-  , _feWithdrawalQ    :: !(TBQueue ProcessorPayload)
+  , _feWithdrawalQ   :: !(TBQueue ProcessorPayload)
   }
 
 makeClassy ''FaucetEnv

Diff for: faucet/src/Cardano/WalletClient.hs

@@ -2,7 +2,6 @@
 {-# LANGUAGE FlexibleContexts    #-}
 {-# LANGUAGE OverloadedStrings   #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE ViewPatterns        #-}
 {-# OPTIONS_GHC -Wall #-}
 module Cardano.WalletClient (
     withdraw
@@ -13,7 +12,7 @@ import           Cardano.Wallet.API.V1.Types (Payment (..), V1 (..))
 import qualified Cardano.Wallet.API.V1.Types as V1
 import           Control.Concurrent.STM (atomically)
 import qualified Control.Concurrent.STM.TBQueue as TBQ
-import           Control.Concurrent.STM.TMVar (newEmptyTMVar, takeTMVar, TMVar)
+import           Control.Concurrent.STM.TMVar (TMVar, newEmptyTMVar, takeTMVar)
 import           Control.Lens
 import           Control.Monad.IO.Class (liftIO)
 import           Control.Monad.Reader

Diff for: pkgs/default.nix

@@ -16519,6 +16519,8 @@ license = stdenv.lib.licenses.mit;
 , ekg-statsd
 , exceptions
 , filepath
+, generic-arbitrary
+, hspec
 , http-api-data
 , http-client
 , http-client-tls
@@ -16579,6 +16581,7 @@ ekg-core
 ekg-statsd
 exceptions
 filepath
+generic-arbitrary
 http-api-data
 http-client
 http-client-tls
@@ -16634,9 +16637,16 @@ wai-extra
 warp
 ];
 testHaskellDepends = [
+aeson
 base
+bytestring
+cardano-sl-core
 cardano-sl-wallet
+cardano-sl-wallet-new
+hspec
+mtl
 QuickCheck
+time
 ];
 doHaddock = false;
 license = stdenv.lib.licenses.mit;