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

kbd: Renamed norwegian dvorak keymap to dvorak-no. #47878

Closed
wants to merge 1 commit into from

Conversation

plutotulp
Copy link
Contributor

This brings it in line with all the other dvorak map names, and keeps
it from hogging the "no" name from the qwery map.

Motivation for this change

Issue #47877; would get dvorak instead of qwerty keymap for "no" map.

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)
  • Fits CONTRIBUTING.md.

@jtojnar
Copy link
Contributor

jtojnar commented Oct 4, 2018

@Mic92
Copy link
Member

Mic92 commented Oct 4, 2018

Do you mind adding those as well?

@plutotulp
Copy link
Contributor Author

Added the other map name changes. Should I put that into postPatch instead, by the way? I suppose that makes more sense, and if upstream ever changes you get the build error before compilation begins.

@Mic92
Copy link
Member

Mic92 commented Oct 7, 2018

Looks good. Can you change the branch from staging to master? This might require a rebase + force push on your site.

@plutotulp plutotulp force-pushed the kbd-dvorak-no branch 2 times, most recently from d2a6ddc to d8d3f56 Compare October 8, 2018 23:20
From upstream kbd, some keymap names are reused across very different
keyboard layouts. This is a a problem because loadkeys just picks the
first keymap it sees. The clashing names lead to e.g.  "loadkeys no"
defaulting to a norwegian dvorak map instead of the much more common
qwerty one.

Used Arch Linux's list of keymaps that need renaming, with a small
deviation: the norwegian dvorak map becomes dvorak-no instead of
no-dvorak, to match the naming scheme for all the other dvorak maps.
@plutotulp
Copy link
Contributor Author

Rebased to master, rewrote as a single commit on top of that, then force pushed.

@Mic92
Copy link
Member

Mic92 commented Oct 9, 2018

@plutotulp never mind I actually meant the opposite. Did you were on staging before. I will push it to staging now. I must have been confused.

@Mic92
Copy link
Member

Mic92 commented Oct 9, 2018

added in f1987fb the pull request will be closed automatically if staging is merged into master.

@Mic92
Copy link
Member

Mic92 commented Oct 9, 2018

At least I was able to test the pull request more easily on master.

Mic92 pushed a commit that referenced this pull request Oct 9, 2018
From upstream kbd, some keymap names are reused across very different
keyboard layouts. This is a a problem because loadkeys just picks the
first keymap it sees. The clashing names lead to e.g.  "loadkeys no"
defaulting to a norwegian dvorak map instead of the much more common
qwerty one.

Used Arch Linux's list of keymaps that need renaming, with a small
deviation: the norwegian dvorak map becomes dvorak-no instead of
no-dvorak, to match the naming scheme for all the other dvorak maps.

fixes #47878

(cherry picked from commit f1987fb)
@Mic92
Copy link
Member

Mic92 commented Oct 9, 2018

Also ported back to staging-18.09: df6d40f

@plutotulp
Copy link
Contributor Author

Great, thanks!

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