Commit Graph

3871 Commits

Author SHA1 Message Date
github-actions[bot]
099a83caba
Merge master into staging-next 2020-12-30 12:24:47 +00:00
Doron Behar
f423aea36a
Merge pull request #103077 from freezeboy/add-colobot 2020-12-30 08:42:16 +02:00
github-actions[bot]
ff873c7c21
Merge master into staging-next 2020-12-29 18:40:52 +00:00
Sandro
4d8414cb92
Merge pull request #107867 from Atemu/update/anki-bin
anki-bin: 2.1.36 -> 2.1.38
2020-12-29 18:35:11 +01:00
freezeboy
80bff15d7b colobot: init at 0.1.12-alpha
Initial integration without the game musics to reduce the size of the
game. It works without them

Data are in another derivation to let them live their live independently
as they are quite big.

Limited to linux platform only because physfs is currently broken on
darwin.
2020-12-29 13:25:59 +01:00
github-actions[bot]
0984deb2b8
Merge master into staging-next 2020-12-29 06:22:28 +00:00
Sandro
ea3638a3fb
Merge pull request #107753 from freezeboy/update-cataclysm-dda
cataclysm-dda: 0.E-2 -> 0.E-3
2020-12-29 05:01:33 +01:00
github-actions[bot]
ac03278035
Merge master into staging-next 2020-12-28 18:34:55 +00:00
Francesco Gazzetta
6792a171e8
mindustry,mindustry-server: 121.4 -> 122 (#107646) 2020-12-28 17:03:31 +01:00
Atemu
cc7acd49ba anki-bin: 2.1.36 -> 2.1.38 2020-12-28 15:41:56 +01:00
Frederik Rietdijk
92cc19490e Merge staging into staging-next 2020-12-28 08:45:43 +01:00
freezeboy
e8cc6535cc cataclysm-dda: 0.E-2 -> 0.E-3 2020-12-27 21:41:39 +01:00
freezeboy
bf629416f0 banner: 1.3.4 -> 1.3.5 2020-12-27 16:12:44 +01:00
Sandro
81181e752a
Merge pull request #106377 from oxalica/osu-lazer 2020-12-26 20:10:50 +01:00
github-actions[bot]
309b7614e7
Merge staging-next into staging 2020-12-26 00:47:55 +00:00
Sandro
8dbd5276fe
Merge pull request #103826 from Thra11/augustus-2-0-0 2020-12-25 22:32:04 +01:00
Tom Hall
8992e8d5fc augustus: 1.4.1a -> 2.0.1
Mark as broken on darwin.
2020-12-25 18:47:54 +00:00
oxalica
58e72782e3
osu-lazer: 2020.1204.0 -> 2020.1225.0 2020-12-25 23:06:54 +08:00
oxalica
1f3cbd31b9
osu-lazer: fix runtime error 2020-12-25 23:06:54 +08:00
github-actions[bot]
09a970dcd2
Merge staging-next into staging 2020-12-25 12:23:40 +00:00
Timo Kaufmann
675660e2f3
Merge pull request #106638 from Atemu/anki-bin
anki-bin: init at 2.1.36
2020-12-25 11:41:42 +01:00
github-actions[bot]
8d42e46e8e
Merge staging-next into staging 2020-12-24 12:25:45 +00:00
Jonathan Ringer
9721604610 steamPackages.steam: add udev rules 2020-12-23 22:46:56 -08:00
Atemu
847b317a95 anki-bin: force x11
Co-authored-by: Vika <vika@fireburn.ru>
2020-12-24 07:02:43 +01:00
Atemu
0769fe2712 anki-bin: add darwin support 2020-12-24 07:02:43 +01:00
Atemu
18906f453e anki-bin: init at 2.1.36
Works around https://github.com/NixOS/nixpkgs/issues/78449

Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
2020-12-24 07:02:24 +01:00
Frederik Rietdijk
736dd028ca Merge staging-next into staging 2020-12-22 19:43:32 +01:00
Sandro
c8e43db4d3
Merge pull request #107245 from lheckemann/manaplus 2020-12-22 16:12:15 +01:00
Linus Heckemann
a59c33f33a manaplus: init at 1.9.3.23 2020-12-22 07:06:34 +01:00
github-actions[bot]
d87de5dd7d
Merge staging-next into staging 2020-12-21 12:23:08 +00:00
Sandro
d8375c5b79
Merge pull request #107290 from fgaz/mindustry/121.4
mindustry,mindustry-server: 120.2 -> 121.4
2020-12-21 07:56:12 +01:00
Jonathan Ringer
373cb5d41d steam: fix readonly boostrap.tar.xz
steam writes it with 444 permissions, which makes
simple deletions fails, and steam will crash
2020-12-20 22:38:18 -08:00
Jonathan Ringer
ab91cd998f steam: fix desktop link 2020-12-20 22:38:18 -08:00
Jonathan Ringer
473ec944a1 steamPackages.steam: 1.0.0.61 -> 1.0.0.68 2020-12-20 22:38:18 -08:00
Jonathan Ringer
0179b5f173 steam-fhsenv: normalize ldPath 2020-12-20 22:38:18 -08:00
github-actions[bot]
204a4ef360
Merge staging-next into staging 2020-12-21 00:45:57 +00:00
Sandro
e98df3d14a
Merge pull request #105391 from reedrw/r2mod 2020-12-21 00:01:41 +01:00
Francesco Gazzetta
15d67698c0 mindustry,mindustry-server: 120.2 -> 121.4 2020-12-20 23:23:19 +01:00
Milan Pässler
a333985d59 libtorrentRasterbar: rename to libtorrent-rasterbar
This is done to match upstream naming:
https://github.com/NixOS/nixpkgs/pull/107194#issuecomment-748501379
2020-12-20 20:51:28 +01:00
github-actions[bot]
266489aefb
Merge staging-next into staging 2020-12-20 18:19:55 +00:00
Sandro
6efd4d4343
Merge pull request #106439 from Xottab-DUTY/patch-2
openxray: update package description
2020-12-20 16:58:08 +01:00
github-actions[bot]
fd51d0dfe3
Merge staging-next into staging 2020-12-20 00:44:00 +00:00
Pavol Rusnak
0c3a7f97fd
Merge pull request #107224 from petabyteboy/feature/xonotic-fix-desktop-item
xonotic: fix desktop item
2020-12-19 23:51:38 +01:00
Lluís Batlle i Rossell
7d6cb4e614 frogatto: update to latest master and fix build 2020-12-19 22:00:25 +01:00
Milan Pässler
40262d4559
xonotic: fix desktop item
The desktop item was referring to "$out/bin/xonotic" as executable, but
since it's built in its own derivation now, "$out" did not contain the
xonotic wrapper.
Since it seems to be common practise to use a relative path, I changed
it to do that here as well.
2020-12-19 21:15:20 +01:00
Frederik Rietdijk
f081225a83
Merge pull request #106533 from helsinki-systems/refactor/waf-hook
[staging] wafHook: Don't wrap Python 2
2020-12-19 19:28:05 +01:00
Janne Heß
c71fd1848b
simutrans: Fix hash 2020-12-17 19:01:32 +01:00
wucke13
2bb504e1f5 flightgear: 2020.1.3 -> 2020.3.4 2020-12-17 10:19:48 -05:00
Jonathan Baldwin
0127c29713 steam/fhsenv: Add LD_LIBRARY_PATH (and hence OpenGL driver library path) to output of --print-steam-runtime-library-paths 2020-12-16 14:04:44 -08:00
Tim Steinbach
be4cf62b67
minecraft: Update script URL 2020-12-16 12:53:58 -05:00