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
rethinkdb: 2.3.6 -> 2.4.0, fix #87828
Conversation
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/prs-ready-for-review-may-2019/3032/164 |
sha256 = "05nagixlwnq3x7441fhll5vs70pxppbsciw8qjqp660bdb5m4jm1"; | ||
}) | ||
]; | ||
patches = [ ./v8-no-snapshot.patch ]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do you mind adding a comment about why this patch is necessary?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will that suffice? I'm not certain how exactly RethinkDB uses V8 or why the snapshots segfault. When I removed the failing patch, which originally disabled V8 snapshots, I noticed that making V8 snapshots would still segfault the build, so I adapted it for the most recent version of RethinkDB, upon which the build succeeded. But I'm unsure I understand what's going on. The commit message of the original patch is "Workaround for building V8 with GCC 6.2".
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The associated PR mentions this issue upstream rethinkdb/rethinkdb#5757, which was closed with mandating CXX=clang++
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, this builds perfectly using clangStdenv
, so the latest commit switches to that. Let me know if for some reason you prefer using GCC with the patch.
4066837
to
ecf94fc
Compare
Is there anything blocking this PR ? Would be nice to have |
It's at
|
closing PR |
The python package is only the client. |
@jonringer I believe @matthias-t is right and the one in staging you're referring to is indeed the client. |
I apologize, just looked at the conflicts. If you wouldn't mind updating the other package, I will review it. |
Add missing dependency on `setuptools`, reflect changed license.
Update patch that prevents making V8 snapshots, as those segfault. Fix build by building only the database server. Other make targets fetch dependencies at build time and this behaviour cannot be overriden. Therefore, the clients and web interface are no longer built. See rethinkdb/rethinkdb#6867.
@jonringer okay, I'm done. |
And remove patch working around a GCC bug.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do you mind squashing the two rethinkdb
commits?
I see both of them as being a "fix"
The first commit introduces a patch to make the server compile using GCC which is deleted again in the second commit. It seems reasonable to me to keep it in the history in case we have to switch back or someone wants to build with GCC for some other reason. |
I guess that could be useful in cases with |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Result of nixpkgs-review pr 87828 1
4 packages built:
- python27Packages.rethinkdb
- python37Packages.rethinkdb
- python38Packages.rethinkdb
- rethinkdb
Motivation for this change
The
rethinkdb
package for the RethinkDB database server fails to build and is marked as broken. Thepython2.pkgs.rethinkdb
package for the python client errors because of a missing dependency. This fixes the two packages. Please see the commit messages for details.Also, I changed the license meta fields as the codebase was relicensed to Apache 2.0 after ownership was transferred to the Linux foundation.
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)