Skip to content

Conversation

@haraldh
Copy link

@haraldh haraldh commented Jun 6, 2025

What ❔

  • add Cargo.lock
  • add riscv_common to workspace
  • add the missing workspace members.
  • remove workspace.edition from examples/experiments/Cargo.toml which is somehow not liked by cargo metadata

Why ❔

This enables the nix cargo vendor mechanism to pull in this git repo as a dependency.

Is this a breaking change?

  • Yes
  • No

Checklist

  • PR title corresponds to the body of PR (we generate changelog entries from PRs).
  • Tests for the changes have been added / updated.
  • Documentation comments have been added / updated.
  • Code has been formatted.

- add Cargo.lock
- add riscv_common to workspace
- add the missing workspace members.
- remove workspace.edition from `examples/experiments/Cargo.toml`
  which is somehow not liked by `cargo metadata`

This enables the nix cargo vendor mechanism to pull in this git repo
as a dependency.

Signed-off-by: Harald Hoyer <[email protected]>
haraldh added a commit to matter-labs/zksync-os that referenced this pull request Jun 6, 2025
- added a `Cargo.lock` for the `zksync_os` subdirectory.
  This reduces problems with the nix rust dependency fetcher drastically.
- rerouted the zksync-airbender dependency to the PR version
  matter-labs/zksync-airbender#37
  which fixed several issues with the nix rust dependency fetcher.
  Another fix would be a release of `riscv_common` on crates.io.
- modified `.cargo/config.toml` to strip build environment paths,
  which are replaced by the nix build script to ensure reproducibility.

See `nix/README.md` how to build.

Signed-off-by: Harald Hoyer <[email protected]>
@mm-zk
Copy link
Contributor

mm-zk commented Jun 9, 2025

Do we really need to add Cargo.lock in the main place? (as in theory this is a library, right?)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants