diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index feebff4884f3..1e03529bf1de 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6666,6 +6666,12 @@ fingerprint = "5B93 9CFA E8FC 4D8F E07A 3AEA DFE1 D4A0 1733 7E2A"; }]; }; + lorenzleutgeb = { + email = "lorenz@leutgeb.xyz"; + github = "lorenzleutgeb"; + githubId = 542154; + name = "Lorenz Leutgeb"; + }; luis = { email = "luis.nixos@gmail.com"; github = "Luis-Hebendanz"; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index c0c576d6d462..877f28419055 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -47,7 +47,7 @@ rec { nativeBuildInputs = [ makeWrapper unzip ]; buildInputs = [ java ]; - meta = { + meta = with lib; { description = "Enterprise-grade build system"; longDescription = '' Gradle is a build system which offers you ease, power and freedom. @@ -58,18 +58,14 @@ rec { build-by-convention behavior. ''; homepage = "http://www.gradle.org/"; - license = lib.licenses.asl20; - platforms = lib.platforms.unix; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ lorenzleutgeb ]; }; }; - gradle_latest = gradle_7; - - # NOTE: 7.3 is a candidate. - gradle_7 = gradle_7_2; - - gradle_7_3 = gradleGen (gradleSpec (import ./gradle-7.3-rc-3-spec.nix)); - gradle_7_2 = gradleGen (gradleSpec (import ./gradle-7.2-spec.nix)); + gradle_latest = gradle_7_3; + gradle_7_3 = gradleGen (gradleSpec (import ./gradle-7.3-spec.nix)); gradle_6_9 = gradleGen (gradleSpec (import ./gradle-6.9.1-spec.nix)); # NOTE: No GitHub Release for this release, so update.sh does not work. diff --git a/pkgs/development/tools/build-managers/gradle/gradle-7.3-rc-3-spec.nix b/pkgs/development/tools/build-managers/gradle/gradle-7.3-rc-3-spec.nix deleted file mode 100644 index c9542d98e816..000000000000 --- a/pkgs/development/tools/build-managers/gradle/gradle-7.3-rc-3-spec.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - version = "7.3-rc-3"; - nativeVersion = "0.22-milestone-21"; - sha256 = "0401q4qpl36a2vnlrlsblflfiiy3b95gyj2wj62hzc1x00hbfznm"; -} diff --git a/pkgs/development/tools/build-managers/gradle/gradle-7.3-spec.nix b/pkgs/development/tools/build-managers/gradle/gradle-7.3-spec.nix new file mode 100644 index 000000000000..2e7b00732970 --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/gradle-7.3-spec.nix @@ -0,0 +1,5 @@ +{ + version = "7.3"; + nativeVersion = "0.22-milestone-21"; + sha256 = "04741q7avmn7rv9h5s6dqj4ibnvdylxrlhvj9wb5kixx96nm53yy"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6dc7a9ee8a2c..c8c9ec061b4f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14577,7 +14577,7 @@ with pkgs; gradle_4 = gradle_4_10; gradle_5 = res.gradleGen.gradle_5_6; gradle_6 = res.gradleGen.gradle_6_9; - gradle_7 = res.gradleGen.gradle_7; + gradle_7 = res.gradleGen.gradle_7_3; gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches.