mopidy: Create a mopidyPackages set

This is to avoid mixing python versions in the same plugin closure.

3 files changed, 47 insertions, 6 deletions

diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
new file mode 100644
index 000000000000..0b9f81533020
--- /dev/null
+++ b/pkgs/applications/audio/mopidy/default.nix
@@ -0,0 +1,41 @@
+{ newScope, python }:
+
+# Create a custom scope so we are consistent in which python version is used
+
+let
+  callPackage = newScope self;
+
+  self = {
+
+    inherit python;
+    pythonPackages = python.pkgs;
+
+    mopidy = callPackage ./mopidy.nix { };
+
+    mopidy-gmusic = callPackage ./gmusic.nix { };
+
+    mopidy-local-images = callPackage ./local-images.nix { };
+
+    mopidy-local-sqlite = callPackage ./local-sqlite.nix { };
+
+    mopidy-spotify = callPackage ./spotify.nix { };
+
+    mopidy-moped = callPackage ./moped.nix { };
+
+    mopidy-mopify = callPackage ./mopify.nix { };
+
+    mopidy-mpd = callPackage ./mpd.nix { };
+
+    mopidy-spotify-tunigo = callPackage ./spotify-tunigo.nix { };
+
+    mopidy-youtube = callPackage ./youtube.nix { };
+
+    mopidy-soundcloud = callPackage ./soundcloud.nix { };
+
+    mopidy-musicbox-webclient = callPackage ./musicbox-webclient.nix { };
+
+    mopidy-iris = callPackage ./iris.nix { };
+
+  };
+
+in self
diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix
index 66be35bfcc8f..ae65d9b2f6ed 100644
--- a/pkgs/applications/audio/mopidy/mopidy.nix
+++ b/pkgs/applications/audio/mopidy/mopidy.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, python3Packages, wrapGAppsHook
+{ stdenv, fetchFromGitHub, pythonPackages, wrapGAppsHook
 , gst_all_1, glib-networking, gobject-introspection
 }:
 
-python3Packages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   pname = "mopidy";
   version = "3.0.2";
 
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
     glib-networking gobject-introspection
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = with pythonPackages; [
     gst-python pygobject3 pykka tornado_4 requests setuptools
   ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python;
 
diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix
index 0793ae01c29e..32019c74f86d 100644
--- a/pkgs/applications/audio/mopidy/spotify.nix
+++ b/pkgs/applications/audio/mopidy/spotify.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, python3Packages, mopidy }:
+{ stdenv, fetchurl, pythonPackages, mopidy }:
 
-python3Packages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   pname = "mopidy-spotify";
   version = "4.0.1";
 
@@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec {
     sha256 = "1ac8r8050i5r3ag1hlblbcyskqjqz7wgamndbzsmw52qi6hxk44f";
   };
 
-  propagatedBuildInputs = [ mopidy python3Packages.pyspotify ];
+  propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ];
 
   doCheck = false;