diff options
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/angband/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/cdogs-sdl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/crack-attack/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/egoboo/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/factorio/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/freedink/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/keeperrl/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/mindustry/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/quakespasm/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/simutrans/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/solarus/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/srb2/default.nix | 6 | ||||
-rw-r--r-- | pkgs/games/tome4/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/vintagestory/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/wesnoth/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/xonotic/default.nix | 19 |
16 files changed, 25 insertions, 34 deletions
diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix index c6dbb631767f8..28de108ca7fa7 100644 --- a/pkgs/games/angband/default.nix +++ b/pkgs/games/angband/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://angband.github.io/angband"; description = "A single-player roguelike dungeon exploration game"; - maintainers = [ maintainers.chattered ]; + maintainers = [ ]; license = licenses.gpl2; }; } diff --git a/pkgs/games/cdogs-sdl/default.nix b/pkgs/games/cdogs-sdl/default.nix index 474fd735f73d0..3a7f4ff63ebad 100644 --- a/pkgs/games/cdogs-sdl/default.nix +++ b/pkgs/games/cdogs-sdl/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cdogs"; - version = "0.13.0"; + version = "1.3.1"; src = fetchFromGitHub { repo = "cdogs-sdl"; owner = "cxong"; rev = version; - sha256 = "sha256-7wNiDA/gOpqzSFWw8Bn6suC/f5RXdDTxPV49nCvOxas="; + sha256 = "sha256-fKqipk1kiPC6HrkNzxHK2aYe5WDZ3hEbPCwsqK5uQ2s="; }; postPatch = '' diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/games/crack-attack/default.nix index fb13ce8c16388..69395e1c44aab 100644 --- a/pkgs/games/crack-attack/default.nix +++ b/pkgs/games/crack-attack/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://www.nongnu.org/crack-attack/"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.piotr ]; + maintainers = [ ]; }; } diff --git a/pkgs/games/egoboo/default.nix b/pkgs/games/egoboo/default.nix index 4023eccec4414..32678ecdf093c 100644 --- a/pkgs/games/egoboo/default.nix +++ b/pkgs/games/egoboo/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; # I take it out of hydra as it does not work as well as I'd like - # maintainers = [ lib.maintainers.bjg ]; + # maintainers = [ ]; # platforms = lib.platforms.all; }; } diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 4ca92961bafd5..17f9947b49824 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -85,7 +85,7 @@ let (lib.overrideDerivation (fetchurl { inherit name url sha256; - curlOpts = [ + curlOptsList = [ "--get" "--data-urlencode" "username@username" "--data-urlencode" "token@token" diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix index 75c50669421d8..b48d7e52cf394 100644 --- a/pkgs/games/freedink/default.nix +++ b/pkgs/games/freedink/default.nix @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/freedink/"; # Formerly http://www.freedink.org license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.bjg ]; + maintainers = [ ]; platforms = lib.platforms.all; hydraPlatforms = lib.platforms.linux; # sdl-config times out on darwin }; diff --git a/pkgs/games/keeperrl/default.nix b/pkgs/games/keeperrl/default.nix index bd49b821f9e1b..a1ead9a3f9cfa 100644 --- a/pkgs/games/keeperrl/default.nix +++ b/pkgs/games/keeperrl/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { description = "A dungeon management rogue-like"; homepage = "https://keeperrl.com/"; license = licenses.gpl2; - maintainers = with maintainers; [ chattered ]; + maintainers = with maintainers; [ ]; # TODO: Add OS X platforms = with platforms; [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 9edc17f0bc080..680d341d335ba 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -204,7 +204,7 @@ stdenv.mkDerivation rec { binaryBytecode # deps ]; license = licenses.gpl3Plus; - maintainers = with maintainers; [ fgaz petabyteboy ]; + maintainers = with maintainers; [ fgaz ]; platforms = platforms.x86_64; # Hash mismatch on darwin: # https://github.com/NixOS/nixpkgs/pull/105590#issuecomment-737120293 diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix index e67363fdc3cc1..faeea7e4765be 100644 --- a/pkgs/games/quakespasm/default.nix +++ b/pkgs/games/quakespasm/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { ''; platforms = platforms.unix; - maintainers = with maintainers; [ mikroskeem m3tti ]; + maintainers = with maintainers; [ mikroskeem ]; mainProgram = "quake"; }; } diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 60b2bc5faf777..1e5e25dbd3a24 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -163,7 +163,7 @@ let homepage = "http://www.simutrans.com/"; license = with licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ kkallio vcunat phile314 ]; + maintainers = with maintainers; [ vcunat phile314 ]; platforms = with platforms; linux; # TODO: ++ darwin; }; }; diff --git a/pkgs/games/solarus/default.nix b/pkgs/games/solarus/default.nix index c42464feaed21..9dc0e1863cfa7 100644 --- a/pkgs/games/solarus/default.nix +++ b/pkgs/games/solarus/default.nix @@ -35,7 +35,7 @@ mkDerivation rec { ''; homepage = "http://www.solarus-games.org"; license = licenses.gpl3; - maintainers = [ maintainers.Nate-Devv ]; + maintainers = [ ]; platforms = platforms.linux; }; diff --git a/pkgs/games/srb2/default.nix b/pkgs/games/srb2/default.nix index ff5e0f4303628..1a4862904abea 100644 --- a/pkgs/games/srb2/default.nix +++ b/pkgs/games/srb2/default.nix @@ -6,7 +6,7 @@ , cmake , curl , nasm -, openmpt123 +, libopenmpt , p7zip , libgme , libpng @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { curl libgme libpng - openmpt123 + libopenmpt SDL2 SDL2_mixer zlib @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { cmakeFlags = [ "-DSRB2_ASSET_DIRECTORY=/build/source/assets" "-DGME_INCLUDE_DIR=${libgme}/include" - "-DOPENMPT_INCLUDE_DIR=${openmpt123}/include" + "-DOPENMPT_INCLUDE_DIR=${libopenmpt.dev}/include" "-DSDL2_MIXER_INCLUDE_DIR=${SDL2_mixer}/include/SDL2" "-DSDL2_INCLUDE_DIR=${SDL2.dev}/include/SDL2" ]; diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix index 1f148feb9320a..b732777ed3a81 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { description = "Tales of Maj'eyal (rogue-like game)"; homepage = "https://te4.org/"; license = licenses.gpl3; - maintainers = with maintainers; [ chattered peterhoeg ]; + maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/games/vintagestory/default.nix b/pkgs/games/vintagestory/default.nix index e6e7d28e17bd6..4c94fa4f1ae3b 100644 --- a/pkgs/games/vintagestory/default.nix +++ b/pkgs/games/vintagestory/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.16.4"; + version = "1.16.5"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz"; - sha256 = "sha256-wdwQ1Dv0872nEOYIB+rEzYtG5rnSw8DZgoSlSvCvtrI="; + sha256 = "sha256-qqrQ+cs/ujzeXAa0xX5Yee3l5bo9DaH+kS1pkCt/UoU="; }; nativeBuildInputs = [ makeWrapper copyDesktopItems ]; diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index fa6b8cb631fc9..4e4cee5cb19c8 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.16.1"; + version = "1.16.3"; src = fetchFromGitHub { rev = version; owner = "wesnoth"; repo = "wesnoth"; - sha256 = "sha256-eRegE+Q5dEtuT2XRKAK0sycRuK6sdSXKS6aLCsBDU8g="; + sha256 = "sha256-om6Tps5ZdAWq1WE9lq9v2oGwfPDPSRJ08pmMlT6DjGk="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index ab9cc14dc9bdf..8865e8f992deb 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, fetchzip, makeWrapper, runCommand, makeDesktopItem +{ lib, stdenv, fetchurl, fetchzip, makeWrapper, runCommand, makeDesktopItem , xonotic-data, copyDesktopItems , # required for both unzip, libjpeg, zlib, libvorbis, curl @@ -16,7 +16,7 @@ let pname = "xonotic"; - version = "0.8.2"; + version = "0.8.5"; name = "${pname}-${version}"; variant = if withSDL && withGLX then @@ -41,7 +41,7 @@ let ''; homepage = "https://www.xonotic.org/"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ astsmtl zalakain petabyteboy ]; + maintainers = with lib.maintainers; [ astsmtl zalakain ]; platforms = lib.platforms.linux; }; @@ -61,18 +61,9 @@ let src = fetchurl { url = "https://dl.xonotic.org/xonotic-${version}-source.zip"; - sha256 = "0axxw04fyz6jlfqd0kp7hdrqa0li31sx1pbipf2j5qp9wvqicsay"; + sha256 = "sha256-oagbpVqxUb8JdY5/WWFLLlFQ6EIkdT53lQvNB6KC6l0="; }; - patches = [ - # Fix to make darkplaces compile under GCC 11 - (fetchpatch { - name = "fix-darkplaces-gcc11"; - url = "https://gitlab.com/xonotic/darkplaces/-/commit/5e9e998c1759bc0085c3273fc39f9ea6f72a7dc8.patch"; - sha256 = "sha256-s0JettSg0AYr8V2mXKJ2QU125bBcX1BAu/yDciTWC5o="; - }) - ]; - nativeBuildInputs = [ unzip ]; buildInputs = [ libjpeg zlib libvorbis curl gmp ] ++ lib.optional withGLX [ libX11.dev libGLU.dev libGL.dev libXpm.dev libXext.dev libXxf86vm.dev alsa-lib.dev ] @@ -146,7 +137,7 @@ in rec { xonotic-data = fetchzip { name = "xonotic-data"; url = "https://dl.xonotic.org/xonotic-${version}.zip"; - sha256 = "15caj11v9hhr7w55w3rs1rspblzr9lg1crqivbn9pyyq0rif8cpl"; + sha256 = "sha256-/malKGbDdUnqG+bJOJ2f3zHb7hAGiNZdprczr2Fgb5E="; postFetch = '' cd $out rm -rf $(ls | grep -v "^data$" | grep -v "^key_0.d0pk$") |