From 2749936147d9370fc2df3ce1ef4faa001bac2b8e Mon Sep 17 00:00:00 2001 From: Shaw Vrana Date: Mon, 5 Jan 2026 09:33:48 -0800 Subject: [PATCH] commafeed: 5.11.1 -> 6.2.0 --- pkgs/by-name/co/commafeed/package.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/co/commafeed/package.nix b/pkgs/by-name/co/commafeed/package.nix index ff78a7f22e9e..3d8308e8a08d 100644 --- a/pkgs/by-name/co/commafeed/package.nix +++ b/pkgs/by-name/co/commafeed/package.nix @@ -3,7 +3,7 @@ biome, buildNpmPackage, fetchFromGitHub, - jre, + jdk25, maven, makeWrapper, unzip, @@ -11,13 +11,13 @@ writeText, }: let - version = "5.11.1"; + version = "6.2.0"; src = fetchFromGitHub { owner = "Athou"; repo = "commafeed"; tag = version; - hash = "sha256-B0ztra7j5V5Qm0DRpu4cl04tmOE1gS89NOV2kyMrzOg="; + hash = "sha256-M5p3nzlEIuIEMADZyQUqE6WAzlMmP/e4Zh9J8nbhZ9Q="; }; frontend = buildNpmPackage { @@ -27,7 +27,7 @@ let sourceRoot = "${src.name}/commafeed-client"; - npmDepsHash = "sha256-TD57bDY/7/zYT1T/HOl0+G59/hct8fzJaKaMC8/bBEI="; + npmDepsHash = "sha256-XkUlsRdqIXwVExvSofZJLKMUSzjxJRRpV549UTP9Cjo="; nativeBuildInputs = [ biome ]; @@ -53,7 +53,8 @@ maven.buildMavenPackage { pname = "commafeed"; - mvnHash = "sha256-ipGxdX/LHEn2mQa2JhfeMTmg0esj5Z+7fJ3W2ipLfto="; + mvnHash = "sha256-vZ7BPA2N3jgRnTwF3k9En2Pn+zTrXbtB9FGbmU4wJgY="; + mvnJdk = jdk25; mvnParameters = lib.escapeShellArgs [ "-Dskip.installnodenpm" @@ -85,7 +86,7 @@ maven.buildMavenPackage { mkdir -p $out/bin $out/share unzip -d $out/share/ commafeed-server/target/commafeed-$version-h2-jvm.zip - makeWrapper ${jre}/bin/java $out/bin/commafeed \ + makeWrapper ${jdk25}/bin/java $out/bin/commafeed \ --add-flags "-jar $out/share/commafeed-$version-h2/quarkus-run.jar" runHook postInstall