@@ -3,7 +3,6 @@
33, makeDesktopItem
44, copyDesktopItems
55, fetchFromGitHub
6−, fetchpatch
76, gradleGen
87, jdk
98, perl
@@ -30,45 +29,31 @@ let
3029 # Note: when raising the version, ensure that all SNAPSHOT versions in
3130 # build.gradle are replaced by a fixed version
3231 # (the current one at the time of release) (see postPatch).
33− version = "122.1";
32+ version = "123.1";
3433 buildVersion = makeBuildVersion version;
3534
3635 Mindustry = fetchFromGitHub {
3736 owner = "Anuken";
3837 repo = "Mindustry";
3938 rev = "v${version}";
40− sha256 = "18m4s81cfb2cr2fj61nf6spiln7cbvx25g42w6fypfikflv3qd8y";
39+ sha256 = "0qpgilb0v93zcik12idwzdd5b5lw74431iywq4d55gn5i6gb6bh1";
4140 };
4241 Arc = fetchFromGitHub {
4342 owner = "Anuken";
4443 repo = "Arc";
4544 rev = "v${version}";
46− sha256 = "0inzyj01442da7794cpxlaab7di9gv1snc97cbffqsdxgin16i7d";
45+ sha256 = "146wvm0dahygnq327pspr62lq29irwrhc8ylgwdwwasrvlsscdp5";
4746 };
4847 soloud = fetchFromGitHub {
4948 owner = "Anuken";
5049 repo = "soloud";
5150 # this is never pinned in upstream, see https://github.com/Anuken/Arc/issues/39
52− rev = "8553049c6fb0d1eaa7f57c1793b96219c84e8ba5";
53− sha256 = "076vnjs2qxd65qq5i37gbmj5v5i04a1vw0kznq986gv9190jj531";
51+ rev = "73860909189c9c42924eb82e9b4a0eab2a4d5e1c";
52+ sha256 = "1gm3r16a539hm8jbc14mfxn7v88dv40vr7nzwmpifnz54qarkg3m";
5453 };
5554
5655 patches = [
5756 ./0001-fix-include-path-for-SDL2-on-linux.patch
58− # upstream fix for https://github.com/Anuken/Arc/issues/40, remove on next release
59− (fetchpatch {
60− url = "https://github.com/Anuken/Arc/commit/b2f3d212c1a88a62f140f5cb04f4c86e61332d1c.patch";
61− sha256 = "1yjp4drv7lk3kinzy47g8jhb2qazr92b85vbc79vsqrs8sycskan";
62− extraPrefix = "Arc/";
63− stripLen = 1;
64− })
65− # add resolveDependencies task, remove when and if it gets added upstream in a future release
66− (fetchpatch {
67− url = "https://github.com/Anuken/Mindustry/pull/4302.patch";
68− sha256 = "0yp42sray4fxkajhpdljal0wss8jh9rvmclysw6cixsa94pw5khq";
69− extraPrefix = "Mindustry/";
70− stripLen = 1;
71− })
7257 ];
7358
7459 unpackPhase = ''
@@ -129,7 +114,7 @@ let
129114 '';
130115 outputHashAlgo = "sha256";
131116 outputHashMode = "recursive";
132− outputHash = "09rwyrg2yv8r499b0dk1bzvymsf98d4j5b95bwd9s4xvrz71is3l";
117+ outputHash = "18r2gd1y79cy571f5hvlablfwrlz10cf7ssc9ckkvkk92i0323gk";
133118 };
134119
135120in