deepfilternet: fix compilation with Rust 1.80 #334838
Conversation
As per NixOS#332957, rust-lang/rust#127343. Bumps the time dependency in Cargo.lock, to fix a compilation issue. Xref NixOS#333227 for a similar PR :) Upstream issue: Rikorose/DeepFilterNet#602
|
Welp, turns out this is a is a duplicate of #334835 |
ofborg
bot
added
10.rebuild-darwin: 1-10
10.rebuild-darwin: 1
10.rebuild-linux: 1-10
labels
| @@ -15,6 +15,11 @@ rustPlatform.buildRustPackage rec { | |||
| hash = "sha256-5bYbfO1kmduNm9YV5niaaPvRIDRmPt4QOX7eKpK+sWY="; | |||
| }; | |||
|
|
|||
| cargoPatches = [ | |||
| # Fix compilation with Rust 1.80 (https://github.com/NixOS/nixpkgs/issues/332957) | |||
| ./cargo-lock-bump-time.patch | |||
There was a problem hiding this comment.
Can we symlink the Cargo.lock into place, rather than having to have both a Cargo.lock file and a patch file? Like in #334818.
There was a problem hiding this comment.
I kind of like this approach since its clearly bound to the package version that's being patched. It also communicates why the (updated) vendored Cargo.lock is necessary and what's changed.
It seems like the linked PR might cause strange situations when the underlying reason for the patch is made redundant by an upstream release, since there won't be a "patch doesn't apply anymore" to nudge maintainers.
Let me know if this seems reasonable to you. I'm new-ish to Nix packaging so my hunch might be off here 🙂
There was a problem hiding this comment.
I think you're quite right, and this is a good instinct. In this case, I think a comment would probably be enough to get it removed on update — it's right there below the source hash, which has to be updated anyway. I regret not asking for that on the other PR.
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/rustc-explain-e0282-error-could-not-compile-time-lib/50765/4 |
As per #332957, rust-lang/rust#127343. Bumps the time dependency in Cargo.lock, to fix a compilation issue.
Xref #333227 for a similar PR :)
Upstream issue:
Rikorose/DeepFilterNet#602
Description of changes
Things done
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.