From 79a823ceae4c1a32216bc1943300838f95193250 Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Sun, 19 Jul 2020 21:02:03 +0200 Subject: [PATCH] mopidy-local-images: remove This plugin has been merged into the newer "mopidy-local" plugin which I just added. "mopidy-local-images" and "mopidy-local-sqlite" were added originally for Mopidy Iris, but Iris now works with mopidy-local, and does not need the older plugins any more. --- pkgs/applications/audio/mopidy/default.nix | 2 -- pkgs/applications/audio/mopidy/iris.nix | 2 +- .../audio/mopidy/local-images.nix | 32 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 5 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 pkgs/applications/audio/mopidy/local-images.nix diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 984db6c57fb2..90b681a99b37 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -16,8 +16,6 @@ let mopidy-local = callPackage ./local.nix { }; - mopidy-local-images = callPackage ./local-images.nix { }; - mopidy-local-sqlite = callPackage ./local-sqlite.nix { }; mopidy-spotify = callPackage ./spotify.nix { }; diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 467ba6fe3f70..48f955fd7137 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, mopidy, mopidy-local-images }: +{ stdenv, python3Packages, mopidy }: python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; diff --git a/pkgs/applications/audio/mopidy/local-images.nix b/pkgs/applications/audio/mopidy/local-images.nix deleted file mode 100644 index 085fe855e8a8..000000000000 --- a/pkgs/applications/audio/mopidy/local-images.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchFromGitHub, pythonPackages, mopidy, gobject-introspection }: - -pythonPackages.buildPythonApplication rec { - pname = "mopidy-local-images"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "mopidy"; - repo = "mopidy-local-images"; - rev = "v${version}"; - sha256 = "0gdqxws0jish50mmi57mlqcs659wrllzv00czl18niz94vzvyc0d"; - }; - - buildInputs = [ gobject-introspection ]; - - checkInputs = [ - pythonPackages.mock - ]; - - propagatedBuildInputs = [ - mopidy - pythonPackages.pykka - pythonPackages.uritools - ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/mopidy/mopidy-local-images"; - description = "Mopidy local library proxy extension for handling embedded album art"; - license = licenses.asl20; - maintainers = [ maintainers.rvolosatovs ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f8e2091d4c18..3b5cccc87474 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -303,6 +303,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"; # added 2019-12-10 mirage = throw "mirage has been femoved from nixpkgs, as it's unmaintained"; # added 2019-12-10 + 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 mysql-client = hiPrio mariadb.client; memtest86 = memtest86plus; # added 2019-05-08 mesa_noglu = mesa; # added 2019-05-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b520c0d913d0..03dbf51a6433 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22123,7 +22123,6 @@ in mopidy-gmusic mopidy-iris mopidy-local - mopidy-local-images mopidy-local-sqlite mopidy-moped mopidy-mopify