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.

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 build failure on NixOS #31515

Merged
merged 1 commit into from Mar 6, 2024
Merged

Fix build failure on NixOS #31515

merged 1 commit into from Mar 6, 2024

Conversation

syvb
Copy link
Contributor

@syvb syvb commented Mar 6, 2024

Fixes a build error when building on NixOS. This build error was introduced by #31465, which changed filterlock without also updating the vendorTarball hash in etc/shell.nix. (filterlock is not a part of the main Servo workspace (it has its own lockfile and target directory), since it has to be executed before any other Rust code can be compiled on NixOS)

$ nix-shell etc/shell.nix 
...
Running phase: buildPhase
error: failed to select a version for the requirement `toml = "^0.8.9"`
candidate versions found which didn't match: 0.8.8
location searched: directory source `/build/filterlock/vendor` (which is replacing registry `crates-io`)
required by package `filterlock v0.1.0 (/build/filterlock)`
perhaps a crate was updated and forgotten to be re-vendored?
As a reminder, you're using offline mode (--offline) which can sometimes cause surprising resolution failures, if this error is too confusing you may wish to retry without the offline flag.

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes do not require tests because none of the Nix configuration is tested in CI

Signed-off-by: syvb <me@iter.ca>
@syvb syvb changed the title Fix build on NixOS Fix build failure on NixOS Mar 6, 2024
@delan delan self-requested a review March 6, 2024 04:14
Copy link
Sponsor Member

@delan delan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@mukilan mukilan added this pull request to the merge queue Mar 6, 2024
Merged via the queue into servo:main with commit 24a088d Mar 6, 2024
9 checks passed
@syvb syvb deleted the fix-filterlock branch March 6, 2024 13:56
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.

None yet

3 participants