jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #119352 from lorenzleutgeb/gradle-7

Browse Source
This commit is contained in:
Sandro 2021-04-14 18:58:38 +02:00 committed by GitHub
commit 80a0032cc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/p2p/frostwire/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }:
{ lib, stdenv, fetchFromGitHub, gradle_6, perl, jre, makeWrapper, makeDesktopItem, mplayer }:
let
version = "6.6.7-build-529";
@ -25,7 +25,7 @@ let
deps = stdenv.mkDerivation {
name = "${name}-deps";
inherit src;
buildInputs = [ gradle perl ];
buildInputs = [ gradle_6 perl ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
( cd desktop
@ -47,7 +47,7 @@ in stdenv.mkDerivation {
inherit name src;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ gradle ];
buildInputs = [ gradle_6 ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)

7
pkgs/development/tools/build-managers/gradle/default.nix
View File

@ -61,13 +61,12 @@ in rec {
};
};
# NOTE: Gradle 7 is a release candidate, so point to 6.8.
gradle_latest = gradle_6_8;
gradle_latest = gradle_7;
gradle_7 = gradleGen (gradleSpec {
version = "7.0-rc-2";
version = "7.0";
nativeVersion = "0.22-milestone-11";
sha256 = "0gzvigyvwwizx90vnzhdnbm5rdaki11inxna11s4y67xkn8hrnx5";
sha256 = "01f3bjn8pbpni8kmxvx1dpwpf4zz04vj7cpm6025n0k188c8k2zb";
});
gradle_6_8 = gradleGen (gradleSpec {

2
pkgs/development/tools/scenebuilder/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, jdk, gradleGen, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper, glib, wrapGAppsHook }:
let
# The default one still uses jdk8 (#89731)
gradle = (gradleGen.override (old: { java = jdk; })).gradle_latest;
gradle = (gradleGen.override (old: { java = jdk; })).gradle_6_8;
pname = "scenebuilder";
version = "15.0.1";

6
pkgs/games/shattered-pixel-dungeon/default.nix
View File

@ -2,7 +2,7 @@
, makeWrapper
, fetchFromGitHub
, nixosTests
, gradle
, gradle_6
, perl
, jre
, libpulseaudio
@ -33,7 +33,7 @@ let
deps = stdenv.mkDerivation {
pname = "${pname}-deps";
inherit version src postPatch;
nativeBuildInputs = [ gradle perl ];
nativeBuildInputs = [ gradle_6 perl ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
# https://github.com/gradle/gradle/issues/4426
@ -54,7 +54,7 @@ let
in stdenv.mkDerivation rec {
inherit pname version src postPatch;
nativeBuildInputs = [ gradle perl makeWrapper ];
nativeBuildInputs = [ gradle_6 perl makeWrapper ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)

6
pkgs/servers/ma1sd/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, jre, git, gradle, perl, makeWrapper }:
{ lib, stdenv, fetchFromGitHub, jre, git, gradle_6, perl, makeWrapper }:
let
name = "ma1sd-${version}";
@ -16,7 +16,7 @@ let
deps = stdenv.mkDerivation {
name = "${name}-deps";
inherit src;
nativeBuildInputs = [ gradle perl git ];
nativeBuildInputs = [ gradle_6 perl git ];
buildPhase = ''
export MA1SD_BUILD_VERSION=${rev}
@ -41,7 +41,7 @@ let
in
stdenv.mkDerivation {
inherit name src version;
nativeBuildInputs = [ gradle perl makeWrapper ];
nativeBuildInputs = [ gradle_6 perl makeWrapper ];
buildInputs = [ jre ];
buildPhase = ''

6
pkgs/servers/mxisd/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, jre, git, gradle, perl, makeWrapper }:
{ lib, stdenv, fetchFromGitHub, jre, git, gradle_6, perl, makeWrapper }:
let
name = "mxisd-${version}";
@ -16,7 +16,7 @@ let
deps = stdenv.mkDerivation {
name = "${name}-deps";
inherit src;
nativeBuildInputs = [ gradle perl git ];
nativeBuildInputs = [ gradle_6 perl git ];
buildPhase = ''
export MXISD_BUILD_VERSION=${rev}
@ -41,7 +41,7 @@ let
in
stdenv.mkDerivation {
inherit name src version;
nativeBuildInputs = [ gradle perl makeWrapper ];
nativeBuildInputs = [ gradle_6 perl makeWrapper ];
buildInputs = [ jre ];
patches = [ ./0001-gradle.patch ];