Commit Graph

5303 Commits

Author SHA1 Message Date
Bobby Rong
b0073b24ad
Merge pull request #149639 from maxhbr/bumpMindustryVersion
mindustry: 126.1 -> 126.2
2021-12-14 14:56:14 +08:00
Bobby Rong
f5ddaa2e6d
Merge pull request #149117 from trofi/update-fheroes2
fheroes2: 0.9.9 -> 0.9.10
2021-12-13 10:33:11 +08:00
Janne Heß
278dd8be91
Merge pull request #150210 from jyooru/fix/minecraft-server 2021-12-12 20:08:12 +01:00
markuskowa
fe19330e72
Merge pull request #150258 from legendofmiracles/astromenace
astromenace: 1.3.2 -> 1.4.1
2021-12-12 19:50:06 +01:00
legendofmiracles
7810e5eb0c
astromenace: 1.3.2 -> 1.4.1 2021-12-12 09:23:12 -06:00
Thiago Kenji Okada
30c2bc6e28
Merge pull request #150413 from fgaz/shattered-pixel-dungeon/1.1.0
shattered-pixel-dungeon: 1.0.0 -> 1.1.0
2021-12-12 12:18:25 -03:00
Francesco Gazzetta
4c764d4dbf shattered-pixel-dungeon: 1.0.0 -> 1.1.0 2021-12-12 13:23:08 +01:00
Bruno Bigras
07e9488aed starsector: 0.95a-RC15 -> 0.95.1a-RC5 2021-12-12 02:35:05 -05:00
R. Ryantm
31fd88293b xsnow: 3.3.2 -> 3.3.6 2021-12-12 05:46:19 +00:00
figsoda
036201a519 fishfight: 0.1 -> 0.3 2021-12-12 00:03:13 -05:00
Joel
b835bec4d7
minecraft-server: 1.18 -> 1.18.1 (#149982) 2021-12-12 11:49:15 +10:00
R. Ryantm
587e2a32b2 chiaki: 2.1.0 -> 2.1.1 2021-12-11 21:40:43 +00:00
Lassulus
179fdf4d56
Merge pull request #150265 from legendofmiracles/gzdoom
gzdoom: 4.7.0 -> 4.7.1
2021-12-11 17:45:54 +01:00
legendofmiracles
5e02596516
vkquake: 1.11.0 -> 1.12.1 2021-12-11 09:53:58 -06:00
Aaron Janse
f1c4bec46a
papermc: 1.17.1r97 -> 1.17.1r399 (#149989)
* papermc: 1.17.1r97 -> 1.17.1r399

Co-authored-by: Joel <jyooru+github@protonmail.ch>
2021-12-11 15:46:12 +00:00
legendofmiracles
fe14cfc71f
gzdoom: 4.7.0 -> 4.7.1 2021-12-11 09:25:54 -06:00
Jörg Thalheim
7849f7b322
Merge pull request #150260 from legendofmiracles/cbonsai
cbonsai: 1.2.1 -> 1.3.1
2021-12-11 15:20:07 +00:00
legendofmiracles
9412abcf1e
cbonsai: 1.2.1 -> 1.3.1 2021-12-11 08:48:12 -06:00
Markus S. Wamser
4d60d9d491 crispyDoom: move build dep to python3 2021-12-10 12:59:18 +01:00
Paul Baecher
315374ecc1
gotypist: init at 0.8.2 (#147295)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-12-10 02:22:28 +01:00
Jörg Thalheim
83a6199074
Merge pull request #149780 from r-ryantm/auto-update/odamex
odamex: 0.8.2 -> 0.9.5
2021-12-09 09:56:12 +00:00
Francesco Gazzetta
2c2e6383a8 gnonograms: 1.4.5 -> 2.0.0 2021-12-09 10:22:30 +01:00
R. Ryantm
3a78bc4373 odamex: 0.8.2 -> 0.9.5 2021-12-09 04:13:32 +00:00
Kira Bruneau
39258474a1
Merge pull request #149505 from thiagokokada/bump-sm64ex
sm64ex: unstable-2020-10-09 -> unstable-2021-11-30
2021-12-08 18:22:27 -05:00
Michael Reilly
e66f8b1c30 katago: 1.9.1 -> 1.10.0 2021-12-08 12:53:25 -05:00
R. Ryantm
c386af740b pentobi: 18.5 -> 19.0 2021-12-08 16:32:53 +00:00
lassulus
9deb6bf336 steam: 1.0.0.73 -> 1.0.0.74 2021-12-08 16:27:41 +01:00
Maximilian Huber
18914a9355 mindustry: 126.1 -> 126.2
Signed-off-by: Maximilian Huber <gh@maxhbr.de>
2021-12-08 15:34:15 +01:00
hqurve
19b685cfe0 space-cadet-pinball: init at unstable-2021-12-02 2021-12-08 08:51:20 -04:00
Thiago Kenji Okada
2a455ce212 sm64ex: unstable-2020-10-09 -> unstable-2021-11-30 2021-12-08 00:09:04 -03:00
Linus Heckemann
0660448110
Merge pull request #145044 from lucc/endless-sky
Endless sky: 0.9.12 -> 0.9.14
2021-12-07 12:38:11 +01:00
Sergei Trofimovich
427a36982a fheroes2: 0.9.9 -> 0.9.10
https://github.com/ihhub/fheroes2/wiki/Change-Log#version-0910-05-december-2021
2021-12-06 20:12:20 +00:00
Ryan Burns
dac5570863 zeroad: build with python3 2021-12-05 22:14:20 -08:00
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
Lucas Hoffmann
77db4fdd95 endless-sky: remove unused function argument 2021-12-05 02:30:13 +01:00
Sandro
633c2d3866
Merge pull request #148051 from fgaz/warzone2100/darwin 2021-12-05 01:40:43 +01:00
Reed
f0520e88a8 shticker-book-unwritten: add libpulseaudio 2021-12-04 13:44:17 -05: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
Linus Heckemann
c9c10cc03c endless-sky: use gcc-ar
Plain ar does not load the LTO plugin correctly, resulting in a build
failure.
2021-12-04 09:06:21 +01:00
Lucas Hoffmann
13b776e93c endless-sky: 0.9.13 -> 0.9.14 2021-12-04 09:06:20 +01:00
Lucas Hoffmann
720cf69320 endless-sky: 0.9.12 -> 0.9.13 2021-12-04 09:06:20 +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
D Anzorge
973c3e8411 cataclysm-dda: 0.F-2 -> 0.F-3 2021-11-29 22:04:42 +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
Kevin Cox
dc447918a0
Merge pull request #119444 from lorenzleutgeb/gradle-jdk
gradle: Decouple from JDK 8 and support Java Toolchains
2021-11-22 16:27:10 -05:00
Felix Buehler
fb7be3d998 sauerbraten: add desktop-icon 2021-11-22 18:09:31 +01:00
Alvar Penning
1c8040364b openrct2: 0.3.5 -> 0.3.5.1
Next to the bumping the version to the latest release, a comment was
reworded and the repository URL was added for the downloadPage.
2021-11-22 00:02:47 +01:00
Jonathan Ringer
09e494f4c2
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/applications/window-managers/sway/default.nix
2021-11-21 14:40:40 -08:00
Sergei Trofimovich
194310ce7c _2048-in-terminal: 2017-11-29 -> 2021-09-12
While at it apply pending ncurses-6.3 fix. Otherwise build fails as:

    draw.c:232:9: error: format not a string literal and no format arguments [-Werror=format-security]
      232 |         mvwprintw(board_win, center, left+1, tile_str[val]);
          |         ^~~~~~~~~
2021-11-21 15:40:38 +00:00
Aamaruvi Yogamani
b03e3fd65f
lunar-client: 2.7.3 -> 2.8.8 2021-11-20 13:05:37 -05:00
github-actions[bot]
578939f5e2
Merge staging-next into staging 2021-11-20 18:01:43 +00:00
github-actions[bot]
f515d91189
Merge master into staging-next 2021-11-20 18:01:07 +00:00
Guillaume Girol
3db958ab4c
Merge pull request #145052 from oxzi/openrct2-0.3.5
openrct2: 0.3.4.1 -> 0.3.5
2021-11-20 16:29:09 +00:00
Sandro Jäckel
046ac66948
keen4: convert away from builder.sh 2021-11-20 00:48:42 +01:00
Vladimír Čunát
83e4222bb6
Merge branch 'staging-next' into staging 2021-11-20 00:06:34 +01:00
Jonathan Ringer
fadaef5aed
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/applications/networking/browsers/chromium/common.nix
2021-11-19 14:31:57 -08:00
Robert Hensing
2441a7992d
Merge pull request #146610 from l0b0/fix-keen4-shellcheck-lints
keen4: Fix ShellCheck lints
2021-11-19 22:48:38 +01:00
github-actions[bot]
e9cc89e77e
Merge staging-next into staging 2021-11-19 18:01:56 +00:00
Lorenz Leutgeb
01f4c7ec88 gradle: Decouple gradleGen and JDK 2021-11-19 18:54:25 +01:00
Jonathan Ringer
6ede9cd761
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  pkgs/applications/audio/hybridreverb2/default.nix
2021-11-19 08:44:33 -08:00
Sandro
5bea0fab63
Merge pull request #145391 from bb2020/gimx 2021-11-19 16:42:32 +01:00
bb2020
852a72a70b gimx: refactor 2021-11-19 17:46:16 +03:00
Victor Engmark
6f70a225f4 keen4: Fail script if variables are undefined
ShellCheck SC2154.
2021-11-19 23:57:52 +13:00
Victor Engmark
8737cb2cc4 keen4: Add shebang line
ShellCheck SC2148.
2021-11-19 23:57:51 +13:00
Victor Engmark
38094397d7 keen4: Mark sourced file as unknown
ShellCheck SC1091.
2021-11-19 23:57:51 +13:00
Victor Engmark
f367033a87 keen4: Quote variable references
ShellCheck SC2086.
2021-11-19 23:57:51 +13:00
github-actions[bot]
93d09085ea
Merge staging-next into staging 2021-11-18 18:01:51 +00:00
github-actions[bot]
91e24d05d7
Merge master into staging-next 2021-11-18 18:01:14 +00:00
Sergei Trofimovich
473ac28b80 pacvim: pull pending upstream inclusion fix for ncurses-6.3
Without the fix build on ncurses-6.3 fails as:

    src/helperFns.cpp:103:17:
      error: format not a string literal and no format arguments [-Werror=format-security]
      103 |         mvprintw(TOP+5, 0, (x).c_str());
          |         ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~
2021-11-18 10:33:56 +00:00
Robert Hensing
9005cb8835
Merge pull request #145841 from l0b0/fix-indentation
Fix indentation
2021-11-18 00:38:59 +01:00
github-actions[bot]
f8cf67790e
Merge master into staging-next 2021-11-17 06:01:28 +00:00
Dmitry Kalinkin
922661273c
beret: remove
Was broken for 6 years
2021-11-16 17:22:36 -05:00
github-actions[bot]
ca7a3ad2e8
Merge master into staging-next 2021-11-16 18:01:14 +00:00
Dusk Banks
ab054f8fdb steamPackages: make customisable
Keep in mind the note in `lib.makeScopeWithSplicing`'s source:

    # N.B. the other stages of the package set spliced in are *not*
    # overridden.

To globally override `pkgs.steamPackages`, overlay `pkgs` like:

    final: prev: { steamPackages = steamPackages.overrideScope …; }
2021-11-16 08:40:10 -08:00
Jonathan Ringer
a2e621d20d
Merge remote-tracking branch 'origin/master' into staging-next 2021-11-16 07:50:20 -08:00
Pavol Rusnak
1663708500
Merge pull request #142468 from prusnak/dotnet-update
dotnet-sdk_3: 3.1.19 -> 3.1.21 + dotnet-sdk_5: 5.0.10 -> 5.0.12
2021-11-16 16:27:23 +01:00
Claudio Bley
f201ba1bbd
osu-lazer: Update dependencies 2021-11-16 15:54:32 +01:00
github-actions[bot]
69a9c90876
Merge staging-next into staging 2021-11-16 00:02:03 +00:00
Janne Heß
0329e54453
Merge pull request #146106 from TredwellGit/steam 2021-11-15 20:58:48 +01:00
TredwellGit
e682fd7c83 steam: 1.0.0.72 -> 1.0.0.73 2021-11-15 09:20:52 +00:00
Evgeny Kurnevsky
8c2acce1d6
wesnoth: remove enableTools option as it was removed from wesnoth 2021-11-15 12:01:59 +03:00
github-actions[bot]
9f6360b7fb
Merge staging-next into staging 2021-11-14 18:01:49 +00:00
sternenseemann
2f78a2d3a3 Merge remote-tracking branch 'origin/master' into staging-next 2021-11-14 16:26:44 +01:00
Alyssa Ross
4e1852096f
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/tools/parsing/flex/2.6.1.nix
2021-11-14 14:17:46 +00:00
Mario Rodas
b329156118
Merge pull request #145464 from kurnevsky/wesnoth
wesnoth: 1.16.0 -> 1.16.1
2021-11-14 09:11:24 -05:00
figsoda
08d371f041
Merge pull request #145868 from r-ryantm/auto-update/osu-lazer
osu-lazer: 2021.1105.0 -> 2021.1113.0
2021-11-14 09:08:35 -05:00
R. Ryantm
2a6b6b2a3c osu-lazer: 2021.1105.0 -> 2021.1113.0 2021-11-14 06:26:18 +00:00
github-actions[bot]
0ca0546665
Merge master into staging-next 2021-11-14 06:01:05 +00:00
Victor Engmark
57b496ea98 misc: Replace tab indentation with spaces
I've tried to be consistent, using four or eight spaces to line up
with existing code.
2021-11-14 16:04:46 +13:00
Thiago Kenji Okada
7d83f50e80
Merge pull request #141997 from flexagoon/openrw-update
openrw: 2018-10-26 -> 2021-10-14
2021-11-13 21:47:29 -03:00
github-actions[bot]
9b5a105856
Merge master into staging-next 2021-11-14 00:01:47 +00:00
Thiago Kenji Okada
beff4b8178
Merge pull request #145802 from fgaz/domination/1.2.4
domination: 1.2.3 -> 1.2.4, add nixos test
2021-11-13 19:12:28 -03:00
Francesco Gazzetta
df99f2326e nixosTests.domination: init 2021-11-13 23:00:20 +01:00
github-actions[bot]
914defdc38
Merge staging-next into staging 2021-11-13 18:01:47 +00:00
github-actions[bot]
4db5f307b0
Merge master into staging-next 2021-11-13 18:01:11 +00:00
sternenseemann
4e50d99934 soldat-unstable: build using CMake
This will be the build system going forward, so it seems sensible to
support it right away. There's no neat way to use the system
GameNetworkingSockets upstream yet, so we add a hack for now.

Proactively decrease platforms to Linux only since the CMake doesn't
quite use GNUInstallDirs on Darwin and Windows unfortunately.
2021-11-13 18:49:45 +01:00
sternenseemann
d37d84bdca soldat-unstable: 2021-04-27 -> 2021-11-01
Now builds with GameNetworkingSockets 1.3.0.
2021-11-13 18:49:45 +01:00
Francesco Gazzetta
df177cf39b domination: 1.2.3 -> 1.2.4 2021-11-13 17:49:46 +01:00
github-actions[bot]
65356b24bf
Merge staging-next into staging 2021-11-12 18:01:48 +00:00
github-actions[bot]
699560194d
Merge master into staging-next 2021-11-12 18:01:08 +00:00
Ben Siraphob
8f39ad3da1
Merge pull request #145514 from legendofmiracles/stockfish 2021-11-12 11:23:37 -06:00
github-actions[bot]
a4e03b8977
Merge staging-next into staging 2021-11-11 18:01:50 +00:00
github-actions[bot]
f2d7271432
Merge master into staging-next 2021-11-11 18:01:13 +00:00
Sandro
4fefd155f0
Merge pull request #142262 from astro/yquake2 2021-11-11 17:53:47 +01:00
legendofmiracles
479899c085
stockfish: 14 -> 14.1; fix license 2021-11-11 10:42:33 -06:00