diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-03-22 16:41:59 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-03-22 16:41:59 +0100 |
commit | 46a88117a05c3469af5d99433af140c3de8ca088 (patch) | |
tree | d7f0557756d8f07a3081b3498c05ddc5a8ad429d /nixpkgs/pkgs/games | |
parent | e97457545cea0b2ca421da257c83d8f1ef451d85 (diff) | |
parent | a343533bccc62400e8a9560423486a3b6c11a23b (diff) | |
download | nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.gz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.bz2 nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.lz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.xz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.zst nixlib-46a88117a05c3469af5d99433af140c3de8ca088.zip |
Merge commit 'a343533bccc62400e8a9560423486a3b6c11a23b'
Diffstat (limited to 'nixpkgs/pkgs/games')
42 files changed, 190 insertions, 209 deletions
diff --git a/nixpkgs/pkgs/games/alienarena/default.nix b/nixpkgs/pkgs/games/alienarena/default.nix index 39b232b267c3..2aff5c86151e 100644 --- a/nixpkgs/pkgs/games/alienarena/default.nix +++ b/nixpkgs/pkgs/games/alienarena/default.nix @@ -1,19 +1,42 @@ -{ lib, stdenv, fetchsvn, pkg-config, libjpeg, libX11, libXxf86vm, curl, libogg -, libvorbis, freetype, openal, libGL }: +{ curl +, fetchFromGitHub +, freetype +, lib +, libGL +, libjpeg +, libogg +, libvorbis +, libX11 +, libXxf86vm +, openal +, pkg-config +, stdenv +}: stdenv.mkDerivation rec { pname = "alienarena"; - version = "7.71.2"; + version = "7.71.6"; - src = fetchsvn { - url = "svn://svn.icculus.org/alienarena/trunk"; - rev = "5673"; - sha256 = "1qfrgrp7nznk5n1jqvjba6l1w8y2ixzyx9swkpvd02rdwlwrp9kw"; + src = fetchFromGitHub { + owner = "alienarena"; + repo = "alienarena"; + rev = version; + hash = "sha256-Dml0VY5VQiWLq8LjItBSzNwJB9L4biJ/nJWmEGtG2ZY="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libjpeg libX11 curl libogg libvorbis - freetype openal libGL libXxf86vm ]; + + buildInputs = [ + curl + freetype + libGL + libjpeg + libogg + libvorbis + libX11 + libXxf86vm + openal + ]; patchPhase = '' substituteInPlace ./configure \ @@ -22,6 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + changelog = "https://github.com/alienarena/alienarena/releases/tag/${version}"; description = "A free, stand-alone first-person shooter computer game"; longDescription = '' Do you like old school deathmatch with modern features? How @@ -32,7 +56,7 @@ stdenv.mkDerivation rec { with a retro alien theme, while adding tons of original ideas to make the game quite unique. ''; - homepage = "http://red.planetarena.org"; + homepage = "https://alienarena.org"; # Engine is under GPLv2, everything else is under license = licenses.unfreeRedistributable; maintainers = with maintainers; [ astsmtl ]; diff --git a/nixpkgs/pkgs/games/brogue-ce/default.nix b/nixpkgs/pkgs/games/brogue-ce/default.nix index 77e58ed5a1a6..32ca328492bc 100644 --- a/nixpkgs/pkgs/games/brogue-ce/default.nix +++ b/nixpkgs/pkgs/games/brogue-ce/default.nix @@ -7,14 +7,14 @@ , SDL2_image }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "brogue-ce"; version = "1.13"; src = fetchFromGitHub { owner = "tmewett"; repo = "BrogueCE"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-FUIdi1Ytn+INeD9550MW41qXtLb6in0QS3Snt8QaXUA="; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres fgaz ]; platforms = platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/games/brogue/default.nix b/nixpkgs/pkgs/games/brogue/default.nix index 0cd3e779c563..770ff3622923 100644 --- a/nixpkgs/pkgs/games/brogue/default.nix +++ b/nixpkgs/pkgs/games/brogue/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, SDL, ncurses, libtcod, makeDesktopItem }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "brogue"; version = "1.7.5"; src = fetchurl { - url = "https://sites.google.com/site/broguegame/brogue-${version}-linux-amd64.tbz2"; + url = "https://sites.google.com/site/broguegame/brogue-${finalAttrs.version}-linux-amd64.tbz2"; sha256 = "0i042zb3axjf0cpgpdh8hvfn66dbfizidyvw0iymjk2n760z2kx7"; }; patches = [ @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { installPhase = '' install -m 555 -D bin/brogue $out/bin/brogue - install -m 444 -D ${desktopItem}/share/applications/brogue.desktop $out/share/applications/brogue.desktop + install -m 444 -D ${finalAttrs.desktopItem}/share/applications/brogue.desktop $out/share/applications/brogue.desktop install -m 444 -D bin/brogue-icon.png $out/share/icons/hicolor/256x256/apps/brogue.png mkdir -p $out/share/brogue cp -r bin/fonts $out/share/brogue/ @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres fgaz ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/nixpkgs/pkgs/games/cataclysm-dda/git.nix b/nixpkgs/pkgs/games/cataclysm-dda/git.nix index c7090838b862..155f900e96f3 100644 --- a/nixpkgs/pkgs/games/cataclysm-dda/git.nix +++ b/nixpkgs/pkgs/games/cataclysm-dda/git.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, callPackage, CoreFoundation, fetchFromGitHub, pkgs, wrapCDDA, attachPkgs +{ stdenv, lib, callPackage, CoreFoundation, fetchFromGitHub, fetchpatch, pkgs, wrapCDDA, attachPkgs , tiles ? true, Cocoa , debug ? false , useXdgDir ? false @@ -25,6 +25,19 @@ let patches = [ # Unconditionally look for translation files in $out/share/locale ./locale-path.patch + # Fixes for failing build with GCC 13, remove on updating next release after 0.G + (fetchpatch { + url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-dangling-reference-warning.patch"; + hash = "sha256-9nPbyz49IYBOVHqr7jzCIyS8z/SQgpK4EjEz1fruIPE="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-cstdint.patch"; + hash = "sha256-8IBW2OzAHVgEJZoViQ490n37sl31hA55ePuqDL/lil0="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-keyword-requires.patch"; + hash = "sha256-8yvHh0YKC7AC/qzia7AZAfMewMC0RiSepMXpOkMXRd8="; + }) ]; makeFlags = common.makeFlags ++ [ diff --git a/nixpkgs/pkgs/games/cataclysm-dda/stable.nix b/nixpkgs/pkgs/games/cataclysm-dda/stable.nix index 0e4ca1aad882..90eab89a8349 100644 --- a/nixpkgs/pkgs/games/cataclysm-dda/stable.nix +++ b/nixpkgs/pkgs/games/cataclysm-dda/stable.nix @@ -30,6 +30,19 @@ let patches = [ # Unconditionally look for translation files in $out/share/locale ./locale-path.patch + # Fixes for failing build with GCC 13, remove on updating next release after 0.G + (fetchpatch { + url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-dangling-reference-warning.patch"; + hash = "sha256-9nPbyz49IYBOVHqr7jzCIyS8z/SQgpK4EjEz1fruIPE="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-cstdint.patch"; + hash = "sha256-8IBW2OzAHVgEJZoViQ490n37sl31hA55ePuqDL/lil0="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-keyword-requires.patch"; + hash = "sha256-8yvHh0YKC7AC/qzia7AZAfMewMC0RiSepMXpOkMXRd8="; + }) ]; makeFlags = common.makeFlags ++ [ diff --git a/nixpkgs/pkgs/games/cdogs-sdl/default.nix b/nixpkgs/pkgs/games/cdogs-sdl/default.nix index 5c74b10ef32a..e6ea213b6220 100644 --- a/nixpkgs/pkgs/games/cdogs-sdl/default.nix +++ b/nixpkgs/pkgs/games/cdogs-sdl/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cdogs-sdl"; - version = "1.5.0"; + version = "2.0.0"; src = fetchFromGitHub { repo = pname; owner = "cxong"; rev = version; - sha256 = "sha256-XSq0TK3ZuLOa8JJnp/Qxt16Ru3p35tq5FOo4+tv+c60="; + sha256 = "sha256-es04sCqthjf9unK2mbsBVHlxOeTpimQ+ViabhC/WD0I="; }; postPatch = '' diff --git a/nixpkgs/pkgs/games/curseofwar/default.nix b/nixpkgs/pkgs/games/curseofwar/default.nix index fef456816ff2..c0accf1e7b64 100644 --- a/nixpkgs/pkgs/games/curseofwar/default.nix +++ b/nixpkgs/pkgs/games/curseofwar/default.nix @@ -4,14 +4,14 @@ , SDL }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "curseofwar"; version = "1.3.0"; src = fetchFromGitHub { owner = "a-nikolaev"; - repo = pname; - rev = "v${version}"; + repo = "curseofwar"; + rev = "v${finalAttrs.version}"; sha256 = "1wd71wdnj9izg5d95m81yx3684g4zdi7fsy0j5wwnbd9j34ilz1i"; }; @@ -33,5 +33,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; -} - +}) diff --git a/nixpkgs/pkgs/games/doom-ports/slade/default.nix b/nixpkgs/pkgs/games/doom-ports/slade/default.nix index 9e9fc837e820..9ab3d1f458d5 100644 --- a/nixpkgs/pkgs/games/doom-ports/slade/default.nix +++ b/nixpkgs/pkgs/games/doom-ports/slade/default.nix @@ -15,21 +15,23 @@ , glew , lua , mpg123 +, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "slade"; - version = "3.2.4"; + version = "3.2.5"; src = fetchFromGitHub { owner = "sirjuddington"; repo = "SLADE"; rev = version; - sha256 = "sha256-CN01w+sXXRqvQqu1whePAb+phVx+VM8tL2NusfnCyF8="; + sha256 = "sha256-FBpf1YApwVpWSpUfa2LOrkS1Ef34sKCIZ6ic+Pczs14="; }; - postPatch = lib.optionalString (!stdenv.hostPlatform.isx86) '' - sed -i '/-msse/d' src/CMakeLists.txt + postPatch = '' + substituteInPlace dist/CMakeLists.txt \ + --replace "PK3_OUTPUT" "PK3_DESTINATION" ''; nativeBuildInputs = [ @@ -37,6 +39,7 @@ stdenv.mkDerivation rec { pkg-config which zip + wrapGAppsHook ]; buildInputs = [ @@ -54,10 +57,17 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DwxWidgets_LIBRARIES=${wxGTK}/lib" + "-DBUILD_PK3=ON" ]; env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + preFixup = '' + gappsWrapperArgs+=( + --prefix GDK_BACKEND : x11 + ) + ''; + meta = with lib; { description = "Doom editor"; homepage = "http://slade.mancubus.net/"; diff --git a/nixpkgs/pkgs/games/fallout-ce/fallout-ce.nix b/nixpkgs/pkgs/games/fallout-ce/fallout-ce.nix index 5f55743a674b..2f229fdf7380 100644 --- a/nixpkgs/pkgs/games/fallout-ce/fallout-ce.nix +++ b/nixpkgs/pkgs/games/fallout-ce/fallout-ce.nix @@ -4,13 +4,13 @@ callPackage ./build.nix rec { pname = "fallout-ce"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "alexbatalov"; repo = "fallout1-ce"; rev = "v${version}"; - hash = "sha256-EvRkOlvtiVao63S0WRKKuHlhfkdTgc0m6GTyv4EfJFU="; + hash = "sha256-ZiBoF3SL00sN0QrD3fkWG9SAknumOvzRB1oQJff6ITA="; }; extraMeta = { diff --git a/nixpkgs/pkgs/games/freeciv/default.nix b/nixpkgs/pkgs/games/freeciv/default.nix index 9ff36c949ce3..6f653c46df86 100644 --- a/nixpkgs/pkgs/games/freeciv/default.nix +++ b/nixpkgs/pkgs/games/freeciv/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "freeciv"; - version = "3.0.10"; + version = "3.1.0"; src = fetchFromGitHub { owner = "freeciv"; repo = "freeciv"; rev = "R${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-f+VJYWsfsoGLs9Ypk5cJQgn86PhsJ/6ODDjlnp84Frg="; + hash = "sha256-8cMy0O5VxVi1ffvA/Gz4BnTB0WvJptMSgM7Zu992k5k="; }; postPatch = '' @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals qtClient [ "--enable-client=qt" + "--with-qtver=qt5" "--with-qt5-includes=${qt5.qtbase.dev}/include" ] ++ lib.optionals gtkClient [ "--enable-client=gtk3.22" ] ++ lib.optional enableSqlite "--enable-fcdb=sqlite3" @@ -82,5 +83,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ pierron ]; platforms = platforms.unix; hydraPlatforms = platforms.linux; # sdl-config times out on darwin + broken = qtClient && stdenv.isDarwin; # Missing Qt5 development files }; } diff --git a/nixpkgs/pkgs/games/galaxis/default.nix b/nixpkgs/pkgs/games/galaxis/default.nix deleted file mode 100644 index a3847e73c8da..000000000000 --- a/nixpkgs/pkgs/games/galaxis/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchurl, ncurses, xmlto }: - -with lib; -stdenv.mkDerivation rec { - - pname = "galaxis"; - version = "1.10"; - - src = fetchurl{ - url = "http://www.catb.org/~esr/galaxis/${pname}-${version}.tar.gz"; - sha256 = "1181x3z4r0794v2bkpigb5fablw1nayj42wvhy2am79p7j1iqq5r"; - }; - - buildInputs = [ ncurses xmlto ]; - - patchPhase = '' - sed -i\ - -e 's|^install: galaxis\.6 uninstall|install: galaxis.6|'\ - -e 's|usr/||g' -e 's|ROOT|DESTDIR|g'\ - -e 's|install -m 755 -o 0 -g 0|install -m 755|' Makefile - ''; - - dontConfigure = true; - - makeFlags = [ "DESTDIR=$(out)" ]; - - meta = { - description = "Rescue lifeboats lost in interstellar space"; - longDescription = '' - Lifeboats from a crippled interstellar liner are adrift in a starfield. To - find them, you can place probes that look in all eight compass directions - and tell you how many lifeboats they see. If you drop a probe directly on - a lifeboat it will be revealed immediately. Your objective: find the - lifeboats as quickly as possible, before the stranded passengers run out - of oxygen! - - This is a UNIX-hosted, curses-based clone of the nifty little Macintosh - freeware game Galaxis. It doesn't have the super-simple, point-and-click - interface of the original, but compensates by automating away some of the - game's simpler deductions. - ''; - homepage = "http://catb.org/~esr/galaxis/"; - license = licenses.gpl2; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/games/gcompris/default.nix b/nixpkgs/pkgs/games/gcompris/default.nix index a9e9f860d852..c6e16da0280c 100644 --- a/nixpkgs/pkgs/games/gcompris/default.nix +++ b/nixpkgs/pkgs/games/gcompris/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "gcompris"; - version = "3.3"; + version = "4.0"; src = fetchurl { url = "mirror://kde/stable/gcompris/qt/src/gcompris-qt-${version}.tar.xz"; - hash = "sha256-8hqiq1wYw4irbOXCrwcJqTMuLISzSmSqPuw2Rn8XzQA="; + hash = "sha256-wcTqnK7ESv+jWHr5asedlkQ5rZV9iV4PLS8yQkvuDrY="; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/games/gimx/default.nix b/nixpkgs/pkgs/games/gimx/default.nix index 9c2b260f1dbf..4173ac0cc2d6 100644 --- a/nixpkgs/pkgs/games/gimx/default.nix +++ b/nixpkgs/pkgs/games/gimx/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, libusb1, xorg, libxml2 +{ stdenv, lib, fetchFromGitHub, fetchpatch +, makeWrapper, curl, libusb1, xorg, libxml2 , ncurses5, bluez, libmhash, gimxPdpGamepad ? false }: let @@ -21,7 +22,23 @@ in stdenv.mkDerivation rec { sha256 = "05kdv2qqr311c2p76hdlgvrq7b04vcpps5c80zn8b8l7p831ilgz"; }; - patches = [ ./conf.patch ]; + patches = [ + ./conf.patch + + # gcc-13 build fixes: + # https://github.com/matlo/GIMX/pull/705 + (fetchpatch { + name = "gcc-13-headers.patch"; + url = "https://github.com/matlo/GIMX/commit/4525dff4d9af672116d8c6c182707f2ad6295b2d.patch"; + hash = "sha256-LkswnFsxqADooa09yO7Yf0AbxTrGfjBObyv/6FQJvRs="; + }) + (fetchpatch { + name = "gcc-13-protos.patch"; + url = "https://github.com/matlo/GIMX/commit/f11855fcb8bd9d0cb9c94871b4111ddfd5b610df.patch"; + hash = "sha256-JL67UUsEyPcOuaimJtMviiGLGghuq9665Lg1QuiaWUU="; + }) + ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ curl libusb1 bluez libxml2 ncurses5 libmhash diff --git a/nixpkgs/pkgs/games/gnonograms/default.nix b/nixpkgs/pkgs/games/gnonograms/default.nix index 2446384ff719..c021ca46f57a 100644 --- a/nixpkgs/pkgs/games/gnonograms/default.nix +++ b/nixpkgs/pkgs/games/gnonograms/default.nix @@ -16,14 +16,14 @@ , libhandy }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnonograms"; version = "2.1.2"; src = fetchFromGitHub { owner = "jeremypw"; repo = "gnonograms"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-TkEVjrwlr4Q5FsfcdY+9fxwaMq+DFs0RwGI2E+GT5Mk="; }; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jeremypw/gnonograms"; platforms = platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/games/gnujump/default.nix b/nixpkgs/pkgs/games/gnujump/default.nix index 1c918395d40b..0fdffcf6fadb 100644 --- a/nixpkgs/pkgs/games/gnujump/default.nix +++ b/nixpkgs/pkgs/games/gnujump/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, makeDesktopItem, copyDesktopItems, fetchurl, SDL, SDL_image, SDL_mixer }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnujump"; version = "1.0.8"; src = fetchurl { - url = "mirror://gnu/gnujump/${pname}-${version}.tar.gz"; + url = "mirror://gnu/gnujump/gnujump-${finalAttrs.version}.tar.gz"; sha256 = "05syy9mzbyqcfnm0hrswlmhwlwx54f0l6zhcaq8c1c0f8dgzxhqk"; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.linux; }; -} +}) diff --git a/nixpkgs/pkgs/games/hikounomizu/default.nix b/nixpkgs/pkgs/games/hikounomizu/default.nix index bca6c8ecf8b9..6e05a17b082e 100644 --- a/nixpkgs/pkgs/games/hikounomizu/default.nix +++ b/nixpkgs/pkgs/games/hikounomizu/default.nix @@ -22,12 +22,12 @@ , bc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hikounomizu"; version = "1.0.1"; src = fetchurl { - url = "http://download.tuxfamily.org/hnm/${version}/hikounomizu-${version}-src.tar.bz2"; + url = "http://download.tuxfamily.org/hnm/${finalAttrs.version}/hikounomizu-${finalAttrs.version}-src.tar.bz2"; hash = "sha256-3wRhe6CDq1dD0SObAygfqslYJx+EM3LM3rj6HI0whYU="; }; @@ -78,4 +78,4 @@ stdenv.mkDerivation rec { license = [ licenses.gpl3Plus licenses.lal13 ]; platforms = platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/games/katago/default.nix b/nixpkgs/pkgs/games/katago/default.nix index 4a66f6cc711e..834ec0774d7a 100644 --- a/nixpkgs/pkgs/games/katago/default.nix +++ b/nixpkgs/pkgs/games/katago/default.nix @@ -19,6 +19,7 @@ , enableBigBoards ? false , enableContrib ? false , enableTcmalloc ? true +, enableTrtPlanCache ? false }: assert lib.assertOneOf "backend" backend [ "opencl" "cuda" "tensorrt" "eigen" ]; @@ -67,25 +68,15 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DNO_GIT_REVISION=ON" - ] ++ lib.optionals enableAVX2 [ - "-DUSE_AVX2=ON" - ] ++ lib.optionals (backend == "eigen") [ - "-DUSE_BACKEND=EIGEN" - ] ++ lib.optionals (backend == "cuda") [ - "-DUSE_BACKEND=CUDA" - ] ++ lib.optionals (backend == "tensorrt") [ - "-DUSE_BACKEND=TENSORRT" - ] ++ lib.optionals (backend == "opencl") [ - "-DUSE_BACKEND=OPENCL" + (lib.cmakeFeature "USE_BACKEND" (lib.toUpper backend)) + (lib.cmakeBool "USE_AVX2" enableAVX2) + (lib.cmakeBool "USE_TCMALLOC" enableTcmalloc) + (lib.cmakeBool "USE_BIGGER_BOARDS_EXPENSIVE" enableBigBoards) + (lib.cmakeBool "USE_CACHE_TENSORRT_PLAN" enableTrtPlanCache) + (lib.cmakeBool "NO_GIT_REVISION" (!enableContrib)) ] ++ lib.optionals enableContrib [ - "-DBUILD_DISTRIBUTED=1" - "-DNO_GIT_REVISION=OFF" - "-DGIT_EXECUTABLE=${fakegit}/bin/git" - ] ++ lib.optionals enableTcmalloc [ - "-DUSE_TCMALLOC=ON" - ] ++ lib.optionals enableBigBoards [ - "-DUSE_BIGGER_BOARDS_EXPENSIVE=ON" + (lib.cmakeBool "BUILD_DISTRIBUTED" true) + (lib.cmakeFeature "GIT_EXECUTABLE" "${fakegit}/bin/git") ]; preConfigure = '' diff --git a/nixpkgs/pkgs/games/lgames/ltris/default.nix b/nixpkgs/pkgs/games/lgames/ltris/default.nix deleted file mode 100644 index 8cf581b376bf..000000000000 --- a/nixpkgs/pkgs/games/lgames/ltris/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, stdenv -, fetchurl -, SDL -, SDL_mixer -, directoryListingUpdater -}: - -stdenv.mkDerivation rec { - pname = "ltris"; - version = "1.2.7"; - - src = fetchurl { - url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; - hash = "sha256-EpHGpkLQa57hU6wKLnhVosmD6DnGGPGilN8E2ClSXLA="; - }; - - buildInputs = [ - SDL - SDL_mixer - ]; - - hardeningDisable = [ "format" ]; - - passthru.updateScript = directoryListingUpdater { - inherit pname version; - url = "https://lgames.sourceforge.io/LTris/"; - extraRegex = "(?!.*-win(32|64)).*"; - }; - - meta = with lib; { - homepage = "https://lgames.sourceforge.io/LTris/"; - description = "Tetris clone from the LGames series"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ciil ]; - inherit (SDL.meta) platforms; - broken = stdenv.isDarwin; - }; -} diff --git a/nixpkgs/pkgs/games/openloco/default.nix b/nixpkgs/pkgs/games/openloco/default.nix index c884c39dafa2..df5b2ca31862 100644 --- a/nixpkgs/pkgs/games/openloco/default.nix +++ b/nixpkgs/pkgs/games/openloco/default.nix @@ -7,19 +7,19 @@ , libzip , openal , pkg-config -, span-lite , yaml-cpp +, fmt }: stdenv.mkDerivation rec { pname = "openloco"; - version = "23.02"; + version = "24.01.1"; src = fetchFromGitHub { owner = "OpenLoco"; repo = "OpenLoco"; rev = "v${version}"; - hash = "sha256-35g7tnKez4tnTdZzavfU+X8f3btFG6EbLkU+cqL6Qek="; + hash = "sha256-QkJmJGObp5irk66SSGTxjydcp3sPaCbxcjcU3XGTVfo="; }; # the upstream build process determines the version tag from git; since we @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { libzip openal yaml-cpp - span-lite + fmt ]; meta = { diff --git a/nixpkgs/pkgs/games/openttd/jgrpp.nix b/nixpkgs/pkgs/games/openttd/jgrpp.nix index 5fbe527425eb..74baeb12387e 100644 --- a/nixpkgs/pkgs/games/openttd/jgrpp.nix +++ b/nixpkgs/pkgs/games/openttd/jgrpp.nix @@ -2,13 +2,13 @@ openttd.overrideAttrs (oldAttrs: rec { pname = "openttd-jgrpp"; - version = "0.57.1"; + version = "0.58.1"; src = fetchFromGitHub rec { owner = "JGRennison"; repo = "OpenTTD-patches"; rev = "jgrpp-${version}"; - hash = "sha256-mQy+QdhEXoM9wIWvSkMgRVBXJO1ugXWS3lduccez1PQ="; + hash = "sha256-6R+biPgQyFPJD6Or6Jhm+7RZ7xe/SC6h83XVZkE+gSk="; }; buildInputs = oldAttrs.buildInputs ++ [ zstd ]; diff --git a/nixpkgs/pkgs/games/openttd/nml.nix b/nixpkgs/pkgs/games/openttd/nml.nix index cf9de289f72e..8ec8adf5f22b 100644 --- a/nixpkgs/pkgs/games/openttd/nml.nix +++ b/nixpkgs/pkgs/games/openttd/nml.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "openttd-nml"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "OpenTTD"; repo = "nml"; rev = "refs/tags/${version}"; - hash = "sha256-7Q1H8BkLnVWoZU6/mdfgBPsMt9L7oLZK8GOvbw9TpzU="; + hash = "sha256-OobTyPD7FtYMhJL3BDFXaZCOO2iPn8kjEw2OEdqQbr8="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/games/osu-lazer/bin.nix b/nixpkgs/pkgs/games/osu-lazer/bin.nix index 30affcd8f8ef..be46a964de88 100644 --- a/nixpkgs/pkgs/games/osu-lazer/bin.nix +++ b/nixpkgs/pkgs/games/osu-lazer/bin.nix @@ -7,22 +7,22 @@ let pname = "osu-lazer-bin"; - version = "2024.221.0"; + version = "2024.302.1"; src = { aarch64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - hash = "sha256-R//GKMpOelPBqRQoEHrjG56xvlZvEYqG8nJSS0iwUkM="; + hash = "sha256-fhjmYAgszAF0uNk94fDj1g4oi8PiHY5lgPc5SdF9L8I="; stripRoot = false; }; x86_64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - hash = "sha256-nz8zUbhv/rWy+MXLMBAoG3B0f4QVrhu6p/AAkrFvhVc="; + hash = "sha256-divrIWeBWjKvWxb+BANnsrUcSP2QlicFgPFpH+H2dpA="; stripRoot = false; }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - hash = "sha256-UY1HSOpcir9ybcxDuicklArynOFWkDtKqJe/LGeQOEM="; + hash = "sha256-vYG3viY9GBtgaY8ThCSWss+zzjAyVa4fmrWrQdYcUow="; }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); diff --git a/nixpkgs/pkgs/games/osu-lazer/default.nix b/nixpkgs/pkgs/games/osu-lazer/default.nix index eb9b4a670a3d..60e372a768ec 100644 --- a/nixpkgs/pkgs/games/osu-lazer/default.nix +++ b/nixpkgs/pkgs/games/osu-lazer/default.nix @@ -17,13 +17,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2024.221.0"; + version = "2024.302.1"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - hash = "sha256-isRGruIMU05/4WDI0jkgycmA0sxkBL4pu9fclTr8VtY="; + hash = "sha256-4+ACEWYgXvr8eoRJZHmTq74Bh159V+p2K+Pn1IPi2l4="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/nixpkgs/pkgs/games/osu-lazer/deps.nix b/nixpkgs/pkgs/games/osu-lazer/deps.nix index 6045847e2777..56cd9d37db82 100644 --- a/nixpkgs/pkgs/games/osu-lazer/deps.nix +++ b/nixpkgs/pkgs/games/osu-lazer/deps.nix @@ -137,7 +137,7 @@ (fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; sha256 = "1vw573mkligpx9qiqasw1683cqaa1kgnxhlnbdcj9c4320b1pwjm"; }) (fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; sha256 = "185bpvgbnd8y20r7vxb1an4pd1aal9b7b5wvmv3knz0qg8j0chd9"; }) (fetchNuGet { pname = "ppy.ManagedBass.Wasapi"; version = "2022.1216.0"; sha256 = "0h2ncf59sza8whvrwwqi8b6fcrkqrnfgfhd0vnhyw0s98nj74f0z"; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.221.0"; sha256 = "0lwvmxssd88vir3a3199i4rasn2c1v850vzcqchkc1z7h9xl3b82"; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.223.0"; sha256 = "0k97jd4kac3vzsyvgn7imx17lad8ibbrhfx1q8vglqy6w5mriqlw"; }) (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2023.1225.0-nativelibs"; sha256 = "008kj91i9486ff2q7fcgb8mmpinskvnmfsqza2m5vafh295y3h7m"; }) (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.720.0"; sha256 = "001vvxyv483ibid25fdknvij77x0y983mp4psx2lbg3x2al7yxax"; }) (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.207.0"; sha256 = "0960jg0a860f545phscimv5qw6bzijpc4pyplx126zcm1w1cpmfi"; }) diff --git a/nixpkgs/pkgs/games/pioneer/default.nix b/nixpkgs/pkgs/games/pioneer/default.nix index b70ef8c3dab6..878101a917fc 100644 --- a/nixpkgs/pkgs/games/pioneer/default.nix +++ b/nixpkgs/pkgs/games/pioneer/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "pioneer"; - version = "20220203"; + version = "20240203"; src = fetchFromGitHub{ owner = "pioneerspacesim"; repo = "pioneer"; rev = version; - hash = "sha256-HNVg8Lq6k6gQDmgOdpnBwJ57WSEnn5XwtqzmkDU1WGI="; + hash = "sha256-Jqv013VM0177VqGYR7vSvdq+67ONM91RrjcdVXNLcHs="; }; postPatch = '' diff --git a/nixpkgs/pkgs/games/powermanga/default.nix b/nixpkgs/pkgs/games/powermanga/default.nix index 25a1df5211a3..5f82eaebb8eb 100644 --- a/nixpkgs/pkgs/games/powermanga/default.nix +++ b/nixpkgs/pkgs/games/powermanga/default.nix @@ -8,12 +8,12 @@ , libpng }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "powermanga"; version = "0.93.1"; src = fetchurl { - url = "https://linux.tlk.fr/games/Powermanga/download/powermanga-${version}.tgz"; + url = "https://linux.tlk.fr/games/Powermanga/download/powermanga-${finalAttrs.version}.tgz"; sha256 = "sha256-2nU/zoOQWm2z/Y6mXHDFfWYjYshsQp1saVRBcUT5Q+g="; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; broken = stdenv.isDarwin; }; -} +}) diff --git a/nixpkgs/pkgs/games/prismlauncher/default.nix b/nixpkgs/pkgs/games/prismlauncher/default.nix index c6378fbc368f..c4571ceaa71b 100644 --- a/nixpkgs/pkgs/games/prismlauncher/default.nix +++ b/nixpkgs/pkgs/games/prismlauncher/default.nix @@ -31,13 +31,13 @@ assert lib.assertMsg (stdenv.isLinux || !gamemodeSupport) "gamemodeSupport is on stdenv.mkDerivation (finalAttrs: { pname = "prismlauncher-unwrapped"; - version = "8.0"; + version = "8.2"; src = fetchFromGitHub { owner = "PrismLauncher"; repo = "PrismLauncher"; rev = finalAttrs.version; - hash = "sha256-WBajtfj3qAMq8zd2S53CQyHiyqtvffLOHOjmOpdALAA="; + hash = "sha256-4VsoxZzi/EfEsnDvvwzg2xhj7j5B+k3gvaSqwJFDweE="; }; nativeBuildInputs = [ extra-cmake-modules cmake jdk17 ninja canonicalize-jars-hook ]; diff --git a/nixpkgs/pkgs/games/rocksndiamonds/default.nix b/nixpkgs/pkgs/games/rocksndiamonds/default.nix index 67d798f8d4a6..feef993207ea 100644 --- a/nixpkgs/pkgs/games/rocksndiamonds/default.nix +++ b/nixpkgs/pkgs/games/rocksndiamonds/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "rocksndiamonds"; - version = "4.3.8.1"; + version = "4.3.8.2"; src = fetchurl { url = "https://www.artsoft.org/RELEASES/linux/${pname}/${pname}-${version}-linux.tar.gz"; - hash = "sha256-kc8E9hyXSr8UdwDA5I4/iP6NfpV/Lso5Q//E/cV02UA="; + hash = "sha256-e/aYjjnEM6MP14FGX+N92U9fRNEjIaDfE1znl6A+4As="; }; desktopItem = makeDesktopItem { diff --git a/nixpkgs/pkgs/games/runelite/default.nix b/nixpkgs/pkgs/games/runelite/default.nix index 02c41307101f..f6d205d473bc 100644 --- a/nixpkgs/pkgs/games/runelite/default.nix +++ b/nixpkgs/pkgs/games/runelite/default.nix @@ -11,13 +11,13 @@ maven.buildMavenPackage rec { pname = "runelite"; - version = "2.6.12"; + version = "2.6.13"; src = fetchFromGitHub { owner = "runelite"; repo = "launcher"; rev = version; - hash = "sha256-lovDkEvzclZCBu/Ha8h0j595NZ4ejefEOX7lNmzb8I8="; + hash = "sha256-KE0UMtm1rypyV5FIxxiJeoP/IeSEzpzqfUyQ9UnxA0o="; }; mvnHash = "sha256-bsJlsIXIIVzZyVgEF/SN+GgpZt6v0u800arO1c5QYHk="; diff --git a/nixpkgs/pkgs/games/sgt-puzzles/default.nix b/nixpkgs/pkgs/games/sgt-puzzles/default.nix index 7361d2281113..bd56416c5918 100644 --- a/nixpkgs/pkgs/games/sgt-puzzles/default.nix +++ b/nixpkgs/pkgs/games/sgt-puzzles/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "sgt-puzzles"; - version = "20240103.7a93ae5"; + version = "20240302.80aac31"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - hash = "sha256-1pTruSF+Kl1wqTFIaYYHrvbD9p+k+1PGa5PpV4jvgEk="; + hash = "sha256-0+bmGq4wM+0/ldQz8ieKdkuG0HHazctQr9ul/qLT0gg="; }; sgt-puzzles-menu = fetchurl { diff --git a/nixpkgs/pkgs/games/steam/fhsenv.nix b/nixpkgs/pkgs/games/steam/fhsenv.nix index d5b266cece37..9c68f241a7fe 100644 --- a/nixpkgs/pkgs/games/steam/fhsenv.nix +++ b/nixpkgs/pkgs/games/steam/fhsenv.nix @@ -111,8 +111,7 @@ in buildFHSEnv rec { xorg.libXdamage xorg.libxshmfence xorg.libXxf86vm - libelf - (lib.getLib elfutils) + elfutils # Without these it silently fails xorg.libXinerama diff --git a/nixpkgs/pkgs/games/stone-kingdoms/default.nix b/nixpkgs/pkgs/games/stone-kingdoms/default.nix index 3138e1fc3aa8..3680f3af1275 100644 --- a/nixpkgs/pkgs/games/stone-kingdoms/default.nix +++ b/nixpkgs/pkgs/games/stone-kingdoms/default.nix @@ -11,13 +11,13 @@ stdenvNoCC.mkDerivation rec { pname = "stone-kingdoms"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitLab { owner = "stone-kingdoms"; repo = pname; rev = version; - hash = "sha256-qdaGowzAmMSCJrXzWLPDmyICsmvs0w+tfTsqKQewzJ8="; + hash = "sha256-W2hzJg22O857Kh7CJVVHV5qu8QKjXCwW3hmgKBc0n2g="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/games/tecnoballz/default.nix b/nixpkgs/pkgs/games/tecnoballz/default.nix index 6366e0ab06a5..f65383a37a89 100644 --- a/nixpkgs/pkgs/games/tecnoballz/default.nix +++ b/nixpkgs/pkgs/games/tecnoballz/default.nix @@ -10,12 +10,12 @@ , tinyxml }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tecnoballz"; version = "0.93.1"; src = fetchurl { - url = "https://linux.tlk.fr/games/TecnoballZ/download/tecnoballz-${version}.tgz"; + url = "https://linux.tlk.fr/games/TecnoballZ/download/tecnoballz-${finalAttrs.version}.tgz"; sha256 = "sha256-WRW76e+/eXE/KwuyOjzTPFQnKwNznbIrUrz14fnvgug="; }; @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; broken = stdenv.isDarwin; }; -} +}) diff --git a/nixpkgs/pkgs/games/titanion/default.nix b/nixpkgs/pkgs/games/titanion/default.nix index 47db68aa483e..94e04a053c4e 100644 --- a/nixpkgs/pkgs/games/titanion/default.nix +++ b/nixpkgs/pkgs/games/titanion/default.nix @@ -16,12 +16,12 @@ debianPatch = patchname: hash: fetchpatch { sha256 = hash; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "titanion"; version = "0.3"; src = fetchurl { - url = "http://abagames.sakura.ne.jp/windows/ttn${lib.replaceStrings ["."] ["_"] version}.zip"; + url = "http://abagames.sakura.ne.jp/windows/ttn${lib.replaceStrings ["."] ["_"] finalAttrs.version}.zip"; sha256 = "sha256-fR0cufi6dU898wP8KGl/vxbfQJzMmMxlYZ3QNGLajfM="; }; @@ -88,4 +88,4 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/games/toppler/default.nix b/nixpkgs/pkgs/games/toppler/default.nix index 890e13498747..fe36229363ce 100644 --- a/nixpkgs/pkgs/games/toppler/default.nix +++ b/nixpkgs/pkgs/games/toppler/default.nix @@ -15,14 +15,14 @@ , zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "toppler"; version = "1.3"; src = fetchFromGitLab { owner = "roever"; repo = "toppler"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-ecEaELu52Nmov/BD9VzcUw6wyWeHJcsKQkEzTnaW330="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/games/torus-trooper/default.nix b/nixpkgs/pkgs/games/torus-trooper/default.nix index 645abc76c807..6e39aac63ff6 100644 --- a/nixpkgs/pkgs/games/torus-trooper/default.nix +++ b/nixpkgs/pkgs/games/torus-trooper/default.nix @@ -16,12 +16,12 @@ debianPatch = patchname: hash: fetchpatch { sha256 = hash; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "torus-trooper"; version = "0.22"; src = fetchurl { - url = "http://abagames.sakura.ne.jp/windows/tt${lib.replaceStrings ["."] ["_"] version}.zip"; + url = "http://abagames.sakura.ne.jp/windows/tt${lib.replaceStrings ["."] ["_"] finalAttrs.version}.zip"; sha256 = "1yhki1fdp3fi4y2iq12vca69f6k38dqjaw9z4lwcxky5kbgb7jvg"; }; @@ -101,4 +101,4 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/games/tumiki-fighters/default.nix b/nixpkgs/pkgs/games/tumiki-fighters/default.nix index b4becea65756..344d062e08c3 100644 --- a/nixpkgs/pkgs/games/tumiki-fighters/default.nix +++ b/nixpkgs/pkgs/games/tumiki-fighters/default.nix @@ -16,12 +16,12 @@ debianPatch = patchname: hash: fetchpatch { sha256 = hash; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "tumiki-fighters"; version = "0.21"; src = fetchurl { - url = "http://abagames.sakura.ne.jp/windows/tf${lib.replaceStrings ["."] ["_"] version}.zip"; + url = "http://abagames.sakura.ne.jp/windows/tf${lib.replaceStrings ["."] ["_"] finalAttrs.version}.zip"; sha256 = "0djykfc1r8ysapklm621h89ana1c4qzc1m5nr9bqw4iccnmvwk3p"; }; @@ -94,4 +94,4 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/games/unciv/default.nix b/nixpkgs/pkgs/games/unciv/default.nix index 68bf0fc8feba..703ee9b18b9f 100644 --- a/nixpkgs/pkgs/games/unciv/default.nix +++ b/nixpkgs/pkgs/games/unciv/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.10.5"; + version = "4.10.15"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-XRm3V2JEwJJWMEVohkT+8JGcTJttYPcB1u0VNnMRxVY="; + hash = "sha256-SikrApaaGCAQc6ncqI4vRfXSgG/hgfO1wn5B5fj+W6Y="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/games/vassal/default.nix b/nixpkgs/pkgs/games/vassal/default.nix index 8395c4ac5fff..216fda688284 100644 --- a/nixpkgs/pkgs/games/vassal/default.nix +++ b/nixpkgs/pkgs/games/vassal/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.7.8"; + version = "3.7.9"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-KZIfgCOZbirstKotQhfcNvJdf3wP1L1o9Wt33ddFrfM="; + sha256 = "sha256-RvP0HhndYRrRX7ag2nwmsOoNPKXXWJXfmfZqAWSZuv8="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/games/warzone2100/default.nix b/nixpkgs/pkgs/games/warzone2100/default.nix index be2525c98716..7e6b8986109e 100644 --- a/nixpkgs/pkgs/games/warzone2100/default.nix +++ b/nixpkgs/pkgs/games/warzone2100/default.nix @@ -44,12 +44,12 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { inherit pname; version = "4.4.2"; src = fetchurl { - url = "mirror://sourceforge/project/warzone2100/releases/${version}/warzone2100_src.tar.xz"; + url = "mirror://sourceforge/project/warzone2100/releases/${finalAttrs.version}/warzone2100_src.tar.xz"; hash = "sha256-O5Yqxqp1vKYr8uvAZ1SdsI/kocOzg0KRCirCqqvLrN4="; }; @@ -142,4 +142,4 @@ stdenv.mkDerivation rec { # https://github.com/Warzone2100/warzone2100/blob/master/macosx/README.md broken = stdenv.isDarwin; }; -} +}) diff --git a/nixpkgs/pkgs/games/xskat/default.nix b/nixpkgs/pkgs/games/xskat/default.nix index 6baf397ad678..0d9fc5fe312f 100644 --- a/nixpkgs/pkgs/games/xskat/default.nix +++ b/nixpkgs/pkgs/games/xskat/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Famous german card game"; platforms = platforms.unix; - license = licenses.free; + license = licenses.xskat; longDescription = "Play the german card game Skat against the AI or over IRC."; homepage = "https://web.archive.org/web/20221003060115/https://www.xskat.de/xskat.html"; }; diff --git a/nixpkgs/pkgs/games/zaz/default.nix b/nixpkgs/pkgs/games/zaz/default.nix index 3b6c7244507c..9cfbad23c278 100644 --- a/nixpkgs/pkgs/games/zaz/default.nix +++ b/nixpkgs/pkgs/games/zaz/default.nix @@ -11,12 +11,12 @@ , freetype }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zaz"; version = "1.0.1"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/zaz/zaz-${finalAttrs.version}.tar.gz"; sha256 = "1r3bmwny05zzmdalxm5ah2rray0nnsg1w00r30p47q6x2lpwj8ml"; }; @@ -56,5 +56,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; mainProgram = "zaz"; }; -} - +}) |