9bf047e · obelisk · git.iko.soy

git.iko.soy/obelisk

Merge pull request #385 from obsidiansystems/master

Merge master to develop

commit9bf047e7c86535143704285cec3751e947e7c92d authorAli Abrar <aliabrar@gmail.com> dateFri 22 Mar 2019, 16:18 (8 years ago) parentabc320a c1fa9c9

2 files changed+2−2

unifiedsplit

lib/command/src/Obelisk/Command/Deploy.hs+1−1

@@ -136,7 +136,7 @@ deployPush deployPath getNixBuilders = do

136136 withSpinner "Uploading closures" $ ifor_ buildOutputByHost $ \host outputPath -> do

137137 callProcess'

138138 (Map.fromList [("NIX_SSHOPTS", unwords sshOpts)])

139− "nix-copy-closure" ["-v", "--to", "root@" <> host, "--gzip", outputPath]

139+ "nix-copy-closure" ["-v", "--to", "--use-substitutes", "root@" <> host, "--gzip", outputPath]

140140 withSpinner "Uploading config" $ ifor_ buildOutputByHost $ \host _ -> do

141141 callProcessAndLogOutput (Notice, Warning) $

142142 proc "rsync"

lib/route/src/Obelisk/Route/Frontend.hs+1−1

@@ -178,7 +178,7 @@ instance (Monad m, SetRoute t r m) => SetRoute t r (QueryT t q m) where

178178runRoutedT :: RoutedT t r m a -> Dynamic t r -> m a

179179runRoutedT = runReaderT . unRoutedT

180180

181−mapRoutedT :: (m a -> n a) -> RoutedT t r m a -> RoutedT t r n a

181+mapRoutedT :: (m a -> n b) -> RoutedT t r m a -> RoutedT t r n b

182182mapRoutedT f = RoutedT . mapReaderT f . unRoutedT

183183

184184withRoutedT :: (Dynamic t r -> Dynamic t r') -> RoutedT t r' m a -> RoutedT t r m a