Commit graph

1391 commits

Author SHA1 Message Date
Vladimír Čunát 3e387c3e00 Merge branch 'staging'
Darwin isn't in a perfect state, in particular its bootstrap tools won't
build which will block nixpkgs channel. But on the whole it seems
acceptable.
2016-05-13 10:14:53 +02:00
Ricardo Ardissone 06436894a7 scorched3d: fix build by adding fftwSinglePrec 2016-05-12 18:57:50 -03:00
Vladimír Čunát 6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
Nikolay Amiantov 173728069b Merge commit 'refs/pull/15308/head' of git://github.com/NixOS/nixpkgs 2016-05-10 14:36:29 +03:00
Tobias Geerinckx-Rice 1a783468aa
tome4: 1.3.3 -> 1.4.6
Just to get it building again after the 1.3.3 sources disappeared,
but it seems to run fine.
2016-05-10 01:51:05 +02:00
Thomas Tuegel 8ffaef8a69 mudlet: mark broken 2016-05-09 10:01:49 -05:00
Thomas Tuegel 19ea08af79 chessx: mark broken 2016-05-09 10:01:49 -05:00
rardiol ff6e194fc7 liberal-crime-squad: 2016-03-03 -> 2016-05-08 (#15309) 2016-05-09 12:28:43 +02:00
Ricardo Ardissone 20a0e782b5 openra: add tests 2016-05-08 18:41:16 -03:00
Ricardo Ardissone fab7a4c21f openra: add man page 2016-05-08 18:41:05 -03:00
Ricardo Ardissone d88ea67fb7 openra: 20151224 -> 20160508 2016-05-08 17:21:55 -03:00
Vladimír Čunát 65a9fa8cdc Merge branch 'master' into staging 2016-05-08 21:24:48 +02:00
Lluís Batlle i Rossell f0c503593f Fixing stunt-rally 2.6 (adding newer bullet) 2016-05-08 16:22:18 +02:00
Peter Simons 5569824729 stockfish: fix meta.maintainer 2016-05-08 15:21:26 +02:00
Peter Simons d9e51222fe stockfish: fix install target 2016-05-08 15:16:11 +02:00
Peter Simons cca3e9c774 stockfish: update version 6 to 7 2016-05-08 15:10:58 +02:00
Sven Keidel 98bef7e0bd
brogue: init at 1.7.4
with fixups by joachifm:
- Correct license (AGPL-3)
- Removed redundant build input
- Cleanup description

Closes #15244
2016-05-07 19:00:30 +02:00
Joachim Fasting 16510869eb Merge pull request #15278 from Baughn/ckan
ckan: Add curl to runtime libraries
2016-05-07 16:42:39 +02:00
Nikolay Amiantov 2d57767974 openspades-git: drop yet another hack, fix accidential python merge 2016-05-07 12:03:24 +03:00
Nikolay Amiantov 628c8e8995 openspades-git: init at 2016-04-17 2016-05-07 11:59:53 +03:00
Nikolay Amiantov c7193c1506 openspades: less hacks 2016-05-07 11:59:53 +03:00
Nikolay Amiantov a7fe84e38a openspades: link to openal instead of using LD_LIBRARY_PATH 2016-05-07 11:59:53 +03:00
Svein Ove Aas 3d8f9a6937 ckan: Add curl to runtime libraries 2016-05-06 18:04:01 +01:00
Eric Litak 246d54ab61
factorio: 0.12.29 -> 0.12.33
Closes #15204
2016-05-05 20:12:14 +02:00
Eric Litak f6b645206f
factorio: refactor alpha/headless split 2016-05-05 20:11:52 +02:00
Vladimír Čunát 1dc36904d8 Merge #14920: windows improvements, mainly mingw 2016-05-05 08:30:19 +02:00
Svein Ove Aas c5451206ab Init CKAN: The Comprehensive Kerbal Archive Network (#15202)
* ckan: Init at 1.16.1
2016-05-04 02:12:39 +01:00
Tuomas Tynkkynen aadaa91379 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
rardiol 0ba62f7150 spring, springlobby update (#15182)
* alure: init at 1.2

* spring: 96.0 -> 101.0

* springlobby: 0.195 -> 0.247
2016-05-03 10:19:19 +01:00
Nikolay Amiantov 7fec04cd7f Merge pull request #15129 from rardiol/openra
openra: 20141029 -> 20151224
2016-05-02 16:28:20 +04:00
Nikolay Amiantov 8297d2c60c Merge pull request #15124 from nathan7/master
minecraft: use makeLibraryPath, so we don't use the dev outputs
2016-05-02 04:14:27 +04:00
Nathan Zadoks ddb4ea19bc minecraft: use makeLibraryPath, so we don't use the dev outputs 2016-05-01 20:13:20 -04:00
Ricardo Ardissone 42cce6ab11 openra: my maintainership 2016-05-01 19:03:07 -03:00
Ricardo Ardissone d19841c46f openra: 20141029 -> 20151224 2016-05-01 19:03:02 -03:00
Tobias Geerinckx-Rice 950a698488
0ad game & data: 0.0.19 -> 0.0.20 2016-05-01 01:58:28 +02:00
Joachim Fasting fb93bfc0bc
angband: cleanups 2016-05-01 01:22:49 +02:00
Phil Scott 8d5962a690
angband: init at version 4.0.5 2016-05-01 01:22:49 +02:00
Nikolay Amiantov 87ebab128a replace ${stdenv.cc.cc}/lib occurences 2016-05-01 00:13:23 +03:00
Nikolay Amiantov a8aa91dc5c ioquake3: 2016-03-15 -> 2016-04-05 2016-04-30 03:12:33 +03:00
Nikolay Amiantov 52f6c0cfb8 dwarf-fortress-packages.phoebus-theme: 20160128 -> 42.06a 2016-04-30 03:12:33 +03:00
Nikolay Amiantov 91563e23e3 dwarf-fortress-packages.cla-theme: 20160128 -> 42.06-v22 2016-04-30 03:12:33 +03:00
Nikolay Amiantov 3c627be4be dwarf-fortress-packages.dfhack: 2016-03-03 -> 0.42.06-r1 2016-04-30 03:12:33 +03:00
Nikolay Amiantov 938d64f1f3 quote URLs in my packages to ease opening them from urxvt 2016-04-30 03:12:32 +03:00
Tuomas Tynkkynen 4ff8f377af Merge remote-tracking branch 'upstream/master' into staging 2016-04-28 00:13:53 +03:00
Tuomas Tynkkynen 6e24c9974f typespeed: Add platforms 2016-04-27 05:06:35 +03:00
Nikolay Amiantov aa1a40b63d dwarf-therapist: add version to derivation, use symlinkJoin 2016-04-26 15:37:43 +03:00
Nikolay Amiantov 5f19542581 Merge commit 'refs/pull/14694/head' of git://github.com/NixOS/nixpkgs into staging 2016-04-25 18:02:23 +03:00
Nikolay Amiantov 559a563208 Merge pull request #14971 from rardiol/the-powder-toy
the-powder-toy: 90.2.322 -> 91.3.328
2016-04-25 18:43:48 +04:00
Ricardo Ardissone a51da70189 the-powder-toy: 90.2.322 -> 91.3.328 2016-04-25 10:15:44 -03:00
Nikolay Amiantov ab0a0c004e makeSearchPathOutputs: refactor to makeSearchPathOutput 2016-04-25 13:24:39 +03:00