summary refs log tree commit diff
diff options
context:
space:
mode:
authorRuud van Asseldonk <dev@veniogames.com>2020-07-19 21:02:03 +0200
committerRuud van Asseldonk <dev@veniogames.com>2020-10-18 19:32:55 +0200
commit79a823ceae4c1a32216bc1943300838f95193250 (patch)
tree3661e45b6d6fdf6bcb4ea3025be540c4616d9dfa
parent7565d00a7c18f500a9cb5b48484f1b0fab95a43a (diff)
downloadnixpkgs-79a823ceae4c1a32216bc1943300838f95193250.tar
nixpkgs-79a823ceae4c1a32216bc1943300838f95193250.tar.gz
nixpkgs-79a823ceae4c1a32216bc1943300838f95193250.tar.bz2
nixpkgs-79a823ceae4c1a32216bc1943300838f95193250.tar.lz
nixpkgs-79a823ceae4c1a32216bc1943300838f95193250.tar.xz
nixpkgs-79a823ceae4c1a32216bc1943300838f95193250.tar.zst
nixpkgs-79a823ceae4c1a32216bc1943300838f95193250.zip
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.
-rw-r--r--pkgs/applications/audio/mopidy/default.nix2
-rw-r--r--pkgs/applications/audio/mopidy/iris.nix2
-rw-r--r--pkgs/applications/audio/mopidy/local-images.nix32
-rw-r--r--pkgs/top-level/aliases.nix1
-rw-r--r--pkgs/top-level/all-packages.nix1
5 files changed, 2 insertions, 36 deletions
diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
index 984db6c57fb..90b681a99b3 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 467ba6fe3f7..48f955fd713 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 085fe855e8a..00000000000
--- 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 f8e2091d4c1..3b5cccc8747 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 b520c0d913d..03dbf51a643 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