File tree 1 file changed +6
-4
lines changed
1 file changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -59,8 +59,10 @@ configureNix run sink = do
59
59
appendLog " Nix is already installed" sink
60
60
else
61
61
logStep " Installing Nix" sink (when run $ do
62
- _ <- runShellCommand " curl -L https://nixos.org/nix/install | sh"
63
- return () )
62
+ output <- runShellCommand " curl -L https://nixos.org/nix/install | sh"
63
+ appendLog (toMisoString output) sink
64
+ nixChannelsFilePath <- toFullFilePath " ~/.nix-channels"
65
+ writeFile nixChannelsFilePath " nixpkgs https://nixos.org/channels/nixos-20.03" )
64
66
65
67
configureNixPackage :: Bool -> Sink Action -> ExtensionInfo -> IO ()
66
68
configureNixPackage run sink (ExtensionInfo name package) = do
@@ -85,8 +87,8 @@ configureNixPackage run sink (ExtensionInfo name package) = do
85
87
if oldConfigurationNixText == newConfigurationNixText -- OPTIMIZE
86
88
then appendLog (" Nix package " <> name <> " already installed" ) sink
87
89
else logStep (" Installing Nix package - " <> name) sink (when run $ do
88
- _ <- runShellCommand " nixos-rebuild switch"
89
- return () )
90
+ output <- runShellCommand " nixos-rebuild switch"
91
+ appendLog (toMisoString output) sink )
90
92
91
93
-- TODO install or update? extension or log message
92
94
-- TODO ensure extensions are enabled if not enable them
You can’t perform that action at this time.
0 commit comments