From 686f1ff9245617bf311062fc9ef044217ff8e2c3 Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Sat, 5 Dec 2015 03:49:17 +0100 Subject: [PATCH 1/5] python-packages: MechanicalSoup: init at 0.4.0 --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ce3eadfe1c..33cad1540c3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9866,6 +9866,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"; From 2f41c41f95ec751bbb44bf57e9828b3f7a9df9e2 Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Sat, 5 Dec 2015 03:49:58 +0100 Subject: [PATCH 2/5] python-packages: gspoauth: init at 0.0.4 --- pkgs/top-level/python-packages.nix | 32 ++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 33cad1540c3..bde4c28ab6d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4848,6 +4848,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; }; From 9571740b1b49c4079824bf6fb768e2c4269855a7 Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Sat, 5 Dec 2015 03:51:57 +0100 Subject: [PATCH 3/5] python-packages: gmusicapi: 4.0.0 -> 7.0.0 --- pkgs/top-level/python-packages.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bde4c28ab6d..1283263c0be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4667,11 +4667,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; [ @@ -4680,14 +4680,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"; From 872d0be1a0441d3e1071bc00feb109654a00f211 Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Sat, 5 Dec 2015 03:53:01 +0100 Subject: [PATCH 4/5] mopidy-gmusic: init at 1.0.0 --- lib/maintainers.nix | 1 + .../audio/mopidy-gmusic/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 26 insertions(+) create mode 100644 pkgs/applications/audio/mopidy-gmusic/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d1e2b100ab8..8b3694f9a3d 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -141,6 +141,7 @@ jefdaj = "Jeffrey David Johnson "; jfb = "James Felix Black "; jgeerds = "Jascha Geerds "; + jgillich = "Jakob Gillich "; jirkamarsik = "Jirka Marsik "; joachifm = "Joachim Fasting "; joamaki = "Jussi Maki "; diff --git a/pkgs/applications/audio/mopidy-gmusic/default.nix b/pkgs/applications/audio/mopidy-gmusic/default.nix new file mode 100644 index 00000000000..00468db767a --- /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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 142ea8d114c..e9f6847d34f 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 { }; From d241354dcdaee5329f78e1039ebcdd7ef05dc379 Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Sat, 5 Dec 2015 14:28:56 +0100 Subject: [PATCH 5/5] mopidy: 1.0.5 -> 1.1.1 --- pkgs/applications/audio/mopidy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 7c236944892..39889973430 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