Commit graph

885 commits

Author SHA1 Message Date
Lluís Batlle i Rossell
8ecdac1404 Fix gltron. Sinterklaas present for iElectric.
(cherry picked from commit 013705113bb95f5e43b779c94c231f4f0f3b89fc)
2014-12-31 10:52:25 +01:00
Moritz Ulrich
f43d67d43a Dwarf Fortress: Update to 0.40.23. 2014-12-30 22:14:02 +01:00
Tobias Geerinckx-Rice
c64257b8e5 Fix user-facing typos (mainly in descriptions) 2014-12-30 03:31:03 +01:00
Shea Levy
05edd656f6 Missed gcc refs 2014-12-26 12:28:15 -05:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
wyvie
10e7ad5dbb Added openarena 0.8.8 2014-12-24 22:43:28 +03:00
Moritz Ulrich
e93c528a01 openttd: Fix build with fix from upstream. 2014-12-22 17:29:30 +01:00
Michael Raskin
447ff811f7 atanks: 6.0 → 6.1 2014-12-21 11:14:24 +03:00
lethalman
cfac943524 Merge pull request #5253 from grwlf/eduke32
eduke32.nix: disable libpng
2014-12-19 11:14:57 +01:00
Mateusz Kowalczyk
513f2bc362 tibia: update to 10.71 2014-12-16 10:28:28 +00:00
Moritz Ulrich
54f3587549 dwarf-{fortress,therapist}: Update
DwarfTherapist does some ugly stuff by matching the first 8 characters
of the md5sum of the game binary to match its binary content. This patch
adds support to automatically patch the ini files.
2014-12-15 22:13:51 +01:00
Domen Kožar
e752a8cff9 gltron: mark as broken
(cherry picked from commit 23d01bb90c9d6ba74f507fe69439f7e1e0a3f238)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-12 18:39:01 +01:00
Peter Simons
29546928b1 haskell-LambdaHack: update to version 0.4.100.0 2014-12-12 10:01:28 +01:00
Peter Simons
61d4faa59d haskell-Allure: update to version 0.4.100.0 2014-12-12 10:01:28 +01:00
Mateusz Kowalczyk
3750da1226 tibia: update to 10.70 2014-12-10 22:06:28 +00:00
Sergey Mironov
baec112e37 eduke32.nix: disable libpng (can't build with it) 2014-12-07 23:19:54 +03:00
Mateusz Kowalczyk
65bdddb430 tibia: update to 10.64 2014-12-04 13:44:30 +00:00
Domen Kožar
ee1542c948 beret: fix hash 2014-12-03 21:54:49 +01:00
宋文武
159bdd1219 performous: new package 2014-11-25 21:39:46 +08:00
Moritz Ulrich
a175776477 dwarf-fortress: Update to 0.40.18. 2014-11-23 21:30:14 +01:00
Moritz Ulrich
bc03398930 dwarf-fortress: Clean up expression & config file handling. 2014-11-23 21:30:14 +01:00
Michael Raskin
73f4466a90 Add ncurses-2048 game 2014-11-23 22:50:47 +03:00
lethalman
f0e4b745f7 Merge pull request #5046 from abbradar/checksum-fixes
Checksum fixes
2014-11-19 18:02:09 +01:00
Nikolay Amiantov
daa9e53e26 beret: fix checksum 2014-11-19 15:35:33 +03:00
Cray Elliott
825e99808c add a platform to all of my packages 2014-11-19 03:03:00 -08:00
Mateusz Kowalczyk
2f71724a02 tibia: update to 10.63 2014-11-19 10:58:19 +00:00
Moritz Ulrich
253c54e411 Dwarf Fortress: Update to 0.40.16. 2014-11-18 11:24:09 +01:00
Domen Kožar
48867b98aa openra: 20140608 -> 20141029 2014-11-15 13:04:32 +01:00
Pascal Wittmann
15b34eaeb9 stuntrally: update from 2.4 to 2.5 2014-11-14 18:19:01 +01:00
Vladimír Čunát
b4af993c3f Merge branch 'master' into staging
Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh
2014-11-14 14:28:23 +01:00
Longrin Wischnewski
348597b939 pkgs: add xsnow 2014-11-12 17:52:21 +01:00
Mateusz Kowalczyk
5aede825b9 tibia: update to 10.62 2014-11-12 09:02:50 +00:00
Eelco Dolstra
f33fa1b66b Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/boost/generic.nix
2014-11-11 23:48:08 +01:00
Pascal Wittmann
8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Eelco Dolstra
aa17cbf0a8 Remove unnecessary override 2014-11-11 10:38:48 +01:00
Domen Kožar
43be15a89c fix quake3game build 2014-11-11 09:34:40 +01:00
Luca Bruno
6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Vladimír Čunát
96fd4950f2 crawl: more meta fixes; eval is fine now 2014-11-08 22:16:34 +01:00
Domen Kožar
5e42bcc18d typo 2014-11-08 21:56:51 +01:00
Vladimír Čunát
5176fb3bdf crawl: fix evaluation (licenses attribute)
CC: #4822.
2014-11-08 21:55:30 +01:00
Michael Raskin
bf184758a6 Adding Fish-Fillets-NG game 2014-11-08 22:35:06 +03:00
Aristid Breitkreuz
392f828c5d Merge pull request #4822 from abbradar/crawl
crawl: fix, update, add console version
2014-11-08 19:42:23 +01:00
Vincent Laporte
8c7d6b8f4c klavaro: update from 2.00 to 3.01 2014-11-08 16:12:37 +00:00
Luca Bruno
83221f3886 Merge branch 'master' into staging
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
2014-11-08 15:56:40 +01:00
Moritz Ulrich
35ea4085bc dwarf-fortress: delete old 34.11 package. 2014-11-07 17:22:29 +01:00
Moritz Ulrich
9c301c1fa1 dwarf-fortress: Update to 40.15. 2014-11-07 17:22:29 +01:00
Moritz Ulrich
9cf9675a60 openttd: Update to 1.4.4. 2014-11-07 16:40:44 +01:00
Eelco Dolstra
0518ccf5af Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk
007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Vladimír Čunát
52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00