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
foundationdb: add branch 6.2 #97683
foundationdb: add branch 6.2 #97683
Conversation
foundationdb: fix, removed trailing whitespace
foundationdb: fix incorrect maintainer
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.
It all looks functionally good to me, I've made a few comments on places where I think there's a clearer or preferred way to do something (to make it more maintainable or quicker to review.)
|
||
meta = with stdenv.lib; { | ||
description = "Open source, distributed, transactional key-value store"; | ||
homepage = https://www.foundationdb.org; |
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.
I think this should be quoted, as direct url syntax is deprecated
@@ -11,6 +11,10 @@ let | |||
gccStdenv = gccStdenv; | |||
llvmPackages = llvmPackages; | |||
}); | |||
cmakeBuild62 = import ./cmake62.nix (args // { |
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 reason for the split cmake62 seems to be the change of libressl->openssl? I think it might be better for maintenance to keep one cmake.nix file and pass an option for which ssl package/declarations.
+# dirty hack for nixos to stop cmake complaining about version mismatch | ||
execute_process( | ||
- COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/build/get_version.sh ${CMAKE_CURRENT_SOURCE_DIR}/versions.target | ||
+ COMMAND bash "-c" "cat ${CMAKE_CURRENT_SOURCE_DIR}/versions.target| grep '<Version>' | sed -e 's,^[^>]*>,,' -e 's,<.*,,'" |
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.
It looks to me like you are inlining the scripts to avoid broken shebangs. It looks like vsmake was using patchShebangs
so I'm not sure if this was broken in 6.1, but only fatal now?
I think patchShebangs should be used if possible or a comment as to this is what it is doing would help for people integrating future versions.
# ------------------------------------------------------ | ||
|
||
foundationdb62 = cmakeBuild62 { | ||
version = "6.2.25"; |
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.
I think it should be freshened to the latest.
ping @thoughtpolice |
I marked this as stale due to inactivity. → More info |
Is this otherwise still working (are you using it)? @SuperSandro2000 @lostnet |
for x in bindings/c/CMakeLists.txt fdbserver/CMakeLists.txt fdbmonitor/CMakeLists.txt fdbbackup/CMakeLists.txt fdbcli/CMakeLists.txt; do | ||
substituteInPlace $x --replace 'fdb_install' 'install' | ||
done |
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.
for x in bindings/c/CMakeLists.txt fdbserver/CMakeLists.txt fdbmonitor/CMakeLists.txt fdbbackup/CMakeLists.txt fdbcli/CMakeLists.txt; do | |
substituteInPlace $x --replace 'fdb_install' 'install' | |
done | |
for x in bindings/c/CMakeLists.txt fdbserver/CMakeLists.txt fdbmonitor/CMakeLists.txt fdbbackup/CMakeLists.txt fdbcli/CMakeLists.txt; do | |
substituteInPlace $x --replace 'fdb_install' 'install' | |
done |
cmakeFlags = | ||
[ "-DCMAKE_BUILD_TYPE=Release" | ||
(lib.optionalString officialRelease "-DFDB_RELEASE=TRUE") | ||
|
||
# FIXME: why can't openssl be found automatically? |
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.
cmakeFlags = | |
[ "-DCMAKE_BUILD_TYPE=Release" | |
(lib.optionalString officialRelease "-DFDB_RELEASE=TRUE") | |
# FIXME: why can't openssl be found automatically? | |
cmakeFlags = [ | |
"-DCMAKE_BUILD_TYPE=Release" | |
(lib.optionalString officialRelease "-DFDB_RELEASE=TRUE") | |
# FIXME: why can't openssl be found automatically? |
and so on
tests = with builtins; | ||
builtins.replaceStrings [ "\n" ] [ " " ] (lib.fileContents ./test-list.txt); |
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.
tests = with builtins; | |
builtins.replaceStrings [ "\n" ] [ " " ] (lib.fileContents ./test-list.txt); | |
tests = builtins.replaceStrings [ "\n" ] [ " " ] (lib.fileContents ./test-list.txt); |
Motivation for this change
A new branch of Foundationdb exists for quite a long time, current branch is 6.2.25, so this PR adds support for it.
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)