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

mindustry,mindustry-server: 122.1 -> 123.1 (#110793)

Browse Source
This commit is contained in:
Francesco Gazzetta 2021-01-25 18:39:38 +00:00 committed by GitHub
parent e34a53c4ea
commit 9ce1caa63c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/games/mindustry/default.nix
View File

@ -3,7 +3,6 @@
, makeDesktopItem
, copyDesktopItems
, fetchFromGitHub
, fetchpatch
, gradleGen
, jdk
, perl
@ -30,45 +29,31 @@ let
# Note: when raising the version, ensure that all SNAPSHOT versions in
# build.gradle are replaced by a fixed version
# (the current one at the time of release) (see postPatch).
version = "122.1";
version = "123.1";
buildVersion = makeBuildVersion version;
Mindustry = fetchFromGitHub {
owner = "Anuken";
repo = "Mindustry";
rev = "v${version}";
sha256 = "18m4s81cfb2cr2fj61nf6spiln7cbvx25g42w6fypfikflv3qd8y";
sha256 = "0qpgilb0v93zcik12idwzdd5b5lw74431iywq4d55gn5i6gb6bh1";
};
Arc = fetchFromGitHub {
owner = "Anuken";
repo = "Arc";
rev = "v${version}";
sha256 = "0inzyj01442da7794cpxlaab7di9gv1snc97cbffqsdxgin16i7d";
sha256 = "146wvm0dahygnq327pspr62lq29irwrhc8ylgwdwwasrvlsscdp5";
};
soloud = fetchFromGitHub {
owner = "Anuken";
repo = "soloud";
# this is never pinned in upstream, see https://github.com/Anuken/Arc/issues/39
rev = "8553049c6fb0d1eaa7f57c1793b96219c84e8ba5";
sha256 = "076vnjs2qxd65qq5i37gbmj5v5i04a1vw0kznq986gv9190jj531";
rev = "73860909189c9c42924eb82e9b4a0eab2a4d5e1c";
sha256 = "1gm3r16a539hm8jbc14mfxn7v88dv40vr7nzwmpifnz54qarkg3m";
};
patches = [
./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 = ''
@ -129,7 +114,7 @@ let
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "09rwyrg2yv8r499b0dk1bzvymsf98d4j5b95bwd9s4xvrz71is3l";
outputHash = "18r2gd1y79cy571f5hvlablfwrlz10cf7ssc9ckkvkk92i0323gk";
};
in