Commit Graph

1457 Commits

Author SHA1 Message Date
Lengyel Balázs
cf16abe9a9 minecraft-server: 1.9 -> 1.9.4 2016-05-23 22:34:52 +02:00
Vladimír Čunát
0b192a0976 Merge branch 'master' into staging
That's to get mesa rebuild from master, as it's nontrivial.
2016-05-23 09:02:10 +02:00
Vladimír Čunát
c4661e9643 Merge: make dev output references explicit
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
Michael Raskin
9cb61d3ac1 sgtpuzzles: create symlinks with sgt-puzzle- prefix for disambiguation, for example with net being provided by Samba 2016-05-20 11:21:52 +02:00
Tuomas Tynkkynen
b0d0752f2a treewide: Make explicit that 'dev' output of libXcursor is used 2016-05-19 10:04:39 +02:00
Tuomas Tynkkynen
c857552da8 treewide: Make explicit that 'dev' output of libX11 is used 2016-05-19 10:04:38 +02:00
Tuomas Tynkkynen
7fb29bfa73 treewide: Make explicit that 'dev' output of zlib is used 2016-05-19 10:04:38 +02:00
Tuomas Tynkkynen
e80e4ba2bb treewide: Make explicit that 'dev' output of sqlite is used 2016-05-19 10:04:34 +02:00
Tuomas Tynkkynen
b51b458aed treewide: Make explicit that 'dev' output of fftwSinglePrec is used 2016-05-19 10:00:33 +02:00
Domen Kožar
b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Matthias Mailänder
8b6125333c openra: Fix a typo and the website URL (#15504) 2016-05-16 21:15:29 +02:00
Michael Raskin
3f83632650 sgtpuzzles: 20160410.9d15092 -> 20160429.b31155b 2016-05-15 23:49:44 +02:00
Michael Raskin
6ed76dccb1 xboard: 4.8.0 -> 4.9.0 2016-05-15 23:49:44 +02:00
rardiol
3373ef1349 Minetest 0.4.13 -> 0.4.14 (#15481)
* minetest: 0.4.13 -> 0.4.14

* minetest: add ncurses support for server

* minetest: add leveldb support
2016-05-15 22:44:56 +02:00
Nikolay Amiantov
229e544148 steamPackages.steam-runtime-wrapped: fix w. multiple outputs 2016-05-15 02:35:17 +03:00
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
Nikolay Amiantov
953c51f65e dwarf-fortress-unfuck: use mesa_noglu instead of mesa 2016-04-24 16:33:11 +03:00
Nikolay Amiantov
19500bc23b Merge pull request #14941 from rardiol/opendungeons
opendungeons: init at 0.6.0
2016-04-24 17:19:34 +04:00
Ricardo Ardissone
71b935c339 opendungeons: init at 0.6.0 2016-04-23 17:31:42 -03:00
Nikolay Amiantov
7f32a05baa dwarf-therapist: fix build 2016-04-23 22:25:34 +03:00
Nikolay Amiantov
6d432531c6 Merge pull request #14906 from rardiol/dwarf-fortress-unfuck
dwarf-fortress-unfuck: 2016-02-11 -> 2016-04-22 and zlib dependency
2016-04-23 02:42:15 +04:00
Ricardo Ardissone
bdf714c303 dwarf-fortress-unfuck: 2016-02-11 -> 2016-04-22 and zlib dependency 2016-04-22 19:34:11 -03:00
Pascal Wittmann
fe6899e330 instead: 2.4.0 -> 2.4.1 2016-04-22 21:05:38 +02:00
Vladimír Čunát
e9379f7416 Merge branch 'staging'
This includes a fix to closure-size regression that moved
share/doc/*/ to share/doc/
2016-04-22 16:49:09 +02:00
Michael Raskin
38aa457f9a sgtpuzzles: add a .upstream file for autoupdating 2016-04-22 00:57:43 +02:00
Joachim Fasting
79de9293c2 Merge pull request #14869 from rardiol/factorio
factorio: add explict dependency on cacert for chroot build
2016-04-21 16:21:14 +02:00
Ricardo Ardissone
f2cee89b22 factorio: add explict dependency on cacert for chroot build 2016-04-21 11:09:53 -03:00
Nikolay Amiantov
02014ea0aa mudlet: move to qmakeHook 2016-04-20 18:55:54 +03:00
Nikolay Amiantov
f8d96d1983 chessx: move to qmakeHook 2016-04-20 18:55:54 +03:00
Michael Raskin
fb60199d42 sgtpuzzles: update, switch to git-snapshot tarballs 2016-04-20 11:33:45 +02:00
Micxjo Funkcio
5f3d24bc92
freeciv: 2.5.0 -> 2.5.3 2016-04-19 21:59:41 -07:00
Linus Arver
5ce564563d sdlmame: fix broken URLs (close #14814) 2016-04-19 11:40:49 +02:00
Nikolay Amiantov
05e713e7a5 Merge pull request #14775 from rardiol/freeorion
freeorion: init at 0.4.5
2016-04-19 03:09:46 +04:00
Nikolay Amiantov
d8eec18ce2 freeorion: fix paths in configuration file before start 2016-04-18 16:20:46 -03:00
Nikolay Amiantov
756a83191c freeorion: enable parallel building 2016-04-18 16:20:45 -03:00
Nikolay Amiantov
454a64caff Merge commit 'refs/pull/14779/head' of git://github.com/NixOS/nixpkgs 2016-04-18 14:02:35 +03:00
Ricardo Ardissone
5f832739ce warzone2100: 3.1.1 -> 3.1.5 2016-04-18 07:37:18 -03:00
Lluís Batlle i Rossell
2d3245042e Removing content-pack download from rigsofrods.
The content packs from 0.37 don't seem to work. We should get one from 0.4, but
there are license problems, I think.
2016-04-18 12:30:47 +02:00
Lluís Batlle i Rossell
e741a302d4 Make rigsofrods build the latest code.
I add angelscript 2.22 too, as it makes RoR happy.
2016-04-18 12:30:47 +02:00
Lluís Batlle i Rossell
93bd5556be Revert "rigsofrods: remove dead package"
This reverts commit 69e7948ffe.
2016-04-18 12:04:38 +02:00
Ricardo Ardissone
3ce9294eeb freeorion: init at 0.4.5 2016-04-18 04:45:21 -03:00
Nikolay Amiantov
a832a71c2c vdrift: 2012-07-22 -> 2014-10-20 2016-04-17 05:24:40 +03:00
Nikolay Amiantov
bd5cd56a49 openmw: 0.38.0 -> 0.39.0 2016-04-17 05:24:40 +03:00
Vladimír Čunát
95d4dda578 factorio: fix evaluation of meta 2016-04-16 23:17:09 +02:00
Eric Litak
7ce216139c factorio: bump to 0.12.29 and headless version 2016-04-14 23:03:05 -07:00
Eric Litak
c6750d2f46 factorio: refactor in preparation for headless version 2016-04-14 23:03:04 -07:00
Alexander V. Nikolaev
32724102ed minetest: Fix finding gettext by CMake 2016-04-14 19:36:37 +03:00
Nikolay Amiantov
37d641ff3d dfhack: use protobuf compiled with old ABI 2016-04-14 17:30:40 +03:00
Nikolay Amiantov
0ffd6d16b6 dwarf-therapist: fix build (see #14670) 2016-04-14 04:17:56 +03:00
Nikolay Amiantov
755e4633c7 mass-replace glib and gtk lib/*/include paths 2016-04-14 04:13:54 +03:00