-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
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
deepfilternet: fix compilation with Rust 1.80 #334838
Merged
SuperSandro2000
merged 1 commit into
NixOS:master
from
Mrmaxmeier:deepfilternet-rust-1-80
Aug 16, 2024
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| diff --git a/Cargo.lock b/Cargo.lock | ||
| index 48eb89c..ae318a6 100644 | ||
| --- a/Cargo.lock | ||
| +++ b/Cargo.lock | ||
| @@ -1073,9 +1073,12 @@ dependencies = [ | ||
|
|
||
| [[package]] | ||
| name = "deranged" | ||
| -version = "0.3.8" | ||
| +version = "0.3.11" | ||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" | ||
| +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" | ||
| +dependencies = [ | ||
| + "powerfmt", | ||
| +] | ||
|
|
||
| [[package]] | ||
| name = "derivative" | ||
| @@ -2805,6 +2808,12 @@ dependencies = [ | ||
| "serde", | ||
| ] | ||
|
|
||
| +[[package]] | ||
| +name = "num-conv" | ||
| +version = "0.1.0" | ||
| +source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" | ||
| + | ||
| [[package]] | ||
| name = "num-derive" | ||
| version = "0.3.3" | ||
| @@ -3266,6 +3275,12 @@ dependencies = [ | ||
| "windows-sys 0.48.0", | ||
| ] | ||
|
|
||
| +[[package]] | ||
| +name = "powerfmt" | ||
| +version = "0.2.0" | ||
| +source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" | ||
| + | ||
| [[package]] | ||
| name = "ppv-lite86" | ||
| version = "0.2.17" | ||
| @@ -4134,12 +4149,14 @@ dependencies = [ | ||
|
|
||
| [[package]] | ||
| name = "time" | ||
| -version = "0.3.28" | ||
| +version = "0.3.36" | ||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" | ||
| +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" | ||
| dependencies = [ | ||
| "deranged", | ||
| "itoa", | ||
| + "num-conv", | ||
| + "powerfmt", | ||
| "serde", | ||
| "time-core", | ||
| "time-macros", | ||
| @@ -4147,16 +4164,17 @@ dependencies = [ | ||
|
|
||
| [[package]] | ||
| name = "time-core" | ||
| -version = "0.1.1" | ||
| +version = "0.1.2" | ||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" | ||
| +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" | ||
|
|
||
| [[package]] | ||
| name = "time-macros" | ||
| -version = "0.2.14" | ||
| +version = "0.2.18" | ||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" | ||
| +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" | ||
| dependencies = [ | ||
| + "num-conv", | ||
| "time-core", | ||
| ] | ||
|
|
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
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.
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.
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.