mindustry,mindustry-server: 122.1 -> 123.1 (#110793)
This commit is contained in:
parent
e34a53c4ea
commit
9ce1caa63c
|
@ -3,7 +3,6 @@
|
||||||
, makeDesktopItem
|
, makeDesktopItem
|
||||||
, copyDesktopItems
|
, copyDesktopItems
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, fetchpatch
|
|
||||||
, gradleGen
|
, gradleGen
|
||||||
, jdk
|
, jdk
|
||||||
, perl
|
, perl
|
||||||
|
@ -30,45 +29,31 @@ let
|
||||||
# Note: when raising the version, ensure that all SNAPSHOT versions in
|
# Note: when raising the version, ensure that all SNAPSHOT versions in
|
||||||
# build.gradle are replaced by a fixed version
|
# build.gradle are replaced by a fixed version
|
||||||
# (the current one at the time of release) (see postPatch).
|
# (the current one at the time of release) (see postPatch).
|
||||||
version = "122.1";
|
version = "123.1";
|
||||||
buildVersion = makeBuildVersion version;
|
buildVersion = makeBuildVersion version;
|
||||||
|
|
||||||
Mindustry = fetchFromGitHub {
|
Mindustry = fetchFromGitHub {
|
||||||
owner = "Anuken";
|
owner = "Anuken";
|
||||||
repo = "Mindustry";
|
repo = "Mindustry";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "18m4s81cfb2cr2fj61nf6spiln7cbvx25g42w6fypfikflv3qd8y";
|
sha256 = "0qpgilb0v93zcik12idwzdd5b5lw74431iywq4d55gn5i6gb6bh1";
|
||||||
};
|
};
|
||||||
Arc = fetchFromGitHub {
|
Arc = fetchFromGitHub {
|
||||||
owner = "Anuken";
|
owner = "Anuken";
|
||||||
repo = "Arc";
|
repo = "Arc";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0inzyj01442da7794cpxlaab7di9gv1snc97cbffqsdxgin16i7d";
|
sha256 = "146wvm0dahygnq327pspr62lq29irwrhc8ylgwdwwasrvlsscdp5";
|
||||||
};
|
};
|
||||||
soloud = fetchFromGitHub {
|
soloud = fetchFromGitHub {
|
||||||
owner = "Anuken";
|
owner = "Anuken";
|
||||||
repo = "soloud";
|
repo = "soloud";
|
||||||
# this is never pinned in upstream, see https://github.com/Anuken/Arc/issues/39
|
# this is never pinned in upstream, see https://github.com/Anuken/Arc/issues/39
|
||||||
rev = "8553049c6fb0d1eaa7f57c1793b96219c84e8ba5";
|
rev = "73860909189c9c42924eb82e9b4a0eab2a4d5e1c";
|
||||||
sha256 = "076vnjs2qxd65qq5i37gbmj5v5i04a1vw0kznq986gv9190jj531";
|
sha256 = "1gm3r16a539hm8jbc14mfxn7v88dv40vr7nzwmpifnz54qarkg3m";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./0001-fix-include-path-for-SDL2-on-linux.patch
|
./0001-fix-include-path-for-SDL2-on-linux.patch
|
||||||
# upstream fix for https://github.com/Anuken/Arc/issues/40, remove on next release
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/Anuken/Arc/commit/b2f3d212c1a88a62f140f5cb04f4c86e61332d1c.patch";
|
|
||||||
sha256 = "1yjp4drv7lk3kinzy47g8jhb2qazr92b85vbc79vsqrs8sycskan";
|
|
||||||
extraPrefix = "Arc/";
|
|
||||||
stripLen = 1;
|
|
||||||
})
|
|
||||||
# add resolveDependencies task, remove when and if it gets added upstream in a future release
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/Anuken/Mindustry/pull/4302.patch";
|
|
||||||
sha256 = "0yp42sray4fxkajhpdljal0wss8jh9rvmclysw6cixsa94pw5khq";
|
|
||||||
extraPrefix = "Mindustry/";
|
|
||||||
stripLen = 1;
|
|
||||||
})
|
|
||||||
];
|
];
|
||||||
|
|
||||||
unpackPhase = ''
|
unpackPhase = ''
|
||||||
|
@ -129,7 +114,7 @@ let
|
||||||
'';
|
'';
|
||||||
outputHashAlgo = "sha256";
|
outputHashAlgo = "sha256";
|
||||||
outputHashMode = "recursive";
|
outputHashMode = "recursive";
|
||||||
outputHash = "09rwyrg2yv8r499b0dk1bzvymsf98d4j5b95bwd9s4xvrz71is3l";
|
outputHash = "18r2gd1y79cy571f5hvlablfwrlz10cf7ssc9ckkvkk92i0323gk";
|
||||||
};
|
};
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
Loading…
Reference in a new issue