From df6ecfc46e62db17fd5282af97aef5d3bf449bdf Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 27 Dec 2020 17:47:39 +0800 Subject: [PATCH] spectral: drop it in favour of neochat --- .../instant-messengers/spectral/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/spectral/default.nix diff --git a/pkgs/applications/networking/instant-messengers/spectral/default.nix b/pkgs/applications/networking/instant-messengers/spectral/default.nix deleted file mode 100644 index b0819ade4f3..00000000000 --- a/pkgs/applications/networking/instant-messengers/spectral/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchgit -, pkgconfig, wrapQtAppsHook -, cmake -, qtbase, qttools, qtquickcontrols2, qtmultimedia, qtkeychain -, libpulseaudio -# Not mentioned but seems needed -, qtgraphicaleffects -, qtdeclarative -, qtmacextras -, olm, libsecret, cmark -}: - -let qtkeychain-qt5 = qtkeychain.override { - inherit qtbase qttools; - withQt5 = true; -}; -in stdenv.mkDerivation rec { - pname = "spectral"; - version = "817"; - - src = fetchgit { - url = "https://gitlab.com/spectral-im/spectral.git"; - rev = version; - sha256 = "0lg0bkz621cmqb67kz1zmn4xwbspcqalz68byll5iszqz9y4gnp1"; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ pkgconfig cmake wrapQtAppsHook ]; - buildInputs = [ qtbase qtkeychain-qt5 qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative olm libsecret cmark ] - ++ stdenv.lib.optional stdenv.hostPlatform.isLinux libpulseaudio - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin qtmacextras; - - meta = with stdenv.lib; { - description = "A glossy cross-platform Matrix client"; - homepage = "https://spectral.im"; - license = licenses.gpl3; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ dtzWill ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 797f8e9984d..3117e99e04f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -572,6 +572,7 @@ mapAliases ({ smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2020-11-04 slim = throw "slim has been removed. Please use a different display-manager"; # added 2019-11-11 slimThemes = throw "slimThemes has been removed because slim has been also"; # added 2019-11-11 + spectral = neochat; # added 2020-12-27 sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed"; # added 2020-02-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d0008f0519..ed06ecafa62 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22024,8 +22024,6 @@ in spectrwm = callPackage ../applications/window-managers/spectrwm { }; - spectral = qt5.callPackage ../applications/networking/instant-messengers/spectral { }; - spotify-cli-linux = callPackage ../applications/audio/spotify-cli-linux { }; spotifyd = callPackage ../applications/audio/spotifyd {