From 4d44e65a92b9c6257a546be680bf10b0d39d6318 Mon Sep 17 00:00:00 2001
From: Perchun Pak <git@perchun.it>
Date: Fri, 22 May 2026 20:53:02 +0200
Subject: [PATCH 1/3] astal.source: 0-unstable-2025-11-26 ->
 0-unstable-2026-06-21

---
 pkgs/development/libraries/astal/default.nix        |  3 +++
 .../libraries/astal/modules/brightness.nix          | 13 +++++++++++++
 pkgs/development/libraries/astal/modules/greet.nix  | 11 +++++++++--
 pkgs/development/libraries/astal/modules/mpris.nix  |  4 ++++
 pkgs/development/libraries/astal/modules/notifd.nix |  2 ++
 .../development/libraries/astal/modules/quarrel.nix |  5 +++++
 pkgs/development/libraries/astal/modules/river.nix  |  3 +++
 pkgs/development/libraries/astal/modules/wl.nix     |  9 +++++++++
 pkgs/development/libraries/astal/source.nix         |  6 +++---
 9 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/libraries/astal/modules/brightness.nix
 create mode 100644 pkgs/development/libraries/astal/modules/quarrel.nix
 create mode 100644 pkgs/development/libraries/astal/modules/wl.nix

diff --git a/pkgs/development/libraries/astal/default.nix b/pkgs/development/libraries/astal/default.nix
index 227ceb161438..208c9b6f68ec 100644
--- a/pkgs/development/libraries/astal/default.nix
+++ b/pkgs/development/libraries/astal/default.nix
@@ -9,6 +9,7 @@ self: {
   auth = self.callPackage ./modules/auth.nix { };
   battery = self.callPackage ./modules/battery.nix { };
   bluetooth = self.callPackage ./modules/bluetooth.nix { };
+  brightness = self.callPackage ./modules/brightness.nix { };
   cava = self.callPackage ./modules/cava.nix { };
   gjs = self.callPackage ./modules/gjs.nix { };
   greet = self.callPackage ./modules/greet.nix { };
@@ -18,7 +19,9 @@ self: {
   network = self.callPackage ./modules/network.nix { };
   notifd = self.callPackage ./modules/notifd.nix { };
   powerprofiles = self.callPackage ./modules/powerprofiles.nix { };
+  quarrel = self.callPackage ./modules/quarrel.nix { };
   river = self.callPackage ./modules/river.nix { };
   tray = self.callPackage ./modules/tray.nix { };
   wireplumber = self.callPackage ./modules/wireplumber.nix { inherit wireplumber; };
+  wl = self.callPackage ./modules/wl.nix { };
 }
diff --git a/pkgs/development/libraries/astal/modules/brightness.nix b/pkgs/development/libraries/astal/modules/brightness.nix
new file mode 100644
index 000000000000..412d881b30c9
--- /dev/null
+++ b/pkgs/development/libraries/astal/modules/brightness.nix
@@ -0,0 +1,13 @@
+{
+  buildAstalModule,
+  json-glib,
+  quarrel,
+}:
+buildAstalModule {
+  name = "brightness";
+  buildInputs = [
+    json-glib
+    quarrel
+  ];
+  meta.description = "Astal module for brightness devices";
+}
diff --git a/pkgs/development/libraries/astal/modules/greet.nix b/pkgs/development/libraries/astal/modules/greet.nix
index 20be11464cba..f01ef1c3968d 100644
--- a/pkgs/development/libraries/astal/modules/greet.nix
+++ b/pkgs/development/libraries/astal/modules/greet.nix
@@ -1,6 +1,13 @@
-{ buildAstalModule, json-glib }:
+{
+  buildAstalModule,
+  json-glib,
+  quarrel,
+}:
 buildAstalModule {
   name = "greet";
-  buildInputs = [ json-glib ];
+  buildInputs = [
+    json-glib
+    quarrel
+  ];
   meta.description = "Astal module for greetd using IPC";
 }
diff --git a/pkgs/development/libraries/astal/modules/mpris.nix b/pkgs/development/libraries/astal/modules/mpris.nix
index 02fa7c072265..db93f55052a9 100644
--- a/pkgs/development/libraries/astal/modules/mpris.nix
+++ b/pkgs/development/libraries/astal/modules/mpris.nix
@@ -2,12 +2,16 @@
   buildAstalModule,
   gvfs,
   json-glib,
+  libsoup_3,
+  quarrel,
 }:
 buildAstalModule {
   name = "mpris";
   buildInputs = [
     gvfs
     json-glib
+    libsoup_3
+    quarrel
   ];
   meta.description = "Astal module for mpris players";
 }
diff --git a/pkgs/development/libraries/astal/modules/notifd.nix b/pkgs/development/libraries/astal/modules/notifd.nix
index a40e5c54091d..d64ecd38b1d6 100644
--- a/pkgs/development/libraries/astal/modules/notifd.nix
+++ b/pkgs/development/libraries/astal/modules/notifd.nix
@@ -2,12 +2,14 @@
   buildAstalModule,
   json-glib,
   gdk-pixbuf,
+  quarrel,
 }:
 buildAstalModule {
   name = "notifd";
   buildInputs = [
     json-glib
     gdk-pixbuf
+    quarrel
   ];
   meta.description = "Astal module for notification daemon";
 }
diff --git a/pkgs/development/libraries/astal/modules/quarrel.nix b/pkgs/development/libraries/astal/modules/quarrel.nix
new file mode 100644
index 000000000000..ee96c6de22fb
--- /dev/null
+++ b/pkgs/development/libraries/astal/modules/quarrel.nix
@@ -0,0 +1,5 @@
+{ buildAstalModule }:
+buildAstalModule {
+  name = "quarrel";
+  meta.description = "Astal module for command line argument parsing";
+}
diff --git a/pkgs/development/libraries/astal/modules/river.nix b/pkgs/development/libraries/astal/modules/river.nix
index bed2492189fe..cdbc3e6fe513 100644
--- a/pkgs/development/libraries/astal/modules/river.nix
+++ b/pkgs/development/libraries/astal/modules/river.nix
@@ -3,6 +3,9 @@ buildAstalModule {
   name = "river";
   buildInputs = [ json-glib ];
   meta.description = "Astal module for River using IPC";
+  # needs https://codeberg.org/kotontrion/wl-vapi-gen,
+  # which has 11 commits and needs to be packaged
+  meta.broken = true;
 
   postUnpack = ''
     rm -rf $sourceRoot/subprojects
diff --git a/pkgs/development/libraries/astal/modules/wl.nix b/pkgs/development/libraries/astal/modules/wl.nix
new file mode 100644
index 000000000000..699e92e5f392
--- /dev/null
+++ b/pkgs/development/libraries/astal/modules/wl.nix
@@ -0,0 +1,9 @@
+{ buildAstalModule }:
+buildAstalModule {
+  name = "wl";
+  buildInputs = [ ];
+  meta.description = "Central wayland connection manager";
+  # needs https://codeberg.org/kotontrion/wl-vapi-gen,
+  # which has 11 commits and needs to be packaged
+  meta.broken = true;
+}
diff --git a/pkgs/development/libraries/astal/source.nix b/pkgs/development/libraries/astal/source.nix
index ecd718b786a5..7e51dc43b61e 100644
--- a/pkgs/development/libraries/astal/source.nix
+++ b/pkgs/development/libraries/astal/source.nix
@@ -7,15 +7,15 @@ let
   originalDrv = fetchFromGitHub {
     owner = "Aylur";
     repo = "astal";
-    rev = "7d1fac8a4b2a14954843a978d2ddde86168c75ef";
-    hash = "sha256-Jh4VtPcK2Ov+RTcV9FtyQRsxiJmXFQGfqX6jjM7/mgc=";
+    rev = "11842ae3045c1367fb3a62a2302dba0d9ccb4a33";
+    hash = "sha256-FGZHls4eQJ8y3pvf5h3b83PfXlve3vD/Gj3g1qoAK6o=";
   };
 in
 originalDrv.overrideAttrs (
   final: prev: {
     name = "${final.pname}-${final.version}"; # fetchFromGitHub already defines name
     pname = "astal-source";
-    version = "0-unstable-2025-11-26";
+    version = "0-unstable-2026-06-21";
 
     meta = prev.meta // {
       description = "Building blocks for creating custom desktop shells (source)";

From 2cfae8e16283d5dc6a5d6b232fd82a98130be0f9 Mon Sep 17 00:00:00 2001
From: Perchun Pak <git@perchun.it>
Date: Fri, 22 May 2026 21:01:22 +0200
Subject: [PATCH 2/3] wl-vapi-gen: init at 1.1.0

---
 pkgs/by-name/wl/wl-vapi-gen/package.nix       | 42 +++++++++++++++++++
 .../libraries/astal/modules/river.nix         | 16 ++++---
 .../libraries/astal/modules/wl.nix            |  7 +---
 3 files changed, 55 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/by-name/wl/wl-vapi-gen/package.nix

diff --git a/pkgs/by-name/wl/wl-vapi-gen/package.nix b/pkgs/by-name/wl/wl-vapi-gen/package.nix
new file mode 100644
index 000000000000..6b22008deb28
--- /dev/null
+++ b/pkgs/by-name/wl/wl-vapi-gen/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitea,
+  meson,
+  ninja,
+  python3,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "wl-vapi-gen";
+  version = "1.1.0";
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "kotontrion";
+    repo = "wl-vapi-gen";
+    tag = finalAttrs.version;
+    hash = "sha256-Wi6zDrabUjIXJuxRJ9oHYfKF1ULkim/5kHGb+pl0oc4=";
+  };
+
+  postPatch = ''
+    patchShebangs wl-vapi-gen.py
+  '';
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    python3
+  ];
+
+  meta = {
+    description = "Generate vala bindings for wayland protocols";
+    homepage = "https://codeberg.org/kotontrion/wl-vapi-gen";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.PerchunPak ];
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/development/libraries/astal/modules/river.nix b/pkgs/development/libraries/astal/modules/river.nix
index cdbc3e6fe513..ad45a5308f7b 100644
--- a/pkgs/development/libraries/astal/modules/river.nix
+++ b/pkgs/development/libraries/astal/modules/river.nix
@@ -1,11 +1,17 @@
-{ buildAstalModule, json-glib }:
+{
+  buildAstalModule,
+  json-glib,
+  wl,
+  wl-vapi-gen,
+}:
 buildAstalModule {
   name = "river";
-  buildInputs = [ json-glib ];
+  nativeBuildInputs = [ wl-vapi-gen ];
+  buildInputs = [
+    json-glib
+    wl
+  ];
   meta.description = "Astal module for River using IPC";
-  # needs https://codeberg.org/kotontrion/wl-vapi-gen,
-  # which has 11 commits and needs to be packaged
-  meta.broken = true;
 
   postUnpack = ''
     rm -rf $sourceRoot/subprojects
diff --git a/pkgs/development/libraries/astal/modules/wl.nix b/pkgs/development/libraries/astal/modules/wl.nix
index 699e92e5f392..ec6fb9f53bc5 100644
--- a/pkgs/development/libraries/astal/modules/wl.nix
+++ b/pkgs/development/libraries/astal/modules/wl.nix
@@ -1,9 +1,6 @@
-{ buildAstalModule }:
+{ buildAstalModule, wl-vapi-gen }:
 buildAstalModule {
   name = "wl";
-  buildInputs = [ ];
+  nativeBuildInputs = [ wl-vapi-gen ];
   meta.description = "Central wayland connection manager";
-  # needs https://codeberg.org/kotontrion/wl-vapi-gen,
-  # which has 11 commits and needs to be packaged
-  meta.broken = true;
 }

From f44715e133c21300e696f592783353e4b9c04433 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Mar 2026 04:40:35 +0000
Subject: [PATCH 3/3] libcava: 0.10.6 -> 0.10.7

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

diff --git a/pkgs/by-name/li/libcava/package.nix b/pkgs/by-name/li/libcava/package.nix
index 0067bd5e99df..985c4283fee2 100644
--- a/pkgs/by-name/li/libcava/package.nix
+++ b/pkgs/by-name/li/libcava/package.nix
@@ -8,13 +8,13 @@
 cava.overrideAttrs (old: rec {
   pname = "libcava";
   # fork may not be updated when we update upstream
-  version = "0.10.6";
+  version = "0.10.7";
 
   src = fetchFromGitHub {
     owner = "LukashonakV";
     repo = "cava";
     tag = version;
-    hash = "sha256-63be1wypMiqhPA6sjMebmFE6yKpTj/bUE53sMWun554=";
+    hash = "sha256-zkyj1vBzHtoypX4Bxdh1Vmwh967DKKxN751v79hzmgQ=";
   };
 
   nativeBuildInputs = old.nativeBuildInputs ++ [