Merge pull request #145460 from lorenzleutgeb/gradle-clean

gradle: Clean up
This commit is contained in:
Kevin Cox 2021-11-15 14:28:39 -05:00 committed by GitHub
commit 969ab6aca0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 30 deletions

View file

@ -1,21 +1,20 @@
{ lib, stdenv, fetchurl, unzip, jdk, java ? jdk, makeWrapper }: { lib, stdenv, fetchurl, unzip, jdk, java ? jdk, makeWrapper }:
let rec {
gradleSpec = { version, nativeVersion, sha256 }: rec { gradleGen = { version, nativeVersion, sha256 }: stdenv.mkDerivation {
inherit nativeVersion; pname = "gradle";
name = "gradle-${version}"; inherit version;
src = fetchurl { src = fetchurl {
inherit sha256; inherit sha256;
url = "https://services.gradle.org/distributions/${name}-bin.zip"; url = "https://services.gradle.org/distributions/gradle-${version}-bin.zip";
}; };
};
in
rec {
gradleGen = { name, src, nativeVersion }: stdenv.mkDerivation {
inherit name src nativeVersion;
dontBuild = true; dontBuild = true;
nativeBuildInputs = [ makeWrapper unzip ];
buildInputs = [ java ];
installPhase = '' installPhase = ''
mkdir -pv $out/lib/gradle/ mkdir -pv $out/lib/gradle/
cp -rv lib/ $out/lib/gradle/ cp -rv lib/ $out/lib/gradle/
@ -44,9 +43,6 @@ rec {
echo ${stdenv.cc.cc} > $out/nix-support/manual-runtime-dependencies echo ${stdenv.cc.cc} > $out/nix-support/manual-runtime-dependencies
''; '';
nativeBuildInputs = [ makeWrapper unzip ];
buildInputs = [ java ];
meta = with lib; { meta = with lib; {
description = "Enterprise-grade build system"; description = "Enterprise-grade build system";
longDescription = '' longDescription = ''
@ -57,7 +53,9 @@ rec {
between the flexibility of Ant and the convenience of a between the flexibility of Ant and the convenience of a
build-by-convention behavior. build-by-convention behavior.
''; '';
homepage = "http://www.gradle.org/"; homepage = "https://www.gradle.org/";
changelog = "https://docs.gradle.org/${version}/release-notes.html";
downloadPage = "https://gradle.org/next-steps/?version=${version}";
license = licenses.asl20; license = licenses.asl20;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ lorenzleutgeb ]; maintainers = with maintainers; [ lorenzleutgeb ];
@ -65,20 +63,11 @@ rec {
}; };
gradle_latest = gradle_7_3; 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. gradle_7_3 = gradleGen (import ./gradle-7.3-spec.nix);
gradle_5_6 = gradleGen (gradleSpec { gradle_6_9 = gradleGen (import ./gradle-6.9.1-spec.nix);
version = "5.6.4";
nativeVersion = "0.18";
sha256 = "03d86bbqd19h9xlanffcjcy3vg1k5905vzhf9mal9g21603nfc0z";
});
# NOTE: No GitHub Release for this release, so update.sh does not work. # NOTE: No GitHub Release for the following versions. Update.sh will not work.
gradle_4_10 = gradleGen (gradleSpec { gradle_5_6 = gradleGen (import ./gradle-5.6.4-spec.nix);
version = "4.10.3"; gradle_4_10 = gradleGen (import ./gradle-4.10.3-spec.nix);
nativeVersion = "0.14";
sha256 = "0vhqxnk0yj3q9jam5w4kpia70i4h0q4pjxxqwynh3qml0vrcn9l6";
});
} }

View file

@ -0,0 +1,5 @@
{
version = "4.10.3";
nativeVersion = "0.14";
sha256 = "0vhqxnk0yj3q9jam5w4kpia70i4h0q4pjxxqwynh3qml0vrcn9l6";
}

View file

@ -0,0 +1,5 @@
{
version = "5.6.4";
nativeVersion = "0.18";
sha256 = "03d86bbqd19h9xlanffcjcy3vg1k5905vzhf9mal9g21603nfc0z";
}

View file

@ -14601,8 +14601,7 @@ with pkgs;
java = jdk8; # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731 java = jdk8; # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731
}; };
gradle = res.gradleGen.gradle_latest; gradle = res.gradleGen.gradle_latest;
gradle_4_10 = res.gradleGen.gradle_4_10; gradle_4 = res.gradleGen.gradle_4_10;
gradle_4 = gradle_4_10;
gradle_5 = res.gradleGen.gradle_5_6; gradle_5 = res.gradleGen.gradle_5_6;
gradle_6 = res.gradleGen.gradle_6_9; gradle_6 = res.gradleGen.gradle_6_9;
gradle_7 = res.gradleGen.gradle_7_3; gradle_7 = res.gradleGen.gradle_7_3;