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

protobuf: 3.7.0 -> 3.7.1 #60015

Merged
merged 1 commit into from Apr 24, 2019
Merged

protobuf: 3.7.0 -> 3.7.1 #60015

merged 1 commit into from Apr 24, 2019

Conversation

teto
Copy link
Member

@teto teto commented Apr 22, 2019

Fix fctix mozc issue #60011
I tried to bump moz as well but it failed with various errors, this should be good enough.

          ^
../../unix/fcitx/fcitx_key_event_handler.cc:209:10: error: no template named 'set'; did you mean 'std::set'?
    for (set<commands::KeyEvent::ModifierKey>::const_iterator it =
         ^~~
         std::set
/nix/store/pm4rg0bdiaj5b748kncp9vf7n3x446sd-gcc-7.4.0/include/c++/7.4.0/bits/stl_multiset.h:69:11: note: 'std::set' declared here
    class set;
          ^
13 errors generated.


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

Required bump by mozc
@teto
Copy link
Member Author

teto commented Apr 23, 2019

@GrahamcOfBorg build fcitx-engines.mozc

@teto
Copy link
Member Author

teto commented Apr 24, 2019

care to check this one @Lucus16 ?

Copy link
Contributor

@Lucus16 Lucus16 left a comment

Choose a reason for hiding this comment

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

Upstream introduced a backwards incompatible change in 3.7.0 and reverted it in 3.7.1. It's a patch version bump so there shouldn't be any backwards incompatible changes in this one. Looking at google/mozc#460, It's clear this will fix #60011. I think #59662 should be reverted here. It would also be nice to check fcitx-engines.* and ibus-engines.* automatically whenever their inputs change, but I don't know how to do that.

@teto
Copy link
Member Author

teto commented Apr 24, 2019

nix-review can rebuild all packages depending on some package but it can be quite resource intensive, which is why I haven't used it here. I use fcitx so I will leave #59662 revert to someone more knowledgeable. I can look at your PR if you create one.

@teto teto merged commit 1b0f67d into NixOS:master Apr 24, 2019
@teto teto deleted the fcitx branch April 24, 2019 09:10
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