From 392534f2bc4cf9422502c244a8bd4e50b53e9916 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Mar 2025 23:59:24 +0000 Subject: [PATCH 1/5] gradle: 8.12.1 -> 8.13 --- pkgs/development/tools/build-managers/gradle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index ff23eda5f569..f7f117214dec 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -230,8 +230,8 @@ rec { # https://docs.gradle.org/current/userguide/compatibility.html gradle_8 = gen { - version = "8.12.1"; - hash = "sha256-jZepeYT2y9K4X+TGCnQ0QKNHVEvxiBgEjmEfUojUbJQ="; + version = "8.13"; + hash = "sha256-IPGxF2I3JUpvwgTYQ0GW+hGkz7OHVnUZxhVW6HEK7Xg="; defaultJava = jdk21; }; From 885090c958a96c58d86347e17b821e67d66786f6 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sat, 8 Mar 2025 11:40:27 +0200 Subject: [PATCH 2/5] jadx: resolve dependencies with gradle 8.13 --- pkgs/by-name/ja/jadx/deps.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ja/jadx/deps.json b/pkgs/by-name/ja/jadx/deps.json index d4c912cc84e7..e9f5b34f86d7 100644 --- a/pkgs/by-name/ja/jadx/deps.json +++ b/pkgs/by-name/ja/jadx/deps.json @@ -255,13 +255,13 @@ "jar": "sha256-urlD5Y7dFzCSOGctunpFrsni2svd24GKjPF3I+oT+iI=", "pom": "sha256-4nl2N1mZxUJ/y8//PzvCD77a+tiqRRArN59cL5fI/rQ=" }, - "org/gradle/kotlin#gradle-kotlin-dsl-plugins/5.1.2": { - "jar": "sha256-tYw+XDWgAln9QC3r89pHqjrQhcP0vnL5AuoSYbNQGa4=", - "module": "sha256-CPnVxzwOvolk4aq3z59G93inhCcxnZJ52ZKoRBPIXPM=", - "pom": "sha256-Y4Th1GwfBKl4Go/Pl6nFQ5YPNNoKZ/XQI2x8EubcvqU=" + "org/gradle/kotlin#gradle-kotlin-dsl-plugins/5.2.0": { + "jar": "sha256-SKlcMPRlehDfloYC01LJ2GTZemYholfoFQjINWDE/q4=", + "module": "sha256-fxo3x8yLU7tmBAqrbAacidiqWOJ/+nH3s2HGROtaD7A=", + "pom": "sha256-uB9ZcQ4lOEW0+Pbe27BWPWfD5/UPg7AiQZXjo2GAtH8=" }, - "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.1.2": { - "pom": "sha256-1JPwqwDRfMB4Zduo3oQAo5CJ1SpxzkFtyQOlEsXe1V0=" + "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.2.0": { + "pom": "sha256-pXu0ObpCYKJW8tYIRx1wgRiQd6Ck3fsCjdGBe+W8Ejc=" }, "org/jdom#jdom2/2.0.6.1": { "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=", From 2fc4fe567f3e0b6796d3899ad40bbd5d6c17c559 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sat, 8 Mar 2025 11:40:37 +0200 Subject: [PATCH 3/5] keyguard: resolve dependencies with gradle 8.13 --- pkgs/by-name/ke/keyguard/deps.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ke/keyguard/deps.json b/pkgs/by-name/ke/keyguard/deps.json index 14c9cbcb90b6..c183f997c066 100644 --- a/pkgs/by-name/ke/keyguard/deps.json +++ b/pkgs/by-name/ke/keyguard/deps.json @@ -1170,13 +1170,13 @@ "nl/littlerobots/version-catalog-update#nl.littlerobots.version-catalog-update.gradle.plugin/0.8.5": { "pom": "sha256-a+z8hpHftExSYVqCqWeS8TQBpXXleMkBkR1/qjMPgoo=" }, - "org/gradle/kotlin#gradle-kotlin-dsl-plugins/5.1.2": { - "jar": "sha256-tYw+XDWgAln9QC3r89pHqjrQhcP0vnL5AuoSYbNQGa4=", - "module": "sha256-CPnVxzwOvolk4aq3z59G93inhCcxnZJ52ZKoRBPIXPM=", - "pom": "sha256-Y4Th1GwfBKl4Go/Pl6nFQ5YPNNoKZ/XQI2x8EubcvqU=" + "org/gradle/kotlin#gradle-kotlin-dsl-plugins/5.2.0": { + "jar": "sha256-SKlcMPRlehDfloYC01LJ2GTZemYholfoFQjINWDE/q4=", + "module": "sha256-fxo3x8yLU7tmBAqrbAacidiqWOJ/+nH3s2HGROtaD7A=", + "pom": "sha256-uB9ZcQ4lOEW0+Pbe27BWPWfD5/UPg7AiQZXjo2GAtH8=" }, - "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.1.2": { - "pom": "sha256-1JPwqwDRfMB4Zduo3oQAo5CJ1SpxzkFtyQOlEsXe1V0=" + "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.2.0": { + "pom": "sha256-pXu0ObpCYKJW8tYIRx1wgRiQd6Ck3fsCjdGBe+W8Ejc=" }, "org/gradle/toolchains#foojay-resolver/0.9.0": { "jar": "sha256-woQImj+HVX92Ai2Z8t8oNlaKpIs/5OKSI5LVZrqBQXY=", From f2a96d52e0ae0d40de1d3e295125f536159e5aec Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sat, 8 Mar 2025 11:40:46 +0200 Subject: [PATCH 4/5] velocity: resolve dependencies with gradle 8.13 --- pkgs/by-name/ve/velocity/deps.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ve/velocity/deps.json b/pkgs/by-name/ve/velocity/deps.json index 8259e84806ce..32d59e66322c 100644 --- a/pkgs/by-name/ve/velocity/deps.json +++ b/pkgs/by-name/ve/velocity/deps.json @@ -92,13 +92,13 @@ "jar": "sha256-urlD5Y7dFzCSOGctunpFrsni2svd24GKjPF3I+oT+iI=", "pom": "sha256-4nl2N1mZxUJ/y8//PzvCD77a+tiqRRArN59cL5fI/rQ=" }, - "org/gradle/kotlin#gradle-kotlin-dsl-plugins/5.1.2": { - "jar": "sha256-tYw+XDWgAln9QC3r89pHqjrQhcP0vnL5AuoSYbNQGa4=", - "module": "sha256-CPnVxzwOvolk4aq3z59G93inhCcxnZJ52ZKoRBPIXPM=", - "pom": "sha256-Y4Th1GwfBKl4Go/Pl6nFQ5YPNNoKZ/XQI2x8EubcvqU=" + "org/gradle/kotlin#gradle-kotlin-dsl-plugins/5.2.0": { + "jar": "sha256-SKlcMPRlehDfloYC01LJ2GTZemYholfoFQjINWDE/q4=", + "module": "sha256-fxo3x8yLU7tmBAqrbAacidiqWOJ/+nH3s2HGROtaD7A=", + "pom": "sha256-uB9ZcQ4lOEW0+Pbe27BWPWfD5/UPg7AiQZXjo2GAtH8=" }, - "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.1.2": { - "pom": "sha256-1JPwqwDRfMB4Zduo3oQAo5CJ1SpxzkFtyQOlEsXe1V0=" + "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.2.0": { + "pom": "sha256-pXu0ObpCYKJW8tYIRx1wgRiQd6Ck3fsCjdGBe+W8Ejc=" }, "org/gradle/toolchains#foojay-resolver/0.9.0": { "jar": "sha256-woQImj+HVX92Ai2Z8t8oNlaKpIs/5OKSI5LVZrqBQXY=", From 057211b4360a3ff6098fc07a726a29eede45f6e8 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sat, 8 Mar 2025 12:07:19 +0200 Subject: [PATCH 5/5] freeplane: add a patch to support Gradle 8.13 --- pkgs/by-name/fr/freeplane/deps.json | 12 ++++++------ pkgs/by-name/fr/freeplane/package.nix | 9 +++++++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/fr/freeplane/deps.json b/pkgs/by-name/fr/freeplane/deps.json index 8026804546ce..305e2ac2c7e8 100644 --- a/pkgs/by-name/fr/freeplane/deps.json +++ b/pkgs/by-name/fr/freeplane/deps.json @@ -16,8 +16,8 @@ "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.51.0": { "pom": "sha256-oy92kCcy9iIN27EhlfozbDMfT2190MRscHcLOu4dR0E=" }, - "com/netflix/nebula/ospackage#com.netflix.nebula.ospackage.gradle.plugin/11.10.0": { - "pom": "sha256-2CtlPq9xjbpM5uYMynsMik4IhQb+DLO+jCoU49cBhwc=" + "com/netflix/nebula/ospackage#com.netflix.nebula.ospackage.gradle.plugin/11.11.1": { + "pom": "sha256-vzFreAr1jNZu6HTiFIpSGFcYGz/pvN36tiQOXikDxPI=" }, "de/jflex#cup-parent/11b": { "pom": "sha256-c4L5m+Pbb+Uh8E1+/XMZ/jlj2nnWXFaOfoofWRLpmHw=" @@ -304,10 +304,10 @@ "jar": "sha256-9UdeY+fonl22IiNImux6Vr0wNUN3IHehfCy1TBnKOiA=", "pom": "sha256-W3YhZzfy2pODlTrMybpY9uc500Rnh5nm1NCCz24da9M=" }, - "com/netflix/nebula#gradle-ospackage-plugin/11.10.0": { - "jar": "sha256-k8JksFhk+NuXmhaameS/qthMqjC4KXQ/ZyEDgt/4lhk=", - "module": "sha256-Ef8gYnVWXB04hmPUmjT73DnQ4OWvGiqO32HOtTtSyzA=", - "pom": "sha256-6hztETK2gdIShusXyuLdJHeGBR9mh/EiufxUWFaSUGQ=" + "com/netflix/nebula#gradle-ospackage-plugin/11.11.1": { + "jar": "sha256-NAJ6yECtuBuA3kMILOM1plGIdSF6OKwCBNWoTcZpt6w=", + "module": "sha256-wb4zriytcHAJd+7KHPhLTNtJXJY7xYjXaAehe+94Lcc=", + "pom": "sha256-2XSxaCnczZP7kLyVaJAFVcxrgJhvSc/yxIZaIANLBPA=" }, "com/samskivert#jmustache/1.15": { "jar": "sha256-GuuWudwXvClUC4wzQujpHul01cYEFl7NRp3XawQcJQw=", diff --git a/pkgs/by-name/fr/freeplane/package.nix b/pkgs/by-name/fr/freeplane/package.nix index 6ba59f984aa4..b0209ec5022d 100644 --- a/pkgs/by-name/fr/freeplane/package.nix +++ b/pkgs/by-name/fr/freeplane/package.nix @@ -2,6 +2,7 @@ stdenvNoCC, lib, fetchFromGitHub, + fetchpatch, makeBinaryWrapper, makeDesktopItem, jdk17, @@ -35,6 +36,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { copyDesktopItems ]; + patches = [ + # Plugin update to support Gradle 8.13; remove when included in a release. + (fetchpatch { + url = "https://github.com/freeplane/freeplane/commit/e58958783ef6f85ab00bf270c1f897093c4d7006.patch"; + hash = "sha256-oQF/GbItl2ZEVlTKzojqk9xTWl8CVP7V3yig/py71hk="; + }) + ]; + mitmCache = gradle.fetchDeps { inherit pname; data = ./deps.json;