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