summaryrefslogtreecommitdiffstats
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorTimothy DeHerrera <tim.deh@pm.me>2021-09-11 15:28:20 -0600
committerGitHub <noreply@github.com>2021-09-11 15:28:20 -0600
commit9f761047cc4d3a7d6b9bbf498fd4f93864e9b311 (patch)
tree3562d82fcca4cc6707f1432fa8891bd123f89db8 /pkgs/top-level
parent0171610faad12bdc6757b483b7e7219780123ff1 (diff)
parentf50e55afdc542f919bd1facfbcbaf30c1ca12e75 (diff)
Merge pull request #137425 from SuperSandro2000/typora
typora: remove
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/aliases.nix3
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c2e524b894f7..a7b3a40a875e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -913,7 +913,8 @@ mapAliases ({
truecrypt = veracrypt; # added 2018-10-24
tshark = wireshark-cli; # added 2018-04-25
tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # added 2021-03-07
- turbo-geth = throw "turbo-geth has been renamed to erigon"; # added 20201-08-08
+ turbo-geth = throw "turbo-geth has been renamed to erigon"; # added 2021-08-08
+ typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed."; # added 2021-09-11
uberwriter = apostrophe; # added 2020-04-23
ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21
ucsFonts = ucs-fonts; # added 2016-07-15
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5493a313d814..5c3064306e8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26633,8 +26633,6 @@ with pkgs;
mlt-qt5 = libsForQt514.mlt;
};
- typora = callPackage ../applications/editors/typora { };
-
taxi = callPackage ../applications/networking/ftp/taxi { };
librep = callPackage ../development/libraries/librep { };