From 76fe1041bea3c84e2984b588b581b2c870483516 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 21 Nov 2024 20:02:57 +0800 Subject: [PATCH 1/4] pantheon.sideload: 6.2.2 -> 6.3.0 https://github.com/elementary/sideload/compare/6.2.2...6.3.0 --- pkgs/desktops/pantheon/apps/sideload/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix index 1178e36033607..8aec7fbb38681 100644 --- a/pkgs/desktops/pantheon/apps/sideload/default.nix +++ b/pkgs/desktops/pantheon/apps/sideload/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "sideload"; - version = "6.2.2"; + version = "6.3.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-7qwjZpEvB0eHIRsXv8jU7fVhbCIYI6tqJYmYvZR8oLo="; + sha256 = "sha256-2tYdcHx77XN2iu2PKXAKwOtb4TOFt3Igv17w2zIxqT4="; }; nativeBuildInputs = [ From 7a36e6ddbdecaaf90e7412c8982e0c6b50d2cb2a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 21 Nov 2024 20:04:11 +0800 Subject: [PATCH 2/4] pantheon.elementary-gtk-theme: 8.1.0 -> 8.2.0 https://github.com/elementary/stylesheet/compare/8.1.0...8.2.0 --- .../pantheon/artwork/elementary-gtk-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index 49aa9382eb84d..91b7ce32a3052 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -11,13 +11,13 @@ stdenvNoCC.mkDerivation rec { pname = "elementary-gtk-theme"; - version = "8.1.0"; + version = "8.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = "stylesheet"; rev = version; - sha256 = "sha256-ZhqgvTbZN0lVAZ1nWy/Pvg7EdMYZIn8B5h1nmWo5E8E="; + sha256 = "sha256-l7E5o7JNqfJZzKpyvsjIVd2i9fwLh4Qn8oJ/S5RlFQ8="; }; nativeBuildInputs = [ From 35d963f9c5c769a63510072cbeff6725925410e7 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 21 Nov 2024 20:06:36 +0800 Subject: [PATCH 3/4] pantheon.switchboard-plug-about: Backport fwupd 2.0.0 support See fwupd@fbcffc7 ("Use typdef enums in more places to ensure type safety"). --- .../pantheon/apps/switchboard-plugs/about/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index 51fbfb7cc3709..d4683e87899ba 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , meson , ninja @@ -32,6 +33,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-6b6nuOp4pEufHEmTraSfKpbtPuO3Z9hQJfvKuuyy7as="; }; + patches = [ + # Fix build with fwupd 2.0.0 + # https://github.com/elementary/switchboard-plug-about/pull/343 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-about/commit/6f8ba61cb3d82229e19358ede81b77f66dbb06a2.patch"; + hash = "sha256-E9itq/KGzw36S1dAFoCowa/A2/f6Shx9F379nEIM2qI="; + }) + ]; + nativeBuildInputs = [ meson ninja From d8e545500a7adbf0a4c010dee1c055f33248c232 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 21 Nov 2024 20:08:32 +0800 Subject: [PATCH 4/4] pantheon.elementary-settings-daemon: Backport fwupd 2.0.0 support See fwupd@fbcffc7 ("Use typdef enums in more places to ensure type safety"). --- .../services/elementary-settings-daemon/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 744c546987b56..5c84dffec72a0 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , meson , ninja @@ -34,6 +35,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-w5dRQPRsM52wqusTLLPmKmVwoBFS+pHOokfDmCDxVWM="; }; + patches = [ + # Fix build with fwupd 2.0.0 + # https://github.com/elementary/settings-daemon/pull/169 + (fetchpatch { + url = "https://github.com/elementary/settings-daemon/commit/f9f9e6c49ef89451ad45aa8314769a0358a5e481.patch"; + hash = "sha256-zLONUqRwODK3JXaoymztEfOIJONJpwcTp5AWv0Vl+EI="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils gobject-introspection