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.

Sign up for GitHub

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

Jump to bottom

19.09: Fixup kea for unique 19.09 mariadb changes #70832

Merged
merged 1 commit into from
Oct 9, 2019
Merged

19.09: Fixup kea for unique 19.09 mariadb changes #70832

merged 1 commit into from
Oct 9, 2019
+1 −1

Conversation

srhb
Copy link
Contributor

@srhb srhb commented Oct 9, 2019

Relevant for #68361

cc @ttuegel I feel like #70025 makes this pretty weird because now we had package divergence directly in 19.09 with no obvious reason (or at least, not that I'm seeing -- perhaps you could enlighten me.)

Wouldn't it be better to have that go through master and avoid branching headaches here?

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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 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 @

Sorry, something went wrong.

@srhb srhb changed the base branch from master to release-19.09 October 9, 2019 06:30
@srhb
Copy link
Contributor Author

srhb commented Oct 9, 2019

Woops, wrong base!

@ofborg ofborg bot added 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 2.status: merge conflict This PR has merge conflicts with the target branch and removed 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: erlang 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang 6.topic: haskell 6.topic: lua 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: pantheon The Pantheon desktop environment 6.topic: python 6.topic: qt/kde 6.topic: ruby 6.topic: rust 6.topic: stdenv Standard environment 6.topic: vim 6.topic: xfce The Xfce Desktop Environment 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 2.status: merge conflict This PR has merge conflicts with the target branch labels Oct 9, 2019
@ofborg ofborg bot requested a review from fpletz October 9, 2019 06:48
@lheckemann
Copy link
Member

@srhb master has a completely different setup for mysql, where libmysqlclient is now used instead; so there was already divergence. It's quite unfortunate that (1) this change was made without checking reverse dependencies (i.e. staging-19.09 was merged without regards to what it broke) and that (2) this happened so late in the run-up to the release… But hey, I guess the best we can do at this point is fix it and move on :) Thanks for the fix, which I seem to have missed in 724dbda!

@lheckemann lheckemann merged commit d7f1e21 into NixOS:release-19.09 Oct 9, 2019
@srhb
Copy link
Contributor Author

srhb commented Oct 9, 2019

@lheckemann Thank you for explaining this! I could probably have found the explanation with a bit more searching. 😅

@srhb srhb deleted the fixup-kea-from-1909-mariadb-divergence branch October 9, 2019 07:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fpletz fpletz

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@srhb @lheckemann