Skip to content

openldap: fixup build on *-darwin #196893

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.

Sign up for GitHub

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

Jump to bottom
Merged
mweinelt merged 1 commit into from
Oct 20, 2022
Merged

openldap: fixup build on *-darwin #196893

mweinelt merged 1 commit into from
Oct 20, 2022

Conversation

@vcunat
Copy link
Member

@vcunat vcunat commented Oct 20, 2022

https://hydra.nixos.org/build/195641103

This essentially partially reverts dd331ad.
I don't expect issues, as libxcrypt it meant to replace parts dropped from glibc which's never been used on *-darwin anyway.

Things done
  • Built on platform(s)
    • no rebuild x86_64-linux
    • no rebuild aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@vcunat
openldap: fixup build on *-darwin
b8dfd96 
https://hydra.nixos.org/build/195641103

This essentially partially reverts dd331ad.
I don't expect issues, as libxcrypt it meant to replace parts dropped
from glibc which's never been used on *-darwin anyway.
@vcunat vcunat added 6.topic: darwin Running or building packages on Darwin 0.kind: regression Something that worked before working no longer labels Oct 20, 2022
vcunat referenced this pull request Oct 20, 2022
@fpletz @mweinelt
openldap: fix build with libxcrypt
dd331ad
@vcunat
Copy link
Member Author

vcunat commented Oct 20, 2022

Normally I wouldn't care, but this was blocking like a thousand builds.

@ofborg ofborg bot requested review from ajs124, dasJ and mweinelt October 20, 2022 08:22
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Oct 20, 2022
@mweinelt mweinelt merged commit 369a66e into NixOS:staging-next Oct 20, 2022
@vcunat vcunat deleted the p/openldap-darwin branch October 20, 2022 09:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ajs124 ajs124 Awaiting requested review from ajs124

@dasJ dasJ Awaiting requested review from dasJ

@mweinelt mweinelt Awaiting requested review from mweinelt

Assignees

No one assigned

Labels

0.kind: regression Something that worked before working no longer 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@vcunat @mweinelt