From 613063ea7a76fb6bb5af23dff30f05ca6de23368 Mon Sep 17 00:00:00 2001 From: squalus Date: Wed, 1 Jan 2025 08:10:03 -0800 Subject: [PATCH] navidrome: 0.53.3 -> 0.54.3 - Update to 0.54.3 - Add netgo tag required for build (https://github.com/navidrome/navidrome/issues/700) - Add patchShebangs step for a script called by UI build - Add settings option for telemetry 0.54.1 changelog: https://github.com/navidrome/navidrome/releases/tag/v0.54.1 0.54.2 changelog: https://github.com/navidrome/navidrome/releases/tag/v0.54.2 0.54.3 changelog: https://github.com/navidrome/navidrome/releases/tag/v0.54.3 Fixes CVE-2024-56362 (cherry picked from commit 19705d04f17d843474c59b76e0b00e6ee4d18814) --- nixos/modules/services/audio/navidrome.nix | 6 ++++++ pkgs/by-name/na/navidrome/package.nix | 16 ++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/audio/navidrome.nix b/nixos/modules/services/audio/navidrome.nix index 06d2d174a4df3..2d0381804c2a5 100644 --- a/nixos/modules/services/audio/navidrome.nix +++ b/nixos/modules/services/audio/navidrome.nix @@ -45,6 +45,12 @@ in description = "Port to run Navidrome on."; type = port; }; + + EnableInsightsCollector = mkOption { + default = false; + description = "Enable anonymous usage data collection, see for details."; + type = bool; + }; }; }; default = { }; diff --git a/pkgs/by-name/na/navidrome/package.nix b/pkgs/by-name/na/navidrome/package.nix index 8925f7ba68077..f09286b36b782 100644 --- a/pkgs/by-name/na/navidrome/package.nix +++ b/pkgs/by-name/na/navidrome/package.nix @@ -18,23 +18,23 @@ buildGo123Module rec { pname = "navidrome"; - version = "0.53.3"; + version = "0.54.3"; src = fetchFromGitHub { owner = "navidrome"; repo = "navidrome"; rev = "v${version}"; - hash = "sha256-RLmGjkeBHuvVdxXaGvlIFPI+6beAdtSLukVmwe6Hnag="; + hash = "sha256-mOJSgX+1id8tZU8KVjWbf2LycrzdudhUV/9pxKa4yHw="; }; - vendorHash = "sha256-XjiRMRfsmcw/4RLZXN36BbzbCKu98BgD3cn89e/vra4="; + vendorHash = "sha256-LpSmSbReQ3yHFvHhN/LERWQjf72/ELTjk4qhO4lyzW0="; npmRoot = "ui"; npmDeps = fetchNpmDeps { inherit src; sourceRoot = "${src.name}/ui"; - hash = "sha256-0vHInRly5xirjfV7tcYVNVLaMk4YtJeB7Ky0mrDDDnY="; + hash = "sha256-PaE1xcZX9wZRcKeqQCXbdhi4cIBWBL8ZQdww6AOB7sQ="; }; nativeBuildInputs = [ @@ -61,10 +61,18 @@ buildGo123Module rec { CGO_CFLAGS = lib.optionals stdenv.cc.isGNU [ "-Wno-return-local-addr" ]; + postPatch = '' + patchShebangs ui/bin/update-workbox.sh + ''; + preBuild = '' make buildjs ''; + tags = [ + "netgo" + ]; + postFixup = lib.optionalString ffmpegSupport '' wrapProgram $out/bin/navidrome \ --prefix PATH : ${lib.makeBinPath [ ffmpeg-headless ]}