philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

619 commits

Author SHA1 Message Date
Vladimír Čunát 9443129b08 Merge master into stdenv-updates 
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
 2014-01-04 18:34:53 +01:00
Michael Raskin fd19376d26 Merge pull request #1441 from rszibele/xonotic 
xonotic: compile the glx version and add a symlink to default to the sdl version.
 2014-01-02 07:50:35 -08:00
rszibele 40f4c5dcad Added Nexuiz-2.5.2. 2014-01-01 17:59:42 +01:00
rszibele 5cc98b77cd xonotic: compile the glx version and add a symlink to default to the sdl 
version.
 2014-01-01 17:47:32 +01:00
Vladimír Čunát e740b565cf Merge master into stdenv-updates 
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
 2013-12-29 10:01:22 +01:00
Evgeny Egorochkin ae4ded3a5c warmux: forgot to add the patch 2013-12-21 07:10:59 +02:00
Nixpkgs Monitor e65ce68bdf klavaro: update from 1.9.5 to 2.00 2013-12-21 02:28:28 +02:00
Evgeny Egorochkin 0ee8be3a19 warmux: fix build 2013-12-21 02:28:24 +02:00
Peter Simons b40393438e LambdaHack: jailbreak to fix build with recent versions of hashable and pretty-show 2013-12-19 18:17:03 +01:00
Nixpkgs Monitor 46d3388196 gemrb: update from 0.6.1 to 0.8.0.1 2013-12-18 18:18:28 +02:00
Nixpkgs Monitor 113a5782a3 d2x_rebirth: update from 0.57.3 to 0.58.1 2013-12-18 18:18:24 +02:00
Nixpkgs Monitor 362f26dec7 d1x_rebirth: update from 0.57.3 to 0.58.1 2013-12-18 18:18:24 +02:00
Nixpkgs Monitor c0a0c0b38e atanks: update from 4.7 to 4.9 2013-12-18 18:18:17 +02:00
Peter Simons 45e8de9a7d Merge branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/tools/misc/less/default.nix
 2013-12-16 21:13:24 +01:00
Peter Simons 001776428e haskell-LambdaHack: update to version 0.2.10.6 2013-12-15 22:37:42 +01:00
Nixpkgs Monitor efb58e101a bzflag: update from 2.0.16 to 2.4.2 2013-12-15 11:25:57 +02:00
Peter Simons e185d0603a haskell-LambdaHack: update to version 0.2.10.5 2013-12-14 15:19:29 +01:00
Nixpkgs Monitor 1937d84203 anki: update from 2.0.18 to 2.0.20 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-12-13 22:53:35 +01:00
Petr Rockai c592783741 stepmania: A dance (rhythm) game in the spirit of DDR. 2013-12-13 20:56:36 +02:00
Michael Raskin 9e329b9fd1 Fix a minor bug in fsg 2013-12-11 16:37:08 +04:00
Peter Simons 486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/tools/networking/p2p/amule/default.nix
 2013-12-10 00:25:54 +01:00
Nixpkgs Monitor a9ce83467e springLobby: update from 0.176 to 0.180 2013-12-09 10:58:16 +02:00
Moritz Ulrich 7bd64d6c1f anki: update from 2.0.12 to 2.0.18 2013-12-09 00:24:10 +00:00
Lluís Batlle i Rossell e12695ba85 Fixing ultrastardx linking with lua. 
Now it fails to start to me, due to some alsa problems.
 2013-12-07 12:24:34 +01:00
Lluís Batlle i Rossell a520b9cfa0 Fix the ultrastardx makefile (the hard way). 2013-12-07 00:07:34 +01:00
Moritz Ulrich fc9772a270 openttd: update from 1.3.2 to 1.3.3 2013-12-05 16:21:28 +00:00
Peter Simons c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
 2013-12-04 18:33:52 +01:00
Evgeny Egorochkin 7b68782e8f spring: add some of the missing dependencies 2013-12-04 05:24:22 +02:00
Nixpkgs Monitor ae7be783a2 torcs: update from 1.3.2 to 1.3.5, potentially fixes CVE-2012-1189 2013-12-04 04:49:13 +02:00
Evgeny Egorochkin 42a5c9d637 spring-lobby: add extra dependencies 2013-12-04 04:25:05 +02:00
Nixpkgs Monitor 29c3424c13 springLobby: update from 0.169 to 0.176 2013-12-04 03:57:15 +02:00
Nixpkgs Monitor d2799c1633 spring: update from 94.1 to 95.0 2013-12-04 03:54:34 +02:00
Peter Simons 8baecad9f9 haskell-LambdaHack: update to version 0.2.10 2013-12-02 16:26:24 +01:00
Jason "Don" O'Conal d4789829fa tintin: add expression 2013-11-29 08:22:57 +00:00
Michael Raskin a8048382e5 Update GNU Chess 2013-11-25 10:59:37 +04:00
Michael Raskin 87eac0321e Merge pull request #1236 from lovek323/sdlmame 
sdlmame: update to latest version
 2013-11-22 23:24:35 -08:00
Rommel M. Martinez 794afb0c78 Update xonotic to 0.7. 
Add scheme48 1.9.
 2013-11-21 09:41:01 +01:00
Jason "Don" O'Conal 774a0b4a00 sdlmame: update to latest version 2013-11-11 00:44:11 +00:00
Eelco Dolstra c88055e1a2 Set meta.hydraPlatforms instead of meta.platforms for some packages 2013-11-05 00:06:10 +01:00
Eelco Dolstra a0e21fd1ca Mark more packages as broken 2013-11-04 21:11:00 +01:00
Mathijs Kwik 609f8dc04b Merge branch 'master' into stdenv-updates 
Conflicts:
	pkgs/top-level/all-packages.nix
 2013-11-01 08:31:54 +01:00
Michael Raskin 4ae50cbc1d Adding upstream tracker for quantum minigolf 2013-10-29 10:56:54 +04:00
Michael Raskin 3022fff7db Adding Quantum Minigolf game 2013-10-28 00:09:46 +04:00
Peter Simons 3d5edb453f sdlmame: fixed trivial typo 2013-10-27 12:34:30 +01:00
Peter Simons 3618e03be9 dwarf-therapist: disable Hydra builds because of unfree dwarf-fortress dependency 2013-10-27 12:32:42 +01:00
Peter Simons 91f2c362de Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/top-level/all-packages.nix
 2013-10-26 18:28:05 +02:00
Arvin Moezzi 9176ad1808 package residualvm 0.1.1 
ResidualVM is an interpreter for LucasArts' Lua-based 3D adventure
games like Grim Fandango.

From: #1118.
 2013-10-26 12:48:08 +03:00
Evgeny Egorochkin 23d3c30f55 alienarena: update to 7.65, fix build. 
Close #1095.
 2013-10-24 12:10:43 +03:00
Bjørn Forsman 0a4d53cc5e flightgear: add .desktop file 2013-10-21 22:47:18 +02:00
Evgeny Egorochkin dc70f31484 sauerbraten: SVN repository has moved 2013-10-21 21:30:14 +03:00