3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

541 commits

Author SHA1 Message Date
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