Commit Graph

752 Commits

Author SHA1 Message Date
Cray Elliott
22eccacb6c update minecraft-server to 1.7.10 2014-08-18 18:51:51 -07:00
Vladimír Čunát
26d68ce798 merge #3301: add Adom game (with fixes) 2014-08-18 16:26:39 +02:00
Vladimír Čunát
edfc77044a adom: various fixes
- make chrooted download work
- add shebang
- nix style and meta conventions
2014-08-18 16:24:45 +02:00
Peter Simons
46e5a78b81 haskell-Allure: add version 0.4.99.0 2014-08-12 12:37:44 +02:00
Peter Simons
1703d9f7cc haskell-LambdaHack: update to version 0.4.99.0 2014-08-12 12:37:44 +02:00
Peter Simons
26ec124da8 LambdaHack: mark package as broken 2014-08-11 12:54:50 +02:00
Peter Simons
f1fb0bf27b LambdaHack: disable Hydra builds for this package 2014-08-09 00:39:52 +02:00
Vladimír Čunát
52d9c93abe Merge 'staging' into master 2014-08-08 20:13:23 +02:00
Sander van der Burg
c8ea9f749a Merge pull request #3494 from madjar/master
steam: updated to 1.0.0.48
2014-08-08 18:00:48 +02:00
Eelco Dolstra
8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Georges Dubus
5df24fadaa steam: updated to 1.0.0.48 2014-08-08 17:28:57 +02:00
Peter Simons
9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
System administrator
f3739e2aca added astromenace: Hardcore 3D space shooter 2014-08-07 01:54:41 +02:00
Peter Simons
20059d37f5 LambdaHack: jailbreak to fix build with latest 'gtk' 2014-08-04 16:52:29 +02:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Moritz Ulrich
be560b710e anki: update from 2.0.26 to 2.0.28 2014-08-04 15:53:05 +02:00
Michael Raskin
06ee6a2dab Update GNU Chess chess engine 2014-08-03 22:29:41 +04:00
Michael Raskin
77389a5bcb Update LiquidWar6 to 0.4 2014-08-03 15:59:21 +04:00
Vladimír Čunát
6295a3ca36 Merge recent master into x-updates
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-08-02 05:08:07 +02:00
Sebastian Korten
b42aa6830b scummvm: version bump to 1.7 2014-07-30 20:26:29 +02:00
John Wiegley
b90e56a53c Merge pull request #3357 from fignuts/df2014
Add dwarf fortress 2014 (unstable) version
2014-07-29 13:20:35 -05:00
John Wiegley
867d3fbf47 Merge pull request #3372 from FlorentBecker/crawl
Add dungeon crawl stone soup 0.14
2014-07-29 13:20:18 -05:00
Peter Simons
fc81ff49d2 LambdaHack: disable test suite to fix build
https://github.com/LambdaHack/LambdaHack/issues/57
2014-07-29 18:39:36 +02:00
Peter Simons
5cc55e9523 Partially revert 7a45996 some more.
Removing more references to the non-existent license "stdenv.lib.licenses.perl5".
Thanks to @FlashKorten for catching those.
2014-07-28 20:52:47 +02:00
Peter Simons
02bd934738 haskell-LambdaHack: update to version 0.2.14 2014-07-28 20:32:59 +02:00
Andrew Morsillo
911eb8d934 bump version to 0.40.05 2014-07-28 09:01:45 -04:00
Peter Simons
d0ca8c237e Fix broken license references. 2014-07-28 11:43:20 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
f64d84698e Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-07-28 11:30:49 +02:00
Florent Becker
826e96af0e Add dungeon crawl stone soup 0.14 2014-07-25 15:00:28 +02:00
Domen Kožar
4024adf232 openra: 20131223 -> 20140608 2014-07-24 17:17:31 +02:00
Andrew Morsillo
7c84e3b785 Add dwarf fortress 2014 (unstable) version 2014-07-23 22:41:30 -04:00
Vladimír Čunát
b9045a7d96 Merge branch 'x-updates' into staging
...in preparation for a merge to master
2014-07-22 22:28:39 +02:00
Eelco Dolstra
9c53065b61 exult: Update to 1.4.9rc1 2014-07-22 15:12:21 +02:00
Vladimír Čunát
a1a6414b9b exult: fix build, same as 4b263946d 2014-07-18 11:56:49 +02:00
Vladimír Čunát
16e35532e4 Merge recent master into x-updates 2014-07-17 19:30:56 +02:00
Sergey Mironov
c1fbd9dc67 adom: add famous rogue-like game 2014-07-16 17:51:39 +04:00
Eelco Dolstra
ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Peter Simons
d2e731e111 Add "please don't edit" comment at the top of every auto-generated Haskell file. 2014-07-14 13:21:41 +02:00
Vladimír Čunát
4b263946dd qt3, graphicsmagick137, fox, neverball: fix build
Broken after freetype propagating libpng, which hid the older ones.
Reordering is enough to ensure the older libpng gets picked.
2014-07-09 21:52:04 +02:00
Eelco Dolstra
95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Eelco Dolstra
f46108aaf0 Remove last reference to stdenvType 2014-07-01 16:22:44 +02:00
Michael Raskin
0957b0a432 Add an auto-update script for atanks 2014-07-01 13:59:02 +04:00
Eelco Dolstra
06fc1ec34d Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Michael Raskin
874e4d7d23 Update atanks 2014-07-01 13:07:33 +04:00
Michael Raskin
5ed1adbbd4 Update Blobby Volley 2014-07-01 11:54:09 +04:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Michael Raskin
89a7cc92a2 Merge pull request #3020 from ambrop72/0ad
Add 0 A.D.
2014-06-30 10:30:41 +04:00
Austin Seipp
b71d425f78 Merge pull request #3109 from nslqqq/master
OpenSpades: Initial 0.0.12
2014-06-28 20:35:35 -05:00
Benno Fünfstück
e10001042d fetchbzr, fetchdarcs, fetchhg: use rev attr
This makes it match the behaviour of fetchgit and fetchsvn, so it's
easier to write scripts that support all of them.
2014-06-28 21:06:10 +02:00