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: b3b0769eced5
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: e8fb77a9446c
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 20, 2018

  1. zsh: patch _setxkbmap completion script

    Instead of searching `/usr` it should search for the `xkb`,
    $XDG_DATA_DIRS will be searched. With this approach we allow compliance
    on NixOS and non-NixOS systems to find `symbols` in the `xkb` directory.
    
    The patch has been accepted by upstream, but isn't released yet, so this
    is mainly a temporary fix until we can bump ZSH to the next stable version.
    
    The `xserver` module links `/share/X11/xkb` to `/run/current-system` to
    make this possible.
    
    The fix can be tested inside the following VM:
    
    ```
    {
      zshtest = {
        programs.zsh.enable = true;
        users.extraUsers.vm = {
          password = "vm";
          isNormalUser = true;
        };
        services.xserver.enable = true;
      };
    }
    ```
    
    Fixes #46025
    Ma27 committed Sep 20, 2018
    Copy the full SHA
    18d4615 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2018

  1. Merge pull request #46152 from Ma27/fix-setxkbmap-completion

    zsh: patch `_setxkbmap` completion script
    Ma27 committed Oct 19, 2018
    Copy the full SHA
    e8fb77a View commit details
    Browse the repository at this point in the history