From bbc869511ecb6a153cf8f7d445dacdefbd3dbcc3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Sep 2024 01:37:43 +0000 Subject: [PATCH 1/2] chiaki-ng: 1.8.1 -> 1.9.0 --- pkgs/games/chiaki-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/chiaki-ng/default.nix b/pkgs/games/chiaki-ng/default.nix index cc183cb7c1da..6ef2bb380fff 100644 --- a/pkgs/games/chiaki-ng/default.nix +++ b/pkgs/games/chiaki-ng/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "chiaki-ng"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "streetpea"; repo = "chiaki-ng"; rev = "v${version}"; - hash = "sha256-wYshjduufxTxLzU2462ZRCj9WP/PZoJUOC/kGzus8ew="; + hash = "sha256-7+AixZu74y1V+rUauVswPzuWX2x6n3MJoM2A2w4zyuI="; fetchSubmodules = true; }; From dc7d86c51c69cb29be1f187948bd8e87e688d30a Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Fri, 20 Sep 2024 07:35:47 -0500 Subject: [PATCH 2/2] chiaki-ng: remove pinned libplacebo version --- pkgs/top-level/all-packages.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f04b72cc7cc..a1f547a41900 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34934,16 +34934,7 @@ with pkgs; chiaki = libsForQt5.callPackage ../games/chiaki { }; - chiaki-ng = kdePackages.callPackage ../games/chiaki-ng { - libplacebo = libplacebo.overrideAttrs (old: { - version = "6.338.2-unstable-2024-01-29"; - src = old.src.override { - # broken with 7.349.0 -- pinning to rev used by upstream https://github.com/streetpea/chiaki-ng/blob/96d535db41bb9c3b37fbffcf2402d51e891ff960/scripts/build-libplacebo.sh#L9 - rev = "c320f61e601caef2be081ce61138e5d51c1be21d"; - hash = "sha256-ZlKYgWz/Rkp4IPt6cJ+KNnzBB2s8jGZEamSAOIGyDuE="; - }; - }); - }; + chiaki-ng = kdePackages.callPackage ../games/chiaki-ng { }; clonehero = callPackage ../games/clonehero { };