diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-01-26 16:49:41 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-01-26 16:49:41 +0100 |
commit | 6973c7739ea1581595931e8c8b3b76241083b2df (patch) | |
tree | f56826492e0e260f24aeeedd2e47d36785ba3519 /pkgs/games | |
parent | 5dacc53af3f4537fab693952b5f13b6cafcde6d4 (diff) | |
parent | bca9bcb3c3dd3b2e46f8e07db9a8326de01697c7 (diff) |
Merge branch 'master' into staging
There were some larger rebuilds because of security.
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/factorio/default.nix | 8 | ||||
-rw-r--r-- | pkgs/games/minetest/default.nix | 6 | ||||
-rw-r--r-- | pkgs/games/super-tux-kart/default.nix | 52 | ||||
-rw-r--r-- | pkgs/games/warsow/default.nix | 1 |
4 files changed, 37 insertions, 30 deletions
diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index fe01667f5318..e071edfeb815 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -10,7 +10,7 @@ assert releaseType == "alpha" || releaseType == "headless"; with stdenv.lib; let - version = "0.13.20"; + version = "0.14.21"; isHeadless = releaseType == "headless"; arch = if stdenv.system == "x86_64-linux" then { @@ -27,12 +27,12 @@ let url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}"; name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.gz"; x64 = { - headless = fetchurl { inherit name url; sha256 = "0nf1sxcgnbx52iwx7jgkjxass10lzz1iyskvgk0gq3ky9cg4ixfb"; }; - alpha = authenticatedFetch { inherit url; sha256 = "0rgjdxdcqf9m3ghzr076q3xi1g01ix14jldjwn6jgnvggzqkph9l"; }; + headless = fetchurl { inherit name url; sha256 = "0bx4fq46781vv9vr0ciyckaskksjrqikvcdv1yz0wj8mrb2j08cw"; }; + alpha = authenticatedFetch { inherit url; sha256 = "067p1i5wcxk88kmblyklc4lh8fqjc5pqjdarvhjz420vqmdls7k6"; }; }; i386 = { headless = abort "Factorio 32-bit headless binaries are not available for download."; - alpha = authenticatedFetch { inherit url; sha256 = "0hda2z1q22xanl328kic5q09ck59mr3aa5cy4dbjv86s4dx9kxfq"; }; + alpha = authenticatedFetch { inherit url; sha256 = "0iwhachp0z02w19x5y70qy3b0yp79dspawkcygdfna5cfqrybvx6"; }; }; }; diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 53227f2cc81b..e28a83cc6a20 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -4,19 +4,19 @@ }: let - version = "0.4.14"; + version = "0.4.15"; sources = { src = fetchFromGitHub { owner = "minetest"; repo = "minetest"; rev = "${version}"; - sha256 = "1f74wsiqj8x1m8wqmxijb00df5ljlvy4ac0ahbh325vfzi0bjla3"; + sha256 = "0bn4102d0hq774bn6hqhrs6qzl4sancrs4j15w4318bqdndk4676"; }; data = fetchFromGitHub { owner = "minetest"; repo = "minetest_game"; rev = "${version}"; - sha256 = "1dc9zfbp603h2nlk39bw37kjbswrfmpd9yg3v72z1jb89pcxzsqs"; + sha256 = "1mjj40slfiw0khg9nrq8yfmnay237z5jm1cg9hrsiq2fkjrr8w2m"; }; }; in stdenv.mkDerivation { diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index a1778cc69d79..4d2db9d293f5 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -1,45 +1,51 @@ -{ fetchgit, fetchsvn, cmake, stdenv, plib, SDL, openal, freealut, mesa -, libvorbis, libogg, gettext, libXxf86vm, curl, pkgconfig -, fribidi, autoconf, automake, libtool, bluez, libjpeg, libpng }: +{ stdenv, fetchFromGitHub, fetchsvn, cmake, pkgconfig +, openal, freealut, mesa, libvorbis, libogg, gettext, curl, freetype +, fribidi, libtool, bluez, libjpeg, libpng, zlib, libX11, libXrandr }: -stdenv.mkDerivation rec { +let + dir = "stk-code"; + +in stdenv.mkDerivation rec { name = "supertuxkart-${version}"; - version = "0.9"; + version = "0.9.2"; srcs = [ - (fetchgit { - url = "https://github.com/supertuxkart/stk-code"; - rev = "28a525f6d4aba2667c41a549b027149fcceda97e"; - sha256 = "0b5izr7j3clm6pcxanwwaas06f17wi454s6hwmgv1mg48aay2v97"; - name = "stk-code"; + (fetchFromGitHub { + owner = "supertuxkart"; + repo = "stk-code"; + rev = version; + sha256 = "1zsc5nw8il8xwppk624jampfk6qhqzjnni8zicrhqix0xg07nxca"; + name = dir; }) (fetchsvn { - url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets"; - rev = "16293"; - sha256 = "07jdkli28xr3rcxvixyy5bwi26n5i7dkhd9q0j4wifgs4pymm8r5"; - name = "stk-assets"; + url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets"; + rev = "16503"; # 0.9.2 crashes with 16937. Refer to stk-code/doc/assets_version + sha256 = "0j1dy27gxm4hx26xddr2ak6vw0lim0nqmjnszfb4c61y92j12cqp"; + name = "stk-assets"; }) ]; - + buildInputs = [ - plib SDL openal freealut mesa libvorbis libogg gettext - libXxf86vm curl pkgconfig fribidi autoconf automake libtool cmake bluez libjpeg libpng + cmake libtool pkgconfig + libX11 libXrandr + openal freealut mesa libvorbis libogg gettext zlib freetype + curl fribidi bluez libjpeg libpng ]; enableParallelBuilding = true; - sourceRoot = "stk-code"; + sourceRoot = dir; - meta = { + meta = with stdenv.lib; { description = "A Free 3D kart racing game"; longDescription = '' SuperTuxKart is a Free 3D kart racing game, with many tracks, characters and items for you to try, similar in spirit to Mario Kart. ''; - homepage = http://supertuxkart.sourceforge.net/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ c0dehero fuuzetsu ]; - platforms = with stdenv.lib.platforms; linux; + homepage = https://supertuxkart.net/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ c0dehero fuuzetsu peterhoeg ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index 9f2dfbab2ecd..ef0e4640c393 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -59,5 +59,6 @@ stdenv.mkDerivation rec { license = licenses.unfreeRedistributable; maintainers = with maintainers; [ astsmtl ]; platforms = platforms.linux; + broken = true; # Depends on a specific old libjpeg version }; } |