mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-13 21:50:33 +03:00
Merge master into staging-next
This commit is contained in:
commit
deb60260a7
12 changed files with 106 additions and 96 deletions
|
@ -23,8 +23,8 @@ let
|
|||
ln -s ${pyEnv}/bin/mn $out/bin/mn
|
||||
|
||||
# mn errors out without a telnet binary
|
||||
# pkgs.telnet brings an undesired ifconfig into PATH see #43105
|
||||
ln -s ${pkgs.telnet}/bin/telnet $out/bin/telnet
|
||||
# pkgs.inetutils brings an undesired ifconfig into PATH see #43105
|
||||
ln -s ${pkgs.inetutils}/bin/telnet $out/bin/telnet
|
||||
'';
|
||||
in
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue