diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-03-15 18:16:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-15 18:16:46 +0000 |
| commit | 4915d2cb4cf2ee22446bf16f566f43d78cf29584 (patch) | |
| tree | 9bb247a4089f58a47c3bb40cc3b04da0722e2f66 /pkgs/games | |
| parent | dec95bae4a3fce008fab10836f4d5d0c43baf9cf (diff) | |
| parent | 529607debbfed484fb7a1ed79b526ca8821927a1 (diff) | |
| download | nixlib-4915d2cb4cf2ee22446bf16f566f43d78cf29584.tar nixlib-4915d2cb4cf2ee22446bf16f566f43d78cf29584.tar.gz nixlib-4915d2cb4cf2ee22446bf16f566f43d78cf29584.tar.bz2 nixlib-4915d2cb4cf2ee22446bf16f566f43d78cf29584.tar.lz nixlib-4915d2cb4cf2ee22446bf16f566f43d78cf29584.tar.xz nixlib-4915d2cb4cf2ee22446bf16f566f43d78cf29584.tar.zst nixlib-4915d2cb4cf2ee22446bf16f566f43d78cf29584.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/katago/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/games/openrct2/default.nix | 8 |
2 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix index 283aa70f8d0d..50b6caee6214 100644 --- a/pkgs/games/katago/default.nix +++ b/pkgs/games/katago/default.nix @@ -6,7 +6,6 @@ , cudnn , eigen , fetchFromGitHub -, fetchpatch , gperftools , lib , libzip @@ -34,14 +33,14 @@ let in env.mkDerivation rec { pname = "katago"; - version = "1.8.0"; - githash = "8ffda1fe05c69c67342365013b11225d443445e8"; + version = "1.8.1"; + githash = "73bc3e38b3490cbe00179c9c37f5385dfd60c6bc"; src = fetchFromGitHub { owner = "lightvector"; repo = "katago"; rev = "v${version}"; - sha256 = "18r75xjj6vv2gbl92k9aa5bd0cxf09zl1vxlji148y0xbvgv6p8c"; + sha256 = "sha256-Rj6fgj1ZQgYhz6TrZk5b8dCMsCPk5N3qN3kgqV+UEDc="; }; fakegit = writeShellScriptBin "git" "echo ${githash}"; @@ -96,10 +95,13 @@ in env.mkDerivation rec { ''; installPhase = '' + runHook preInstall mkdir -p $out/bin; cp katago $out/bin; '' + lib.optionalString enableCuda '' wrapProgram $out/bin/katago \ --prefix LD_LIBRARY_PATH : "/run/opengl-driver/lib" + '' + '' + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index 912d0da59a06..e210efade03a 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -5,20 +5,20 @@ }: let - version = "0.3.2"; + version = "0.3.3"; openrct2-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${version}"; - sha256 = "1fd32wniiy6qz2046ppqfj2sb3rf2qf086rf9v1bdhyj254d0b1z"; + sha256 = "01nanpbz5ycdhkyd46fjfvj18sw729l4vk7xg12600f9rjngjk76"; }; objects-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "objects"; - rev = "v1.0.18"; - sha256 = "1v9424kxdppg8vszv0vyq91lzljkrjc3nmk58wbwlpcwj6dip07s"; + rev = "v1.0.21"; + sha256 = "0r2vp2y67jc1mpfl4j83sx5khvvaddx7xs26ppkigmr2d1xpxgr7"; }; title-sequences-src = fetchFromGitHub { |