diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-12 00:02:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-12 00:02:14 +0000 |
| commit | 33248a2cafb255edb4c91a290864194242622de3 (patch) | |
| tree | 13114ade9e94e05d17dc1c77935efa08dab925d2 /pkgs/games | |
| parent | 9776723357705dedeb933221c8f9b295d44813d7 (diff) | |
| parent | 647a6f42eef18d2e8367f1870dfa718640b8a63a (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/brogue/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/cataclysm-dda/stable.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/hikounomizu/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/warzone2100/default.nix | 15 |
4 files changed, 6 insertions, 17 deletions
diff --git a/pkgs/games/brogue/default.nix b/pkgs/games/brogue/default.nix index e5b0f838be1af..d7f5694bfb6ce 100644 --- a/pkgs/games/brogue/default.nix +++ b/pkgs/games/brogue/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { description = "A roguelike game"; homepage = "https://sites.google.com/site/broguegame/"; license = licenses.agpl3; - maintainers = [ maintainers.skeidel ]; + maintainers = [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/games/cataclysm-dda/stable.nix b/pkgs/games/cataclysm-dda/stable.nix index e24432a25bbf5..0e4ca1aad882f 100644 --- a/pkgs/games/cataclysm-dda/stable.nix +++ b/pkgs/games/cataclysm-dda/stable.nix @@ -44,7 +44,7 @@ let meta = common.meta // { maintainers = with lib.maintainers; - common.meta.maintainers ++ [ skeidel ]; + common.meta.maintainers; changelog = "https://github.com/CleverRaven/Cataclysm-DDA/blob/${version}/data/changelog.txt"; }; }); diff --git a/pkgs/games/hikounomizu/default.nix b/pkgs/games/hikounomizu/default.nix index c59418ac1a436..bca6c8ecf8b96 100644 --- a/pkgs/games/hikounomizu/default.nix +++ b/pkgs/games/hikounomizu/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "hikounomizu"; - version = "1.0"; + version = "1.0.1"; src = fetchurl { url = "http://download.tuxfamily.org/hnm/${version}/hikounomizu-${version}-src.tar.bz2"; - hash = "sha256-Hw/BA7jOW9KGdde1NLDh4SfQXxvZkNGx/sHXukgFZ5M="; + hash = "sha256-3wRhe6CDq1dD0SObAygfqslYJx+EM3LM3rj6HI0whYU="; }; nativeBuildInputs = [ diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 61df2e54c2283..9979d16247c02 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , cmake , ninja , p7zip @@ -47,23 +46,13 @@ in stdenv.mkDerivation rec { inherit pname; - version = "4.3.5"; + version = "4.4.0"; src = fetchurl { url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; - sha256 = "sha256-AdYI9vljjhTXyFffQK0znBv8IHoF2q/nFXrYZSo0BcM="; + hash = "sha256-Ul77OihJWIH9H6FUpibGDjqX1BY4DWDQ3bR4lRDY9+U="; }; - patches = [ - # Upstream patch for curl-8.4 support, - # TODO: remove on next release. - (fetchpatch { - name = "curl-8.4.patch"; - url = "https://github.com/Warzone2100/warzone2100/commit/db1cf70950d4fa6630f37a7bf85f548b48ed53cd.patch"; - hash = "sha256-/jRan5pi7CamZaCaRdfugFmtCbWTKmCt63q0NBuTrFk="; - }) - ]; - buildInputs = [ SDL2 libtheora |