From 828687f82ca25257cee4904924797613e3e51127 Mon Sep 17 00:00:00 2001 From: bokicoder <1556588440@qq.com> Date: Wed, 14 Jan 2026 23:20:27 +0800 Subject: [PATCH 1/3] mpd-mpris: 0.4.1 -> 0.4.3 --- pkgs/by-name/mp/mpd-mpris/package.nix | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/mp/mpd-mpris/package.nix b/pkgs/by-name/mp/mpd-mpris/package.nix index 8abed8f15f53..181e465d0b4d 100644 --- a/pkgs/by-name/mp/mpd-mpris/package.nix +++ b/pkgs/by-name/mp/mpd-mpris/package.nix @@ -2,37 +2,30 @@ lib, buildGoModule, fetchFromGitHub, - fetchpatch, }: buildGoModule rec { pname = "mpd-mpris"; - version = "0.4.1"; + version = "0.4.3"; src = fetchFromGitHub { owner = "natsukagami"; repo = "mpd-mpris"; rev = "v${version}"; - sha256 = "sha256-QxPkGWpCWiyEbChH9SHeD+SiV8k0c/G7MG/azksP3xU="; + sha256 = "sha256-w8OH34JW++OYLpNIHfQvc45dFyU/wVWVa+vEwWb8VqU="; }; - patches = [ - # Makes Exec= path not absolute, see https://github.com/natsukagami/mpd-mpris/pull/42 - (fetchpatch { - url = "https://github.com/natsukagami/mpd-mpris/commit/8a5b53b1aa3174c3ccb1db24fb4e39f90012b98f.patch"; - hash = "sha256-LArPq+RRPJOs0je1olqg+pK7nvU7UIlrpGtHv2PhIY4="; - }) - ]; - - vendorHash = "sha256-HCDJrp9WFB1z+FnYpOI5e/AojtdnpN2ZNtgGVaH/v/Q="; - - doCheck = false; + vendorHash = "sha256-ugJEw02jSsfObljDaup31zoQlf2HvwDRUljD7lp7Ys4="; subPackages = [ "cmd/mpd-mpris" ]; + postPatch = '' + substituteInPlace services/mpd-mpris.service --replace-fail "ExecStart=" "ExecStart=$out/bin/" + ''; + postInstall = '' - install -Dm644 mpd-mpris.service $out/lib/systemd/user/mpd-mpris.service - install -Dm644 mpd-mpris.desktop $out/etc/xdg/autostart/mpd-mpris.desktop + install -Dm644 services/mpd-mpris.service -t $out/lib/systemd/user + install -Dm644 mpd-mpris.desktop -t $out/etc/xdg/autostart ''; meta = { From 77b6d9db6d9019afe23fda8eb9b0083d309bbef2 Mon Sep 17 00:00:00 2001 From: wxlyyy <1556588440@qq.com> Date: Thu, 15 Jan 2026 23:59:30 +0800 Subject: [PATCH 2/3] mpd-mpris: use `tag` and `hash` in the fetcher --- pkgs/by-name/mp/mpd-mpris/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mp/mpd-mpris/package.nix b/pkgs/by-name/mp/mpd-mpris/package.nix index 181e465d0b4d..f858f12f4ff6 100644 --- a/pkgs/by-name/mp/mpd-mpris/package.nix +++ b/pkgs/by-name/mp/mpd-mpris/package.nix @@ -11,8 +11,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = "natsukagami"; repo = "mpd-mpris"; - rev = "v${version}"; - sha256 = "sha256-w8OH34JW++OYLpNIHfQvc45dFyU/wVWVa+vEwWb8VqU="; + tag = "v${version}"; + hash = "sha256-w8OH34JW++OYLpNIHfQvc45dFyU/wVWVa+vEwWb8VqU="; }; vendorHash = "sha256-ugJEw02jSsfObljDaup31zoQlf2HvwDRUljD7lp7Ys4="; From 6c658e8c35da44e800036e6ff6425961c06e03d7 Mon Sep 17 00:00:00 2001 From: wxlyyy <1556588440@qq.com> Date: Fri, 16 Jan 2026 00:02:53 +0800 Subject: [PATCH 3/3] mpd-mpris: migrate to `finalAttrs` --- pkgs/by-name/mp/mpd-mpris/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mp/mpd-mpris/package.nix b/pkgs/by-name/mp/mpd-mpris/package.nix index f858f12f4ff6..b1bc34480ba3 100644 --- a/pkgs/by-name/mp/mpd-mpris/package.nix +++ b/pkgs/by-name/mp/mpd-mpris/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "mpd-mpris"; version = "0.4.3"; src = fetchFromGitHub { owner = "natsukagami"; repo = "mpd-mpris"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-w8OH34JW++OYLpNIHfQvc45dFyU/wVWVa+vEwWb8VqU="; }; @@ -35,4 +35,4 @@ buildGoModule rec { maintainers = with lib.maintainers; [ doronbehar ]; mainProgram = "mpd-mpris"; }; -} +})