diff options
| author | davidak <davidak@users.noreply.github.com> | 2021-02-22 20:19:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-22 20:19:11 +0100 |
| commit | 550833b7f0d7bbcacaa8d788e1ce24c248b53062 (patch) | |
| tree | 713b1af5f773124985dd0c0ca4e64c8ca5002cd4 /pkgs/top-level | |
| parent | bb99ddeecb7121a1237592cd74c597f1a0177a21 (diff) | |
| parent | 819873f29e9a08c184656ef69e2234ce5417ff2a (diff) | |
Merge pull request #113933 from Mic92/xmpppy
python2.pkgs.xmpppy: remove + dependent packages
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a9a13aaa6b1fd..812f5cf49b44b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -769,6 +769,9 @@ mapAliases ({ xbmcPlain = kodiPlain; # added 2018-04-25 xbmcPlugins = kodiPlugins; # added 2018-04-25 xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01 + xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only"; + pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only"; + pyMAILt = throw "pyMAILt has been removed from nixpkgs as it is unmaintained and python2-only"; xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 xf86_input_mtrack = throw ("xf86_input_mtrack has been removed from nixpkgs as it hasn't been maintained" + "and is broken. Working alternatives are libinput and synaptics."); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 761a5faaecf27..22feb341605d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9214,8 +9214,6 @@ in w3m = w3m-batch; }; - xmpppy = pythonPackages.xmpppy; - xiccd = callPackage ../tools/misc/xiccd { }; xidlehook = callPackage ../tools/X11/xidlehook { @@ -18453,10 +18451,6 @@ in pure-ftpd = callPackage ../servers/ftp/pure-ftpd { }; - pyIRCt = callPackage ../servers/xmpp/pyIRCt {}; - - pyMAILt = callPackage ../servers/xmpp/pyMAILt {}; - pypolicyd-spf = python3.pkgs.callPackage ../servers/mail/pypolicyd-spf { }; qpid-cpp = callPackage ../servers/amqp/qpid-cpp { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f9034877ecb96..4c3574ca82563 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8512,8 +8512,6 @@ in { xmodem = callPackage ../development/python-modules/xmodem { }; - xmpppy = callPackage ../development/python-modules/xmpppy { }; - xnd = callPackage ../development/python-modules/xnd { }; xpybutil = callPackage ../development/python-modules/xpybutil { }; |