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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 81a16d6f7751
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4b7cac98a106
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 1, 2019

  1. nixos/cmt: Update error message for cmt 

    Added clearer error message for the failed assertion with libinput
    @kcalvinalvin
    kcalvinalvin committed Oct 1, 2019
    Copy the full SHA
    a96a5f3 View commit details

  2. Merge pull request #70166 from kcalvinalvin/plasma-cmt-fix 

    nixos/cmt: Update error message for cmt
    @worldofpeace
    worldofpeace authored Oct 1, 2019
    Copy the full SHA
    4b7cac9 View commit details
Showing with 6 additions and 1 deletion.
  1. +6 −1 nixos/modules/services/x11/hardware/cmt.nix
7 changes: 6 additions & 1 deletion nixos/modules/services/x11/hardware/cmt.nix
View file
Original file line number Diff line number Diff line change
@@ -47,7 +47,12 @@ in {
assertions = [
{
assertion = !config.services.xserver.libinput.enable;
message = "cmt and libinput are incompatible, you cannot enable both (in services.xserver).";
message = ''
cmt and libinput are incompatible, meaning you cannot enable them both.
To use cmt you need to disable libinput with `services.xserver.libinput.enable = false`
If you haven't enabled it in configuration.nix, it's enabled by default on a
different xserver module.
'';
}
];
};