diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy')
7 files changed, 51 insertions, 68 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/default.nix index 23322ca5663e..fc532482cba4 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/default.nix @@ -14,9 +14,7 @@ let mopidy-gmusic = callPackage ./gmusic.nix { }; - mopidy-local-images = callPackage ./local-images.nix { }; - - mopidy-local-sqlite = callPackage ./local-sqlite.nix { }; + mopidy-local = callPackage ./local.nix { }; mopidy-spotify = callPackage ./spotify.nix { }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/iris.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/iris.nix index 467ba6fe3f70..48f955fd7137 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/iris.nix +++ b/infra/libkookie/nixpkgs/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/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/local-images.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/local-images.nix deleted file mode 100644 index 085fe855e8a8..000000000000 --- a/infra/libkookie/nixpkgs/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/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/local-sqlite.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/local-sqlite.nix deleted file mode 100644 index 23e01c02a0f5..000000000000 --- a/infra/libkookie/nixpkgs/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/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/local.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/local.nix new file mode 100644 index 000000000000..43554280565e --- /dev/null +++ b/infra/libkookie/nixpkgs/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/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix index 28216020b78a..eb5672fe135b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix +++ b/infra/libkookie/nixpkgs/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/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/musicbox-webclient.nix b/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/musicbox-webclient.nix index d628e5894a28..b10accedc6f8 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/musicbox-webclient.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/audio/mopidy/musicbox-webclient.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy-musicbox-webclient"; - version = "2.4.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "pimusicbox"; repo = "mopidy-musicbox-webclient"; rev = "v${version}"; - sha256 = "0784s32pap9rbki3f0f7swaf6946sdv4xzidns13jmw9ilifk5z4"; + sha256 = "1lzarazq67gciyn6r8cdms0f7j0ayyfwhpf28z93ydb280mfrrb9"; }; propagatedBuildInputs = [ mopidy ]; @@ -18,6 +18,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Mopidy extension for playing music from SoundCloud"; license = licenses.mit; + broken = stdenv.isDarwin; maintainers = [ maintainers.spwhitt ]; }; } |