mpc: 0.34 -> 0.35

[AndersonTorres]

Things done

• Built on platform(s)
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
  • sandbox = relaxed
  • sandbox = true
• Tested, as applicable:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
• Tested basic functionality of all binary files (usually in ./result/bin/)
• 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
  • (Package updates) Added a release notes entry if the change is major or breaking
  • (Module updates) Added a release notes entry if the change is significant
  • (Module addition) Added a release notes entry if adding a new NixOS module
• Fits CONTRIBUTING.md.

---

Add a 👍 reaction to pull requests you find important.

[nixos-discourse]

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/4672

[Scrumplex]

Some derivations still reference mpc-cli. Those should be updated so that Nixpkgs can evaluate with aliases disabled.

$ rg --files-with-matches mpc-cli
nixos/tests/mpd.nix
nixos/modules/services/hardware/triggerhappy.nix
pkgs/top-level/aliases.nix
pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix
pkgs/applications/audio/clerk/default.nix

[AndersonTorres]

I will revert the aliasing.

[Scrumplex]

Git diff to use aliases.nix and fix the remaining dependents:

diff --git a/nixos/modules/services/hardware/triggerhappy.nix b/nixos/modules/services/hardware/triggerhappy.nix
index d2137971b3a7..26dec0a29c66 100644
--- a/nixos/modules/services/hardware/triggerhappy.nix
+++ b/nixos/modules/services/hardware/triggerhappy.nix
@@ -67,7 +67,7 @@ in
         type = lib.types.listOf (lib.types.submodule bindingCfg);
         default = [];
         example = lib.literalExpression ''
-          [ { keys = ["PLAYPAUSE"];  cmd = "''${pkgs.mpc-cli}/bin/mpc -q toggle"; } ]
+          [ { keys = ["PLAYPAUSE"];  cmd = "''${pkgs.mpc}/bin/mpc -q toggle"; } ]
         '';
         description = ''
           Key bindings for {command}`triggerhappy`.
diff --git a/nixos/tests/mpd.nix b/nixos/tests/mpd.nix
index 0772c05d12ac..8e3ea867bfaa 100644
--- a/nixos/tests/mpd.nix
+++ b/nixos/tests/mpd.nix
@@ -95,7 +95,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
     };
 
   testScript = ''
-    mpc = "${pkgs.mpc-cli}/bin/mpc --wait"
+    mpc = "${pkgs.mpc}/bin/mpc --wait"
 
     # Connects to the given server and attempts to play a tune.
     def play_some_music(server):
diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix
index f77b03daac78..4eebd96f516a 100644
--- a/pkgs/applications/audio/clerk/default.nix
+++ b/pkgs/applications/audio/clerk/default.nix
@@ -5,7 +5,7 @@
 , rofi
 , tmux
 , fzf
-, mpc-cli
+, mpc
 , perl
 , util-linux
 , libnotify
@@ -59,7 +59,7 @@ stdenv.mkDerivation {
   postFixup = let
     binPath = lib.makeBinPath [
       libnotify
-      mpc-cli
+      mpc
       rofi
       tmux
       fzf
diff --git a/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix b/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix
index 5810070d2ff4..d5567ce15e8f 100644
--- a/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix
+++ b/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix
@@ -89,7 +89,7 @@ in
   memory.propagatedBuildInputs = [ pkgs.gnome-system-monitor ];
   messagereceiver = { };
   mocp.propagatedBuildInputs = [ pkgs.moc ];
-  mpd.propagatedBuildInputs = [ pkgs.mpc-cli ];
+  mpd.propagatedBuildInputs = [ pkgs.mpc ];
   network.propagatedBuildInputs = [ py.netifaces pkgs.iw ];
   network_traffic.propagatedBuildInputs = [ py.netifaces ];
   nic.propagatedBuildInputs = [ py.netifaces pkgs.iw ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 087dab080f6b..31d1561f294f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1072,7 +1072,8 @@ mapAliases {
   mozart-binary = throw "'mozart-binary' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2023-09-10
   mozart = throw "'mozart' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2023-09-10
   mp3info = throw "'mp3info' has been removed due to lack of maintenance upstream. Consider using 'eartag' or 'tagger' instead"; # Added 2024-09-14
-  mpc_cli = mpc-cli; # moved from top-level 2022-01-24
+  mpc-cli = mpc; # Added 2024-10-14
+  mpc_cli = mpc; # moved from top-level 2022-01-24
   mpd_clientlib = libmpdclient; # Added 2021-02-11
   mpdevil = plattenalbum; # Added 2024-05-22
   mpg321 = throw "'mpg321' has been removed due to it being unmaintained by upstream. Consider using mpg123 instead."; # Added 2024-05-10
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9deb23803ee4..16a7d86ae54a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31077,8 +31077,6 @@ with pkgs;
     withConplay = false;
   };
 
-  mpc-cli = mpc; # green-alias added 2024-10-14
-
   clerk = callPackage ../applications/audio/clerk { };
 
   nbstripout = callPackage ../applications/version-management/nbstripout { };

[AndersonTorres]

OK, let's edit this.

Converting to draft.

[Scrumplex]

Changes LGTM