diff options
| author | Timothy DeHerrera <tim.deh@pm.me> | 2021-06-29 11:54:05 -0600 |
|---|---|---|
| committer | Timothy DeHerrera <tim.deh@pm.me> | 2021-07-21 15:55:22 -0600 |
| commit | d687fe88fdbb00b89f4e5b82824c7b187659d648 (patch) | |
| tree | 6a2270346f60704716aa287140faa8166f64c010 | |
| parent | 34d960aecb709028f2d843b22b04c79935204f42 (diff) | |
| download | nixpkgs-d687fe88fdbb00b89f4e5b82824c7b187659d648.tar nixpkgs-d687fe88fdbb00b89f4e5b82824c7b187659d648.tar.gz nixpkgs-d687fe88fdbb00b89f4e5b82824c7b187659d648.tar.bz2 nixpkgs-d687fe88fdbb00b89f4e5b82824c7b187659d648.tar.lz nixpkgs-d687fe88fdbb00b89f4e5b82824c7b187659d648.tar.xz nixpkgs-d687fe88fdbb00b89f4e5b82824c7b187659d648.tar.zst nixpkgs-d687fe88fdbb00b89f4e5b82824c7b187659d648.zip | |
zsh: remove conflicting nixUnstable completions
| -rw-r--r-- | nixos/modules/programs/zsh/zsh.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 049a315c762..81f1395662a 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -279,7 +279,7 @@ in environment.etc.zinputrc.source = ./zinputrc; environment.systemPackages = [ pkgs.zsh ] - ++ optional cfg.enableCompletion pkgs.nix-zsh-completions; + ++ optional (cfg.enableCompletion && ! lib.versionAtLeast (lib.getVersion config.nix.package) "2.4pre") pkgs.nix-zsh-completions; environment.pathsToLink = optional cfg.enableCompletion "/share/zsh"; |