1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 12:11:28 +00:00
Commit graph

3540 commits

Author SHA1 Message Date
Jan Tojnar 83442a3533
Merge branch 'master' into staging-next 2020-07-20 02:16:21 +02:00
Sarah Brofeldt 0bf47d487a
Merge pull request #93448 from euank/update-steamruntime
steam-runtime: 0.20200417.0 -> 0.20200604.0
2020-07-19 10:32:33 +02:00
Vladimír Čunát 4244b73917
Merge branch 'master' into staging 2020-07-18 17:50:23 +02:00
Michael Weiss 5b14758d31
Merge pull request #92920 from primeos/scons
scons: 3.1.2 -> 4.0.0
2020-07-18 13:36:29 +02:00
Michael Weiss a838caa33a
tdm: Fix the build
Was failing in the desktop-file validation stage [0]:
/nix/store/XXX-tdm.desktop/share/applications/tdm.desktop: error: value
"False" for boolean key "Terminal" in group "Desktop Entry" contains
invalid characters, boolean values must be "false" or "true"

[0]: https://hydra.nixos.org/build/123852137
2020-07-18 11:41:47 +02:00
Michael Weiss 595a36d846
scons.py2: Replace with sconsPackages.scons_3_1_2
Required since SCons 4.0.0 doesn't support Python 2.7 anymore.
2020-07-18 10:48:20 +02:00
Alyssa Ross 5da2d61bd4 cataclysm-dda: 0.E -> 0.E-2 2020-07-18 05:16:04 +00:00
Euan Kemp 8c5c7d3aaf steam-runtime: 0.20200417.0 -> 0.20200604.0 2020-07-16 22:35:14 -07:00
Silvan Mosberger 2a740344cc
Merge pull request #85021 from oxalica/osu
osu-lazer: init at 2020.714.0
2020-07-17 01:45:04 +02:00
Derpford 951e2175c3
GZDoom 4.3.3 -> 4.4.2
* Update to 4.4.2

4.4.0 increased the ZScript version number, GZDoom 4.4.1 and 4.4.2 have some bugfixes.

* Fix bad checksum

Old hash was done without `--unpack` option, resulting in a mismatch.

* Fetch submodules

This fixes the issue with `zmusic` not being brought in as a dependency.

* Add zmusic derivation

Since zmusic isn't actually a submodule, we have to derive it ourselves and pass it as a buildInput.

* Semicolon.

* Semicolon in the *right* place this time.

* Merge the zmusic source into the gzdoom source.

Apparently this is how they expect zmusic to be added. Why this isn't a submodule, I don't know.

* Fix bad path editing

Credit to Open Skies for fixing this. Turns out the paths edited in the `gzdoom` derivation were for zmusic, which needs these edits to be made so that it looks in nix-friendly places for its stuff.
2020-07-16 23:45:10 +02:00
oxalica 11f986d3c8
osu-lazer: 2020.712.0 -> 2020.714.0 2020-07-16 19:23:44 +08:00
oxalica 4bbedffe50
osu-lazer: 2020.707.0 -> 2020.712.0 2020-07-14 03:15:49 +08:00
Daniël de Kok 0963cebfc5
Merge pull request #92897 from Moredread/chiaki
chiaki: 1.1.3 -> 1.2.1
2020-07-13 13:11:32 +02:00
Carles Pagès d6c63c7bcd minecraft: 2.1.15166 -> 2.1.15852 2020-07-12 23:34:36 +02:00
André-Patrick Bubel 97da56664c
chiaki: 1.1.3 -> 1.2.1 2020-07-12 20:52:11 +02:00
freezeboy bda43779f6 minetest: 5.2.0 -> 5.3.0 2020-07-11 15:33:23 +02:00
oxalica a21ba99681
osu-lazer: init at 2020.707.0 2020-07-09 02:20:12 +08:00
Domen Kožar 2794ee0c06
Merge pull request #92584 from r-ryantm/auto-update/springlobby
springLobby: 0.269 -> 0.270
2020-07-07 16:37:14 +02:00
R. RyanTM 63bba7986a springLobby: 0.269 -> 0.270 2020-07-07 14:18:31 +00:00
Benjamin Hipple 1809db0ae1
Merge pull request #92381 from r-ryantm/auto-update/pentobi
pentobi: 18.0 -> 18.1
2020-07-05 19:22:01 -04:00
R. RyanTM bfc1c1533c pentobi: 18.0 -> 18.1 2020-07-05 21:49:43 +00:00
Daniël de Kok cfceaaec17
Merge pull request #92236 from neonfuz/crispy-doom
crispy-doom: fixed CVE-2020-14983
2020-07-05 20:24:11 +02:00
Sage Raflik 2d24b8b187 crispyDoom: fixed CVE-2020-14983 2020-07-05 20:09:32 +02:00
Ryan Mulligan c09177d5dc
Merge pull request #92346 from fgaz/endgame-singularity/1.00
Endgame singularity/1.00
2020-07-05 09:44:19 -07:00
Francesco Gazzetta c823b4c374 endgame-singularity: add option to disable the default music pack
It's the heaviest part of the game. People may not want to have it take
space or may want to use their own music.
2020-07-05 17:37:08 +02:00
Francesco Gazzetta d80eeaea47 endgame-singularity: 0.30c -> 1.00 2020-07-05 17:29:17 +02:00
R. RyanTM ea7fc409dd chocolateDoom: 3.0.0 -> 3.0.1 2020-07-03 04:23:16 +00:00
Manuel Bärenz 637fa6901f Rename flightgear-{base -> data} 2020-07-01 14:58:09 +02:00
Manuel Bärenz 2b88a4fd29 flightgear: 2019.1.1 -> 2020.1.2, simgear: 2020.1.{1 -> 2} 2020-07-01 14:58:09 +02:00
Benjamin Hipple 0e2d755231 anki: expression cleanup 2020-07-01 04:29:09 +02:00
Benjamin Hipple ae56f20b71 anki: update download url
The original repo has been transferred on github, so the URL is a redirect to here.
2020-07-01 04:29:09 +02:00
Tim Steinbach a8edf35af8
minecraft-launcher: 2.1.14947 -> 2.1.15166
Set JAVA_HOME, which can impurely override JRE
2020-06-30 17:14:46 -04:00
Dmitry Kalinkin 9e7d03c588
Merge pull request #91763 from priegger/fix/factorio-update
factorio{,-headless}-experimental: 0.18.32 -> 0.18.34, add priegger to maintainers
2020-06-29 15:54:52 -04:00
Philipp Riegger c596617e40 factorio*: add priegger to maintainers 2020-06-29 15:52:54 +02:00
Philipp Riegger c36b573fab factorio{,-headless}-experimental: 0.18.32 -> 0.18.34 2020-06-29 15:39:41 +02:00
Francesco Gazzetta 75d9ea9671 shattered-pixel-dungeon: 0.8.0b -> 0.8.1 2020-06-29 12:27:13 +02:00
Mario Rodas 340b0d5382
Merge pull request #91569 from Lucus16/bump-minecraft
minecraft-server: 1.15.2 -> 1.16.1
2020-06-27 20:14:06 -05:00
Matthieu Coudron 91c9127ef9
Merge pull request #91421 from SCOTT-HAMILTON/SuperTuxKart
SuperTuxKart: Replaced some bundled libraries with system ones
2020-06-27 20:21:11 +02:00
SCOTT-HAMILTON b2b28fcad3 SuperTuxKart: Replaced some bundled libraries with system ones 2020-06-27 18:45:18 +02:00
Lars Jellema 80bd9d38e3
minecraft-server: 1.15.2 -> 1.16.1 2020-06-26 10:30:00 +02:00
zowoq c7e61112df treewide: remove deprecated value Application from makeDesktopItem 2020-06-25 12:18:37 +10:00
Christian Kampka ccb847f735
wesnoth: 1.14.12 -> 1.14.13 2020-06-22 23:33:34 +02:00
Martin Weinelt b109addeef
openttd-jgrpp: init at 0.34.4 2020-06-22 15:36:18 +02:00
Benjamin Slade 37d231adfe gargoyle: 2018.10.06 -> 2019.01.01
- latest released version

- changes: adopt suggestions + more fixes
2020-06-21 09:04:16 -06:00
Timo Kaufmann 6a438dbb87
Merge pull request #87947 from fgaz/shattered-pixel-dungeon/0.8.0b
shattered-pixel-dungeon: 0.7.5f -> 0.8.0b
2020-06-19 23:50:38 +02:00
Daniël de Kok baa29b3734
Merge pull request #91051 from pstn/mudlet-4.9.1
mudlet: 4.3 -> 4.9.1
2020-06-19 08:11:36 +02:00
Philipp 9f2d920c35
mudlet: 4.3 -> 4.9.1 2020-06-18 19:15:31 +02:00
gnidorah 5b3eac040b
openmw-tes3mp: fix build after #80624 (#91045) 2020-06-18 12:49:27 -04:00
Nick Hu 3690f94550
Merge pull request #90499 from priegger/fix/factorio-experimental
factorio{,-headless}-experimental: 0.18.30 -> 0.18.32
2020-06-18 11:15:36 +01:00
Christian Kampka eb296c5010 wesnoth: 1.14.11 -> 1.14.12 2020-06-17 16:28:18 +02:00