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.

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

libcouchbase: fix build #70455

Merged
merged 1 commit into from Oct 5, 2019
Merged

libcouchbase: fix build #70455

merged 1 commit into from Oct 5, 2019

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Oct 5, 2019

Motivation for this change

This applies an upstream fix from libcouchbase to fix a timeout issue
with openssl 1.1.

See also https://hydra.nixos.org/build/102495724

ZHF #68361

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 nix-review --run "nix-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

@Ma27 Ma27 added the 9.needs: port to stable A PR needs a backport to the stable release. label Oct 5, 2019
@Ma27 Ma27 mentioned this pull request Oct 5, 2019
Merged
10 tasks
worldofpeace
worldofpeace approved these changes Oct 5, 2019
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

LGTM with above fix.

@Ma27
libcouchbase: fix build
fd41a33 
This applies an upstream fix from libcouchbase to fix a timeout issue
with openssl 1.1.

See also https://hydra.nixos.org/build/102495724

ZHF NixOS#68361
@worldofpeace worldofpeace merged commit fa74662 into NixOS:master Oct 5, 2019
@Ma27 Ma27 deleted the fix-libcouchbase branch October 5, 2019 12:25
@worldofpeace
Copy link
Contributor

worldofpeace commented Oct 5, 2019 •
edited

backported in 1735d77

@Ma27
Copy link
Member Author

Ma27 commented Oct 5, 2019

Thanks! :)

@Ma27 Ma27 added 8.has: port to stable A PR already has a backport to the stable release. and removed 9.needs: port to stable A PR needs a backport to the stable release. labels Oct 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace worldofpeace approved these changes

Assignees
No one assigned
Labels
8.has: port to stable A PR already has a backport to the stable release. 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Ma27 @worldofpeace