mopidyPackages: modernize and clean up (#424443)

authored by Franz Pletz and committed by GitHub 58d08457 4df8cc70

+234 -140
+15 -7
pkgs/applications/audio/mopidy/bandcamp.nix
··· 1 1 { 2 2 lib, 3 - python3Packages, 3 + pythonPackages, 4 4 fetchPypi, 5 5 mopidy, 6 6 }: 7 7 8 - python3Packages.buildPythonApplication rec { 9 - pname = "Mopidy-Bandcamp"; 8 + pythonPackages.buildPythonApplication rec { 9 + pname = "mopidy-bandcamp"; 10 10 version = "1.1.5"; 11 - format = "setuptools"; 11 + pyproject = true; 12 + 12 13 src = fetchPypi { 13 - inherit pname version; 14 + inherit version; 15 + pname = "Mopidy-Bandcamp"; 14 16 hash = "sha256-wg9zcOKfZQRhpyA1Cu5wvdwKpmrlcr2m9mrqBHgUXAQ="; 15 17 }; 16 18 17 - propagatedBuildInputs = with python3Packages; [ 19 + build-system = [ 20 + pythonPackages.setuptools 21 + ]; 22 + 23 + dependencies = [ 18 24 mopidy 19 - pykka 25 + pythonPackages.pykka 20 26 ]; 27 + 28 + pythonImportsCheck = [ "mopidy_bandcamp" ]; 21 29 22 30 meta = with lib; { 23 31 description = "Mopidy extension for playing music from bandcamp";
+18 -14
pkgs/applications/audio/mopidy/iris.nix
··· 1 1 { 2 2 lib, 3 - python3Packages, 3 + pythonPackages, 4 4 fetchPypi, 5 5 mopidy, 6 6 }: 7 7 8 - python3Packages.buildPythonApplication rec { 9 - pname = "Mopidy-Iris"; 8 + pythonPackages.buildPythonApplication rec { 9 + pname = "mopidy-iris"; 10 10 version = "3.69.3"; 11 - format = "setuptools"; 11 + pyproject = true; 12 12 13 13 src = fetchPypi { 14 - inherit pname version; 14 + inherit version; 15 + pname = "Mopidy-Iris"; 15 16 hash = "sha256-PEAXnapiyxozijR053I7zQYRYLeDOV719L0QbO2r4r4="; 16 17 }; 17 18 18 - propagatedBuildInputs = 19 - [ 20 - mopidy 21 - ] 22 - ++ (with python3Packages; [ 23 - configobj 24 - requests 25 - tornado 26 - ]); 19 + build-system = [ 20 + pythonPackages.setuptools 21 + ]; 22 + 23 + dependencies = [ 24 + mopidy 25 + pythonPackages.configobj 26 + pythonPackages.requests 27 + pythonPackages.tornado 28 + ]; 27 29 28 30 # no tests implemented 29 31 doCheck = false; 32 + 33 + pythonImportsCheck = [ "mopidy_iris" ]; 30 34 31 35 meta = with lib; { 32 36 homepage = "https://github.com/jaedb/Iris";
+8 -6
pkgs/applications/audio/mopidy/jellyfin.nix
··· 1 1 { 2 2 lib, 3 - python3Packages, 3 + pythonPackages, 4 4 fetchPypi, 5 5 mopidy, 6 6 }: 7 7 8 - python3Packages.buildPythonApplication rec { 8 + pythonPackages.buildPythonApplication rec { 9 9 pname = "mopidy-jellyfin"; 10 10 version = "1.0.6"; 11 - format = "setuptools"; 11 + pyproject = true; 12 12 13 13 src = fetchPypi { 14 14 inherit version; ··· 16 16 hash = "sha256-IKCPypMuluR0+mMALp8lB1oB1pSw4rN4rOl/eKn+Qvo="; 17 17 }; 18 18 19 - propagatedBuildInputs = [ 19 + build-system = [ pythonPackages.setuptools ]; 20 + 21 + dependencies = [ 20 22 mopidy 21 - python3Packages.unidecode 22 - python3Packages.websocket-client 23 + pythonPackages.unidecode 24 + pythonPackages.websocket-client 23 25 ]; 24 26 25 27 # no tests implemented
+13 -7
pkgs/applications/audio/mopidy/local.nix
··· 1 1 { 2 2 lib, 3 3 mopidy, 4 - python3Packages, 4 + pythonPackages, 5 5 fetchPypi, 6 6 }: 7 7 8 - python3Packages.buildPythonApplication rec { 9 - pname = "Mopidy-Local"; 8 + pythonPackages.buildPythonApplication rec { 9 + pname = "mopidy-local"; 10 10 version = "3.3.0"; 11 - format = "setuptools"; 11 + pyproject = true; 12 12 13 13 src = fetchPypi { 14 14 inherit version; ··· 16 16 hash = "sha256-y6btbGk5UiVan178x7d9jq5OTnKMbuliHv0aRxuZK3o="; 17 17 }; 18 18 19 - propagatedBuildInputs = [ 19 + build-system = [ 20 + pythonPackages.setuptools 21 + ]; 22 + 23 + dependencies = [ 20 24 mopidy 21 - python3Packages.uritools 25 + pythonPackages.uritools 22 26 ]; 23 27 24 28 nativeCheckInputs = [ 25 - python3Packages.pytestCheckHook 29 + pythonPackages.pytestCheckHook 26 30 ]; 31 + 32 + pythonImportsCheck = [ "mopidy_local" ]; 27 33 28 34 meta = with lib; { 29 35 homepage = "https://github.com/mopidy/mopidy-local";
+10 -4
pkgs/applications/audio/mopidy/moped.nix
··· 7 7 }: 8 8 9 9 pythonPackages.buildPythonApplication rec { 10 - pname = "Mopidy-Moped"; 10 + pname = "mopidy-moped"; 11 11 version = "0.7.1"; 12 - format = "setuptools"; 12 + pyproject = true; 13 13 14 14 src = fetchPypi { 15 - inherit pname version; 15 + inherit version; 16 + pname = "Mopidy-Moped"; 16 17 sha256 = "15461174037d87af93dd59a236d4275c5abf71cea0670ffff24a7d0399a8a2e4"; 17 18 }; 18 19 19 20 LC_ALL = "en_US.UTF-8"; 20 21 buildInputs = [ glibcLocales ]; 21 - propagatedBuildInputs = [ mopidy ]; 22 + 23 + build-system = [ pythonPackages.setuptools ]; 24 + 25 + dependencies = [ mopidy ]; 22 26 23 27 # no tests implemented 24 28 doCheck = false; 29 + 30 + pythonImportsCheck = [ "mopidy_moped" ]; 25 31 26 32 meta = with lib; { 27 33 homepage = "https://github.com/martijnboland/moped";
+20 -19
pkgs/applications/audio/mopidy/mopidy.nix
··· 14 14 pythonPackages.buildPythonApplication rec { 15 15 pname = "mopidy"; 16 16 version = "3.4.2"; 17 - format = "setuptools"; 17 + pyproject = true; 18 18 19 19 src = fetchFromGitHub { 20 20 owner = "mopidy"; 21 21 repo = "mopidy"; 22 - rev = "refs/tags/v${version}"; 23 - sha256 = "sha256-2OFav2HaQq/RphmZxLyL1n3suwzt1Y/d4h33EdbStjk="; 22 + tag = "v${version}"; 23 + hash = "sha256-2OFav2HaQq/RphmZxLyL1n3suwzt1Y/d4h33EdbStjk="; 24 24 }; 25 25 26 26 nativeBuildInputs = [ wrapGAppsNoGuiHook ]; ··· 50 50 } 51 51 )) 52 52 ] 53 - ++ lib.optional (!stdenv.hostPlatform.isDarwin) pipewire; 53 + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pipewire ]; 54 + 55 + propagatedNativeBuildInputs = [ gobject-introspection ]; 56 + 57 + propagatedBuildInputs = [ gobject-introspection ]; 54 58 55 - propagatedBuildInputs = 56 - [ gobject-introspection ] 57 - ++ ( 58 - with pythonPackages; 59 - [ 60 - gst-python 61 - pygobject3 62 - pykka 63 - requests 64 - setuptools 65 - tornado 66 - ] 67 - ++ lib.optional (!stdenv.hostPlatform.isDarwin) dbus-python 68 - ); 59 + build-system = [ pythonPackages.setuptools ]; 69 60 70 - propagatedNativeBuildInputs = [ gobject-introspection ]; 61 + dependencies = 62 + with pythonPackages; 63 + [ 64 + gst-python 65 + pygobject3 66 + pykka 67 + requests 68 + setuptools 69 + tornado 70 + ] 71 + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ dbus-python ]; 71 72 72 73 # There are no tests 73 74 doCheck = false;
+12 -5
pkgs/applications/audio/mopidy/mopify.nix
··· 6 6 }: 7 7 8 8 pythonPackages.buildPythonApplication rec { 9 - pname = "Mopidy-Mopify"; 9 + pname = "mopidy-mopify"; 10 10 version = "1.7.3"; 11 - format = "setuptools"; 11 + pyproject = true; 12 12 13 13 src = fetchPypi { 14 - inherit pname version; 14 + inherit version; 15 + pname = "Mopidy-Mopify"; 15 16 hash = "sha256-RlCC+39zC+LeA/QDWPHYx5TrEwOgVrnvcH1Xg12qSLE="; 16 17 }; 17 18 18 - propagatedBuildInputs = with pythonPackages; [ 19 + build-system = [ 20 + pythonPackages.setuptools 21 + ]; 22 + 23 + dependencies = [ 19 24 mopidy 20 - configobj 25 + pythonPackages.configobj 21 26 ]; 22 27 23 28 # no tests implemented 24 29 doCheck = false; 30 + 31 + pythonImportsCheck = [ "mopidy_mopify" ]; 25 32 26 33 meta = with lib; { 27 34 homepage = "https://github.com/dirkgroenen/mopidy-mopify";
+9 -6
pkgs/applications/audio/mopidy/mpd.nix
··· 1 1 { 2 2 lib, 3 - python3Packages, 3 + pythonPackages, 4 4 fetchPypi, 5 5 mopidy, 6 6 }: 7 7 8 - python3Packages.buildPythonApplication rec { 9 - pname = "Mopidy-MPD"; 8 + pythonPackages.buildPythonApplication rec { 9 + pname = "mopidy-mpd"; 10 10 version = "3.3.0"; 11 - format = "setuptools"; 11 + pyproject = true; 12 12 13 13 src = fetchPypi { 14 - inherit pname version; 14 + inherit version; 15 + pname = "Mopidy-MPD"; 15 16 hash = "sha256-CeLMRqj9cwBvQrOx7XHVV8MjDjwOosONVlsN2o+vTVM="; 16 17 }; 17 18 18 - propagatedBuildInputs = [ mopidy ]; 19 + build-system = [ pythonPackages.setuptools ]; 20 + 21 + dependencies = [ mopidy ]; 19 22 20 23 # no tests implemented 21 24 doCheck = false;
+11 -5
pkgs/applications/audio/mopidy/mpris.nix
··· 1 1 { 2 2 lib, 3 - python3Packages, 3 + pythonPackages, 4 4 fetchPypi, 5 5 mopidy, 6 6 }: 7 7 8 - python3Packages.buildPythonApplication rec { 8 + pythonPackages.buildPythonApplication rec { 9 9 pname = "mopidy-mpris"; 10 10 version = "3.0.3"; 11 - format = "setuptools"; 11 + pyproject = true; 12 12 13 13 src = fetchPypi { 14 14 inherit version; ··· 16 16 hash = "sha256-rHQgNIyludTEL7RDC8dIpyGTMOt1Tazn6i/orKlSP4U="; 17 17 }; 18 18 19 - propagatedBuildInputs = [ 19 + build-system = [ 20 + pythonPackages.setuptools 21 + ]; 22 + 23 + dependencies = [ 20 24 mopidy 21 - python3Packages.pydbus 25 + pythonPackages.pydbus 22 26 ]; 23 27 24 28 doCheck = false; 29 + 30 + pythonImportsCheck = [ "mopidy_mpris" ]; 25 31 26 32 meta = with lib; { 27 33 homepage = "https://www.mopidy.com/";
+6 -2
pkgs/applications/audio/mopidy/muse.nix
··· 8 8 pythonPackages.buildPythonApplication rec { 9 9 pname = "mopidy-muse"; 10 10 version = "0.0.33"; 11 - format = "setuptools"; 11 + pyproject = true; 12 12 13 13 src = fetchPypi { 14 14 inherit version; ··· 16 16 hash = "sha256-CEPAPWtMrD+HljyqBB6EAyGVeOjzkvVoEywlE4XEJGs="; 17 17 }; 18 18 19 - propagatedBuildInputs = [ 19 + build-system = [ 20 + pythonPackages.setuptools 21 + ]; 22 + 23 + dependencies = [ 20 24 mopidy 21 25 pythonPackages.pykka 22 26 ];
+8 -4
pkgs/applications/audio/mopidy/musicbox-webclient.nix
··· 8 8 pythonPackages.buildPythonApplication rec { 9 9 pname = "mopidy-musicbox-webclient"; 10 10 version = "3.1.0"; 11 - format = "setuptools"; 11 + pyproject = true; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "pimusicbox"; 15 - repo = pname; 16 - rev = "v${version}"; 15 + repo = "mopidy-musicbox-webclient"; 16 + tag = "v${version}"; 17 17 sha256 = "1lzarazq67gciyn6r8cdms0f7j0ayyfwhpf28z93ydb280mfrrb9"; 18 18 }; 19 19 20 - propagatedBuildInputs = [ 20 + build-system = [ 21 + pythonPackages.setuptools 22 + ]; 23 + 24 + dependencies = [ 21 25 mopidy 22 26 ]; 23 27
+11 -4
pkgs/applications/audio/mopidy/notify.nix
··· 6 6 }: 7 7 8 8 pythonPackages.buildPythonApplication rec { 9 - pname = "Mopidy-Notify"; 9 + pname = "mopidy-notify"; 10 10 version = "0.2.1"; 11 - format = "setuptools"; 11 + pyproject = true; 12 12 13 13 src = fetchPypi { 14 - inherit pname version; 14 + inherit version; 15 + pname = "Mopidy-Notify"; 15 16 hash = "sha256-8FT4O4k0wEsdHA1vJaOW9UamJ3QLyO47HwL5XcSU3Pc="; 16 17 }; 17 18 18 - propagatedBuildInputs = [ 19 + build-system = [ 20 + pythonPackages.setuptools 21 + ]; 22 + 23 + pythonRelaxDeps = [ "pykka" ]; 24 + 25 + dependencies = [ 19 26 mopidy 20 27 pythonPackages.pydbus 21 28 ];
+14 -8
pkgs/applications/audio/mopidy/podcast.nix
··· 1 1 { 2 2 lib, 3 - python3Packages, 3 + pythonPackages, 4 4 fetchPypi, 5 5 mopidy, 6 6 }: 7 7 8 - python3Packages.buildPythonApplication rec { 8 + pythonPackages.buildPythonApplication rec { 9 9 pname = "mopidy-podcast"; 10 10 version = "3.0.1"; 11 - format = "setuptools"; 11 + pyproject = true; 12 12 13 13 src = fetchPypi { 14 14 inherit version; ··· 16 16 hash = "sha256-grNPVEVM2PlpYhBXe6sabFjWVB9+q+apIRjcHUxH52A="; 17 17 }; 18 18 19 - propagatedBuildInputs = [ 19 + build-system = [ 20 + pythonPackages.setuptools 21 + ]; 22 + 23 + dependencies = [ 20 24 mopidy 21 - python3Packages.cachetools 22 - python3Packages.uritools 25 + pythonPackages.cachetools 26 + pythonPackages.uritools 23 27 ]; 24 28 25 - nativeCheckInputs = with python3Packages; [ 26 - pytestCheckHook 29 + nativeCheckInputs = [ 30 + pythonPackages.pytestCheckHook 27 31 ]; 32 + 33 + pythonImportsCheck = [ "mopidy_podcast" ]; 28 34 29 35 meta = with lib; { 30 36 homepage = "https://github.com/tkem/mopidy-podcast";
+12 -7
pkgs/applications/audio/mopidy/scrobbler.nix
··· 1 1 { 2 2 lib, 3 - python3Packages, 3 + pythonPackages, 4 4 fetchPypi, 5 5 mopidy, 6 6 }: 7 7 8 - python3Packages.buildPythonApplication rec { 9 - pname = "Mopidy-Scrobbler"; 8 + pythonPackages.buildPythonApplication rec { 9 + pname = "mopidy-scrobbler"; 10 10 version = "2.0.1"; 11 - format = "setuptools"; 11 + pyproject = true; 12 12 13 13 src = fetchPypi { 14 - inherit pname version; 14 + inherit version; 15 + pname = "Mopidy-Scrobbler"; 15 16 sha256 = "11vxgax4xgkggnq4fr1rh2rcvzspkkimck5p3h4phdj3qpnj0680"; 16 17 }; 17 18 18 - propagatedBuildInputs = with python3Packages; [ 19 + build-system = [ 20 + pythonPackages.setuptools 21 + ]; 22 + 23 + dependencies = [ 19 24 mopidy 20 - pylast 25 + pythonPackages.pylast 21 26 ]; 22 27 23 28 # no tests implemented
+12 -4
pkgs/applications/audio/mopidy/somafm.nix
··· 1 1 { 2 2 lib, 3 - python3Packages, 3 + pythonPackages, 4 4 fetchPypi, 5 5 mopidy, 6 6 }: 7 7 8 - python3Packages.buildPythonApplication rec { 8 + pythonPackages.buildPythonApplication rec { 9 9 pname = "mopidy-somafm"; 10 10 version = "2.0.2"; 11 - format = "setuptools"; 11 + pyproject = true; 12 12 13 13 src = fetchPypi { 14 14 inherit version; ··· 16 16 sha256 = "DC0emxkoWfjGHih2C8nINBFByf521Xf+3Ks4JRxNPLM="; 17 17 }; 18 18 19 - propagatedBuildInputs = [ mopidy ]; 19 + build-system = [ 20 + pythonPackages.setuptools 21 + ]; 22 + 23 + dependencies = [ 24 + mopidy 25 + ]; 20 26 21 27 doCheck = false; 28 + 29 + pythonImportsCheck = [ "mopidy_somafm" ]; 22 30 23 31 meta = with lib; { 24 32 homepage = "https://www.mopidy.com/";
+9 -3
pkgs/applications/audio/mopidy/soundcloud.nix
··· 8 8 pythonPackages.buildPythonApplication rec { 9 9 pname = "mopidy-soundcloud"; 10 10 version = "3.0.2"; 11 - format = "setuptools"; 11 + pyproject = true; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "mopidy"; 15 15 repo = "mopidy-soundcloud"; 16 - rev = "v${version}"; 16 + tag = "v${version}"; 17 17 sha256 = "sha256-1Qqbfw6NZ+2K1w+abMBfWo0RAmIRbNyIErEmalmWJ0s="; 18 18 }; 19 19 20 - propagatedBuildInputs = [ 20 + build-system = [ 21 + pythonPackages.setuptools 22 + ]; 23 + 24 + dependencies = [ 21 25 mopidy 22 26 pythonPackages.beautifulsoup4 23 27 ]; 24 28 25 29 doCheck = false; 30 + 31 + pythonImportsCheck = [ "mopidy_soundcloud" ]; 26 32 27 33 meta = with lib; { 28 34 description = "Mopidy extension for playing music from SoundCloud";
+13 -5
pkgs/applications/audio/mopidy/subidy.nix
··· 8 8 pythonPackages.buildPythonApplication rec { 9 9 pname = "mopidy-subidy"; 10 10 version = "1.0.0"; 11 - format = "setuptools"; 11 + pyproject = true; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "Prior99"; 15 - repo = pname; 16 - rev = version; 15 + repo = "mopidy-subidy"; 16 + tag = version; 17 17 sha256 = "0c5ghhhrj5v3yp4zmll9ari6r5c6ha8c1izwqshvadn40b02q7xz"; 18 18 }; 19 19 20 - propagatedBuildInputs = [ 20 + build-system = [ 21 + pythonPackages.setuptools 22 + ]; 23 + 24 + dependencies = [ 21 25 mopidy 22 26 pythonPackages.py-sonic 23 27 ]; 24 28 25 - nativeCheckInputs = with pythonPackages; [ pytestCheckHook ]; 29 + nativeCheckInputs = [ 30 + pythonPackages.pytestCheckHook 31 + ]; 32 + 33 + pythonImportsCheck = [ "mopidy_subidy" ]; 26 34 27 35 meta = with lib; { 28 36 homepage = "https://www.mopidy.com/";
+8 -4
pkgs/applications/audio/mopidy/tunein.nix
··· 1 1 { 2 2 lib, 3 - python3Packages, 3 + pythonPackages, 4 4 fetchPypi, 5 5 mopidy, 6 6 }: 7 7 8 - python3Packages.buildPythonApplication rec { 8 + pythonPackages.buildPythonApplication rec { 9 9 pname = "mopidy-tunein"; 10 10 version = "1.1.0"; 11 - format = "setuptools"; 11 + pyproject = true; 12 12 13 13 src = fetchPypi { 14 14 inherit version; ··· 16 16 sha256 = "01y1asylscr73yqx071imhrzfzlg07wmqqzkdvpgm6r35marc2li"; 17 17 }; 18 18 19 - propagatedBuildInputs = [ 19 + build-system = [ 20 + pythonPackages.setuptools 21 + ]; 22 + 23 + dependencies = [ 20 24 mopidy 21 25 ]; 22 26
+25 -26
pkgs/applications/audio/mopidy/youtube.nix
··· 1 1 { 2 2 lib, 3 3 fetchFromGitHub, 4 - python3, 4 + pythonPackages, 5 5 mopidy, 6 - yt-dlp, 6 + pkgs, 7 7 extraPkgs ? pkgs: [ ], 8 8 }: 9 9 10 - python3.pkgs.buildPythonApplication rec { 10 + pythonPackages.buildPythonApplication rec { 11 11 pname = "mopidy-youtube"; 12 12 version = "3.7"; 13 - format = "setuptools"; 13 + pyproject = true; 14 14 15 15 src = fetchFromGitHub { 16 16 owner = "natumbri"; 17 - repo = pname; 18 - rev = "refs/tags/v${version}"; 17 + repo = "mopidy-youtube"; 18 + tag = "v${version}"; 19 19 hash = "sha256-iFt7r8Ljymc+grNJiOClTHkZOeo7AcYpcNc8tLMPROk="; 20 20 }; 21 21 22 - propagatedBuildInputs = 23 - with python3.pkgs; 24 - [ 25 - beautifulsoup4 26 - cachetools 27 - pykka 28 - requests 29 - ytmusicapi 30 - ] 31 - ++ [ 32 - mopidy 33 - yt-dlp 34 - ] 35 - ++ extraPkgs pkgs; 36 - 37 - nativeCheckInputs = with python3.pkgs; [ 38 - vcrpy 39 - pytestCheckHook 40 - ]; 41 - 42 22 postPatch = '' 43 23 substituteInPlace mopidy_youtube/youtube.py \ 44 24 --replace-fail 'youtube_dl_package = "youtube_dl"' 'youtube_dl_package = "yt_dlp"' ··· 48 28 'patcher = mock.patch.object(youtube, "youtube_dl", spec=yt_dlp)' \ 49 29 --replace-fail '"youtube_dl_package": "youtube_dl",' '"youtube_dl_package": "yt_dlp",' 50 30 ''; 31 + 32 + build-system = [ 33 + pythonPackages.setuptools 34 + ]; 35 + 36 + dependencies = [ 37 + mopidy 38 + pythonPackages.beautifulsoup4 39 + pythonPackages.cachetools 40 + pythonPackages.pykka 41 + pythonPackages.requests 42 + pythonPackages.ytmusicapi 43 + pythonPackages.yt-dlp 44 + ] ++ extraPkgs pkgs; # should we remove this? If we do, don't forget to also change the docs! 45 + 46 + nativeCheckInputs = with pythonPackages; [ 47 + vcrpy 48 + pytestCheckHook 49 + ]; 51 50 52 51 disabledTests = [ 53 52 # Test requires a YouTube API key