Merge pull request #89479 from edolstra/nix-2.4-completion

Don't enable nix-bash-completions when using Nix 2.4
2020-06-05 13:29:10 +02:00
parent 96795314de bbfc47326b
commit b00463d406
3 changed files with 7 additions and 6 deletions
@@ -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 {