From 074f343a708bb1c910aefeba60fbe9cc1a8e97f6 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 8 Oct 2024 22:41:48 -0300 Subject: [PATCH 01/10] mpc-cli: hide inputs --- pkgs/applications/audio/mpc/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index c58c6831edf46..4b5403df4ae4e 100644 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -8,7 +8,7 @@ , meson , ninja , pkg-config -, sphinx +, python3Packages }: stdenv.mkDerivation rec { @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - sphinx + python3Packages.sphinx ]; postInstall = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e3afeaa345de..9984e79ba4d73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31060,9 +31060,7 @@ with pkgs; withConplay = false; }; - mpc-cli = callPackage ../applications/audio/mpc { - inherit (python3Packages) sphinx; - }; + mpc-cli = callPackage ../applications/audio/mpc { }; clerk = callPackage ../applications/audio/clerk { }; From 86792c11f828d9e8bb159f1b91b704766ab80840 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 14 Oct 2024 20:31:26 -0300 Subject: [PATCH 02/10] mpc: migrate to by-name And green-alias mpc-cli. --- .../audio/mpc/default.nix => by-name/mp/mpc/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{applications/audio/mpc/default.nix => by-name/mp/mpc/package.nix} (100%) diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/by-name/mp/mpc/package.nix similarity index 100% rename from pkgs/applications/audio/mpc/default.nix rename to pkgs/by-name/mp/mpc/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9984e79ba4d73..8e783a6254b27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31060,7 +31060,7 @@ with pkgs; withConplay = false; }; - mpc-cli = callPackage ../applications/audio/mpc { }; + mpc-cli = mpc; # green-alias added 2024-10-14 clerk = callPackage ../applications/audio/clerk { }; From a0745023d82e408ef77ec0327c2dd38e58f48613 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 8 Oct 2024 22:59:10 -0300 Subject: [PATCH 03/10] mpc: refactor - finalAttrs --- pkgs/by-name/mp/mpc/package.nix | 44 ++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/mp/mpc/package.nix b/pkgs/by-name/mp/mpc/package.nix index 4b5403df4ae4e..6a4a748b8138f 100644 --- a/pkgs/by-name/mp/mpc/package.nix +++ b/pkgs/by-name/mp/mpc/package.nix @@ -1,24 +1,25 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, installShellFiles -, libiconv -, libmpdclient -, meson -, ninja -, pkg-config -, python3Packages +{ + lib, + fetchFromGitHub, + fetchpatch, + installShellFiles, + libiconv, + libmpdclient, + meson, + ninja, + pkg-config, + python3Packages, + stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mpc"; version = "0.34"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; - repo = pname; - rev = "v${version}"; + repo = "mpc"; + rev = "v${finalAttrs.version}"; hash = "sha256-2FjYBfak0IjibuU+CNQ0y9Ei8hTZhynS/BK2DNerhVw="; }; @@ -32,8 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ libmpdclient - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; nativeBuildInputs = [ installShellFiles @@ -51,13 +51,13 @@ stdenv.mkDerivation rec { rm $out/share/doc/mpc/contrib/mpc-completion.bash ''; - meta = with lib; { + meta = { homepage = "https://www.musicpd.org/clients/mpc/"; description = "Minimalist command line interface to MPD"; - changelog = "https://raw.githubusercontent.com/MusicPlayerDaemon/mpc/v${version}/NEWS"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; + changelog = "https://raw.githubusercontent.com/MusicPlayerDaemon/mpc/refs/heads/master/NEWS"; + license = lib.licenses.gpl2Plus; mainProgram = "mpc"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) From c7ecc6569561bb80ae92973f296347a69da8639e Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 8 Oct 2024 23:04:37 -0300 Subject: [PATCH 04/10] mpc: 0.34 -> 0.35 --- pkgs/by-name/mp/mpc/package.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/mp/mpc/package.nix b/pkgs/by-name/mp/mpc/package.nix index 6a4a748b8138f..2d19761231670 100644 --- a/pkgs/by-name/mp/mpc/package.nix +++ b/pkgs/by-name/mp/mpc/package.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - fetchpatch, installShellFiles, libiconv, libmpdclient, @@ -14,23 +13,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "mpc"; - version = "0.34"; + version = "0.35"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "mpc"; rev = "v${finalAttrs.version}"; - hash = "sha256-2FjYBfak0IjibuU+CNQ0y9Ei8hTZhynS/BK2DNerhVw="; + hash = "sha256-oVdnj3nsYvOHcIOgoamLamriuWu9lucWUQtxVmXZabs="; }; - patches = [ - # fix the build with meson 0.60 (https://github.com/MusicPlayerDaemon/mpc/pull/76) - (fetchpatch { - url = "https://github.com/MusicPlayerDaemon/mpc/commit/b656ca4b6c2a0d5b6cebd7f7daa679352f664e0e.patch"; - sha256 = "sha256-fjjSlCKxgkz7Em08CaK7+JAzl8YTzLcpGGMz2HJlsVw="; - }) - ]; - buildInputs = [ libmpdclient ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; From ef4ca5eab442e5ee51fc7747db4f93ab1ce50170 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 16 Oct 2024 21:34:54 -0300 Subject: [PATCH 05/10] clerk: update and format --- pkgs/applications/audio/clerk/default.nix | 101 +++++++++++++--------- 1 file changed, 61 insertions(+), 40 deletions(-) diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix index f77b03daac786..0ccce9c4e0c29 100644 --- a/pkgs/applications/audio/clerk/default.nix +++ b/pkgs/applications/audio/clerk/default.nix @@ -1,20 +1,22 @@ -{ lib -, stdenv -, fetchFromGitHub -, makeWrapper -, rofi -, tmux -, fzf -, mpc-cli -, perl -, util-linux -, libnotify -, perlPackages +{ + lib, + fetchFromGitHub, + fzf, + installShellFiles, + libnotify, + makeWrapper, + mpc, + perlPackages, + rofi, + stdenv, + tmux, + unstableGitUpdater, + util-linux, }: stdenv.mkDerivation { pname = "clerk"; - version = "unstable-2023-10-07"; + version = "0-unstable-2023-10-07"; src = fetchFromGitHub { owner = "carnager"; @@ -23,12 +25,10 @@ stdenv.mkDerivation { hash = "sha256-V2nDLq2ViC5Twve0EILBEYOdEavqgYB/TQq/T+ftfmk="; }; - postPatch = '' - substituteInPlace clerk_rating_client.service \ - --replace "/usr" "$out" - ''; - - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + installShellFiles + makeWrapper + ]; buildInputs = with perlPackages; [ perl @@ -47,36 +47,57 @@ stdenv.mkDerivation { strictDeps = true; + postPatch = '' + substituteInPlace clerk_rating_client.service \ + --replace "/usr" "$out" + ''; + installPhase = '' runHook preInstall - install -D clerk.pl $out/bin/clerk - install -D clerk_rating_client $out/bin/clerk_rating_client + mv clerk.pl clerk + installBin clerk clerk_rating_client install -D clerk_rating_client.service $out/lib/systemd/user/clerk_rating_client.service + runHook postInstall ''; - postFixup = let - binPath = lib.makeBinPath [ - libnotify - mpc-cli - rofi - tmux - fzf - util-linux - ]; - in - '' - wrapProgram $out/bin/clerk --set PERL5LIB $PERL5LIB --prefix PATH : "${binPath}" - wrapProgram $out/bin/clerk_rating_client --set PERL5LIB $PERL5LIB --prefix PATH : "${binPath}" - ''; + postFixup = + let + binPath = lib.makeBinPath [ + fzf + libnotify + mpc + rofi + tmux + util-linux + ]; + in + '' + pushd $out/bin + for f in clerk clerk_rating_client; do + wrapProgram $f \ + --prefix PATH : "${binPath}" \ + --set PERL5LIB $PERL5LIB + done + popd + ''; - meta = with lib; { - description = "MPD client based on rofi/fzf"; + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/carnager/clerk.git"; + hardcodeZeroVersion = true; + }; + + meta = { homepage = "https://github.com/carnager/clerk"; - license = licenses.mit; - maintainers = with maintainers; [ anderspapitto rewine ]; + description = "MPD client based on rofi/fzf"; + license = lib.licenses.mit; mainProgram = "clerk"; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ + anderspapitto + rewine + AndersonTorres + ]; + platforms = lib.platforms.linux; }; } From df9afd2553740dbb23b5f14c377d0f7dd4cb134a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 16 Oct 2024 21:37:22 -0300 Subject: [PATCH 06/10] clerk: migrate to by-name --- .../audio/clerk/default.nix => by-name/cl/clerk/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/audio/clerk/default.nix => by-name/cl/clerk/package.nix} (100%) diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/by-name/cl/clerk/package.nix similarity index 100% rename from pkgs/applications/audio/clerk/default.nix rename to pkgs/by-name/cl/clerk/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e783a6254b27..8c6dd3e8501bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31062,8 +31062,6 @@ with pkgs; mpc-cli = mpc; # green-alias added 2024-10-14 - clerk = callPackage ../applications/audio/clerk { }; - nbstripout = callPackage ../applications/version-management/nbstripout { }; ncmpc = callPackage ../applications/audio/ncmpc { }; From a6c3e5e17696956298b5872af26b572f77cedcfe Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 16 Oct 2024 20:56:28 -0300 Subject: [PATCH 07/10] nixos/triggerhappy: update and format mpc-cli is now mpc --- .../services/hardware/triggerhappy.nix | 98 ++++++++++++------- 1 file changed, 62 insertions(+), 36 deletions(-) diff --git a/nixos/modules/services/hardware/triggerhappy.nix b/nixos/modules/services/hardware/triggerhappy.nix index d2137971b3a79..a9bcf250cf69a 100644 --- a/nixos/modules/services/hardware/triggerhappy.nix +++ b/nixos/modules/services/hardware/triggerhappy.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.services.triggerhappy; @@ -6,35 +11,53 @@ let socket = "/run/thd.socket"; configFile = pkgs.writeText "triggerhappy.conf" '' - ${lib.concatMapStringsSep "\n" - ({ keys, event, cmd, ... }: - ''${lib.concatMapStringsSep "+" (x: "KEY_" + x) keys} ${toString { press = 1; hold = 2; release = 0; }.${event}} ${cmd}'' - ) - cfg.bindings} + ${lib.concatMapStringsSep "\n" ( + { + keys, + event, + cmd, + ... + }: + ''${lib.concatMapStringsSep "+" (x: "KEY_" + x) keys} ${ + toString + { + press = 1; + hold = 2; + release = 0; + } + .${event} + } ${cmd}'' + ) cfg.bindings} ${cfg.extraConfig} ''; - bindingCfg = { ... }: { - options = { - - keys = lib.mkOption { - type = lib.types.listOf lib.types.str; - description = "List of keys to match. Key names as defined in linux/input-event-codes.h"; - }; - - event = lib.mkOption { - type = lib.types.enum ["press" "hold" "release"]; - default = "press"; - description = "Event to match."; - }; + bindingCfg = + { ... }: + { + options = { + + keys = lib.mkOption { + type = lib.types.listOf lib.types.str; + description = "List of keys to match. Key names as defined in linux/input-event-codes.h"; + }; + + event = lib.mkOption { + type = lib.types.enum [ + "press" + "hold" + "release" + ]; + default = "press"; + description = "Event to match."; + }; + + cmd = lib.mkOption { + type = lib.types.str; + description = "What to run."; + }; - cmd = lib.mkOption { - type = lib.types.str; - description = "What to run."; }; - }; - }; in @@ -65,9 +88,9 @@ in bindings = lib.mkOption { type = lib.types.listOf (lib.types.submodule bindingCfg); - default = []; + default = [ ]; example = lib.literalExpression '' - [ { keys = ["PLAYPAUSE"]; cmd = "''${pkgs.mpc-cli}/bin/mpc -q toggle"; } ] + [ { keys = ["PLAYPAUSE"]; cmd = "''${lib.getExe pkgs.mpc} -q toggle"; } ] ''; description = '' Key bindings for {command}`triggerhappy`. @@ -86,7 +109,6 @@ in }; - ###### implementation config = lib.mkIf cfg.enable { @@ -101,18 +123,22 @@ in wantedBy = [ "multi-user.target" ]; description = "Global hotkey daemon"; serviceConfig = { - ExecStart = "${pkgs.triggerhappy}/bin/thd ${lib.optionalString (cfg.user != "root") "--user ${cfg.user}"} --socket ${socket} --triggers ${configFile} --deviceglob /dev/input/event*"; + ExecStart = "${pkgs.triggerhappy}/bin/thd ${ + lib.optionalString (cfg.user != "root") "--user ${cfg.user}" + } --socket ${socket} --triggers ${configFile} --deviceglob /dev/input/event*"; }; }; - services.udev.packages = lib.singleton (pkgs.writeTextFile { - name = "triggerhappy-udev-rules"; - destination = "/etc/udev/rules.d/61-triggerhappy.rules"; - text = '' - ACTION=="add", SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{name}!="triggerhappy", \ - RUN+="${pkgs.triggerhappy}/bin/th-cmd --socket ${socket} --passfd --udev" - ''; - }); + services.udev.packages = lib.singleton ( + pkgs.writeTextFile { + name = "triggerhappy-udev-rules"; + destination = "/etc/udev/rules.d/61-triggerhappy.rules"; + text = '' + ACTION=="add", SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{name}!="triggerhappy", \ + RUN+="${pkgs.triggerhappy}/bin/th-cmd --socket ${socket} --passfd --udev" + ''; + } + ); }; From 046db98f7d9f1fac1117387be6cf5c6e52c700b0 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 16 Oct 2024 21:28:57 -0300 Subject: [PATCH 08/10] nixos/tests/mpd: update and format mpc-cli is now mpc --- nixos/tests/mpd.nix | 127 +++++++++++++++++++++++++------------------- 1 file changed, 72 insertions(+), 55 deletions(-) diff --git a/nixos/tests/mpd.nix b/nixos/tests/mpd.nix index 0772c05d12ac4..45063e168cbea 100644 --- a/nixos/tests/mpd.nix +++ b/nixos/tests/mpd.nix @@ -1,12 +1,13 @@ -import ./make-test-python.nix ({ pkgs, lib, ... }: +import ./make-test-python.nix ( + { pkgs, lib, ... }: let track = pkgs.fetchurl { # Sourced from http://freemusicarchive.org/music/Blue_Wave_Theory/Surf_Music_Month_Challenge/Skyhawk_Beach_fade_in - # License: http://creativecommons.org/licenses/by-sa/4.0/ name = "Blue_Wave_Theory-Skyhawk_Beach.mp3"; url = "https://freemusicarchive.org/file/music/ccCommunity/Blue_Wave_Theory/Surf_Music_Month_Challenge/Blue_Wave_Theory_-_04_-_Skyhawk_Beach.mp3"; - sha256 = "0xw417bxkx4gqqy139bb21yldi37xx8xjfxrwaqa0gyw19dl6mgp"; + hash = "sha256-91VDWwrcP6Cw4rk72VHvZ8RGfRBrpRE8xo/02dcJhHc="; + meta.license = lib.licenses.cc-by-nc-sa-40; }; defaultCfg = rec { @@ -16,42 +17,56 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: musicDirectory = "${dataDir}/music"; }; - defaultMpdCfg = with defaultCfg; { - inherit dataDir musicDirectory user group; + defaultMpdCfg = { + inherit (defaultCfg) + dataDir + musicDirectory + user + group + ; enable = true; }; - musicService = { user, group, musicDirectory }: { - description = "Sets up the music file(s) for MPD to use."; - requires = [ "mpd.service" ]; - after = [ "mpd.service" ]; - wantedBy = [ "default.target" ]; - script = '' - cp ${track} ${musicDirectory} - ''; - serviceConfig = { - User = user; - Group = group; + musicService = + { + user, + group, + musicDirectory, + }: + { + description = "Sets up the music file(s) for MPD to use."; + requires = [ "mpd.service" ]; + after = [ "mpd.service" ]; + wantedBy = [ "default.target" ]; + script = '' + cp ${track} ${musicDirectory} + ''; + serviceConfig = { + User = user; + Group = group; + }; }; - }; - mkServer = { mpd, musicService, }: - { boot.kernelModules = [ "snd-dummy" ]; + mkServer = + { mpd, musicService }: + { + boot.kernelModules = [ "snd-dummy" ]; services.mpd = mpd; systemd.services.musicService = musicService; }; - in { + in + { name = "mpd"; - meta = with pkgs.lib.maintainers; { - maintainers = [ emmanuelrosa ]; + meta = { + maintainers = with lib.maintainers; [ emmanuelrosa ]; }; - nodes = - { client = - { ... }: { }; + nodes = { + client = { ... }: { }; serverALSA = - { ... }: lib.mkMerge [ + { ... }: + lib.mkMerge [ (mkServer { mpd = defaultMpdCfg // { network.listenAddress = "any"; @@ -63,13 +78,14 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: } ''; }; - musicService = with defaultMpdCfg; musicService { inherit user group musicDirectory; }; + musicService = musicService { inherit (defaultMpdCfg) user group musicDirectory; }; }) { networking.firewall.allowedTCPPorts = [ 6600 ]; } ]; serverPulseAudio = - { ... }: lib.mkMerge [ + { ... }: + lib.mkMerge [ (mkServer { mpd = defaultMpdCfg // { extraConfig = '' @@ -80,7 +96,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: ''; }; - musicService = with defaultCfg; musicService { inherit user group musicDirectory; }; + musicService = musicService { inherit (defaultMpdCfg) user group musicDirectory; }; }) { hardware.pulseaudio = { @@ -94,40 +110,41 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: ]; }; - testScript = '' - mpc = "${pkgs.mpc-cli}/bin/mpc --wait" + testScript = '' + mpc = "${lib.getExe pkgs.mpc} --wait" - # Connects to the given server and attempts to play a tune. - def play_some_music(server): - server.wait_for_unit("mpd.service") - server.succeed(f"{mpc} update") - _, tracks = server.execute(f"{mpc} ls") + # Connects to the given server and attempts to play a tune. + def play_some_music(server): + server.wait_for_unit("mpd.service") + server.succeed(f"{mpc} update") + _, tracks = server.execute(f"{mpc} ls") - for track in tracks.splitlines(): - server.succeed(f"{mpc} add {track}") + for track in tracks.splitlines(): + server.succeed(f"{mpc} add {track}") - _, added_tracks = server.execute(f"{mpc} playlist") + _, added_tracks = server.execute(f"{mpc} playlist") - # Check we succeeded adding audio tracks to the playlist - assert len(added_tracks.splitlines()) > 0 + # Check we succeeded adding audio tracks to the playlist + assert len(added_tracks.splitlines()) > 0 - server.succeed(f"{mpc} play") + server.succeed(f"{mpc} play") - _, output = server.execute(f"{mpc} status") - # Assure audio track is playing - assert "playing" in output + _, output = server.execute(f"{mpc} status") + # Assure audio track is playing + assert "playing" in output - server.succeed(f"{mpc} stop") + server.succeed(f"{mpc} stop") - play_some_music(serverALSA) - play_some_music(serverPulseAudio) + play_some_music(serverALSA) + play_some_music(serverPulseAudio) - client.wait_for_unit("multi-user.target") - client.succeed(f"{mpc} -h serverALSA status") + client.wait_for_unit("multi-user.target") + client.succeed(f"{mpc} -h serverALSA status") - # The PulseAudio-based server is configured not to accept external client connections - # to perform the following test: - client.fail(f"{mpc} -h serverPulseAudio status") - ''; -}) + # The PulseAudio-based server is configured not to accept external client connections + # to perform the following test: + client.fail(f"{mpc} -h serverPulseAudio status") + ''; + } +) From e0d400328294bea901a23fc8be202bf150b61a6c Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 16 Oct 2024 21:39:50 -0300 Subject: [PATCH 09/10] bumblebee-status: update plugins mpc-cli is now mpc --- .../window-managers/i3/bumblebee-status/plugins.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix b/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix index 5810070d2ff43..d5567ce15e8f1 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 ]; From 27554898deeae5c1295ed5acc28d5db39fa2bc9d Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 16 Oct 2024 21:40:44 -0300 Subject: [PATCH 10/10] mpc-cli: migrate to aliases --- pkgs/top-level/aliases.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 16bc4f0594750..4053beac1ac2a 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 8c6dd3e8501bc..90823d7d263a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31060,8 +31060,6 @@ with pkgs; withConplay = false; }; - mpc-cli = mpc; # green-alias added 2024-10-14 - nbstripout = callPackage ../applications/version-management/nbstripout { }; ncmpc = callPackage ../applications/audio/ncmpc { };