diff options
author | Rickard Nilsson <rickynils@gmail.com> | 2015-12-15 10:15:51 +0100 |
---|---|---|
committer | Rickard Nilsson <rickynils@gmail.com> | 2015-12-15 10:15:51 +0100 |
commit | 46905425cfcfd29da9f5bf17ae5917d3cf83f0d6 (patch) | |
tree | 562f5085e50049d5653a87765bc1605b1eeb535f | |
parent | 63eb3395cb80021c00e94160bd70cfbbcc049eb8 (diff) | |
parent | d241354dcdaee5329f78e1039ebcdd7ef05dc379 (diff) |
Merge pull request #11477 from jgillich/mopidy-gmusic
mopidy-gmusic: init at 1.0.0
-rw-r--r-- | lib/maintainers.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/audio/mopidy-gmusic/default.nix | 23 | ||||
-rw-r--r-- | pkgs/applications/audio/mopidy/default.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 63 |
5 files changed, 87 insertions, 8 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index b373a932dc5dc..e0d5b478e86c5 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -141,6 +141,7 @@ jefdaj = "Jeffrey David Johnson <jefdaj@gmail.com>"; jfb = "James Felix Black <james@yamtime.com>"; jgeerds = "Jascha Geerds <jg@ekby.de>"; + jgillich = "Jakob Gillich <jakob@gillich.me>"; jirkamarsik = "Jirka Marsik <jiri.marsik89@gmail.com>"; joachifm = "Joachim Fasting <joachifm@fastmail.fm>"; joamaki = "Jussi Maki <joamaki@gmail.com>"; diff --git a/pkgs/applications/audio/mopidy-gmusic/default.nix b/pkgs/applications/audio/mopidy-gmusic/default.nix new file mode 100644 index 0000000000000..00468db767a2d --- /dev/null +++ b/pkgs/applications/audio/mopidy-gmusic/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pythonPackages, mopidy }: + +pythonPackages.buildPythonPackage rec { + name = "mopidy-gmusic-${version}"; + version = "1.0.0"; + + src = fetchurl { + url = "https://github.com/mopidy/mopidy-gmusic/archive/v${version}.tar.gz"; + sha256 = "0yfilzfamy1bxnmgb1xk56jrk4sz0i7vcnc0a8klrm9sc7agnm9i"; + }; + + propagatedBuildInputs = [ mopidy pythonPackages.requests2 pythonPackages.gmusicapi ]; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://www.mopidy.com/; + description = "Mopidy extension for playing music from Google Play Music"; + license = licenses.asl20; + maintainers = [ maintainers.jgillich ]; + hydraPlatforms = []; + }; +} diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 7c23694489207..3988997343091 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -5,15 +5,15 @@ pythonPackages.buildPythonPackage rec { name = "mopidy-${version}"; - version = "1.0.5"; + version = "1.1.1"; src = fetchurl { url = "https://github.com/mopidy/mopidy/archive/v${version}.tar.gz"; - sha256 = "0lhmm2w2djf6mb3acw1yq1k4j74v1lf4kgx24dsdnpkgsycrv5q6"; + sha256 = "1xfyg8xqgnrb98wx7a4fzr4vlzkffjhkc1s36ka63rwmx86vqhyw"; }; propagatedBuildInputs = with pythonPackages; [ - gst_python pygobject pykka tornado gst_plugins_base gst_plugins_good + gst_python pygobject pykka tornado requests2 gst_plugins_base gst_plugins_good ]; # There are no tests diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ae54685bc7f5..f71857ca653e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12489,6 +12489,8 @@ let mopidy = callPackage ../applications/audio/mopidy { }; + mopidy-gmusic = callPackage ../applications/audio/mopidy-gmusic { }; + mopidy-spotify = callPackage ../applications/audio/mopidy-spotify { }; mopidy-moped = callPackage ../applications/audio/mopidy-moped { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 958cd90faab1d..433fb88ee2b17 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4695,11 +4695,11 @@ in modules // { }; gmusicapi = with pkgs; buildPythonPackage rec { - name = "gmusicapi-4.0.0"; + name = "gmusicapi-7.0.0"; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/g/gmusicapi/gmusicapi-4.0.0.tar.gz"; - md5 = "12ba66607531978b349c7035c9bab311"; + url = "https://pypi.python.org/packages/source/g/gmusicapi/gmusicapi-7.0.0.tar.gz"; + sha256 = "1zji4cgylyzz97cz69lywkbsn5nvvzrhk7iaqnpqpfvj9gwdchwn"; }; propagatedBuildInputs = with self; [ @@ -4708,14 +4708,16 @@ in modules // { mutagen protobuf setuptools - requests + requests2 dateutil proboscis mock appdirs oauth2client + pyopenssl + gpsoauth + MechanicalSoup ]; - doCheck = false; meta = { description = "An unofficial API for Google Play Music"; @@ -4876,6 +4878,38 @@ in modules // { }; }; + gpsoauth = buildPythonPackage rec { + version = "0.0.4"; + name = "gpsoauth-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/g/gpsoauth/${name}.tar.gz"; + sha256 = "1mhd2lkl1f4fmia1cwxwik8gvqr5q16scjip7kfwzadh9a11n9kw"; + }; + + propagatedBuildInputs = with self; [ + cffi + cryptography + enum34 + idna + ipaddress + ndg-httpsclient + pyopenssl + pyasn1 + pycparser + pycrypto + requests2 + six + ]; + + meta = { + description = "A python client library for Google Play Services OAuth."; + homepage = "https://github.com/simon-weber/gpsoauth"; + license = licenses.mit; + maintainers = with maintainers; [ jgillich ]; + }; + }; + gst-python = callPackage ../development/libraries/gstreamer/python { gst-plugins-base = pkgs.gst_all_1.gst-plugins-base; }; @@ -9921,6 +9955,25 @@ in modules // { }; }); + MechanicalSoup = buildPythonPackage rec { + name = "MechanicalSoup-${version}"; + version = "0.4.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/M/MechanicalSoup/${name}.zip"; + sha256 = "02jkwly4gw1jqm55l4wwn0j0ggnysx55inw9j96bif5l49z5cacd"; + }; + + propagatedBuildInputs = with self; [ requests2 beautifulsoup4 six ]; + + meta = { + description = "A Python library for automating interaction with websites"; + homepage = https://github.com/hickford/MechanicalSoup; + license = licenses.mit; + maintainers = with maintainers; [ jgillich ]; + }; + }; + meld3 = buildPythonPackage rec { name = "meld3-1.0.0"; |