Commit Graph

2085 Commits

Author SHA1 Message Date
Frederik Rietdijk
804285f589 Merge remote-tracking branch 'upstream/staging' into HEAD 2018-01-02 19:10:45 +01:00
Yegor Timoshenko
63c1a54257
Merge pull request #33213 from wchresta/master
steam: add wrapper testing for libGL
2018-01-02 21:03:28 +03:00
adisbladis
3d692437c4
Merge pull request #33291 from bkchr/cutemaze
cutemaze: 1.2.1 -> 1.2.2
2018-01-01 21:23:03 +01:00
Bastian Köcher
72ade2a813 cutemaze: 1.2.1 -> 1.2.2 2018-01-01 21:05:15 +01:00
Frederik Rietdijk
1869e7e5b0 Merge remote-tracking branch 'upstream/master' into HEAD 2018-01-01 15:09:55 +01:00
Vladimír Čunát
616048bcbf
simutrans: don't build on Darwin
Support is perhaps claimed upstream, but it's never built successfully
on Hydra, so let's disable that until someone fixes it.
2018-01-01 06:47:37 +01:00
wchresta
f4c9cc6878 steam: Check for NixOS, improve error message 2017-12-31 13:24:45 +01:00
wchresta
2fd1b95fad steam: add wrapper testing for libGL
NixOS: Failing to set hardware.opengl.driSupport32Bit will lead to a
confusing error message about missing libGL.so.1. We include a wrapper
around the steam bin to test for working 32bit opengl with glxinfo. When
failing, we display a proper warning hinting towards the option.

Fixes: #19518
2017-12-30 21:23:51 +01:00
Frederik Rietdijk
2d0bead714 Merge remote-tracking branch 'upstream/master' into HEAD 2017-12-30 17:04:54 +01:00
Herwig Hochleitner
c36ebca240 dwarf-fortress: 0.44.02 -> 0.44.03 2017-12-30 14:52:50 +01:00
Vladimír Čunát
f29000b002
Merge branch 'master' into staging
Hydra: ?compare=1421760
2017-12-29 10:13:33 +01:00
Yegor Timoshenko
1f3f774bbe
Merge pull request #33040 from yegortimoshenko/20171225.022736/easyrpg-player
easyrpg-player: init at 0.5.3
2017-12-29 08:33:58 +03:00
Robin Gloster
6903ea6050 treewide: libmysql -> mysql.connector-c 2017-12-29 02:18:35 +01:00
Peter Hoeg
4d5837fc08 scummvm: add support for FluidSynth
This gives by far the best music and general sound quality for games
with MIDI support.
2017-12-27 09:10:34 +08:00
Yegor Timoshenko
46edd63af9
easyrpg-player: init at 0.5.3 2017-12-25 02:28:19 +00:00
Orivej Desh
8572e0fd05
Merge pull request #32759 from bflyblue/factorio-0.15.40
factorio: 0.15.37 -> 0.15.40
2017-12-23 23:54:15 +00:00
Frank Doepper
43b1e3114a xsnow: fix url 2017-12-21 11:34:48 +01:00
Francesco Gazzetta
e7d49d6dba warzone2100: 3.2.2 -> 3.2.3 2017-12-18 22:14:08 +00:00
Orivej Desh
68d57167b0 scummvm: fix eval 2017-12-18 15:44:06 +00:00
Peter Hoeg
e198522137 scummvm: 1.9.0 -> 2.0.0 2017-12-18 17:56:50 +08:00
Orivej Desh
7bd04329a0
Merge pull request #32783 from yegortimoshenko/steam/nss
steam: override nss, nspr, fixes #32781
2017-12-18 01:01:40 +00:00
Piotr Bogdan
16dc6bf521 steam: override nss, nspr, fixes #32781 2017-12-18 00:20:23 +00:00
Shaun Sharples
23565a2574 factorio: 0.15.37 -> 0.15.40
stable is now 0.15.40
demo: 0.15.33 -> 0.15.36
2017-12-17 16:08:02 +02:00
Orivej Desh
0fdb4473f6
Merge pull request #32587 from tristan0x/assimp4
assimp: 3.3.1 -> 4.1.0
2017-12-17 13:40:39 +00:00
Orivej Desh
25dbba0bf2 pioneer: 20160116 -> 20171001 2017-12-17 03:46:27 +00:00
Orivej Desh
1cfad78781 cutemaze: support darwin 2017-12-14 12:05:09 +00:00
Robert Schütz
c8880764fb cutemaze: init at 1.2.1 2017-12-14 11:37:28 +00:00
Graham Christensen
e5629dc51a
Merge pull request #32365 from vcunat/p/check-meta
check meta, treewide
2017-12-12 18:55:23 -05:00
Vladimír Čunát
3a110ea3f9
treewide platform checks: abort -> throw
They aren't meant to be critical (uncatchable) errors.
Tested with nix-env + checkMeta:
[ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]
2017-12-12 18:08:10 -05:00
Herwig Hochleitner
d29cee773c dwarf-fortress: 0.43.05 -> 0.44.02
dwarf-therapist: 37.0.0-Hello71 -> 39.0.0
dfhack: 0.43.05-r1 -> 0.44.02-alpha1
cla-theme: 43.05-v23 -> 44.01-v24
phoebus-theme: 43.05c -> 44.02a

There is a new maintained repository for
dwarf-therapist: http://www.bay12forums.com/smf/index.php?topic=168411

dfhack is still in alpha, so make backups, if you use it.

cc @the-kenny @abbradar
2017-12-11 20:41:38 +01:00
Vladimír Čunát
e9c12f6936
Merge older staging
There are some regressions, but not that many and I want
the security update of openssl fast.
2017-12-11 09:49:56 +01:00
Franz Pletz
9b934a4b69
simutrans: 120.1.1 -> 120.2.2 2017-12-11 04:23:46 +01:00
Vladimír Čunát
2309acf723
Merge branch 'master' into staging 2017-12-09 21:00:07 +01:00
Markus Hauck
00ad51933d cataclysm-dda-git: update to latest and add arguments 2017-12-09 19:40:40 +01:00
Vladimír Čunát
6f5d989478
treewide: checkMeta fixes for x86_64-linux 2017-12-07 07:50:47 -05:00
Orivej Desh
11e503815c chessx: disable parallel building
qmake does not support translations in resources.
2017-12-07 08:52:42 +00:00
Peter Hoeg
acab619ba0 freeorion: 0.4.6 -> 0.4.7.1
Also compile against latest boost.
2017-12-06 16:50:42 +08:00
adisbladis
d8787a8aac
Merge pull request #32350 from woffs/etr-0.7.4
extremetuxracer: 0.6.0 -> 0.7.4
2017-12-06 01:50:10 +08:00
Frank Doepper
cb5ac6a726 extremetuxracer: 0.6.0 -> 0.7.4 2017-12-05 17:09:10 +01:00
Orivej Desh
c885b3c622 cataclysm-dda-git: disable parallel building 2017-12-04 22:43:20 +00:00
Herwig Hochleitner
bccd410e78 dwarf-fortress-packages.stoneSense: remove vestigial package
To use stonesense, build dwarf-fortress with `enableDFHack=true` and
`enableStoneSense=true`, then type `ssense` into the dfhack console.

This partially reverts commit 85056ee698
2017-12-03 12:22:13 +01:00
Peter Hoeg
9a4cd40337 gemrb: 0.8.1 -> 0.8.5
Additionally:
 - use SDL2 instead of SDL
2017-11-30 11:14:47 +08:00
Orivej Desh
d070942654 solarus: enable parallel building 2017-11-27 16:14:18 +00:00
Orivej Desh
aaf6b2b601 freeciv: enable parallel building 2017-11-26 07:42:18 +00:00
Joachim F
8627859793
Merge pull request #31994 from kierdavis/freesweep
freesweep: init at 1.0.1
2017-11-25 14:51:29 +00:00
Kier Davis
cb9bf1c854 PySolFC: init at 2.0
PySolFC is a solitaire game written in Python, supporting thousands of
solitaire variants.
2017-11-25 09:43:42 +01:00
Vladimír Čunát
7dfa97969a
Merge branch 'staging' (older one)
Hydra seems OK-ish, except that some aarch64 jobs need restarting
after qt4 timing out for the first time:
https://hydra.nixos.org/eval/1412641?compare=1412561
2017-11-24 18:36:54 +01:00
Kier Davis
c09608f6a8
freesweep: init at 1.0.1
Freesweep is a console minesweeper game.
2017-11-24 00:34:28 +00:00
adisbladis
5f111a854e
hedgewars: 0.9.22 -> 0.9.23 2017-11-23 15:47:41 +08:00
Soham Chowdhury
8775b80503 stockfish: 7 -> 8 2017-11-23 10:12:14 +05:30
Orivej Desh
b8e1e7191e Merge branch 'master' into staging
* master: (80 commits)
  lkl: Supports aarch64
  wimlib: nitpicks
  gitAndTools.git-codeowners: 0.1.1 -> 0.1.2
  wimlib: init at 1.12.0
  kernel: improve modDirVersion error message
  releaseTools.sourceTarball: Clean up temporary files
  dotnetPackages.SmartIrc4net: rehash source
  migmix: make it a fixed-output derivation
  vm: Create /dev/full
  samba: 4.6.8 -> 4.6.11 to address CVEs CVE-2017-14746 & CVE-2017-15275
  microcodeIntel: 20170707 -> 20171117
  sshd: Remove ripemd160 MACs
  kernel config: Enable MEDIA_CONTROLLER
  linux: 4.4.99 -> 4.4.100
  linux: 4.9.63 -> 4.9.64
  nix-bash-completions: 0.4 -> 0.5
  linux: 4.14 -> 4.14.1
  linux: 4.13.14 -> 4.13.15
  nix-zsh-completions: 0.3.3 -> 0.3.5
  dns-root-data: use a stable URL that I maintain anyway
  ...
2017-11-21 22:48:36 +00:00
Orivej Desh
4f73b3162b treewide: preset windres missing to fix builds on Linux
https://github.com/NixOS/nixpkgs/pull/30484#issuecomment-345899910
2017-11-21 04:27:10 +00:00
Daniel Peebles
81cc9bb41d
Merge pull request #31701 from matthewbauer/wesnoth-mac
Wesnoth MacOS
2017-11-20 22:42:59 -05:00
Orivej Desh
fb703ad117 treewide: update the usage of makeWrapper after #31497 2017-11-19 23:50:49 +00:00
Neil Cecchini
fd8a174868 factorio: 0.15.34 -> 0.15.37 2017-11-16 15:48:00 +01:00
Orivej Desh
3dded417f6 gtetrinet: prevent warnings and fix style 2017-11-15 05:36:05 +00:00
Chris Martin
fa20e7c6a2 gtetrinet: init at 0.7.11 2017-11-14 23:41:10 -05:00
Joerg Thalheim
d58f318333 trackballs: 1.2.3 -> 1.2.4 2017-11-13 23:44:50 +00:00
Orivej Desh
a2bebdd6ce anki: fix package name 2017-11-13 13:19:36 +00:00
adisbladis
d3cb4de970 anki: Enable tests (#31582)
* anki: Enable tests

Convert package to use buildPythonApplication instead of mkDerivation

* anki: ignore tests via pytest arguments
2017-11-13 13:13:17 +00:00
Matthew Bauer
58adb5df7d wesnoth: works on darwin 2017-11-12 22:25:35 -06:00
Samuel Leathers
10d02b7c43
Merge pull request #31581 from adisbladis/anki-bs3
anki: Switch dependency to beautifulsoup-3
2017-11-12 22:17:30 -05:00
adisbladis
c28911e0f9
anki: Switch dependency to beautifulsoup-3
The current upstream development version is using 4 but the release
version is still using 3.
2017-11-13 09:17:07 +08:00
Renaud
90ffccffdc
Merge pull request #16683 from rardiol/cataclysm-dda-git2
cataclysm-dda-git: init at 2017-07-12
2017-11-12 18:56:26 +01:00
Robert Schütz
ebd064b761 braincurses: init at 1.1.0 2017-11-12 15:27:01 +01:00
Michael Raskin
59b00f8766 sgt-puzzles: 20170228.1f613ba -> 20171029.69773d8 2017-11-11 15:31:36 +01:00
Nikolay Amiantov
459e4b78db steam: add /steamrt/run.sh
This is needed for Steam Beta which expects run.sh to print runtime library
paths.

Fixes #31384.
2017-11-11 15:52:33 +03:00
Orivej Desh
b6b931a4f9
Merge pull request #31480 from DIzFer/steam-borderlands-fix
steam-chrootenv: add iana-etc, fixes #25443
2017-11-10 18:05:54 +00:00
David Izquierdo
6c862b8553 steam-chrootenv: add iana-etc, fixes #25443 2017-11-10 13:37:15 +01:00
Evan Wallace
9bbb9b2e46 freeciv: 2.5.7 -> 2.5.9 2017-11-10 07:54:50 +00:00
aszlig
33b0b5ed1d
anki: Fix hash of the source tarball
Searching the web for the base-16 encoded hash of the one we have in the
Nix expression didn't give any results and I also couldn't find the
older tarball anywhere (even the mirrors I've checked don't have it).

So checking the updated hash I've found that other distros use this, so
I'd bet it's safe to do this.

I've tested building the package but I didn't do any runtime test.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @the-kenny
2017-11-08 21:12:22 +01:00
John Ericson
0101856765
Merge pull request #30549 from obsidiansystems/bintools
treewide: Introduce stdenv.cc.bintools
2017-11-08 14:20:48 -05:00
aszlig
b9b5942e2b
uqm: Remove the -lgcc_s hack
This is no longer needed and I've verified this by building and running
the game.

Signed-off-by: aszlig <aszlig@nix.build>
2017-11-08 06:48:57 +01:00
aszlig
7603da33de
uqm: Fix build against glibc 2.26
I've bisected the introduction of the build failure to be the glibc 2.26
upgrade with commit 9bb67d5c1e.

At first I was somewhat stumped why an glibc update could cause
undeclared identifiers, but after looking at the changes of glibc and
the source code of The Ur-Quan Masters the problem quickly turned out to
be this very change:

https://sourceware.org/git/?p=glibc.git;a=commit;h=7b037c095e31c2396d0a9b0e6356bc566ee4812f

So string.h now in turn includes strings.h, which in theory wouldn't be
a problem.

However, both strings.h and the strings.h in the uqm source code use
constant _STRINGS_H, which causes the glibc strings.h to be included but
the one from uqm basically includes an empty file.

Signed-off-by: aszlig <aszlig@nix.build>
2017-11-08 06:48:15 +01:00
aszlig
3429d8cbbf
uqm: Clean up package expression style
The only functional change here is that I've dropped unzip, because that
dependency doesn't seem to be necessary at all. Despite the broken build
state I've tried building and running The Ur-Quan Masters with an older
nixpkgs revision and it works fine.

Other than that there are no references in the source code for unzip
except in the binary installer and some of the INSTALL files.

The reason why I'm removing the "with pkgs.lib;" is that it makes it
easier to quickly check for errors with "nix-instantiate --parse".

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @jcumming
2017-11-08 05:55:35 +01:00
Frederik Rietdijk
e734ecb1e8
Merge pull request #30919 from adisbladis/pythonPackages-cleanup
WIP: Python packages cleanup
2017-11-06 20:54:51 +01:00
Frederik Rietdijk
4a62ff9f47
Merge pull request #31324 from srhb/openra-python-binpath
openra: Add python to bin PATH, fixing launcher
2017-11-06 20:38:04 +01:00
Sarah Brofeldt
05b90907a7 openra: Add python to bin PATH, fixing launcher 2017-11-06 18:18:19 +01:00
John Ericson
70d91badf5 treewide: Depend on stdenv.cc.bintools instead of binutils directly
One should do this when needed executables at build time. It is more
honest and cross-friendly than refering to binutils directly.
2017-11-05 17:10:53 -05:00
rnhmjoj
35539c641e
arx-libertatis: 2017-02-26 -> 2017-10-30 2017-11-05 19:28:20 +01:00
Vladimír Čunát
4f8b980355
torcs: fix libGL when the OS uses non-mesa
Fixes OP of issue #30749.
2017-11-05 18:23:31 +01:00
Piotr Bogdan
9e59605bab openrct2: fix build 2017-11-04 14:18:47 +00:00
adisbladis
e87ffaefc6
anki: Depend on pythonPackages.beautifulsoup4 instead of pythonPackages.beautifulsoup 2017-10-30 11:55:54 +08:00
Joachim F
bee8066e45
Merge pull request #30453 from dtzWill/fix/robotfindskitten
robotfindskitten: install req'd data and put bin in $out/bin
2017-10-29 10:26:05 +00:00
Nikolay Amiantov
c9ac187c3c tbb: 4.4-u2 -> 2018_U1, merge with libtbb
Remove libtbb derivation as a duplicate.
2017-10-29 01:51:11 +03:00
Herwig Hochleitner
85056ee698 dwarf-fortress-packages.dfhack: add stoneSense support 2017-10-28 14:55:25 +02:00
Herwig Hochleitner
24ea093806 dwarf-fortress-packages.soundSense: init 2016-1_196 2017-10-28 14:55:20 +02:00
Herwig Hochleitner
d6ee81e912 dwarf-fortress-packages.dwarf-therapist: update for df 43.05
Similar to the LNP, we use Hello71's fork, which features support for
the (first 64bit) version 43.05 of Dwarf Fortress.

http://dffd.bay12games.com/file.php?id=12762
2017-10-28 14:55:16 +02:00
David Izquierdo
7dff2c53d4 steam-runtime-wrapped: switch curl to use gnutls 2017-10-28 12:32:54 +03:00
David Izquierdo
38368c42fc steam-runtime-wrapped: add libtbb 2017-10-28 12:32:54 +03:00
Michiel Leenaars
e0d83c66cf duckmarines: 1.0b => 1.0c 2017-10-27 22:26:09 +02:00
Tuomas Tynkkynen
c384ad46b8 qtbase: Make some output references more explicit 2017-10-24 23:48:49 +03:00
Alex Vorobiev
770bedbc20 meritous: init at 1.4 2017-10-24 09:52:52 +02:00
Joachim F
32866a3b0b Merge pull request #30696 from pbogdan/torcs-fix-build
torcs: fix build & cleanups
2017-10-23 16:40:11 +00:00
Vincent Laporte
97d02a78f0
0ad: fix homepage URL 2017-10-22 22:19:28 +00:00
Piotr Bogdan
a94d014149 torcs: clean up compiler warnings 2017-10-22 22:05:11 +01:00
Piotr Bogdan
ce0684a81a torcs: re-enable -Wformat hardening 2017-10-22 22:05:11 +01:00
Piotr Bogdan
5711bfdefb torcs: fix build with gcc6 2017-10-22 22:05:11 +01:00
Nikolay Amiantov
9a84b52c93 openra: 20161019 -> 20171014
Closes #30581.
2017-10-19 23:18:54 +03:00
Nikolay Amiantov
0bc4216bf0 Merge branch 'staging' 2017-10-19 12:46:38 +03:00