diff options
author | Nick Hu <me@nickhu.co.uk> | 2020-05-26 12:39:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-26 12:39:53 +0100 |
commit | bf0b10fbdd50e4add6a7b6ee60da3435f6e15cec (patch) | |
tree | 048eaae4d34b06be18f12a3a2029162a7d0b5b24 /pkgs/applications | |
parent | fdecd9eedab4dca3e526005b666a3bb5a14d16d6 (diff) | |
parent | cf9ca59fbff587aa69c8ba71d1219a10b8c4444e (diff) |
Merge pull request #78361 from NickHu/mopidy
mopidy-mpris: init at 3.0.1 mopidy-somafm: init at 2.0.0 mopidy-youtube: 2.0.2 -> 3.0 mopidy-gmusic: 3.0.0 -> 4.0.0
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/audio/mopidy/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/mopidy/gmusic.nix | 19 | ||||
-rw-r--r-- | pkgs/applications/audio/mopidy/mpris.nix | 27 | ||||
-rw-r--r-- | pkgs/applications/audio/mopidy/somafm.nix | 26 | ||||
-rw-r--r-- | pkgs/applications/audio/mopidy/youtube.nix | 24 |
5 files changed, 82 insertions, 18 deletions
diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 0b9f815330200..6c2a7d9fe3344 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -26,6 +26,10 @@ let mopidy-mpd = callPackage ./mpd.nix { }; + 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/gmusic.nix b/pkgs/applications/audio/mopidy/gmusic.nix index 3dea9156f8fcb..1e5e42ac2f346 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; diff --git a/pkgs/applications/audio/mopidy/mpris.nix b/pkgs/applications/audio/mopidy/mpris.nix new file mode 100644 index 0000000000000..16fbfab380ba6 --- /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/applications/audio/mopidy/somafm.nix b/pkgs/applications/audio/mopidy/somafm.nix new file mode 100644 index 0000000000000..2e3380fa20f87 --- /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/applications/audio/mopidy/youtube.nix b/pkgs/applications/audio/mopidy/youtube.nix index b8e22a41cabf0..ac16c182a50e0 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; |