diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-06-05 13:29:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-05 13:29:10 +0200 |
| commit | b00463d40641ea48a8e1dcd954bb3c9511e2e82e (patch) | |
| tree | c2980ba89ee74b33e9fd5a60490c0c995f982c1b /nixos/modules/services | |
| parent | 96795314de2c4e512d6c4ed7cb44837a8b71a65a (diff) | |
| parent | bbfc47326b393daf26c7227bfa2cfc235e812251 (diff) | |
| download | nixlib-b00463d40641ea48a8e1dcd954bb3c9511e2e82e.tar nixlib-b00463d40641ea48a8e1dcd954bb3c9511e2e82e.tar.gz nixlib-b00463d40641ea48a8e1dcd954bb3c9511e2e82e.tar.bz2 nixlib-b00463d40641ea48a8e1dcd954bb3c9511e2e82e.tar.lz nixlib-b00463d40641ea48a8e1dcd954bb3c9511e2e82e.tar.xz nixlib-b00463d40641ea48a8e1dcd954bb3c9511e2e82e.tar.zst nixlib-b00463d40641ea48a8e1dcd954bb3c9511e2e82e.zip | |
Merge pull request #89479 from edolstra/nix-2.4-completion
Don't enable nix-bash-completions when using Nix 2.4
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 { |