treewide: pin Gradle 8 where deprecation warning present in build log (#359177)
This commit is contained in:
commit
76bb4843c7
@ -8,10 +8,13 @@
|
|||||||
, xdg-utils
|
, xdg-utils
|
||||||
, gtk3
|
, gtk3
|
||||||
, jdk
|
, jdk
|
||||||
, gradle
|
, gradle_8
|
||||||
, python3
|
, python3
|
||||||
}:
|
}:
|
||||||
|
let
|
||||||
|
# "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
|
||||||
|
gradle = gradle_8;
|
||||||
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "5.13";
|
version = "5.13";
|
||||||
pname = "jabref";
|
pname = "jabref";
|
||||||
|
@ -2,10 +2,13 @@
|
|||||||
, stdenv
|
, stdenv
|
||||||
, fetchgit
|
, fetchgit
|
||||||
, jdk_headless
|
, jdk_headless
|
||||||
, gradle
|
, gradle_8
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
}:
|
}:
|
||||||
|
let
|
||||||
|
# "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
|
||||||
|
gradle = gradle_8;
|
||||||
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "apksigner";
|
pname = "apksigner";
|
||||||
version = "34.0.5-unstable-2024-03-06";
|
version = "34.0.5-unstable-2024-03-06";
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
, fetchurl
|
, fetchurl
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, jdk11
|
, jdk11
|
||||||
, gradle
|
, gradle_8
|
||||||
, metasploit
|
, metasploit
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, makeDesktopItem
|
, makeDesktopItem
|
||||||
@ -47,6 +47,9 @@ let
|
|||||||
./gradle-8.patch
|
./gradle-8.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
|
||||||
|
gradle = gradle_8;
|
||||||
|
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
inherit pname version src patches;
|
inherit pname version src patches;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
gradle,
|
gradle_8,
|
||||||
jre,
|
jre,
|
||||||
lib,
|
lib,
|
||||||
makeWrapper,
|
makeWrapper,
|
||||||
@ -18,7 +18,10 @@
|
|||||||
udev,
|
udev,
|
||||||
xorg,
|
xorg,
|
||||||
}:
|
}:
|
||||||
|
let
|
||||||
|
# "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
|
||||||
|
gradle = gradle_8;
|
||||||
|
in
|
||||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||||
pname = "atlauncher";
|
pname = "atlauncher";
|
||||||
version = "3.4.38.0";
|
version = "3.4.38.0";
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
gradle,
|
gradle_8,
|
||||||
jdk,
|
jdk,
|
||||||
quark-engine,
|
quark-engine,
|
||||||
makeBinaryWrapper,
|
makeBinaryWrapper,
|
||||||
@ -11,7 +11,10 @@
|
|||||||
copyDesktopItems,
|
copyDesktopItems,
|
||||||
desktopToDarwinBundle,
|
desktopToDarwinBundle,
|
||||||
}:
|
}:
|
||||||
|
let
|
||||||
|
# "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
|
||||||
|
gradle = gradle_8;
|
||||||
|
in
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "jadx";
|
pname = "jadx";
|
||||||
version = "1.5.0";
|
version = "1.5.0";
|
||||||
|
@ -4,13 +4,15 @@
|
|||||||
fetchgit,
|
fetchgit,
|
||||||
python3,
|
python3,
|
||||||
jdk17_headless,
|
jdk17_headless,
|
||||||
gradle,
|
gradle_8,
|
||||||
makeWrapper,
|
makeWrapper,
|
||||||
postgresql,
|
postgresql,
|
||||||
postgresqlTestHook,
|
postgresqlTestHook,
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
customPython = python3.withPackages (p: [ p.setuptools ]);
|
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
|
in
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "libeufin";
|
pname = "libeufin";
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
makeDesktopItem,
|
makeDesktopItem,
|
||||||
copyDesktopItems,
|
copyDesktopItems,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
gradle,
|
gradle_8,
|
||||||
jdk17,
|
jdk17,
|
||||||
zenity,
|
zenity,
|
||||||
|
|
||||||
@ -43,6 +43,8 @@ let
|
|||||||
buildVersion = makeBuildVersion version;
|
buildVersion = makeBuildVersion version;
|
||||||
|
|
||||||
jdk = jdk17;
|
jdk = jdk17;
|
||||||
|
# "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
|
||||||
|
gradle = gradle_8;
|
||||||
|
|
||||||
Mindustry = fetchFromGitHub {
|
Mindustry = fetchFromGitHub {
|
||||||
owner = "Anuken";
|
owner = "Anuken";
|
||||||
|
@ -2,12 +2,15 @@
|
|||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
gradle,
|
gradle_8,
|
||||||
makeWrapper,
|
makeWrapper,
|
||||||
jdk,
|
jdk,
|
||||||
gsettings-desktop-schemas,
|
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: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "mucommander";
|
pname = "mucommander";
|
||||||
version = "1.5.2-1";
|
version = "1.5.2-1";
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
makeWrapper,
|
makeWrapper,
|
||||||
openjdk,
|
openjdk,
|
||||||
gradle,
|
gradle_8,
|
||||||
wget,
|
wget,
|
||||||
which,
|
which,
|
||||||
gnused,
|
gnused,
|
||||||
@ -14,6 +14,10 @@
|
|||||||
testers,
|
testers,
|
||||||
nixosTests,
|
nixosTests,
|
||||||
}:
|
}:
|
||||||
|
let
|
||||||
|
# "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
|
||||||
|
gradle = gradle_8;
|
||||||
|
in
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "nextflow";
|
pname = "nextflow";
|
||||||
# 24.08.0-edge is compatible with Java 21. The current (as of 2024-09-19)
|
# 24.08.0-edge is compatible with Java 21. The current (as of 2024-09-19)
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
fetchpatch2,
|
fetchpatch2,
|
||||||
|
|
||||||
gradle,
|
gradle_8,
|
||||||
gradle_7,
|
gradle_7,
|
||||||
perl,
|
perl,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
@ -57,7 +57,7 @@ let
|
|||||||
atLeast21 = lib.versionAtLeast featureVersion "21";
|
atLeast21 = lib.versionAtLeast featureVersion "21";
|
||||||
atLeast23 = lib.versionAtLeast featureVersion "23";
|
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
|
in
|
||||||
|
|
||||||
assert lib.assertMsg (lib.pathExists sourceFile)
|
assert lib.assertMsg (lib.pathExists sourceFile)
|
||||||
|
@ -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 {
|
stdenv.mkDerivation rec {
|
||||||
pname = "pdftk";
|
pname = "pdftk";
|
||||||
version = "3.3.3";
|
version = "3.3.3";
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{ lib, stdenv, fetchFromGitLab, jdk17_headless, coreutils, findutils, gnused,
|
{ lib, stdenv, fetchFromGitLab, jdk17_headless, coreutils, findutils, gnused,
|
||||||
gradle, git, makeWrapper, jre_minimal
|
gradle_8, git, makeWrapper, jre_minimal
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
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 {
|
in stdenv.mkDerivation {
|
||||||
inherit pname src version;
|
inherit pname src version;
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
, lib
|
, lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, gradle
|
, gradle_8
|
||||||
, perl
|
, perl
|
||||||
, jre
|
, jre
|
||||||
, libGL
|
, libGL
|
||||||
@ -55,6 +55,9 @@ let
|
|||||||
|
|
||||||
depsPath' = if depsPath != null then depsPath else ./. + "/${pname}/deps.json";
|
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 // {
|
in stdenv.mkDerivation (cleanAttrs // {
|
||||||
inherit pname version src patches postPatch;
|
inherit pname version src patches postPatch;
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
lib,
|
lib,
|
||||||
callPackage,
|
callPackage,
|
||||||
gradle,
|
gradle_8,
|
||||||
makeBinaryWrapper,
|
makeBinaryWrapper,
|
||||||
openjdk21,
|
openjdk21,
|
||||||
unzip,
|
unzip,
|
||||||
@ -73,6 +73,9 @@ let
|
|||||||
HERE
|
HERE
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
# "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
|
||||||
|
gradle = gradle_8;
|
||||||
|
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
inherit
|
inherit
|
||||||
|
Loading…
Reference in New Issue
Block a user