-
-
Notifications
You must be signed in to change notification settings - Fork 14.6k
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
rerun: 0.13.0 -> 0.18.2 #334854
rerun: 0.13.0 -> 0.18.2 #334854
Conversation
d9285e9
to
4fc9a79
Compare
pkgs/by-name/re/rerun/package.nix
Outdated
|
||
# patch https://github.com/NixOS/nixpkgs/issues/332957 | ||
postPatch = '' | ||
ln -s ${./Cargo.lock} Cargo.lock |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Upstream provides a Cargo.lock, so we don't need to put it in Nixpkgs — we can use cargoHash
and just put a small patch updating time in cargoPatches
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, TIL cargoPatches
exist! I didn't know about that yet. Are there any better docs on the the rust utilities other than this or grepping through nixpkgs?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think so. The documentation you linked does mention cargoPatches
, but not in a reference list of attributes, so I can see how you missed it. I've found that using grep to try to find how the same problem is solved in other packages to be the best way.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@RobWalt you beat me to it! Thanks!
I noticed the patch generated from the master branch isn't applicable to the release commit, so I wanted to look into whether it's possible to pass a postPatch
to the FOD and use some kind of a TOML editor to reset the versions unconditionally so that the "patch" would be more generally applicable. I'm unhappy about override-ability of this kind of packages...
Do you need to add yourself to maintainers.nix? (If so, please do so in a separate commit, before the current one.) |
I'm sorry for all the little nits you needed to comment on. It was just |
@ofborg build python312Packages.rerun-sdk Did I forget to add that to passthru tests? |
The name of the package in nixpkgs is |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't you also need to patch Cargo.toml
and its rust-version
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is mostly cosmetric and not picked up by cargo
commands
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Apparently not? Ofborg says:
>
> Cargo.lock is not the same in /build/rerun-0.17.0-vendor.tar.gz
>
> 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-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
https://github.com/NixOS/nixpkgs/pull/334854/checks?check_run_id=28868560235
I think in the end it's just the package name that changed and is now called |
ok by me but Ofborg looks at the commit message not at the PR title |
@SomeoneSerge I think it ran through now successfully 🤠 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, you're right 😬
Hash mismatch on OfBorg. |
Yes, my presumption still is that it's #334854 (comment) |
2403d98
to
27a81e3
Compare
Took me a while but the passthru tests now build locally and are all green. Thanks to you two I learned a lot! @SomeoneSerge FYI |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll leave the final check to @SomeoneSerge.
I didn't do much thorough testing but |
Description of changes
rerun-cli
package withnative_viewer
featurerust-toolchain
file which states which rust version they use upstream, so I went ahead and build the crate with a non standardrustPlatform
(1.76 instead of 1.80 currently, but the toolchain now updates with thesrc
)Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-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.