Skip to content

Commit 58d0845

Browse files
fpletzfpletz
authored
mopidyPackages: modernize and clean up (#424443)
2 parents 4df8cc7 + 0c1a3a5 commit 58d0845

19 files changed

+234
-140
lines changed

‎pkgs/applications/audio/mopidy/bandcamp.nix‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,32 @@
11
{
22
lib,
3-
python3Packages,
3+
pythonPackages,
44
fetchPypi,
55
mopidy,
66
}:
77

8-
python3Packages.buildPythonApplication rec {
9-
pname = "Mopidy-Bandcamp";
8+
pythonPackages.buildPythonApplication rec {
9+
pname = "mopidy-bandcamp";
1010
version = "1.1.5";
11-
format = "setuptools";
11+
pyproject = true;
12+
1213
src = fetchPypi {
13-
inherit pname version;
14+
inherit version;
15+
pname = "Mopidy-Bandcamp";
1416
hash = "sha256-wg9zcOKfZQRhpyA1Cu5wvdwKpmrlcr2m9mrqBHgUXAQ=";
1517
};
1618

17-
propagatedBuildInputs = with python3Packages; [
19+
build-system = [
20+
pythonPackages.setuptools
21+
];
22+
23+
dependencies = [
1824
mopidy
19-
pykka
25+
pythonPackages.pykka
2026
];
2127

28+
pythonImportsCheck = [ "mopidy_bandcamp" ];
29+
2230
meta = with lib; {
2331
description = "Mopidy extension for playing music from bandcamp";
2432
homepage = "https://github.com/impliedchaos/mopidy-bandcamp";

‎pkgs/applications/audio/mopidy/iris.nix‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,37 @@
11
{
22
lib,
3-
python3Packages,
3+
pythonPackages,
44
fetchPypi,
55
mopidy,
66
}:
77

8-
python3Packages.buildPythonApplication rec {
9-
pname = "Mopidy-Iris";
8+
pythonPackages.buildPythonApplication rec {
9+
pname = "mopidy-iris";
1010
version = "3.69.3";
11-
format = "setuptools";
11+
pyproject = true;
1212

1313
src = fetchPypi {
14-
inherit pname version;
14+
inherit version;
15+
pname = "Mopidy-Iris";
1516
hash = "sha256-PEAXnapiyxozijR053I7zQYRYLeDOV719L0QbO2r4r4=";
1617
};
1718

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+
];
2729

2830
# no tests implemented
2931
doCheck = false;
3032

33+
pythonImportsCheck = [ "mopidy_iris" ];
34+
3135
meta = with lib; {
3236
homepage = "https://github.com/jaedb/Iris";
3337
description = "Fully-functional Mopidy web client encompassing Spotify and many other backends";

‎pkgs/applications/audio/mopidy/jellyfin.nix‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,27 @@
11
{
22
lib,
3-
python3Packages,
3+
pythonPackages,
44
fetchPypi,
55
mopidy,
66
}:
77

8-
python3Packages.buildPythonApplication rec {
8+
pythonPackages.buildPythonApplication rec {
99
pname = "mopidy-jellyfin";
1010
version = "1.0.6";
11-
format = "setuptools";
11+
pyproject = true;
1212

1313
src = fetchPypi {
1414
inherit version;
1515
pname = "mopidy_jellyfin";
1616
hash = "sha256-IKCPypMuluR0+mMALp8lB1oB1pSw4rN4rOl/eKn+Qvo=";
1717
};
1818

19-
propagatedBuildInputs = [
19+
build-system = [ pythonPackages.setuptools ];
20+
21+
dependencies = [
2022
mopidy
21-
python3Packages.unidecode
22-
python3Packages.websocket-client
23+
pythonPackages.unidecode
24+
pythonPackages.websocket-client
2325
];
2426

2527
# no tests implemented

‎pkgs/applications/audio/mopidy/local.nix‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,36 @@
11
{
22
lib,
33
mopidy,
4-
python3Packages,
4+
pythonPackages,
55
fetchPypi,
66
}:
77

8-
python3Packages.buildPythonApplication rec {
9-
pname = "Mopidy-Local";
8+
pythonPackages.buildPythonApplication rec {
9+
pname = "mopidy-local";
1010
version = "3.3.0";
11-
format = "setuptools";
11+
pyproject = true;
1212

1313
src = fetchPypi {
1414
inherit version;
1515
pname = "mopidy_local";
1616
hash = "sha256-y6btbGk5UiVan178x7d9jq5OTnKMbuliHv0aRxuZK3o=";
1717
};
1818

19-
propagatedBuildInputs = [
19+
build-system = [
20+
pythonPackages.setuptools
21+
];
22+
23+
dependencies = [
2024
mopidy
21-
python3Packages.uritools
25+
pythonPackages.uritools
2226
];
2327

2428
nativeCheckInputs = [
25-
python3Packages.pytestCheckHook
29+
pythonPackages.pytestCheckHook
2630
];
2731

32+
pythonImportsCheck = [ "mopidy_local" ];
33+
2834
meta = with lib; {
2935
homepage = "https://github.com/mopidy/mopidy-local";
3036
description = "Mopidy extension for playing music from your local music archive";

‎pkgs/applications/audio/mopidy/moped.nix‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,28 @@
77
}:
88

99
pythonPackages.buildPythonApplication rec {
10-
pname = "Mopidy-Moped";
10+
pname = "mopidy-moped";
1111
version = "0.7.1";
12-
format = "setuptools";
12+
pyproject = true;
1313

1414
src = fetchPypi {
15-
inherit pname version;
15+
inherit version;
16+
pname = "Mopidy-Moped";
1617
sha256 = "15461174037d87af93dd59a236d4275c5abf71cea0670ffff24a7d0399a8a2e4";
1718
};
1819

1920
LC_ALL = "en_US.UTF-8";
2021
buildInputs = [ glibcLocales ];
21-
propagatedBuildInputs = [ mopidy ];
22+
23+
build-system = [ pythonPackages.setuptools ];
24+
25+
dependencies = [ mopidy ];
2226

2327
# no tests implemented
2428
doCheck = false;
2529

30+
pythonImportsCheck = [ "mopidy_moped" ];
31+
2632
meta = with lib; {
2733
homepage = "https://github.com/martijnboland/moped";
2834
description = "Web client for Mopidy";

‎pkgs/applications/audio/mopidy/mopidy.nix‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
pythonPackages.buildPythonApplication rec {
1515
pname = "mopidy";
1616
version = "3.4.2";
17-
format = "setuptools";
17+
pyproject = true;
1818

1919
src = fetchFromGitHub {
2020
owner = "mopidy";
2121
repo = "mopidy";
22-
rev = "refs/tags/v${version}";
23-
sha256 = "sha256-2OFav2HaQq/RphmZxLyL1n3suwzt1Y/d4h33EdbStjk=";
22+
tag = "v${version}";
23+
hash = "sha256-2OFav2HaQq/RphmZxLyL1n3suwzt1Y/d4h33EdbStjk=";
2424
};
2525

2626
nativeBuildInputs = [ wrapGAppsNoGuiHook ];
@@ -50,25 +50,26 @@ pythonPackages.buildPythonApplication rec {
5050
}
5151
))
5252
]
53-
++ lib.optional (!stdenv.hostPlatform.isDarwin) pipewire;
54-
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-
);
53+
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pipewire ];
6954

7055
propagatedNativeBuildInputs = [ gobject-introspection ];
7156

57+
propagatedBuildInputs = [ gobject-introspection ];
58+
59+
build-system = [ pythonPackages.setuptools ];
60+
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 ];
72+
7273
# There are no tests
7374
doCheck = false;
7475

‎pkgs/applications/audio/mopidy/mopify.nix‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,30 @@
66
}:
77

88
pythonPackages.buildPythonApplication rec {
9-
pname = "Mopidy-Mopify";
9+
pname = "mopidy-mopify";
1010
version = "1.7.3";
11-
format = "setuptools";
11+
pyproject = true;
1212

1313
src = fetchPypi {
14-
inherit pname version;
14+
inherit version;
15+
pname = "Mopidy-Mopify";
1516
hash = "sha256-RlCC+39zC+LeA/QDWPHYx5TrEwOgVrnvcH1Xg12qSLE=";
1617
};
1718

18-
propagatedBuildInputs = with pythonPackages; [
19+
build-system = [
20+
pythonPackages.setuptools
21+
];
22+
23+
dependencies = [
1924
mopidy
20-
configobj
25+
pythonPackages.configobj
2126
];
2227

2328
# no tests implemented
2429
doCheck = false;
2530

31+
pythonImportsCheck = [ "mopidy_mopify" ];
32+
2633
meta = with lib; {
2734
homepage = "https://github.com/dirkgroenen/mopidy-mopify";
2835
description = "Mopidy webclient based on the Spotify webbased interface";

‎pkgs/applications/audio/mopidy/mpd.nix‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
11
{
22
lib,
3-
python3Packages,
3+
pythonPackages,
44
fetchPypi,
55
mopidy,
66
}:
77

8-
python3Packages.buildPythonApplication rec {
9-
pname = "Mopidy-MPD";
8+
pythonPackages.buildPythonApplication rec {
9+
pname = "mopidy-mpd";
1010
version = "3.3.0";
11-
format = "setuptools";
11+
pyproject = true;
1212

1313
src = fetchPypi {
14-
inherit pname version;
14+
inherit version;
15+
pname = "Mopidy-MPD";
1516
hash = "sha256-CeLMRqj9cwBvQrOx7XHVV8MjDjwOosONVlsN2o+vTVM=";
1617
};
1718

18-
propagatedBuildInputs = [ mopidy ];
19+
build-system = [ pythonPackages.setuptools ];
20+
21+
dependencies = [ mopidy ];
1922

2023
# no tests implemented
2124
doCheck = false;

‎pkgs/applications/audio/mopidy/mpris.nix‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,34 @@
11
{
22
lib,
3-
python3Packages,
3+
pythonPackages,
44
fetchPypi,
55
mopidy,
66
}:
77

8-
python3Packages.buildPythonApplication rec {
8+
pythonPackages.buildPythonApplication rec {
99
pname = "mopidy-mpris";
1010
version = "3.0.3";
11-
format = "setuptools";
11+
pyproject = true;
1212

1313
src = fetchPypi {
1414
inherit version;
1515
pname = "Mopidy-MPRIS";
1616
hash = "sha256-rHQgNIyludTEL7RDC8dIpyGTMOt1Tazn6i/orKlSP4U=";
1717
};
1818

19-
propagatedBuildInputs = [
19+
build-system = [
20+
pythonPackages.setuptools
21+
];
22+
23+
dependencies = [
2024
mopidy
21-
python3Packages.pydbus
25+
pythonPackages.pydbus
2226
];
2327

2428
doCheck = false;
2529

30+
pythonImportsCheck = [ "mopidy_mpris" ];
31+
2632
meta = with lib; {
2733
homepage = "https://www.mopidy.com/";
2834
description = "Mopidy extension for controlling Mopidy through D-Bus using the MPRIS specification";

‎pkgs/applications/audio/mopidy/muse.nix‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,19 @@
88
pythonPackages.buildPythonApplication rec {
99
pname = "mopidy-muse";
1010
version = "0.0.33";
11-
format = "setuptools";
11+
pyproject = true;
1212

1313
src = fetchPypi {
1414
inherit version;
1515
pname = "Mopidy-Muse";
1616
hash = "sha256-CEPAPWtMrD+HljyqBB6EAyGVeOjzkvVoEywlE4XEJGs=";
1717
};
1818

19-
propagatedBuildInputs = [
19+
build-system = [
20+
pythonPackages.setuptools
21+
];
22+
23+
dependencies = [
2024
mopidy
2125
pythonPackages.pykka
2226
];

0 commit comments

Comments
 (0)