diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-28 15:42:42 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-28 15:42:42 +0000 |
commit | defd86049c17a1a34db52f9cbf238f926e270dca (patch) | |
tree | bfb3eab227bc0ad487db09a2a34780fb71f61808 /pkgs/games | |
parent | 49b7f13128731188bfebdc2cf2a712a7fc5118ce (diff) | |
parent | db8f709430e20ad07e040af1813529e133ec823b (diff) |
Merge ^/nixpkgs/trunk.
This merge leads to a big rebuild, but this wouldn't hurt as I'm going to
reintegrate this branch soon.
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33455
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/LambdaHack/default.nix | 9 | ||||
-rw-r--r-- | pkgs/games/MazesOfMonad/default.nix | 5 | ||||
-rw-r--r-- | pkgs/games/gtypist/default.nix | 23 | ||||
-rw-r--r-- | pkgs/games/spring/default.nix | 8 | ||||
-rw-r--r-- | pkgs/games/tuxracer/default.nix | 31 |
5 files changed, 31 insertions, 45 deletions
diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index dc82a1a000aa..f7375172f06f 100644 --- a/pkgs/games/LambdaHack/default.nix +++ b/pkgs/games/LambdaHack/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "LambdaHack"; - version = "0.2.0"; - sha256 = "09lgbpwrlw29n797q3k5aafvkg04nd8cw6pi41g914phf7lxzq4c"; + version = "0.2.1"; + sha256 = "1d2mnpy8fl9m5584rbskgary18mqibivwmlz9gfv87gg0lzhw2ab"; isLibrary = true; isExecutable = true; buildDepends = [ binary ConfigFile filepath gtk mtl random zlib ]; @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "A roguelike game engine in early and very active development"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/games/MazesOfMonad/default.nix b/pkgs/games/MazesOfMonad/default.nix index 92c7a17d7d96..0e2abf6d7c77 100644 --- a/pkgs/games/MazesOfMonad/default.nix +++ b/pkgs/games/MazesOfMonad/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Console-based Role Playing Game"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/games/gtypist/default.nix b/pkgs/games/gtypist/default.nix new file mode 100644 index 000000000000..8fd2e28e77b3 --- /dev/null +++ b/pkgs/games/gtypist/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, ncurses}: + +stdenv.mkDerivation { + name = "gtypist-2.9.1"; + + src = fetchurl { + url = "ftp://ftp.gnu.org/gnu/gtypist/gtypist-2.9.1.tar.xz"; + sha256 = "1yv209aih1ixbs477vzzk1xj013g6w32vi33g0hldfzvfxbl9y5s"; + }; + + buildInputs = [ncurses]; + + patches = [ (fetchurl { + url = "http://projects.archlinux.org/svntogit/community.git/plain/trunk/ncurses.patch?h=packages/gtypist"; + sha256 = "1chdr4xkm140cjwv1n3ydk04qdwgycd12d9adz2sjc58lybqp7sy"; + })]; + + meta = { + homepage = http://www.gnu.org/software/gtypist; + description = "GNU Typist (also called gtypist) is a universal typing tutor."; + license = stdenv.lib.licenses.gpl3Plus; + }; +} diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 99b0c35aedb4..09eb41f7267f 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip -, openal, libvorbis, glew, freetype, xlibs, SDL, mesa +, openal, libvorbis, glew, freetype, xlibs, SDL, mesa, binutils , jdk ? null, python ? null , withAI ? true # support for AI Interfaces and Skirmish AIs }: stdenv.mkDerivation rec { name = "spring-${version}"; - version = "0.87.0"; + version = "0.88.0"; src = fetchurl { - url = "mirror://sourceforge/springrts/spring_87.0_src.tar.lzma"; - sha256 = "4c8528966b62e3fede63a4acb3cd5f13ecfed195688e135293bdc747980738b2"; + url = "mirror://sourceforge/springrts/spring_88.0_src.tar.lzma"; + sha256 = "f203114b849a83795fe2d413d01c843b6f5b50df0832ce570bc476502f89e6fa"; }; buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL diff --git a/pkgs/games/tuxracer/default.nix b/pkgs/games/tuxracer/default.nix deleted file mode 100644 index 98074c42d9b9..000000000000 --- a/pkgs/games/tuxracer/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -a : -let - fetchurl = a.fetchurl; - - version = a.lib.attrByPath ["version"] "0.61" a; - buildInputs = with a; [ - mesa libX11 xproto tcl freeglut - ]; -in -rec { - src = fetchurl { - url = "http://downloads.sourceforge.net/tuxracer/tuxracer-${version}.tar.gz"; - sha256 = "1zqyz4ig0kax5q30vcgbavcjw36wsyp9yjsd2dbfb3srh28d04d3"; - }; - - inherit buildInputs; - configureFlags = []; - - /* doConfigure should be removed if not needed */ - phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"]; - - preConfigure = a.fullDepEntry ('' - sed -e '/TCL_LIB_LIST=/atcl8.4' -i configure - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DGLX_GLXEXT_LEGACY=1" - '') ["minInit" "doUnpack"]; - - name = "tuxracer-" + version; - meta = { - description = "TuxRacer - Tux lies on his belly and accelerates down ice slopes.."; - }; -} |