Commit graph

3940 commits

Author SHA1 Message Date
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
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
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