alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
75166 commits 217 branches 116 tags 4 GiB
Commit graph

1163 commits

Author SHA1 Message Date
William A. Kennington III ae28ff8b91 Merge branch 'master.upstream' into staging.upstream 2015-07-06 17:15:11 -07:00
Pascal Wittmann 505f624e01 newtonwars: init at 2015060 2015-07-06 11:37:06 +02:00
William A. Kennington III d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
Michael Raskin af3d395cfe sgtpuzzles: update to revision 10286; rewrite completely to avoid reliance on builderDefs features 2015-07-05 11:57:49 +03:00
lassulus f3bd641203 zandronum: 2.0 -> 2.1 2015-07-03 23:30:52 -07:00
Pascal Wittmann 5f462f0eae xconq: fix build and refactor 2015-07-01 22:06:39 +02:00
Arseniy Seroka 88c7e4aa94 Merge pull request #8545 from C0DEHERO/update/voxelands 
update 1504.01 -> 1506.00
 2015-06-29 00:06:06 +03:00
C0DEHERO cf98387f73 voxelands: 1504.01 -> 1506.00 2015-06-28 16:36:15 -04:00
Arseniy Seroka 2c64c34517 Merge pull request #8544 from Chattered/master 
tome4: add new maintainer
 2015-06-28 20:42:58 +03:00
Phil Scott 52339c7c70 tome4: add new maintainer 2015-06-28 18:35:26 +01:00
Michael Raskin 0d24a16bdf Minimal fix to make XConq playable again 2015-06-28 19:06:59 +03:00
Vladimír Čunát e716dc9058 zandronum-bin: fix evaluation/tarball by assertion 
The expression seems usable only on x86_64-linux anyway.
/cc maintainer @lassulus.
 2015-06-22 18:21:27 +02:00
Jascha Geerds b361cc71e7 Merge pull request #8449 from dezgeg/pr-bastet-platforms 
bastet: Add platforms
 2015-06-22 08:36:54 +02:00
Tuomas Tynkkynen 2caa151354 bastet: Add platforms 
I had initially forgotten to add this.
 2015-06-21 23:00:42 +03:00
Tanner Doshier 0da4293c2c steam: add xrandr binary to env 
Games utilizing LWJGL >= 2.4 && < 3.0 need this as the framework parses
display information from the command line output of xrandr[1] on Linux.
There are a number of LWJGL games on Steam currently.

[1]: 46f602f0c6/src/java/org/lwjgl/opengl/XRandR.java (L72)
 2015-06-19 20:48:26 -05:00
lassulus 099923c7be add pkgs: zandronum, zandronum-{server,bin}, closes #8338 2015-06-18 11:29:03 +02:00
Tobias Geerinckx-Rice 98b2d7b727 Separate nativeBuildInputs where maintainers |= nckx 2015-06-17 22:21:32 +02:00
Mateusz Kowalczyk 6563dd251f tibia: update to 10.79 2015-06-17 14:44:44 +01:00
Andraz Brodnik 21bb2caf78 Update scrolls client (src hash change) 2015-06-16 21:02:48 +02:00
Phil Scott 279c426f05 Add Tales of Maj'eyal game. 2015-06-14 17:44:38 +01:00
Pascal Wittmann 7829a2c92e chocolate-doom: update from 2.1.0 to 2.2.0 2015-06-10 09:00:47 +02:00
Nixpkgs Monitor c25027f210 openttd: update from 1.4.4 to 1.5.1 2015-06-07 15:43:53 +02:00
Arseniy Seroka daf4ec39a5 fix: add missing versions 2015-06-04 23:34:14 +03:00
Tanner Doshier 5a993f8d0d minetest: LuaJIT, in-app mod store, better fonts and enable translations 
cURL was already a dependency, but the build was having some trouble
finding the headers. Just give it a little help and the in-app mod store
store actually works.

The rest of the configuration brings us closer to other distros, like
Fedora (LuaJIT)[1] and Debian (LuaJIT, LevelDB, FreeType, gettext)[2][3]

[1] http://pkgs.fedoraproject.org/cgit/minetest.git/tree/minetest.spec#n28
[2] https://anonscm.debian.org/cgit/pkg-games/minetest-v04x.git/tree/debian/control#n9
[3] https://anonscm.debian.org/cgit/pkg-games/minetest-v04x.git/tree/debian/rules#n56
 2015-05-31 11:36:56 -05:00
Pascal Wittmann 66433822d3 supertux: remove obsolete patch 2015-05-31 16:44:16 +02:00
Aristid Breitkreuz 3c09ff6d15 prevent accidentally installing unwrapped steam 2015-05-30 19:27:24 +02:00
Pascal Wittmann 1d30557516 Fixed meta.license: s/licence/license 2015-05-30 15:19:05 +02:00
William A. Kennington III be5f4082fd pulseaudio: Remove default derivation 2015-05-29 14:47:33 -07:00
William A. Kennington III b07929b0a3 Use libpulseaudio instead of pulseaudio 2015-05-29 14:32:56 -07:00
Peter Simons 99273a6716 Merge pull request #8047 from nckx/master 
Don't use "with licenses;" for single licences
 2015-05-28 22:14:53 +02:00
Tobias Geerinckx-Rice 158e1cfdd0 Don't use "with licenses;" for single licences 
And don't use square brackets on such lines.
 2015-05-28 19:20:29 +02:00
Pascal Wittmann deec257852 supertux: update from 0.1.3 to 0.3.5a 2015-05-28 18:41:22 +02:00
Tobias Geerinckx-Rice b2d7f4b1ba Use common licence attributes from lib/licenses.nix 
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
 2015-05-27 22:00:06 +02:00
Jan Malakhovski 3d02048283 xbomb: add version 2.2b 2015-05-24 14:24:33 +00:00
Jascha Geerds f3162d6d4f Add c0dehero as a maintainer of minetest and voxelands 2015-05-17 22:47:36 +02:00
Jascha Geerds a84775e8f6 Merge pull request #7862 from C0DEHERO/fix/supertuxkart-update 
supertuxkart: update 0.8.1 -> 0.9
 2015-05-17 21:33:54 +02:00
C0DEHERO b549ce1ddd minetest: update 0.4.4 -> 0.4.12 2015-05-17 20:58:41 +02:00
C0DEHERO e505663051 supertuxkart: update 0.8.1 -> 0.9 2015-05-17 14:36:49 -04:00
C0DEHERO 3a966376bf voxelands: added 1504.01 2015-05-17 20:33:35 +02:00
Joachim Schiele bbd342dcf4 openal to openalSoft conversion 2015-05-16 04:04:35 +02:00
lassulus 871b472c66 update zdoom to v2.7.1 2015-05-15 10:04:08 +02:00
Pascal Wittmann bb9e9cc3f8 Turned some meta.maintainers into lists 2015-05-14 19:09:43 +02:00
lethalman 8714140e31 Merge pull request #7795 from Lassulus/gzdoom 
add gzdoom package
 2015-05-14 17:45:46 +02:00
Pascal Wittmann 9c9c586534 Fixed several "package has no version" warnings 2015-05-14 17:19:41 +02:00
lassulus 4b0cfe67b4 add gzdoom to nixpkgs 2015-05-13 09:35:20 +02:00
Mateusz Kowalczyk 7640b92c30 tibia: update to 10.78 2015-05-12 16:51:38 +01:00
Peter Simons 0c32585e67 anki: polish meta section 2015-05-11 23:30:50 +02:00
Peter Simons f5d8fb8409 anki: fix Emacs syntax highlighting 2015-05-11 23:30:15 +02:00
Peter Simons c6ca7a0be1 anki: update to SQLAlchemy 9 2015-05-11 23:29:19 +02:00
Michael Raskin 6219db292c Update LiquidWar 2015-05-10 13:46:31 +02:00
Michael Raskin b5b7c825f6 Update atanks 2015-05-10 13:46:31 +02:00
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 013705113b)
 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 23d01bb90c)
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
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