diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6dd2f6c42ac5c..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 { @@ -24988,16 +24982,12 @@ in linuxstopmotion = libsForQt5.callPackage ../applications/video/linuxstopmotion { }; - sweethome3d = recurseIntoAttrs ( (callPackage ../applications/misc/sweethome3d { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }) - // (callPackage ../applications/misc/sweethome3d/editors.nix { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - sweethome3dApp = sweethome3d.application; - }) - ); + sweethome3d = recurseIntoAttrs ( + (callPackage ../applications/misc/sweethome3d { }) // + (callPackage ../applications/misc/sweethome3d/editors.nix { + sweethome3dApp = sweethome3d.application; + }) + ); swingsane = callPackage ../applications/graphics/swingsane { }; |