From e3efd45261ebf5407947167f246b74f515c09aa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 6 Mar 2021 08:51:31 +0100 Subject: [PATCH] mopidy-gmusic: drop --- pkgs/applications/audio/mopidy/default.nix | 2 -- pkgs/applications/audio/mopidy/gmusic.nix | 29 ---------------------- pkgs/applications/audio/mopidy/mopidy.nix | 2 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 5 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 pkgs/applications/audio/mopidy/gmusic.nix diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 2c19afb16a22..44d48fb3783a 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -12,8 +12,6 @@ let mopidy = callPackage ./mopidy.nix { }; - mopidy-gmusic = callPackage ./gmusic.nix { }; - mopidy-iris = callPackage ./iris.nix { }; mopidy-local = callPackage ./local.nix { }; diff --git a/pkgs/applications/audio/mopidy/gmusic.nix b/pkgs/applications/audio/mopidy/gmusic.nix deleted file mode 100644 index 6e76d6af87d3..000000000000 --- a/pkgs/applications/audio/mopidy/gmusic.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, python3Packages, mopidy }: - -python3Packages.buildPythonApplication rec { - pname = "mopidy-gmusic"; - version = "4.0.0"; - - src = python3Packages.fetchPypi { - inherit version; - pname = "Mopidy-GMusic"; - sha256 = "14yswmlfs659rs3k595606m77lw9c6pjykb5pikqw21sb97haxl3"; - }; - - propagatedBuildInputs = [ - mopidy - python3Packages.requests - python3Packages.gmusicapi - python3Packages.cachetools - ]; - - doCheck = false; - - meta = with lib; { - homepage = "https://www.mopidy.com/"; - description = "Mopidy extension for playing music from Google Play Music"; - license = licenses.asl20; - maintainers = [ maintainers.jgillich ]; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index 63a28eb0f58e..d53bfee9efd2 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -42,7 +42,7 @@ pythonPackages.buildPythonApplication rec { homepage = "https://www.mopidy.com/"; description = '' An extensible music server that plays music from local disk, Spotify, - SoundCloud, Google Play Music, and more + SoundCloud, and more ''; license = licenses.asl20; maintainers = [ maintainers.fpletz ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 968be61d7a18..09272281829d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -386,6 +386,7 @@ mapAliases ({ 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 mirage = throw "mirage has been femoved from nixpkgs, as it's unmaintained"; # added 2019-12-10 + mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # added 2021-03-07 mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18 mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18 mysql-client = hiPrio mariadb.client; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65d62cc1d39c..6d7bfcb7518d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23885,7 +23885,6 @@ in inherit (mopidyPackages) mopidy - mopidy-gmusic mopidy-iris mopidy-local mopidy-moped