3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

830 commits

Author SHA1 Message Date
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
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
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
Eelco Dolstra 811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
Conflicts:
	pkgs/tools/security/gnupg/default.nix
2014-10-09 10:57:57 +02:00
Cray Elliott c067b37cf7 Fix a silly mistake in the chocolateDoom packages, and bump master
master was bumped because a few critical bugs were found in the chocolate-strife netcode (and were subsequently fixed). Still pestering upstream for a new release :P

Closes #4422
2014-10-08 21:43:26 +01:00
Mateusz Kowalczyk 05130419d5 tibia: update to 10.58 2014-10-07 16:59:03 +01:00
Aristid Breitkreuz 6c7786074f fix sound in minecraft for pulseaudio users 2014-10-05 19:50:35 +02:00
Vladimír Čunát e4436ad841 FONTCONFIG_FILE: remove setters to /etc/fonts/fonts.conf
Any reasonably new version of fontconfig does search that path by default,
and setting this globally causes problems, as 2.10 and 2.11 need
incompatible configs.

Tested: slim+xfce desktop, chrootenv-ed steam.
I have no idea why we were setting the global variable;
e.g., neither Fedora nor Ubuntu does that.
2014-10-05 17:05:27 +02:00
Mateusz Kowalczyk 819e4b6a2c tibia: update to 10.57 2014-10-02 17:22:36 +01:00
Mateusz Kowalczyk da85164bc4 anki: update from 2.0.28 to 2.0.29
cc @the-kenny
2014-09-30 11:19:53 +01:00
wyvie d4b7910f80 Added more lua modules to lua-packages, added them as dependencies for
mudlet

Closes #4269
2014-09-30 07:42:19 +01:00
Eelco Dolstra 6843fc41c9 Fix evaluation 2014-09-30 00:51:00 +02:00
Moritz Ulrich 50d37f736d OpenTTD: Update to 1.4.3. 2014-09-25 13:53:49 +02:00
Eelco Dolstra 91fa55e702 Remove references to <nixpkgs>
Nixpkgs should not use <nixpkgs> to refer to itself, because $NIX_PATH
might not be set or not point to the same Nixpkgs. It's also
unnecessary.
2014-09-23 15:48:15 +02:00
Domen Kožar 6e8056ada9 further improvements to buildLuaPackage 2014-09-23 13:56:46 +02:00
wyvie e6eb51496b Added luaPackages, moved lua sockets and lua filesystem to luaPackages, fixed mudlet deps 2014-09-23 13:56:45 +02:00
Mateusz Kowalczyk 7fefb6f5c3 tibia: update to 10.55 2014-09-22 23:16:37 +01:00
William A. Kennington III 31220480d8 boost: Update depdendent packages 2014-09-21 17:20:59 -07:00
William A. Kennington III f327e9c922 boostHeaders: regular boost package now only contains headers 2014-09-21 15:18:16 -07:00
lostdj a54eb8d8b2 ue4demos: new package
Closes #4082
2014-09-21 01:19:00 +01:00
wyvie a3effead90 Added myself as maintainer 2014-09-21 00:45:31 +01:00
wyvie c891dd2719 new package: mudlet-3.0
Closes #4095
2014-09-21 00:45:31 +01:00
Moritz Ulrich 7f7505c620 dwarf-fortress: Bump to 0.40.13. 2014-09-18 20:41:54 +02:00
Pascal Wittmann 8d67b9a240 transformed meta.maintainers of some packages into lists 2014-09-13 13:52:02 +02:00
Pascal Wittmann 95b4d2af94 Merge pull request #3934 from MP2E/chocolate-doom
chocolateDoom and chocolateDoomMaster added
2014-09-09 12:16:18 +02:00
Cray Elliott d2270f8d79 Fix chocolateDoom and chocolateDoomMaster descriptions 2014-09-08 22:11:40 -07:00
Pascal Wittmann 2d9956114d gtypist: update from 2.9.4 to 2.9.5 and fix typefortune
also adopted it and set platforms to linux
2014-09-08 17:37:16 +02:00
Eelco Dolstra 585983bc95 Merge remote-tracking branch 'origin/staging'
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
2014-09-08 11:42:09 +02:00
Pascal Wittmann 4537c1ab25 Merge pull request #3935 from MP2E/eternity-engine
Add eternity and eternityMaster, a Doom port by James Haley
2014-09-07 15:26:11 +02:00
Cray Elliott eb7dbf9067 Remove eternityMaster 2014-09-06 16:18:35 -07:00
Vladimír Čunát 06fea81c6e Merge recent master into staging
Hydra: ?compare=1150594
2014-09-06 16:52:45 +02:00