mopidyPackages: modernize and clean up (#424443)

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