Commit Graph

6654 Commits

Author SHA1 Message Date
Francesco Gazzetta
932d315a5a
Merge pull request #210628 from twitchyliquid64/mindustry-bump
mindustry: 140.4 → 141.2
2023-01-14 23:26:37 +00:00
Martin Weinelt
b974cf6522
Merge pull request #209180 from NixOS/staging-next 2023-01-14 16:26:39 +00:00
ajs124
9190becb61
Merge pull request #210463 from 0x4A6F/master-eidolon
eidolon: openssl_1_1 -> openssl_3
2023-01-14 15:03:39 +01:00
github-actions[bot]
79cb2f7e61
Merge master into staging-next 2023-01-14 11:12:34 +00:00
Nick Cao
e6643860cb
Merge pull request #210456 from helsinki-systems/shticker-book-unwritten_ossl3
Revert "shticker-book-unwritten: pin to openssl_1_1"
2023-01-14 16:52:18 +08:00
Tom
3fb55f3268 mindustry: 140.4 → 141.2 2023-01-13 20:18:57 -08:00
github-actions[bot]
4712ed9439
Merge master into staging-next 2023-01-14 00:02:26 +00:00
Robert Schütz
b165b45b20 cutemaze: 1.3.1 -> 1.3.2
https://github.com/gottcode/cutemaze/releases/tag/v1.3.2
2023-01-13 14:24:26 -08:00
github-actions[bot]
ceb05ad4bf
Merge master into staging-next 2023-01-13 06:01:09 +00:00
0x4A6F
7933a9399e
eidolon: openssl_1_1 -> openssl_3 2023-01-13 02:03:34 +01:00
Mario Rodas
306dab3b50
Merge pull request #210427 from r-ryantm/auto-update/ferium
ferium: 4.2.2 -> 4.3.3
2023-01-12 19:53:52 -05:00
ajs124
4f16cd58e5 Revert "shticker-book-unwritten: pin to openssl_1_1"
This reverts commit ceb1673ca7.

Seems fine after 653e881d1c
2023-01-13 01:12:33 +01:00
github-actions[bot]
d51e8ce349
Merge master into staging-next 2023-01-13 00:02:15 +00:00
ajs124
ae41560618
Merge pull request #208642 from anoadragon453/anoa/runescape_fix
runescape-launcher: Switch to openssl_1_1
2023-01-13 00:16:12 +01:00
R. Ryantm
66fac9b1cf ferium: 4.2.2 -> 4.3.3 2023-01-12 21:26:09 +00:00
Martin Weinelt
c1e6c6af69 Merge remote-tracking branch 'origin/master' into staging-next 2023-01-11 03:51:33 +01:00
Jonas Heinrich
d46a8e74bc
Merge pull request #209905 from mahmoudk1000/master
anki-bin: 2.1.55 -> 2.1.56
2023-01-10 13:53:25 +01:00
Sergei Trofimovich
d1b1b0d1b0
Merge pull request #209333 from mikroskeem/update-eduke32
eduke32: 20221026 -> 20221225
2023-01-09 21:14:29 +00:00
Artturi
27c1ec2ecf
Merge pull request #209816 from Artturin/deprecate-top-level-platform-aliases 2023-01-09 22:15:50 +02:00
Artturin
2eeb34c273 treewide: {build,host,target}Platform -> stdenv.{build,host,target}Platform 2023-01-09 21:13:22 +02:00
Mahmoud Ayman
87be5b0e9b
anki-bin: 2.1.55 -> 2.1.56 2023-01-09 18:55:45 +02:00
Martin Weinelt
4d65509504 Merge remote-tracking branch 'origin/master' into staging-next 2023-01-08 16:34:30 +01:00
Nikolay Korotkiy
2f2aa2b846
Merge pull request #209623 from r-ryantm/auto-update/tintin
tintin: 2.02.20 -> 2.02.30
2023-01-08 17:16:30 +04:00
Thiago Kenji Okada
fe1bb44eee
Merge pull request #209018 from wegank/solicurses-darwin
solicurses: unbreak on darwin
2023-01-08 12:08:29 +00:00
Sergei Trofimovich
3f26c524f1
Merge pull request #208767 from fgaz/warzone2100/4.3.3
warzone2100: 4.3.2 -> 4.3.3
2023-01-08 11:00:09 +00:00
R. Ryantm
76766f8bcd tintin: 2.02.20 -> 2.02.30 2023-01-08 04:42:04 +00:00
github-actions[bot]
4bf238a8fb
Merge master into staging-next 2023-01-08 00:02:31 +00:00
R. Ryantm
d2c57d447f the-legend-of-edgar: 1.35 -> 1.36 2023-01-07 20:10:21 +00:00
github-actions[bot]
3b3114f45d
Merge master into staging-next 2023-01-07 18:01:08 +00:00
Artturi
f56de234bb
Merge pull request #207652 from Artturin/splicenixfmt 2023-01-07 17:42:25 +02:00
github-actions[bot]
76d33189ba
Merge master into staging-next 2023-01-07 12:01:24 +00:00
Bobby Rong
ede1577e9e
Merge pull request #209028 from EsAu79p/submit/anki-bin
anki-bin: 2.1.54 -> 2.1.55
2023-01-07 17:49:53 +08:00
github-actions[bot]
00aa7f762f
Merge master into staging-next 2023-01-07 06:01:13 +00:00
360ied
c73f29c723 classicube: move runHook postInstall 2023-01-07 05:28:13 +01:00
360ied
235799128b classicube: use makeDesktopItem 2023-01-07 05:28:13 +01:00
360ied
52519fd12e classicube: add .desktop file 2023-01-07 05:28:13 +01:00
github-actions[bot]
0789ea69b1
Merge master into staging-next 2023-01-07 00:02:25 +00:00
Thiago Kenji Okada
8af48279a7
Merge pull request #209359 from thiagokokada/vdrift-bump
vdrift: unstable-2017-12-09 -> unstable-2021-09-05
2023-01-06 20:33:14 +00:00
Thiago Kenji Okada
085a82b2c8 vdrift: unstable-2017-12-09 -> unstable-2021-09-05 2023-01-06 19:19:10 +00:00
Thiago Kenji Okada
5fead9f61e osu-lazer-bin: set meta.mainProgram 2023-01-06 18:37:55 +00:00
Thiago Kenji Okada
2503cf5ba2 osu-lazer-bin: set meta.sourceProvenance 2023-01-06 18:26:44 +00:00
Thiago Kenji Okada
30acf193c5 osu-lazer-bin: move it to osu-lazer directory 2023-01-06 18:26:27 +00:00
Thiago Kenji Okada
f6e032322c
Merge pull request #209320 from wegank/vdrift-scons
vdrift: migrate to scons_latest
2023-01-06 18:16:26 +00:00
Martin Weinelt
5b308cd1df Merge remote-tracking branch 'origin/master' into staging-next 2023-01-06 19:10:05 +01:00
Thiago Kenji Okada
15612c32bf
Merge pull request #209314 from wegank/glob2-scons
globulation2: migrate to scons_latest
2023-01-06 18:06:14 +00:00
Mark Vainomaa
230027e9c6
eduke32: 20221026 -> 20221225 2023-01-06 18:34:06 +02:00
Weijia Wang
cc671d5f32 vdrift: migrate to scons_latest 2023-01-06 16:16:18 +01:00
Weijia Wang
930bc69b28 globulation2: migrate to scons_latest 2023-01-06 14:54:14 +01:00
github-actions[bot]
789ae2c93d
Merge staging-next into staging 2023-01-04 18:01:36 +00:00
Bobby Rong
62f3c14480
Merge pull request #208907 from reedrw/r2mod-132
r2mod_cli: 1.2.1 -> 1.3.2
2023-01-04 22:42:31 +08:00