@@ -7,22 +7,22 @@ let
77
88in {
99 ca = buildOpenRAMod {
10− version = "93";
10+ version = "96.git.fc3cf0b";
1111 title = "Combined Arms";
1212 description = "A game that combines units from the official OpenRA Red Alert and Tiberian Dawn mods";
1313 homepage = https://github.com/Inq8/CAmod;
1414 src = fetchFromGitHub {
1515 owner = "Inq8";
1616 repo = "CAmod";
17− rev = "16fb77d037be7005c3805382712c33cec1a2788c";
18− sha256 = "11fjyr3692cy2a09bqzk5ya1hf6plh8hmdrgzds581r9xbj0q4pr";
17+ rev = "fc3cf0baf2b827650eaae9e1d2335a3eed24bac9";
18+ sha256 = "15w91xs253gyrlzsgid6ixxjazx0fbzick6vlkiay0znb58n883m";
1919 };
20− engine = let commit = "b8a7dd52ff893ed8225726d4ed4e14ecad748404"; in {
21− version = abbrevCommit commit;
20+ engine = {
21+ version = "b8a7dd5";
2222 src = fetchFromGitHub {
2323 owner = "Inq8";
2424 repo = "CAengine" ;
25− rev = commit;
25+ rev = "b8a7dd52ff893ed8225726d4ed4e14ecad748404";
2626 sha256 = "0dyk861qagibx8ldshz7d2nrki9q550f6f0wy8pvayvf1gv1dbxj";
2727 name = "engine";
2828 inherit extraPostFetch;
@@ -31,23 +31,23 @@ in {
3131 };
3232
3333 d2 = unsafeBuildOpenRAMod rec {
34− version = "128";
34+ version = "134.git.69a4aa7";
3535 title = "Dune II";
3636 description = "A modernization of the original ${title} game";
3737 homepage = https://github.com/OpenRA/d2;
3838 src = fetchFromGitHub {
3939 owner = "OpenRA";
4040 repo = "d2";
41− rev = "bc969207b532a2def69e0d6ac09a4e8fb5d4e946";
42− sha256 = "18v154kf1fmfk2gnymb3ggsfy73ql8rr7jvbhiw60yhzwx89cdk8";
41+ rev = "69a4aa708e2c26376469c0048fac13592aa452ca";
42+ sha256 = "1mfch4s6c05slyqvxllklbxpqq8dqcbx3515n3gyylyq43gq481r";
4343 };
4444 engine = rec {
45− version = "20181215";
45+ version = "release-20181215";
4646 mods = [ "cnc" "d2k" "ra" ];
4747 src = fetchFromGitHub {
4848 owner = "OpenRA";
4949 repo = "OpenRA" ;
50− rev = "release-${version}";
50+ rev = version;
5151 sha256 = "0p0izykjnz7pz02g2khp7msqa00jhjsrzk9y0g29dirmdv75qa4r";
5252 name = "engine";
5353 inherit extraPostFetch;
@@ -60,23 +60,23 @@ in {
6060 };
6161
6262 dr = buildOpenRAMod rec {
63− version = "244";
63+ version = "266.git.920b476";
6464 title = "Dark Reign";
6565 description = "A re-imagination of the original Command & Conquer: ${title} game";
6666 homepage = https://github.com/drogoganor/DarkReign;
6767 src = fetchFromGitHub {
6868 owner = "drogoganor";
6969 repo = "DarkReign";
70− rev = "e21db398f4d995c91b9e1a0f31ffaa7d54f43742";
71− sha256 = "1gzvdf6idmx0rr8afaxd9dsbnxljif2kic6znkd9vcrwnqmp1fjr";
70+ rev = "920b476be1b7751db087f1f7acd504b8a048d1e2";
71+ sha256 = "11ir4pnichrnv4z9532fp9g166jl8fvy5kk03a2fgxssp3g40zz2";
7272 };
73− engine = let commit = "7fcfb1dcb2bd472fa6680ffa37bd3bbedb2c44c5"; in {
74− version = abbrevCommit commit;
73+ engine = {
74+ version = "DarkReign";
7575 src = fetchFromGitHub {
7676 owner = "drogoganor";
7777 repo = "OpenRA" ;
78− rev = commit;
79− sha256 = "0x7k96j3q16dgay4jjlyv9kcgn4sc4v9ksw6ijnjws7q1r2rjs0m";
78+ rev = "e08b75c2add30439228ea3dd61d6be60d1800329";
79+ sha256 = "125vf962p69ajrh5pxgfwsi0ksczqwvlw5kn2fvffiwvh8d5in23";
8080 name = "engine";
8181 inherit extraPostFetch;
8282 };
@@ -84,71 +84,76 @@ in {
8484 };
8585
8686 gen = buildOpenRAMod {
87− version = "1133";
87+ version = "1157.git.4f5e11d";
8888 title = "Generals Alpha";
8989 description = "Re-imagination of the original Command & Conquer: Generals game";
9090 homepage = https://github.com/MustaphaTR/Generals-Alpha;
9191 src = fetchFromGitHub {
9292 owner = "MustaphaTR";
9393 repo = "Generals-Alpha";
94− rev = "277d20d5a8b5e11eac9443031af133dc110c653f";
95− sha256 = "1k37545l99q7zphnh1ykvimsyp5daykannps07d4dgr2w9l7bmhg";
94+ rev = "4f5e11d916e4a03d8cf1c97eef484ce2d77d7df2";
95+ sha256 = "1wnl4qrlhynnlahgdlxwhgsdba5wgdg9yrv9f8hkgi69j60szypd";
9696 };
9797 engine = rec {
98− version = "gen-20180905";
98+ version = "gen-20190128_3";
9999 src = fetchFromGitHub {
100100 owner = "MustaphaTR";
101101 repo = "OpenRA" ;
102102 rev = version;
103− sha256 = "0wy1h7fg0n8dpy6y91md7x0qnr9rk4xf6155jali4bi8gghw2g5v";
103+ sha256 = "1x6byz37s8qcpqj902zvkvbv95rv2mv2kj35c12gbpyc92xkqkq0";
104104 name = "generals-alpha-engine";
105105 inherit extraPostFetch;
106106 };
107107 };
108108 };
109109
110− kknd = buildOpenRAMod rec {
111− version = "142";
110+ kknd = let version = "145.git.5530bab"; in name: (buildOpenRAMod rec {
111+ inherit version;
112112 title = "Krush, Kill 'n' Destroy";
113113 description = "Re-imagination of the original ${title} game";
114114 homepage = https://kknd-game.com/;
115115 src = fetchFromGitHub {
116116 owner = "IceReaper";
117117 repo = "KKnD";
118− rev = "54d34292168d5c47529688c8d5ca7693c4001ef3";
119− sha256 = "1rsdig282cfr8b4iamr9ri6sshgppp8gllfyib6c2hvqqr301720";
118+ rev = "5530babcb05170e0959e4cf2b079161e9fedde4f";
119+ sha256 = "07jczrarmgm6zdk0myzwgq200x19yvpjyxrnhdac08mjgyz75zk1";
120120 };
121− engine = let commit = "4e8eab4ca00d1910203c8a103dfd2c002714daa8"; in {
122− version = abbrevCommit commit;
121+ engine = {
122+ version = "4e8eab4ca00d1910203c8a103dfd2c002714daa8";
123123 src = fetchFromGitHub {
124− owner = "OpenRA";
124+ owner = "IceReaper";
125125 repo = "OpenRA" ;
126− rev = commit;
126+ rev = "4e8eab4ca00d1910203c8a103dfd2c002714daa8";
127127 sha256 = "1yyqparf93x8yzy1f46gsymgkj5jls25v2yc7ighr3f7mi3igdvq";
128128 name = "engine";
129129 inherit extraPostFetch;
130130 };
131131 };
132− };
132+ } name).overrideAttrs (origAttrs: {
133+ postPatch = ''
134+ ${origAttrs.postPatch}
135+ sed -i 's/{DEV_VERSION}/${version}/' mods/*/mod.yaml
136+ '';
137+ });
133138
134139 mw = buildOpenRAMod rec {
135− version = "235";
140+ version = "257.git.c9be8f2";
136141 title = "Medieval Warfare";
137142 description = "A re-imagination of the original Command & Conquer: ${title} game";
138143 homepage = https://github.com/CombinE88/Medieval-Warfare;
139144 src = fetchFromGitHub {
140145 owner = "CombinE88";
141146 repo = "Medieval-Warfare";
142− rev = "1e4fc7ea24d0806c5a7cd753490e967d804a3567";
143− sha256 = "0swa66mzb6wr8vf1yivrss54dl98jzzwh9b8qrjfwmfrq2i356iq";
147+ rev = "c9be8f2a6f1dd710b1aedd9d5b00b4cf5020e2fe";
148+ sha256 = "09fp7k95jd6hjqdasbspbd43z5670wkyzbbgqkll9dfsrv0sky0v";
144149 };
145− engine = let commit = "9f9617aa359ebc1923252b7a4a79def73ecfa8a2"; in {
146− version = abbrevCommit commit;
150+ engine = {
151+ version = "MedievalWarfareEngine";
147152 src = fetchFromGitHub {
148153 owner = "CombinE88";
149154 repo = "OpenRA" ;
150− rev = commit;
151− sha256 = "02h29xnc1cb5zr001cnmaww5qnfnfaza4v28251jgzkby593r32q";
155+ rev = "52109c0910f479753704c46fb19e8afaab353c83";
156+ sha256 = "0ga3855j6bc7h81q03cw6laiaiz12915zg8aqah1idvxbzicfy7l";
152157 name = "engine";
153158 inherit extraPostFetch;
154159 };
@@ -156,22 +161,22 @@ in {
156161 };
157162
158163 ra2 = buildOpenRAMod rec {
159− version = "876";
164+ version = "881.git.b37f4f9";
160165 title = "Red Alert 2";
161166 description = "Re-imagination of the original Command & Conquer: ${title} game";
162167 homepage = https://github.com/OpenRA/ra2;
163168 src = fetchFromGitHub {
164169 owner = "OpenRA";
165170 repo = "ra2";
166− rev = "6a864b2a5887ae42291768fb3dec73082fee44ee";
167− sha256 = "19m4z9r00dj67746ps2f9a8i1icq8nm0iiww6dl975yl6gaxp5qy";
171+ rev = "b37f4f9f07404127062d9061966e9cc89dd86445";
172+ sha256 = "1jiww66ma3qdk9hzyvhbcaa5h4p2mxxk22kvrw92ckpxy0bqba3h";
168173 };
169174 engine = rec {
170− version = "20180923";
175+ version = "release-20180923";
171176 src = fetchFromGitHub {
172177 owner = "OpenRA";
173178 repo = "OpenRA" ;
174− rev = "release-${version}";
179+ rev = version;
175180 sha256 = "1pgi3zaq9fwwdq6yh19bwxscslqgabjxkvl9bcn1a5agy4bfbqk5";
176181 name = "engine";
177182 inherit extraPostFetch;
@@ -184,23 +189,23 @@ in {
184189 };
185190
186191 raclassic = buildOpenRAMod {
187− version = "171";
192+ version = "181.git.8240890";
188193 title = "Red Alert Classic";
189194 description = "A modernization of the original Command & Conquer: Red Alert game";
190195 homepage = https://github.com/OpenRA/raclassic;
191196 src = fetchFromGitHub {
192197 owner = "OpenRA";
193198 repo = "raclassic";
194− rev = "a2319b3dfb367a8d4278bf7baf55a10abf615fbc";
195− sha256 = "1k67fx4d9hg8mckzp7pp8lxa6ngqxnnrnbqyfls99dqc4df1iw0a";
199+ rev = "8240890b32191ce34241c22158b8a79e8c380879";
200+ sha256 = "0dznyb6qa4n3ab87g1c4bihfc2nx53k6z0kajc7ynjdnwzvx69ww";
196201 };
197202 engine = rec {
198− version = "20181215";
203+ version = "playtest-20190106";
199204 src = fetchFromGitHub {
200205 owner = "OpenRA";
201206 repo = "OpenRA" ;
202− rev = "release-${version}";
203− sha256 = "0p0izykjnz7pz02g2khp7msqa00jhjsrzk9y0g29dirmdv75qa4r";
207+ rev = version;
208+ sha256 = "0ps9x379plrrj1hnj4fpr26lc46mzgxknv5imxi0bmrh5y4781ql";
204209 name = "engine";
205210 inherit extraPostFetch;
206211 };
@@ -208,24 +213,24 @@ in {
208213 };
209214
210215 rv = unsafeBuildOpenRAMod {
211− version = "1294";
216+ version = "1330.git.9230e6f";
212217 title = "Romanov's Vengeance";
213218 description = "Re-imagination of the original Command & Conquer: Red Alert 2 game";
214219 homepage = https://github.com/MustaphaTR/Romanovs-Vengeance;
215220 src = fetchFromGitHub {
216221 owner = "MustaphaTR";
217222 repo = "Romanovs-Vengeance";
218− rev = "c21cb11579d7e12354c5ccb5c3c47e567c6b3d4f";
219− sha256 = "1vmc5b9awx8q0mahwv11fzgplw9w7m8kzvnx5cl7xr1w5wk87428";
223+ rev = "9230e6f1dd9758467832aee4eda115e18f0e635f";
224+ sha256 = "0bwbmmlhp1kh8rgk2nx1ca9vqssj849amndacf318d61gksc1w9n";
220225 };
221− engine = let commit = "e9e99074b294c32fbe88dd8727581cb8c512c2e2"; in {
222− version = abbrevCommit commit;
226+ engine = {
227+ version = "f3873ae";
223228 mods = [ "as" ];
224229 src = fetchFromGitHub {
225− owner = "GraionDilach";
226− repo = "OpenRA" ;
227− rev = commit;
228− sha256 = "0bibnakpmbxwglf2dka6g04xp8dzwyms1zk5kqlbm8gpdp0aqmxp";
230+ owner = "AttacqueSuperior";
231+ repo = "Engine";
232+ rev = "f3873ae242803051285994d77eb26f4b951594b5";
233+ sha256 = "02rv29wja0p5d083pd087daz7x7pp5b9ym7sci2fhg3mrnaqgwkp";
229234 name = "engine";
230235 inherit extraPostFetch;
231236 };
@@ -237,24 +242,24 @@ in {
237242 };
238243
239244 sp = unsafeBuildOpenRAMod {
240− version = "153";
245+ version = "176.git.fc89ae8";
241246 title = "Shattered Paradise";
242247 description = "Re-imagination of the original Command & Conquer: Tiberian Sun game";
243248 homepage = https://github.com/ABrandau/OpenRAModSDK;
244249 src = fetchFromGitHub {
245250 owner = "ABrandau";
246251 repo = "OpenRAModSDK";
247− rev = "89148b8cf89bf13911fafb74a1aa2b4cacf027e0";
248− sha256 = "1bb8hzd3mhnn76iqiah1161qz98f0yvyryhmrghq03xlbin3mhbi";
252+ rev = "fc89ae8a10e0f765ac735f923e01aa24dd20e8d2";
253+ sha256 = "0xyxhipmjlld0kp23fwsdwnspr7fci0mdnjd60gcsh34c7m0341p";
249254 };
250− engine = let commit = "82a2f234bdf3b768cea06408e3de30f9fbbe9412"; in {
251− version = abbrevCommit commit;
255+ engine = {
256+ version = "SP-Bleed-Branch";
252257 mods = [ "as" "ts" ];
253258 src = fetchFromGitHub {
254259 owner = "ABrandau";
255260 repo = "OpenRA" ;
256− rev = commit;
257− sha256 = "1nl3brvx1bikxm5rmpc7xmd32n722jiyjh86pnar6b6idr1zj2ws";
261+ rev = "d3545c0b751aea2105748eddaab5919313e35314";
262+ sha256 = "1jsldl6vnf3r9dzppdm4z7kqbrzkidda5k74wc809i8c4jjnq9rq";
258263 name = "engine";
259264 inherit extraPostFetch;
260265 };
@@ -262,23 +267,23 @@ in {
262267 };
263268
264269 ss = buildOpenRAMod rec {
265− version = "72";
270+ version = "77.git.23e1f3e";
266271 title = "Sole Survivor";
267272 description = "A re-imagination of the original Command & Conquer: ${title} game";
268273 homepage = https://github.com/MustaphaTR/sole-survivor;
269274 src = fetchFromGitHub {
270275 owner = "MustaphaTR";
271276 repo = "sole-survivor";
272− rev = "fad65579c8b487cef9a8145e872390ed77c16c69";
273− sha256 = "0h7is7x2qyvq7vqp0jgw5zrdkw8g7ndd82d843ldhnb0a3vyrk34";
277+ rev = "23e1f3e5d8b98c936797b6680d95d56a69a9e2ab";
278+ sha256 = "104clmxphchs7r8y7hpmw103bychayz80bqj98bp89i64nv9d89x";
274279 };
275− engine = let commit = "becfc154c5cd3891d695339ff86883db8b5790a5"; in {
276− version = abbrevCommit commit;
280+ engine = {
281+ version = "6de92de";
277282 src = fetchFromGitHub {
278283 owner = "OpenRA";
279284 repo = "OpenRA" ;
280− rev = commit;
281− sha256 = "0id8vf3cjr7h5pz4sw8pdaz3sc45lxr21k1fk4309kixsrpa7i0y";
285+ rev = "6de92de8d982094a766eab97a92225c240d85493";
286+ sha256 = "0ps9x379plrrj1hnj4fpr26lc46mzgxknv5imxi0bmrh5y4781ql";
282287 name = "engine";
283288 inherit extraPostFetch;
284289 };
@@ -286,7 +291,7 @@ in {
286291 };
287292
288293 ura = buildOpenRAMod {
289− version = "431";
294+ version = "431.git.128dc53";
290295 title = "Red Alert Unplugged";
291296 description = "Re-imagination of the original Command & Conquer: Red Alert game";
292297 homepage = http://redalertunplugged.com/;
@@ -310,22 +315,22 @@ in {
310315 };
311316
312317 yr = unsafeBuildOpenRAMod rec {
313− version = "117";
318+ version = "118.git.c26bf14";
314319 homepage = https://github.com/cookgreen/yr;
315320 title = "Yuri's Revenge";
316321 description = "Re-imagination of the original Command & Conquer: ${title} game";
317322 src = fetchFromGitHub {
318323 owner = "cookgreen";
319324 repo = "yr";
320− rev = "1d4beeb0687fe4b39b01ec31f3702cfb90a7f4f7";
321− sha256 = "1rd962ja1x72rz68kbmp19yiip3iif50hzlj3v8k1f5l94r2x2pn";
325+ rev = "c26bf14155d040edf33c6c5eb3677517d07b39f8";
326+ sha256 = "15k6gv4rx3490n0cs9q7ah7q31z89v0pddsw6nqv0fhcahhvq1bc";
322327 };
323328 engine = rec {
324− version = "20180923";
329+ version = "release-20180923";
325330 src = fetchFromGitHub {
326331 owner = "OpenRA";
327332 repo = "OpenRA" ;
328− rev = "release-${version}";
333+ rev = version;
329334 sha256 = "1pgi3zaq9fwwdq6yh19bwxscslqgabjxkvl9bcn1a5agy4bfbqk5";
330335 name = "engine";
331336 inherit extraPostFetch;