about summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorRickard Nilsson <rickynils@gmail.com>2015-12-15 10:15:51 +0100
committerRickard Nilsson <rickynils@gmail.com>2015-12-15 10:15:51 +0100
commit46905425cfcfd29da9f5bf17ae5917d3cf83f0d6 (patch)
tree562f5085e50049d5653a87765bc1605b1eeb535f /pkgs/applications
parent63eb3395cb80021c00e94160bd70cfbbcc049eb8 (diff)
parentd241354dcdaee5329f78e1039ebcdd7ef05dc379 (diff)
Merge pull request #11477 from jgillich/mopidy-gmusic
mopidy-gmusic: init at 1.0.0
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/audio/mopidy-gmusic/default.nix23
-rw-r--r--pkgs/applications/audio/mopidy/default.nix6
2 files changed, 26 insertions, 3 deletions
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