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

cyrus_sasl: merge PR #51651 into master #51769

Merged
merged 4 commits into from Dec 9, 2018
Merged

cyrus_sasl: merge PR #51651 into master #51769

merged 4 commits into from Dec 9, 2018

Conversation

pbogdan
Copy link
Member

@pbogdan pbogdan commented Dec 9, 2018

Motivation for this change

Without this qemu is broken in master, it probably shouldn't be.

The original PR made its way into the staging-next branch but not before that branch was merged into master.

It is a mass-rebuild on master but without this fix no NixOS tests can be run which doesn't seem ideal.

Not sure what else could be done short of waiting for another staging-next merge which seems to have already accumulated some other changes.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

hedning and others added 4 commits December 8, 2018 17:52
Version 2.1.27 adds `-lkrb5` etc. to `dependency_libs` in all the .la files,
which in turn breaks spice's build. Prune .la's dependency_libs with
pruneLibtoolFiles.
since pruneLibtoolFiles is used openssl is no longer referenced
@hedning
Copy link
Contributor

hedning commented Dec 9, 2018

Thanks for catching this, I didn't notice staging-next getting merged (the PR got reused).

I can't really see a real good reason not merging this asap (I guess nixpkgs-unstable might be slightly delayed?).

@Mic92 Mic92 merged commit 9a37ec0 into NixOS:master Dec 9, 2018
7c6f434c added a commit to 7c6f434c/nixpkgs that referenced this pull request Dec 9, 2018
Already fixed by NixOS#51769

This reverts commit a9779bd.
@pbogdan pbogdan deleted the cyrus-sasl branch December 3, 2019 17:07
@pbogdan pbogdan restored the cyrus-sasl branch December 3, 2019 17:15
@pbogdan pbogdan deleted the cyrus-sasl branch December 3, 2019 17:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants