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

nixos/xserver:services.xserver.xkbOptions is now commas #73394

Merged
merged 1 commit into from Jan 5, 2020

Conversation

pasqui23
Copy link
Contributor

Motivation for this change

Fixes #18646

Things done
  • 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 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 @

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.

It doesn't break any functionality (see xkbvalidate) and makes the the option mergable. 👍

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/68

@timokau
Copy link
Member

timokau commented Nov 17, 2019

This is a breaking change right? If so, maybe a changelog entry would be good.

Also as a minor nitpick: Please use the imperative in your commit message and talk about your intention, not the implementation details (Make xkbOptions mergable or similar).

CC @Ericson2314

@rnhmjoj
Copy link
Contributor

rnhmjoj commented Nov 17, 2019

This is a breaking change right? If so, maybe a changelog entry would be good.

No, it shouldn't break any existing module or config:

nix-repl> lib.types.str.check "a,b,c"    
true

nix-repl> lib.types.commas.check "a,b,c"
true

However if two modules set xkbOptions the values will be appended.

@timokau
Copy link
Member

timokau commented Nov 17, 2019

Nice. I don't have much experience with NixOS modules, so thanks for clarifying. Since @Ericson2314 raised the initial issue and has merge rights himself, I think its best if he takes a look at this and ultimately merges it. If he's unresponsive for a couple of days feel free to ping me again.

Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

@pasqui23 I'm seeing of a lot of your commits getting merged in like
title:commit description

when there's a missing space.

Can we do?

 nixos/xserver: xkbOptions is now commas

@nh2
Copy link
Contributor

nh2 commented Dec 22, 2019

@pasqui23 Do you know how you can change the commit description the way @worldofpeace suggests? If not, git commit --amend is what you need.

@roberth
Copy link
Member

roberth commented Jan 5, 2020

Thank you @pasqui23 !

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.

Could services.xserver.xkboptions be a list not a string?
7 participants