Commit graph

5438 commits

Author SHA1 Message Date
Jonathan Ringer 12fd8a77e1
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/top-level/aliases.nix
2022-02-10 09:21:09 -08:00
Renaud 724905c9d9
Merge pull request #157571 from ozkutuk/fix/anki-apply-unescape-patch
anki: apply patch to replace deprecated method
2022-02-10 17:54:12 +01:00
Jonathan Ringer 39669ea2b6
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/top-level/aliases.nix
2022-02-09 19:58:40 -08:00
Franz Pletz b9bf0d43c2
Merge pull request #158134 from fpletz/pkgs/minetest-5.5 2022-02-09 15:15:55 +01:00
github-actions[bot] 69accc4d14
Merge master into staging-next 2022-02-09 12:01:08 +00:00
Sergei Trofimovich 44bc0ee64b fheroes2: 0.9.11 -> 0.9.12
https://github.com/ihhub/fheroes2/wiki/Change-Log#version-0912-07-february-2022
2022-02-09 07:43:26 +00:00
Jonathan Ringer 5df08e00cd
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/opensimplex/default.nix
	pkgs/development/python-modules/pygame-gui/default.nix
	pkgs/top-level/aliases.nix
	pkgs/top-level/python-aliases.nix
2022-02-08 21:19:24 -08:00
Marek Mahut eb911e75d7
Merge pull request #157779 from 1000101/7kaa
7kaa: init at 2.15.4p1
2022-02-08 14:01:53 +01:00
Vladimír Čunát 3aec1846cc
Merge #157455: linthesia: init at 0.8.0 2022-02-08 10:41:20 +01:00
Bobby Rong f8f6b4398b
Merge pull request #157776 from jyooru/fix/minecraft-servers
minecraft-servers: fix update.py
2022-02-08 16:36:51 +08:00
legendofmiracles 3578be70f5
Merge pull request #158544 from legendofmiracles/wordle
cl-wordle: 0.1.2 -> 0.2.0
2022-02-07 23:35:59 -05:00
legendofmiracles 582c36f563
cl-wordle: 0.1.2 -> 0.2.0 2022-02-07 21:56:33 -06:00
Francesco Gazzetta 690c6dd1d3 toppler: 1.1.6 -> 1.3 2022-02-07 19:08:31 -08:00
Jonathan Ringer d06ab8aa75
alephone: pin ffmpeg to 4.x 2022-02-07 10:29:32 -08:00
ckie 202f13c7b0
linthesia: init at 0.8.0 2022-02-07 19:09:24 +02:00
Ben Siraphob 1869f7cf93
Merge pull request #158389 from legendofmiracles/wordle
cl-wordle: init at 0.1.2
2022-02-06 22:23:01 +00:00
legendofmiracles c0217caf80
cl-wordle: init at 0.1.2 2022-02-06 16:06:35 -06:00
Ben Siraphob ca2647489a
Merge pull request #158325 from veprbl/pr/broken_minestuff_4
{minetestclient,minetestserver}_4: mark as broken on darwin
2022-02-06 20:10:18 +00:00
Ben Siraphob 33489310eb
Merge pull request #158358 from c0bw3b/fix/homepages
A batch of homepage (and source) updates
2022-02-06 20:02:50 +00:00
Renaud b61a3fcbea freedink: update homepage 2022-02-06 15:10:45 +01:00
Renaud c074350988 egoboo: update homepage 2022-02-06 15:10:29 +01:00
Aaron Andersen 137291eaa6
Merge pull request #158330 from McSinyx/flare-1.13
flare: 1.12 -> 1.13
2022-02-06 09:04:07 -05:00
Nguyễn Gia Phong 02c976001a
flare: 1.12 -> 1.13
Also add myself as a maintainer.
2022-02-06 14:44:03 +07:00
Dmitry Kalinkin a9e24deb45
{minetestclient,minetestserver}_4: mark as broken on darwin 2022-02-06 00:40:02 -05:00
Colin f0c78d8174
uchess: switch to go_1_17
hash regenerated
2022-02-05 16:58:43 +10:00
R. Ryantm 825deacec2 vintagestory: 1.16.1 -> 1.16.3 2022-02-04 18:38:08 -08:00
Jonathan Ringer 80833d9a2b steam-run: inherit /etc/profile fixes 2022-02-04 18:36:46 -08:00
Franz Pletz 267fad119f
minetest: remove unused patches 2022-02-04 16:21:28 +01:00
Franz Pletz 6e78755eaf
minetest: 5.4.1 -> 5.5.0 2022-02-04 16:16:04 +01:00
Franz Pletz 2bbe6d7b8a
minetest: remove version 4 2022-02-04 16:16:04 +01:00
1000101 7446e158d8 7kaa: init at 2.15.4p1 2022-02-03 16:46:27 +01:00
Joel 56076698c2
minecraft-servers: fix update.py
Previously, running `nix-shell maintainers/scripts/update.nix --argstr package minecraft-server` caused `versions.json` to be placed in the repository root instead of `pkgs/games/minecraft-servers`.
2022-02-02 11:36:09 +10:00
Berk Ozkutuk 38fa6d6041 anki: apply patch to replace deprecated method 2022-01-31 22:37:47 +03:00
R. Ryantm 03aabab071 openttd-nml: 0.5.3 -> 0.6.1 2022-01-31 10:00:46 -08:00
R. Ryantm 8ec1caf265 osu-lazer: 2021.1225.0 -> 2022.118.0 2022-01-31 10:00:19 -08:00
R. Ryantm 1245bc3819 vassal: 3.6.1 -> 3.6.4 2022-01-31 09:53:46 -08:00
Sandro 9e61c9c064
Merge pull request #157116 from muscaln/polymc 2022-01-28 12:00:21 +01:00
Mustafa Çalışkan 37df4305c6
polymc: 1.0.4 -> 1.0.6 2022-01-28 13:03:01 +03:00
Sandro 27cccd4e49
Merge pull request #151363 from Stunkymonkey/doc-updateWalker 2022-01-27 14:06:36 +01:00
Felix Buehler ed7bf9452c treewide: remove *.upstream files from updateWalker 2022-01-26 21:46:07 +01:00
Martin Weinelt 48f17360d9 Merge remote-tracking branch 'origin/master' into staging-next 2022-01-25 15:53:19 +01:00
Franz Pletz a6e45b0893
Merge pull request #156703 from fgaz/shattered-pixel-dungeon/1.1.2 2022-01-25 15:35:55 +01:00
Francesco Gazzetta 6beb585135 shattered-pixel-dungeon: 1.1.0 -> 1.1.2 2022-01-25 14:21:48 +01:00
Artturi 25dc5a5d2d
Merge pull request #156300 from r-ryantm/auto-update/vintagestory 2022-01-25 15:12:53 +02:00
github-actions[bot] cfef27f7cf
Merge master into staging-next 2022-01-25 06:01:33 +00:00
legendofmiracles 379e0e806e
Merge pull request #156403 from r-ryantm/auto-update/legendary-gl
legendary-gl: 0.20.24 -> 0.20.25
2022-01-24 21:40:29 -06:00
github-actions[bot] a45818989a
Merge master into staging-next 2022-01-24 18:01:03 +00:00
legendofmiracles ba667597db
Merge pull request #156490 from r-ryantm/auto-update/xcowsay
xcowsay: 1.5.1 -> 1.6
2022-01-24 07:51:17 -06:00
legendofmiracles b3e7261a0e
Merge pull request #155505 from IvarWithoutBones/init/supaplex
opensupaplex: init at 7.1.2
2022-01-24 07:12:23 -06:00
github-actions[bot] 6fee71d339
Merge master into staging-next 2022-01-24 12:01:16 +00:00