From 89079b37ec19258fb2a8eb2aa6e33e7bd042075c Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Tue, 26 Nov 2024 02:33:08 +0000 Subject: [PATCH 01/12] signald: pin to Gradle 8 --- pkgs/by-name/si/signald/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/si/signald/package.nix b/pkgs/by-name/si/signald/package.nix index acadc87d9a3d..47d79cd88b6d 100644 --- a/pkgs/by-name/si/signald/package.nix +++ b/pkgs/by-name/si/signald/package.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitLab, jdk17_headless, coreutils, findutils, gnused, -gradle, git, makeWrapper, jre_minimal +gradle_8, git, makeWrapper, jre_minimal }: let @@ -32,6 +32,9 @@ let ]; }; + # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0." + gradle = gradle_8; + in stdenv.mkDerivation { inherit pname src version; From b433620b611ec01493cf5fc4d24a1a7d338683db Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Tue, 26 Nov 2024 02:35:59 +0000 Subject: [PATCH 02/12] shattered-pixel-dungeon: pin to Gradle 8 --- pkgs/games/shattered-pixel-dungeon/generic.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/games/shattered-pixel-dungeon/generic.nix b/pkgs/games/shattered-pixel-dungeon/generic.nix index 3e81c54bba91..30d7f3f47260 100644 --- a/pkgs/games/shattered-pixel-dungeon/generic.nix +++ b/pkgs/games/shattered-pixel-dungeon/generic.nix @@ -10,7 +10,7 @@ , lib , stdenv , makeWrapper -, gradle +, gradle_8 , perl , jre , libGL @@ -55,6 +55,9 @@ let depsPath' = if depsPath != null then depsPath else ./. + "/${pname}/deps.json"; + # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0." + gradle = gradle_8; + in stdenv.mkDerivation (cleanAttrs // { inherit pname version src patches postPatch; From eddcbd19d3dee329c7a98634f2eac366349468ec Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Tue, 26 Nov 2024 02:37:29 +0000 Subject: [PATCH 03/12] pdftk: pin to Gradle 8 --- pkgs/by-name/pd/pdftk/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pd/pdftk/package.nix b/pkgs/by-name/pd/pdftk/package.nix index 9ecb87b86ff6..99f25a51877b 100644 --- a/pkgs/by-name/pd/pdftk/package.nix +++ b/pkgs/by-name/pd/pdftk/package.nix @@ -1,5 +1,8 @@ -{ lib, stdenv, fetchFromGitLab, gradle, jre, runtimeShell }: - +{ lib, stdenv, fetchFromGitLab, gradle_8, jre, runtimeShell }: +let + # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0." + gradle = gradle_8; +in stdenv.mkDerivation rec { pname = "pdftk"; version = "3.3.3"; From 9795412499c2601ce1b73cdc6cdf10d812cb77e0 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Tue, 26 Nov 2024 02:38:44 +0000 Subject: [PATCH 04/12] mindustry: pin to Gradle 8 --- pkgs/by-name/mi/mindustry/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/mi/mindustry/package.nix b/pkgs/by-name/mi/mindustry/package.nix index 998946c8eeb9..ecba7df93d8d 100644 --- a/pkgs/by-name/mi/mindustry/package.nix +++ b/pkgs/by-name/mi/mindustry/package.nix @@ -6,7 +6,7 @@ makeDesktopItem, copyDesktopItems, fetchFromGitHub, - gradle, + gradle_8, jdk17, zenity, @@ -43,6 +43,8 @@ let buildVersion = makeBuildVersion version; jdk = jdk17; + # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0." + gradle = gradle_8; Mindustry = fetchFromGitHub { owner = "Anuken"; From c64ddb7d6a375dfc6c093683e79b425c539c6717 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Tue, 26 Nov 2024 02:39:36 +0000 Subject: [PATCH 05/12] libeufin: pin to Gradle 8 --- pkgs/by-name/li/libeufin/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libeufin/package.nix b/pkgs/by-name/li/libeufin/package.nix index b6ef3d432d92..71717721a894 100644 --- a/pkgs/by-name/li/libeufin/package.nix +++ b/pkgs/by-name/li/libeufin/package.nix @@ -4,13 +4,15 @@ fetchgit, python3, jdk17_headless, - gradle, + gradle_8, makeWrapper, postgresql, postgresqlTestHook, }: let customPython = python3.withPackages (p: [ p.setuptools ]); + # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0." + gradle = gradle_8; in stdenv.mkDerivation (finalAttrs: { pname = "libeufin"; From e4be1efabfcc25707a30de9a85d1384ba86f9dfc Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Tue, 26 Nov 2024 02:42:08 +0000 Subject: [PATCH 06/12] nextflow: pin to Gradle 8 --- pkgs/by-name/ne/nextflow/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ne/nextflow/package.nix b/pkgs/by-name/ne/nextflow/package.nix index fca7a4854453..9fe2c20fae55 100644 --- a/pkgs/by-name/ne/nextflow/package.nix +++ b/pkgs/by-name/ne/nextflow/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, makeWrapper, openjdk, - gradle, + gradle_8, wget, which, gnused, @@ -14,6 +14,10 @@ testers, nixosTests, }: +let + # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0." + gradle = gradle_8; +in stdenv.mkDerivation (finalAttrs: { pname = "nextflow"; # 24.08.0-edge is compatible with Java 21. The current (as of 2024-09-19) From 04338e96bb98bc7ee66ed15c42a2a143007af82c Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Tue, 26 Nov 2024 02:43:02 +0000 Subject: [PATCH 07/12] mucommander: pin to Gradle 8 --- pkgs/by-name/mu/mucommander/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mu/mucommander/package.nix b/pkgs/by-name/mu/mucommander/package.nix index c97b2605e5b2..5116b5e27641 100644 --- a/pkgs/by-name/mu/mucommander/package.nix +++ b/pkgs/by-name/mu/mucommander/package.nix @@ -2,12 +2,15 @@ lib, stdenv, fetchFromGitHub, - gradle, + gradle_8, makeWrapper, jdk, gsettings-desktop-schemas, }: - +let + # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0." + gradle = gradle_8; +in stdenv.mkDerivation (finalAttrs: { pname = "mucommander"; version = "1.5.2-1"; From 33c8fa3a3c89348301165852116b44fbeed76777 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Tue, 26 Nov 2024 02:44:25 +0000 Subject: [PATCH 08/12] armitage: pin to Gradle 8 --- pkgs/by-name/ar/armitage/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ar/armitage/package.nix b/pkgs/by-name/ar/armitage/package.nix index 0fc8455b4f87..a77d9bb9e08a 100644 --- a/pkgs/by-name/ar/armitage/package.nix +++ b/pkgs/by-name/ar/armitage/package.nix @@ -3,7 +3,7 @@ , fetchurl , fetchFromGitHub , jdk11 -, gradle +, gradle_8 , metasploit , makeWrapper , makeDesktopItem @@ -47,6 +47,9 @@ let ./gradle-8.patch ]; + # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0." + gradle = gradle_8; + in stdenv.mkDerivation (finalAttrs: { inherit pname version src patches; From d2b828fbeb1aec6c80b6d04659e3cf224b078e4d Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Tue, 26 Nov 2024 02:46:39 +0000 Subject: [PATCH 09/12] atlauncher: pin to Gradle 8 --- pkgs/by-name/ap/apksigner/package.nix | 7 +++++-- pkgs/by-name/at/atlauncher/package.nix | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ap/apksigner/package.nix b/pkgs/by-name/ap/apksigner/package.nix index 0a918df061a7..f606b43386ca 100644 --- a/pkgs/by-name/ap/apksigner/package.nix +++ b/pkgs/by-name/ap/apksigner/package.nix @@ -2,10 +2,13 @@ , stdenv , fetchgit , jdk_headless -, gradle +, gradle_8 , makeWrapper }: - +let + # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0." + gradle = gradle_8; +in stdenv.mkDerivation rec { pname = "apksigner"; version = "34.0.5-unstable-2024-03-06"; diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix index 60da698cd721..436f3711ce20 100644 --- a/pkgs/by-name/at/atlauncher/package.nix +++ b/pkgs/by-name/at/atlauncher/package.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, - gradle, + gradle_8, jre, lib, makeWrapper, @@ -18,7 +18,10 @@ udev, xorg, }: - +let + # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0." + gradle = gradle_8; +in stdenvNoCC.mkDerivation (finalAttrs: { pname = "atlauncher"; version = "3.4.38.0"; From 9ebedd309118dbc0e69636386a78f5a8f022a26b Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Tue, 26 Nov 2024 02:49:42 +0000 Subject: [PATCH 10/12] jadx: pin to Gradle 8 --- pkgs/by-name/ja/jadx/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ja/jadx/package.nix b/pkgs/by-name/ja/jadx/package.nix index 07c9a4a6c29b..0fe71e06db65 100644 --- a/pkgs/by-name/ja/jadx/package.nix +++ b/pkgs/by-name/ja/jadx/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - gradle, + gradle_8, jdk, quark-engine, makeBinaryWrapper, @@ -11,7 +11,10 @@ copyDesktopItems, desktopToDarwinBundle, }: - +let + # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0." + gradle = gradle_8; +in stdenv.mkDerivation (finalAttrs: { pname = "jadx"; version = "1.5.0"; From cf1bfe275a1a2a66015f21b6e18b8b7c3049752a Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Tue, 26 Nov 2024 02:52:08 +0000 Subject: [PATCH 11/12] openjfx23: pin to Gradle 8 --- pkgs/applications/office/jabref/default.nix | 7 +++++-- pkgs/by-name/op/openjfx/package.nix | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index 96ff199f964d..5c7fd7b7de9a 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -8,10 +8,13 @@ , xdg-utils , gtk3 , jdk -, gradle +, gradle_8 , python3 }: - +let + # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0." + gradle = gradle_8; +in stdenv.mkDerivation rec { version = "5.13"; pname = "jabref"; diff --git a/pkgs/by-name/op/openjfx/package.nix b/pkgs/by-name/op/openjfx/package.nix index b64ce6d32e15..e563214c9b9e 100644 --- a/pkgs/by-name/op/openjfx/package.nix +++ b/pkgs/by-name/op/openjfx/package.nix @@ -7,7 +7,7 @@ fetchpatch2, - gradle, + gradle_8, gradle_7, perl, pkg-config, @@ -57,7 +57,7 @@ let atLeast21 = lib.versionAtLeast featureVersion "21"; atLeast23 = lib.versionAtLeast featureVersion "23"; - gradle_openjfx = if atLeast23 then gradle else gradle_7; + gradle_openjfx = if atLeast23 then gradle_8 else gradle_7; in assert lib.assertMsg (lib.pathExists sourceFile) From 9b37174df0172575b3b037c411bed36fc91eb1f9 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Tue, 26 Nov 2024 02:54:02 +0000 Subject: [PATCH 12/12] ghidra: pin to Gradle 8 --- pkgs/tools/security/ghidra/build.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index edda86957f1d..8396db783a02 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -3,7 +3,7 @@ fetchFromGitHub, lib, callPackage, - gradle, + gradle_8, makeBinaryWrapper, openjdk21, unzip, @@ -73,6 +73,9 @@ let HERE ''; + # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0." + gradle = gradle_8; + in stdenv.mkDerivation (finalAttrs: { inherit