From 8465c5f220ab4e9ac353c853beb18e0cb9522997 Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Fri, 24 Jan 2020 09:24:14 +0000 Subject: mopidy-gmusic: 3.0.0 -> 4.0.0 --- pkgs/applications/audio/mopidy/gmusic.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/audio/mopidy/gmusic.nix b/pkgs/applications/audio/mopidy/gmusic.nix index 3dea9156f8fc..1e5e42ac2f34 100644 --- a/pkgs/applications/audio/mopidy/gmusic.nix +++ b/pkgs/applications/audio/mopidy/gmusic.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, pythonPackages, mopidy }: +{ stdenv, python3Packages, mopidy }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "mopidy-gmusic"; - version = "3.0.0"; + version = "4.0.0"; - src = fetchurl { - url = "https://github.com/mopidy/mopidy-gmusic/archive/v${version}.tar.gz"; - sha256 = "0a2s4xrrhnkv85rx4w5bj6ih9xm34jy0q71fdvbzmi827g9dw5sz"; + src = python3Packages.fetchPypi { + inherit version; + pname = "Mopidy-GMusic"; + sha256 = "14yswmlfs659rs3k595606m77lw9c6pjykb5pikqw21sb97haxl3"; }; propagatedBuildInputs = [ mopidy - pythonPackages.requests - pythonPackages.gmusicapi - pythonPackages.cachetools + python3Packages.requests + python3Packages.gmusicapi + python3Packages.cachetools ]; doCheck = false; -- cgit 1.4.1 From 3967a244fca9e587b32528dded5faeabe3e3f5bf Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Fri, 24 Jan 2020 09:26:35 +0000 Subject: mopidy-mpris: init at 3.0.1 --- pkgs/applications/audio/mopidy/default.nix | 2 ++ pkgs/applications/audio/mopidy/mpris.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 16 +++++++++++++++- 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/audio/mopidy/mpris.nix (limited to 'pkgs/applications') diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 0b9f81533020..2277e2be0786 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -26,6 +26,8 @@ let mopidy-mpd = callPackage ./mpd.nix { }; + mopidy-mpris = callPackage ./mpris.nix { }; + mopidy-spotify-tunigo = callPackage ./spotify-tunigo.nix { }; mopidy-youtube = callPackage ./youtube.nix { }; diff --git a/pkgs/applications/audio/mopidy/mpris.nix b/pkgs/applications/audio/mopidy/mpris.nix new file mode 100644 index 000000000000..16fbfab380ba --- /dev/null +++ b/pkgs/applications/audio/mopidy/mpris.nix @@ -0,0 +1,27 @@ +{ stdenv, python3Packages, mopidy }: + +python3Packages.buildPythonApplication rec { + pname = "mopidy-mpris"; + version = "3.0.1"; + + src = python3Packages.fetchPypi { + inherit version; + pname = "Mopidy-MPRIS"; + sha256 = "0qk46aq5r92qgkldzl41x09naww1gv92l4c4hknyl7yymyvm9lr2"; + }; + + propagatedBuildInputs = [ + mopidy + python3Packages.pydbus + ]; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://www.mopidy.com/; + description = "Mopidy extension for controlling Mopidy through D-Bus using the MPRIS specification"; + license = licenses.asl20; + maintainers = [ maintainers.nickhu ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1da0e2df115b..2e6cee242d63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20787,7 +20787,21 @@ in python = python3; }; - inherit (mopidyPackages) mopidy mopidy-gmusic mopidy-local-images mopidy-local-sqlite mopidy-spotify mopidy-moped mopidy-mopify mopidy-spotify-tunigo mopidy-youtube mopidy-soundcloud mopidy-musicbox-webclient mopidy-iris mopidy-mpd; + inherit (mopidyPackages) + mopidy + mopidy-gmusic + mopidy-iris + mopidy-local-images + mopidy-local-sqlite + mopidy-moped + mopidy-mopify + mopidy-mpd + mopidy-mpris + mopidy-musicbox-webclient + mopidy-soundcloud + mopidy-spotify + mopidy-spotify-tunigo + mopidy-youtube; motif = callPackage ../development/libraries/motif { }; -- cgit 1.4.1 From 17f31102d75e9dc26c732d55e9789e88af81506d Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Fri, 24 Jan 2020 09:27:17 +0000 Subject: mopidy-somafm: init at 2.0.0 --- pkgs/applications/audio/mopidy/default.nix | 2 ++ pkgs/applications/audio/mopidy/somafm.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 29 insertions(+) create mode 100644 pkgs/applications/audio/mopidy/somafm.nix (limited to 'pkgs/applications') diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 2277e2be0786..6c2a7d9fe334 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -28,6 +28,8 @@ let mopidy-mpris = callPackage ./mpris.nix { }; + mopidy-somafm = callPackage ./somafm.nix { }; + mopidy-spotify-tunigo = callPackage ./spotify-tunigo.nix { }; mopidy-youtube = callPackage ./youtube.nix { }; diff --git a/pkgs/applications/audio/mopidy/somafm.nix b/pkgs/applications/audio/mopidy/somafm.nix new file mode 100644 index 000000000000..2e3380fa20f8 --- /dev/null +++ b/pkgs/applications/audio/mopidy/somafm.nix @@ -0,0 +1,26 @@ +{ stdenv, python3Packages, mopidy }: + +python3Packages.buildPythonApplication rec { + pname = "mopidy-somafm"; + version = "2.0.0"; + + src = python3Packages.fetchPypi { + inherit version; + pname = "Mopidy-SomaFM"; + sha256 = "1j88rrliys8hqvnb35k1xqw88bvrllcb4rb53lgh82byhscsxlf3"; + }; + + propagatedBuildInputs = [ + mopidy + ]; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://www.mopidy.com/; + description = "Mopidy extension for playing music from SomaFM"; + license = licenses.mit; + maintainers = [ maintainers.nickhu ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e6cee242d63..a9240be18b79 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20798,6 +20798,7 @@ in mopidy-mpd mopidy-mpris mopidy-musicbox-webclient + mopidy-somafm mopidy-soundcloud mopidy-spotify mopidy-spotify-tunigo -- cgit 1.4.1 From cf9ca59fbff587aa69c8ba71d1219a10b8c4444e Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Fri, 24 Jan 2020 09:27:35 +0000 Subject: mopidy-youtube: 2.0.2 -> 3.0 --- pkgs/applications/audio/mopidy/youtube.nix | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/audio/mopidy/youtube.nix b/pkgs/applications/audio/mopidy/youtube.nix index b8e22a41cabf..ac16c182a50e 100644 --- a/pkgs/applications/audio/mopidy/youtube.nix +++ b/pkgs/applications/audio/mopidy/youtube.nix @@ -1,17 +1,23 @@ -{ stdenv, fetchFromGitHub, pythonPackages, mopidy }: +{ stdenv, python3Packages, mopidy }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "mopidy-youtube"; - version = "2.0.2"; + version = "3.0"; - src = fetchFromGitHub { - owner = "mopidy"; - repo = "mopidy-youtube"; - rev = "v${version}"; - sha256 = "06r3ikyg2ch5n7fbn3sgj04hk6icpfpk1r856qch41995k3bbfg7"; + src = python3Packages.fetchPypi { + inherit version; + pname = "Mopidy-YouTube"; + sha256 = "0x1q9rfnjx65n6hi8s5rw5ff4xv55h63zy52fwm8aksdnzppr7gd"; }; - propagatedBuildInputs = with pythonPackages; [ mopidy pafy ]; + patchPhase = "sed s/bs4/beautifulsoup4/ -i setup.cfg"; + + propagatedBuildInputs = [ + mopidy + python3Packages.beautifulsoup4 + python3Packages.cachetools + python3Packages.youtube-dl + ]; doCheck = false; -- cgit 1.4.1