Commit Graph

4182 Commits

Author SHA1 Message Date
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
Jonathan Ringer
721ea006a8 steam-fhsenv: don't unshare pid
Some applications such as Natron need access to MIT-SHM or other
shared memory mechanisms. Unsharing the pid namespace
breaks the ability for application to reference shared memory.
2021-01-16 16:55:30 -08:00
Tom Hall
0615a47308 julius: 1.5.1 -> 1.6.0 2021-01-16 16:29:31 +00:00
Philipp Riegger
b87f18e92c factorio-headless-experimental, factorio-experimental: 1.1.10 -> 1.1.12 2021-01-16 17:02:28 +01:00
Sandro
9faf1581d8
Merge pull request #109339 from OmnipotentEntity/katago-1.8.0
katago 1.6.1 -> 1.8.0
2021-01-15 16:51:44 +01:00
Tim Steinbach
518a0c1901
minecraft-server: 1.16.4 → 1.16.5 2021-01-15 10:39:11 -05:00
Ben Siraphob
2e34288f0d pkgs/games: stdenv.lib -> lib 2021-01-15 13:36:04 +07:00
Michael Reilly
bca9aa192a katago: 1.6.1 -> 1.8.0 2021-01-14 11:31:07 -05:00
Sandro
4eeab9284c
Merge pull request #109366 from lukegb/factorio
factorio-headless-experimental, factorio-experimental, factorio-demo-experimental: 1.1.8 -> 1.1.10
2021-01-14 16:24:30 +01:00
Luke Granger-Brown
9dda7b9ac3 factorio-headless-experimental, factorio-experimental: 1.1.8 -> 1.1.10 2021-01-14 14:38:18 +00:00
Michael Raskin
195c3acf8f
Merge pull request #86912 from iblech/patch-15
fish-fillets-ng: install desktop file
2021-01-14 14:13:01 +00:00
Ingo Blechschmidt
ffdc3dc13f fish-fillets-ng: minor cleanup so tests pass 2021-01-13 01:56:25 +01:00
Milan
213286bb18
mindustry: fix desktop item (#109121)
- make pre- and post-{build,install} phases usable for the main derivation
- replace uses of stdenv.lib with just lib
- specify which buildInputs are only needed for the client
2021-01-12 20:17:11 +01:00
sternenseemann
2a88330fbe soldat-unstable: init at 2020-11-26 2021-01-12 14:44:42 +01:00
Ingo Blechschmidt
289c46d088 fish-fillets-ng: install desktop file 2021-01-11 16:45:41 +01:00
Ingo Blechschmidt
e7db46ccaf xbill: install desktop file 2021-01-11 16:15:08 +01:00
Ingo Blechschmidt
0f76dd2996 gnujump: install desktop file 2021-01-11 16:04:47 +01:00
Milan
e614b5a2d0
mindustry: build Arc from source (#108274)
- reduce the buildPhase of the fixed-output dependencies derivation to
  only download all dependencies, instead of building the full thing.
- add wayland variant, which is linked against a different variant of
  the glew library to run natively using SDL_VIDEODRIVER=wayland
- use jdk (Java 15) instead of jre (Java 8) at runtime
- use new copyDesktopItems hook
2021-01-11 15:55:52 +01:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
github-actions[bot]
db7b9735f9
Merge master into staging-next 2021-01-11 06:33:30 +00:00
Sandro
4d69305d75
Merge pull request #108961 from iblech/patch-jumpnbump
jumpnbump: init at 1.70-dev
2021-01-11 02:18:07 +01:00
Sandro
bff4ecd74b
Merge pull request #104499 from fgaz/domination/init
domination: init at 1.2.3
2021-01-11 02:14:27 +01:00
github-actions[bot]
36bab113bf
Merge master into staging-next 2021-01-11 01:02:21 +00:00
Ingo Blechschmidt
725051e81c enigma: 1.21 -> 1.30-alpha 2021-01-11 01:42:28 +01:00
Sandro
08ca8173ef
Merge pull request #107897 from samuelrivas/update-vassal-to-3-14
vassal: 3.3.2 -> 3.14.12
2021-01-11 01:39:11 +01:00
Jan Tojnar
dd72357155
Merge branch 'master' into staging-next 2021-01-10 23:24:33 +01:00
Ingo Blechschmidt
f33ae65fe1 jumpnbump: init at 1.70-dev 2021-01-10 22:34:41 +01:00
Sandro
f41dc35387
Merge pull request #108799 from SuperSandro2000/fix-collection 2021-01-10 20:04:46 +01:00
Frederik Rietdijk
0c42bb5027 Merge master into staging-next 2021-01-10 15:50:49 +01:00
Sandro
2cfa110ae8
Merge pull request #96935 from rvolosatovs/update/ioquake3
ioquake3: 2019-05-29 -> 2020-08-29
2021-01-10 13:59:19 +01:00
Sandro Jäckel
c256508542
anki: Disable tests on darwin 2021-01-10 13:18:37 +01:00
Ingo Blechschmidt
d0779bc16e enigma: init at 1.21 2021-01-10 02:06:53 +01:00
github-actions[bot]
fcbe48c797
Merge master into staging-next 2021-01-09 18:41:27 +00:00
Georg Haas
aaf9cf6e43
sauerbraten: 2020-12-04 -> 2020-12-27
Bumped version because 2020-12-04 is not available on mirrors.
Tested server and client on NixOS x86_64 with sway/wayland.
Played some rounds with old and new maps on public servers.
2021-01-09 17:05:00 +01:00
github-actions[bot]
e251591528
Merge master into staging-next 2021-01-09 01:00:25 +00:00
Yannick Markus
09b6ca477e ckan 1.16.1 -> 1.29.2 2021-01-08 10:46:17 -08:00
github-actions[bot]
f89e74dbcc
Merge master into staging-next 2021-01-08 18:37:56 +00:00
Sandro
8459558130
Merge pull request #108736 from lukegb/factorio
factorio-experimental, factorio-headless-experimental: 1.1.7 -> 1.1.8
2021-01-08 16:38:21 +01:00
Roman Volosatovs
d6d9eb5593
ioquake3: 2019-05-29 -> 2020-12-26 2021-01-08 12:57:42 +01:00
Jan Tojnar
e6c0c98940
Merge branch 'master' into staging-next
zynaddsubfx conflict has been updated to 3.0.1, which conflicted with rewrite after 3.0.5 update on a different branch.
2021-01-08 02:07:34 +01:00
Luke Granger-Brown
cf58429db8 factorio-experimental, factorio-headless-experimental: 1.1.7 -> 1.1.8 2021-01-08 00:16:41 +00:00
Tad Fisher
7b0aed2b06
enyo-doom: update license (#101410)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-01-07 21:25:50 +01:00
Jan Tojnar
f19eb635b4
Merge branch 'master' into staging-next
b04fc593e7 seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
2021-01-07 13:04:31 +01:00
Luke Granger-Brown
77f45ee01f factorio-experimental, factorio-headless-experimental: 1.1.5 -> 1.1.7 2021-01-07 10:23:04 +00:00
Doron Behar
7aed38b8ab
Merge pull request #107547 from jerith666/openjdk-15 2021-01-06 16:02:45 +02:00
Sandro
fd0c2add78
Merge pull request #108555 from Enzime/remove/maintainer-status
treewide: stop maintaining most packages
2021-01-06 11:42:54 +01:00
Michael Hoang
31f9051cf6 treewide: stop maintaining most packages 2021-01-06 17:06:03 +11:00
Orivej Desh
1e0feb6545 endless-sky: fix build with gcc10 2021-01-06 08:32:03 +00:00
Rouven Czerwinski
ca0e2aced0 chiaki: use mkDerivation for QT5 application
Commit fe1151218c ("chiaki: cleanup package") replaced mkDerivation
with stdenv mkDerivation, which is wrong for QT5 applications and
results in the following error on start:

  qt.qpa.plugin: Could not find the Qt platform plugin "wayland" in ""
  qt.qpa.plugin: Could not find the Qt platform plugin "xcb" in ""
  This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem.

also see [1] in the manual. Fix the package by using mkDerivation again.

[1]: https://nixos.org/manual/nixpkgs/unstable/#sec-language-qt

Fixes: fe1151218c ("chiaki: cleanup package")
2021-01-06 08:26:15 +01:00
Sandro
f53c431645
Merge pull request #108379 from SuperSandro2000/cleanups 2021-01-05 02:19:24 +01:00
github-actions[bot]
0e4e47512d
Merge master into staging-next 2021-01-05 00:56:58 +00:00
Frederik Rietdijk
b20838eb4a Merge staging-next into staging 2021-01-04 20:51:32 +01:00
Marc 'risson' Schmitt
559cf76fa3
warsow: fix src url
Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space>
2021-01-04 20:02:23 +01:00
Sandro
217285c79e
Merge pull request #108299 from siraben/zdbsp-platform 2021-01-04 16:56:26 +01:00
Ben Siraphob
58d6dc3359 zdbsp: update maintainers 2021-01-04 17:39:12 +07:00
Sandro Jäckel
9daf938d37
katago: Use stdenv.hostPlatform.avx2Support 2021-01-04 11:02:16 +01:00
Ben Siraphob
c602076c8f zdoom: refactor 2021-01-04 16:46:57 +07:00
Samuel Rivas
63faa127df
vassal: 3.3.2 -> 3.14.12
Extra changes:

  - use variables to avoid repetition
  - update licence
  - use fetczip
2021-01-04 08:35:06 +01:00
John Ericson
b03fdcc7f9
Merge pull request #108300 from siraben/parallel-cmake
treewide: remove enableParallelBuilding = true if using cmake
2021-01-03 13:22:09 -05:00
github-actions[bot]
0649757570
Merge staging-next into staging 2021-01-03 12:24:59 +00:00
Ben Siraphob
3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
Sandro
40e65eb90d
Merge pull request #108143 from fgaz/mindustry/122.1
mindustry: 122 -> 122.1
2021-01-03 10:04:28 +01:00
zowoq
fb2311d430 Merge staging-next into staging 2021-01-03 16:33:28 +10:00
github-actions[bot]
ec161d2240
Merge master into staging-next 2021-01-02 12:24:09 +00:00
Domen Kožar
77839b5a55
Merge pull request #108062 from siraben/spring-update
spring: refactor
2021-01-02 10:57:12 +00:00
github-actions[bot]
0eb369d907
Merge staging-next into staging 2021-01-01 18:39:12 +00:00
github-actions[bot]
c0a9361687
Merge master into staging-next 2021-01-01 18:39:09 +00:00
Francesco Gazzetta
35cbd224af mindustry: 122 -> 122.1 2021-01-01 18:13:55 +01:00
Pavol Rusnak
fe1151218c chiaki: cleanup package 2021-01-01 13:33:16 +01:00
github-actions[bot]
f1df516121
Merge staging-next into staging 2021-01-01 12:25:55 +00:00
github-actions[bot]
0fe33caad3
Merge master into staging-next 2021-01-01 12:25:52 +00:00
Pavol Rusnak
37c9f30f66
Merge pull request #107983 from Emantor/topic/chiaki_bump_touchpad
chiaki: 1.3.0 -> 2.0.1 & touchpad support
2021-01-01 13:21:17 +01:00
Frederik Rietdijk
3f08495212
Merge pull request #108022 from siraben/cmake-native-build-inputs
[staging] treewide: cmake buildInputs to nativeBuildInputs, minor cleanups
2021-01-01 10:54:25 +01:00
Rouven Czerwinski
b5a0c7466c chiaki: fix build on darwin
Darwin requires qtmacextra in the buildInputs, otherwise compilation
fails with:

  CMake Error at /nix/store/05nmn6v1hrk56zqs61s2awvykha51fx9-qtbase-5.12.7-dev/lib/cmake/Qt5/Qt5Config.cmake:28 (find_package):
    By not providing "FindQt5MacExtras.cmake" in CMAKE_MODULE_PATH this project
    has asked CMake to find a package configuration file provided by
    "Qt5MacExtras", but CMake did not find one.

    Could not find a package configuration file provided by "Qt5MacExtras" with
    any of the following names:

      Qt5MacExtrasConfig.cmake
      qt5macextras-config.cmake

    Add the installation prefix of "Qt5MacExtras" to CMAKE_PREFIX_PATH or set
    "Qt5MacExtras_DIR" to a directory containing one of the above files.  If
    "Qt5MacExtras" provides a separate development package or SDK, be sure it
    has been installed.
  Call Stack (most recent call first):
    gui/CMakeLists.txt:7 (find_package)

  -- Configuring incomplete, errors occurred!
  See also "/tmp/nix-build-chiaki-2.0.1.drv-0/chiaki/build/CMakeFiles/CMakeOutput.log".
2021-01-01 09:53:27 +01:00
Rouven Czerwinski
4d461177a7 chiaki: add DualShock4 touchpad support
Chiaki supports the touchpad on DualShock4 controllers when they are
connected via USB and requires libevdev & udev for this. Add both
libraries if chiaki is to be built for a Linux host.
2021-01-01 09:52:42 +01:00
github-actions[bot]
8500f595a1
Merge master into staging-next 2021-01-01 06:22:40 +00:00
Ben Siraphob
b04fc593e7 treewide: cmake buildInputs to nativeBuildInputs, minor cleanups 2021-01-01 11:52:33 +07:00
Sandro
5ea718cb2d
Merge pull request #106674 from 0x4A6F/master-freenukum 2021-01-01 03:39:00 +01:00
0x4A6F
ac47ac9cb7
freenukum: init at 0.3.5 2021-01-01 01:37:12 +00:00
github-actions[bot]
5dffe03f30
Merge master into staging-next 2020-12-31 18:42:41 +00:00
Ben Siraphob
d55a9e23b6 spring: refactor 2021-01-01 00:20:18 +07:00
Ben Siraphob
88f3187df3 trackballs: 1.3.1 -> 1.3.2 2020-12-31 19:47:59 +07:00
Frederik Rietdijk
e823016e66 Merge master into staging-next 2020-12-31 13:29:32 +01:00
Niklas Hambüchen
a8f2b9f4d9
Merge pull request #67643 from MetaDark/clonehero
clonehero: init at 0.23.2.2
2020-12-31 01:53:46 +01:00
Rouven Czerwinski
536a40c3d7 chiaki: 1.3.0 -> 2.0.1
Also switch the upstream repository from github to git.sr.ht, since the
project has been moved to sourcehut.

Signed-off-by: Rouven Czerwinski <rouven@czerwinskis.de>
2020-12-30 21:57:55 +01:00
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
Matt McHenry
13e3d2bc4b openjdk: 14.0.2 -> 15.0.1
* update two explicit references to jdk14 to just jdk, which no longer
  points at jdk8 after #89731.

* patch an explicit -XX:+UseConcMarkSweepGC to -XX:UseG1GC, as the
  former now throws an error (after having been deprecated since jdk 9)
2020-12-26 11:58:06 -05: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