Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 933003e6840e
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: e1ce60ae7ae5
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 4, 2020

  1. Fix example for xkbOptions

    ###### Motivation for this change
    With space between two options, multiple options just don't work
    Looks like xkbOptions then used for generation of xorg.conf.d/00-keyboard.conf.
    kbd's man says XkbOptions must be comma-separated without spaces.
    https://linux.die.net/man/4/kbd
    
    ###### Things done
    
    <!-- Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers. -->
    
    - [ ] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) 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](https://github.com/NixOS/nixpkgs/blob/master/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](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).
    
    ###### Notify maintainers
    
    cc @
    juliancoffee committed Jan 4, 2020
    Copy the full SHA
    73b38ff View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1 from juliancoffee/juliancoffee-patch-1

    Fix example for xkbOptions
    juliancoffee committed Jan 4, 2020
    Copy the full SHA
    5851c9c View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2020

  1. Merge pull request #76947 from juliancoffee/master

    Fix example for xkbOptions
    roberth committed Jan 5, 2020
    Copy the full SHA
    e1ce60a View commit details
    Browse the repository at this point in the history