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

774 commits

Author SHA1 Message Date
Michael Raskin de036bc10c Fix Xmoto build (missing include) 2014-01-29 14:42:26 +04:00
Petr Rockai 6f5be260b4 Adopt packages. 2014-01-28 17:31:17 +01:00
Shea Levy ca116f76f9 Unmaintain a bunch of packages 
Trying to take maintainership more seriously...

Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-21 22:34:41 -05:00
Vladimír Čunát 0a58b512cb Merge master into stdenv-updates 
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
 2014-01-18 14:46:20 +01:00
Moritz Ulrich a2b8ede2c7 FlightGear: Update to 2.12.1. 2014-01-15 21:36:34 +01:00
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
Michael Raskin d79b3e5998 Updating XBoard to 4.7.2 2013-10-20 21:08:25 +04:00
Lluís Batlle i Rossell 8818dbedbf Adding an attribute for the gtk freeciv too. 2013-10-20 18:26:57 +02:00
Lluís Batlle i Rossell 655ba1e418 freeciv: update to 2.4.0 2013-10-20 18:26:57 +02:00
Michael Raskin eb385aa109 Merge pull request #1050 from bjornfor/flightgear 
flightgear: 2.10.0 -> 2.12.0 (and make it run again)
 2013-10-20 08:50:06 -07:00
Jack Cummings 1dd072f70d i686 support for GSB 2013-10-19 14:45:03 +02:00
Jack Cummings e6f2ac65e2 Gratuitous Space Battles. Needs libcurl.so.3, so put an old version of that in, too 2013-10-19 14:45:03 +02:00
Peter Simons 6be8ad3392 Merge branch 'origin/master' into stdenv-updates. 
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
 2013-10-18 18:57:24 +02:00
Jason "Don" O'Conal a3d9f41aad sdlmame: add expression 2013-10-12 00:31:46 +00:00
Moritz Ulrich 282b5ac5f0 dwarf-therapist: New package 
Dwarf Therapist is a tool to manage your Dwarves' work orders and
other management stuff.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-10-10 01:22:23 +02:00
Moritz Ulrich b98ae36d32 dwarf-fortress: Update to 0.34.11. 
Somehow Dwarf Fortress suddenly started failing to use our libpng (or
zlib). I tried all possible combinations (supplying them via
LD_LIBRARY_PATH in the script) but it just won't work.

This solution was found in the Archlinux bug tracker: It just symlinks
all problematic .png files to their .bmp counterparts. It's ugly and
*sadly* breaks tileset support (unless you convert them to bmp) but I
think it's acceptable, as the whole expression is pretty problematic
in terms of purity.

Let's hope the next release of Dwarf Fortress will be easier to
support.

(fixes #710)
 2013-10-10 01:21:55 +02:00
Eelco Dolstra 21cfef0beb Disable some packages that don't build 2013-10-08 11:12:44 +02:00
Eelco Dolstra 2147a07938 Fix a bunch of Hydra evaluation errors 2013-10-07 17:36:47 +02:00
Bjørn Forsman 1a062d1456 flightgear: 2.10.0 -> 2.12.0 (and make it run again) 
The current FlightGear expression doesn't work:

  bash$ nix-build -A flightgear
  /nix/store/3c47sibzb9h1vhnn0gnh692hkpjc5p5v-flightgear-2.10.0

  bash$ ./result/bin/fgfs
  ERROR: The path '/nix/store/3c47sibzb9h1vhnn0gnh692hkpjc5p5v-flightgear-2.10.0/lib/FlightGear' does not exist in the file system.

  Base package check failed:
    Version [none] found at: /nix/store/3c47sibzb9h1vhnn0gnh692hkpjc5p5v-flightgear-2.10.0/lib/FlightGear
    Version 2.10.0 is required.
  Please upgrade/downgrade base package and set the path to your fgdata
  with --fg-root=path_to_your_fgdata

We could probably make the 2.10.0 version run, but I had already
upgraded it to 2.12.0 before I made it work. It seems only the data dir
configuration was wrong/missing: FG_DATA_DIR="$out/share/FlightGear/".

Simgear must be in version sync with flightgear, hence the upgrade.

Most of the diff is because I rewrote the flightgear expression to what
I think is the "new style". I wanted to add a preConfigure phase but
didn't understand why this expression had custom phases. So I just
rewrote the whole thing to something I consider more readable.
 2013-10-06 22:38:48 +02:00
Bjørn Forsman 083d0890f5 More description fixes 
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
 2013-10-06 12:01:38 +02:00
Bjørn Forsman 28ac782583 Some description fixes 
There are many more packages to fix, this is just a start.

Rules:
 * Don't repeat the package name (not always that easy...)
 * Start with capital letter
 * Don't end with full stop
 * Don't start with "The ..." or "A ..."

I've also added descriptions to some packages and rewritten others.
 2013-10-05 19:36:23 +02:00
Peter Simons ac5d5297dd Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-10-02 22:44:12 +02:00
Moritz Ulrich 296dbc8279 OpenTTD: 1.3.2 & some coding-style fixes. 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-09-29 00:29:26 +02:00
Peter Simons 9407832de4 Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/development/libraries/gettext/default.nix
 2013-09-23 10:59:44 +02:00
Domen Kožar a774212684 anki: 2.0.3 -> 2.0.12 2013-09-22 19:23:11 +02:00
Peter Simons ad13652455 haskell-LambdaHack: update to version 0.2.8 2013-09-22 13:25:09 +02:00
Peter Simons 24366adf19 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-14 15:28:40 +02:00
Sander van der Burg 28d8e93871 My attempt to get Steam working in NixOS. It uses a function called buildFHSChrootEnv {} that composed chroot environments. In such a chroot environment, I could run Steam without much problem 2013-09-13 23:58:59 +02:00
Peter Simons 3d2caf1180 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-08 22:54:35 +02:00
Jason \"Don\" O'Conal 834cd6c886 beret: Fix build on darwin (close #923) 2013-09-08 10:32:25 +02:00
Peter Simons 98fcc2f746 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-08-30 10:45:11 +02:00
Eelco Dolstra 6f9c01cfbc vessel: Don't build on Hydra 
http://hydra-test.nixos.org/build/5822528
 2013-08-28 17:38:54 +02:00
Vladimír Čunát 991a617025 wesnoth: fix build, minor update, parallel builds 
Yes, games are the most important things in nixpkgs...
not that I actually plan to play it anytime soon ;-)
 2013-08-27 12:08:35 +02:00
Vladimír Čunát 2fa5f01bb9 wesnoth: fix build, minor update, parallel builds 
Yes, games are the most important things in nixpkgs...
not that I actually plan to play it anytime soon ;-)
 2013-08-27 12:07:21 +02:00
Peter Simons 9ac8ea937c Merge branch 'origin/master' into stdenv-updates. 2013-08-26 12:21:23 +02:00
Sergey Mironov d5ddce7f76 instead: version 1.9.1, icon, .desktop, few more games 
Instead is a textquest game engine. Games are located at

http://instead-games.sourceforge.net/
http://instead-games.ru/
 2013-08-18 19:34:23 +02:00
Peter Simons 0d7118814b Merge branch 'origin/master' into stdenv. 2013-08-17 10:00:16 +02:00
Ludovic Courtès 2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Peter Simons 76244ac2e2 Merge branch 'master' into stdenv-updates 
Conflicts:
	pkgs/development/compilers/ghc/with-packages.nix
 2013-08-16 22:51:13 +02:00
aszlig e76a755517
uqm: Add myself to the maintainers list. 
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-08-15 10:43:39 +02:00
aszlig 3fbd3a025d
uqm: Symlink addons and packages. 
Copying these over to the output path of the main derivation will just
unnecessarily blow up the size of it with files we already have in the
store anyway.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-08-15 10:43:39 +02:00
aszlig 80673a70e7
uqm: Add an option to use the remix packs. 
The remix packs are a collection of newly remixed versions of the
old music from the PC/3DO versions. By using useRemixPacks these are
fetched as well and added to the game.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-08-15 10:43:39 +02:00
aszlig 5b421a86f6
uqm: Convert base16 SHA256 hashes to base32. 
We want to have shorter SHAs, don't we? :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-08-15 10:43:39 +02:00
aszlig 7e2587561d
uqm: Switch to using fetchurl for uqm3donix. 
As we now have a tagged first release, it really doesn't make sense to
introduce additional dependencies by using fetchgit.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-08-15 10:43:38 +02:00
aszlig 4f62f1603a
uqm: Update video extractor to latest Git version. 
This updates the 3DO video extractor to the latest Git version, which
should fix a too restrictive dependency on base which leads to it not
compiling with current nixpkgs.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-08-14 20:50:58 +02:00
Evgeny Egorochkin 37996253e6 Steam: fix and update to 1.0.0.39 2013-08-10 06:08:19 +03:00
Carles Pagès 5885cf1286 steam: add flashplayer plugin support. 
The videos work, but there is a problem with sound:
ALSA lib dlmisc.c:236:(snd1_dlobj_cache_get) Cannot open shared library
/nix/store/9z51hr9l19vdhgmqd60jwwrg6ny5md2d-alsa-plugins-1.0.26/lib/alsa-lib/libasound_module_pcm_pulse.so

It tries to open a 64bit plugin, which obviously fails. I think this depends on
/etc/asound.conf, but I'm not sure how to fix it.

Regardless of the problem, in one computer I tried the sound works but other
apps cannot output sound. In another, the sound doesn't work and other apps
continue working as normal.
 2013-08-10 06:08:18 +03:00
Carles Pagès 4d853ae94f steam: revert adding amd64 version. 
It turns out that the .deb only contains the changelog and some other docs.
Revert back to using the i686 version, but keep the double url for the future.
 2013-08-10 06:08:18 +03:00
Carles Pagès 97ea8d61e6 steam: add amd64 version and point url to fix version (as suggested by aristid). 
Valve has a repository with fixed version packages, so use that instead of the
steam.deb I was using. They also have amd64 packages there.
 2013-08-10 06:08:18 +03:00
Carles Pagès 3f4557b0eb steam: update to 1.0.0.28 2013-08-10 06:08:18 +03:00
Carles Pagès bd44348baf steam: create some missing symlinks in the script. 
In the original script it says they are temporary, but without those simlinks
Osmos and others fail to start with SteamAPI_Init() failed.
 2013-08-10 06:08:18 +03:00
Carles Pagès 87c5a418ec steam: create proper symlinks in $HOME/.steam 2013-08-10 06:08:17 +03:00
Carles Pagès a249fa67d9 steam: add libXdmcp to dependencies. 
I must have been blind. libXdmcp is in nixpkgs, contrary to what I said.
 2013-08-10 06:08:17 +03:00
Carles Pagès dc10fabb2f steam: update to 1.0.0.27 
It needed some more sed'ing and more deps. It's still not working as I seem to
need libXdmcp which is not in nixpkgs.
 2013-08-10 06:08:17 +03:00
Carles Pagès f42cece8f5 steam: update to 1.0.0.21. 
I also updated the patches for the bootsrapper script and fixed a typo, but
didn't test anything.
 2013-08-10 06:08:17 +03:00
Carles Pagès 094c0662e8 steam: add mesa to library path. 
Mesa is needed for Superbrothers: S&S EP, which links to libGLU.
 2013-08-10 06:08:17 +03:00
Carles Pagès 10f722dc04 steam: workaround segfault at startup. 
I don't know why, if I call ld-linux.so.2 to launch the game, it segfaults, so
I renamed it to ld.so.
 2013-08-10 06:08:16 +03:00
Carles Pagès c75cccc469 steam: update to 1.0.0.18. 
I forgot in the previous commit to update the version as I had changed the
tarball hash.

I also modified a bit the launcher script, since xz should only be needed by
the installer.
 2013-08-10 06:08:16 +03:00
Carles Pagès b07300f2ef steam: bypass valve's bootstrapper. 
Since there is no way to modify either steam.sh or the steam binary as they are
hash checked, I took the approach of bypassing steam.sh and create a script
that does its job.

For now it segfaults, but when I try to run under strace, it works perfectly.
Need to check this.
 2013-08-10 06:08:16 +03:00
Carles Pagès dad0ed4eaa steam: add all the missing dependancies. 
Calling their steam script still segfaults, but I managed to run it from the
shell with all these deps in the lib path.
 2013-08-10 06:08:16 +03:00
Carles Pagès ee6129350e steam: add glibc215 to the wrapper. 2013-08-10 06:08:16 +03:00
Carles Pagès 12a0d83855 Steam: add patch for user stuff and lib paths to wrapProgram. 
The binaries that get copied to $HOME need patchelf to run, and after that I
need all the runtime libs in the library path. Still not working as I need
glibc2.15.
 2013-08-10 06:08:15 +03:00
Carles Pagès 3cd37b550b Steam: first attempt at adding the beta client. 
The script installed with this expression only copies a boostrapper and another
script to the user's home folder. Those also need to be patched to get on with
the installation.
 2013-08-10 06:08:15 +03:00
Peter Simons 522acfd2f4 Merge remote-tracking branch 'master' into stdenv-updates. 
Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix
 2013-07-30 11:29:30 +02:00
Cillian de Róiste d7283abbbb gtypist: update to 2.9.3 and fix the patch 2013-07-19 01:22:29 +02:00
Evgeny Egorochkin da4be371e9 make package use mirror:// for gnu, savannah and gnome repositories where possible 2013-07-14 05:23:06 +03:00
Evgeny Egorochkin d0b4c8bfaa gktspell: version bump to 2.0.16 because the old one has disappeared 2013-07-14 03:09:34 +03:00
Evgeny Egorochkin 297a561491 eduke32: fix version to match tarball 2013-07-14 02:08:54 +03:00
Evgeny Egorochkin 6c1fc08df7 blobby-volley: fix version to match tarball 2013-07-14 02:08:48 +03:00
Evgeny Egorochkin 3af273f3c3 3dpong: fix version to match tarball 2013-07-14 02:08:48 +03:00
Vladimír Čunát 8ba92b8895 Merge master into stdenv-updates 
Conflicts (simple):
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/tools/package-management/disnix/default.nix
	pkgs/top-level/all-packages.nix
 2013-07-08 10:48:05 +02:00
Mathijs Kwik 0b17251c06 libpng: keep versioning in all-packages.nix, not in individual expressions 2013-06-27 21:35:21 +02:00
Mathijs Kwik 7f413e4d5c whitespace cleaning 2013-06-27 21:35:21 +02:00
Eelco Dolstra acba9240cd nixos.org/tarballs -> tarballs.nixos.org 
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
 2013-06-25 14:12:16 +02:00
Vladimír Čunát 842420c3e1 Merge branch 'master' into stdenv-updates 
Conflicts (relatively simple):
	pkgs/development/interpreters/python/2.7/default.nix
	pkgs/development/libraries/dbus/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/common.nix
 2013-06-20 19:21:25 +02:00
Eelco Dolstra efde9567d1 flightgear: Remove from channel 
It's 264 MiB compressed...
 2013-06-17 22:51:37 +02:00
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
Peter Simons 728e305205 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-05-22 12:30: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
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