diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-06-04 14:18:18 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2020-06-04 14:18:18 +0200 |
| commit | bbfc47326b393daf26c7227bfa2cfc235e812251 (patch) | |
| tree | b0e7f9245a0c2774e25d771ac22b78f578e134a1 /nixos/modules/services | |
| parent | 3327b9a385f5ec2e219bf93b48896772b3f66afc (diff) | |
| download | nixlib-bbfc47326b393daf26c7227bfa2cfc235e812251.tar nixlib-bbfc47326b393daf26c7227bfa2cfc235e812251.tar.gz nixlib-bbfc47326b393daf26c7227bfa2cfc235e812251.tar.bz2 nixlib-bbfc47326b393daf26c7227bfa2cfc235e812251.tar.lz nixlib-bbfc47326b393daf26c7227bfa2cfc235e812251.tar.xz nixlib-bbfc47326b393daf26c7227bfa2cfc235e812251.tar.zst nixlib-bbfc47326b393daf26c7227bfa2cfc235e812251.zip | |
Don't enable nix-bash-completions when using Nix 2.4
2.4 has its own completion script which collides with nix-bash-completions.
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 2577cb78e96e..0b3d7f3f03c3 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -442,6 +442,12 @@ in nix.binaryCachePublicKeys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; nix.binaryCaches = [ "https://cache.nixos.org/" ]; + environment.systemPackages = + [ nix + pkgs.nix-info + ] + ++ optional (config.programs.bash.enableCompletion && !versionAtLeast nixVersion "2.4pre") pkgs.nix-bash-completions; + environment.etc."nix/nix.conf".source = nixConf; environment.etc."nix/registry.json".text = builtins.toJSON { |