From 28bb35e52c6522d67f9dc3833b9ac0f06bc556bb Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sun, 16 Feb 2025 10:50:18 +0200 Subject: [PATCH 1/2] gradle: use pname and version in symlinkJoin An actual `version` attribute is needed for the automatic updates to work. --- pkgs/development/tools/build-managers/gradle/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 1db388194007..3b22a9c2fedb 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -259,7 +259,8 @@ rec { gradle = gradle-unwrapped.override args; in symlinkJoin { - name = "gradle-${gradle.version}"; + pname = "gradle"; + inherit (gradle) version; paths = [ (makeSetupHook { name = "gradle-setup-hook"; } (concatTextFile { From 7fb913f890b46456ef5d403ff40202914c57f021 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sun, 16 Feb 2025 10:50:36 +0200 Subject: [PATCH 2/2] gradle: 8.12 -> 8.12.1 --- 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 3b22a9c2fedb..ff23eda5f569 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"; - hash = "sha256-egDVH7kxR4Gaq3YCT+7OILa4TkIGlBAfJ2vpUuCL7wM="; + version = "8.12.1"; + hash = "sha256-jZepeYT2y9K4X+TGCnQ0QKNHVEvxiBgEjmEfUojUbJQ="; defaultJava = jdk21; };