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

xkeyboard-config: 2.27 -> 2.31 #101695

Merged
merged 2 commits into from Oct 27, 2020
Merged

xkeyboard-config: 2.27 -> 2.31 #101695

merged 2 commits into from Oct 27, 2020

Conversation

@lourkeur
Copy link
Contributor

@lourkeur lourkeur commented Oct 25, 2020

Motivation for this change

upstream minor version. New layouts, e. g. French AFNOR Azerty

Things done

Functionally tested on one of my workstations w/ gnome3 and x11.extra-layouts.

Targeted staging because there are a lot of transitive referers

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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.
@lourkeur
Copy link
Contributor Author

@lourkeur lourkeur commented Oct 25, 2020

nixos/test/keymap.nix passes

teto
teto approved these changes Oct 25, 2020
@teto
Copy link
Contributor

@teto teto commented Oct 25, 2020

would you be interested in adding the manpage while you are at it ? it s a longstanding isusue https://github.com/freedesktop/xkeyboard-config/tree/master/man

Copy link
Contributor

@jtojnar jtojnar left a comment

@lourkeur
Copy link
Contributor Author

@lourkeur lourkeur commented Oct 26, 2020

would you be interested in adding the manpage while you are at it ? it s a longstanding isusue https://github.com/freedesktop/xkeyboard-config/tree/master/man

I looked into that and I found that there's nothing wrong with this derivation in itself. there's a share/man in the output and if you have it directly into your environment, it shows in man. The reason it doesn't show it when used normally is that it isn't spliced in system-path, rather setxkbmap contains a manual symlink to the xkb data. I'll look into it further though.

@teto
Copy link
Contributor

@teto teto commented Oct 27, 2020

fantastic, that fixed it for me.

@teto teto merged commit e3d3bc6 into NixOS:staging Oct 27, 2020
17 checks passed
@lourkeur lourkeur deleted the xkeyboard-config branch Dec 31, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants