Commit graph

858 commits

Author SHA1 Message Date
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
Mateusz Kowalczyk a8e2e80bcd xsokoban: fix eval 2014-11-05 09:49:37 +00:00
Michael Raskin 404930ec8c Add fairymax chess engine 2014-11-05 11:56:20 +03:00
Michael Raskin a5dfaef9ea Update XMoto 2014-11-05 11:56:19 +03:00
Michael Raskin 0770fce3c0 Update XBoard 2014-11-05 11:56:19 +03:00
Michael Raskin bc5f55cc91 Adopt a few packages 2014-11-05 11:56:19 +03:00
Eelco Dolstra 7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
Eelco Dolstra 60ad5c2b4e ioquake3: Remove meta.broken
It actually builds fine.
2014-11-04 14:28:09 +01:00
Nikolay Amiantov 2c0ad22666 crawl: fix, update, add console version 2014-11-04 13:05:47 +03:00
Peter Simons b5fed52c43 Merge pull request #4238 from wkennington/master.boost
Make boost 156 the default
2014-11-03 23:03:01 +01:00
Arseniy Seroka 51abbf7204 steam: update 1.0.0.48 -> 1.0.0.49 2014-11-03 20:00:49 +03:00
Michael Raskin 6707d9e8c3 Update Stunt Rally 2014-11-03 16:54:39 +03:00
William A. Kennington III 47ef7b4508 glob2: Refactor to use mkDerivation 2014-11-02 17:22:27 -08:00
William A. Kennington III aa3e800be7 boost: Remove boost.lib 2014-11-02 17:22:27 -08:00
Mateusz Kowalczyk 609da7e8c3 tibia: update to 10.61 2014-11-01 01:49:00 +00:00
Cray Elliott 553ba05d6a Add odamex, a client/server multiplayer doom port
note that odalaunch is not included in this package, users are
expected to use doomseeker. If you would like an option for
odalaunch, please bother me(MP2E)
2014-10-29 05:05:44 -07:00
lethalman 8904b2b4e3 Merge pull request #4630 from abbradar/onscripter
add "onscripter-en" package
2014-10-27 09:54:03 +01:00
Nikolay Amiantov a94eadacf2 onscripter-en: add package 2014-10-27 01:45:17 +03:00
Philip Horger b995c2a479 Update Hawkthorne game to v0.12.1 (bugfix) 2014-10-26 14:19:15 -07:00
Philip Horger 31949a102e Update Hawkthorne game to v0.12.0 2014-10-24 09:13:31 -07:00
Bjørn Forsman b47e5b6db3 anki: update to 2.0.31
Build and run tested.
2014-10-23 13:17:28 +02:00
Bjørn Forsman 47617be9f8 anki: add alternative "archive/" download url
Anki developers move old (non-latest) releases to an "archive/"
subdirectory. So try both with and without "archive/" when downloading
the source.
2014-10-23 13:15:39 +02:00
Cray Elliott 48e0a0a3c8 update chocolateDoom to v2.1.0, chocolateDoomMaster removed 2014-10-22 00:01:33 -07:00
Louis Taylor 48664fb7b2 Add hedgewars
Turn-based strategy artillery game similiar to Worms.
2014-10-14 16:40:56 +01:00
Jaka Hudoklin ed53f57c9f Merge pull request #4475 from matejc/megaglest
megaglest: new package
2014-10-12 22:57:56 +02:00
Longrin Wischnewski 6e7de2155b change md5sum to sha256sum for a few packages 2014-10-12 16:13:21 +02:00
Mateusz Kowalczyk d285aece7b tibia: update to 10.59 2014-10-12 12:33:04 +01:00
Matej Cotman 6d7de06a9a megaglest: new package 2014-10-11 18:56:15 +02:00