ecoppens/colmena
1
0
Fork 0
forked from DGNum/colmena
Code Pull requests Activity

nix/deployment: Misc cleanup

Browse source
This commit is contained in:
Zhaofeng Li 2021-12-04 01:03:26 -08:00
parent 04976e5fda
commit 064432f38e
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -52,7 +52,7 @@
devShell = pkgs.mkShell { devShell = pkgs.mkShell {
inputsFrom = [ defaultPackage ]; inputsFrom = [ defaultPackage ];
nativeBuildInputs = with pkgs; [ mdbook python3 ]; packages = with pkgs; [ clippy mdbook python3 ];
shellHook = '' shellHook = ''
export NIX_PATH=nixpkgs=${pkgs.path} export NIX_PATH=nixpkgs=${pkgs.path}
''; '';

14
src/nix/deployment/mod.rs
View file

@ -140,9 +140,8 @@ impl Deployment {
futures.push(deployment.clone().upload_keys_to_node(meta.clone(), target)); futures.push(deployment.clone().upload_keys_to_node(meta.clone(), target));
} }
let result: NixResult<Vec<()>> = join_all(futures).await.into_iter().collect(); join_all(futures).await
.into_iter().collect::<NixResult<Vec<()>>>()?;
result?;
Ok(()) Ok(())
}); });
@ -166,9 +165,8 @@ impl Deployment {
futures.push(deployment.clone().execute_chunk(meta.clone(), chunk)); futures.push(deployment.clone().execute_chunk(meta.clone(), chunk));
} }
let result: NixResult<Vec<()>> = join_all(futures).await.into_iter().collect(); join_all(futures).await
.into_iter().collect::<NixResult<Vec<()>>>()?;
result?;
Ok(()) Ok(())
}); });
@ -233,8 +231,8 @@ impl Deployment {
futures.push(self.clone().deploy_node(parent.clone(), target, profile.clone())); futures.push(self.clone().deploy_node(parent.clone(), target, profile.clone()));
} }
let result: NixResult<Vec<()>> = join_all(futures).await.into_iter().collect(); join_all(futures).await
result?; .into_iter().collect::<NixResult<Vec<()>>>()?;
// Create GC root // Create GC root
if self.options.create_gc_roots { if self.options.create_gc_roots {