From 50ade5e2b81a48dd0aef370953d61e7aeb8d57fa Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 2 Jun 2022 17:52:04 +0200 Subject: [PATCH] telepathy-salut: remove after being marked broken for over 18 months It was marked in commit 5aa4b1994629ed0701b8b6d6e094da9d7d912721 by Linus Heckemann on 2019-10-07 (commited on 2019-10-08) --- .../telepathy/salut/default.nix | 27 ------------------- pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 30 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix deleted file mode 100644 index 882fae1c3b5f..000000000000 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, python2, avahi, libsoup -, libuuid, openssl, pcre, sqlite, pkg-config }: - -stdenv.mkDerivation rec { - pname = "telepathy-salut"; - version = "0.8.1"; - - src = fetchurl { - url = "https://telepathy.freedesktop.org/releases/telepathy-salut/telepathy-salut-${version}.tar.gz"; - sha256 = "13k112vrr3zghzr03pnbqc1id65qvpj0sn0virlbf4dmr2511fbh"; - }; - - # pcre needed because https://github.com/NixOS/nixpkgs/pull/15046 - buildInputs = [ glib libxml2 telepathy-glib avahi libsoup libuuid openssl - sqlite pcre python2 ]; - - nativeBuildInputs = [ libxslt pkg-config ]; - - configureFlags = [ "--disable-avahi-tests" ]; - - meta = with lib; { - description = "Link-local XMPP connection manager for Telepathy"; - platforms = platforms.gnu ++ platforms.linux; # Random choice - maintainers = [ ]; - broken = true; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7776d8ccdcc1..8ddad51c4e4e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1323,7 +1323,6 @@ mapAliases ({ telepathy_mission_control = throw "'telepathy_mission_control' has been renamed to/replaced by 'telepathy-mission-control'"; # Converted to throw 2022-02-22 telepathy_qt = throw "'telepathy_qt' has been renamed to/replaced by 'telepathy-qt'"; # Converted to throw 2022-02-22 telepathy_qt5 = throw "'telepathy_qt5' has been renamed to/replaced by 'libsForQt5.telepathy'"; # Converted to throw 2022-02-22 - telepathy_salut = throw "'telepathy_salut' has been renamed to/replaced by 'telepathy-salut'"; # Converted to throw 2022-02-22 telnet = throw "'telnet' has been renamed to/replaced by 'inetutils'"; # Converted to throw 2022-02-22 terminus = throw "terminus has been removed, it was unmaintained in nixpkgs"; # Added 2021-08-21 terraform-provider-ibm = throw "'terraform-provider-ibm' has been renamed to/replaced by 'terraform-providers.ibm'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4fd341c76d9..84f52dbb4041 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29914,8 +29914,6 @@ with pkgs; telepathy-mission-control = callPackage ../applications/networking/instant-messengers/telepathy/mission-control { }; - telepathy-salut = callPackage ../applications/networking/instant-messengers/telepathy/salut {}; - telepathy-idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {}; teleprompter = callPackage ../applications/misc/teleprompter {};