Commit graph

1012 commits

Author SHA1 Message Date
William A. Kennington III
074c4a7f78 Merge remote-tracking branch 'upstream/master' into staging 2015-05-07 01:44:49 -07:00
aszlig
c7e7f12ef6
uqm: Bring back package and fix 3do extractor.
It was dropped in 324719a5a6.

The UQM package itself doesn't require Haskell, but in order to extract
contents from the 3do version of the game, we need to have a small
helper utility which I wrote in Haskell a while ago. In order to switch
it to Haskell NG, only very minor modifications were necessary, which
are now done with this commit instead of dropping the whole game.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-07 08:03:06 +02:00
Peter Simons
324719a5a6 Drop obsolete pre-NG Haskell builds. 2015-05-05 21:44:47 +02:00
Peter Simons
f8743f3dcd hedgewars: convert the build to Haskell NG 2015-05-04 12:43:24 +02:00
Pascal Wittmann
ca03cf5c70 xmoto: refactor, remove patches and add myself to maintainers 2015-05-02 23:14:19 +02:00
William A. Kennington III
00df204c82 Merge remote-tracking branch 'upstream/master' into staging 2015-05-01 15:57:09 -07:00
Joachim Fasting
bf7ad2d84f meta.description fixups
Mostly scripted substitutions with a couple of subjective enhancements.
2015-04-30 18:17:42 +02:00
Tobias Geerinckx-Rice
dc5c8ce819 eduke32 20130303-3542 -> 20150420-5160 2015-04-30 13:11:32 +02:00
Thomas Tuegel
1fe28a1132 Merge remote-tracking branch 'upstream/master' into staging 2015-04-29 11:33:28 -05:00
Pascal Wittmann
f99d5cf2fc Fixed some descriptions 2015-04-28 10:55:20 +02:00
Vladimír Čunát
30f31c9afc Merge 'master' into staging
(relatively simple conflicts)
2015-04-26 22:52:08 +02:00
William A. Kennington III
1adb482638 Convert more applications to libmysql 2015-04-22 16:09:41 -07:00
Nikolay Amiantov
9ae0798e73 steam: fix for new fhs-userenv 2015-04-22 17:50:41 +03:00
Pascal Wittmann
06d1da0948 Merge pull request #7487 from oxij/fix-update-stepmania
stepmania: revive and update to 5.0.7
2015-04-20 20:39:33 +02:00
Jan Malakhovski
ba53021d92 stepmania: revive and update to 5.0.7 2015-04-20 16:09:07 +00:00
Balletie
d03e6162dc Update SFML to version 2.2, remove sfml_git, and update MARS (depended on sfml_git) 2015-04-20 16:49:39 +02:00
Lluís Batlle i Rossell
7937bd7039 Updating trigger rally to 0.6.1
A lot more tracks
2015-04-17 10:46:22 +02:00
Mateusz Kowalczyk
0097e09420 tibia: update to 10.77 2015-04-14 14:27:40 +01:00
Pascal Wittmann
6fba1d8628 Merge pull request #7348 from dezgeg/bastet
bastet: new package
2015-04-13 11:49:45 +02:00
C0DEHERO
fbf5798e82 xonotic: update 0.7.0 -> 0.8.0 2015-04-12 19:09:48 -04:00
Tuomas Tynkkynen
2f7b37749e bastet: New package
Add version 0.43.1 of bastet, the infamous evil tetris clone, to the
games collection.
2015-04-12 19:44:51 +03:00
Thomas Tuegel
88918e10e9 Merge branch 'master' into staging 2015-04-10 07:45:38 -05:00
Vladimír Čunát
da158672bd simutrans: update, refactor, improve, add paksets
Close #7019.

- update all, and add more paksets
- add config.simutrans.paksets, multiple are possible now
- fix #6719: missing sounds
- move user settings from ~/simutrans to ~/.simutrans
- darwin support is untested (but claimed upstream)

Tested-by: Matthias Beyer <mail@beyermatthias.de>
(and by the author vcunat)
2015-04-09 19:43:42 +02:00
Pascal Wittmann
2402390766 instead: update from 2.2.2 to 2.2.3 2015-04-08 16:06:09 +02:00
Nikolay Amiantov
1fa5e7ae3c the-powder-toy: add derivation 2015-04-08 01:45:41 +03:00
Eric Seidel
6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00
Richard Zetterberg
46178f057e Fixes irrlicht and minetest to work with mesa > 10 2015-04-03 20:45:50 +02:00
William A. Kennington III
b524480695 More mysql migrations 2015-04-01 16:50:47 -07:00
Nikolay Amiantov
7a3780a675 crawl: fix build 2015-04-02 01:48:21 +03:00
William A. Kennington III
fa2e5b25ba Merge branch 'master' into staging 2015-03-29 14:25:48 -07:00
Nikolay Amiantov
ac900ac7fb crawl: update 2015-03-29 13:05:27 +03:00
Nixpkgs Monitor
ad2b2a7997 anki: update from 2.0.31 to 2.0.32 2015-03-28 11:14:55 +01:00
Thomas Tuegel
5d1f6ad57c qt5: make qt-5.4.1 default 2015-03-24 17:14:56 -05:00
Arseniy Seroka
18ab694934 steam: fix: add gst lib (needed by audiosurf 2) 2015-03-21 02:54:32 +03:00
Eelco Dolstra
2ed5c2bd6b Set some meta.platforms
Also fix meta.platform -> meta.platforms in a few places.
2015-03-20 20:04:42 +01:00
Longrin Wischnewski
30beb0ad7d flightgear: bump version to 3.4 (close #6385)
- openscenegraph: bump version to 3.2.1: http://www.openscenegraph.org/index.php/download-section/stable-releases
- remove obsolete patch
- simgear: bump version to 3.4.0
- flightgear: add qt5 as build input
2015-03-17 22:58:39 +01:00
Domen Kožar
6e45fb5a55 planetaryannihilation: fix build 2015-03-16 09:15:00 +01:00
Pascal Wittmann
01935e880b stunt-rally: fix hashes and add meta.platforms (closes #6712) 2015-03-14 21:42:58 +01:00
Peter Simons
7e45327e9a mnemosyne: update to version 2.3.2 2015-03-10 15:39:28 +01:00
Nikolay Amiantov
c16188343a steam: add primus support 2015-03-09 23:02:47 +03:00
Nikolay Amiantov
e01cd8f214 steam: fix sound issues 2015-03-09 17:29:44 +03:00
Nikolay Amiantov
95cd118d4f steam: refactor meta 2015-03-09 17:29:43 +03:00
Andraz Brodnik
2d8f7883a9 Add scrolls game (unfree). Close #6456.
@vcunat added today's date as version.
2015-03-08 15:37:33 +01:00
Eelco Dolstra
6f33aa8465 orig-gcc -> orig-cc 2015-03-04 22:15:46 +01:00
Mateusz Kowalczyk
d4b4e586f1 tibia: update to 10.76 2015-03-03 09:59:04 +00:00
Jason Moggridge
2aa2d8ac76 Update the sources to the latest version and added one new dependency 2015-02-25 00:25:14 -05:00
Mateusz Kowalczyk
7d2667a172 tibia: update to 10.75 2015-02-14 08:52:47 +00:00
Pascal Wittmann
24c91295c1 instead: update from 2.2.1 to 2.2.2 2015-02-07 12:47:42 +01:00
Nikolay Amiantov
aa54b77611 Merge pull request #6189 from abbradar/fhs-userenv
steamOriginal: rename to steam-original
2015-02-06 03:59:43 +03:00
Nikolay Amiantov
fd99962abb steamOriginal: rename to steam-original 2015-02-06 03:48:32 +03:00
Arseniy Seroka
5ccc4839cb Merge pull request #6177 from abbradar/fhs-userenv
add non-root temporary FHS chrootenv
2015-02-05 21:57:54 +03:00
Nikolay Amiantov
627f8178b8 steam: rename, add a warning 2015-02-05 19:46:25 +03:00
Nikolay Amiantov
238fe730b9 steam-chrootenv: use UserEnv 2015-02-05 19:46:25 +03:00
Arseniy Seroka
35e333241c Merge pull request #6116 from dbohdan/master
tcl2048: update to 0.3.1, fix tclsh path.
2015-02-05 18:48:16 +03:00
Nikolay Amiantov
69d19d4283 steam: replace steamdeps 2015-02-05 18:43:58 +03:00
Sou Bunnbu
e91dd46ba4 Merge pull request #6097 from waylon531/patch-1
Update 0ad 0.0.16 -> 0.0.17
2015-02-03 19:22:44 +08:00
Danyil Bohdan
1faafc8b86 tcl2048: update to 0.3.1, fix tclsh path.
Also add self as maintainer.
2015-02-03 12:01:34 +01:00
Pascal Wittmann
80b13069db instead: update from 2.2.0 to 2.2.1 2015-02-03 10:43:41 +01:00
waylon531
5b03e5d02e 0ad 0.0.16 -> 0.0.17 2015-02-02 21:33:48 -08:00
Shea Levy
c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
wyvie
629357c04a mudlet version 2015-02-02 16:50:39 +03:00
Eelco Dolstra
6f8fad2253 Remove executable bits from non-executable files 2015-01-27 18:54:38 +01:00
Mateusz Kowalczyk
ed943be5d8 tibia: update to 10.74 2015-01-27 11:54:41 +00:00
Moritz Ulrich
fc4d437fd1 Dwarf Therapist: Update to git-prerelease.
Necessary to support Dwarf Fortress 0.40.24.
2015-01-26 00:00:57 +01:00
Moritz Ulrich
171bb614f2 Dwarf Fortress: Update to 0.40.24. 2015-01-26 00:00:31 +01:00
Mateusz Kowalczyk
75ddffe39b tibia: update to version 10.73 2015-01-23 19:41:27 +00:00
Peter Simons
ec6b82a0c2 Merge branch 'master' into staging. 2015-01-19 18:41:17 +01:00
Pascal Wittmann
d79bba5116 Merge pull request #5538 from ehmry/gnubg
gnubg: initial package at 1.04.000
2015-01-18 20:46:21 +01:00
Eric Seidel
f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
Pascal Wittmann
6f27834e3a instead: update from 1.9.1 to 2.2.0 and adopt it 2015-01-15 00:42:17 +01:00
Vladimír Čunát
7637e71cee merge #5521: give fetchgit outputs nicer names 2015-01-13 17:46:44 +01:00
Vladimír Čunát
3dfd87d7af fixup "git-export" directory names
All tested to build.
For freetalk the hash change seems unrelated to fetchgit changes.

FIXME: it might be suitable to adapt nix-prefetch-git.
2015-01-13 17:46:09 +01:00
Michael Raskin
9d6bd701bb GNU Chess 6.1.2 -> 6.2.1 2015-01-11 16:43:29 +03:00
Austin Seipp
23a9bf85d8 Merge pull request #5518 from tomberek/patch-1
Bump minecraft-server to 1.8.1
2015-01-08 02:56:23 -06:00
Emery Hemingway
8bde40359a gnubg: initial package at 1.04.000 2015-01-07 02:14:45 -05:00
aszlig
7982c3423a
openarena: Clean up and fix tarball evaluation.
It really doesn't make sense to pass stdenv.system to the builder and
check the value during build process. Also, we're now using
$NIX_CC/nix-support/dynamic-linker instead of pattern matching on
ld-linux*.so.?.

This is part of an attempt to fix nixpkgs tarball evaluation.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-03 18:26:40 +01:00
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
tomberek
fdefa49056 Bump minecraft-server to 1.8.1 2014-12-31 00:51:15 -05: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