Commit Graph

4109 Commits

Author SHA1 Message Date
github-actions[bot]
2226996f6c
Merge master into staging-next 2021-02-07 18:16:08 +00:00
R. RyanTM
8cce78f067 unciv: 3.12.8 -> 3.12.12 2021-02-06 23:28:23 +00:00
R. RyanTM
cc77f910fc osu-lazer: 2021.129.0 -> 2021.205.1 2021-02-06 16:22:28 +00:00
R. RyanTM
f5bac9f2e9 crawl: 0.26.0 -> 0.26.1 2021-02-06 09:46:08 +00:00
Robert T. McGibbon
507d7154fb supertuxkart: fix build 2021-02-05 19:22:38 -05:00
github-actions[bot]
3c4d8b38c4
Merge staging-next into staging 2021-02-05 00:36:22 +00:00
Sandro
9847d1368d
Merge pull request #111793 from oxalica/osu
osu-lazer: 2020.1225.0 -> 2021.129.0
2021-02-04 23:45:09 +01:00
Robert Schütz
83e82c1caf steam-run-native: use ffmpeg instead of libav 2021-02-04 15:19:23 +01:00
oxalica
50707b3130
osu-lazer: 2020.1225.0 -> 2021.129.0 2021-02-04 20:27:29 +08:00
github-actions[bot]
8ab0b85ead
Merge staging-next into staging 2021-02-03 12:22:13 +00:00
Sandro
2f79819ce2
Merge pull request #111273 from numinit/armagetronad 2021-02-03 11:45:48 +01:00
Morgan Jones
f3e8b9c6bf armagetronad: 0.2.8.3.5 -> 0.2.9.1.0 2021-02-03 00:22:55 -07:00
Robert Schütz
872b763710 performous: use ffmpeg instead of libav 2021-02-02 17:26:36 +01:00
github-actions[bot]
4c1eae9176
Merge staging-next into staging 2021-02-02 00:42:42 +00:00
Tim Steinbach
2dc9fe1ea5
minecraft: 2.2.1262 → 2.2.1441 2021-02-01 15:22:16 -05:00
github-actions[bot]
7044cd0c9d
Merge staging-next into staging 2021-02-01 18:31:04 +00:00
Sage Raflik
23de1f4ae6 papermc: add neonfuz as maintainer 2021-02-01 11:47:47 -06:00
Sage Raflik
63b9189151 papermc: 1.16.4r296 -> 1.16.5r457 2021-02-01 11:40:37 -06:00
Jan Tojnar
54f4529aec
Merge pull request #111519 from siraben/xdg-utils-naming 2021-02-01 17:18:57 +01:00
github-actions[bot]
d2bf5aea5a
Merge staging-next into staging 2021-02-01 12:24:36 +00:00
Sandro
120a7279e5
Merge pull request #111416 from bb2020/gimx 2021-02-01 13:16:58 +01:00
bb2020
9fcc211220 gimx: init at 8.0 2021-02-01 12:28:48 +03:00
Ben Siraphob
a6ac3eedbd treewide: xdg_utils -> xdg-utils 2021-02-01 15:05:09 +07:00
github-actions[bot]
104c56e909
Merge staging-next into staging 2021-02-01 00:47:02 +00:00
wchresta
b682b0fc16 legendary-gl: Remove wchresta from maintainers
I created this derivation due to because it was requested in #88963. I
do not use legendary-gl myself. Now that we have another maintainer,
there is no good reason for me to stay maintainer of this.
2021-01-31 14:08:40 -05:00
Eduardo Quirós
66bf902d59
legendary-gl: 0.20.1 -> 0.20.6 (#110823)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-01-31 20:00:23 +01:00
github-actions[bot]
f92395cf3c
Merge staging-next into staging 2021-01-31 06:19:43 +00:00
Sandro
1fd35ff65b
Merge pull request #111311 from lorenzleutgeb/gradle-6.8.1 2021-01-31 04:10:01 +01:00
github-actions[bot]
c72ffa864a
Merge staging-next into staging 2021-01-30 18:27:30 +00:00
Guillaume Girol
e58ed984d6
Merge pull request #110661 from delroth/chiaki-update
chiaki: 2.0.1 -> 2.1.0 (+ licensing fix)
2021-01-30 18:22:28 +00:00
Lorenz Leutgeb
54bf37a957 mindustry: Use Gradle 6.8 2021-01-30 14:43:44 +01:00
github-actions[bot]
3ac0ccda7a
Merge staging-next into staging 2021-01-29 00:43:57 +00:00
Lassulus
c056196983
Merge pull request #111043 from Profpatsch/gzdoom-4.5.0
gzdoom: 4.4.2 -> 4.5.0
2021-01-28 22:49:16 +01:00
Profpatsch
0d2fc6ba91 gzdoom: 4.4.2 -> 4.5.0
Also updates the zmusic dependency to 1.1.3.
2021-01-28 21:13:12 +01:00
github-actions[bot]
798f7b136c
Merge staging-next into staging 2021-01-28 18:30:08 +00:00
Sandro
8d2a780501
Merge pull request #110433 from iblech/patch-freedroid 2021-01-28 15:31:01 +01:00
github-actions[bot]
2e78c8c736
Merge staging-next into staging 2021-01-28 12:23:55 +00:00
Sandro
883040943a
Merge pull request #110994 from siraben/trackballs-license
trackballs: clarify license
2021-01-28 09:04:57 +01:00
Ben Siraphob
b2ed5d775b trackballs: clarify license 2021-01-28 12:10:33 +07:00
Ingo Blechschmidt
85007d94fb freedroid: init at 1.2.1 2021-01-27 19:07:27 +01:00
github-actions[bot]
1b5da764a7
Merge staging-next into staging 2021-01-27 12:24:09 +00:00
Sandro
e8d60e277c
Merge pull request #110909 from jpas/factorio 2021-01-27 11:27:06 +01:00
Sandro
ad97ca4e51
Merge pull request #110912 from siraben/stdenv-lib-inherit
treewide: remove inherited stdenv.lib
2021-01-27 10:28:55 +01:00
Ben Siraphob
3bbad8b041 treewide: remove inherited stdenv.lib 2021-01-27 12:44:43 +07:00
Jarrod Pas
a5fa85129b factorio, factorio-demo, factorio-headless: 1.0.0 -> 1.1.19 2021-01-26 20:49:28 -06:00
Jarrod Pas
27de17f45a factorio-experimental, factorio-demo-experimental, factorio-headless-experimental: 1.1.16 -> 1.1.19 2021-01-26 20:48:56 -06:00
github-actions[bot]
0f779d50b1
Merge staging-next into staging 2021-01-27 00:43:23 +00:00
Aaron Andersen
71a9046715
Merge pull request #109847 from kampka/wesnoth
Wesnoth: 1.14.14 -> 1.14.15
2021-01-26 18:32:15 -05:00
Thomas Tuegel
0e418a1a18
Merge pull request #108888 from ttuegel/feature--staging--qt-no-mkDerivation
Qt: Do not require mkDerivation
2021-01-26 16:24:41 -06:00
Sandro Jäckel
25e7d3949c
openmw: Add comment that commit does not exist on any branch on target repository 2021-01-26 15:19:01 +01:00
Sandro Jäckel
24e36fdd82
openra.mods: Add comment that commit does not exist on any branch on target repository 2021-01-26 15:18:59 +01:00
Sandro Jäckel
5d4a0aeee5
snipes: replace commit which doesn't belong to any branch with parent commit and recreate patch 2021-01-26 15:18:57 +01:00
Julien Moutinho
dbbdc2eb3e freeciv: fix Qt runtime 2021-01-26 12:33:59 +01:00
Jonathan Strickland
eb6b3ab09f
hhexen: init at 1.6.3 (#110792)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-01-26 01:30:05 +01:00
Thomas Tuegel
5590e365e4
qtbase: Check for wrapQtAppsHook in setupHook 2021-01-25 15:56:15 -06:00
Sandro
ecb607ded2
Merge pull request #110804 from priegger/factorio
factorio-headless-experimental, factorio-experimental: 1.1.12 -> 1.1.16
2021-01-25 21:46:02 +01:00
Francesco Gazzetta
9ce1caa63c
mindustry,mindustry-server: 122.1 -> 123.1 (#110793) 2021-01-25 19:39:38 +01:00
Philipp Riegger
51bc6bdf8c factorio-headless-experimental, factorio-experimental: 1.1.12 -> 1.1.16 2021-01-25 19:05:30 +01:00
Pavol Rusnak
a6ce00c50c
treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
Sandro
2c0b4ecab1
Merge pull request #110761 from fgaz/warzone2100/3.4.1 2021-01-25 17:11:14 +01:00
Francesco Gazzetta
321f70a603 warzone2100: 3.3.0 -> 3.4.1 2021-01-25 13:07:03 +01:00
Francesco Gazzetta
7db3b75d21 warzone2100: add fgaz to maintainers 2021-01-25 13:06:19 +01:00
Sandro
81e3b9d15b
Merge pull request #110670 from siraben/double-quotes-fix
treewide: fix double quoted strings in one-liners
2021-01-24 16:17:14 +01:00
aszlig
2f30e32121
uqm: Fix evaluation of 3DO video package
Regression introduced by 2e34288f0d.

The commit in question just used the "lib" attribute, but it wasn't in
scope. In addition to bringeng the lib attribute into scope, I also
removed the "with lib;", which should make sure that we get an error
when just parsing (nix-instantiate --parse) the Nix expression.

Signed-off-by: aszlig <aszlig@nix.build>
2021-01-24 15:35:33 +01:00
volth
bc0d605cf1 treewide: fix double quoted strings in meta.description
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
2021-01-24 19:56:59 +07:00
Pierre Bourdon
54293e70b5
chiaki: 2.0.1 -> 2.1.0 2021-01-24 07:51:54 +01:00
Pierre Bourdon
4c45543736
chiaki: fix license information (GPLv3+ -> AGPLv3)
This was changed by upstream in the 2.0 release and missed when we
update the nixpkgs package.
2021-01-24 07:48:12 +01:00
Sandro
77f32f2f3c
Merge pull request #110628 from prusnak/stdenv-lib
treewide: stdenv.lib -> lib
2021-01-24 03:10:32 +01:00
Tristan
e3a86d5577
multimc: Update to latest development build (#110439) 2021-01-24 02:47:06 +01:00
Pavol Rusnak
90f7338112
treewide: stdenv.lib -> lib 2021-01-24 01:49:49 +01:00
Spencer Baugh
0bdc35a2ed crawl: 0.25.1 -> 0.26.0
FORCE_PKGCONFIG was added upstream in crawl/crawl@61de54256c, so we
can drop our patch to the Makefile which does the same thing - nice!
Still need the other patches since crawl/crawl#1367 isn't yet fully
merged.
2021-01-23 00:27:25 -05:00
Sandro
bedf58b78f
Merge pull request #91123 from tex/unciv 2021-01-22 12:55:01 +01:00
R. RyanTM
12f13bc8e8 freeciv: 2.6.2.1 -> 2.6.3 2021-01-21 23:43:46 +00:00
zowoq
932941b79c treewide: editorconfig fixes
- remove trailing whitespace
- use spaces for indentation
2021-01-21 13:29:54 +10:00
Sandro
973705f7c9
Merge pull request #109925 from r-ryantm/auto-update/crispy-doom
crispyDoom: 5.9.2 -> 5.10.0
2021-01-20 23:33:45 +01:00
Sandro
8008ebae20
Merge pull request #108761 from charvp/fix/zeroad-build 2021-01-20 20:14:01 +01:00
Milan Svoboda
52a7a2df15 unciv: init at 3.12.8 2021-01-20 20:07:25 +01:00
Francesco Gazzetta
9e0bb258f5 shattered-pixel-dungeon: 0.9.0b -> 0.9.1d 2021-01-20 18:34:58 +01:00
Charlotte Van Petegem
2ce4aa86d9
0ad: Do an extra s/pkgconfig/pkg-config to fix build
9bb3fcc missed one important rename of pkgconfig, breaking the build.
2021-01-20 17:45:14 +01:00
Charlotte Van Petegem
a0259207da
0ad: fix build by using gcc9Stdenv 2021-01-20 17:31:33 +01:00
Sandro
f0cf05c4b9
Merge pull request #99885 from fgaz/shattered-pixel-dungeon/0.9.0 2021-01-20 16:00:52 +01:00
Francesco Gazzetta
61b83e68dc shattered-pixel-dungeon: almost fix darwin build
Gradle has some problems with termcap:

> FAILURE: Build failed with an exception.
>
> * What went wrong:
> Could not open terminal for stdout: could not get termcap entry

see https://github.com/gradle/gradle/issues/4426

Unfortunately before the merge darwin broke again, so while this is now
in a better state it is still broken:
https://github.com/NixOS/nixpkgs/pull/99885#issuecomment-740065005
2021-01-20 11:27:12 +01:00
R. RyanTM
734ffbe483 alephone-marathon: 20190331 -> 20200904 2021-01-20 10:38:47 +01:00
zowoq
31f5dd3f36 treewide: editorconfig fixes
- remove trailing whitespace
- use spaces for indentation
2021-01-20 09:11:11 +10:00
Tim Steinbach
c15c3e61ef
minecraft: 2.2.909 → 2.2.1262 2021-01-19 09:53:01 -05:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
R. RyanTM
8b442c70f5 crispyDoom: 5.9.2 -> 5.10.0 2021-01-19 08:59:05 +00:00
Christian Kampka
39cf1f651b
wesnoth: 1.14.14 -> 1.14.15 2021-01-18 23:57:44 +01:00
Sandro
2d461342e7
Merge pull request #109315 from rvolosatovs/init/quake3hires
quake3hires: init at 2020-05-07
2021-01-18 23:08:31 +01:00
Sandro
1f70ec2053
Merge pull request #86913 from iblech/patch-16
gnujump: install desktop file
2021-01-18 21:14:33 +01:00
Sandro
8f3a9c08bb
Merge pull request #86831 from iblech/patch-14
xbill: install desktop file
2021-01-18 21:13:54 +01:00
Roman Volosatovs
cef94edcf8
quake3hires: init at 2020-01-20 2021-01-18 17:12:16 +01:00
Emery Hemingway
04585f097f anki: replace mplayer with mpv
Mplayer is not available for aarch64.
2021-01-18 09:44:00 +01:00
Sandro
4e292b04af
Merge pull request #109632 from siraben/stdenv-lib-2 2021-01-17 16:29:40 +01:00
Ben Siraphob
ca7f39f987 pkgs/data, pkgs/games: [sS]tdenv.*lib -> lib 2021-01-17 20:59:16 +07:00
Sandro
2964ee515b
Merge pull request #109544 from priegger/factorio
factorio-headless-experimental, factorio-experimental: 1.1.10 -> 1.1.12
2021-01-17 13:41:50 +01:00
Sandro
86892ac9f3
Merge pull request #109548 from Thra11/julius-1-6-0
julius: 1.5.1 -> 1.6.0
2021-01-17 13:40:46 +01:00
Ben Siraphob
bd42003f87 pkgs/games: pkg-config -> pkgconfig (2) 2021-01-16 23:49:59 -08:00
Ben Siraphob
47e997598c pkgs/games: pkgconfig -> pkg-config 2021-01-16 23:49:59 -08:00
Jonathan Ringer
c44acaaceb steam-run: inherit bwrap namespace settings 2021-01-16 16:55:30 -08:00