marytts: use Gradle 8

Part of #358845.

Inlined from https://github.com/marytts/marytts/pull/1120

+39 -5
+28
pkgs/by-name/ma/marytts/gradle-8.patch
··· 1 + From 5cda42b687a2271f5be52466c39d18e974beaa30 Mon Sep 17 00:00:00 2001 2 + From: Tomodachi94 <tomodachi94@protonmail.com> 3 + Date: Sun, 20 Apr 2025 02:22:16 +0000 4 + Subject: [PATCH] gradle(installDist): explicitly depend on 5 + installerGuiStartScripts 6 + 7 + This allows us to use Gradle 8. 8 + 9 + Closes #1112 10 + --- 11 + applicationLogic.gradle | 4 ++++ 12 + 1 file changed, 4 insertions(+) 13 + 14 + diff --git a/applicationLogic.gradle b/applicationLogic.gradle 15 + index 0d4a4c7dc..a4f6a571c 100644 16 + --- a/applicationLogic.gradle 17 + +++ b/applicationLogic.gradle 18 + @@ -129,6 +129,10 @@ def testStartScriptsTask = tasks.register('testStartScripts') { 19 + } 20 + } 21 + 22 + +tasks.named('installDist') { 23 + + dependsOn tasks.named('installerGuiStartScripts') 24 + +} 25 + + 26 + tasks.named('check') { 27 + dependsOn testStartScriptsTask 28 + }
+11 -5
pkgs/by-name/ma/marytts/package.nix
··· 2 2 lib, 3 3 stdenvNoCC, 4 4 fetchFromGitHub, 5 - # Gradle 8 complains about implicit task dependencies when using `installDist`. 6 - # See https://github.com/marytts/marytts/issues/1112 7 - gradle_7, 5 + # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0." 6 + gradle_8, 8 7 makeWrapper, 9 8 jdk, 10 9 nixosTests, ··· 20 19 hash = "sha256-jGpsD6IwJ67nDLnulBn8DycXCyowssSnDCkQXBIfOH8="; 21 20 }; 22 21 22 + patches = [ 23 + # Gradle 8 complains about implicit task dependencies when using `installDist`, 24 + # so let's patch it. 25 + # See https://github.com/marytts/marytts/issues/1112 26 + ./gradle-8.patch 27 + ]; 28 + 23 29 nativeBuildInputs = [ 24 - gradle_7 30 + gradle_8 25 31 makeWrapper 26 32 ]; 27 33 28 - mitmCache = gradle_7.fetchDeps { 34 + mitmCache = gradle_8.fetchDeps { 29 35 inherit (finalAttrs) pname; 30 36 data = ./deps.json; 31 37 };