3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

5163 commits

Author SHA1 Message Date
0x4A6F 974c2a13a1
Merge pull request #146102 from kurnevsky/wesnoth
wesnoth: remove enableTools option as it was removed from wesnoth
2021-12-05 20:05:06 +01:00
R. Ryantm 406015beb8 xsnow: 3.3.1 -> 3.3.2 2021-12-05 18:12:34 +00:00
Sandro 0c7cc64922
Merge pull request #129832 from canndrew/eternity-engine-4.02.00 2021-12-05 06:40:16 +01:00
Sandro 23a141517d
Merge pull request #148470 from WolfangAukang/heroic-games-launcher 2021-12-05 06:31:44 +01:00
Sandro 633c2d3866
Merge pull request #148051 from fgaz/warzone2100/darwin 2021-12-05 01:40:43 +01:00
Francesco Gazzetta d69ee7c409 warzone2100: set platforms to all, mark darwin as broken
It's supposed to work on darwin too, but the cmake file for darwin tries
to download stuff
2021-12-04 13:12:03 +01:00
P. R. d. O 5ac79dd2ce
heroic: init at 1.10.3 2021-12-03 14:57:34 -06:00
Sandro 77a9330269
Merge pull request #145445 from Stunkymonkey/sauerbraten-icon 2021-12-03 20:03:18 +01:00
Astro 863ef0dd47 quake3e: fix libcurl.so.4 location 2021-12-03 18:22:30 +01:00
github-actions[bot] bcc4d12e17
Merge master into staging-next 2021-12-02 18:01:11 +00:00
legendofmiracles b9e6351d30
maintainers: rename legendofmiracles to lom 2021-12-01 17:19:48 -06:00
github-actions[bot] 523293d53d
Merge master into staging-next 2021-12-01 18:01:12 +00:00
github-actions[bot] 80fce0f4a7
Merge master into staging-next 2021-12-01 00:01:49 +00:00
Robin Townsend 43ec279d77 minecraft-server: 1.17.1 -> 1.18 2021-11-30 16:02:00 -05:00
Artturi 47291630c4
Merge pull request #144969 from trofi/fix-freesweep-for-ncurses-6.13 2021-11-30 20:51:11 +02:00
github-actions[bot] 3c6eb8fe49
Merge master into staging-next 2021-11-30 18:01:33 +00:00
Sandro 43ff00e55e
Merge pull request #146779 from Technical27/update-lunar 2021-11-30 18:21:13 +01:00
Sandro 5d46a56a1e
Merge pull request #146713 from SuperSandro2000/keen4 2021-11-30 18:09:52 +01:00
Sandro 8425006f90
Merge pull request #147893 from MoritzBoehme/bump-legendary 2021-11-30 17:59:05 +01:00
Francesco Gazzetta 87aed70b18 warzone2100: 4.2.2 -> 4.2.3 2021-11-30 11:59:48 +01:00
github-actions[bot] 18ca52de87
Merge master into staging-next 2021-11-30 06:01:26 +00:00
github-actions[bot] 941a6593c8
Merge master into staging-next 2021-11-30 00:01:51 +00:00
Lluís Batlle i Rossell f30f9c8aa8 frogatto-data: 2020-12-17 -> 2021-11-29
Updating the engine required updating the data. Otherwise a crash would
happen at the 2nd level (out of the main house).
2021-11-29 23:02:40 +01:00
Artturi 740bccb9bf
Merge pull request #147838 from bflyblue/vintagestory-1.5.10 2021-11-29 22:01:59 +02:00
Sandro 0640d5a32d
Merge pull request #147556 from TredwellGit/steamPackages.steam-runtime 2021-11-29 20:30:46 +01:00
Sandro bf2e83c571
Merge pull request #147587 from atopuzov/bump-augustus 2021-11-29 20:26:32 +01:00
MoritzBoehme 26f82bcea7 legendary-gl: 0.20.10 -> 0.20.18 2021-11-29 16:00:05 +01:00
Shaun Sharples 6d3cfa53d6 vintagestory: 1.15.5 -> 1.15.10 2021-11-29 12:28:00 +02:00
github-actions[bot] be67219326
Merge master into staging-next 2021-11-29 06:01:16 +00:00
Bobby Rong 7dcd2f54b8
Merge pull request #147735 from viric/fix-frogatto
frogatto: 2021-05-24 -> 2021-11-23
2021-11-29 12:12:32 +08:00
Lluís Batlle i Rossell 873042271a frogatto: 2021-05-24 -> 2021-11-23
And fix build
2021-11-28 18:02:36 +01:00
github-actions[bot] 43d7f2e53d
Merge master into staging-next 2021-11-27 18:01:10 +00:00
AndersonTorres d20dc69664 residualvm: remove
Now ResidualVM lives inside ScummVM.
2021-11-27 10:53:16 -03:00
Aleksandar Topuzović 592218648c
augustus: 3.0.1 -> 3.1.0 2021-11-27 11:31:57 +00:00
TredwellGit dbda557c64 steamPackages.steam-runtime: 0.20210906.1 -> 0.20211102.0 2021-11-27 01:15:42 +00:00
github-actions[bot] b529eccbb3
Merge master into staging-next 2021-11-26 18:01:19 +00:00
Thiago Kenji Okada c64e1f60ff
Merge pull request #147455 from ElXreno/package-ddnet-15.7
ddnet: 15.6.2 -> 15.7
2021-11-26 13:05:47 -03:00
Sandro 715d9c37f8
Merge pull request #146941 from oxzi/openrct2-0.3.5.1 2021-11-26 13:30:21 +01:00
github-actions[bot] 956b399ffa
Merge master into staging-next 2021-11-26 12:01:30 +00:00
Sandro caaf4bc95c
Merge pull request #147264 from lukegb/factorio 2021-11-26 12:00:37 +01:00
Luke Granger-Brown 62363f5e19 factorio: 1.1.46 -> 1.1.48 2021-11-26 09:31:44 +00:00
ElXreno 38a950b377
ddnet: 15.6.2 -> 15.7 2021-11-26 08:26:03 +03:00
github-actions[bot] c39cd5f314
Merge master into staging-next 2021-11-26 00:01:38 +00:00
Luke Granger-Brown 0d0763c951 factorio-experimental: 1.1.45 -> 1.1.48 2021-11-24 14:54:29 +00:00
Rick van Schijndel 4179df352b mindustry: fix eval error due to #119444
The PR https://github.com/NixOS/nixpkgs/pull/119444 broke the build for mindustry
even further. This patch fixes that again so it evals and builds properly.
2021-11-23 23:41:24 +01:00
Rick van Schijndel 7824302dd0 mindustry: mitigate issue with missing glew
Fixes: https://github.com/NixOS/nixpkgs/issues/109798
2021-11-23 23:41:15 +01:00
Rick van Schijndel 19c06baf6c mindustry: unbreak by building with jdk15
Fixes: https://github.com/NixOS/nixpkgs/issues/128929
2021-11-23 23:41:14 +01:00
github-actions[bot] a1d98b162f
Merge master into staging-next 2021-11-23 18:01:10 +00:00
Francesco Gazzetta e9f119566a warzone2100: 4.2.1 -> 4.2.2 2021-11-23 18:20:50 +01:00
Jonathan Ringer 4b73049ccc
Merge remote-tracking branch 'origin/staging' into staging-next
Conflicts:
	nixos/tests/custom-ca.nix
2021-11-22 21:33:23 -08:00