Don't enable nix-bash-completions when using Nix 2.4
2.4 has its own completion script which collides with
nix-bash-completions.
commitbbfc47326b393daf26c7227bfa2cfc235e812251
authorEelco Dolstra <edolstra@gmail.com>
dateThu 4 Jun 2020, 14:18 (6 years ago)
parent3327b9a
nixos/modules/config/system-path.nix+1−3
@@ -8,8 +8,7 @@ with lib;
88let
99
1010 requiredPackages = map (pkg: setPrio ((pkg.meta.priority or 5) + 3) pkg)
11− [ config.nix.package
12− pkgs.acl
11+ [ pkgs.acl
1312 pkgs.attr
1413 pkgs.bashInteractive # bash with ncurses support
1514 pkgs.bzip2
@@ -33,7 +32,6 @@ let
3332 pkgs.nano
3433 pkgs.ncurses
3534 pkgs.netcat
36− pkgs.nix-info
3735 config.programs.ssh.package
3836 pkgs.perl
3937 pkgs.procps
nixos/modules/programs/bash/bash.nix−3
@@ -238,9 +238,6 @@ in
238238 "/share/bash-completion"
239239 ];
240240
241− environment.systemPackages = optional cfg.enableCompletion
242− pkgs.nix-bash-completions;
243−
244241 environment.shells =
245242 [ "/run/current-system/sw/bin/bash"
246243 "/run/current-system/sw/bin/sh"
nixos/modules/services/misc/nix-daemon.nix+6
@@ -442,6 +442,12 @@ in
442442 nix.binaryCachePublicKeys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
443443 nix.binaryCaches = [ "https://cache.nixos.org/" ];
444444
445+ environment.systemPackages =
446+ [ nix
447+ pkgs.nix-info
448+ ]
449+ ++ optional (config.programs.bash.enableCompletion && !versionAtLeast nixVersion "2.4pre") pkgs.nix-bash-completions;
450+
445451 environment.etc."nix/nix.conf".source = nixConf;
446452
447453 environment.etc."nix/registry.json".text = builtins.toJSON {