diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-04-17 06:01:07 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-17 06:01:07 +0000 |
commit | deb60260a7d28ec5c74051dfb78bbaf02d802f3d (patch) | |
tree | b3d140536ab26b56ab45b0d8895a0598dc6940b8 /nixos | |
parent | 503a9041279c57679a6564ee2f1169cfafbac81d (diff) | |
parent | 6140c314d5850406dddc78e55dcc8716ea111ee4 (diff) | |
download | nixpkgs-deb60260a7d28ec5c74051dfb78bbaf02d802f3d.tar nixpkgs-deb60260a7d28ec5c74051dfb78bbaf02d802f3d.tar.gz nixpkgs-deb60260a7d28ec5c74051dfb78bbaf02d802f3d.tar.bz2 nixpkgs-deb60260a7d28ec5c74051dfb78bbaf02d802f3d.tar.lz nixpkgs-deb60260a7d28ec5c74051dfb78bbaf02d802f3d.tar.xz nixpkgs-deb60260a7d28ec5c74051dfb78bbaf02d802f3d.tar.zst nixpkgs-deb60260a7d28ec5c74051dfb78bbaf02d802f3d.zip |
Merge master into staging-next
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/programs/mininet.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/programs/mininet.nix b/nixos/modules/programs/mininet.nix index 6e90e7669ac..2cf6c014c35 100644 --- a/nixos/modules/programs/mininet.nix +++ b/nixos/modules/programs/mininet.nix @@ -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 { |