Skip to content
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

Merged
merged 9 commits into from
Aug 10, 2024
Merged

lldap: rust 1.80 compatibility #333125

merged 9 commits into from
Aug 10, 2024

Conversation

bendlas
Copy link
Contributor

@bendlas bendlas commented Aug 8, 2024

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

  • Build latest main instead of 0.5.0, for a few 1.80 fixes that are already in
  • Split Cargo.lock into Cargo.original.lock and Cargo.updated.lock, the latter resulting from cargo update
  • Keep building frontend with original, backend with updated

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Aug 8, 2024
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a 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?

pkgs/servers/ldap/lldap/default.nix Outdated Show resolved Hide resolved
pkgs/servers/ldap/lldap/default.nix Outdated Show resolved Hide resolved
pkgs/servers/ldap/lldap/default.nix Outdated Show resolved Hide resolved
@alyssais
Copy link
Member

alyssais commented Aug 8, 2024

If other updated dependencies cause problems, why can't you update just the time crate?

@alyssais
Copy link
Member

alyssais commented Aug 8, 2024

As expected, updating just the time crate is painless and fixes the issue: lldap/lldap#947

@alyssais
Copy link
Member

alyssais commented Aug 9, 2024

Upstream suggests using a daily tag as a release. Should we do that instead of patching?

@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Aug 9, 2024

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.

@alyssais
Copy link
Member

alyssais commented Aug 9, 2024

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.

@emilazy
Copy link
Member

emilazy commented Aug 9, 2024

Yes, going by lldap/lldap#947 (comment) I think we should bump to HEAD.

Copy link
Member

@emilazy emilazy left a 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.

@bendlas bendlas requested a review from emilazy August 10, 2024 13:58
@bendlas
Copy link
Contributor Author

bendlas commented Aug 10, 2024

I'll use the squash commit feature, which github hilariously blocked for me until @emilazy approves.

Copy link
Member

@emilazy emilazy left a 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.

@bendlas bendlas merged commit b14750b into NixOS:master Aug 10, 2024
9 of 10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants