Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

treewide: pin Gradle 8 where deprecation warning present in build log #359177

7 changes: 5 additions & 2 deletions pkgs/applications/office/jabref/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
7 changes: 5 additions & 2 deletions pkgs/by-name/ap/apksigner/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
5 changes: 4 additions & 1 deletion pkgs/by-name/ar/armitage/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
, fetchurl
, fetchFromGitHub
, jdk11
, gradle
, gradle_8
, metasploit
, makeWrapper
, makeDesktopItem
Expand Down Expand Up @@ -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;
Expand Down
7 changes: 5 additions & 2 deletions pkgs/by-name/at/atlauncher/package.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
fetchFromGitHub,
gradle,
gradle_8,
jre,
lib,
makeWrapper,
Expand All @@ -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";
Expand Down
7 changes: 5 additions & 2 deletions pkgs/by-name/ja/jadx/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
gradle,
gradle_8,
jdk,
quark-engine,
makeBinaryWrapper,
Expand All @@ -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";
Expand Down
4 changes: 3 additions & 1 deletion pkgs/by-name/li/libeufin/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 3 additions & 1 deletion pkgs/by-name/mi/mindustry/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
makeDesktopItem,
copyDesktopItems,
fetchFromGitHub,
gradle,
gradle_8,
jdk17,
zenity,

Expand Down Expand Up @@ -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";
Expand Down
7 changes: 5 additions & 2 deletions pkgs/by-name/mu/mucommander/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
6 changes: 5 additions & 1 deletion pkgs/by-name/ne/nextflow/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
fetchFromGitHub,
makeWrapper,
openjdk,
gradle,
gradle_8,
wget,
which,
gnused,
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/op/openjfx/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

fetchpatch2,

gradle,
gradle_8,
gradle_7,
perl,
pkg-config,
Expand Down Expand Up @@ -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)
Expand Down
7 changes: 5 additions & 2 deletions pkgs/by-name/pd/pdftk/package.nix
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
5 changes: 4 additions & 1 deletion pkgs/by-name/si/signald/package.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitLab, jdk17_headless, coreutils, findutils, gnused,
gradle, git, makeWrapper, jre_minimal
gradle_8, git, makeWrapper, jre_minimal
}:

let
Expand Down Expand Up @@ -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;

Expand Down
5 changes: 4 additions & 1 deletion pkgs/games/shattered-pixel-dungeon/generic.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
, lib
, stdenv
, makeWrapper
, gradle
, gradle_8
, perl
, jre
, libGL
Expand Down Expand Up @@ -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;

fgaz marked this conversation as resolved.
Show resolved Hide resolved
in stdenv.mkDerivation (cleanAttrs // {
inherit pname version src patches postPatch;

Expand Down
5 changes: 4 additions & 1 deletion pkgs/tools/security/ghidra/build.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
fetchFromGitHub,
lib,
callPackage,
gradle,
gradle_8,
makeBinaryWrapper,
openjdk21,
unzip,
Expand Down Expand Up @@ -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
Expand Down