Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

nixos: zsh: Remove hack for zsh-nix-completions on nix 2.4

The zsh-nix-completions package now sets a priority, which helps avoid
conflicts with newer nix versions without patching the package from
the module.

+2 -15
+2 -15
nixos/modules/programs/zsh/zsh.nix
··· 283 283 # see https://github.com/NixOS/nixpkgs/issues/132732 284 284 environment.etc.zinputrc.text = builtins.readFile ./zinputrc; 285 285 286 - environment.systemPackages = 287 - let 288 - completions = 289 - if lib.versionAtLeast (lib.getVersion config.nix.package) "2.4pre" 290 - then 291 - pkgs.nix-zsh-completions.overrideAttrs 292 - (_: { 293 - postInstall = '' 294 - rm $out/share/zsh/site-functions/_nix 295 - ''; 296 - }) 297 - else pkgs.nix-zsh-completions; 298 - in 299 - [ pkgs.zsh ] 300 - ++ optional cfg.enableCompletion completions; 286 + environment.systemPackages = [ pkgs.zsh ] 287 + ++ optional cfg.enableCompletion pkgs.nix-zsh-completions; 301 288 302 289 environment.pathsToLink = optional cfg.enableCompletion "/share/zsh"; 303 290