public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mopidy: update to python3

Browse Source 
mopidy: 2.3.1 -> 3.0.1
mopidy-iris: 3.43.0 -> 3.44.0
mopidy-spotify: 3.1.0 -> 4.0.1
pykka: 1.2.0 -> 2.0.1
This commit is contained in:
Kevin Rauscher 2020-02-10 09:14:15 +01:00 committed by Frederik Rietdijk
parent 16df275985
commit 05b4fe20a7
5 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/audio/mopidy.nix
View File

@ -13,11 +13,11 @@ let
mopidyEnv = buildEnv { mopidyEnv = buildEnv {
name = "mopidy-with-extensions-${mopidy.version}"; name = "mopidy-with-extensions-${mopidy.version}";
paths = closePropagation cfg.extensionPackages; paths = closePropagation cfg.extensionPackages;
pathsToLink = [ "/${python.sitePackages}" ]; pathsToLink = [ "/${python3.sitePackages}" ];
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];
postBuild = '' postBuild = ''
makeWrapper ${mopidy}/bin/mopidy $out/bin/mopidy \ makeWrapper ${mopidy}/bin/mopidy $out/bin/mopidy \
--prefix PYTHONPATH : $out/${python.sitePackages} --prefix PYTHONPATH : $out/${python3.sitePackages}
''; '';
}; };
in { in {

10
pkgs/applications/audio/mopidy/default.nix
View File

@ -1,16 +1,16 @@
{ stdenv, fetchFromGitHub, pythonPackages, wrapGAppsHook { stdenv, fetchFromGitHub, python3Packages, wrapGAppsHook
, gst_all_1, glib-networking, gobject-introspection , gst_all_1, glib-networking, gobject-introspection
}: }:
pythonPackages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "mopidy"; pname = "mopidy";
version = "2.3.1"; version = "3.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mopidy"; owner = "mopidy";
repo = "mopidy"; repo = "mopidy";
rev = "v${version}"; rev = "v${version}";
sha256 = "1qdflxr0an6l2m3j90h55bzyj7rjlkkwmxx945hwv8xi472rcgdj"; sha256 = "0fpjprjw143ixak68iwxjpscdjgyb7rsr1cxj7fsdrw6hc83nq4z";
}; };
nativeBuildInputs = [ wrapGAppsHook ]; nativeBuildInputs = [ wrapGAppsHook ];
@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec {
glib-networking gobject-introspection glib-networking gobject-introspection
]; ];
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with python3Packages; [
gst-python pygobject3 pykka tornado_4 requests setuptools gst-python pygobject3 pykka tornado_4 requests setuptools
] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python; ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python;

13
pkgs/applications/audio/mopidy/iris.nix
View File

@ -1,18 +1,17 @@
{ stdenv, pythonPackages, mopidy, mopidy-local-images }: { stdenv, python3Packages, mopidy, mopidy-local-images }:
pythonPackages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "Mopidy-Iris"; pname = "Mopidy-Iris";
version = "3.43.0"; version = "3.44.0";
src = pythonPackages.fetchPypi { src = python3Packages.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1qg9xyjf27dp0810h4kdliyfb8r3kvi37lq8r93d01xwfphdzs05"; sha256 = "0gap0cyw6sfb4487i1x220rr9fbsz6xyw68l15ar0vfll0zv0760";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
mopidy mopidy
mopidy-local-images ] ++ (with python3Packages; [
] ++ (with pythonPackages; [
configobj configobj
requests requests
tornado_4 tornado_4

10
pkgs/applications/audio/mopidy/spotify.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, pythonPackages, mopidy }: { stdenv, fetchurl, python3Packages, mopidy }:
pythonPackages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "mopidy-spotify"; pname = "mopidy-spotify";
version = "3.1.0"; version = "4.0.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz"; url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz";
sha256 = "1mh87w4j0ypvsrnax7kkjgfxfpnw3l290jvfzg56b8qlwf20khjl"; sha256 = "1ac8r8050i5r3ag1hlblbcyskqjqz7wgamndbzsmw52qi6hxk44f";
}; };
propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ]; propagatedBuildInputs = [ mopidy python3Packages.pyspotify ];
doCheck = false; doCheck = false;

4
pkgs/development/python-modules/pykka/default.nix
View File

@ -5,12 +5,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pykka"; pname = "pykka";
version = "1.2.0"; version = "2.0.1";
src = fetchgit { src = fetchgit {
url = "https://github.com/jodal/pykka.git"; url = "https://github.com/jodal/pykka.git";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "0qlfw1054ap0cha1m6dbnq51kjxqxaf338g7jwnwy33b3gr8x0hg"; sha256 = "011rvv3vzj9rpwaq6vfpz9hfwm6gx1jmad4iri6z12g8nnlpydhs";
}; };
# There are no tests # There are no tests