From 888eb29a546eb311c75715a8a7982238a6a55865 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 24 Jul 2020 17:27:30 +0200 Subject: [PATCH] riot-{web,desktop}: throw an error to use element-web This approach has been discussed in #93774[1]. The application has been completely rebranded and to avoid confusion, users should actively be pointed to `element-*`. [1] https://github.com/NixOS/nixpkgs/pull/93774#issuecomment-664077010 --- pkgs/top-level/aliases.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c9c101da1a06..be624a59aaea 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -449,8 +449,6 @@ mapAliases ({ rdiff_backup = rdiff-backup; # added 2014-11-23 rdmd = dtools; # added 2017-08-19 rhc = throw "deprecated in 2019-04-09: abandoned by upstream."; - riot-desktop = element-desktop; # added 2020-07-15 - riot-web = element-web; # added 2020-07-15 rng_tools = rng-tools; # added 2018-10-24 robomongo = robo3t; #added 2017-09-28 rssglx = rss-glx; #added 2015-03-25 @@ -711,4 +709,8 @@ mapAliases ({ sqldeveloper_18 = throw "sqldeveloper_18 is not maintained anymore!"; # added 2020-02-04 gcc-snapshot = throw "Marked as broken for >2 years, additionally this 'snapshot' pointed to a fairly old one from gcc7."; + + /* Cleanup before 21.03 */ + riot-desktop = throw "riot-desktop is now element-desktop!"; + riot-web = throw "riot-web is now element-web"; })