diff --git a/pkgs/by-name/na/navidrome/package.nix b/pkgs/by-name/na/navidrome/package.nix index c8267ea640d0..242bd807785c 100644 --- a/pkgs/by-name/na/navidrome/package.nix +++ b/pkgs/by-name/na/navidrome/package.nix @@ -20,37 +20,23 @@ buildGoModule (finalAttrs: { pname = "navidrome"; - version = "0.61.1"; + version = "0.61.2"; src = fetchFromGitHub { owner = "navidrome"; repo = "navidrome"; rev = "v${finalAttrs.version}"; - hash = "sha256-BRMJCBQl38AqsCI2UYQ9X36U57pg9uuiHsx8sHpVBKE="; + hash = "sha256-epSgGiDdfNRUaQtWoOd4ADKtF7Ptt3p9UOqsWBzZg7I="; }; - patches = [ - # https://github.com/navidrome/navidrome/pull/5276 (waiting on release) - (fetchpatch { - name = "regenerate-package-lock-json"; - url = "https://github.com/navidrome/navidrome/compare/v0.61.1...33a05ef662760fd9feb0a3ae43c7fe149eda610b.patch"; - hash = "sha256-IQ0wJ7vsSaLjBZS/fKIApNM8UV8oj6L2taCQIPhHvwg="; - }) - ]; - - vendorHash = "sha256-iVXJPP41rIpC6Tu1P/jWcePYCQ2Z9lEoTOrDLN26kTU="; + vendorHash = "sha256-RmmZudmWBxiw+c9g8KFEX+ALFD0xP/SBsYc6b6RWWO8="; npmRoot = "ui"; npmDeps = fetchNpmDeps { - inherit (finalAttrs) src patches; - # Remove after https://github.com/navidrome/navidrome/pull/5276 is released - # patches are applied after we run npmDeps without inheriting patches here - # so we have to get out of the sourceRoot to apply it then get back in to it - prePatch = "cd .."; - postPatch = "cd ui"; + inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/ui"; - hash = "sha256-iXey2XmDwsTR1/bIrBLzm6uvVGzPgQFcDLUtNy8robI="; + hash = "sha256-7hy2vLCEicKzjORpJZ0mrRS8PT3GsJ8DWdvj/7SrB70="; }; nativeBuildInputs = [