Commit Graph

4774 Commits

Author SHA1 Message Date
github-actions[bot]
7ae0b00541
Merge staging-next into staging 2021-08-11 18:01:46 +00:00
Jan Tojnar
807d3ec359 Merge branch 'staging-next' into staging
; Conflicts:
;	pkgs/tools/misc/t1utils/default.nix
2021-08-11 16:34:11 +02:00
Sandro
fa556a76c4
Merge pull request #131976 from McSinyx/brutalmaze 2021-08-11 16:33:52 +02:00
Sandro
45b6595e86
Merge pull request #133434 from nagy/ioquake3 2021-08-11 10:49:53 +02:00
Artturi
a4c256fa86
Merge pull request #133362 from r-ryantm/auto-update/antsimulator 2021-08-11 04:40:00 +03:00
Artturin
58156d95e9 antsimulator: fix texture path 2021-08-11 04:31:46 +03:00
Artturi
76ab20e3b7
Merge pull request #133419 from r-ryantm/auto-update/crispy-doom
crispyDoom: 5.10.1 -> 5.10.2
2021-08-11 04:03:27 +03:00
Daniel Nagy
20f7b7517e
ioquake3: 2020-12-26 -> 2021-07-20 2021-08-11 00:30:53 +02:00
R. RyanTM
41d065ef60 crispyDoom: 5.10.1 -> 5.10.2 2021-08-10 20:01:17 +00:00
Sandro
da5f8ba58c
Merge pull request #133348 from marius851000/portmod-update
portmod: 2.0_beta9 -> 2.0.3
2021-08-10 15:27:59 +02:00
R. RyanTM
07ebaed974 antsimulator: 1.2 -> 3.1 2021-08-10 11:05:35 +00:00
marius david
bce379dd87 portmod: 2.0_beta9 -> 2.0.3 2021-08-10 11:58:18 +02:00
Sandro Jäckel
b2bdf29ced
ecwolf: cleanup, format 2021-08-10 10:19:29 +02:00
Charlotte Van Petegem
dfe3b739c7
zeroad: make sure hydra builds zeroad-unwrapped
Hydra hasn't built zeroad since the 0.0.24 bump:
https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.zeroad.x86_64-linux/all
This is due to the data package becoming larger than the output
limit. Even though the data package is already marked with
`hydraPlatforms = [];`, hydra still tried to build it, since it is a
dependency of `zeroad`. This makes it so `zeroad` isn't built by hydra
either. Only `zeroad-unwrapped` (which takes significant compilation
time) will be built by hydra.
2021-08-10 09:37:34 +02:00
Nguyễn Gia Phong
8096436f28
brutalmaze: init at 1.1.1 2021-08-10 11:42:13 +07:00
Manuel F. Schmid
a777419869 zeroad: 0.0.24b -> 0.0.25 2021-08-09 13:41:01 +02:00
Artturi
a0e7ff1153
Merge pull request #129475 from robintown/minecraft-server
minecraft-server: 1.17 -> 1.17.1
2021-08-08 08:28:28 +03:00
Sandro
fe06160c09
Merge pull request #133044 from robgssp/anki-bin-update
anki-bin: 2.1.44 -> 2.1.46
2021-08-08 05:12:46 +02:00
Robert Glossop
08c8e87b99 anki-bin: 2.1.44 -> 2.1.46 2021-08-07 20:30:38 -05:00
Sandro Jäckel
16ffbe7582
marathon: format 2021-08-08 02:38:43 +02:00
Artturi
658c431079
Merge pull request #117598 from r-ryantm/auto-update/manaplus
manaplus: 1.9.3.23 -> 2.1.3.17
2021-08-08 03:35:11 +03:00
R. RyanTM
45f3eea922
angband: 4.2.2 -> 4.2.3 (#132372)
Co-authored-by: Artturi <Artturin@artturin.com>
2021-08-08 03:05:24 +03:00
Artturi
a8e797b9f8
Merge pull request #124092 from r-ryantm/auto-update/marathon
alephone-marathon: 20200904 -> 20210408
2021-08-08 02:55:03 +03:00
Artturi
456c65021f
Merge pull request #132982 from r-ryantm/auto-update/fheroes2
fheroes2: 0.9.5 -> 0.9.6
2021-08-08 02:22:19 +03:00
Sander van der Burg
8fa19a7a6c
Merge pull request #132826 from svanderburg/add-desktopitems
Add desktopitems for some classic games
2021-08-07 20:32:00 +02:00
Artturi
a613f88023
Merge pull request #116403 from r-ryantm/auto-update/dhewm3
dhewm3: 1.5.0 -> 1.5.1
2021-08-07 21:08:13 +03:00
Sandro
ceb245203b
Merge pull request #133027 from legendofmiracles/rpg-cli/update
rpg-cli: 0.5.0 -> 0.6.0
2021-08-07 19:36:28 +02:00
legendofmiracles
4e370c5020
rpg-cli: 0.5.0 -> 0.6.0 2021-08-07 09:51:14 -06:00
Sandro
e056d5d122
Merge pull request #132794 from SuperSandro2000/freeciv
freeciv: format, cleanup
2021-08-07 11:49:14 +02:00
Johannes Arnold
ba2cb8365c
ballerburg: init at 1.2.0 (#132824)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-08-07 11:43:20 +02:00
R. RyanTM
a4cd1123fe fheroes2: 0.9.5 -> 0.9.6 2021-08-07 07:19:40 +00:00
Artturin
3cf4dbe256 grapejuice: 3.40.14 -> 3.60.14 2021-08-07 04:24:10 +03:00
Sander van der Burg
f7ae4163e0 dhewm: add desktop item 2021-08-06 22:14:47 +02:00
Sander van der Burg
55c21071de quakespasm: add desktop item 2021-08-06 22:14:46 +02:00
Sander van der Burg
246ac3167d gzdoom: add desktop item 2021-08-06 22:14:39 +02:00
Naïm Favier
da23d345f2
terraria-server: update source URL (#132801)
The old URL redirects to the main page.
2021-08-06 01:54:49 -04:00
Sandro Jäckel
da88c1e9b6
freeciv: format, cleanup 2021-08-05 16:57:52 +02:00
oxalica
59538cea82
osu-lazer: remove temper detection bypass patch
See #132610
2021-08-05 15:04:33 +08:00
Sandro
9879c59ab1
Merge pull request #132684 from lukegb/factorio 2021-08-04 22:48:45 +02:00
Luke Granger-Brown
f20800263c factorio-experimental: 1.1.36 -> 1.1.37 2021-08-04 16:37:33 +00:00
Sandro
b2412ac2e9
Merge pull request #132520 from Stunkymonkey/games-phases 2021-08-03 20:59:54 +00:00
Daniel Olsen
7467b025a0 randtype: init at 1.13 2021-08-03 18:14:09 +02:00
Sandro
8a774cb173
Merge pull request #132512 from McSinyx/flare-1.12
flare: 1.12rc2 -> 1.12
2021-08-03 10:16:14 +00:00
Felix Buehler
11ba397752 flightgear: deprecate phases 2021-08-03 10:50:40 +02:00
Felix Buehler
76fff62cad vapor: deprecate phases 2021-08-03 10:50:22 +02:00
Felix Buehler
b2071530e2 sienna: deprecate phases 2021-08-03 10:50:01 +02:00
Felix Buehler
1b7a0e8dbb scrolls: remove phases 2021-08-03 10:49:27 +02:00
Felix Buehler
4dafca2c7a rimshot: remove phases 2021-08-03 10:49:09 +02:00
Felix Buehler
6c9e39afa0 nottetris2: remove phases 2021-08-03 10:48:50 +02:00
Felix Buehler
96dfb5fa71 mrrescue: deprecate phases 2021-08-03 10:48:34 +02:00