diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-05-16 03:09:33 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-05-16 03:09:33 +0300 |
| commit | 6b6a57574828b21632a7b8ff3a99e1465035b93e (patch) | |
| tree | 07fe10e97c2d0b4cbf45e90952d8c7d948e84c59 /pkgs/top-level/aliases.nix | |
| parent | ce018be2d6ce20960b52ebc4bd86e64a5a58ce29 (diff) | |
| parent | 780592ca6ef752f3f4886a66ed6181095e358db5 (diff) | |
| download | nixpkgs-6b6a57574828b21632a7b8ff3a99e1465035b93e.tar nixpkgs-6b6a57574828b21632a7b8ff3a99e1465035b93e.tar.gz nixpkgs-6b6a57574828b21632a7b8ff3a99e1465035b93e.tar.bz2 nixpkgs-6b6a57574828b21632a7b8ff3a99e1465035b93e.tar.lz nixpkgs-6b6a57574828b21632a7b8ff3a99e1465035b93e.tar.xz nixpkgs-6b6a57574828b21632a7b8ff3a99e1465035b93e.tar.zst nixpkgs-6b6a57574828b21632a7b8ff3a99e1465035b93e.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/tools/networking/telnet/default.nix pkgs/top-level/aliases.nix
Diffstat (limited to 'pkgs/top-level/aliases.nix')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fdc6b58346b..6591968ed55 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -275,6 +275,7 @@ mapAliases (rec { telepathy_qt = telepathy-qt; # added 2018-02-25 telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19 telepathy_salut = telepathy-salut; # added 2018-02-25 + telnet = inetutils; # added 2018-05-15 tex-gyre-bonum-math = tex-gyre-math.bonum; # added 2018-04-03 tex-gyre-pagella-math = tex-gyre-math.pagella; # added 2018-04-03 tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03 |