From 1d5377fffd39a0851fd5ef9de212669a24099d97 Mon Sep 17 00:00:00 2001 From: ocfox Date: Fri, 6 Sep 2024 13:03:40 +0800 Subject: [PATCH 1/3] music-player: migrate to by-name --- .../default.nix => by-name/mu/music-player/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/audio/music-player/default.nix => by-name/mu/music-player/package.nix} (100%) diff --git a/pkgs/applications/audio/music-player/default.nix b/pkgs/by-name/mu/music-player/package.nix similarity index 100% rename from pkgs/applications/audio/music-player/default.nix rename to pkgs/by-name/mu/music-player/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e69ca4d78f5b..e3d4bc99d2f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32000,8 +32000,6 @@ with pkgs; musescore = qt6.callPackage ../applications/audio/musescore { }; - music-player = callPackage ../applications/audio/music-player { }; - mmh = callPackage ../applications/networking/mailreaders/mmh { }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; From 1af6eaf93c0b0e78e16e13d8823e3c00f4af93e5 Mon Sep 17 00:00:00 2001 From: ocfox Date: Fri, 6 Sep 2024 21:33:17 +0800 Subject: [PATCH 2/3] music-player: 0.2.0-alpha.14 -> unstable-2024-08-24 update to 0.2.0-alpha.14-unstable-2024-08-24 to fix build --- pkgs/by-name/mu/music-player/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mu/music-player/package.nix b/pkgs/by-name/mu/music-player/package.nix index 137c46343775..7cde9694f8fd 100644 --- a/pkgs/by-name/mu/music-player/package.nix +++ b/pkgs/by-name/mu/music-player/package.nix @@ -10,16 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "music-player"; - version = "0.2.0-alpha.14"; + version = "0.2.0-alpha.14-unstable-2024-08-24"; src = fetchFromGitHub { owner = "tsirysndr"; repo = "music-player"; - rev = "v${version}"; - hash = "sha256-l8Y1fc5v0YDm87b+d3DuMgKFiem6WFfJEASplHoqva0="; + # No patch for 0.2.0, diff patch has a big size, temporarily until the next release + rev = "cf01ae4d2dcf5c804559250f2c7f922d870ae26d"; + hash = "sha256-8C8uFnXSBalLD2MUgzzfg4ylvTVecyPJOSUri5jbvkM="; }; - cargoHash = "sha256-nnOHuAn+eGf+iiX3QbDTH4zHMQ6KV4QP6RnyBhLMrEc="; + cargoHash = "sha256-JmyuA5p6/7jtNuOMWuAuspYYid+dGOeollIlS0DRCIE="; nativeBuildInputs = [ protobuf From 6350c71d9bea84b0562df8d24956bc1079d53169 Mon Sep 17 00:00:00 2001 From: ocfox Date: Fri, 6 Sep 2024 21:34:55 +0800 Subject: [PATCH 3/3] music-player: format --- pkgs/by-name/mu/music-player/package.nix | 43 +++++++++++++----------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/mu/music-player/package.nix b/pkgs/by-name/mu/music-player/package.nix index 7cde9694f8fd..776486e6928c 100644 --- a/pkgs/by-name/mu/music-player/package.nix +++ b/pkgs/by-name/mu/music-player/package.nix @@ -1,11 +1,12 @@ -{ lib -, stdenv -, alsa-lib -, darwin -, fetchFromGitHub -, pkg-config -, protobuf -, rustPlatform +{ + lib, + stdenv, + alsa-lib, + darwin, + fetchFromGitHub, + pkg-config, + protobuf, + rustPlatform, }: rustPlatform.buildRustPackage rec { @@ -22,18 +23,22 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-JmyuA5p6/7jtNuOMWuAuspYYid+dGOeollIlS0DRCIE="; - nativeBuildInputs = [ - protobuf - rustPlatform.bindgenHook - ] ++ lib.optionals stdenv.isLinux [ - pkg-config - ]; + nativeBuildInputs = + [ + protobuf + rustPlatform.bindgenHook + ] + ++ lib.optionals stdenv.isLinux [ + pkg-config + ]; - buildInputs = lib.optionals stdenv.isLinux [ - alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.AudioUnit - ]; + buildInputs = + lib.optionals stdenv.isLinux [ + alsa-lib + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AudioUnit + ]; meta = with lib; { description = "Extensible music player daemon written in Rust";