3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

697 commits

Author SHA1 Message Date
aszlig 1aa68dd29f
uqm: Include optional support for 3DO videos.
This is optional because you have to have an image of a Star Control II 3DO CD
image. I decided to hack together a small OperaFS (that's the proprietary
filesystem used with 3DO CD-ROMs) file extractor, which should possibly make
it as painless as possible to include those videos.

It may be a good idea to split off the haskell package into another attribute
set (possibly haskellPackages?), but I really don't think there is a need for
that, because it's really just UQM and 3DO specific.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-05-16 21:03:07 +02:00
Peter Simons 3b2254a3af Remove myself from the meta.maintainer field of most Haskell packages.
There is no point in receiving hundreds of e-mails; I cannot read them anyway.
2013-05-11 00:36:59 +02:00
Vladimír Čunát ec3965d8d0 Revert Merge x-updates into master due to mesa bloat
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Vladimír Čunát 1278859d31 Merge branch 'master' into x-updates
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
2013-05-08 13:46:46 +02:00
Michael Raskin 0c020c98f9 Updates: Wine, SBCL, XBoard 2013-05-08 10:52:47 +04:00
Shea Levy fde3526e7d Merge branch 'master' into stdenv-updates
Conflict in kerberos, which was updated both in master and in
stdenv-updates. Kept the stdenv-updates version, except pulled in the
enableParallelBuilding change from master.

Signed-off-by: Shea Levy <shea@shealevy.com>

Conflicts:
	pkgs/development/libraries/kerberos/krb5.nix
2013-05-04 18:28:48 -04:00
Eelco Dolstra 14169da6f5 vdrift: Remove from the channel
It's 564 MiB compressed.
2013-05-02 13:26:15 +02:00
Eelco Dolstra 7846ad9a90 alienarena: Remove from the channel
387 MiB compressed, 898 uncompressed.
2013-05-02 13:26:01 +02:00
Eelco Dolstra 40cd4a8a9d xonotic: Remove from the channel
It's 878 MiB compressed.
2013-05-02 13:25:57 +02:00
Eelco Dolstra a1bc05bb55 ufoai: Remove from the channel
It's 898 MiB compressed.
2013-05-02 13:25:52 +02:00
Eelco Dolstra 35e8764a2e speed-dreams: Remove from the channel
At 758 MiB compressed it's really too big for the channel.
2013-05-02 13:25:44 +02:00
Vladimír Čunát bde20f3e88 Merge branch 'master' into x-updates
Conflicts (just taken x-updates):
	pkgs/servers/x11/xorg/overrides.nix
2013-04-24 06:29:09 +00:00
Michael Raskin b98ece6bc2 Auto-update some packages; no early build failures (SBCL and Wine not yet fully built) 2013-04-23 09:15:48 +04:00
Peter Simons 4914e63a89 Merge changes from branch 'master' into stdenv-updates.
Conflicts:
	pkgs/development/libraries/icu/default.nix
	pkgs/tools/misc/coreutils/default.nix
2013-04-19 11:48:11 +02:00
Vladimír Čunát 17ae1617dc Merge branch 'master' into x-updates
Conflicts (systemd version is split on x-updates):
	pkgs/os-specific/linux/systemd/default.nix
2013-04-13 12:21:31 +02:00
Eelco Dolstra 4adad458e7 Remove the "proprietary" license
We already had "unfree".
2013-04-12 14:37:50 +02:00
Vladimír Čunát 8249695b61 Merge branch 'master' into x-updates
Needed that to fix the tarball.
2013-04-11 23:31:33 +02:00
Peter Simons 022f120a2c Merge branch 'master' into stdenv-updates. 2013-04-07 23:37:12 +02:00
Lluís Batlle i Rossell 78827836cc openlierox: fixing and updating. 2013-04-06 12:09:18 +02:00
Peter Simons c7dee1a5a5 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-04-06 10:33:50 +02:00
Lluís Batlle i Rossell 04d41f95d0 Adding d2x-rebirth, source port of the Descent 2 engine 2013-04-05 22:59:20 +02:00
Lluís Batlle i Rossell 65c008f653 Adding d1x-rebirth, Descent 1 source port. 2013-04-05 22:59:20 +02:00
Peter Simons 9f4d510b6b Merge branch 'master' into stdenv-updates. 2013-04-05 11:23:38 +02:00
Lluís Batlle i Rossell 3db052eb7a dhewm3: linking with mesa (for non-nvidia cards)
It was just doing a dlopen(libGL), so mesa wasn't in the rpath.
Now it is.
2013-04-04 23:07:23 +02:00
Lluís Batlle i Rossell bbbedf56c6 dhewm3: adding enableParallelBuilding 2013-04-04 23:07:23 +02:00
Vladimír Čunát eb2e46aab2 Merge branch 'master' into x-updates
Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix
2013-04-04 21:43:40 +02:00
Carles Pagès 1717b494bf dhewm3: add mesa to build inputs
I also removed an unused line I left over in previous commits.
2013-04-02 22:52:50 +02:00
Carles Pagès 8f2662d480 dhewm3: add current master from github
This is a port of the Doom 3 source code released under GPL. Amongst others,
this makes use of SDL to be multiplatform, and supports amd64.
2013-04-02 22:28:30 +02:00
Peter Simons 64f600a010 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-04-01 13:39:57 +02:00
Domen Kozar e58521d5dc anki: set platforms 2013-03-31 20:56:18 +02:00
Domen Kozar c72ac21c55 springlobby: bump to 0.169 2013-03-30 20:05:13 +01:00
Domen Kozar 6026c60388 spring: bump and fix build 2013-03-29 16:43:48 +01:00
Peter Simons 0823aea0a6 Merge branch 'master' into stdenv-updates.
Conflicts:
	pkgs/development/libraries/libxslt/default.nix

Commit 1764ea2b0a introduced changes to libxslt
in an awkward way to avoid re-builds on Linux. This patch has been simplified
during this merge.
2013-03-25 13:43:45 +01:00
Peter Simons 6fc2cccfe6 Add myself as a maintainer to all Haskell packages (re-)generated by hackage4nix. 2013-03-23 15:58:14 +01:00
Mathijs Kwik ebf71f78ef gtypist: fix patch hash 2013-03-22 00:00:05 +01:00
Michael Raskin a24da89252 Update/fix SGT puzzles 2013-03-21 17:35:18 +04:00
Peter Simons bcfe0ef394 blobby: update to 2.0rc3 (which is called 1.0rc3 on the server for some reason) 2013-03-21 10:28:09 +01:00
Peter Simons fc17617867 blobby: update to 2.0rc3 (which is called 1.0rc3 on the server for some reason) 2013-03-21 10:26:02 +01:00
Peter Simons 9c893c7931 blobby: merge changes from master into stdenv-updates 2013-03-21 10:13:06 +01:00
Vladimír Čunát 6c21cde68d blobby: minor update, making it build 2013-03-17 21:14:33 +01:00
Vladimír Čunát c3cefc669c asc: fix build for gcc47 2013-03-17 12:02:55 +01:00
Vladimír Čunát 03ba2960a4 vdrift: update and fix
Tested on two laps :-)
2013-03-09 14:59:39 +01:00
Александр Цамутали 63256d0834 games/unvanquished: Update to 0.13.1. 2013-03-08 20:58:48 +04:00
Eelco Dolstra 674c51af3c Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
Michael Raskin f251f8b91a XBoard: update to version 4.7.0 2013-03-07 10:58:25 +04:00
Sander van der Burg 9455f23d22 eduke32: Bumped to rev 3542 - very important 2013-03-03 19:34:59 +01:00
Vladimír Čunát d505b8c490 freedink: update and fix 2013-02-28 16:34:19 +01:00
Peter Simons 5f32207dfc Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-24 19:27:08 +01:00
Александр Цамутали 7d5056f8a3 games/unvanquished: New nixpkg. 2013-02-24 18:02:53 +04:00
Vladimír Čunát 82a0df8bad flightgear: fix build via update; but no testing, hope it works 2013-02-23 20:32:12 +01:00
Shea Levy c42d77aa35 Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-02-17 08:19:40 -05:00
Александр Цамутали 1921086ffa urbanterror: Correction for previous commit. 2013-02-16 21:52:36 +04:00
Александр Цамутали bcc14b65c3 urbanterror: Update to 4.2.009. 2013-02-16 21:43:34 +04:00
Eelco Dolstra 2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Александр Цамутали 4cb80bdb1e warsow: Fix for ui module downloaded from server. 2013-02-12 01:02:19 +04:00
Vladimír Čunát 712af3a70f Merge pull request #243 from RSzibele/minetest-0.4.4
add minetest-0.4.4.
2013-02-10 03:08:40 -08:00
Александр Цамутали 9bd4d4e8a4 warsow: Update to 1.03. 2013-02-07 03:37:50 +04:00
Vladimír Čunát c95cbc12cb wesnoth: fix by updating and using newer boost 2013-02-05 19:40:06 +01:00
Vladimír Čunát ed699d1c17 simutrans: pass meta into the final package so it's built by hydra 2013-02-02 16:44:42 +01:00
Vladimír Čunát 602e6a94ee simutrans: fix, update, split data, make pak128 the default
Today the monitor resolutions are quite high, so I set pak128 as the default.
It's easy to change.
2013-02-02 12:38:15 +01:00
Eelco Dolstra 8317cd1f14 kde-3: Remove
KDE 3 hasn't built in a long time.  Also remove six, the only package
with a dependency on KDE 3.
2013-01-29 12:43:53 +01:00
Aristid Breitkreuz d596180cf8 use alsa-oss layer for minecraft 2013-01-28 02:58:47 +01:00
viric 0a8f2e084f Merge pull request #260 from jcumming/vessel.121213
Vessel.121213
2013-01-27 12:38:08 -08:00
Vladimír Čunát 46dd0485f5 Update ufoai to 2.4, clean dependencies and the expression. 2013-01-26 23:36:42 +01:00
Rickard Nilsson 1886d1db6a Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-01-20 16:53:21 +01:00
Aristid Breitkreuz d674d9cf9b update minecraft recipe 2013-01-18 02:01:08 +01:00
Eelco Dolstra 0db6ea6f76 Remove some oversized packages from the channel
E.g. urbanterror takes up 2x720 MiB.
2013-01-17 22:34:08 +01:00
Eelco Dolstra 5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Eelco Dolstra 7fd42a8380 Get rid of the "sf" alias for "sourceforge" 2013-01-14 12:00:32 +01:00
Peter Simons b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
Lluís Batlle i Rossell ce705aa998 supertuxkart: updating to 0.8 2013-01-10 20:55:46 +01:00
Lluís Batlle i Rossell 7e1d0c12a3 stuntrally: updating from 1.4 to 1.8
I updated ogre and mygui, too. Now myguiSvn is older than mygui.
We should check if this commit breaks other games that use ogre (ror?)
2013-01-10 15:11:12 +01:00
Florian Friesdorf 0d3ad0d786 bsd-games: fix some paths, pager and typo 2013-01-09 06:53:44 +01:00
Peter Simons 9e9cd7b529 Merge branch 'master' into stdenv-updates. 2013-01-04 21:00:53 +01:00
RSzibele 894de031cd Added Minetest-0.4.4. 2013-01-04 11:39:11 +01:00
Jan Malakhovski e00c03101f anki: add version 2.0.3 2013-01-04 03:48:47 +00:00
Eelco Dolstra ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra 5be0a9acd7 Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
2012-12-28 19:08:19 +01:00
Jack Cummings 69b752de57 patchelf the libraries: they need rpath set for sound to work 2012-12-27 18:42:40 -08:00
Jack Cummings 36e946c34f Need pulseaudio or alsalibs for sound. 2012-12-18 00:07:24 -08:00
Jack Cummings d1254fa27e add Vessel, a fluid physics puzzle game. 2012-12-16 23:24:31 -08:00
aszlig 5054e8ec29
scid: New package, version 4.3.
Just saw Michael Raskin's GNU Chess and XBoard updates and did a short check if
Scid is already in nixpkgs. It wasn't, so I decided to add it, so thanks to
@7c6f434c :-)

The package involves a lot of patching, as usual with Tcl/Tk on NixOS. In this
case the program is written in C++ and embeds the Tcl/Wish interpreter.

Unfortunately this doesn't make it easier to inject TCLLIBPATH, as there doesn't
seem to be a direct library call (well in theory you could `lappend TCLLIBPATH`,
but that won't help with TK_LIBRARY).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:20 +01:00
Peter Simons de81ec924b haskell-LambdaHack: update to version 0.2.6.5 2012-12-12 11:54:27 +01:00
Michael Raskin 498f2e7c20 GNU Chess: update to 6.0.2 2012-12-12 09:36:14 +04:00
Michael Raskin 232fedb1c7 XBoard: update to 4.6.2 2012-12-12 09:29:49 +04:00
Michael Raskin d3e5b8feee Fix dummy pseudo-updates being found for some packages 2012-12-08 13:05:43 +04:00
Michael Raskin 138e9e0212 Oops. Fix LincityNG source search 2012-12-04 17:09:31 +04:00
Michael Raskin 680ca19789 Xmoto: remove obsolete patch 2012-12-04 14:50:50 +04:00
Michael Raskin 8976915c6d Update xmoto 2012-12-04 10:09:18 +04:00
Michael Raskin 0918928cdb Currently advertised Lincity-NG download URL 2012-12-04 09:59:09 +04:00
Michael Raskin e9c35e9381 Add Pingus 2012-12-02 00:23:28 +04:00
Alexander Tsamutali bfa2cbe55e games/warsow: Updated to 1.02. 2012-12-01 02:27:47 +03:00
Michael Raskin 702590f6c6 Add Lincity-NG fork 2012-11-30 22:59:26 +04:00
Eelco Dolstra 5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Jack Cummings 6540190179 World of Goo 1.41. 2012-11-28 14:38:46 -08:00
Peter Simons 2a7cda22f8 haskell-LambdaHack: update to version 0.2.6 2012-11-26 15:32:19 +01:00
Florian Friesdorf d66fa56de2 xsokoban: fix for colliding getline in score.c 2012-11-26 15:24:33 +01:00
Florian Friesdorf 7ac03301a7 xsokoban scorefile in current directory 2012-11-26 15:24:33 +01:00
Florian Friesdorf 39cb204797 zoom-1.1.5 - also adjust name 2012-11-26 14:43:28 +01:00
Florian Friesdorf ed45707278 zoom-1.1.5 2012-11-26 14:32:03 +01:00
Florian Friesdorf 7d717444e5 zdoom 2.6.1 (instead of svn) 2012-11-26 14:32:03 +01:00
Michael Raskin 4c5c8ba08e TBE: fix unneeded /bin/sh reference 2012-11-10 15:14:28 +04:00
Michael Raskin 66164a941b FSG: Fix unneeded /bin/sh reference 2012-11-10 15:09:42 +04:00
Joachim Schiele 49f2fef481 updated spring from 88 to 91 and downgraded the boost library which spring uses from default to 1.49 as the
more recent boost version results in a build issue at about 30%
2012-10-28 13:43:15 +00:00
Michael Raskin 3d2e43df37 Update sgt-puzzles 2012-10-18 00:21:42 +04:00
Jack Cummings 66e43a5297 - Make rili work with new autoconf versions 2012-10-05 13:56:51 -07:00
Jack Cummings 18d4a832b0 - clean up openttd, rili, uqm, and widelands descriptions 2012-10-05 09:36:36 -07:00
Jack Cummings 27ec277359 - add myself as a maintainer for the packages I've added 2012-10-04 23:39:00 -07:00
Jack Cummings 22ece175a0 - openttd 1.2.2, rili 2.0.1, widelands-build17, uqm-0.7.0 2012-10-04 23:32:34 -07:00
Александр Цамутали 400db72f1d games/warsow: Updated to 1.0. 2012-09-24 02:27:34 +04:00
Eelco Dolstra e6077fbc46 Remove getConfig helper function
An expression like ‘getConfig [ "cabal" "libraryProfiling" ] false’
can be written more concisely as ‘config.cabal.libraryProfiling or false’.
2012-09-19 13:56:56 -04:00
Michael Raskin fdf82b66e7 Falling Sand Game: use a mirror 2012-09-01 10:27:41 +04:00
Carles Pagès 389a76c085 minecraft: update to 1.3.1 2012-08-09 23:39:57 +02:00
Carles Pagès 0b85d04d9e kobodeluxe: fix compilation errors.
The glibc29 patch was taken from Gentoo.
2012-07-12 23:42:20 +02:00
Lluís Batlle i Rossell aab4bec314 ufoai: fixing the build. Building with libpng12. 2012-07-02 21:53:03 +02:00
Lluís Batlle i Rossell bda2b3ca5a blackshadeselite: fix build in gcc 4.6
I simply added '-fpermissive', and it went on.
2012-07-02 21:40:14 +02:00
Lluís Batlle i Rossell c43a18b8ec speed dreams: fixing build (libpng order in buildInputs)
I forgot committing this in my previous commit for speed dreams.
2012-07-02 20:40:16 +02:00
Peter Simons 8db6c55944 klavaro: add version 1.9.5
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
2012-07-02 17:13:36 +02:00
Joachim Schiele 424c24d4fc updated to a new version
svn path=/nixpkgs/trunk/; revision=33964
2012-05-01 12:40:57 +00:00
Shea Levy 23506543a4 Add minecraft
Patch by Carles Pagès, minor modification (adding in version number, updating
sha256) by me

svn path=/nixpkgs/trunk/; revision=33944
2012-04-29 14:09:58 +00:00
Karn Kallio 75692dfc1e Remove some commented out instructions.
svn path=/nixpkgs/trunk/; revision=33881
2012-04-22 18:56:30 +00:00
Karn Kallio e81f9de121 Advance wesnoth version to 1.10.2; fixes old version failing build.
svn path=/nixpkgs/trunk/; revision=33874
2012-04-22 05:31:22 +00:00
Peter Simons e4509bda5d blobby: fixed typo
svn path=/nixpkgs/trunk/; revision=33814
2012-04-17 13:56:38 +00:00
Peter Simons 39c9ece183 wxGTK-2.9: updated the development version of wxGTK to 2.9.3
I deleted older snapshots because my attempts to use 2.9.0 or 2.9.1 ran into
problems with our recent version of libpng. The 2.9.3 version seems to work
fine, though. If you still need the older versions, please feel free to
reinstate them.

svn path=/nixpkgs/trunk/; revision=33812
2012-04-17 13:56:30 +00:00
Michael Raskin f699257450 Adding blobby volleybal
svn path=/nixpkgs/trunk/; revision=33810
2012-04-17 13:06:12 +00:00
Nicolas Pierron 6a9ac1f016 Add opentyrian game.
svn path=/nixpkgs/trunk/; revision=33797
2012-04-15 23:38:38 +00:00
Alexander Tsamutali a9c51d7af3 games/urbanterror: Fixed compilation issue, but it still doesn't work.
svn path=/nixpkgs/trunk/; revision=33795
2012-04-15 22:33:36 +00:00
Yury G. Kudryashov defd86049c Merge ^/nixpkgs/trunk.
This merge leads to a big rebuild, but this wouldn't hurt as I'm going to
reintegrate this branch soon.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33455
2012-03-28 15:42:42 +00:00
Joachim Schiele 194c822cce version 88.0 of spring has arrived
svn path=/nixpkgs/trunk/; revision=33438
2012-03-27 11:07:53 +00:00
Peter Simons 6b0f1dab5c Updated Haskell packages.
- LambdaHack: updated to version 0.2.1
 - OpenAL: updated to version 1.4.0.1
 - cabal2nix: updated to version 1.29
 - unbound: updated to version 0.4.0.1

svn path=/nixpkgs/trunk/; revision=33394
2012-03-24 10:21:48 +00:00
Peter Simons 880dcc2c64 Removed myself as a maintainer from Haskell packages that I don't personally use.
By now, it happened twice that a commit broke GHC and thus all Haskell packages
we have in Nixpkgs. On such an occasion, I receive well in excess of 3000
notification e-mails from Hydra, and then I receive another 3000 e-mails after
the bug has been fixed. Under these circumstances, subscribing to these
notifications makes no sense for me.

svn path=/nixpkgs/trunk/; revision=33392
2012-03-24 10:21:28 +00:00
Michael Raskin 5087016ee1 Updating and fixing sgtpuzzles.
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33369
2012-03-23 07:09:48 +00:00
Mathijs Kwik 54a5f7f328 gtypist, typing tutor
Now all I need is time to practise :)

svn path=/nixpkgs/trunk/; revision=33228
2012-03-18 08:11:17 +00:00
Yury G. Kudryashov f94501bfa2 Remove tuxracer
"tuxracer = ..." string was commented for 3 years.

svn path=/nixpkgs/trunk/; revision=33206
2012-03-17 17:20:34 +00:00
Yury G. Kudryashov 03875e0bce Make nixpkgs ready to gtkLibs attrset removal
svn path=/nixpkgs/trunk/; revision=33091
2012-03-14 22:44:41 +00:00
Lluís Batlle i Rossell 59d6b60e46 We don't have mesa for freebsd, so don't tell hydra to build xmoto for freebsd.
svn path=/nixpkgs/trunk/; revision=33050
2012-03-13 21:48:12 +00:00
Joachim Schiele bdcce09b46 seems i forgot to change some things...
svn path=/nixpkgs/trunk/; revision=33025
2012-03-12 21:28:51 +00:00
Joachim Schiele 5b6856ff52 new version of spring is there
svn path=/nixpkgs/trunk/; revision=33019
2012-03-12 15:11:37 +00:00
Joachim Schiele ac9f3a50a2 package won't build on the current nixos/nixpkgs (but it did with older checkouts on my other computer). so here is a fix which makes springlobby compile and install at least
svn path=/nixpkgs/trunk/; revision=32937
2012-03-09 00:59:13 +00:00
Joachim Schiele dfbde3db02 updated springlobby to 141 and changed the name of the package
svn path=/nixpkgs/trunk/; revision=32896
2012-03-08 15:32:20 +00:00
Joachim Schiele 0d6be026c3 changing the name from spring-lobby to springlobby
svn path=/nixpkgs/trunk/; revision=32895
2012-03-08 15:30:08 +00:00
Lluís Batlle i Rossell 18ddc5f25c A little patch to gav, and it does not require gcc 4.1 anymore.
svn path=/nixpkgs/trunk/; revision=32863
2012-03-07 22:04:53 +00:00
Yury G. Kudryashov 57fd764a39 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
2012-03-05 10:00:23 +00:00
Joachim Schiele 3fc8538884 soon to come version of spring (not live yet but at least it builds compared to the former version in nixos)
svn path=/nixpkgs/trunk/; revision=32733
2012-03-01 23:14:14 +00:00
Yury G. Kudryashov 0210e20b5a svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
2012-03-01 07:04:39 +00:00
Evgeny Egorochkin 287f1f0f65 spring-lobby: bump version to 0.139
svn path=/nixpkgs/trunk/; revision=32697
2012-02-29 14:29:49 +00:00
Lluís Batlle i Rossell 1ad3da0ca8 Taking back 32635. An older Rigs of Rods does not work better. Same throttle issues. Let's keep with 0.39.4.
svn path=/nixpkgs/trunk/; revision=32685
2012-02-28 23:01:25 +00:00
Lluís Batlle i Rossell 11aceede25 Downgrading rigsofrods to a version that might work, where cars may run fast.
This rev should be very close to the stablest 0.38.

I had to bring an old angelscript in.


svn path=/nixpkgs/trunk/; revision=32635
2012-02-27 22:39:23 +00:00
Shea Levy ea195b2507 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
2012-02-25 19:57:34 +00:00
Lluís Batlle i Rossell f25daaaf3d Rigs of rods was built without optimisations. Setting the cmake build type to
release.

I think that should be done at the cmake setup hook, and win that for all
possible cmake packages that are built by default without optimisation flags.
Which is the cmake default behaviour if not overriden.


svn path=/nixpkgs/trunk/; revision=32561
2012-02-25 18:29:30 +00:00
Lluís Batlle i Rossell 6f7cb59e04 Making rigs of rods build and run right away. Simpyl run 'rorconfig' first, and
'RoR' then. On linux, disable Caleum rendering. It does not work. Known bug
upstream.


svn path=/nixpkgs/trunk/; revision=32553
2012-02-24 22:56:53 +00:00
Lluís Batlle i Rossell ded053529f A patch required for RoR I just forgot.
svn path=/nixpkgs/trunk/; revision=32551
2012-02-24 22:09:07 +00:00
Lluís Batlle i Rossell d3d5783466 Updating and fixing rigsofrods, to 0.39.4. Pay attention to the last 'echo' of installPhase.
svn path=/nixpkgs/trunk/; revision=32550
2012-02-24 22:05:47 +00:00
Eelco Dolstra e64443baf1 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32468
2012-02-21 23:29:21 +00:00
Shea Levy 9a6cf14ef1 Fix tarball
svn path=/nixpkgs/trunk/; revision=32432
2012-02-20 17:25:35 +00:00
Lluís Batlle i Rossell 1488d45699 Updating vdrift to 2011-10-22. There are newer source code files, but that's
the newsest src+data tarball I could find. We should write an expression that can use
the latest src with the latest data apart.


svn path=/nixpkgs/trunk/; revision=32423
2012-02-20 13:05:21 +00:00
Yury G. Kudryashov d8454e538c svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32417
2012-02-20 05:30:06 +00:00
Yury G. Kudryashov 23856c2a40 tbe needs which
svn path=/nixpkgs/trunk/; revision=32416
2012-02-20 05:28:06 +00:00
Peter Simons c96d4bd72e and yet it moves: gravity/physics game
Demo and commercial version are supported.

This nix expression shows some of the techniques used to package
closed-source binaries.

Committed on behalf of Mathijs Kwik.

svn path=/nixpkgs/trunk/; revision=32408
2012-02-19 21:36:54 +00:00
Lluís Batlle i Rossell 3b02e6f70d Updating super tux kart to 0.7.3. I also add the library irrlicht, the specific
version needed for super tux kart.


svn path=/nixpkgs/trunk/; revision=32399
2012-02-19 13:15:50 +00:00
Eelco Dolstra 60f8478fde * ioquake: fix building on GCC 4.6.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32383
2012-02-18 16:35:04 +00:00
Yury G. Kudryashov 79d0d410cb svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32350
2012-02-17 13:43:31 +00:00
Yury G. Kudryashov 1bf215f261 warmux-11.04.1, fix build with libpng-1.5
svn path=/nixpkgs/trunk/; revision=32333
2012-02-16 17:56:14 +00:00
Yury G. Kudryashov e5027e5b36 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
2012-02-16 15:02:26 +00:00
Peter Simons cb28766341 Re-generated Haskell package descriptions with the latest version of cabal2nix.
svn path=/nixpkgs/trunk/; revision=32327
2012-02-16 14:05:41 +00:00
Yury G. Kudryashov 9dbf57715a liquidwar: update (builds with libpng-1.5)
I removed update-upstream-info magick because it didn't work for new version.

svn path=/nixpkgs/trunk/; revision=32324
2012-02-16 12:22:05 +00:00
Peter Simons ac69747aa8 Regenerated all Haskell packages with the latest version of cabal2nix.
svn path=/nixpkgs/trunk/; revision=32292
2012-02-14 17:00:37 +00:00
Yury G. Kudryashov f7886ac78b svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32265
2012-02-13 19:47:36 +00:00
Yury G. Kudryashov 1c4a8d7e6d freeciv: add flags for clients and server
svn path=/nixpkgs/trunk/; revision=32263
2012-02-13 19:34:39 +00:00
Yury G. Kudryashov b13fd75b35 freeciv-2.3.1
svn path=/nixpkgs/trunk/; revision=32262
2012-02-13 19:34:35 +00:00
Lluís Batlle i Rossell 1a5c12c34c I made stuntrally work, thanks to adding the nvidia_cg_toolkit to ogre.
svn path=/nixpkgs/trunk/; revision=32257
2012-02-13 13:41:57 +00:00
Yury G. Kudryashov fc21cca549 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32231
2012-02-12 09:33:54 +00:00
Lluís Batlle i Rossell c2e5c08d72 Adding the game Bits&Bots
svn path=/nixpkgs/trunk/; revision=32227
2012-02-11 14:33:27 +00:00
Lluís Batlle i Rossell ff240c0150 Updating trigger rally
svn path=/nixpkgs/trunk/; revision=32223
2012-02-10 22:23:33 +00:00
Lluís Batlle i Rossell ed00bb14bb Adding a throw for stunt-rally; it does not work after build.
svn path=/nixpkgs/trunk/; revision=32221
2012-02-10 21:53:59 +00:00
Lluís Batlle i Rossell 1ad1d987e3 Adding stunt rally.
svn path=/nixpkgs/trunk/; revision=32217
2012-02-10 20:24:13 +00:00
Peter Simons c5617dc628 haskell-LambdaHack: updated to version 0.2.0
svn path=/nixpkgs/trunk/; revision=32214
2012-02-10 11:34:26 +00:00
Yury G. Kudryashov 215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Alexander Tsamutali 55e74d5e9a games/oilrush: New nixpkg.
svn path=/nixpkgs/trunk/; revision=31925
2012-01-29 22:44:49 +00:00
Yury G. Kudryashov 5b132f6e96 svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
Yury G. Kudryashov 72116657d4 torcs-1.3.2, builds with libpng-1.5
svn path=/nixpkgs/trunk/; revision=31844
2012-01-26 08:36:23 +00:00
Eelco Dolstra c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Yury G. Kudryashov 0c79434ccb svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31567
2012-01-14 21:34:37 +00:00
Yury G. Kudryashov c403364c06 xmoto-0.5.9+libpng-1.5 patch
svn path=/nixpkgs/trunk/; revision=31447
2012-01-08 23:31:31 +00:00
Yury G. Kudryashov 786a5c083f games/six: add meta.platforms to see if it compiles
svn path=/nixpkgs/trunk/; revision=31443
2012-01-08 20:58:04 +00:00
Yury G. Kudryashov 9ee0a9df9b svn merge ^/nixpkgs/trunk
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
2012-01-08 16:01:12 +00:00
Michael Raskin 55f39a3aff Stop using Esound
svn path=/nixpkgs/trunk/; revision=31428
2012-01-07 21:58:20 +00:00
Yury G. Kudryashov 900c6e18cd svn merge ^/nixpkgs/trunk
Conflicts: openssl, libplist

svn path=/nixpkgs/branches/stdenv-updates/; revision=31337
2012-01-06 01:07:45 +00:00
Florian Friesdorf d149922655 privateer compile succeeds, remove platform, still WIP
svn path=/nixpkgs/trunk/; revision=31312
2012-01-05 12:23:49 +00:00
Florian Friesdorf 68db88bbf8 wip: privateer
svn path=/nixpkgs/trunk/; revision=31305
2012-01-04 23:05:51 +00:00
Alexander Tsamutali 3b4451ade5 games/tremulous: Removed rust.
svn path=/nixpkgs/trunk/; revision=31282
2012-01-04 16:46:25 +00:00
Yury G. Kudryashov 2bca92e32d Merge trunk
Conflicts:
1. cmake upgrade: use 2.8.7
2. openssl: left FreeBSD-asm patch.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31245
2012-01-03 17:25:24 +00:00
Yury G. Kudryashov 5ca5a0242a naev-0.5.0
svn path=/nixpkgs/trunk/; revision=31214
2012-01-02 17:37:53 +00:00
Yury G. Kudryashov f77741e018 merge trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31067
2011-12-25 05:47:23 +00:00
Shea Levy f821677f67 beret: Store game status in home directory
svn path=/nixpkgs/trunk/; revision=31021
2011-12-21 18:18:15 +00:00
Shea Levy 0a93e74174 Add beret game
svn path=/nixpkgs/trunk/; revision=30954
2011-12-19 02:13:38 +00:00
Eelco Dolstra eda3fd1730 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
2011-12-12 16:54:35 +00:00
Eelco Dolstra 5de58eb387 * More oops.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30851
2011-12-12 16:52:03 +00:00
Eelco Dolstra 3db0fe3b94 * Oops.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30850
2011-12-12 16:51:09 +00:00
Eelco Dolstra 3ea1c30846 * Remove the NIX_STRIP_DEBUG flag. It was undocumented and confusing
in its interaction with the ‘dontStrip’ attribute.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30848
2011-12-12 14:02:12 +00:00
Peter Simons 0d7a0a502e spring: tell Hydra that it shouldn't attempt to build that package an Cygwin (fails with an assertion)
svn path=/nixpkgs/trunk/; revision=30834
2011-12-11 18:35:23 +00:00
Alexander Tsamutali 5598fcf36c games/warzone2100: Updated to 2.3.9.
svn path=/nixpkgs/trunk/; revision=30490
2011-11-20 17:10:54 +00:00
Alexander Tsamutali 20005b7f5d Reverting 30393.
svn path=/nixpkgs/trunk/; revision=30394
2011-11-12 17:11:25 +00:00
Alexander Tsamutali 4f3ffcd0ec development/compilers/nvidia-cg-toolkit: New nixbuild.
svn path=/nixpkgs/trunk/; revision=30393
2011-11-12 17:03:44 +00:00
Evgeny Egorochkin 0b322b9227 Spring: version bump
svn path=/nixpkgs/trunk/; revision=30392
2011-11-12 16:51:44 +00:00
Alexander Tsamutali 1b9adf9951 games/xonotic: New nixbuild.
svn path=/nixpkgs/trunk/; revision=30260
2011-11-06 13:54:03 +00:00
Alexander Tsamutali 10128798b5 games/teeworlds: Updated to 0.6.1, added myself as maintainer.
svn path=/nixpkgs/trunk/; revision=30259
2011-11-06 10:11:31 +00:00
Alexander Tsamutali c10a1a50b8 games/alienarena: New nixbuild.
svn path=/nixpkgs/trunk/; revision=29975
2011-10-22 21:04:29 +00:00
Russell O'Connor 7bb3f91731 updating dwarf-fortress
svn path=/nixpkgs/trunk/; revision=29853
2011-10-15 14:46:05 +00:00
Vladimír Čunát a6db3d5723 Fixing package naming in wesnoth broken by r27666
svn path=/nixpkgs/trunk/; revision=29794
2011-10-12 19:16:15 +00:00
Michael Raskin e413faa019 Update liquidWar
svn path=/nixpkgs/trunk/; revision=29621
2011-10-04 08:54:01 +00:00
Florian Friesdorf 7186978ce9 scummvm more deps
svn path=/nixpkgs/trunk/; revision=29447
2011-09-23 02:23:05 +00:00
Peter Simons a5bbfc5786 haskell-LambdaHack: updated to version 0.1.20110918
svn path=/nixpkgs/trunk/; revision=29353
2011-09-19 16:38:37 +00:00
Yury G. Kudryashov de2105b740 scorched3d: latest version, build against wxgtk-2.8
svn path=/nixpkgs/trunk/; revision=29341
2011-09-19 05:17:00 +00:00
Piotr Pietraszkiewicz 97efcfd4a4 made myself a maintainer of crack-attack + cosmetics (removed trailing whitespaces from the file)
svn path=/nixpkgs/trunk/; revision=29256
2011-09-13 20:49:45 +00:00
Michael Raskin c5e1345758 Update LiquidWar
svn path=/nixpkgs/trunk/; revision=28913
2011-08-30 05:26:39 +00:00
Nicolas Pierron 4c8bbfe81b Restrict freeciv to linux platforms.
svn path=/nixpkgs/trunk/; revision=28720
2011-08-21 15:36:25 +00:00
Nicolas Pierron 3e6f39239d Add game freeciv.
svn path=/nixpkgs/trunk/; revision=28711
2011-08-20 14:30:16 +00:00
Peter Simons 21b26aef25 Updated Haskell package meta sections.
svn path=/nixpkgs/trunk/; revision=28583
2011-08-15 11:27:02 +00:00
Peter Simons 468c5dbc5c The 'random' library is no longer a core library in GHC 7.2.1. For older
versions of the compiler, haskell-packages.nix provides a null attribute.

svn path=/nixpkgs/trunk/; revision=28500
2011-08-12 00:18:56 +00:00
Peter Simons 622a12a405 haskell-MazesOfMonad: updated to version 1.0.7
svn path=/nixpkgs/trunk/; revision=28484
2011-08-11 10:24:39 +00:00
Sander van der Burg bf5c3bb671 - libgcc_s seems to be needed after all
- eduke32 uses UNIX style options nowadays


svn path=/nixpkgs/trunk/; revision=27937
2011-07-25 11:43:27 +00:00
Sander van der Burg f0e799a492 Updated eduke32 to rev 1944
svn path=/nixpkgs/trunk/; revision=27936
2011-07-25 10:48:07 +00:00
Karn Kallio 9fbe9c9541 Repair Wesnoth build error and advance to version 1.8.6.
svn path=/nixpkgs/trunk/; revision=27666
2011-07-08 00:59:01 +00:00
Peter Simons ebefce41aa banner: a tool to print print large banners to ASCII terminals
svn path=/nixpkgs/trunk/; revision=27656
2011-07-07 22:19:52 +00:00
Lluís Batlle i Rossell 5acd48a0b0 Fixing the url of teeter torture.
svn path=/nixpkgs/trunk/; revision=27502
2011-06-20 09:11:54 +00:00
Lluís Batlle i Rossell 6074d7f112 Adding the videogame teeter torture.
svn path=/nixpkgs/trunk/; revision=27500
2011-06-19 22:25:52 +00:00
Lluís Batlle i Rossell 8571ea8fda Adding the videogame icbm3d
svn path=/nixpkgs/trunk/; revision=27499
2011-06-19 21:46:45 +00:00
Lluís Batlle i Rossell 746da25d6b Adding 3dpong.
svn path=/nixpkgs/trunk/; revision=27498
2011-06-19 21:33:31 +00:00
Lluís Batlle i Rossell cc1d27bf68 Adding the videogame Vectoroids.
svn path=/nixpkgs/trunk/; revision=27497
2011-06-19 21:07:35 +00:00
Michael Raskin 372aaf63e1 MediumBlue is currently too dark to be background for black checkmark, correct to Light
svn path=/nixpkgs/trunk/; revision=27340
2011-05-31 20:18:40 +00:00
Michael Raskin 168080d159 Fix for an annoying crash
svn path=/nixpkgs/trunk/; revision=27339
2011-05-31 19:34:06 +00:00
Michael Raskin 9f3e6006e8 Adding Xconq turn-based strategy
svn path=/nixpkgs/trunk/; revision=27306
2011-05-28 15:36:56 +00:00
Alexander Tsamutali a9de562ef1 games/mars: Updated source hash.
svn path=/nixpkgs/trunk/; revision=27254
2011-05-15 13:31:43 +00:00
Eelco Dolstra b1e93d013c * Get rid of those annoying "not an attrSet" trace messages.
svn path=/nixpkgs/trunk/; revision=27141
2011-05-04 12:43:31 +00:00
Alexander Tsamutali 4fc6fa03c5 games/warsow: Updated to 0.62.
svn path=/nixpkgs/trunk/; revision=27078
2011-05-01 23:26:51 +00:00
Lluís Batlle i Rossell c259379dc9 Getting mars to build. Somehow the fetchsvn in sfml_svn did not work anymore.
svn path=/nixpkgs/trunk/; revision=27037
2011-04-28 20:50:12 +00:00
Lluís Batlle i Rossell bebcbcde8c Adding the videogame Naev (beta version, because they label the non-beta 'deprecated')
svn path=/nixpkgs/trunk/; revision=27017
2011-04-27 21:57:27 +00:00
Lluís Batlle i Rossell d3dbf1bea4 Update mars.
svn path=/nixpkgs/trunk/; revision=27016
2011-04-27 21:23:14 +00:00
Alexander Tsamutali 617b1fc62e games/warsow: Updated to 0.61.
svn path=/nixpkgs/trunk/; revision=26946
2011-04-24 12:09:33 +00:00
Michael Raskin 18f74fcada Fix Widelands meta
svn path=/nixpkgs/trunk/; revision=26933
2011-04-23 13:00:38 +00:00
Michael Raskin eae5098af9 Adding Glest Advanced Engine 3D RTS
svn path=/nixpkgs/trunk/; revision=26917
2011-04-22 07:26:59 +00:00
Michael Raskin db48255b5e Using patch from Globulation2 bugtracker to fix crashes in tutorial
svn path=/nixpkgs/trunk/; revision=26897
2011-04-20 07:06:17 +00:00
Michael Raskin 451040c299 Adding globulation
svn path=/nixpkgs/trunk/; revision=26892
2011-04-19 16:02:29 +00:00
Michael Raskin c9f06b05c1 Add Widelands RTS
svn path=/nixpkgs/trunk/; revision=26869
2011-04-17 17:55:29 +00:00
Michael Raskin bf1e3d3f87 Update XMoto
svn path=/nixpkgs/trunk/; revision=26842
2011-04-14 11:16:05 +00:00
Michael Raskin 8a00dfcc18 Update teeworlds
svn path=/nixpkgs/trunk/; revision=26814
2011-04-13 05:47:51 +00:00
Michael Raskin 0526aaa8a2 Adding FlightGear
svn path=/nixpkgs/trunk/; revision=26770
2011-04-09 18:57:00 +00:00
Michael Raskin 15b3a08448 Install content pack
svn path=/nixpkgs/trunk/; revision=26767
2011-04-09 15:51:24 +00:00
Michael Raskin b2caa1ce67 Add myself to RoR maintainers
svn path=/nixpkgs/trunk/; revision=26755
2011-04-08 14:11:54 +00:00