From a676ad0643660e15953b97d33d82db73c07fd20d Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Wed, 12 Nov 2025 02:48:53 +0100
Subject: [PATCH 1/3] alpaca: 8.2.2 -> 8.3.1

---
 pkgs/by-name/al/alpaca/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix
index 92ef58cba418..5747a7b8a68e 100644
--- a/pkgs/by-name/al/alpaca/package.nix
+++ b/pkgs/by-name/al/alpaca/package.nix
@@ -31,14 +31,14 @@ let
 in
 pythonPackages.buildPythonApplication rec {
   pname = "alpaca";
-  version = "8.2.2";
+  version = "8.3.1";
   pyproject = false; # Built with meson
 
   src = fetchFromGitHub {
     owner = "Jeffser";
     repo = "Alpaca";
     tag = version;
-    hash = "sha256-i1qNLV+oKkZlS/v8jfJJc67lJBuW6j2Uz93vb1StD6g=";
+    hash = "sha256-X3kITzZBcpN3kYDiT2PTu9UvuWQ/XSq3tVYYMa1btnY=";
   };
 
   nativeBuildInputs = [

From f53dac85931735abd21bde46a900d220b05bcb9a Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Wed, 12 Nov 2025 02:50:45 +0100
Subject: [PATCH 2/3] alpaca: fix the integrated web-browser

---
 pkgs/by-name/al/alpaca/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix
index 5747a7b8a68e..2b9f22054ea4 100644
--- a/pkgs/by-name/al/alpaca/package.nix
+++ b/pkgs/by-name/al/alpaca/package.nix
@@ -20,6 +20,7 @@
   libportal,
   webkitgtk_6_0,
   pipewire,
+  glib-networking,
 }:
 
 let
@@ -60,6 +61,7 @@ pythonPackages.buildPythonApplication rec {
     libportal
     webkitgtk_6_0
     pipewire # pipewiresrc
+    glib-networking
   ];
 
   dependencies =

From 50afa26caac1a2bcedcb6c5b785ab71ff932f4fc Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Wed, 12 Nov 2025 02:54:27 +0100
Subject: [PATCH 3/3] alpaca: fix integrated terminal

---
 pkgs/by-name/al/alpaca/package.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix
index 2b9f22054ea4..508f03ffc0a0 100644
--- a/pkgs/by-name/al/alpaca/package.nix
+++ b/pkgs/by-name/al/alpaca/package.nix
@@ -21,6 +21,8 @@
   webkitgtk_6_0,
   pipewire,
   glib-networking,
+  bash,
+  fetchpatch,
 }:
 
 let
@@ -42,6 +44,19 @@ pythonPackages.buildPythonApplication rec {
     hash = "sha256-X3kITzZBcpN3kYDiT2PTu9UvuWQ/XSq3tVYYMa1btnY=";
   };
 
+  # TODO: remove in the next release
+  patches = [
+    (fetchpatch {
+      url = "https://patch-diff.githubusercontent.com/raw/Jeffser/Alpaca/pull/1043.patch";
+      hash = "sha256-y0NiT0FvyB/fKvi+5E0hSzDs1Ds2ydqRO1My83bnmYY=";
+    })
+  ];
+
+  postPatch = ''
+    substituteInPlace src/widgets/activities/terminal.py \
+      --replace-fail "['bash', '-c', ';\n'.join(self.prepare_script())]," "['${bash}/bin/bash', '-c', ';\n'.join(self.prepare_script())],"
+  '';
+
   nativeBuildInputs = [
     appstream
     meson