git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #145365 from lorenzleutgeb/gradle-7.3
3df68ceKevin Cox
maintainers/maintainer-list.nix+6
compare with master
unifiedsplit
@@ -6666,6 +6666,12 @@
6666 fingerprint = "5B93 9CFA E8FC 4D8F E07A 3AEA DFE1 D4A0 1733 7E2A";
6666 fingerprint = "5B93 9CFA E8FC 4D8F E07A 3AEA DFE1 D4A0 1733 7E2A";
6667 }];
6667 }];
6668 };
6668 };
6669+ lorenzleutgeb = {
6670+ email = "lorenz@leutgeb.xyz";
6671+ github = "lorenzleutgeb";
6672+ githubId = 542154;
6673+ name = "Lorenz Leutgeb";
6674+ };
6669 luis = {
6675 luis = {
6670 email = "luis.nixos@gmail.com";
6676 email = "luis.nixos@gmail.com";
6671 github = "Luis-Hebendanz";
6677 github = "Luis-Hebendanz";
pkgs/development/tools/build-managers/gradle/default.nix+6−10
@@ -47,7 +47,7 @@ rec {
47 nativeBuildInputs = [ makeWrapper unzip ];
47 nativeBuildInputs = [ makeWrapper unzip ];
48 buildInputs = [ java ];
48 buildInputs = [ java ];
49
49
50− meta = {
50+ meta = with lib; {
51 description = "Enterprise-grade build system";
51 description = "Enterprise-grade build system";
52 longDescription = ''
52 longDescription = ''
53 Gradle is a build system which offers you ease, power and freedom.
53 Gradle is a build system which offers you ease, power and freedom.
@@ -58,18 +58,14 @@ rec {
58 build-by-convention behavior.
58 build-by-convention behavior.
59 '';
59 '';
60 homepage = "http://www.gradle.org/";
60 homepage = "http://www.gradle.org/";
61− license = lib.licenses.asl20;
61+ license = licenses.asl20;
62− platforms = lib.platforms.unix;
62+ platforms = platforms.unix;
63+ maintainers = with maintainers; [ lorenzleutgeb ];
63 };
64 };
64 };
65 };
65
66
66− gradle_latest = gradle_7;
67+ gradle_latest = gradle_7_3;
67−
68− # NOTE: 7.3 is a candidate.
69− gradle_7 = gradle_7_2;
70−
71− gradle_7_3 = gradleGen (gradleSpec (import ./gradle-7.3-rc-3-spec.nix));
68+ gradle_7_3 = gradleGen (gradleSpec (import ./gradle-7.3-spec.nix));
72− gradle_7_2 = gradleGen (gradleSpec (import ./gradle-7.2-spec.nix));
73 gradle_6_9 = gradleGen (gradleSpec (import ./gradle-6.9.1-spec.nix));
69 gradle_6_9 = gradleGen (gradleSpec (import ./gradle-6.9.1-spec.nix));
74
70
75 # NOTE: No GitHub Release for this release, so update.sh does not work.
71 # NOTE: No GitHub Release for this release, so update.sh does not work.
pkgs/development/tools/build-managers/gradle/gradle-7.3-rc-3-spec.nixdeleted−5
@@ -1,5 +0,0 @@
1−{
2− version = "7.3-rc-3";
3− nativeVersion = "0.22-milestone-21";
4− sha256 = "0401q4qpl36a2vnlrlsblflfiiy3b95gyj2wj62hzc1x00hbfznm";
5−}
pkgs/development/tools/build-managers/gradle/gradle-7.3-spec.nixnew file+5
@@ -0,0 +1,5 @@
1+{
2+ version = "7.3";
3+ nativeVersion = "0.22-milestone-21";
4+ sha256 = "04741q7avmn7rv9h5s6dqj4ibnvdylxrlhvj9wb5kixx96nm53yy";
5+}
pkgs/top-level/all-packages.nix+1−1
@@ -14577,7 +14577,7 @@ with pkgs;
14577 gradle_4 = gradle_4_10;
14577 gradle_4 = gradle_4_10;
14578 gradle_5 = res.gradleGen.gradle_5_6;
14578 gradle_5 = res.gradleGen.gradle_5_6;
14579 gradle_6 = res.gradleGen.gradle_6_9;
14579 gradle_6 = res.gradleGen.gradle_6_9;
14580− gradle_7 = res.gradleGen.gradle_7;
14580+ gradle_7 = res.gradleGen.gradle_7_3;
14581
14581
14582 gperf = callPackage ../development/tools/misc/gperf { };
14582 gperf = callPackage ../development/tools/misc/gperf { };
14583 # 3.1 changed some parameters from int to size_t, leading to mismatches.
14583 # 3.1 changed some parameters from int to size_t, leading to mismatches.