quickwit: fix compilation with rust 1.80 #345219
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment.
I don't think we need the patch here, we can just update the lock file directly
There was a problem hiding this comment.
i tried to do so first but it then failed stating something along the lines of "mismatch between source Cargo.lock and provided Cargo.lock"
There was a problem hiding this comment.
Here is the exact error message:
Validating consistency between /build/source/quickwit/Cargo.lock and /build/cargo-vendor-dir/Cargo.lock
8228c8228
< version = "0.3.34"
---
> version = "0.3.36"
8230c8230
< checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
---
> checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
8261c8261
< version = "0.2.17"
---
> version = "0.2.18"
8263c8263
< checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
---
> checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
ERROR: cargoHash or cargoSha256 is out of date
Cargo.lock is not the same in /build/cargo-vendor-dir
To fix the issue:
1. Set cargoHash/cargoSha256 to an empty string: `cargoHash = "";`
2. Build the derivation and wait for it to fail with a hash mismatch
3. Copy the "got: sha256-..." value back into the cargoHash field
You should have: cargoHash = "sha256-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX=";
There was a problem hiding this comment.
🤔 I think I had a similar problem when fixing wezterm. I think it got suggested to me to copy the already vendored Cargo.lock in postPatch to the normal location.
There was a problem hiding this comment.
I will look into it. Thanks for the pointer.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Cargo.lockhas been patched to update thetimecrate and its dependencies to version0.3.36to fix the failing build with rust 1.80 (#332957).Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.