diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-04-01 18:00:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-01 18:00:59 +0000 |
| commit | ef44d4677532e2a1e3fb0fe4bb3e0c73faa416dd (patch) | |
| tree | c67eacd9068be4d954124a4a8a8791d9757b3c19 /pkgs/games | |
| parent | 2f73b699a30bd1f976d55ee2c22176de288a9486 (diff) | |
| parent | 790bb39e577479e3a5cf760c73e0048b70457d75 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/anki/bin.nix | 10 | ||||
| -rw-r--r-- | pkgs/games/widelands/default.nix | 7 |
2 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index d6789f63b82dc..ee293cb7c962f 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.12.1"; + version = "24.04"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; - sha256 = "sha256-bFtAUqSoFS8CWESiepWXywndkijATbWp6CJdqlQecuk="; + sha256 = "sha256-mIQ448ecBDrMo3qspXVOBJM/0LebJ9lA1JIwz70Uqhc="; }; # 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-z48REB14p7rb50ty9u/26wx0sY4QZb4pj6wOXsSBCdg="; + sha256 = "sha256-ab8cc+QMt3ZJp1NZmAwz2VNZwWQK0DBPKnz2fGmC7Fs="; }; darwin-aarch64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; - sha256 = "sha256-bdaCqSjje86wmVKIFZqzuFaEZ7SWQr7CAS/Hm1CpOMg="; + sha256 = "sha256-bRpPVOXpDRq+EXwW1yWiAgzkcdLhLnMrHo/t9Jgzth0="; }; }; @@ -60,7 +60,7 @@ let ''; # Dependencies of anki - targetPkgs = pkgs: (with pkgs; [ xorg.libxkbfile xcb-util-cursor-HEAD krb5 ]); + targetPkgs = pkgs: (with pkgs; [ xorg.libxkbfile xcb-util-cursor-HEAD krb5 zstd ]); runScript = writeShellScript "anki-wrapper.sh" '' exec ${unpacked}/bin/anki ${ lib.strings.escapeShellArgs commandLineArgs } "$@" diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix index f49921024e45f..324f388e716e9 100644 --- a/pkgs/games/widelands/default.nix +++ b/pkgs/games/widelands/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "widelands"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "widelands"; repo = "widelands"; rev = "v${version}"; - sha256 = "sha256-fe1fey34b6T1+kqMa22STROu7dagQJtg24nW2jhVix8="; + sha256 = "sha256-V7eappIMEQMNbf9EGQhv71Fwz0wH679ifi/qAHWwMNU="; }; postPatch = '' @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-Wno-dev" # dev warnings are only needed for upstream development + "-DCMAKE_BUILD_TYPE=Release" "-DWL_INSTALL_BASEDIR=${placeholder "out"}/share/widelands" # for COPYING, Changelog, etc. "-DWL_INSTALL_DATADIR=${placeholder "out"}/share/widelands" # for game data "-DWL_INSTALL_BINDIR=${placeholder "out"}/bin" @@ -92,7 +93,7 @@ stdenv.mkDerivation rec { Settlers II". It has a single player campaign mode, as well as a networked multiplayer mode. ''; - changelog = "https://github.com/widelands/widelands/releases/tag/v1.1"; + changelog = "https://github.com/widelands/widelands/releases/tag/v${version}"; mainProgram = "widelands"; license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin jcumming ]; |