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

nixos/xserver: refactor/fix xml tags for keyboard layout overrides #67181

Closed
wants to merge 3 commits into from
Closed

nixos/xserver: refactor/fix xml tags for keyboard layout overrides #67181

wants to merge 3 commits into from

Conversation

dasj19
Copy link
Contributor

@dasj19 dasj19 commented Aug 21, 2019

Motivation for this change

With the current XML tags there is an issue when building with a custom keyboard.
As described here: #47764 (comment) the description of the new keyboard layout will be missing in the built file: xkeyboard-config-2.27/share/X11/xkb/rules/evdev.lst

@rnhmjoj explains that this broke when xkb dropped intltool ... #47764 (comment)

Things done

I built with https://github.com/NixOS/nixpkgs/pull/47764#issuecomment-523237183 and checked the output in xkeyboard-config-2.27/share/X11/xkb/rules/evdev.lst

  • 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 @rnhmjoj

rnhmjoj
rnhmjoj approved these changes Aug 21, 2019
View reviewed changes
Copy link
Contributor

@rnhmjoj rnhmjoj left a comment

Choose a reason for hiding this comment

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

Thank you.

@worldofpeace
Copy link
Contributor

Looks good, @dasj19 can you make commit msg the title of your PR? (and with a summary in the body)

@dasj19
nixos/xserver: refactor/fix xml tags for keyboard layout overrides
7d9c605 
With the current XML tags there is an issue when building with a custom keyboard.
The description of the new keyboard layout will be missing in the built file: xkeyboard-config-2.27/share/X11/xkb/rules/evdev.lst
@dasj19
Merge branch 'fix-custom-xkb-layout' of github.com:dasj19/nixpkgs int…
fd4945f 
…o fix-custom-xkb-layout
@dasj19
Copy link
Contributor Author

dasj19 commented Aug 21, 2019

@worldofpeace I just did that with git commit --amend ... hope I did not mess anything up, this is my first contribution to this project.

@rnhmjoj
Copy link
Contributor

rnhmjoj commented Aug 21, 2019

@dasj19: in general you should use git rebase -i: it can squash commits into a single one, rearrange or change the commit title.

@dasj19 dasj19 mentioned this pull request Sep 9, 2019
Merged
10 tasks
@dasj19
Copy link
Contributor Author

dasj19 commented Sep 9, 2019

closed as #68310 was merged, and it contained the same changes I was proposing here

@dasj19 dasj19 closed this Sep 9, 2019
@dasj19 dasj19 deleted the fix-custom-xkb-layout branch September 17, 2019 11:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rnhmjoj rnhmjoj rnhmjoj approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 0 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@dasj19 @worldofpeace @rnhmjoj @Janik-Haag