mopidy-local: init at 3.1.1 #93400

ruuda · 2020-07-18T10:03:20Z

Motivation for this change

Mopidy-Local is the successor to Mopidy-Local-SQLite and
Mopidy-Local-Images, which are both already packaged.

Things done

I had to make gobject-introspection a propagated build input, otherwise Mopidy imported by Mopidy-Local could not import Gst.

Tested by building the following:

buildEnv {
  name = "mopidy-with-extensions-${mopidy.version}";
  paths = lib.closePropagation [
    pkgs.mopidy-iris
    pkgs.mopidy-local
  ];
  pathsToLink = [ "/${mopidyPackages.python.sitePackages}" ];
  buildInputs = [ makeWrapper ];
  postBuild = ''
    makeWrapper ${mopidy}/bin/mopidy $out/bin/mopidy \
      --prefix PYTHONPATH : $out/${mopidyPackages.python.sitePackages}
  '';
}

The bin/mopidy in there has a mopidy local scan command that successfully scanned my local collection.

ruuda · 2020-07-18T11:15:33Z

CC @rvolosatovs, who is the maintainer of the mopidy-local-* packages.

rvolosatovs

LGTM
Can we remove the other two as well then? I added them initially as a dependency to mopidy-iris, which does not need them anymore apparently.

ruuda · 2020-07-19T19:06:01Z

Can we remove the other two as well then? I added them initially as a dependency to mopidy-iris, which does not need them anymore apparently.

Mopidy-Iris does not need them, it works with the newer Mopidy-Local now. I added a commit to delete the older packages. The only thing I wonder, should this be recorded in a changelog somewhere? I can imagine people have these older plugins in their config, and that will break when upgrading.

mweinelt

Thanks for taking care of this. I've added a few remarks, nothing major.

We should convert the whole mopidy-shebang to python3 shortly, not necessarily in this pr.

mweinelt · 2020-10-18T00:58:28Z

pkgs/applications/audio/mopidy/local.nix

+  checkInputs = [
+    python3Packages.pytest
+  ];


I think its preferable to use pytestCheckHook over pytest.

mweinelt · 2020-10-18T01:02:27Z

pkgs/top-level/all-packages.nix

@@ -21224,8 +21224,7 @@ in
    mopidy
    mopidy-gmusic
    mopidy-iris
-    mopidy-local-images
-    mopidy-local-sqlite


Let's add throw aliases to aliases.nix explaining the removal and migration steps.

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3e9cdc8e87e..634ecc3af0e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -301,6 +301,8 @@ mapAliases ({ mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # added 2020-05-23 mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 mirage = throw "mirage has been femoved from nixpkgs, as it's unmaintained"; # added 2019-12-10 + mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18 + mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18 mysql-client = hiPrio mariadb.client; memtest86 = memtest86plus; # added 2019-05-08 mesa_noglu = mesa; # added 2019-05-28

Ah, so this is how to deal with removing packages, thanks for pointing that out!

mweinelt · 2020-10-18T01:05:10Z

pkgs/applications/audio/mopidy/local.nix

@@ -0,0 +1,30 @@
+{ stdenv


Suggested change

{ stdenv

{ lib

mweinelt · 2020-10-18T01:05:18Z

pkgs/applications/audio/mopidy/local.nix

+    python3Packages.pytest
+  ];
+
+  meta = with stdenv.lib; {


Suggested change

meta = with stdenv.lib; {

meta = with lib; {

mweinelt · 2020-10-18T01:05:31Z

pkgs/applications/audio/mopidy/local.nix

+    homepage = "https://github.com/mopidy/mopidy-local";
+    description = "Mopidy extension for playing music from your local music archive";
+    license = licenses.asl20;
+    maintainers = [ maintainers.ruuda ];


Suggested change

maintainers = [ maintainers.ruuda ];

maintainers = with maintainers; [ ruuda ];

mweinelt · 2020-10-18T01:07:57Z

pkgs/applications/audio/mopidy/mopidy.nix

+  ] ++ (
+    with pythonPackages; [


Suggested change

] ++ (

with pythonPackages; [

] ++ (with pythonPackages; [

ruuda · 2020-10-18T12:33:30Z

Thanks for having a look @mweinelt. I addressed your comments and also rebased this PR on top of the latest master.

mweinelt · 2020-10-18T12:55:56Z

Do you have experience on how these plugins interact with each other? I see we mix and match python2 and python3 there.

mweinelt · 2020-10-18T16:31:07Z

20b2e8e

This commit should be split in two (local-images and local-sqlite) and use the format described in CONTRIBUTING.md, e.g.

mopidy-local-images: remove

The what and why here

Mopidy-Local is the successor to Mopidy-Local-SQLite and Mopidy-Local-Images, which are already packaged. I had to make gobject-introspection a propagated build input, otherwise Mopidy-Local can't import Mopidy.

This plugin has been merged into the newer "mopidy-local" plugin which I just added. "mopidy-local-images" and "mopidy-local-sqlite" were added originally for Mopidy Iris, but Iris now works with mopidy-local, and does not need the older plugins any more.

This plugin has been merged into the newer "mopidy-local" plugin which I just added. "mopidy-local-images" and "mopidy-local-sqlite" were added originally for Mopidy Iris, but Iris now works with mopidy-local, and does not need the older ones any more.

ruuda · 2020-10-18T18:12:11Z

Do you have experience on how these plugins interact with each other? I see we mix and match python2 and python3 there.

I don’t think we do, the packages reference pythonPackages, but that is set here:

nixpkgs/pkgs/applications/audio/mopidy/default.nix

Line 11 in 396f340

pythonPackages = python.pkgs;

And the Python there is set to python3 here:

nixpkgs/pkgs/top-level/all-packages.nix

Lines 22111 to 22113 in 396f340

    
           mopidyPackages = callPackages ../applications/audio/mopidy/default.nix { 
        
             python = python3; 
        
           };

So it’s all running with Python 3.

This commit should be split in two (local-images and local-sqlite)

Done.

mweinelt · 2020-10-18T18:19:22Z

Result of nixpkgs-review pr 93400 1

15 packages built:

mopidy
mopidy-gmusic
mopidy-iris
mopidy-local
mopidy-moped
mopidy-mopify
mopidy-mpd
mopidy-mpris
mopidy-musicbox-webclient
mopidy-somafm
mopidy-soundcloud
mopidy-spotify
mopidy-spotify-tunigo
mopidy-tunein
mopidy-youtube

mweinelt · 2020-10-18T18:31:13Z

As the mopidy-local-{sqlite,images} packages are broken on 20.09 I think this is worth backporting to release-20.09.

ofborg bot added 8.has: package (new) 11.by: package-maintainer 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 labels Jul 18, 2020

ruuda requested a review from fpletz July 18, 2020 11:12

rvolosatovs approved these changes Jul 19, 2020

View reviewed changes

ofborg bot added 8.has: clean-up 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 and removed 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 labels Jul 19, 2020

ryantm added 2.status: merge conflict and removed 2.status: merge conflict labels Oct 3, 2020

mweinelt requested changes Oct 18, 2020

View reviewed changes

ruuda force-pushed the mopidy-local branch from 4e56261 to 20b2e8e Compare October 18, 2020 12:32

ofborg bot removed the 2.status: merge conflict label Oct 18, 2020

ofborg bot added 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 and removed 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Oct 18, 2020

ruuda added 2 commits October 18, 2020 19:31

mopidy-local: init at 3.1.1

7565d00

Mopidy-Local is the successor to Mopidy-Local-SQLite and Mopidy-Local-Images, which are already packaged. I had to make gobject-introspection a propagated build input, otherwise Mopidy-Local can't import Mopidy.

mopidy-local-images: remove

79a823c

This plugin has been merged into the newer "mopidy-local" plugin which I just added. "mopidy-local-images" and "mopidy-local-sqlite" were added originally for Mopidy Iris, but Iris now works with mopidy-local, and does not need the older plugins any more.

mopidy-local-sqlite: remove

b82ca4d

This plugin has been merged into the newer "mopidy-local" plugin which I just added. "mopidy-local-images" and "mopidy-local-sqlite" were added originally for Mopidy Iris, but Iris now works with mopidy-local, and does not need the older ones any more.

ruuda force-pushed the mopidy-local branch from 20b2e8e to b82ca4d Compare October 18, 2020 18:12

mweinelt approved these changes Oct 18, 2020

View reviewed changes

mweinelt merged commit c3054b7 into NixOS:master Oct 18, 2020

mweinelt added the 9.needs: port to stable A PR needs a backport to the stable release. label Oct 18, 2020

ruuda mentioned this pull request Oct 20, 2020

[20.09] mopidy-local: init at 3.1.1 #101197

Merged

10 tasks

ruuda deleted the mopidy-local branch October 6, 2022 20:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

mopidy-local: init at 3.1.1 #93400

mopidy-local: init at 3.1.1 #93400

ruuda commented Jul 18, 2020

ruuda commented Jul 18, 2020

rvolosatovs left a comment

ruuda commented Jul 19, 2020

mweinelt left a comment •

edited

mweinelt Oct 18, 2020

mweinelt Oct 18, 2020

ruuda Oct 18, 2020

mweinelt Oct 18, 2020

mweinelt Oct 18, 2020

mweinelt Oct 18, 2020

mweinelt Oct 18, 2020

ruuda commented Oct 18, 2020

mweinelt commented Oct 18, 2020

mweinelt commented Oct 18, 2020

ruuda commented Oct 18, 2020

mweinelt commented Oct 18, 2020

mweinelt commented Oct 18, 2020

	maintainers = [ maintainers.ruuda ];
	maintainers = with maintainers; [ ruuda ];

mopidy-local: init at 3.1.1 #93400

mopidy-local: init at 3.1.1 #93400

Conversation

ruuda commented Jul 18, 2020

Motivation for this change

Things done

ruuda commented Jul 18, 2020

rvolosatovs left a comment

Choose a reason for hiding this comment

ruuda commented Jul 19, 2020

mweinelt left a comment • edited

Choose a reason for hiding this comment

mweinelt Oct 18, 2020

Choose a reason for hiding this comment

mweinelt Oct 18, 2020

Choose a reason for hiding this comment

ruuda Oct 18, 2020

Choose a reason for hiding this comment

mweinelt Oct 18, 2020

Choose a reason for hiding this comment

mweinelt Oct 18, 2020

Choose a reason for hiding this comment

mweinelt Oct 18, 2020

Choose a reason for hiding this comment

mweinelt Oct 18, 2020

Choose a reason for hiding this comment

ruuda commented Oct 18, 2020

mweinelt commented Oct 18, 2020

mweinelt commented Oct 18, 2020

ruuda commented Oct 18, 2020

mweinelt commented Oct 18, 2020

mweinelt commented Oct 18, 2020

mweinelt left a comment •

edited