-
-
Notifications
You must be signed in to change notification settings - Fork 14.3k
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
lldap: rust 1.80 compatibility #333125
lldap: rust 1.80 compatibility #333125
Conversation
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.
Do we really need to commit both lock files?
If other updated dependencies cause problems, why can't you update just the time crate? |
As expected, updating just the time crate is painless and fixes the issue: lldap/lldap#947 |
Co-authored-by: Sandro <[email protected]>
Co-authored-by: Sandro <[email protected]>
Upstream suggests using a daily tag as a release. Should we do that instead of patching? |
Which daily tag? I don't see any. https://github.com/lldap/lldap/tags We can't grab anything from actions as they get deleted after some time. |
I don't know — but if they think any daily version is good enough, we could just do current HEAD. They also said they don't consider 0.5.0, the currently packaged version, to be a proper release. |
Yes, going by lldap/lldap#947 (comment) I think we should bump to |
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.
Final diff looks good to me, thanks! Please remove the unused fetchpatch
and squash away the obsolete commits.
I'll use the squash commit feature, which github hilariously blocked for me until @emilazy approves. |
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.
SGTM. Would be good to rename the PR to “lldap: 0.5.0 -> 0.5.1-unstable-2024-08-09” so the version bump is preserved in the squashed commit description.
Description of changes
following up on #332957, this prepares lldap for compilation with rust 1.80
lldap/lldap#945 necessitates a relatively awkward workaround: We're using different lock files for client and server.
Things done
main
instead of0.5.0
, for a few 1.80 fixes that are already inCargo.lock
intoCargo.original.lock
andCargo.updated.lock
, the latter resulting fromcargo update
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.