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

openldap: Fix build with LibreSSL. #28457

Merged
merged 1 commit into from
Aug 30, 2017

Conversation

mrobbetts
Copy link
Contributor

@mrobbetts mrobbetts commented Aug 22, 2017

Motivation for this change

openldap doesn't build with LibreSSL as-is. This patch is pulled from upstream to fix it.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@mrobbetts, thanks for your PR! By analyzing the history of the files in this pull request, we identified @edolstra, @DerTim1 and @chaoflow to be potential reviewers.

@mrobbetts
Copy link
Contributor Author

It looks like the build failed simply because the output was too big. Glancing quickly, it looks like normal build output to me. Is this type of failure normal?

@joachifm
Copy link
Contributor

This is a big rebuild, much larger than travis can handle.

@mrobbetts
Copy link
Contributor Author

Ahh. Not intentional. Is there a way to fix it, or do you guys just ignore the failure for PRs like this one?

@joachifm
Copy link
Contributor

Spurious/unrelated errors are ignored.

@Mic92
Copy link
Member

Mic92 commented Aug 25, 2017

Can you change the pull request from the master branch to staging?

@@ -8,6 +8,14 @@ stdenv.mkDerivation rec {
sha256 = "091qvwk5dkcpp17ziabcnh3rg3m7qwzw2pihfcd1d5fdxgywzmnd";
};

patches = [
(fetchurl {
url = "https://bz-attachments.freebsd.org/attachment.cgi?id=183223";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this url stable?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

svn is better, use also fetchpatch instead of fetchurl for further normalization.

@mrobbetts mrobbetts changed the base branch from master to staging August 25, 2017 23:37
@mrobbetts
Copy link
Contributor Author

Changed base branch to staging

@fpletz fpletz merged commit e82cb3d into NixOS:staging Aug 30, 2017
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

5 participants