Commit graph

4551 commits

Author SHA1 Message Date
Sandro 7b4dfb1a88
Merge pull request #127823 from Stunkymonkey/games-pname 2021-06-28 23:39:30 +02:00
legendofmiracles 189a6ba91d
rpg-cli: 0.4.1 -> 0.5.0 2021-06-27 00:20:53 -06:00
necessarily-equal f5bba23a7b
unvanquished: 0.52.0 -> 0.52.1 (#127771) 2021-06-26 17:48:49 +02:00
Felix Buehler ce3b463c79 games: /s/name/pname&version/ 2021-06-25 01:28:10 +02:00
Sandro 0ba004e97d
Merge pull request #127885 from SuperSandro2000/SuperSandro2000-patch-1
orthorobot: remove phases overwrite
2021-06-23 13:43:33 +02:00
Sandro 039b2deca5
orthorobot: remove phases overwrite 2021-06-23 12:59:57 +02:00
Sandro cab0b546a3
Merge pull request #127456 from musfay/multimc-fix 2021-06-23 10:44:50 +02:00
Mustafa Çalışkan 3fd5108780 multimc: hardcode jdk paths and use latest jdk by default 2021-06-22 22:00:51 +03:00
Sandro 192a85e425
Merge pull request #127759 from peterhoeg/u/widelands
widelands: 21 -> 1.0
2021-06-22 16:15:53 +02:00
Sandro cb86e4e62f
Merge pull request #127397 from Artturin/add-grapejuice
grapejuice: init at 3.11.4
2021-06-22 10:12:00 +02:00
Peter Hoeg 56f2a77584 widelands: 21 -> 1.0
Also add a few missing bits (icons, man page)
2021-06-22 14:09:48 +08:00
Artturin 09a52f7662 grapejuice: init at 3.11.4 2021-06-22 04:52:16 +03:00
Mustafa Çalışkan 46c373b5e5 multimc: 0.6.12 -> unstable-2021-06-21 2021-06-21 20:54:40 +03:00
Peter Hoeg 4d66930f13
gemrb: 0.8.7 -> 0.9.0 (#127631)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-06-21 13:53:18 +02:00
Luke Granger-Brown 756233bf00
Merge pull request #127491 from nbraud/factorio
factorio: 1.1.34 → 1.1.35
2021-06-20 01:18:51 +01:00
nicoo e5baf82e87 factorio: 1.1.34 → 1.1.35 2021-06-19 21:16:15 +02:00
nicoo 5e06828dff factorio: Fix bug in update.py
Prior to this change, `update.py` fails with `KeyError: 'alpha'` when upstream
does not have a version in the `experimental` channel:

	./update.py --username XXXXXXXX --token "$(wl-paste)"
	Traceback (most recent call last):
	  File "./update.py", line 180, in <module>
	    app.run(main)
	  File "/nix/store/854z51wg8fj1s6ghxasp1xxx8khb3r8v-python3-3.8.9-env/lib/python3.8/site-packages/absl/app.py", line 303, in run
	    _run_main(main, args)
	  File "/nix/store/854z51wg8fj1s6ghxasp1xxx8khb3r8v-python3-3.8.9-env/lib/python3.8/site-packages/absl/app.py", line 251, in _run_main
	    sys.exit(main(argv))
	  File "./update.py", line 162, in main
	    new_our_versions = generate_our_versions(factorio_versions)
	  File "./update.py", line 92, in generate_our_versions
	    version = factorio_versions[release_channel.name][release_type.name]
	KeyError: 'alpha'

I chose to make it so that the versions in nixpkgs' `factorio-*` packages are
either experimental (when available) or stable, as this seems like the most
coherent approach
2021-06-19 21:15:44 +02:00
Sandro 381fd6994c
Merge pull request #127190 from McSinyx/blackshades-1.1.1 2021-06-18 10:36:10 +02:00
Nguyễn Gia Phong 60ac7d2b58
blackshades: svn-110 -> 1.1.1 2021-06-17 15:03:18 +07:00
github-actions[bot] 51bf815af0
Merge master into staging-next 2021-06-17 00:09:48 +00:00
Jonathan Ringer 08581dc64c
dwarf-therapist: 41.1.5 -> 41.2.2 2021-06-16 13:36:04 -07:00
github-actions[bot] 2d104c99a7
Merge master into staging-next 2021-06-16 18:04:45 +00:00
Jakub Kądziołka fa9f6b9e1b
osu-lazer: 2021.602.0 -> 2021.612.0 2021-06-16 16:03:16 +02:00
Jan Tojnar 91171e2955
Merge branch 'master' into staging-next
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
2021-06-15 11:19:41 +02:00
legendofmiracles cd68c94996
rpg-cli: 0.4.0 -> 0.4.1 2021-06-14 14:14:59 -06:00
Sandro 14f42ee031
Merge pull request #126647 from necessarily-equal/unvanquished
unvanquished: workaround NVidia proprietary driver bug
2021-06-14 20:05:32 +02:00
github-actions[bot] ec4b7ebf86
Merge master into staging-next 2021-06-13 06:04:48 +00:00
Matthieu Coudron e0b13fe95b sauerbraten: set mainProgram to sauerbraten_client
so that nix run nixpkgs#sauerbraten starts the game
2021-06-13 00:49:02 +02:00
Antoine Fontaine bce8f178d8 unvanquished: workaround NVidia proprietary driver bug 2021-06-12 11:40:14 +02:00
github-actions[bot] dcfc502458
Merge master into staging-next 2021-06-11 00:09:47 +00:00
Sandro a3b7038a70
Merge pull request #126414 from petabyteboy/feature/update-alienarena
alienarena: 7.65 -> 7.71.2
2021-06-10 21:10:03 +02:00
github-actions[bot] da8d931c82
Merge master into staging-next 2021-06-10 06:07:24 +00:00
AndersonTorres 0b045a37fc Change all alsaPlugins references to alsa-plugins
Also, refactor alsa-plugins to make it more readable.
2021-06-10 01:36:35 -03:00
AndersonTorres e9e5f5f84d Change all alsaLib references to alsa-lib 2021-06-10 01:12:49 -03:00
Milan Pässler d5df1b0f5d
alienarena: 7.65 -> 7.71.2 2021-06-10 01:11:47 +02:00
Martin Weinelt 3da00fa467
Merge branch 'master' into staging-next 2021-06-09 14:18:55 +02:00
Sandro ae18d436e5
Merge pull request #126215 from fgaz/shattered-pixel-dungeon/0.9.3
shattered-pixel-dungeon: 0.9.2b -> 0.9.3
2021-06-09 13:30:13 +02:00
Sandro 14e6e83b60
Merge pull request #125904 from legendofmiracles/update/rpg-cli
rpg-cli: 0.3.0 -> 0.4.0
2021-06-09 12:42:31 +02:00
Alyssa Ross 013d3cb42d xsnow: 1.42 -> 3.3.0
Since this package was last updated, xsnow has been relicensed, and
then forked.  It's also had its build system replaced.
2021-06-09 10:21:20 +00:00
github-actions[bot] b61efd9db1
Merge master into staging-next 2021-06-09 00:09:07 +00:00
Peter Simons 51bb9f3e9a minecraft-server: 1.16.5 -> 1.17 2021-06-08 14:17:06 -04:00
github-actions[bot] e8f8906d68
Merge master into staging-next 2021-06-08 18:16:27 +00:00
Sandro 4ebc8bcf01
Merge pull request #126133 from ZerataX/papermc 2021-06-08 17:57:13 +02:00
Jonathan Ringer e6903f1e94 steam/fhsenv: add pipewire as hard requirement 2021-06-08 08:51:18 -07:00
Francesco Gazzetta 9306fb9f3d shattered-pixel-dungeon: 0.9.2b -> 0.9.3 2021-06-08 16:21:41 +02:00
github-actions[bot] 89746ce131
Merge master into staging-next 2021-06-08 06:12:14 +00:00
Artturin 2033f37fb2 steamPackages.steam-runtime: 0.20210317.0 -> 0.20210527.0 2021-06-08 03:47:26 +03:00
ZerataX b2c045c07b
papermc: 1.16.5r488 -> 1.16.5r771 2021-06-08 00:59:38 +02:00
github-actions[bot] 6076dbb085
Merge master into staging-next 2021-06-06 12:14:32 +00:00
Peter Simons c850d5a550
Merge pull request #125837 from r-burns/stockfish
stockfish: 12 -> 13
2021-06-06 09:10:10 +02:00