Commit Graph

4063 Commits

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