From ffb35e7cf522c4f5166da7a7efc0856152a32b1b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Mar 2023 15:38:08 +0000 Subject: [PATCH] =?UTF-8?q?libadwaita:=201.3.beta=20=E2=86=92=201.3.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libadwaita/-/compare/1.3.beta...1.3.rc These commits will be backported to 1.3.x when the freeze is over. https://gitlab.gnome.org/GNOME/libadwaita/-/merge_requests/786#note_1689002 Co-authored-by: Bobby Rong Changelog-Reviewed-By: Jan Tojnar --- .../libraries/libadwaita/default.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 55f4a3ad3db6..b03c4c3535f0 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , gi-docgen , meson , ninja @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.3.beta"; + version = "1.3.rc"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -30,9 +31,23 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-SqJrWaGIfqxmd6OxiIWa3QfFUZgnoWKGsu6/+0QPlyI="; + hash = "sha256-Xb1sNT1KpWspRkjuPBcAaRMXtVpXnjhm+V2FkNthEKk="; }; + patches = [ + # Fixes for the broken carousel test + # https://github.com/NixOS/nixpkgs/pull/218143#issuecomment-1456610692 + # https://gitlab.gnome.org/GNOME/libadwaita/-/merge_requests/786 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libadwaita/-/commit/cbfd8e57d5ba684c8744f6955e0435e7a09b993e.patch"; + hash = "sha256-nVJD5Eu4gjyfIJf4/6e/ah10/dSxjLk5weWKxSP8byE="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libadwaita/-/commit/78dc3b1dc8527b29c8610a1ad3dee82c8b2b3771.patch"; + hash = "sha256-Nthf5crWjNlAPI+8SQ7YfUBCcmCJrHcfkpankqSm+Ic="; + }) + ]; + depsBuildBuild = [ pkg-config ];