diff options
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/anki/bin.nix | 10 | ||||
-rw-r--r-- | pkgs/games/brogue/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/cataclysm-dda/stable.nix | 2 | ||||
-rw-r--r-- | pkgs/games/hedgewars/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/hikounomizu/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/hyperrogue/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/quake2/yquake2/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/runelite/default.nix | 74 | ||||
-rw-r--r-- | pkgs/games/warzone2100/default.nix | 15 | ||||
-rw-r--r-- | pkgs/games/xskat/default.nix | 4 |
10 files changed, 51 insertions, 68 deletions
diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index d633c594d87f5..7404be23bc641 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -3,22 +3,22 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "23.10"; + version = "23.10.1"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; - sha256 = "sha256-dfL95UKu6kwD4WHLtXlIdkf5UItEtW2WCAKP7YGlCtc="; + sha256 = "sha256-Kv0SH+bLnBSM/tYHe2kEJc4n7izZTBNWQs2nm/teLEU="; }; # For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version darwin-x86_64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg"; - sha256 = "sha256-Y8BZ7EA6Dn4+5kMCFyuXi17XDLn9YRxqVGautt9WUOo="; + sha256 = "sha256-MSlKsEv4N/H7G1bUOBlPBXerpHIW32P6Va02aRq1+54="; }; darwin-aarch64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; - sha256 = "sha256-IrKWJ16gMCR2MH8dgYUCtMj6mDQP18+HQr17hfekPIs="; + sha256 = "sha256-jEm9WJBXx77KpldzBuxK1Pu6VGiARZPnRmMhEjZdm1I="; }; }; @@ -45,7 +45,7 @@ let meta = with lib; { inherit (anki.meta) license homepage description longDescription; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; - maintainers = with maintainers; [ mahmoudk1000 atemu ]; + maintainers = with maintainers; [ mahmoudk1000 ]; }; passthru = { inherit sources; }; 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/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 6674c85c33237..94f8a28add9bd 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Turn-based strategy artillery game similar to Worms"; - homepage = "http://hedgewars.org/"; + homepage = "https://hedgewars.org/"; license = licenses.gpl2; longDescription = '' Each player controls a team of several hedgehogs. During the course of 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/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index cd24a44f92a52..2735cfff1946b 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/pkgs/games/hyperrogue/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "http://www.roguetemple.com/z/hyper/"; + homepage = "https://www.roguetemple.com/z/hyper/"; description = "A roguelike game set in hyperbolic geometry"; maintainers = with maintainers; [ rardiol ]; license = licenses.gpl2; diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix index 522a8e39fd88c..9a3597937d8ca 100644 --- a/pkgs/games/quake2/yquake2/default.nix +++ b/pkgs/games/quake2/yquake2/default.nix @@ -13,13 +13,13 @@ let yquake2 = stdenv.mkDerivation rec { pname = "yquake2"; - version = "8.20"; + version = "8.30"; src = fetchFromGitHub { owner = "yquake2"; repo = "yquake2"; rev = "QUAKE2_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-x1mk6qo03b438ZBS16/f7pzMCfugtQvaRcV+hg7Zc/w="; + sha256 = "sha256-2x/qxrhvy+An/HitmWAhmwuDJ2djMeTsLhAtijuvbzE="; }; postPatch = '' diff --git a/pkgs/games/runelite/default.nix b/pkgs/games/runelite/default.nix index 0f71164f62fd1..a4963eb2a9d1a 100644 --- a/pkgs/games/runelite/default.nix +++ b/pkgs/games/runelite/default.nix @@ -1,69 +1,63 @@ -{ pkgs, lib, stdenv, makeDesktopItem, fetchurl, unzip, makeWrapper, xorg, jre, }: - -stdenv.mkDerivation rec { +{ lib +, fetchFromGitHub +, makeDesktopItem +, makeWrapper +, maven +, jre +, xorg +, gitUpdater +}: + +maven.buildMavenPackage rec { pname = "runelite"; - version = "2.5.0"; - - jar = fetchurl { - url = "https://github.com/runelite/launcher/releases/download/${version}/RuneLite.jar"; - hash = "sha512-uEvlxXtnq7pgt8H5/hYIMu/kl32/dNojcHrPW6n2/RD/nzywreDw4kZ3G1kx0gGBY71x0RIEseEbm4BM+fhJlQ=="; - }; + version = "2.6.9"; - icon = fetchurl { - url = "https://github.com/runelite/launcher/raw/${version}/appimage/runelite.png"; - hash = "sha512-Yh8mpc6z9xd6ePe3f1f+KzrpE9r3fsdtQ0pfAvOhK/0hrCo/17eQA6v73yFXZcPQogVwm9CmJlrx4CkfzB25RQ=="; + src = fetchFromGitHub { + owner = "runelite"; + repo = "launcher"; + rev = version; + hash = "sha256-wU97uiotKZfui0ir7rmO1WLN3G6lTMxqF6vTyrlax1Q="; }; - - # The `.so` files provided by these two jars aren't detected by RuneLite for some reason, so we have to provide them manually - jogl = fetchurl { - url = "https://repo.runelite.net/net/runelite/jogl/jogl-all/2.4.0-rc-20200429/jogl-all-2.4.0-rc-20200429-natives-linux-amd64.jar"; - hash = "sha512-OmJIbk5pKtvf1n1I5UHu6iaOKNrPgmaJTPhqC8yMjaRh/Hso1vV/+Eu+zKu7d5UiVggVUzJxqDKatmEnqFrzbg=="; - }; - gluegen = fetchurl { - url = "https://repo.runelite.net/net/runelite/gluegen/gluegen-rt/2.4.0-rc-20220318/gluegen-rt-2.4.0-rc-20220318-natives-linux-amd64.jar"; - hash = "sha512-kF+RdDzYEhBuZOJ6ZwMhaEVcjYLxiwR8tYAm08FXDML45iP4HBEfmqHOLJpIakK06aQFj99/296vx810eDFX5A=="; - }; - dontUnpack = true; + mvnHash = "sha256-iGnoAZcJvaVoACi9ozG/f+A8tjvDuwn22bMRyuUU5Jg="; desktop = makeDesktopItem { name = "RuneLite"; type = "Application"; exec = "runelite"; - icon = icon; + icon = "runelite"; comment = "Open source Old School RuneScape client"; desktopName = "RuneLite"; genericName = "Oldschool Runescape"; categories = [ "Game" ]; }; - nativeBuildInputs = [ makeWrapper unzip ]; - installPhase = '' - mkdir -p $out/share/runelite - mkdir -p $out/share/applications - mkdir -p $out/natives + # tests require internet :( + mvnParameters = "-Dmaven.test.skip"; + nativeBuildInputs = [ makeWrapper ]; - unzip ${jogl} 'natives/*' -d $out - unzip ${gluegen} 'natives/*' -d $out + installPhase = '' + mkdir -p $out/share/icons - ln -s ${jar} $out/share/runelite/RuneLite.jar - ln -s ${desktop}/share/applications/RuneLite.desktop $out/share/applications/RuneLite.desktop + cp target/RuneLite.jar $out/share + cp appimage/runelite.png $out/share/icons - # RuneLite looks for `.so` files in $PWD/natives, so ensure that we set the PWD to the right place makeWrapper ${jre}/bin/java $out/bin/runelite \ - --chdir "$out" \ --prefix LD_LIBRARY_PATH : "${xorg.libXxf86vm}/lib" \ - --add-flags "-jar $out/share/runelite/RuneLite.jar" + --add-flags "-jar $out/share/RuneLite.jar" ''; - meta = with lib; { + passthru.updateScript = gitUpdater { }; + + meta = { description = "Open source Old School RuneScape client"; homepage = "https://runelite.net/"; - sourceProvenance = with sourceTypes; [ + sourceProvenance = with lib.sourceTypes; [ binaryBytecode binaryNativeCode ]; - license = licenses.bsd2; - maintainers = with maintainers; [ kmeakin ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ kmeakin moody ]; platforms = [ "x86_64-linux" ]; + mainProgram = "runelite"; }; } 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 diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix index 74c2be586ceb6..6baf397ad678d 100644 --- a/pkgs/games/xskat/default.nix +++ b/pkgs/games/xskat/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 imake ]; src = fetchurl { - url = "http://www.xskat.de/xskat-${version }.tar.gz"; + url = "https://web.archive.org/web/20220331112433if_/https://www.xskat.de/xskat-${version}.tar.gz"; sha256 = "8ba52797ccbd131dce69b96288f525b0d55dee5de4008733f7a5a51deb831c10"; }; @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.free; longDescription = "Play the german card game Skat against the AI or over IRC."; - homepage = "http://www.xskat.de/"; + homepage = "https://web.archive.org/web/20221003060115/https://www.xskat.de/xskat.html"; }; } |