github-actions[bot]
b199af176d
Merge master into staging-next
2021-11-11 00:01:45 +00:00
Felix Bühler
f5c12e8311
treewide: replace '-git' packages with 'unstable-' in version ( #145396 )
2021-11-10 16:21:47 -05:00
Dmitry Kalinkin
d4554c23a8
Merge pull request #145328 from SFrijters/openttd-12.1
...
openttd: 12.0 -> 12.1, openttd-jgrpp: 0.43.1 -> 0.44.0
2021-11-10 16:20:31 -05:00
github-actions[bot]
259e08cd22
Merge master into staging-next
2021-11-10 18:01:21 +00:00
Francesco Gazzetta
65072f8018
warzone2100: 4.2.0 -> 4.2.1
2021-11-10 14:02:17 +01:00
Stefan Frijters
ed15fa0a4a
openttd-jgrpp: 0.43.1 -> 0.44.0
2021-11-10 10:08:10 +01:00
Stefan Frijters
d60b95168e
openttd: 12.0 -> 12.1
2021-11-10 10:05:46 +01:00
github-actions[bot]
6e4d2d1f10
Merge master into staging-next
2021-11-10 00:01:31 +00:00
Thiago Kenji Okada
36d4aed2aa
Merge pull request #144709 from flexagoon/tpt-desktop
...
the-powder-toy: add a .desktop file
2021-11-09 19:16:41 -03:00
github-actions[bot]
7414a16ee5
Merge master into staging-next
2021-11-09 18:01:23 +00:00
Thiago Kenji Okada
1ffd57e92b
Merge pull request #144999 from aanderse/devilutionx
...
devilutionx: minor cleanup after review
2021-11-09 11:28:07 -03:00
github-actions[bot]
f14d7cb2f6
Merge master into staging-next
2021-11-08 18:01:24 +00:00
Sandro
cb5b4c60e2
Merge pull request #144710 from ElXreno/package-ddnet-15.6
2021-11-08 13:39:29 +01:00
ElXreno
e9f274bb57
ddnet: 15.5.4 -> 15.6.2
2021-11-08 14:40:18 +03:00
Aaron Andersen
f7b51c1dcf
devilutionx: pass static version of SDL2 into derivation
2021-11-07 13:15:24 -05:00
github-actions[bot]
14f1b9f2ac
Merge master into staging-next
2021-11-07 18:01:14 +00:00
Sandro
a2f2e10e9e
Merge pull request #144985 from Stunkymonkey/factorio-1.1.46
2021-11-07 18:26:22 +01:00
Felix Buehler
7d64d4b197
factorio{,demo,headless}: 1.1.42 -> 1.1.46
2021-11-07 15:50:31 +01:00
Thiago Kenji Okada
1671a7beb3
Merge pull request #144569 from aanderse/devilutionx
...
devilutionx: 1.2.1 -> 1.3.0
2021-11-07 11:21:15 -03:00
Aaron Andersen
102fe10745
devilutionx: include patch to compile with system SDL2_image
2021-11-07 07:50:04 -05:00
Aaron Andersen
565d632952
devilutionx: 1.2.1 -> 1.3.0
2021-11-07 07:49:59 -05:00
github-actions[bot]
e0cac44f90
Merge master into staging-next
2021-11-07 12:01:18 +00:00
Michele Guerini Rocco
d631a73345
Merge pull request #144881 from vs49688/wtfix
...
winetricks: remove wine dependency
2021-11-07 12:33:09 +01:00
github-actions[bot]
1093ddf273
Merge master into staging-next
2021-11-07 06:01:02 +00:00
Zane van Iperen
1d177d5a70
stepmania: build with newer ffmpeg
2021-11-07 15:56:45 +10:00
Bobby Rong
81d1568262
Merge pull request #144926 from trofi/update-fheroes2
...
fheroes2: 0.9.8 -> 0.9.9
2021-11-07 11:05:56 +08:00
figsoda
56cb753dcf
Merge pull request #144916 from flexagoon/osu-lazer-update
...
osu-lazer: 2021.1028.0 -> 2021.1105.0
2021-11-06 22:45:21 -04:00
github-actions[bot]
9166210176
Merge master into staging-next
2021-11-07 00:01:38 +00:00
Zane van Iperen
68ca39a775
winetricks: remove wine dependency
...
It shouldn't be tied to a particular Wine installation, it should use
the one in $PATH. Also massively reduces the closure size.
2021-11-07 10:00:47 +10:00
Sergei Trofimovich
ef89ee9b71
fheroes2: 0.9.8 -> 0.9.9
...
Changelog: https://github.com/ihhub/fheroes2/wiki/Change-Log#version-099-05-november-2021
2021-11-06 21:01:56 +00:00
Joerie de Gram
50417ddb87
opendungeons: 0.7.1 -> unstable-2021-11-06
...
- no stable release for over 5 years, switch to unstable
(fixes ois include path issue)
- update ogre dependency to ogre_1.10 to match cegui's version
(fixes crash on init)
ZHF: #144627
2021-11-06 14:46:59 -04:00
flexagoon
e9d384fd62
osu-lazer: 2021.1028.0 -> 2021.1105.0
2021-11-06 21:46:17 +03:00
github-actions[bot]
eeb7e66e97
Merge master into staging-next
2021-11-06 18:01:01 +00:00
Maximilian Bosch
5b013594c2
Merge pull request #144278 from marius851000/flightgear202011
...
flighgear : 2020.3.8 -> 2020.3.11
2021-11-06 16:52:09 +01:00
github-actions[bot]
89ec09c858
Merge master into staging-next
2021-11-06 12:01:12 +00:00
Kevin Cox
cc8db4bc81
Merge pull request #143152 from lorenzleutgeb/gradle-upgrade
...
gradle: add 7.3-rc-3, 6.8 -> 6.9.1
2021-11-06 06:57:19 -04:00
Ryan Burns
8726c7088d
Merge pull request #144380 from trofi/fix-bastet-for-ncurses-6.3
...
bastet: fix build against upcoming ncurses-6.3
2021-11-06 01:49:22 -07:00
github-actions[bot]
2663e5b623
Merge master into staging-next
2021-11-05 12:01:17 +00:00
Sandro
78e9fa8ba1
Merge pull request #144723 from trofi/fix-nudoku-for-ncurses-6.3
2021-11-05 11:17:40 +01:00
Sergei Trofimovich
274df1ce28
nudoku: pull upstream fix for upcoming ncurses-6.3
2021-11-05 09:28:18 +00:00
flexagoon
25566ba039
the-powder-toy: add a .desktop file
2021-11-05 11:05:06 +03:00
github-actions[bot]
cca97be2f0
Merge staging-next into staging
2021-11-04 12:01:39 +00:00
Sergei Trofimovich
bd7499ed61
Update pkgs/games/bastet/default.nix
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-11-03 22:33:59 +00:00
Sandro Jäckel
8547db919a
treewide: switch `builtins.fromJSON(builtins.readFile ./file.json)` to lib.importJSON ./file.json
2021-11-03 14:43:52 +01:00
Sergei Trofimovich
77c54c908f
bastet: fix build against upcoming ncurses-6.3
...
On ncurses-6.3 with extra printf() annotations gcc now detects
use of user input in place of format strings:
Ui.cpp:293:16: error: format not a string literal and no format arguments [-Werror=format-security]
293 | mvwprintw(w,0,0,msg.c_str());
| ~~~~~~~~~^~~~~~~~~~~~~~~~~~~
2021-11-03 08:09:42 +00:00
Alyssa Ross
703ffa2f5d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
2021-11-03 07:34:33 +00:00
Ryan Burns
f3bcb96352
Merge pull request #141723 from trofi/update-fheroes2
...
fheroes2: 0.9.7 -> 0.9.8
2021-11-02 20:12:23 -07:00
Martin Weinelt
8f5da907b0
Merge remote-tracking branch 'origin/staging-next' into staging
2021-11-02 23:31:28 +01:00
marius david
0fa259d1f4
flightgear: 2020.3.8 -> 2020.3.11
2021-11-02 20:56:28 +01:00
Artturi
57ad6db7c7
Merge pull request #144243 from Artturin/grapejuiceupdate
2021-11-02 18:10:42 +02:00
