Skip to content

Commit

Permalink
remove patch.crates-io.zone (#6484)
Browse files Browse the repository at this point in the history
While looking at doing lockfile maintenance for R11 I noticed that we
patch the `zone` package to be a branch that adds Eq and Hash to
`zone::State`. This branch was never merged into the main branch of
oxidecomputer/zone, and also appears to be unnecessary for Omicron to
build at present. This switches us back to the released version on
crates.io.
  • Loading branch information
iliana authored Aug 30, 2024
1 parent 330f4bc commit d36f3a5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
6 changes: 4 additions & 2 deletions Cargo.lock

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

4 changes: 0 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,3 @@ path = "workspace-hack"
[patch."https://github.com/oxidecomputer/omicron"]
omicron-uuid-kinds = { path = "uuid-kinds" }
omicron-common = { path = "common" }

[patch.crates-io.zone]
git = 'https://github.com/oxidecomputer/zone'
branch = 'state-derive-eq-hash'

0 comments on commit d36f3a5

Please sign in to comment.