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

weechat: fix bad merge #51571

Merged
merged 1 commit into from Dec 6, 2018
Merged

weechat: fix bad merge #51571

merged 1 commit into from Dec 6, 2018

Conversation

alyssais
Copy link
Member

@alyssais alyssais commented Dec 5, 2018

Motivation for this change

8887e1f#r239097413

9504292 accidentally reverted all the changes that had been made to the weechat wrapper since 8887e1f.

I removed the wrapper, then wrote it again, but this time taking the code from the latest version of weechat before the bad merge.

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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

cc @Ma27 @lheckemann

Identified in NixOS@8887e1f#r239097413.

9504292 accidentally reverted all the
changes that had been made to the weechat wrapper since
8887e1f.

I removed the wrapper, then wrote it again, but this time taking the
code from the latest version of weechat before the bad merge.
Copy link
Member

@lheckemann lheckemann left a comment

Choose a reason for hiding this comment

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

Oh no! 🤦‍♂️ I'm pretty sure I got that right on the first merge attempt, which I screwed up by merging the wrong way. Thanks for the fix!

Copy link
Member

@Ma27 Ma27 left a comment

Choose a reason for hiding this comment

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

Checked this with my personal weechat configuration and it seems to work again. Thanks for the fast reaction! 👍

@Ma27 Ma27 merged commit 42356fe into NixOS:master Dec 6, 2018
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