3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

5016 commits

Author SHA1 Message Date
github-actions[bot] 1093ddf273
Merge master into staging-next 2021-11-07 06:01:02 +00: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
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
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
Artturin 436b062368 grapejuice: 3.60.14 -> 3.64.16 2021-11-02 15:23:44 +02:00
Artturi c5869ce201
Merge pull request #143608 from r-ryantm/auto-update/qtads
qtads: 3.1.0 -> 3.2.0
2021-11-02 14:29:59 +02:00
Artturi fd33deeb3e
Merge pull request #143936 from r-ryantm/auto-update/osu-lazer
osu-lazer: 2021.1016.0 -> 2021.1028.0
2021-11-02 14:11:51 +02:00
Lorenz Leutgeb 43750fb958 gradle: add 7.3-rc-3, 6.8 -> 6.9.1 2021-11-02 09:39:36 +01:00
github-actions[bot] 83d6b7a7e0
Merge staging-next into staging 2021-11-01 18:01:40 +00:00
Bobby Rong 652963831c
Merge pull request #144096 from Atemu/update/anki-bin
anki-bin: 2.1.48 -> 2.1.49
2021-11-01 20:55:33 +08:00
Atemu fcd2ff5727 anki-bin: 2.1.48 -> 2.1.49 2021-11-01 10:01:11 +01:00
R. Ryantm 2344bc5c9d osu-lazer: 2021.1016.0 -> 2021.1028.0 2021-10-31 04:33:51 +00:00
github-actions[bot] 853a47c140
Merge staging-next into staging 2021-10-29 12:01:53 +00:00
R. Ryantm 0826148c36 qtads: 3.1.0 -> 3.2.0 2021-10-29 08:31:53 +00:00
Bobby Rong 5961a053f7
Merge pull request #143342 from r-ryantm/auto-update/trackballs
trackballs: 1.3.2 -> 1.3.3
2021-10-29 14:46:51 +08:00
github-actions[bot] d9aba51052
Merge staging-next into staging 2021-10-29 06:01:42 +00:00
Bobby Rong 7f795a4e46
Merge pull request #143351 from r-ryantm/auto-update/tintin
tintin: 2.02.11 -> 2.02.12
2021-10-29 11:19:38 +08:00
github-actions[bot] 37b1afa489
Merge staging-next into staging 2021-10-28 18:02:03 +00:00
Alyssa Ross 3f01b576af
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
	nixos/doc/manual/release-notes/rl-2111.section.md
2021-10-28 16:07:38 +00:00
Sandro ffc11df8d2
Merge pull request #143057 from lukegb/factorio 2021-10-28 16:42:11 +02:00
Luke Granger-Brown 6b4dfd8db1 factorio-experimental: 1.1.44 -> 1.1.45 2021-10-28 14:12:46 +00:00
R. Ryantm f785bbf4bf tintin: 2.02.11 -> 2.02.12 2021-10-28 10:22:57 +00:00
R. Ryantm 39e8890675 trackballs: 1.3.2 -> 1.3.3 2021-10-28 09:36:06 +00:00
Luke Granger-Brown 9603ad9f17 factorio-experimental: 1.1.43 -> 1.1.44 2021-10-27 22:36:35 +00:00
Kerstin 8336346e74
factorio: set pname (#143164)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-10-27 21:18:51 +02:00
Evgeny Kurnevsky a25d54aae3
wesnoth: 1.14.17 -> 1.16.0 2021-10-27 10:26:34 +03:00
github-actions[bot] b6a580b9b3
Merge staging-next into staging 2021-10-27 00:02:06 +00:00
Luke Granger-Brown 7580641623 factorio: add support for updating specific release_type/release_channel 2021-10-26 22:58:56 +00:00
Luke Granger-Brown c2c0862c7a factorio-experimental: 1.1.42 -> 1.1.43 2021-10-26 22:55:15 +00:00
Sandro aae7b95f57
Merge pull request #143049 from fgaz/warzone2100/4.2.0 2021-10-26 23:34:56 +02:00