Skip to content

Commit

Permalink
Use crates.io over git for dependencies
Browse files Browse the repository at this point in the history
The presence of git dependencies can be problematic for build systems
like Nix. `progenitor` as a git dependencies and `progenitor-client` as
a registry causes the build to fail because it tries to vendor
`progenitor-client` from two places: from crates.io as a direct
dependency, and from GitHub as a transitive dependency of `progenitor`.

This commit changes the Cargo.toml and lock file to pull `progenitor`
from the registry instead of GitHub.

Fixes oxidecomputer#950
  • Loading branch information
djacu committed Dec 18, 2024
1 parent 71c40c9 commit 8ec4016
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 29 deletions.
48 changes: 20 additions & 28 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ oxide-httpmock = { path = "sdk-httpmock", version = "0.9.0" }
oxnet = { git = "https://github.com/oxidecomputer/oxnet" }
predicates = "3.1.2"
pretty_assertions = "1.4.1"
progenitor = { git = "https://github.com/oxidecomputer/progenitor" }
progenitor = "0.8.0"
progenitor-client = "0.8.0"
rand = "0.8.5"
ratatui = "0.26.3"
Expand Down

0 comments on commit 8ec4016

Please sign in to comment.