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

mysql module: fix flaky check #31641

Merged
merged 1 commit into from Nov 15, 2017
Merged

mysql module: fix flaky check #31641

merged 1 commit into from Nov 15, 2017

Conversation

danbst
Copy link
Contributor

@danbst danbst commented Nov 14, 2017

Comparing packages via equality will lead to different results when package and module are from different nixpkgs checkouts. See #29387 (comment)

Also, because MariaDB is actually supported, added a note to option description to make this knowledge more discover-able. In particular, https://nixos.org/nixos/options.html#mariadb currently shows zero results, but that is wrong, because pkgs.mysql is actually pkgs.mariadb.

ping @fpletz
call for test @florianjacob

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Comparing packages via equality will lead to different results when package and module are from different
`nixpkgs` checkouts.

Also, because MariaDB is actually supported, added a note to option description to make this knowledge more discover-able.
Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

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

Thanks a lot for the fix! Looks fine to me but let's wait for @florianjacob to chime in. ;)

Copy link
Contributor

@florianjacob florianjacob left a comment

Choose a reason for hiding this comment

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

Works for me like it should, nice way to fix the issue. And on top, makes the MySQL / MariaDB distinction clearer in code and docs. 👍

@@ -7,6 +7,11 @@ let
cfg = config.services.mysql;

mysql = cfg.package;

isMariaDB =
Copy link
Contributor

Choose a reason for hiding this comment

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

Very well expressed, better than what I could have come up with. 👍

@fpletz fpletz merged commit 903a7e2 into NixOS:master Nov 15, 2017
@danbst danbst deleted the patch-13 branch November 16, 2017 03:56
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

4 participants