JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #108184 from lovesegfault/command-not-found-nix-shell

Browse Source 
nixos/command-not-found: don't suggest nix-env
This commit is contained in:
Florian Klink 2021-01-02 12:04:43 +01:00 committed by GitHub
commit 71e24364c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nixos/modules/programs/command-not-found/command-not-found.pl
View File

@ -27,8 +27,8 @@ if (!defined $res || scalar @$res == 0) {
my $package = @$res[0]->{package}; my $package = @$res[0]->{package};
if ($ENV{"NIX_AUTO_INSTALL"} // "") { if ($ENV{"NIX_AUTO_INSTALL"} // "") {
print STDERR <<EOF; print STDERR <<EOF;
The program ‘$program’ is currently not installed. It is provided by The program '$program' is currently not installed. It is provided by
the package ‘$package’, which I will now install for you. the package '$package', which I will now install for you.
EOF EOF
; ;
exit 126 if system("nix-env", "-iA", "nixos.$package") == 0; exit 126 if system("nix-env", "-iA", "nixos.$package") == 0;
@ -36,16 +36,17 @@ EOF
exec("nix-shell", "-p", $package, "--run", shell_quote("exec", @ARGV)); exec("nix-shell", "-p", $package, "--run", shell_quote("exec", @ARGV));
} else { } else {
print STDERR <<EOF; print STDERR <<EOF;
The program ‘$program’ is currently not installed. You can install it by typing: The program '$program' is not in your PATH. You can make it available in a
nix-env -iA nixos.$package ephemeral shell by typing:
nix-shell -p $package
EOF EOF
} }
} else { } else {
print STDERR <<EOF; print STDERR <<EOF;
The program ‘$program’ is currently not installed. It is provided by The program '$program' is not in your PATH. It is provided by several packages.
several packages. You can install it by typing one of the following: You can make it available in a ephemeral shell by typing one of the following:
EOF EOF
print STDERR " nix-env -iA nixos.$_->{package}\n" foreach @$res; print STDERR " nix-shell -p $_->{package}\n" foreach @$res;
} }
exit 127; exit 127;