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

nixos/redis: fix merging #73049

Merged
merged 1 commit into from Nov 8, 2019
Merged

nixos/redis: fix merging #73049

merged 1 commit into from Nov 8, 2019

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Nov 8, 2019

#71584 did merging without mkMerge.

cc @jtojnar

Motivation for this change
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 nix-review --run "nix-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.
Notify maintainers

cc @maralorn

NixOS#71584 did merging without mkMerge.

cc @jtojnar
@flokli
Copy link
Contributor Author

flokli commented Nov 8, 2019

This should be backported to 19.09 aswell due to #71585

Copy link
Contributor

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

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

LGTM-

@worldofpeace
Copy link
Contributor

@GrahamcOfBorg test redis

@flokli flokli merged commit cced569 into NixOS:master Nov 8, 2019
@flokli flokli deleted the fix-redis-merge branch November 8, 2019 21:15
@flokli
Copy link
Contributor Author

flokli commented Nov 8, 2019

backported to 19.09 in 107e2b7.

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