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

3626 commits

Author SHA1 Message Date
Michele Guerini Rocco 85a6aa1131
Merge pull request #94612 from OmnipotentEntity/master
katago: 1.4.4 -> 1.5.0
2020-08-04 09:15:29 +02:00
Michael Reilly 7652a8e3d5 katago: 1.4.4 -> 1.5.0 2020-08-03 11:45:58 -04:00
R. RyanTM 03812ea806 shattered-pixel-dungeon: 0.8.1 -> 0.8.1a 2020-07-31 09:28:41 +00:00
Jörg Thalheim 8704039c98
Merge pull request #93405 from fgaz/curseofwar/1.3.0
curseofwar,curseofwar-sdl: 1.2.0 -> 1.3.0
2020-07-30 12:56:08 +01:00
Francesco Gazzetta 5d85ffea09 curseofwar,curseofwar-sdl: fix darwin build 2020-07-30 10:49:50 +02:00
Will Dietz d7dd12326f
steam-runtime: 0.20200604.0 -> 0.20200720.0 2020-07-28 23:53:23 -05:00
Louis Bettens 3049cb5b34 minecraft: 2.1.15852 -> 2.1.16102 2020-07-26 22:35:02 +02:00
oxalica 1d85919657
osu-lazer: 2020.714.0 -> 2020.725.0 (#93726) 2020-07-25 18:47:55 -04:00
Jan Tojnar 2988feba8c
Merge branch 'master' into staging-next 2020-07-23 08:19:14 +02:00
worldofpeace 8b6e9818a5
Merge pull request #84873 from mnacamura/cdda-mods
cataclysmDDA: add modding interface
2020-07-22 16:18:32 -04:00
Vladimír Čunát 7a5c6fee0f
Merge branch 'master' into staging-next
Some rebuilds, e.g. all of haskell.
Hydra nixpkgs: ?compare=1601713
2020-07-22 08:37:19 +02:00
Justin Humm 7d1b94b4dc
Merge pull request #93525 from priegger/fix/factorio-update
factorio{,-headless}-experimental: 0.18.34 -> 0.18.36
2020-07-20 16:04:46 +02:00
Philipp Riegger 1814bebd82 factorio{,-headless}-experimental: 0.18.34 -> 0.18.36 2020-07-20 11:46:23 +02:00
Michael Raskin 23c93a5205
Merge pull request #85169 from prusnak/inkscape
inkscape: 0.92.5 -> 1.0
2020-07-20 08:45:05 +00:00
Jan Tojnar 83442a3533
Merge branch 'master' into staging-next 2020-07-20 02:16:21 +02:00
Pavol Rusnak 8402a74cce
treewide: replace inkscape with inkscape_0
The Inkscape CLI interface has been changed with 1.x and packages
are not adjusted yet to this change. Let's use inkscape 0.x instead.
2020-07-19 13:10:16 +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
Francesco Gazzetta 68b7fc27c4 curseofwar,curseofwar-sdl: 1.2.0 -> 1.3.0 2020-07-18 12:41:20 +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
Mitsuhiro Nakamura f2b2347b29 doc: add section for cataclysm-dda 2020-07-18 14:23:25 +09:00
Mitsuhiro Nakamura cf0e2d51ac cataclysmDDA: update mods 2020-07-18 14:23:25 +09:00
Mitsuhiro Nakamura fbf4b4f5ed cataclysmDDA: update README
Add description about `useXdgDir` flag
2020-07-18 14:23:24 +09:00
Mitsuhiro Nakamura bbe7b86eea cataclysmDDA: launch the wrapped program 2020-07-18 14:23:24 +09:00
Mitsuhiro Nakamura d472eed4b5 cataclysmDDA: add README 2020-07-18 14:23:23 +09:00
Mitsuhiro Nakamura 633f211113 cataclysm-dda-git: make it overridable with git revision
'cataclysm-dda-git.overrideAttrs (_: { version = ...; src = fetchFromGitHub { ... }; })'
did not update VERSION make flag correctly.

With this change, one can override 'cataclysm-dda-git' correctly and
more easily:

cataclysm-dda-git.override { version = ...; rev = ...; sha256 = ...; }
2020-07-18 14:23:23 +09:00
Mitsuhiro Nakamura ecf7b57e12 cataclysm-dda{,-git}: support build with USE_XDG_DIR flag 2020-07-18 14:23:23 +09:00
Mitsuhiro Nakamura de56294e57 cataclysm-dda{,-git}: clean up 2020-07-18 14:23:22 +09:00
Mitsuhiro Nakamura 90c265275f cataclysmDDA: make pkgs extensible
Example:

let
  customMods = self: super: lib.recursiveUpdate super {
    soundpack.AwesomeSounds = cataclysmDDA.buildSoundPack { ... };
  };
in
cataclysm-dda.withMods (mods: with mods.extend customMods; [
  tileset.UndeadPeople
  soundpack.AwesomeSounds
])
2020-07-18 14:23:22 +09:00
Mitsuhiro Nakamura bc88844e68 cataclysmDDA: add UndeadPeople tileset 2020-07-18 14:23:22 +09:00
Mitsuhiro Nakamura ac8555486f cataclysmDDA: add very basic framework for packaging mods
Add new namespace 'cataclysmDDA', in which package builders, games, and
mods are listed.
2020-07-18 14:23:19 +09:00
Mitsuhiro Nakamura bf71f12cb5 cataclysm-dda{,-git}: apply locale patch dynamically
Each time src/translations.cpp is modified, we have to update the locale
patch. Using sed to patch dynamically should be handy.
2020-07-18 14:21:12 +09:00
Mitsuhiro Nakamura d6863de058 cataclysm-dda{,-git}: name -> pname and version 2020-07-18 14:21:09 +09: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
Ivar 8e9c0cbe2b sm64ex: init at unstable-2020-06-19 2020-07-17 01:46:55 +02: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
Lassulus 5c0ff087e6
Merge pull request #89831 from Thra11/julius-augustus
Julius augustus
2020-06-17 16:20:03 +02:00
Philipp Riegger 3d6107d423 factorio{,-headless}-experimental: 0.18.30 -> 0.18.32 2020-06-17 10:39:41 +02:00
marius851000 c6d32d816c
openmw: 0.45.0 -> 0.46.0 (#90589) 2020-06-16 14:45:23 -04:00
Ryan Mulligan 0777d09079
Merge pull request #90349 from r-ryantm/auto-update/easyrpg-player
easyrpg-player: 0.6.2 -> 0.6.2.1
2020-06-16 06:12:06 -07:00
Michael Reilly 5aeb03a06e katago: 1.4.2 -> 1.4.4 2020-06-15 22:10:18 -04:00
Tom Hall b5bb201579 augustus: init at 1.4.1a 2020-06-14 23:22:40 +01:00
Tom Hall 731f722289 julius: init at 1.4.1 2020-06-14 23:11:52 +01:00
R. RyanTM 0a56f10920 easyrpg-player: 0.6.2 -> 0.6.2.1 2020-06-14 14:05:54 +00:00
Euan Kemp 727e7d8039 steam: switch to correct runtime tarball
In my previous commit (593c28b) I used the wrong upstream artifact for
the runtime. After reading the documentation in the
ValveSoftware/steam-runtime repo, I now know that the steam-runtime
tarball is what I actually wanted.

I also used 'diff' to compare the various artifacts with the old runtime
this package used before, and the steam-runtime one is certainly the
closest.

Most importantly, switching to the right steam-runtime package
reportedly fixes issues for other users (fixes #90229).

This also entirely removes the amd64/i386 split from runtime.nix because
the upstream package bundles both together, and if that's how upstream
wants to distribute this, it seems best to follow their lead.
2020-06-14 00:10:47 -07:00
Spencer Baugh 27373f56b4 crawl: 0.24.1 -> 0.25.0
Thanks to @emilazy adding support for pkgconfig for SQLite upstream,
we can drop that part of the patch. The rest is still needed.
2020-06-12 21:55:49 -04:00
Doron Behar 01d4e2fe33 treewide: use ffmpeg_3 explicitly if not wanted otherwise
After making `ffmpeg` point to the latest `ffmpeg_4`, all packages that
used `ffmpeg` without requiring a specific version now use ffmpeg_3
explicitly so they shouldn't change.
2020-06-12 11:55:31 -07:00
Jörg Thalheim 8df5edc153
Merge pull request #87178 from hax404/teeworlds-module-test
nixos/{modules,tests}/teeworlds: init
2020-06-12 19:52:06 +01:00
Benjamin Hipple 9a91be049a anki: format to fix indentation
Indentation was off the coding standards, so ran it through nixpkgs-fmt to
sanitize; no manual changes.
2020-06-10 19:46:38 +02:00
Ryan Mulligan faaab8f9e4
Merge pull request #89870 from r-ryantm/auto-update/taisei
taisei: 1.3 -> 1.3.1
2020-06-09 06:03:52 -07:00
Nick Hu a505e9d7f4
Merge pull request #89440 from priegger/fix/factorio-mkModDirDrv
factorio-utils: fix recursive mod dependency resolution
2020-06-09 13:16:33 +01:00
Nick Hu de94d7a4f8
Merge pull request #89467 from priegger/fix/factorio-0.18.30
factorio{,-headless}-experimental: 0.18.29 -> 0.18.30
2020-06-09 13:11:49 +01:00
Samuel Hernandez 8c7b509897
terraria-server: 1.4.0.4 -> 1.4.0.5 2020-06-09 00:30:09 -04:00
R. RyanTM 7ec89e7793 taisei: 1.3 -> 1.3.1 2020-06-09 02:52:05 +00:00
R. RyanTM aa36693149 angband: 4.2.0 -> 4.2.1 2020-06-08 11:43:11 -07:00
1000101 c597a7f869 formatting: fix missing leading whitespace 2020-06-07 17:29:08 -04:00