From 6d8e84900baf2affd06a2071c623ce1aa1f5e7a7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:11:36 +0000 Subject: [PATCH] =?UTF-8?q?quadrapassel:=2040.2=20=E2=86=92=2049.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/quadrapassel/-/compare/40.2...49.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/qu/quadrapassel/package.nix | 45 +++++++++++------------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/qu/quadrapassel/package.nix b/pkgs/by-name/qu/quadrapassel/package.nix index 0efef1f7a502..04952a443542 100644 --- a/pkgs/by-name/qu/quadrapassel/package.nix +++ b/pkgs/by-name/qu/quadrapassel/package.nix @@ -3,71 +3,68 @@ lib, fetchurl, pkg-config, - gtk3, + gtk4, + libadwaita, + libgee, + pango, gnome, - adwaita-icon-theme, gdk-pixbuf, librsvg, gsound, libmanette, - gettext, itstool, - libxml2, - clutter, - clutter-gtk, - wrapGAppsHook3, + blueprint-compiler, + wrapGAppsHook4, meson, ninja, - python3, vala, desktop-file-utils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "quadrapassel"; - version = "40.2"; + version = "49.rc"; src = fetchurl { - url = "mirror://gnome/sources/quadrapassel/${lib.versions.major version}/quadrapassel-${version}.tar.xz"; - hash = "sha256-C9giQUIHxzEj7WpJ9yPaWsjdTfXTXtwJn/6i4TmcwAo="; + url = "mirror://gnome/sources/quadrapassel/${lib.versions.major finalAttrs.version}/quadrapassel-${finalAttrs.version}.tar.xz"; + hash = "sha256-Mr71UXopmxkapqwi0XMDJZBhN15MYyadMpwOVt7bEP4="; }; nativeBuildInputs = [ meson ninja - python3 vala desktop-file-utils pkg-config - adwaita-icon-theme - libxml2 itstool - gettext - wrapGAppsHook3 + blueprint-compiler + wrapGAppsHook4 ]; buildInputs = [ - gtk3 + gtk4 + libadwaita + libgee + pango gdk-pixbuf librsvg libmanette gsound - clutter - libxml2 - clutter-gtk ]; passthru = { - updateScript = gnome.updateScript { packageName = "quadrapassel"; }; + updateScript = gnome.updateScript { + packageName = "quadrapassel"; + }; }; meta = { description = "Classic falling-block game, Tetris"; mainProgram = "quadrapassel"; homepage = "https://gitlab.gnome.org/GNOME/quadrapassel"; - changelog = "https://gitlab.gnome.org/GNOME/quadrapassel/-/blob/${version}/NEWS?ref_type=tags"; + changelog = "https://gitlab.gnome.org/GNOME/quadrapassel/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = lib.licenses.gpl2Plus; teams = [ lib.teams.gnome ]; platforms = lib.platforms.linux; }; -} +})