diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-31 04:10:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-31 04:10:01 +0100 |
| commit | 1fd35ff65bf24a3acd0e14fbcb75f9b5d57adebd (patch) | |
| tree | f739ec2984a61ee4a3662834d4cebb93b2f46a71 | |
| parent | 161b9b24365cff3c94f1c2d3eb5a5e13c722d04a (diff) | |
| parent | 54bf37a9576f6e510b2403eec926a2948799e96b (diff) | |
| download | nixpkgs-1fd35ff65bf24a3acd0e14fbcb75f9b5d57adebd.tar nixpkgs-1fd35ff65bf24a3acd0e14fbcb75f9b5d57adebd.tar.gz nixpkgs-1fd35ff65bf24a3acd0e14fbcb75f9b5d57adebd.tar.bz2 nixpkgs-1fd35ff65bf24a3acd0e14fbcb75f9b5d57adebd.tar.lz nixpkgs-1fd35ff65bf24a3acd0e14fbcb75f9b5d57adebd.tar.xz nixpkgs-1fd35ff65bf24a3acd0e14fbcb75f9b5d57adebd.tar.zst nixpkgs-1fd35ff65bf24a3acd0e14fbcb75f9b5d57adebd.zip | |
Merge pull request #111311 from lorenzleutgeb/gradle-6.8.1
| -rw-r--r-- | pkgs/development/tools/build-managers/gradle/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/games/mindustry/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 638be6b02d8..d314064904d 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -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"; }; }; diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index fb6b9d70a9c..ca4dc3b9a17 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -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 { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c4eaa8e71a..c9e45a90aea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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. |