mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
Merge pull request #111311 from lorenzleutgeb/gradle-6.8.1
This commit is contained in:
commit
1fd35ff65b
|
@ -51,15 +51,15 @@ rec {
|
|||
};
|
||||
};
|
||||
|
||||
gradle_latest = gradle_6_7;
|
||||
gradle_latest = gradle_6_8;
|
||||
|
||||
gradle_6_7 = gradleGen rec {
|
||||
name = "gradle-6.7";
|
||||
nativeVersion = "0.22-milestone-8";
|
||||
gradle_6_8 = gradleGen rec {
|
||||
name = "gradle-6.8.1";
|
||||
nativeVersion = "0.22-milestone-9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://services.gradle.org/distributions/${name}-bin.zip";
|
||||
sha256 = "1i6zm55wzy13wvvmf3804b0rs47yrqqablf4gpf374ls05cpgmca";
|
||||
sha256 = "1zfn7400k39qbiidd5zxay6v5f5xz8x4g7rrf04p71bkmws1lngx";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -88,7 +88,7 @@ let
|
|||
'';
|
||||
|
||||
# The default one still uses jdk8 (#89731)
|
||||
gradle_6 = (gradleGen.override (old: { java = jdk; })).gradle_6_7;
|
||||
gradle_6 = (gradleGen.override (old: { java = jdk; })).gradle_6_8;
|
||||
|
||||
# fake build to pre-download deps into fixed-output derivation
|
||||
deps = stdenv.mkDerivation {
|
||||
|
|
|
@ -12205,7 +12205,7 @@ in
|
|||
gradle_4_10 = res.gradleGen.gradle_4_10;
|
||||
gradle_4 = gradle_4_10;
|
||||
gradle_5 = res.gradleGen.gradle_5_6;
|
||||
gradle_6 = res.gradleGen.gradle_6_7;
|
||||
gradle_6 = res.gradleGen.gradle_6_8;
|
||||
|
||||
gperf = callPackage ../development/tools/misc/gperf { };
|
||||
# 3.1 changed some parameters from int to size_t, leading to mismatches.
|
||||
|
|
Loading…
Reference in a new issue