From 855259b311dc724f634ef2c125d51bd4a1d225fb Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Wed, 12 Aug 2026 14:23:01 +0200 Subject: [PATCH 1/3] bottles-unwrapped: 65.4 -> 67.4 --- pkgs/by-name/bo/bottles-unwrapped/package.nix | 9 +++++-- .../remove-flatpak-check.patch | 24 +++++++++---------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/bo/bottles-unwrapped/package.nix b/pkgs/by-name/bo/bottles-unwrapped/package.nix index 4e4609ff6b5f..0f9efcdae32f 100644 --- a/pkgs/by-name/bo/bottles-unwrapped/package.nix +++ b/pkgs/by-name/bo/bottles-unwrapped/package.nix @@ -30,6 +30,8 @@ libportal, libportal-gtk4, obs-studio-plugins, + libxml2, + umu-launcher, nix-update-script, removeWarningPopup ? false, withObsVkCapture ? false, @@ -37,13 +39,13 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "bottles-unwrapped"; - version = "65.4"; + version = "67.4"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = "bottles"; tag = finalAttrs.version; - hash = "sha256-59Duh4E1kMShhk/iH/SBhpmFfUjYzRClNuWqoDSbTeM="; + hash = "sha256-Ohzsg/CTmk6ix+hATCncusmN5DqWHcw8jDP0dg67r4o="; }; patches = [ @@ -70,6 +72,7 @@ python3Packages.buildPythonApplication (finalAttrs: { gtk4 # gtk4-update-icon-cache appstream-glib desktop-file-utils + libxml2 ]; buildInputs = [ @@ -101,6 +104,7 @@ python3Packages.buildPythonApplication (finalAttrs: { certifi pefile yara-python + pysocks ] ++ [ cabextract @@ -115,6 +119,7 @@ python3Packages.buildPythonApplication (finalAttrs: { mangohud vmtouch fvs2 + umu-launcher # Undocumented (subprocess.Popen()) lsb-release diff --git a/pkgs/by-name/bo/bottles-unwrapped/remove-flatpak-check.patch b/pkgs/by-name/bo/bottles-unwrapped/remove-flatpak-check.patch index b33d6d670255..fb61f0e2d20a 100644 --- a/pkgs/by-name/bo/bottles-unwrapped/remove-flatpak-check.patch +++ b/pkgs/by-name/bo/bottles-unwrapped/remove-flatpak-check.patch @@ -52,43 +52,43 @@ index f897953c..393572ed 100644 show_chooser() diff --git a/bottles/frontend/views/bottle_preferences.py b/bottles/frontend/views/bottle_preferences.py -index 2bc2235e..34db4dbd 100644 +index 0254eb92..96c73283 100644 --- a/bottles/frontend/views/bottle_preferences.py +++ b/bottles/frontend/views/bottle_preferences.py -@@ -173,9 +173,6 @@ class PreferencesView(Adw.PreferencesPage): +@@ -185,9 +185,6 @@ class PreferencesView(Adw.PreferencesPage): ) ) -- if not Xdp.Portal.running_under_sandbox(): +- if not is_cpak() and not Xdp.Portal.running_under_sandbox(): - return - _not_available = _("This feature is unavailable on your system.") _flatpak_not_available = _("{} To add this feature, please run").format( _not_available - - _not_available = _("This feature is unavailable on your system.") diff --git a/bottles/frontend/views/list.py b/bottles/frontend/views/list.py -index 6bd8fc81..0f96ab70 100644 +index 689d023f..7e7d9b89 100644 --- a/bottles/frontend/views/list.py +++ b/bottles/frontend/views/list.py -@@ -82,8 +82,6 @@ class BottlesBottleRow(Adw.ActionRow): +@@ -130,8 +130,6 @@ class BottlesBottleRow(Adw.ActionRow): def run_executable(self, *_args): """Display file dialog for executable""" -- if not Xdp.Portal.running_under_sandbox(): +- if not is_cpak() and not Xdp.Portal.running_under_sandbox(): - return def set_path(_dialog, response): if response != Gtk.ResponseType.ACCEPT: diff --git a/bottles/frontend/views/new_bottle_dialog.py b/bottles/frontend/views/new_bottle_dialog.py -index 9c386862..3ed98f7c 100644 +index 02adeb2f..d755d50d 100644 --- a/bottles/frontend/views/new_bottle_dialog.py +++ b/bottles/frontend/views/new_bottle_dialog.py -@@ -86,7 +86,7 @@ class BottlesNewBottleDialog(Adw.Dialog): - super().__init__(**kwargs) +@@ -93,9 +93,7 @@ class BottlesNewBottleDialog(Adw.Dialog): + ) # common variables and references self.window = GtkUtils.get_parent_window() -- if not self.window or not Xdp.Portal.running_under_sandbox(): +- if not self.window or ( +- not is_cpak() and not Xdp.Portal.running_under_sandbox() +- ): + if not self.window: return From 463771f568c0d11cfe4b293feee540f9f81a572f Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Wed, 12 Aug 2026 17:38:01 +0200 Subject: [PATCH 2/3] bottles-unwrapped: remove unused dependencies --- pkgs/by-name/bo/bottles-unwrapped/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/bo/bottles-unwrapped/package.nix b/pkgs/by-name/bo/bottles-unwrapped/package.nix index 0f9efcdae32f..00fc6b4ce4f0 100644 --- a/pkgs/by-name/bo/bottles-unwrapped/package.nix +++ b/pkgs/by-name/bo/bottles-unwrapped/package.nix @@ -10,7 +10,6 @@ appstream-glib, desktop-file-utils, fvs2, - librsvg, gtk4, gtksourceview5, libadwaita, @@ -27,7 +26,6 @@ vkbasalt-cli, vulkan-tools, vmtouch, - libportal, libportal-gtk4, obs-studio-plugins, libxml2, @@ -76,11 +74,9 @@ python3Packages.buildPythonApplication (finalAttrs: { ]; buildInputs = [ - librsvg gtk4 gtksourceview5 libadwaita - libportal libportal-gtk4 ]; From ef1c59d18ead33aafbe6fc3d315234ebbb322518 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 14 Aug 2026 12:01:15 +0200 Subject: [PATCH 3/3] fvs2: 0.9.0 -> 0.11.0 --- pkgs/by-name/fv/fvs2/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/fv/fvs2/package.nix b/pkgs/by-name/fv/fvs2/package.nix index 5af2caeaea38..9956fc36c9ba 100644 --- a/pkgs/by-name/fv/fvs2/package.nix +++ b/pkgs/by-name/fv/fvs2/package.nix @@ -8,22 +8,22 @@ let core = fetchFromGitHub { owner = "fvs-lab"; repo = "core"; - tag = "v0.1.1"; - hash = "sha256-vEQhV9wInqxgJlSyhgp0BV5VaYBJVtqcPrdN2NP33i4="; + tag = "v0.1.3"; + hash = "sha256-9AjUaTRBrcNr1yYakzXfLBuRCKqDIrVwrEKlQgb4m0o="; }; in buildGoModule (finalAttrs: { pname = "fvs2"; - version = "0.9.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "fvs-lab"; repo = "fvs2"; tag = "v${finalAttrs.version}"; - hash = "sha256-lJZd9QbvjArYMSXG6qHcaxaAe5UOPpko/TXD2L8yxDA="; + hash = "sha256-j/jUz/WGOy7qtGDfARtVf1Tv1thk434eRVbq3ePC7RQ="; }; - vendorHash = "sha256-FUst0ccxpZS3NjvthQQE7CVlULWPhXj8KA2cOoksLGI="; + vendorHash = "sha256-gzI8mKGJWRJqUkscOU3wXTscZO+9i6MLKCoyMLkymUY="; # Needed for build time tests nativeBuildInputs = [ git ];