Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: add nix dependency to home-manager #61

Merged
merged 1 commit into from
Jun 22, 2023
Merged

fix: add nix dependency to home-manager #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions crates/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ license = "MIT"
name = "crosup"
readme = "../../README.md"
repository = "https://github.com/tsirysndr/crosup"
version = "0.4.0"
version = "0.4.1"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
anyhow = "1.0.71"
clap = "3.2.20"
crosup-core = {path = "../core", version = "0.1.6"}
crosup-core = {path = "../core", version = "0.1.7"}
crosup-entity = {version = "0.1.0", path = "../entity"}
crosup-installers = {path = "../installers", version = "0.1.4"}
crosup-nix = {path = "../nix", version = "0.1.1"}
Expand Down
2 changes: 1 addition & 1 deletion crates/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ keywords = ["chromebook", "chromeos", "homebrew", "docker", "nix"]
license = "MIT"
name = "crosup-core"
repository = "https://github.com/tsirysndr/crosup"
version = "0.1.6"
version = "0.1.7"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
15 changes: 15 additions & 0 deletions crates/core/src/graph.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,13 @@ pub fn build_installer_graph(
..CurlInstaller::from(nix.clone())
}) as Box<dyn Installer>));
}
} else {
let nix = default_nix_installer();
graph.add_vertex(Vertex::from(Box::new(CurlInstaller {
name: nix.name.clone(),
session: session.clone(),
..CurlInstaller::from(nix.clone())
}) as Box<dyn Installer>));
}
}

Expand All @@ -194,6 +201,13 @@ pub fn build_installer_graph(
..CurlInstaller::from(brew.clone())
}) as Box<dyn Installer>));
}
} else {
let brew = default_brew_installer();
graph.add_vertex(Vertex::from(Box::new(CurlInstaller {
name: brew.name.clone(),
session: session.clone(),
..CurlInstaller::from(brew.clone())
}) as Box<dyn Installer>));
}
}

Expand Down Expand Up @@ -234,6 +248,7 @@ pub fn build_installer_graph(
session: session.clone(),
provider: "home-manager".into(),
packages: Some(vec![name.clone()]),
dependencies: vec!["nix".into()],
..Default::default()
}) as Box<dyn Installer>));
});
Expand Down