1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 20:21:14 +00:00
Commit graph

3994 commits

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