pyrox.dev
gradle: Pin pkgs to Gradle 6 that fail with 7
+3
-3
pkgs/applications/networking/p2p/frostwire/default.nix
+3
-3
pkgs/applications/networking/p2p/frostwire/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }:
1
+
{ lib, stdenv, fetchFromGitHub, gradle_6, perl, jre, makeWrapper, makeDesktopItem, mplayer }:
2
2
3
3
let
4
4
version = "6.6.7-build-529";
···
25
25
deps = stdenv.mkDerivation {
26
26
name = "${name}-deps";
27
27
inherit src;
28
-
buildInputs = [ gradle perl ];
28
+
buildInputs = [ gradle_6 perl ];
29
29
buildPhase = ''
30
30
export GRADLE_USER_HOME=$(mktemp -d)
31
31
( cd desktop
···
47
47
inherit name src;
48
48
49
49
nativeBuildInputs = [ makeWrapper ];
50
-
buildInputs = [ gradle ];
50
+
buildInputs = [ gradle_6 ];
51
51
52
52
buildPhase = ''
53
53
export GRADLE_USER_HOME=$(mktemp -d)
+1
-1
pkgs/development/tools/scenebuilder/default.nix
+1
-1
pkgs/development/tools/scenebuilder/default.nix
···
1
1
{ lib, stdenv, fetchFromGitHub, jdk, gradleGen, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper, glib, wrapGAppsHook }:
2
2
let
3
3
# The default one still uses jdk8 (#89731)
4
-
gradle = (gradleGen.override (old: { java = jdk; })).gradle_latest;
4
+
gradle = (gradleGen.override (old: { java = jdk; })).gradle_6_8;
5
5
6
6
pname = "scenebuilder";
7
7
version = "15.0.1";
+3
-3
pkgs/games/shattered-pixel-dungeon/default.nix
+3
-3
pkgs/games/shattered-pixel-dungeon/default.nix
···
2
2
, makeWrapper
3
3
, fetchFromGitHub
4
4
, nixosTests
5
-
, gradle
5
+
, gradle_6
6
6
, perl
7
7
, jre
8
8
, libpulseaudio
···
33
33
deps = stdenv.mkDerivation {
34
34
pname = "${pname}-deps";
35
35
inherit version src postPatch;
36
-
nativeBuildInputs = [ gradle perl ];
36
+
nativeBuildInputs = [ gradle_6 perl ];
37
37
buildPhase = ''
38
38
export GRADLE_USER_HOME=$(mktemp -d)
39
39
# https://github.com/gradle/gradle/issues/4426
···
54
54
in stdenv.mkDerivation rec {
55
55
inherit pname version src postPatch;
56
56
57
-
nativeBuildInputs = [ gradle perl makeWrapper ];
57
+
nativeBuildInputs = [ gradle_6 perl makeWrapper ];
58
58
59
59
buildPhase = ''
60
60
export GRADLE_USER_HOME=$(mktemp -d)
+3
-3
pkgs/servers/ma1sd/default.nix
+3
-3
pkgs/servers/ma1sd/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, jre, git, gradle, perl, makeWrapper }:
1
+
{ lib, stdenv, fetchFromGitHub, jre, git, gradle_6, perl, makeWrapper }:
2
2
3
3
let
4
4
name = "ma1sd-${version}";
···
16
16
deps = stdenv.mkDerivation {
17
17
name = "${name}-deps";
18
18
inherit src;
19
-
nativeBuildInputs = [ gradle perl git ];
19
+
nativeBuildInputs = [ gradle_6 perl git ];
20
20
21
21
buildPhase = ''
22
22
export MA1SD_BUILD_VERSION=${rev}
···
41
41
in
42
42
stdenv.mkDerivation {
43
43
inherit name src version;
44
-
nativeBuildInputs = [ gradle perl makeWrapper ];
44
+
nativeBuildInputs = [ gradle_6 perl makeWrapper ];
45
45
buildInputs = [ jre ];
46
46
47
47
buildPhase = ''
+3
-3
pkgs/servers/mxisd/default.nix
+3
-3
pkgs/servers/mxisd/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, jre, git, gradle, perl, makeWrapper }:
1
+
{ lib, stdenv, fetchFromGitHub, jre, git, gradle_6, perl, makeWrapper }:
2
2
3
3
let
4
4
name = "mxisd-${version}";
···
16
16
deps = stdenv.mkDerivation {
17
17
name = "${name}-deps";
18
18
inherit src;
19
-
nativeBuildInputs = [ gradle perl git ];
19
+
nativeBuildInputs = [ gradle_6 perl git ];
20
20
21
21
buildPhase = ''
22
22
export MXISD_BUILD_VERSION=${rev}
···
41
41
in
42
42
stdenv.mkDerivation {
43
43
inherit name src version;
44
-
nativeBuildInputs = [ gradle perl makeWrapper ];
44
+
nativeBuildInputs = [ gradle_6 perl makeWrapper ];
45
45
buildInputs = [ jre ];
46
46
47
47
patches = [ ./0001-gradle.patch ];