git.iko.soy/obelisk
on master help sign in
Merge pull request #290 from obsidiansystems/nix-instantiate
8767400Luigy Leon
lib/command/src/Obelisk/Command/Deploy.hs+5−6
compare with master
unifiedsplit
@@ -97,13 +97,13 @@ deployPush deployPath getNixBuilders = do
97 Left err -> failWith $ "ob deploy push: couldn't read src thunk: " <> T.pack (show err)
97 Left err -> failWith $ "ob deploy push: couldn't read src thunk: " <> T.pack (show err)
98 let version = show . _thunkRev_commit $ _thunkPtr_rev thunkPtr
98 let version = show . _thunkRev_commit $ _thunkPtr_rev thunkPtr
99 builders <- getNixBuilders
99 builders <- getNixBuilders
100− buildOutput <- nixBuild $ def
100+ buildOutput <- nixCmd $ NixCmd_Build $ def
101− { _nixBuildConfig_target = Target
101+ & nixCmdConfig_target .~Target
102 { _target_path = srcPath
102 { _target_path = srcPath
103 , _target_attr = Just "server.system"
103 , _target_attr = Just "server.system"
104 }
104 }
105− , _nixBuildConfig_outLink = OutLink_None
105+ & nixBuildConfig_outLink .~ OutLink_None
106− , _nixBuildConfig_args =
106+ & nixCmdConfig_args .~
107 [ strArg "hostName" host
107 [ strArg "hostName" host
108 , strArg "adminEmail" adminEmail
108 , strArg "adminEmail" adminEmail
109 , strArg "routeHost" routeHost
109 , strArg "routeHost" routeHost
@@ -111,8 +111,7 @@ deployPush deployPath getNixBuilders = do
111 , boolArg "enableHttps" enableHttps
111 , boolArg "enableHttps" enableHttps
112 , rawArg "config" $ deployPath </> "config"
112 , rawArg "config" $ deployPath </> "config"
113 ]
113 ]
114− , _nixBuildConfig_builders = builders
114+ & nixCmdConfig_builders .~ builders
115− }
116 let result = listToMaybe $ lines buildOutput
115 let result = listToMaybe $ lines buildOutput
117 forM_ result $ \res -> do
116 forM_ result $ \res -> do
118 let knownHostsPath = deployPath </> "backend_known_hosts"
117 let knownHostsPath = deployPath </> "backend_known_hosts"
lib/command/src/Obelisk/Command/Nix.hs+103−32
@@ -6,10 +6,19 @@
6{-# LANGUAGE OverloadedStrings #-}
6{-# LANGUAGE OverloadedStrings #-}
7{-# LANGUAGE Rank2Types #-}
7{-# LANGUAGE Rank2Types #-}
8{-# LANGUAGE ScopedTypeVariables #-}
8{-# LANGUAGE ScopedTypeVariables #-}
9+{-# LANGUAGE TemplateHaskell #-}
9{-# LANGUAGE TypeApplications #-}
10{-# LANGUAGE TypeApplications #-}
10module Obelisk.Command.Nix
11module Obelisk.Command.Nix
11− ( nixBuild
12+ ( nixCmd
13+ , NixCmd (..)
14+ , nixCmdConfig_target
15+ , nixCmdConfig_args
16+ , nixCmdConfig_builders
12 , NixBuildConfig (..)
17 , NixBuildConfig (..)
18+ , nixBuildConfig_outLink
19+ , NixInstantiateConfig (..)
20+ , nixInstantiateConfig_eval
21+ , NixCommonConfig (..)
13 , Target (..)
22 , Target (..)
14 , OutLink (..)
23 , OutLink (..)
15 , Arg (..)
24 , Arg (..)
@@ -18,6 +27,9 @@ module Obelisk.Command.Nix
18 , strArg
27 , strArg
19 ) where
28 ) where
20
29
30+import Control.Monad (guard)
31+import Control.Lens
32+
21import Data.Bool (bool)
33import Data.Bool (bool)
22import Data.Default
34import Data.Default
23import Data.List (intercalate)
35import Data.List (intercalate)
@@ -28,20 +40,12 @@ import System.Process (proc)
28import Obelisk.App (MonadObelisk)
40import Obelisk.App (MonadObelisk)
29import Obelisk.CliApp
41import Obelisk.CliApp
30
42
31−-- | Where to put nix-build output
32−data OutLink
33− = OutLink_Default
34− | OutLink_None
35− | OutLink_IndirectRoot FilePath
36−
37−instance Default OutLink where
38− def = OutLink_Default
39−
40-- | What to build
43-- | What to build
41data Target = Target
44data Target = Target
42 { _target_path :: FilePath
45 { _target_path :: FilePath
43 , _target_attr :: Maybe String
46 , _target_attr :: Maybe String
44 }
47 }
48+makeClassy ''Target
45
49
46instance Default Target where
50instance Default Target where
47 def = Target
51 def = Target
@@ -68,36 +72,103 @@ cliFromArgs = concatMap $ \case
68 Arg_Str k v -> ["--argstr", k, v]
72 Arg_Str k v -> ["--argstr", k, v]
69 Arg_Expr k v -> ["--arg", k, v]
73 Arg_Expr k v -> ["--arg", k, v]
70
74
71−data NixBuildConfig = NixBuildConfig
75+data NixCommonConfig = NixCommonConfig
72− { _nixBuildConfig_target :: Target
76+ { _nixCmdConfig_target :: Target
73− , _nixBuildConfig_outLink :: OutLink
77+ , _nixCmdConfig_args :: [Arg]
74− , _nixBuildConfig_args :: [Arg]
78+ , _nixCmdConfig_builders :: [String]
75− , _nixBuildConfig_builders :: [String]
76 }
79 }
80+makeClassy ''NixCommonConfig
77
81
78−instance Default NixBuildConfig where
82+instance Default NixCommonConfig where
79− def = NixBuildConfig def def mempty mempty
83+ def = NixCommonConfig def mempty mempty
80
84
81−nixBuild :: MonadObelisk m => NixBuildConfig -> m FilePath
85+runNixCommonConfig :: NixCommonConfig -> [FilePath]
82−nixBuild cfg = withSpinner' ("Running nix-build on " <> desc) (Just $ const $ "Built " <> desc) $ do
83− output <- readProcessAndLogStderr Debug $ proc "nix-build" $ mconcat
84− [[path], attrArg, args, outLink, buildersArg]
86+runNixCommonConfig cfg = mconcat [[path], attrArg, args, buildersArg]
85− -- Remove final newline that Nix appends
86− Just (outPath, '\n') <- pure $ T.unsnoc output
87− pure $ T.unpack outPath
88 where
87 where
89− path = _target_path $ _nixBuildConfig_target cfg
88+ path = _target_path $ _nixCmdConfig_target cfg
90− attr = _target_attr $ _nixBuildConfig_target cfg
89+ attr = _target_attr $ _nixCmdConfig_target cfg
91 attrArg = case attr of
90 attrArg = case attr of
92 Nothing -> []
91 Nothing -> []
93 Just a -> ["-A", a]
92 Just a -> ["-A", a]
94− args = cliFromArgs $ _nixBuildConfig_args cfg
93+ args = cliFromArgs $ _nixCmdConfig_args cfg
94+ buildersArg = case _nixCmdConfig_builders cfg of
95+ [] -> []
96+ builders -> ["--builders", intercalate ";" builders]
97+
98+-- | Where to put nix-build output
99+data OutLink
100+ = OutLink_Default
101+ | OutLink_None
102+ | OutLink_IndirectRoot FilePath
103+
104+instance Default OutLink where
105+ def = OutLink_Default
106+
107+data NixBuildConfig = NixBuildConfig
108+ { _nixBuildConfig_common :: NixCommonConfig
109+ , _nixBuildConfig_outLink :: OutLink
110+ }
111+makeLenses ''NixBuildConfig
112+
113+instance HasNixCommonConfig NixBuildConfig where
114+ nixCommonConfig = nixBuildConfig_common
115+
116+instance Default NixBuildConfig where
117+ def = NixBuildConfig def def
118+
119+runNixBuildConfig :: NixBuildConfig -> [FilePath]
120+runNixBuildConfig cfg = mconcat
121+ [ runNixCommonConfig $ cfg ^. nixCommonConfig
95− outLink = case _nixBuildConfig_outLink cfg of
122+ , case _nixBuildConfig_outLink cfg of
96 OutLink_Default -> []
123 OutLink_Default -> []
97 OutLink_None -> ["--no-out-link"]
124 OutLink_None -> ["--no-out-link"]
98 OutLink_IndirectRoot l -> ["--out-link", l]
125 OutLink_IndirectRoot l -> ["--out-link", l]
99− desc = T.pack $ path <> maybe "" (\a -> " [" <> a <> "]") attr
126+ ]
100− buildersArg = case _nixBuildConfig_builders cfg of
101− [] -> []
102− builders -> ["--builders", intercalate ";" builders]
103
127
128+data NixInstantiateConfig = NixInstantiateConfig
129+ { _nixInstantiateConfig_common :: NixCommonConfig
130+ , _nixInstantiateConfig_eval :: Bool
131+ }
132+makeLenses ''NixInstantiateConfig
133+
134+instance HasNixCommonConfig NixInstantiateConfig where
135+ nixCommonConfig = nixInstantiateConfig_common
136+
137+instance Default NixInstantiateConfig where
138+ def = NixInstantiateConfig def False
139+
140+runNixInstantiateConfig :: NixInstantiateConfig -> [FilePath]
141+runNixInstantiateConfig cfg = mconcat
142+ [ runNixCommonConfig $ cfg ^. nixCommonConfig
143+ , "--eval" <$ guard (_nixInstantiateConfig_eval cfg)
144+ ]
145+
146+data NixCmd
147+ = NixCmd_Build NixBuildConfig
148+ | NixCmd_Instantiate NixInstantiateConfig
149+
150+instance Default NixCmd where
151+ def = NixCmd_Build def
152+
153+nixCmd :: MonadObelisk m => NixCmd -> m FilePath
154+nixCmd cmdCfg = withSpinner' ("Running " <> cmd <> " on " <> desc) (Just $ const $ "Built " <> desc) $ do
155+ output <- readProcessAndLogStderr Debug $ proc (T.unpack cmd) $ options
156+ -- Remove final newline that Nix appends
157+ Just (outPath, '\n') <- pure $ T.unsnoc output
158+ pure $ T.unpack outPath
159+ where
160+ (cmd, options, commonCfg) = case cmdCfg of
161+ NixCmd_Build cfg' ->
162+ ( "nix-build"
163+ , runNixBuildConfig cfg'
164+ , cfg' ^. nixCommonConfig
165+ )
166+ NixCmd_Instantiate cfg' ->
167+ ( "nix-instantiate"
168+ , runNixInstantiateConfig cfg'
169+ , cfg' ^. nixCommonConfig
170+ )
171+ path = commonCfg ^. nixCmdConfig_target . target_path
172+ desc = T.pack $ path <> maybe ""
173+ (\a -> " [" <> a <> "]")
174+ (commonCfg ^. nixCmdConfig_target . target_attr)
lib/command/src/Obelisk/Command/Thunk.hs+7−8
@@ -33,6 +33,7 @@ module Obelisk.Command.Thunk
33
33
34import Control.Applicative
34import Control.Applicative
35import Control.Exception (displayException, try)
35import Control.Exception (displayException, try)
36+import qualified Control.Lens as Lens
36import Control.Lens.Indexed hiding ((<.>))
37import Control.Lens.Indexed hiding ((<.>))
37import Control.Monad
38import Control.Monad
38import Control.Monad.Catch (handle)
39import Control.Monad.Catch (handle)
@@ -501,13 +502,12 @@ nixBuildThunkAttrWithCache thunkDir attr = do
501 Just c -> return c
502 Just c -> return c
502 Nothing -> do
503 Nothing -> do
503 putLog Warning $ T.pack $ mconcat [thunkDir, ": ", attr, " not cached, building ..."]
504 putLog Warning $ T.pack $ mconcat [thunkDir, ": ", attr, " not cached, building ..."]
504− _ <- nixBuild $ def
505+ _ <- nixCmd $ NixCmd_Build$ def
505− { _nixBuildConfig_target = Target
506+ Lens.& nixBuildConfig_outLink Lens..~ OutLink_IndirectRoot cachePath
507+ Lens.& nixCmdConfig_target Lens..~ Target
506 { _target_path = thunkDir
508 { _target_path = thunkDir
507 , _target_attr = Just attr
509 , _target_attr = Just attr
508 }
510 }
509− , _nixBuildConfig_outLink = OutLink_IndirectRoot cachePath
510− }
511 return cachePath
511 return cachePath
512
512
513-- | Build a nix attribute, and cache the result if possible
513-- | Build a nix attribute, and cache the result if possible
@@ -523,13 +523,12 @@ nixBuildAttrWithCache exprPath attr = do
523 readThunk exprPath >>= \case
523 readThunk exprPath >>= \case
524 -- Only packed thunks are cached. in particular, checkouts are not
524 -- Only packed thunks are cached. in particular, checkouts are not
525 Right (ThunkData_Packed _) -> nixBuildThunkAttrWithCache exprPath attr
525 Right (ThunkData_Packed _) -> nixBuildThunkAttrWithCache exprPath attr
526− _ -> nixBuild $ def
526+ _ -> nixCmd $ NixCmd_Build $ def
527− { _nixBuildConfig_target = Target
527+ Lens.& nixBuildConfig_outLink Lens..~ OutLink_None
528+ Lens.& nixCmdConfig_target Lens..~ Target
528 { _target_path = exprPath
529 { _target_path = exprPath
529 , _target_attr = Just attr
530 , _target_attr = Just attr
530 }
531 }
531− , _nixBuildConfig_outLink = OutLink_None
532− }
533
532
534-- | Safely update thunk using a custom action
533-- | Safely update thunk using a custom action
535--
534--