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

rippled: 1.4.0 -> 1.5.0 #92308

Merged
merged 2 commits into from Jul 6, 2020
Merged

Conversation

RaghavSood
Copy link
Member

Motivation for this change

Ripple has undergone a network upgrade and rippled 1.4.0 no longer syncs

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.

@@ -6486,6 +6486,12 @@
githubId = 131856;
name = "Arnout Engelen";
};
RaghavSood = {
Copy link
Contributor

Choose a reason for hiding this comment

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

please separate this into another commit

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

"-DBOOST_LIBRARYDIR=${boost.out}/lib"
"-DBOOST_INCLUDEDIR=${boost.dev}/include"
];
cmakeFlags = ["-Dstatic=OFF" "-DBoost_NO_BOOST_CMAKE=ON" "-DCMAKE_BUILD_TYPE=Release"];
Copy link
Contributor

Choose a reason for hiding this comment

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

cmake hook already adds CMAKE_BUILD_TYPE

Suggested change
cmakeFlags = ["-Dstatic=OFF" "-DBoost_NO_BOOST_CMAKE=ON" "-DCMAKE_BUILD_TYPE=Release"];
cmakeFlags = ["-Dstatic=OFF" "-DBoost_NO_BOOST_CMAKE=ON" ];

Copy link
Member Author

Choose a reason for hiding this comment

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

Ah, interesting - updated


preConfigure = ''
export HOME=$PWD

echo $HOME && ls -al
Copy link
Contributor

Choose a reason for hiding this comment

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

would you mind deleting this line?

Copy link
Member Author

Choose a reason for hiding this comment

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

Apologies, that was for debugging - removed

Copy link
Contributor

@offlinehacker offlinehacker left a comment

Choose a reason for hiding this comment

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

Thank you for update, looks good 🙂

@offlinehacker
Copy link
Contributor

We used rippled from nixpkgs in my previous company, but since I left, I did not keep it updated, well they seem to not use this package anymore.

@offlinehacker offlinehacker merged commit 9698c73 into NixOS:master Jul 6, 2020
@RaghavSood
Copy link
Member Author

@offlinehacker thanks for the merge! I work at an exchange, and we do use rippled :) Should be able to keep it up to date with minimal effort

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

3 participants