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

487 commits

Author SHA1 Message Date
Vladimír Čunát b770365574 ReRevert Merge x-updates into master 
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
 2013-05-29 23:25:02 +02:00
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
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
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
Lluís Batlle i Rossell 78827836cc openlierox: fixing and updating. 2013-04-06 12:09:18 +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
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
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 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
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