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

foundationdb: add branch 6.2 #97683

Closed
wants to merge 3 commits into from
Closed

foundationdb: add branch 6.2 #97683

wants to merge 3 commits into from

Conversation

vlche
Copy link

@vlche vlche commented Sep 10, 2020

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
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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.

foundationdb: fix, removed trailing whitespace
foundationdb: fix incorrect maintainer
Copy link
Contributor

@lostnet lostnet left a 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;
Copy link
Contributor

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 // {
Copy link
Contributor

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,<.*,,'"
Copy link
Contributor

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";
Copy link
Contributor

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.

@SuperSandro2000
Copy link
Member

ping @thoughtpolice

@stale
Copy link

stale bot commented Sep 19, 2021

I marked this as stale due to inactivity. → More info

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Sep 19, 2021
@eyeinsky
Copy link
Contributor

eyeinsky commented Apr 8, 2022

Is this otherwise still working (are you using it)? @SuperSandro2000 @lostnet

@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Apr 8, 2022
@lostnet
Copy link
Contributor

lostnet commented Apr 8, 2022

@eyeinsky It was a starting point for me, but I wanted 6.3+ for arm64 support. I think I was last using this but since then the project roadmap changed and I wont need foundationdb.

Comment on lines +69 to +71
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
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
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

Comment on lines +42 to +46
cmakeFlags =
[ "-DCMAKE_BUILD_TYPE=Release"
(lib.optionalString officialRelease "-DFDB_RELEASE=TRUE")

# FIXME: why can't openssl be found automatically?
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
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

Comment on lines +14 to +15
tests = with builtins;
builtins.replaceStrings [ "\n" ] [ " " ] (lib.fileContents ./test-list.txt);
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
tests = with builtins;
builtins.replaceStrings [ "\n" ] [ " " ] (lib.fileContents ./test-list.txt);
tests = builtins.replaceStrings [ "\n" ] [ " " ] (lib.fileContents ./test-list.txt);

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Nov 2, 2022
@wegank wegank mentioned this pull request Apr 26, 2023
10 tasks
@wegank wegank closed this Apr 26, 2023
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

6 participants