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
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
Eelco Dolstra
4adad458e7
Remove the "proprietary" license
...
We already had "unfree".
2013-04-12 14:37:50 +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
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
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
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
