From 7565d00a7c18f500a9cb5b48484f1b0fab95a43a Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Sat, 18 Jul 2020 11:27:37 +0200 Subject: [PATCH 1/3] mopidy-local: init at 3.1.1 Mopidy-Local is the successor to Mopidy-Local-SQLite and Mopidy-Local-Images, which are already packaged. I had to make gobject-introspection a propagated build input, otherwise Mopidy-Local can't import Mopidy. --- pkgs/applications/audio/mopidy/default.nix | 2 ++ pkgs/applications/audio/mopidy/local.nix | 30 ++++++++++++++++++++++ pkgs/applications/audio/mopidy/mopidy.nix | 21 +++++++++++---- pkgs/top-level/all-packages.nix | 1 + 4 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 pkgs/applications/audio/mopidy/local.nix diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 23322ca5663..984db6c57fb 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -14,6 +14,8 @@ let mopidy-gmusic = callPackage ./gmusic.nix { }; + mopidy-local = callPackage ./local.nix { }; + mopidy-local-images = callPackage ./local-images.nix { }; mopidy-local-sqlite = callPackage ./local-sqlite.nix { }; diff --git a/pkgs/applications/audio/mopidy/local.nix b/pkgs/applications/audio/mopidy/local.nix new file mode 100644 index 00000000000..43554280565 --- /dev/null +++ b/pkgs/applications/audio/mopidy/local.nix @@ -0,0 +1,30 @@ +{ lib +, mopidy +, python3Packages +}: + +python3Packages.buildPythonApplication rec { + pname = "Mopidy-Local"; + version = "3.1.1"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "13m0iz14lyplnpm96gfpisqvv4n89ls30kmkg21z7v238lm0h19j"; + }; + + propagatedBuildInputs = [ + mopidy + python3Packages.uritools + ]; + + checkInputs = [ + python3Packages.pytestCheckHook + ]; + + meta = with lib; { + homepage = "https://github.com/mopidy/mopidy-local"; + description = "Mopidy extension for playing music from your local music archive"; + license = licenses.asl20; + maintainers = with maintainers; [ ruuda ]; + }; +} diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index 28216020b78..eb5672fe135 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -16,13 +16,24 @@ pythonPackages.buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook ]; buildInputs = with gst_all_1; [ - gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad - glib-networking gobject-introspection + glib-networking + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gst-plugins-ugly ]; - propagatedBuildInputs = with pythonPackages; [ - gst-python pygobject3 pykka tornado requests setuptools - ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python; + propagatedBuildInputs = [ + gobject-introspection + ] ++ (with pythonPackages; [ + gst-python + pygobject3 + pykka + requests + setuptools + tornado + ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python + ); # There are no tests doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 326f54578f4..b520c0d913d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22122,6 +22122,7 @@ in mopidy mopidy-gmusic mopidy-iris + mopidy-local mopidy-local-images mopidy-local-sqlite mopidy-moped From 79a823ceae4c1a32216bc1943300838f95193250 Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Sun, 19 Jul 2020 21:02:03 +0200 Subject: [PATCH 2/3] 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 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 From b82ca4d2e100592b43ec79ee4efeb626d0929cdd Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Sun, 18 Oct 2020 19:22:12 +0200 Subject: [PATCH 3/3] mopidy-local-sqlite: 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 ones any more. --- pkgs/applications/audio/mopidy/default.nix | 2 -- .../audio/mopidy/local-sqlite.nix | 25 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 4 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 pkgs/applications/audio/mopidy/local-sqlite.nix diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 90b681a99b3..fc532482cba 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-sqlite = callPackage ./local-sqlite.nix { }; - mopidy-spotify = callPackage ./spotify.nix { }; mopidy-moped = callPackage ./moped.nix { }; diff --git a/pkgs/applications/audio/mopidy/local-sqlite.nix b/pkgs/applications/audio/mopidy/local-sqlite.nix deleted file mode 100644 index 23e01c02a0f..00000000000 --- a/pkgs/applications/audio/mopidy/local-sqlite.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchFromGitHub, pythonPackages, mopidy }: - -pythonPackages.buildPythonApplication rec { - pname = "mopidy-local-sqlite"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "mopidy"; - repo = "mopidy-local-sqlite"; - rev = "v${version}"; - sha256 = "1fjd9ydbfwd1n9b9zw8zjn4l7c5hpam2n0xs51pjkjn82m3zq9zv"; - }; - - propagatedBuildInputs = [ - mopidy - pythonPackages.uritools - ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/mopidy/mopidy-local-sqlite"; - description = "Mopidy SQLite local library extension"; - license = licenses.asl20; - maintainers = [ maintainers.rvolosatovs ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3b5cccc8747..df248096890 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -304,6 +304,7 @@ mapAliases ({ 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 + 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; 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 03dbf51a643..aebf895e385 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-sqlite mopidy-moped mopidy-mopify mopidy-mpd