From a4d3758afa11da1e582b8f2018fcad635061e300 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Jan 2022 02:05:59 +0100
Subject: [PATCH 01/23] sickbeard: remove

Python2 user and unmaintained upstream since 2016.
---
 pkgs/servers/sickbeard/default.nix | 35 ------------------------------
 pkgs/top-level/aliases.nix         |  1 +
 pkgs/top-level/all-packages.nix    |  2 --
 3 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 pkgs/servers/sickbeard/default.nix

diff --git a/pkgs/servers/sickbeard/default.nix b/pkgs/servers/sickbeard/default.nix
deleted file mode 100644
index 46562a11fac4..000000000000
--- a/pkgs/servers/sickbeard/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, python2, makeWrapper }:
-
-let
-  pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]);
-in stdenv.mkDerivation {
-  pname = "sickbeard";
-  version = "2016-03-21";
-
-  src = fetchFromGitHub {
-    owner = "midgetspy";
-    repo = "Sick-Beard";
-    rev = "171a607e41b7347a74cc815f6ecce7968d9acccf";
-    sha256 = "16bn13pvzl8w6nxm36ii724x48z1cnf8y5fl0m5ig1vpqfypk5vq";
-  };
-
-  dontBuild = true;
-  doCheck = false;
-
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ pythonEnv ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp -R {autoProcessTV,cherrypy,data,lib,sickbeard,SickBeard.py} $out/
-
-    makeWrapper $out/SickBeard.py $out/bin/sickbeard
-  '';
-
-  meta = with lib; {
-    description = "PVR & episode guide that downloads and manages all your TV shows";
-    license     = licenses.gpl3;
-    homepage    = "https://github.com/midgetspy/Sick-Beard";
-    maintainers = with lib.maintainers; [ ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 91820f6f9614..e5f5ead1eb0a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -850,6 +850,7 @@ mapAliases ({
   seg3d = throw "seg3d has been removed from nixpkgs (2019-11-10)";
   sepolgen = throw "sepolgen was merged into selinux-python"; # added 2021-11-11
   shared_mime_info = shared-mime-info; # added 2018-02-25
+  sickbeard = throw "sickbeard has been removed from nixpkgs, as it was unmaintained."; # added 2022-01-01
   skrooge2 = skrooge; # added 2017-02-18
   sky = throw "sky has been removed from nixpkgs (2020-09-16)";
   skype = skypeforlinux; # added 2017-07-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea6e8fd3dce3..91d662f2f277 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21780,8 +21780,6 @@ with pkgs;
       # see also openssl, which has/had this same trick
   };
 
-  sickbeard = callPackage ../servers/sickbeard { };
-
   sickgear = callPackage ../servers/sickbeard/sickgear.nix { };
 
   sickrage = callPackage ../servers/sickbeard/sickrage.nix { };

From 2be369a7d678dfd3c5a89c1e6314aa75161d647f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Jan 2022 02:09:47 +0100
Subject: [PATCH 02/23] sickrage: remove

Uses python2 and unmaintained in nixpkgs since introduced in 2018.

Upstream still maintains it, but it isn't easy to package, so we'll
remove it now.
---
 pkgs/servers/sickbeard/sickrage.nix | 34 -----------------------------
 pkgs/top-level/aliases.nix          |  1 +
 pkgs/top-level/all-packages.nix     |  2 --
 3 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 pkgs/servers/sickbeard/sickrage.nix

diff --git a/pkgs/servers/sickbeard/sickrage.nix b/pkgs/servers/sickbeard/sickrage.nix
deleted file mode 100644
index 43ba82caf768..000000000000
--- a/pkgs/servers/sickbeard/sickrage.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ lib, fetchFromGitHub, python2, makeWrapper }:
-
-python2.pkgs.buildPythonApplication rec {
-  pname = "sickrage";
-  version = "v2018.07.21-1";
-
-  src = fetchFromGitHub {
-    owner = "SickRage";
-    repo = "SickRage";
-    rev = version;
-    sha256 = "0lzklpsxqrb73inbv8almnhbnb681pmi44gzc8i4sjwmdksiiif9";
-  };
-
-  dontBuild = true;
-  doCheck = false;
-
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ python2 ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp -R {gui,lib,locale,sickbeard,sickrage,SickBeard.py} $out/
-
-    makeWrapper $out/SickBeard.py $out/bin/sickrage
-  '';
-
-  meta = with lib; {
-    description = "Automatic Video Library Manager for TV Shows";
-    longDescription = "It watches for new episodes of your favorite shows, and when they are posted it does its magic.";
-    license     = licenses.gpl3;
-    homepage    = "https://sickrage.github.io";
-    maintainers = with maintainers; [ sterfield ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e5f5ead1eb0a..5d38d318972e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -851,6 +851,7 @@ mapAliases ({
   sepolgen = throw "sepolgen was merged into selinux-python"; # added 2021-11-11
   shared_mime_info = shared-mime-info; # added 2018-02-25
   sickbeard = throw "sickbeard has been removed from nixpkgs, as it was unmaintained."; # added 2022-01-01
+  sickrage = throw "sickbeard has been removed from nixpkgs, as it was unmaintained."; # added 2022-01-01
   skrooge2 = skrooge; # added 2017-02-18
   sky = throw "sky has been removed from nixpkgs (2020-09-16)";
   skype = skypeforlinux; # added 2017-07-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 91d662f2f277..983fae30cbd3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21782,8 +21782,6 @@ with pkgs;
 
   sickgear = callPackage ../servers/sickbeard/sickgear.nix { };
 
-  sickrage = callPackage ../servers/sickbeard/sickrage.nix { };
-
   sigurlx = callPackage ../tools/security/sigurlx { };
 
   sipwitch = callPackage ../servers/sip/sipwitch { };

From 15f577daaa2b382b59a1eb7ed8ca9c826e58495e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Jan 2022 02:17:29 +0100
Subject: [PATCH 03/23] couchpotato, nixos/couchpotato: remove

Using python2 and abadoned upstream in 2020, last release in 2015.
---
 nixos/modules/misc/ids.nix                  |  4 +-
 nixos/modules/module-list.nix               |  1 -
 nixos/modules/rename.nix                    |  1 +
 nixos/modules/services/misc/couchpotato.nix | 42 --------------------
 pkgs/servers/couchpotato/default.nix        | 44 ---------------------
 pkgs/top-level/all-packages.nix             |  2 -
 6 files changed, 3 insertions(+), 91 deletions(-)
 delete mode 100644 nixos/modules/services/misc/couchpotato.nix
 delete mode 100644 pkgs/servers/couchpotato/default.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index a9f2031d1e1a..d7fc9ca87d45 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -296,7 +296,7 @@ in
       infinoted = 264;
       sickbeard = 265;
       headphones = 266;
-      couchpotato = 267;
+      # couchpotato = 267; # unused, removed 2022-01-01
       gogs = 268;
       #pdns-recursor = 269; # dynamically allocated as of 2020-20-18
       #kresd = 270; # switched to "knot-resolver" with dynamic ID
@@ -603,7 +603,7 @@ in
       infinoted = 264;
       sickbeard = 265;
       headphones = 266;
-      couchpotato = 267;
+      # couchpotato = 267; # unused, removed 2022-01-01
       gogs = 268;
       #kresd = 270; # switched to "knot-resolver" with dynamic ID
       #rpc = 271; # unused
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e8bbaacc2c5a..5dd98644ac85 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -511,7 +511,6 @@
   ./services/misc/cpuminer-cryptonight.nix
   ./services/misc/cgminer.nix
   ./services/misc/confd.nix
-  ./services/misc/couchpotato.nix
   ./services/misc/dendrite.nix
   ./services/misc/devmon.nix
   ./services/misc/dictd.nix
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 15c3a8dc1ab4..0171a8511d5b 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -20,6 +20,7 @@ with lib;
     (mkRemovedOptionModule [ "fonts" "fontconfig" "penultimate" ] "The corresponding package has removed from nixpkgs.")
     (mkRemovedOptionModule [ "services" "quagga" ] "the corresponding package has been removed from nixpkgs")
     (mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.")
+    (mkRemovedOptionModule [ "services" "couchpotato" ] "The corresponding package was removed from nixpkgs.")
     (mkRemovedOptionModule [ "services" "deepin" ] "The corresponding packages were removed from nixpkgs.")
     (mkRemovedOptionModule [ "services" "firefox" "syncserver" ] "The corresponding package was removed from nixpkgs.")
     (mkRemovedOptionModule [ "services" "marathon" ] "The corresponding package was removed from nixpkgs.")
diff --git a/nixos/modules/services/misc/couchpotato.nix b/nixos/modules/services/misc/couchpotato.nix
deleted file mode 100644
index f5163cf86cf5..000000000000
--- a/nixos/modules/services/misc/couchpotato.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.services.couchpotato;
-
-in
-{
-  options = {
-    services.couchpotato = {
-      enable = mkEnableOption "CouchPotato Server";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    systemd.services.couchpotato = {
-      description = "CouchPotato Server";
-      after = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-
-      serviceConfig = {
-        Type = "simple";
-        User = "couchpotato";
-        Group = "couchpotato";
-        StateDirectory = "couchpotato";
-        ExecStart = "${pkgs.couchpotato}/bin/couchpotato";
-        Restart = "on-failure";
-      };
-    };
-
-    users.users.couchpotato =
-      { group = "couchpotato";
-        home = "/var/lib/couchpotato/";
-        description = "CouchPotato daemon user";
-        uid = config.ids.uids.couchpotato;
-      };
-
-    users.groups.couchpotato =
-      { gid = config.ids.gids.couchpotato; };
-  };
-}
diff --git a/pkgs/servers/couchpotato/default.nix b/pkgs/servers/couchpotato/default.nix
deleted file mode 100644
index d276c02487df..000000000000
--- a/pkgs/servers/couchpotato/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ fetchFromGitHub, python2Packages, lib }:
-
-with python2Packages;
-
-buildPythonApplication rec {
-  pname = "couchpotato";
-  version = "3.0.1";
-  disabled = isPy3k;
-
-  src = fetchFromGitHub {
-    owner = "CouchPotato";
-    repo = "CouchPotatoServer";
-    rev = "build/${version}";
-    hash = "sha256-0k8MqLnqYjhHPE9/jncTFIj1T4F2aXU4mXdeEimDB7M=";
-  };
-
-  format = "other";
-
-  postPatch = ''
-    substituteInPlace CouchPotato.py --replace "dirname(os.path.abspath(__file__))" "os.path.join(dirname(os.path.abspath(__file__)), '../${python.sitePackages}')"
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin/
-    mkdir -p $out/${python.sitePackages}/
-
-    cp -r libs/* $out/${python.sitePackages}/
-    cp -r couchpotato $out/${python.sitePackages}/
-
-    cp CouchPotato.py $out/bin/couchpotato
-    chmod +x $out/bin/*
-  '';
-
-  postFixup = ''
-    wrapProgram "$out/bin/couchpotato" --set PYTHONPATH "$PYTHONPATH:$out/${python.sitePackages}"
-  '';
-
-  meta = {
-    description = "Automatic movie downloading via NZBs and torrents";
-    license     = lib.licenses.gpl3;
-    homepage    = "https://couchpota.to/";
-    maintainers = with lib.maintainers; [ fadenb ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 983fae30cbd3..5305c75a8822 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20887,8 +20887,6 @@ with pkgs;
     erlang = erlangR22;
   };
 
-  couchpotato = callPackage ../servers/couchpotato {};
-
   dendrite = callPackage ../servers/dendrite { };
 
   dex-oidc = callPackage ../servers/dex { };

From 74c730bd87fcee5c36e52f8aaa93c05d3eead805 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Jan 2022 02:39:03 +0100
Subject: [PATCH 04/23] euca2ools: remove

Uses python2 and the upstream stopped maintaining it in 2017.
---
 .../virtualization/euca2ools/default.nix      | 23 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 pkgs/tools/virtualization/euca2ools/default.nix

diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix
deleted file mode 100644
index 88e83f42733e..000000000000
--- a/pkgs/tools/virtualization/euca2ools/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, fetchgit, python2Packages }:
-
-let
-  inherit (python2Packages) buildPythonApplication boto m2crypto;
-in buildPythonApplication {
-  pname = "euca2ools";
-  version = "2.1.4";
-
-  src = fetchgit {
-    url = "https://github.com/eucalyptus/euca2ools.git";
-    rev = "19cb7eac34dd7efe3a56e4841b9692c03458bf3b";
-    sha256 = "0grsgn5gbvk1hlfa8qx7ppz7iyfyi2pdhxy8njr8lm60w4amfiyq";
-  };
-
-  propagatedBuildInputs = [ boto m2crypto ];
-
-  meta = {
-    homepage = "https://github.com/eucalyptus/euca2ools";
-    description = "Tools for interacting with Amazon EC2/S3-compatible cloud computing services";
-    maintainers = [ lib.maintainers.eelco ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5d38d318972e..cc08d49341fc 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -233,6 +233,7 @@ mapAliases ({
   envelope = throw "envelope has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05
   epoxy = libepoxy; # 2021-11-11
   esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # added 2021-04-12
+  euca2tools = throw "euca2ools has been removed because it is unmaintained upstream and still uses python2."; # added 2022-01-01
   evolution_data_server = evolution-data-server; # added 2018-02-25
   etcdctl = etcd; # added 2018-04-25
   exfat-utils = exfat;                  # 2015-09-11
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5305c75a8822..4b6dadf075de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5131,8 +5131,6 @@ with pkgs;
 
   ettercap = callPackage ../applications/networking/sniffers/ettercap { };
 
-  euca2ools = callPackage ../tools/virtualization/euca2ools { };
-
   eventstat = callPackage ../os-specific/linux/eventstat { };
 
   evillimiter = python3Packages.callPackage ../tools/networking/evillimiter { };

From 27d75c273008d16f15aa3c791e4197f47abe3a72 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Jan 2022 02:47:43 +0100
Subject: [PATCH 05/23] zabbix-cli: use python3, enable tests, remove
 maintainer

The maintainer hasn't interacted with this package since it was
introduced in 2017.
---
 pkgs/tools/misc/zabbix-cli/default.nix | 37 ++++++++++++++++----------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/misc/zabbix-cli/default.nix b/pkgs/tools/misc/zabbix-cli/default.nix
index 74e7e7223d14..3732361ea834 100644
--- a/pkgs/tools/misc/zabbix-cli/default.nix
+++ b/pkgs/tools/misc/zabbix-cli/default.nix
@@ -1,17 +1,12 @@
-{ fetchFromGitHub, lib, python2Packages }:
-let
-  pythonPackages = python2Packages;
+{ lib
+, fetchFromGitHub
+, python3
+}:
 
-in pythonPackages.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "zabbix-cli";
   version = "2.2.1";
-
-  propagatedBuildInputs = with pythonPackages; [ ipaddr requests ];
-
-  # argparse is part of the standardlib
-  prePatch = ''
-    substituteInPlace setup.py --replace "'argparse'," ""
-  '';
+  format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "usit-gd";
@@ -20,10 +15,24 @@ in pythonPackages.buildPythonApplication rec {
     sha256 = "0wzmrn8p09ksqhhgawr179c4az7p2liqr0l4q2dra62bxliawyqz";
   };
 
+  propagatedBuildInputs = with python3.pkgs; [
+    requests
+  ];
+
+  checkInputs = with python3.pkgs; [
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # TypeError: option values must be strings
+    "test_descriptor_del"
+    "test_initialize"
+  ];
+
   meta = with lib; {
     description = "Command-line interface for Zabbix";
-    homepage = src.meta.homepage;
-    license = [ licenses.gpl3 ];
-    maintainers = [ maintainers.womfoo ];
+    homepage = "https://github.com/unioslo/zabbix-cli";
+    license = licenses.gpl3Plus;
+    maintainers = [ ];
   };
 }

From ae81c439769ecbb391502a458c9fbf78a43f00fd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Jan 2022 02:51:55 +0100
Subject: [PATCH 06/23] tor-arm: remove

Uses python2 and the upstream has abandoned the project.
---
 pkgs/tools/security/tor/tor-arm.nix | 55 -----------------------------
 pkgs/top-level/aliases.nix          |  1 +
 pkgs/top-level/all-packages.nix     |  2 --
 3 files changed, 1 insertion(+), 57 deletions(-)
 delete mode 100644 pkgs/tools/security/tor/tor-arm.nix

diff --git a/pkgs/tools/security/tor/tor-arm.nix b/pkgs/tools/security/tor/tor-arm.nix
deleted file mode 100644
index fcdb628e0f4a..000000000000
--- a/pkgs/tools/security/tor/tor-arm.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ lib, stdenv, fetchurl, makeWrapper
-, python2Packages, ncurses, lsof, nettools
-}:
-
-stdenv.mkDerivation rec {
-  pname = "tor-arm";
-  version = "1.4.5.0";
-
-  src = fetchurl {
-    url = "https://www.atagar.com/arm/resources/static/arm-${version}.tar.bz2";
-    sha256 = "1yi87gdglkvi1a23hv5c3k7mc18g0rw7b05lfcw81qyxhlapf3pw";
-  };
-
-  nativeBuildInputs = [ makeWrapper python2Packages.python ];
-
-  outputs = [ "out" "man" ];
-
-  postPatch = ''
-    substituteInPlace ./setup.py --replace "/usr/bin" "$out/bin"
-    substituteInPlace ./src/util/connections.py \
-      --replace "lsof -wnPi"   "${lsof}/bin/lsof"
-    substituteInPlace ./src/util/torTools.py \
-      --replace "netstat -npl" "${nettools}/bin/netstat -npl" \
-      --replace "lsof -wnPi"   "${lsof}/bin/lsof"
-
-    substituteInPlace ./arm --replace '"$0" = /usr/bin/arm' 'true'
-    substituteInPlace ./arm --replace "python" "${python2Packages.python}/bin/python"
-
-    for i in ./install ./arm ./src/gui/controller.py ./src/cli/wizard.py ./src/resources/torrcOverride/override.h ./src/resources/torrcOverride/override.py ./src/resources/arm.1 ./setup.py; do
-      substituteInPlace $i --replace "/usr/share" "$out/share"
-    done
-
-    # fixes man page installation
-    substituteInPlace ./setup.py --replace "src/resoureces" "src/resources"
-  '';
-
-  installPhase = ''
-    mkdir -p $out/share/arm $out/bin $out/libexec
-    python setup.py install --prefix=$out --docPath $out/share/doc/arm
-    cp -R src/TorCtl $out/libexec
-
-    wrapProgram $out/bin/arm \
-      --prefix PYTHONPATH : "$(toPythonPath $out):$out/libexec:$PYTHONPATH" \
-      --set TERMINFO "${ncurses.out}/share/terminfo" \
-      --set TERM "xterm"
-  '';
-
-  meta = {
-    description = "A terminal status monitor for Tor relays";
-    homepage    = "https://www.atagar.com/arm/";
-    license     = lib.licenses.gpl3;
-    platforms   = lib.platforms.unix;
-    maintainers = [ lib.maintainers.thoughtpolice ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index cc08d49341fc..3cfcd48e373a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -955,6 +955,7 @@ mapAliases ({
   tomcat7 = throw "tomcat7 has been removed from nixpkgs as it has reached end of life."; # added 2021-06-16
   tomcat8 = throw "tomcat8 has been removed from nixpkgs as it has reached end of life."; # added 2021-06-16
   tomcat85 = throw "tomcat85 has been removed from nixpkgs as it has reached end of life."; # added 2020-03-11
+  tor-arm = throw "tor-arm has been removed from nixpkgs as the upstream project has been abandoned."; # added 2022-01-01
   torbrowser = tor-browser-bundle-bin; # added 2017-04-05
   torch = throw "torch has been removed, as the upstream project has been abandoned"; # added 2020-03-28
   torch-hdf5 = throw "torch-hdf5 has been removed, as the upstream project has been abandoned"; # added 2020-03-28
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4b6dadf075de..fde367042ded 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10288,8 +10288,6 @@ with pkgs;
 
   tor = callPackage ../tools/security/tor { };
 
-  tor-arm = callPackage ../tools/security/tor/tor-arm.nix { };
-
   tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { };
 
   touchegg = callPackage ../tools/inputmethods/touchegg { };

From 997c1274bd9065db9e540486c3e5c4ef27f7b048 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Jan 2022 03:01:21 +0100
Subject: [PATCH 07/23] pdf-redact-tools: remove

Uses python2 and abandoned by upstream.
---
 .../tools/graphics/pdfredacttools/default.nix | 38 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 pkgs/tools/graphics/pdfredacttools/default.nix

diff --git a/pkgs/tools/graphics/pdfredacttools/default.nix b/pkgs/tools/graphics/pdfredacttools/default.nix
deleted file mode 100644
index 0a1cc111b541..000000000000
--- a/pkgs/tools/graphics/pdfredacttools/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib, fetchFromGitHub, python2Packages, imagemagick, exiftool, file, ghostscript }:
-
-python2Packages.buildPythonApplication rec {
-  pname = "pdf-redact-tools";
-  version = "0.1.2";
-
-  src = fetchFromGitHub {
-    owner = "firstlookmedia";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "01vs1bc0pfgk6x2m36vwra605fg59yc31d0hl9jmj86n8q6wwvss";
-  };
-
-  patchPhase = ''substituteInPlace pdf-redact-tools      \
-    --replace \'convert\' \'${imagemagick}/bin/convert\' \
-    --replace \'exiftool\' \'${exiftool}/bin/exiftool\'  \
-    --replace \'file\' \'${file}/bin/file\'
-   '';
-
-  propagatedBuildInputs = [ imagemagick exiftool ghostscript ];
-
-  meta = with lib; {
-    description = "Redact and strip metadata from documents before publishing";
-    longDescription = ''
-        PDF Redact Tools helps with securely redacting and stripping metadata
-        from documents before publishing. Note that this is not a security tool.
-        It uses ImageMagick to parse PDFs.  While ImageMagick is a versatile tool, it has
-        a history of several security bugs. A malicious PDF could exploit a bug in
-        ImageMagick to take over your computer. If you're working with potentially
-        malicious PDFs, it's safest to run them through PDF Redact Tools in an isolated
-        environment, such as a virtual machine, or by using a tool such as the Qubes
-        PDF Converter instead.
-    '';
-    platforms = platforms.all;
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ leenaars ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3cfcd48e373a..802a59d28e08 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -649,6 +649,7 @@ mapAliases ({
   parquet-cpp = arrow-cpp; # added 2018-09-08
   pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04
   pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # added 2021-07-22
+  pdf-redact-tools = throw "pdf-redact-tools has been removed from nixpkgs because the upstream has abandoned the project."; # added 2022-01-01
   pdf2htmlEx = throw "pdf2htmlEx has been removed from nixpkgs, as it was unmaintained"; # added 2020-11-03
   perlXMLParser = perlPackages.XMLParser; # added 2018-10-12
   perlArchiveCpio = perlPackages.ArchiveCpio; # added 2018-10-12
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fde367042ded..977271df6514 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8675,8 +8675,6 @@ with pkgs;
 
   pdf2odt = callPackage ../tools/typesetting/pdf2odt { };
 
-  pdf-redact-tools = callPackage ../tools/graphics/pdfredacttools { };
-
   pdfcrack = callPackage ../tools/security/pdfcrack { };
 
   pdfsandwich = callPackage ../tools/typesetting/pdfsandwich { };

From 7409e5411b384f60184671cd51a5c4535fceafe9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Jan 2022 03:03:58 +0100
Subject: [PATCH 08/23] polysh: remove

Uses python2 and abandoned by upstream in 2012.
---
 pkgs/tools/networking/polysh/default.nix | 25 ------------------------
 pkgs/top-level/aliases.nix               |  1 +
 pkgs/top-level/all-packages.nix          |  2 --
 3 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 pkgs/tools/networking/polysh/default.nix

diff --git a/pkgs/tools/networking/polysh/default.nix b/pkgs/tools/networking/polysh/default.nix
deleted file mode 100644
index 69e5d0427e58..000000000000
--- a/pkgs/tools/networking/polysh/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, fetchurl, python2Packages }:
-
-let
-  inherit (python2Packages) buildPythonApplication;
-in
-buildPythonApplication rec {
-  pname = "polysh";
-  version = "0.4";
-  src = fetchurl {
-          url = "http://guichaz.free.fr/polysh/files/${pname}-${version}.tar.bz2";
-          sha256 = "0kxhp38c8a8hc8l86y53l2z5zpzxc4b8lx5zyzmq1badcrfc4mh4";
-        };
-
-  meta = with lib; {
-    description = "A tool to aggregate several remote shells into one";
-    longDescription = ''
-      Polysh is a tool to aggregate several remote shells into one. It
-      is used to launch an interactive remote shell on many machines
-      at once.
-    '';
-    maintainers = [ maintainers.astsmtl ];
-    homepage = "http://guichaz.free.fr/polysh/";
-    license = licenses.gpl2;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 802a59d28e08..620c8bc93c8f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -724,6 +724,7 @@ mapAliases ({
   plexpy = tautulli; # plexpy got renamed to tautulli, added 2019-02-22
   pmtools = acpica-tools; # added 2018-11-01
   polarssl = mbedtls; # added 2018-04-25
+  polysh = throw "polysh has been removed from nixpkgs as the upstream has abandoned the project."; # added 2022-01-01
   poppler_qt5 = libsForQt5.poppler;  # added 2015-12-19
   postgresql96 = postgresql_9_6;
   postgresql_9_6 = throw "postgresql_9_6 has been removed from nixpkgs, as this version is no longer supported by upstream"; # added 2021-12-03
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 977271df6514..46824ca688d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8864,8 +8864,6 @@ with pkgs;
 
   poly2tri-c = callPackage ../development/libraries/poly2tri-c { };
 
-  polysh = callPackage ../tools/networking/polysh { };
-
   ponysay = callPackage ../tools/misc/ponysay { };
 
   popfile = callPackage ../tools/text/popfile { };

From a426bc246d191aa2bd22f53f8dd51ed57f132d89 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Jan 2022 03:08:05 +0100
Subject: [PATCH 09/23] pyrit: remove

Stuck on python2, the upstream added a note to the projectes REAMDE to
watch out for a python3 version. Nothing ever came off it.
---
 pkgs/tools/security/pyrit/default.nix | 42 ---------------------------
 pkgs/top-level/aliases.nix            |  1 +
 pkgs/top-level/all-packages.nix       |  2 --
 3 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 pkgs/tools/security/pyrit/default.nix

diff --git a/pkgs/tools/security/pyrit/default.nix b/pkgs/tools/security/pyrit/default.nix
deleted file mode 100644
index dc1d0b97f879..000000000000
--- a/pkgs/tools/security/pyrit/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ lib, fetchFromGitHub, python2Packages, openssl, zlib, libpcap, opencl-headers, ocl-icd }:
-
-let
-  version = "2019-12-13";
-  src = fetchFromGitHub {
-    owner = "JPaulMora";
-    repo = "Pyrit";
-    rev = "f0f1913c645b445dd391fb047b812b5ba511782c";
-    sha256 = "1npkvngc4g3g6mpjip2wwhvcd4a75jy3dbddxhxhzrrz4p7259gr";
-  };
-
-  cpyrit_opencl = python2Packages.buildPythonPackage {
-    pname = "cpyrit-opencl";
-    inherit version;
-
-    src = "${src}/modules/cpyrit_opencl";
-
-    buildInputs = [ opencl-headers ocl-icd openssl zlib ];
-
-    postInstall = let
-      python = python2Packages.python;
-    in ''
-      # pyrit uses "import _cpyrit_cuda" so put the output in the root site-packages
-      mv $out/lib/${python.libPrefix}/site-packages/cpyrit/_cpyrit_opencl.so $out/lib/${python.libPrefix}/site-packages/
-    '';
-  };
-in
-python2Packages.buildPythonApplication rec {
-  pname = "pyrit";
-  inherit version src;
-
-  buildInputs = [ openssl zlib libpcap ];
-  propagatedBuildInputs = [ cpyrit_opencl ];
-
-  meta = with lib; {
-    homepage = "https://github.com/JPaulMora/Pyrit";
-    description = "GPGPU-driven WPA/WPA2-PSK key cracker";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ danielfullmer ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 620c8bc93c8f..a87fb56a973c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -767,6 +767,7 @@ mapAliases ({
   phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22
   pybind11 = throw "pybind11 was removed because pythonPackages.pybind11 for the appropriate version of Python should be used"; # added 2021-05-14
   pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd."; # added 2020-10-24
+  pyrit = throw "pyrit has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-01
   python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # added 2021-03-08
   python-swiftclient = swiftclient; # added 2021-09-09
   quagga = throw "quagga is no longer maintained upstream"; # added 2021-04-22
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46824ca688d4..f1acdc551c77 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3599,8 +3599,6 @@ with pkgs;
 
   pyCA = python3Packages.callPackage ../applications/video/pyca {};
 
-  pyrit = callPackage ../tools/security/pyrit {};
-
   pyznap = python3Packages.callPackage ../tools/backup/pyznap {};
 
   procs = callPackage ../tools/admin/procs {

From 4a896438b8ac92e5073137e3adc8a62a6e51328c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Jan 2022 03:12:34 +0100
Subject: [PATCH 10/23] enpass: use python3

---
 pkgs/tools/security/enpass/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix
index 7cbbaee45820..00c161eeb730 100644
--- a/pkgs/tools/security/enpass/default.nix
+++ b/pkgs/tools/security/enpass/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, dpkg, xorg
 , glib, libGLU, libGL, libpulseaudio, zlib, dbus, fontconfig, freetype
 , gtk3, pango
-, makeWrapper , python2Packages, lib
+, makeWrapper , python3Packages, lib
 , lsof, curl, libuuid, cups, mesa, xz, libxkbcommon
 }:
 
@@ -89,7 +89,7 @@ let
       name = "enpass-update-script";
       SCRIPT =./update_script.py;
 
-      buildInputs = with python2Packages; [python requests pathlib2 six attrs ];
+      buildInputs = with python3Packages; [python requests pathlib2 six attrs ];
       shellHook = ''
         exec python $SCRIPT --target pkgs/tools/security/enpass/data.json --repo ${baseUrl}
       '';

From 9f0c445d21013546800d5ec023885edfebec9738 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Jan 2022 03:15:36 +0100
Subject: [PATCH 11/23] creddump: remove

Uses python2 and abandoned by upstream.
---
 pkgs/tools/security/creddump/default.nix | 35 ------------------------
 pkgs/top-level/aliases.nix               |  1 +
 pkgs/top-level/all-packages.nix          |  2 --
 3 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 pkgs/tools/security/creddump/default.nix

diff --git a/pkgs/tools/security/creddump/default.nix b/pkgs/tools/security/creddump/default.nix
deleted file mode 100644
index e9e5685acf4a..000000000000
--- a/pkgs/tools/security/creddump/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ lib, fetchFromGitLab, python2, python2Packages }:
-
-python2Packages.buildPythonApplication rec {
-  pname = "creddump";
-  version = "0.3";
-
-  src = fetchFromGitLab {
-    owner = "kalilinux";
-    repo = "packages/creddump";
-    rev = "debian/${version}-1kali2";
-    sha256 = "0r3rs2hggsvv619l3fh3c0jli6d3ryyj30ni3hz0nz670z5smzcf";
-  };
-
-  # No setup.py is available
-  dontBuild = true;
-  doCheck = false;
-  propagatedBuildInputs = [ python2Packages.pycrypto ];
-
-  installPhase = ''
-    mkdir -p ${placeholder "out"}/bin
-    cp -r framework ${placeholder "out"}/bin/framework
-    cp pwdump.py ${placeholder "out"}/bin/pwdump
-    cp cachedump.py ${placeholder "out"}/bin/cachedump
-    cp lsadump.py ${placeholder "out"}/bin/lsadump
-  '';
-
-  meta = with lib; {
-    description = "Python tool to extract various credentials and secrets from Windows registry hives";
-    homepage = "https://gitlab.com/kalilinux/packages/creddump";
-    license = licenses.gpl3;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.fishi0x01 ];
-  };
-}
-
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a87fb56a973c..7a8ac92d7e7b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -118,6 +118,7 @@ mapAliases ({
   cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10
   cifs_utils = cifs-utils; # added 2016-08
   ckb = ckb-next; # added 2018-10-21
+  creddump = throw "creddump has been removed from nixpkgs as the upstream has abandoned the project."; # added 2022-01-01
 
   # these are for convenience, not for backward compat and shouldn't expire
   clang5Stdenv = lowPrio llvmPackages_5.stdenv;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f1acdc551c77..01f49dc40565 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -379,8 +379,6 @@ with pkgs;
 
   oletools = with python3.pkgs; toPythonApplication oletools;
 
-  creddump = callPackage ../tools/security/creddump {};
-
   credential-detector = callPackage ../tools/security/credential-detector { };
 
   credslayer = callPackage ../tools/security/credslayer { };

From cd7ba3078651c8a6ceb9c1e08ec0572614a65c97 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Jan 2022 03:18:26 +0100
Subject: [PATCH 12/23] knockknock: remove

Uses python2 and abandoned by upstream.
---
 pkgs/tools/security/knockknock/default.nix | 33 ----------------------
 pkgs/top-level/aliases.nix                 |  1 +
 pkgs/top-level/all-packages.nix            |  2 --
 3 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 pkgs/tools/security/knockknock/default.nix

diff --git a/pkgs/tools/security/knockknock/default.nix b/pkgs/tools/security/knockknock/default.nix
deleted file mode 100644
index ed7f19065f05..000000000000
--- a/pkgs/tools/security/knockknock/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib, fetchFromGitHub, python2Packages, hping }:
-
-python2Packages.buildPythonApplication rec {
-  pname = "knockknock";
-  version = "unstable-2012-09-17";
-
-  src = fetchFromGitHub {
-    owner  = "moxie0";
-    repo   = "knockknock";
-    rev    = "bf14bbffc5f1d2105cd1d955dabca26b3faa0db4";
-    sha256 = "1chpfs3w2vkjrgay69pbdr116z1jldv53fi768a1i05fdqhy1px4";
-  };
-
-  propagatedBuildInputs = [ python2Packages.pycrypto ];
-
-  # No tests
-  doCheck = false;
-
-  postPatch = ''
-    sed -i '/build\//d' setup.py
-    substituteInPlace setup.py --replace "/etc" "$out/etc"
-    substituteInPlace knockknock.py --replace 'existsInPath("hping3")' '"${hping}/bin/hping3"'
-  '';
-
-  meta = with lib; {
-    description = "Simple, secure port knocking daemon and client written in Python";
-    homepage    = "https://github.com/moxie0/knockknock";
-    license     = licenses.gpl3Plus;
-    maintainers = with maintainers; [ copumpkin ];
-    platforms   = platforms.unix;
-  };
-}
-
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 7a8ac92d7e7b..3e188614bb29 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -417,6 +417,7 @@ mapAliases ({
   kicad-with-packages3d = kicad; # added 2019-11-25
   kindlegen = throw "kindlegen has been removed from nixpkgs, as it's abandoned and no longer available for download."; # 2021-03-09
   kino = throw "kino has been removed because it was broken and abandoned"; # added 2021-04-25
+  knockknock = throw "knockknock has been removed from nixpkgs because the upstream project is abandoned."; # 2022-01-01
   krename-qt5 = krename; # added 2017-02-18
   kerberos = libkrb5; # moved from top-level 2021-03-14
   keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # added 2019-12-10
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01f49dc40565..102d883acd13 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6909,8 +6909,6 @@ with pkgs;
 
   klystrack = callPackage ../applications/audio/klystrack { };
 
-  knockknock = callPackage ../tools/security/knockknock { };
-
   knockpy = callPackage ../tools/security/knockpy { };
 
   kore = callPackage ../development/web/kore { };

From 64e2164ef3517e6093374e7a76693a1937fe495a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Jan 2022 03:20:30 +0100
Subject: [PATCH 13/23] dtrx: remove

Uses python2 and the upstream homepage is abandoned, the download link
is dead.
---
 pkgs/tools/compression/dtrx/default.nix | 45 -------------------------
 pkgs/top-level/aliases.nix              |  1 +
 pkgs/top-level/all-packages.nix         |  2 --
 3 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100644 pkgs/tools/compression/dtrx/default.nix

diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix
deleted file mode 100644
index 6c4f2f6e854e..000000000000
--- a/pkgs/tools/compression/dtrx/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ lib, fetchurl, python2Packages
-, gnutar, unzip, lhasa, rpm, binutils, cpio, gzip, p7zip, cabextract, unrar, unshield
-, bzip2, xz, lzip
-# unzip is handled by p7zip
-, unzipSupport ? false
-, unrarSupport ? false }:
-
-let
-  archivers = lib.makeBinPath ([ gnutar lhasa rpm binutils cpio gzip p7zip cabextract unshield ]
-  ++ lib.optional (unzipSupport) unzip
-  ++ lib.optional (unrarSupport) unrar
-  ++ [ bzip2 xz lzip ]);
-
-in python2Packages.buildPythonApplication rec {
-  pname = "dtrx";
-  version = "7.1";
-
-  src = fetchurl {
-    url = "https://brettcsmith.org/2007/dtrx/dtrx-${version}.tar.gz";
-    sha256 = "15yf4n27zbhvv0byfv3i89wl5zn6jc2wbc69lk5a3m6rx54gx6hw";
-  };
-
-  postInstall = ''
-    wrapProgram "$out/bin/dtrx" --prefix PATH : "${archivers}"
-  '';
-
-  checkPhase = ''
-    python2 tests/compare.py
-  '';
-
-  checkInputs = with python2Packages; [
-    pyyaml
-  ];
-
-  # custom test suite fails
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Do The Right Extraction: A tool for taking the hassle out of extracting archives";
-    homepage = "https://brettcsmith.org/2007/dtrx/";
-    license = licenses.gpl3Plus;
-    maintainers = [ maintainers.spwhitt ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3e188614bb29..37c93df0a34d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -214,6 +214,7 @@ mapAliases ({
   double_conversion = double-conversion; # 2017-11-22
   docker_compose = docker-compose; # 2018-11-10
   draftsight = throw "draftsight has been removed, no longer available as freeware"; # added 2020-08-14
+  dtrx = throw "dtrx has been removed from nixpkgs as the upstream has abandoned the project."; # added 2022-01-01
   dvb_apps = throw "dvb_apps has been removed."; # added 2020-11-03
   dwarf_fortress = dwarf-fortress; # added 2016-01-23
   dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose."; # added 2021-02-07
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 102d883acd13..eda0be414055 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2872,8 +2872,6 @@ with pkgs;
 
   dtools = callPackage ../development/tools/dtools { };
 
-  dtrx = callPackage ../tools/compression/dtrx { };
-
   dua = callPackage ../tools/misc/dua {
     inherit (darwin.apple_sdk.frameworks) Foundation;
   };

From 4ee61b7c18f1892986a18049880065315e26a7c3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Jan 2022 03:26:59 +0100
Subject: [PATCH 14/23] blastem: remove

Requires python2 and no release in over two years to resolve the
situation.

```
./img2tiles.py -s font_interlace_variable.spec font_interlace_variable.tiles
  File "/build/blastem-3d48cb0c28be/./img2tiles.py", line 78
    print len(colors), 'distinct 9-bit colors in image'
          ^
SyntaxError: invalid syntax
```
---
 pkgs/misc/emulators/blastem/default.nix | 51 -------------------------
 pkgs/top-level/aliases.nix              |  1 +
 pkgs/top-level/all-packages.nix         |  2 -
 3 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 pkgs/misc/emulators/blastem/default.nix

diff --git a/pkgs/misc/emulators/blastem/default.nix b/pkgs/misc/emulators/blastem/default.nix
deleted file mode 100644
index c96f5d9217c5..000000000000
--- a/pkgs/misc/emulators/blastem/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ lib, stdenv, fetchurl, fetchFromGitHub, pkg-config, SDL2, glew, xcftools, python2Packages, makeWrapper }:
-
-let
-  vasm =
-    stdenv.mkDerivation {
-      pname = "vasm";
-      version = "1.8c";
-      src = fetchFromGitHub {
-        owner = "mbitsnbites";
-        repo = "vasm";
-        rev = "244f8bbbdf64ae603f9f6c09a3067943837459ec";
-        sha256 = "0x4y5q7ygxfjfy2wxijkps9khsjjfb169sbda410vaw0m88wqj5p";
-      };
-      makeFlags = [ "CPU=m68k" "SYNTAX=mot" ];
-      installPhase = ''
-        mkdir -p $out/bin
-        cp vasmm68k_mot $out/bin
-      '';
-    };
-in
-stdenv.mkDerivation {
-  pname = "blastem";
-  version = "0.5.1";
-  src = fetchurl {
-    url = "https://www.retrodev.com/repos/blastem/archive/3d48cb0c28be.tar.gz";
-    sha256 = "07wzbmzp0y8mh59jxg81q17gqagz3psxigxh8dmzsipgg68y6a8r";
-  };
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ pkg-config SDL2 glew xcftools python2Packages.python python2Packages.pillow vasm ];
-  preBuild = ''
-    patchShebangs img2tiles.py
-  '';
-  postBuild = ''
-    make menu.bin
-  '';
-  installPhase = ''
-    mkdir -p $out/bin $out/share/blastem
-    cp -r {blastem,menu.bin,default.cfg,rom.db,shaders} $out/share/blastem/
-    makeWrapper $out/share/blastem/blastem $out/bin/blastem
-  '';
-
-  meta = {
-    homepage = "https://www.retrodev.com/blastem/";
-    description = "The fast and accurate Genesis emulator";
-    maintainers = with lib.maintainers; [ puffnfresh ];
-    license = lib.licenses.gpl3;
-    platforms = lib.platforms.linux;
-    # Makefile:140: *** aarch64 is not a supported architecture.  Stop.
-    badPlatforms = [ "aarch64-linux" ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 37c93df0a34d..4f2efe7b9a9e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -79,6 +79,7 @@ mapAliases ({
   bcat = throw "bcat has been removed because upstream is dead"; # added 2021-08-22
   beegfs = throw "beegfs has been removed."; # added 2019-11-24
   beret = throw "beret has been removed"; # added 2021-11-16
+  blastem = throw "blastem has been removed from nixpkgs as it would still require python2."; # added 2022-01-01
   bluezFull = bluez; # Added 2019-12-03
   bpftool = bpftools; # Added 2021-05-03
   brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # added 2021-01-24
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eda0be414055..d2dd2a32e58b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3930,8 +3930,6 @@ with pkgs;
   birdfont = callPackage ../tools/misc/birdfont { };
   xmlbird = callPackage ../tools/misc/birdfont/xmlbird.nix { stdenv = gccStdenv; };
 
-  blastem = callPackage ../misc/emulators/blastem { };
-
   blahtexml = callPackage ../tools/typesetting/tex/blahtexml { };
 
   blueberry = callPackage ../tools/bluetooth/blueberry { };

From f4fc87ee965684a31be3d877a287baa06dad6709 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Jan 2022 03:31:13 +0100
Subject: [PATCH 15/23] lastfmsubmitd: remove

Stuck on python2 and abandoned by upstream.
---
 .../audio/lastfmsubmitd/default.nix           | 21 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 pkgs/applications/audio/lastfmsubmitd/default.nix

diff --git a/pkgs/applications/audio/lastfmsubmitd/default.nix b/pkgs/applications/audio/lastfmsubmitd/default.nix
deleted file mode 100644
index 8a786c5c69ee..000000000000
--- a/pkgs/applications/audio/lastfmsubmitd/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ lib, fetchurl, python2Packages }:
-
-python2Packages.buildPythonApplication rec {
-  pname = "lastfmsubmitd";
-  version = "1.0.6";
-
-  src = fetchurl {
-    url = "https://www.red-bean.com/decklin/lastfmsubmitd/lastfmsubmitd-${version}.tar.gz";
-    sha256 = "c2636d5095a95167366bacd458624d67b046e060244fa54ba2c2e3efb79f9b0e";
-  };
-
-  doCheck = false;
-
-  installCommand = "python setup.py install --prefix=$out";
-
-  meta = {
-    homepage = "https://www.red-bean.com/decklin/lastfmsubmitd/";
-    license = lib.licenses.mit;
-    description = "An last.fm audio scrobbler and daemon";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4f2efe7b9a9e..6eb25bbaf08c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -426,6 +426,7 @@ mapAliases ({
   kramdown-rfc2629 = rubyPackages.kramdown-rfc2629; # added 2021-03-23
   krita-beta = krita; # moved from top-level 2021-12-23
   kvm = qemu_kvm; # added 2018-04-25
+  lastfmsubmitd = throw "lastfmsubmitd was removed from nixpkgs as the project is abandoned"; # added 2022-01-01
   latinmodern-math = lmmath;
   letsencrypt = certbot; # added 2016-05-16
   libaudit = audit; # added 2018-04-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d2dd2a32e58b..610d85b08388 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26715,8 +26715,6 @@ with pkgs;
 
   caps = callPackage ../applications/audio/caps { };
 
-  lastfmsubmitd = callPackage ../applications/audio/lastfmsubmitd { };
-
   lbdb = callPackage ../tools/misc/lbdb { abook = null; gnupg = null; goobook = null; khard = null; mu = null; };
 
   lbry = callPackage ../applications/video/lbry { };

From 8a107229a0db6a140856a762797a042adc43fe85 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Jan 2022 03:37:17 +0100
Subject: [PATCH 16/23] mimms: remove

Stuck on python2 and last release in 2015.
---
 pkgs/applications/audio/mimms/default.nix | 31 -----------------------
 pkgs/top-level/aliases.nix                |  1 +
 pkgs/top-level/all-packages.nix           |  2 --
 3 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 pkgs/applications/audio/mimms/default.nix

diff --git a/pkgs/applications/audio/mimms/default.nix b/pkgs/applications/audio/mimms/default.nix
deleted file mode 100644
index 28ec09eba9ca..000000000000
--- a/pkgs/applications/audio/mimms/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ fetchurl, lib, python2Packages, libmms }:
-
-python2Packages.buildPythonApplication rec {
-  pname = "mimms";
-  version = "3.2";
-
-  src = fetchurl {
-    url = "https://download.savannah.gnu.org/releases/mimms/mimms-${version}.tar.bz2";
-    sha256 = "0zmcd670mpq85cs3nvdq3i805ba0d1alqahfy1m9cpf7kxrivfml";
-  };
-
-  postInstall = ''
-    wrapProgram $out/bin/mimms \
-      --prefix LD_LIBRARY_PATH : ${libmms}/lib
-  '';
-
-  meta = {
-    homepage = "https://savannah.nongnu.org/projects/mimms/";
-    license = lib.licenses.gpl3;
-    description = "An mms (e.g. mms://) stream downloader";
-
-    longDescription = ''
-      mimms is a program designed to allow you to download streams
-      using the MMS protocol and save them to your computer, as
-      opposed to watching them live. Similar functionality is
-      available in full media player suites such as Xine, MPlayer,
-      and VLC, but mimms is quick and easy to use and, for the time
-      being, remains a useful program.
-    '';
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6eb25bbaf08c..b108b27c24d3 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -559,6 +559,7 @@ mapAliases ({
   mess = mame; # added 2019-10-30
   mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # added 2020-05-23
   mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained; try mcomix3 a Python 3 fork"; # added 2019-12-10, modified 2020-11-25
+  mimms = throw "mimms has been removed from nixpkgs as the upstream project is stuck on python2."; # added 2022-01-01
   mirage = throw "mirage has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10
   minergate = throw "minergate has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13
   minergate-cli = throw "minergatecli has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 610d85b08388..3a2a55acd326 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27070,8 +27070,6 @@ with pkgs;
 
   mimic = callPackage ../applications/audio/mimic { };
 
-  mimms = callPackage ../applications/audio/mimms {};
-
   meh = callPackage ../applications/graphics/meh {};
 
   mixxx = libsForQt5.callPackage ../applications/audio/mixxx { };

From 965d11084e21cfa973f4231e24b2c8918cd413fe Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Jan 2022 03:39:31 +0100
Subject: [PATCH 17/23] gtklick: remove

Stuck on python2 and last release in 2010.
---
 pkgs/applications/audio/gtklick/default.nix | 34 ---------------------
 pkgs/top-level/aliases.nix                  |  1 +
 pkgs/top-level/all-packages.nix             |  2 --
 3 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 pkgs/applications/audio/gtklick/default.nix

diff --git a/pkgs/applications/audio/gtklick/default.nix b/pkgs/applications/audio/gtklick/default.nix
deleted file mode 100644
index 6b7f4e4d7b22..000000000000
--- a/pkgs/applications/audio/gtklick/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ lib, fetchurl, python2Packages, gettext, klick}:
-
-python2Packages.buildPythonApplication rec {
-  pname = "gtklick";
-  version = "0.6.4";
-
-  src = fetchurl {
-    url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz";
-    sha256 = "7799d884126ccc818678aed79d58057f8cf3528e9f1be771c3fa5b694d9d0137";
-  };
-
-  pythonPath = with python2Packages; [
-    pyliblo
-    pyGtkGlade
-  ];
-
-  nativeBuildInputs = [ gettext ];
-
-  propagatedBuildInputs = [ klick ];
-
-  # wrapPythonPrograms breaks gtklick in the postFixup phase.
-  # To fix it, apply wrapPythonPrograms and then clean up the wrapped file.
-  postFixup = ''
-    wrapPythonPrograms
-
-    sed -i "/import sys; sys.argv\[0\] = 'gtklick'/d" $out/bin/.gtklick-wrapped
-  '';
-
-  meta = {
-    homepage = "http://das.nasophon.de/gtklick/";
-    description = "Simple metronome with an easy-to-use GTK interface";
-    license = lib.licenses.gpl2Plus;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b108b27c24d3..7388b9e323ba 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -349,6 +349,7 @@ mapAliases ({
   graalvm11 = graalvm11-ce;
   gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25
   gtk_doc = gtk-doc; # added 2018-02-25
+  gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # added 2022-01-01
   guileCairo = guile-cairo; # added 2017-09-24
   guileGnome = guile-gnome; # added 2017-09-24
   gnome3 = gnome; # added 2021-05-07
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3a2a55acd326..c01f411730ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6198,8 +6198,6 @@ with pkgs;
 
   gtkdatabox = callPackage ../development/libraries/gtkdatabox {};
 
-  gtklick = callPackage ../applications/audio/gtklick {};
-
   gtdialog = callPackage ../development/libraries/gtdialog {};
 
   gtkd = callPackage ../development/libraries/gtkd { };

From 73f02a1379a26a31f28f6188e3daeef418691453 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Jan 2022 03:47:42 +0100
Subject: [PATCH 18/23] keepnote: remove

Stuck on python2 with last release in 2012.
---
 pkgs/applications/office/keepnote/default.nix | 23 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 pkgs/applications/office/keepnote/default.nix

diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix
deleted file mode 100644
index 1ff88d49d2b7..000000000000
--- a/pkgs/applications/office/keepnote/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, fetchurl, python2Packages }:
-
-python2Packages.buildPythonApplication rec {
-  pname = "keepnote";
-  version = "0.7.8";
-  namePrefix = "";
-
-  src = fetchurl {
-    url = "http://keepnote.org/download/keepnote-${version}.tar.gz";
-    sha256 = "0nhkkv1n0lqf3zn17pxg5cgryv1wwlj4hfmhixwd76rcy8gs45dh";
-  };
-
-  propagatedBuildInputs = with python2Packages; [ pyGtkGlade ];
-
-  # Testing fails.
-  doCheck = false;
-
-  meta = {
-    description = "Note taking application";
-    homepage = "http://keepnote.org";
-    license = lib.licenses.gpl2Plus;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 7388b9e323ba..00f917bc3df8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -395,6 +395,7 @@ mapAliases ({
   json_glib = json-glib; # added 2018-02-25
   kafkacat = kcat; # added 2021-10-07
   kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16
+  keepnote = throw "keepnote has been removed from nixpkgs, as it is stuck on python2."; # added 2022-01-01
   k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06
   kibana7-oss = throw "kibana7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # added 2021-06-09
   kodiGBM = kodi-gbm;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c01f411730ec..e574eac9ad93 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26518,8 +26518,6 @@ with pkgs;
 
   kdevelop = libsForQt5.callPackage ../applications/editors/kdevelop5/wrapper.nix { };
 
-  keepnote = callPackage ../applications/office/keepnote { };
-
   kega-fusion = pkgsi686Linux.callPackage ../misc/emulators/kega-fusion { };
 
   kepubify = callPackage ../tools/misc/kepubify { };

From 5a08535f4b3f5eca72e8b9da7eb6083647b56b6c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Jan 2022 03:49:17 +0100
Subject: [PATCH 19/23] rawdog: remove

> rawdog requires Python 2.7 or later, and not Python 3.

Have it your way!
---
 .../networking/feedreaders/rawdog/default.nix | 26 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 pkgs/applications/networking/feedreaders/rawdog/default.nix

diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix
deleted file mode 100644
index f840c191f909..000000000000
--- a/pkgs/applications/networking/feedreaders/rawdog/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib, fetchurl, python2Packages }:
-
-python2Packages.buildPythonApplication rec {
-  pname = "rawdog";
-  version = "2.23";
-
-  src = fetchurl {
-    url = "https://offog.org/files/${pname}-${version}.tar.gz";
-    sha256 = "18nyg19mwxyqdnykplkqmzb4n27vvrhvp639zai8f81gg9vdbsjp";
-  };
-
-  propagatedBuildInputs = with python2Packages; [ feedparser ];
-
-  # Requested by @SuperSandro20001
-  pythonImportsCheck = [ "feedparser" ];
-  doCheck = false;
-
-  namePrefix = "";
-
-  meta = with lib; {
-    homepage = "https://offog.org/code/rawdog/";
-    description = "RSS Aggregator Without Delusions Of Grandeur";
-    license = licenses.gpl2;
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 00f917bc3df8..1769ec1a2191 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -793,6 +793,7 @@ mapAliases ({
   qtcurve = libsForQt5.qtcurve;  # added 2020-11-07
   quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # added 2020-04-09
   raspberrypi-tools = throw "raspberrypi-tools has been removed in favor of identical 'libraspberrypi'"; # added 2020-12-24
+  rawdog = throw "rawdog has been removed from nixpkgs as it still requires python2."; # added 2022-01-01
   rdf4store = throw "rdf4store has been removed from nixpkgs."; # added 2019-12-21
   rdiff_backup = rdiff-backup;  # added 2014-11-23
   rdmd = dtools;  # added 2017-08-19
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e574eac9ad93..eccc3959e273 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9137,8 +9137,6 @@ with pkgs;
 
   ratools = callPackage ../tools/networking/ratools { };
 
-  rawdog = callPackage ../applications/networking/feedreaders/rawdog { };
-
   rc = callPackage ../shells/rc { };
 
   rcon = callPackage ../tools/networking/rcon { };

From 12fb90696ece54f84ab23c4986ae74d98a29fcc0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Jan 2022 03:54:39 +0100
Subject: [PATCH 20/23] git-bz: remove

Stuck on python2 and unmaintained since 2015.
---
 .../git-and-tools/git-bz/default.nix          | 54 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  3 --
 3 files changed, 1 insertion(+), 57 deletions(-)
 delete mode 100644 pkgs/applications/version-management/git-and-tools/git-bz/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
deleted file mode 100644
index eec9b7ea1246..000000000000
--- a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ lib, stdenv, fetchgit
-, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, makeWrapper, xmlto
-, python2Packages }:
-
-stdenv.mkDerivation {
-  pname = "git-bz";
-  version = "3.2015-09-08";
-
-  src = fetchgit {
-    sha256 = "146z57m8nblgsxm4z6qnsvcy81p11d0w88v93ybacc6w21plh8hc";
-    rev = "e17bbae7a2ce454d9f69c32fc40066995d44913d";
-    url = "git://git.fishsoup.net/git-bz";
-  };
-
-  nativeBuildInputs = [
-    asciidoc docbook_xml_dtd_45 docbook_xsl libxslt makeWrapper xmlto
-  ];
-  buildInputs = []
-    ++ (with python2Packages; [ python pysqlite ]);
-
-  postPatch = ''
-    patchShebangs configure
-
-    # Don't create a .html copy of the man page that isn't installed anyway:
-    substituteInPlace Makefile --replace "git-bz.html" ""
-  '';
-
-  postInstall = ''
-    wrapProgram $out/bin/git-bz \
-      --prefix PYTHONPATH : "$(toPythonPath "${python2Packages.pycrypto}")" \
-      --prefix PYTHONPATH : "$(toPythonPath "${python2Packages.pysqlite}")"
-  '';
-
-  meta = with lib; {
-    description = "Bugzilla integration for git";
-    longDescription = ''
-      git-bz is a tool for integrating the Git command line with the
-      Bugzilla bug-tracking system. Operations such as attaching patches to
-      bugs, applying patches in bugs to your current tree, and closing bugs
-      once you've pushed the fixes publicly can be done completely from
-      the command line without having to go to your web browser.
-
-      Authentication for git-bz is done by reading the cookies for the
-      Bugzilla host from your web browser. In order to do this, git-bz needs
-      to know how to access the cookies for your web browser; git-bz
-      currently is able to do this for Firefox, Epiphany, Galeon and
-      Chromium on Linux.
-    '';
-    license = licenses.gpl2Plus;
-    homepage = "http://git.fishsoup.net/cgit/git-bz/";
-
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 1769ec1a2191..e0993bbfaaae 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -291,6 +291,7 @@ mapAliases ({
   gdk_pixbuf = gdk-pixbuf; # added 2019-05-22
   gettextWithExpat = gettext; # 2016-02-19
   giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # 2020-02-12
+  git-bz = throw "giz-bz has been removed from nixpkgs as it is stuck on python2."; # added 2022-01-01
   gitAndTools = self // { # added 2021-01-14
     darcsToGit = darcs-to-git;
     gitAnnex = git-annex;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eccc3959e273..032c07b079d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5699,9 +5699,6 @@ with pkgs;
 
   git-bug = callPackage ../applications/version-management/git-and-tools/git-bug { };
 
-  # support for bugzilla
-  git-bz = callPackage ../applications/version-management/git-and-tools/git-bz { };
-
   git-chglog = callPackage ../applications/version-management/git-and-tools/git-chglog { };
 
   git-cinnabar = callPackage ../applications/version-management/git-and-tools/git-cinnabar { };

From f91116586abfb39899b2ea39d6608bffe6127cb6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Jan 2022 03:56:59 +0100
Subject: [PATCH 21/23] electrum-dash: remove

Stuck on python2 and abandoned since 2017.
---
 pkgs/applications/misc/electrum/dash.nix | 47 ------------------------
 pkgs/top-level/aliases.nix               |  1 +
 pkgs/top-level/all-packages.nix          |  2 -
 3 files changed, 1 insertion(+), 49 deletions(-)
 delete mode 100644 pkgs/applications/misc/electrum/dash.nix

diff --git a/pkgs/applications/misc/electrum/dash.nix b/pkgs/applications/misc/electrum/dash.nix
deleted file mode 100644
index d0606001ad43..000000000000
--- a/pkgs/applications/misc/electrum/dash.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ lib, fetchurl, python2Packages }:
-
-python2Packages.buildPythonApplication rec {
-  version = "2.9.3.1";
-  pname = "electrum-dash";
-
-  src = fetchurl {
-    url = "https://github.com/akhavr/electrum-dash/releases/download/${version}/Electrum-DASH-${version}.tar.gz";
-    #"https://github.com/dashpay/electrum-dash/releases/download/v${version}/Electrum-DASH-${version}.tar.gz";
-    sha256 = "9b7ac205f63fd4bfb15d77a34a4451ef82caecf096f31048a7603bd276dfc33e";
-  };
-
-  propagatedBuildInputs = with python2Packages; [
-    dnspython
-    ecdsa
-    pbkdf2
-    protobuf
-    pyasn1
-    pyasn1-modules
-    pycrypto
-    pyqt4
-    qrcode
-    requests
-    pyaes
-    tlslite-ng
-    x11_hash
-    mnemonic
-    jsonrpclib
-
-    # plugins
-    trezor
-  ];
-
-  preInstall = ''
-    mkdir -p $out/share
-    sed -i 's@usr_share = .*@usr_share = os.getenv("out")+"/share"@' setup.py
-    pyrcc4 icons.qrc -o gui/qt/icons_rc.py
-  '';
-
-  meta = with lib; {
-    description = "Electrum DASH";
-    homepage = "https://github.com/dashpay/electrum-dash";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ np ];
-    knownVulnerabilities = [ "CVE-2018-1000022" ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e0993bbfaaae..de0b28e2c414 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -224,6 +224,7 @@ mapAliases ({
   ec2_api_tools = ec2-api-tools; # added 2021-10-08
   elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # added 2021-01-17
   elasticsearch7-oss = throw "elasticsearch7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # added 2021-06-09
+  electrum-dash = throw "electrum-dash has been removed from nixpkgs as the project is abandoned."; # added 2022-01-01
   emacsPackagesGen = emacsPackagesFor; # added 2018-08-18
   emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18
   emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 032c07b079d4..897dd9df4f27 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24978,8 +24978,6 @@ with pkgs;
 
   electrum = libsForQt5.callPackage ../applications/misc/electrum { };
 
-  electrum-dash = callPackage ../applications/misc/electrum/dash.nix { };
-
   electrum-ltc = libsForQt5.callPackage ../applications/misc/electrum/ltc.nix { };
 
   elementary-planner = callPackage ../applications/office/elementary-planner { };

From 71e2b303c179e97af108b8b3a38369113fd09f9a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Jan 2022 03:59:12 +0100
Subject: [PATCH 22/23] pybitmessage: remove

> "Programming Language :: Python :: 2.7 :: Only",
---
 .../pybitmessage/default.nix                  | 40 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/pybitmessage/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
deleted file mode 100644
index 279eea2f2d7b..000000000000
--- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ lib, fetchFromGitHub, python2Packages, openssl }:
-
-python2Packages.buildPythonApplication rec {
-  pname = "pybitmessage";
-
-  version = "0.6.3.2";
-
-  src = fetchFromGitHub {
-    owner = "bitmessage";
-    repo = "PyBitmessage";
-    rev = version;
-    sha256 = "1lmhbpwsqh1v93krlqqhafw2pc3y0qp8zby186yllbph6s8kdp35";
-  };
-
-  propagatedBuildInputs = with python2Packages; [ msgpack pyqt4 numpy pyopencl setuptools ] ++ [ openssl ];
-
-  preConfigure = ''
-    # Remove interaction and misleading output
-    substituteInPlace setup.py \
-      --replace "nothing = raw_input()" pass \
-      --replace 'print "It looks like building the package failed.\n" \' pass \
-      --replace '    "You may be missing a C++ compiler and the OpenSSL headers."' pass \
-      --replace 'msgpack-python' 'msgpack'
-
-    substituteInPlace src/pyelliptic/openssl.py \
-      --replace "libdir.append(find_library('ssl'))" "libdir.append('${openssl.out}/lib/libssl.so')"
-
-    substituteInPlace src/depends.py \
-      --replace "ctypes.util.find_library('ssl')" "'${openssl.out}/lib/libssl.so'"
-
-  '';
-
-  meta = with lib; {
-    homepage = "https://bitmessage.org/";
-    description = "The official Bitmessage client";
-    license = licenses.mit;
-    maintainers = with maintainers; [ jgillich ];
-    platforms = with platforms; linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index de0b28e2c414..81d41311161d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -776,6 +776,7 @@ mapAliases ({
   phonon-backend-vlc = throw "phonon-backend-vlc: Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # added 2019-11-22
   phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22
   pybind11 = throw "pybind11 was removed because pythonPackages.pybind11 for the appropriate version of Python should be used"; # added 2021-05-14
+  pybitmessage = throw "pybitmessage was removed from nixpkgs as it is stuck on python2."; # added 2022-01-01
   pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd."; # added 2020-10-24
   pyrit = throw "pyrit has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-01
   python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # added 2021-03-08
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 897dd9df4f27..c90db222930b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28038,8 +28038,6 @@ with pkgs;
 
   pwdsafety = callPackage ../tools/security/pwdsafety { };
 
-  pybitmessage = callPackage ../applications/networking/instant-messengers/pybitmessage { };
-
   qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { };
   qbittorrent-nox = qbittorrent.override {
     guiSupport = false;

From 94bb926967020f2386704769f736200db925b8d4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Jan 2022 04:14:34 +0100
Subject: [PATCH 23/23] wifite2: no longer depend on pyrit

The latter was removed because it is stuck on python2.

Co-authored-by: Daniel Fullmer <danielrf12@gmail.com>
---
 pkgs/tools/networking/wifite2/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/wifite2/default.nix b/pkgs/tools/networking/wifite2/default.nix
index 8a4b5f2e0514..4069e378a29b 100644
--- a/pkgs/tools/networking/wifite2/default.nix
+++ b/pkgs/tools/networking/wifite2/default.nix
@@ -1,6 +1,6 @@
 { lib, fetchFromGitHub, fetchpatch, python3, wirelesstools
 , aircrack-ng, wireshark-cli, reaverwps-t6x, cowpatty, hashcat, hcxtools
-, hcxdumptool, pyrit, which, bully, pixiewps }:
+, hcxdumptool, which, bully, pixiewps }:
 
 python3.pkgs.buildPythonApplication rec {
   version = "2.5.7";
@@ -14,6 +14,11 @@ python3.pkgs.buildPythonApplication rec {
   };
 
   patches = [
+    # Fix issue when missing optional pyrit dependency: https://github.com/kimocoder/wifite2/pull/76
+    (fetchpatch {
+      url = "https://github.com/kimocoder/wifite2/commit/2e5d76c794f2e5493cf5048384d6564727ae2c19.patch";
+      sha256 = "0lawk8s1md98g061xg6ma37wqyqc4j2ag0gmf7insf4kvlgg3l9z";
+    })
     (fetchpatch {
       url = "https://salsa.debian.org/pkg-security-team/wifite/raw/debian/${version}-1/debian/patches/Disable-aircrack-failing-test.patch";
       sha256 = "04qql8w27c1lqk59ghkr1n6r08jwdrb1dcam5k88szkk2bxv8yx1";
@@ -22,6 +27,10 @@ python3.pkgs.buildPythonApplication rec {
       url = "https://salsa.debian.org/pkg-security-team/wifite/raw/debian/${version}-1/debian/patches/Disable-two-failing-tests.patch";
       sha256 = "1sixcqz1kbkhxf38yq55pwycm54adjx22bq46dfnl44mg69nx356";
     })
+    (fetchpatch {
+      url = "https://salsa.debian.org/pkg-security-team/wifite/raw/debian/2.5.8-2/debian/patches/fix-for-new-which.patch";
+      sha256 = "0p6sa09qpq9qarkjrai2ksx9nz2v2hs6dk1y01qnfbsmc4hhm30g";
+    })
   ];
 
   propagatedBuildInputs = [
@@ -33,7 +42,6 @@ python3.pkgs.buildPythonApplication rec {
     hcxtools
     hcxdumptool
     wirelesstools
-    pyrit
     which
     bully
     pixiewps