DGNum/colmena
10
0
Fork 2
Code Issues 6 Pull requests 3 Projects Releases Packages Wiki Activity

Make flake resolution (slightly) less terrible

Browse source 
Instead of using `path:` which always copies the entire directory,
we now try to resolve the Flake URI using `nix flake metadata` which
may give us a `git+file:`.
This commit is contained in:
Zhaofeng Li 2021-10-25 23:38:10 -07:00
parent b48753239a
commit 0e0a1e84f0
10 changed files with 137 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/util.rs
View file

@ -9,7 +9,7 @@ use glob::Pattern as GlobPattern;
use tokio::io::{AsyncRead, AsyncBufReadExt, BufReader};
use tokio::process::Command;
use super::nix::{NodeConfig, Hive, HivePath, NixResult};
use super::nix::{Flake, NodeConfig, Hive, HivePath, NixResult};
use super::progress::TaskProgress;
enum NodeFilter {
@ -79,7 +79,7 @@ impl CommandExecution {
}
}
pub fn hive_from_args(args: &ArgMatches<'_>) -> NixResult<Hive> {
pub async fn hive_from_args(args: &ArgMatches<'_>) -> NixResult<Hive> {
let path = match args.occurrences_of("config") {
0 => {
// traverse upwards until we find hive.nix
@ -142,7 +142,8 @@ pub fn hive_from_args(args: &ArgMatches<'_>) -> NixResult<Hive> {
if !fpath.exists() && path.contains(":") {
// Treat as flake URI
let hive_path = HivePath::Flake(path);
let flake = Flake::from_uri(path).await?;
let hive_path = HivePath::Flake(flake);
let mut hive = Hive::new(hive_path)?;
if args.is_present("show-trace") {
@ -156,7 +157,7 @@ pub fn hive_from_args(args: &ArgMatches<'_>) -> NixResult<Hive> {
}
};
let hive_path = HivePath::from_path(path);
let hive_path = HivePath::from_path(path).await?;
let mut hive = Hive::new(hive_path)?;
if args.is_present("show-trace") {