nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-20 03:43:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #147459 from samueldr/fix/nix-bash-completion-2.4

Browse Source 
Fix bash completion for stable nix-* commands with Nix 2.4
This commit is contained in:
Thiago Kenji Okada 2021-11-26 10:32:51 -03:00 committed by GitHub
commit 6f4eab2bd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/misc/nix-daemon.nix
View File

@ -546,7 +546,7 @@ in
[ nix [ nix
pkgs.nix-info pkgs.nix-info
] ]
++ optional (config.programs.bash.enableCompletion && !versionAtLeast nixVersion "2.4pre") pkgs.nix-bash-completions; ++ optional (config.programs.bash.enableCompletion) pkgs.nix-bash-completions;
environment.etc."nix/nix.conf".source = nixConf; environment.etc."nix/nix.conf".source = nixConf;

2
pkgs/shells/bash/nix-bash-completions/default.nix
View File

@ -32,5 +32,7 @@ stdenv.mkDerivation rec {
license = licenses.bsd3; license = licenses.bsd3;
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ hedning ]; maintainers = with maintainers; [ hedning ];
# Set a lower priority such that the newly provided completion from Nix 2.4 are preferred.
priority = 10;
}; };
} }