From 113bc6492db8155241fb099712b0560483a30e6d Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Sat, 30 Jan 2021 14:15:56 +0100 Subject: [PATCH 1/2] gradle: 6.7 -> 6.8.1 --- .../tools/build-managers/gradle/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 638be6b02d83..d314064904d1 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7c74d2f01ca..a6a8a7663dd3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12203,7 +12203,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. From 54bf37a9576f6e510b2403eec926a2948799e96b Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Sat, 30 Jan 2021 14:36:38 +0100 Subject: [PATCH 2/2] mindustry: Use Gradle 6.8 --- pkgs/games/mindustry/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index fb6b9d70a9cb..ca4dc3b9a17c 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 {