From f1ac2e855c361fabe0e0c442a47df1e4b71f2cab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Apr 2026 14:54:44 +0000
Subject: [PATCH 01/15] mcp-grafana: 0.11.4 -> 0.11.6

---
 pkgs/by-name/mc/mcp-grafana/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mc/mcp-grafana/package.nix b/pkgs/by-name/mc/mcp-grafana/package.nix
index 4d5892e30507..246785e68cf1 100644
--- a/pkgs/by-name/mc/mcp-grafana/package.nix
+++ b/pkgs/by-name/mc/mcp-grafana/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "mcp-grafana";
-  version = "0.11.4";
+  version = "0.11.6";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "mcp-grafana";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sOT4rS9lEKJmQM9roLJbbs/8Y7thEr3KvwChXrsRKr4=";
+    hash = "sha256-cJjapd2phI4NgMAPzsKrs74+sEK7ykfKHQx24FVpHoQ=";
   };
 
-  vendorHash = "sha256-EXjZjXwyeH7zTgYvtMbtWh1j6xk2ybbeqvbxLz5yA+I=";
+  vendorHash = "sha256-a9VgfzJmbTudYSLqhBBnkpq37xghtxWTzpcd7rMlZmA=";
 
   ldflags = [
     "-s"

From 4ad50d60631d5ef12f487081e36a6b9b4c56f3c3 Mon Sep 17 00:00:00 2001
From: Katalin Rebhan <me@dblsaiko.net>
Date: Mon, 13 Apr 2026 14:17:07 +0200
Subject: [PATCH 02/15] nixosTests.opensmtpd: fixup for new dovecot module

---
 nixos/tests/opensmtpd.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/nixos/tests/opensmtpd.nix b/nixos/tests/opensmtpd.nix
index f613c7241134..3911bd4f29cc 100644
--- a/nixos/tests/opensmtpd.nix
+++ b/nixos/tests/opensmtpd.nix
@@ -48,7 +48,7 @@ import ./make-test-python.nix {
       };
 
     smtp2 =
-      { pkgs, ... }:
+      { config, pkgs, ... }:
       {
         imports = [ common/user-account.nix ];
         networking = {
@@ -71,15 +71,21 @@ import ./make-test-python.nix {
           serverConfiguration = ''
             listen on 0.0.0.0
             action dovecot_deliver mda \
-              "${pkgs.dovecot}/libexec/dovecot/deliver -d %{user.username}"
+              "${config.services.dovecot2.package}/libexec/dovecot/deliver -d %{user.username}"
             match from any for local action dovecot_deliver
           '';
         };
         services.dovecot2 = {
           enable = true;
-          enableImap = true;
-          mailLocation = "maildir:~/mail";
-          protocols = [ "imap" ];
+          enablePAM = true;
+          settings = {
+            dovecot_config_version = "2.4.3";
+            dovecot_storage_version = config.services.dovecot2.package.version;
+            mail_driver = "maildir";
+            mail_path = "~/mail";
+            protocols.imap = true;
+            auth_allow_cleartext = true;
+          };
         };
       };
 

From 070a701e69d11f36f7131ca7dd10138029319675 Mon Sep 17 00:00:00 2001
From: Katalin Rebhan <me@dblsaiko.net>
Date: Mon, 13 Apr 2026 14:17:07 +0200
Subject: [PATCH 03/15] nixosTests.alps: fixup for new dovecot module

---
 nixos/tests/alps.nix | 73 +++++++++++++++++++++++++-------------------
 1 file changed, 41 insertions(+), 32 deletions(-)

diff --git a/nixos/tests/alps.nix b/nixos/tests/alps.nix
index 55adcb9f3a19..ced254b1819c 100644
--- a/nixos/tests/alps.nix
+++ b/nixos/tests/alps.nix
@@ -10,40 +10,49 @@ in
   };
 
   nodes = {
-    server = {
-      imports = [ ./common/user-account.nix ];
-      security.pki.certificateFiles = [
-        certs.ca.cert
-      ];
-      networking.extraHosts = ''
-        127.0.0.1 ${domain}
-      '';
-      networking.firewall.allowedTCPPorts = [
-        25
-        465
-        993
-      ];
-      services.postfix = {
-        enable = true;
-        enableSubmission = true;
-        enableSubmissions = true;
+    server =
+      { config, ... }:
+      {
+        imports = [ ./common/user-account.nix ];
+        security.pki.certificateFiles = [
+          certs.ca.cert
+        ];
+        networking.extraHosts = ''
+          127.0.0.1 ${domain}
+        '';
+        networking.firewall.allowedTCPPorts = [
+          25
+          465
+          993
+        ];
+        services.postfix = {
+          enable = true;
+          enableSubmission = true;
+          enableSubmissions = true;
 
-        settings.main = {
-          smtp_tls_CAfile = "${certs.ca.cert}";
-          smtpd_tls_chain_files = [
-            "${certs.${domain}.key}"
-            "${certs.${domain}.cert}"
-          ];
+          settings.main = {
+            smtp_tls_CAfile = "${certs.ca.cert}";
+            smtpd_tls_chain_files = [
+              "${certs.${domain}.key}"
+              "${certs.${domain}.cert}"
+            ];
+          };
+        };
+        services.dovecot2 = {
+          enable = true;
+          enablePAM = true;
+          settings = {
+            dovecot_config_version = "2.4.3";
+            dovecot_storage_version = config.services.dovecot2.package.version;
+            mail_driver = "maildir";
+            mail_path = "~/mail";
+            protocols.imap = true;
+            ssl_server_ca_file = "${certs.ca.cert}";
+            ssl_server_cert_file = "${certs.${domain}.cert}";
+            ssl_server_key_file = "${certs.${domain}.key}";
+          };
         };
       };
-      services.dovecot2 = {
-        enable = true;
-        enableImap = true;
-        sslCACert = "${certs.ca.cert}";
-        sslServerCert = "${certs.${domain}.cert}";
-        sslServerKey = "${certs.${domain}.key}";
-      };
-    };
 
     client =
       { nodes, config, ... }:
@@ -110,7 +119,7 @@ in
     ''
       server.start()
       server.wait_for_unit("postfix.service")
-      server.wait_for_unit("dovecot2.service")
+      server.wait_for_unit("dovecot.service")
       server.wait_for_open_port(465)
       server.wait_for_open_port(993)
 

From 5d9157f0773e230ddfe4488cd039fffed75527d5 Mon Sep 17 00:00:00 2001
From: Katalin Rebhan <me@dblsaiko.net>
Date: Mon, 13 Apr 2026 14:17:07 +0200
Subject: [PATCH 04/15] nixosTests.discourse: fixup for new dovecot module

---
 nixos/tests/discourse.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/discourse.nix b/nixos/tests/discourse.nix
index 33b02a3ffe2a..89a139e254f7 100644
--- a/nixos/tests/discourse.nix
+++ b/nixos/tests/discourse.nix
@@ -85,7 +85,7 @@ in
     };
 
   nodes.client =
-    { nodes, ... }:
+    { config, nodes, ... }:
     {
       imports = [ common/user-account.nix ];
 
@@ -100,7 +100,14 @@ in
 
       services.dovecot2 = {
         enable = true;
-        protocols = [ "imap" ];
+        enablePAM = true;
+        settings = {
+          dovecot_config_version = "2.4.3";
+          dovecot_storage_version = config.services.dovecot2.package.version;
+          protocols.imap = true;
+          mail_driver = "maildir";
+          mail_path = "${config.services.postfix.settings.main.mail_spool_directory}/%{user}";
+        };
       };
 
       services.postfix = {

From db2a583e7d11082389c937adebbbbcb056c55c5c Mon Sep 17 00:00:00 2001
From: Katalin Rebhan <me@dblsaiko.net>
Date: Mon, 13 Apr 2026 14:17:07 +0200
Subject: [PATCH 05/15] nixosTests.rss2email: fixup for new dovecot module

---
 nixos/tests/rss2email.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/nixos/tests/rss2email.nix b/nixos/tests/rss2email.nix
index 490d08943734..0b3c84b315f0 100644
--- a/nixos/tests/rss2email.nix
+++ b/nixos/tests/rss2email.nix
@@ -3,7 +3,7 @@ import ./make-test-python.nix {
 
   nodes = {
     server =
-      { pkgs, ... }:
+      { config, pkgs, ... }:
       {
         imports = [ common/user-account.nix ];
         services.nginx = {
@@ -33,9 +33,14 @@ import ./make-test-python.nix {
         };
         services.dovecot2 = {
           enable = true;
-          enableImap = true;
-          mailLocation = "maildir:~/mail";
-          protocols = [ "imap" ];
+          enablePAM = true;
+          settings = {
+            dovecot_config_version = "2.4.3";
+            dovecot_storage_version = config.services.dovecot2.package.version;
+            mail_driver = "maildir";
+            mail_path = "~/mail";
+            protocols.imap = true;
+          };
         };
         environment.systemPackages =
           let
@@ -67,7 +72,7 @@ import ./make-test-python.nix {
     server.systemctl("start network-online.target")
     server.wait_for_unit("network-online.target")
     server.wait_for_unit("opensmtpd")
-    server.wait_for_unit("dovecot2")
+    server.wait_for_unit("dovecot")
     server.wait_for_unit("nginx")
     server.wait_for_unit("rss2email")
 

From 9ee15cb23d067993cf1c029feb9ae9a892b734c0 Mon Sep 17 00:00:00 2001
From: klea <klea@iwnp.org>
Date: Tue, 14 Apr 2026 16:30:09 +0000
Subject: [PATCH 06/15] vim: 9.2.0106 -> 9.2.0340

Fixes several security issues:

CVE-2026-34982 https://github.com/vim/vim/security/advisories/GHSA-8h6p-m6gr-mpw9
https://github.com/vim/vim/security/advisories/GHSA-2gmj-rpqf-pxvh
https://github.com/vim/vim/security/advisories/GHSA-jc86-w7vm-8p24
---
 pkgs/applications/editors/vim/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index afce0284b722..e34d28ccd302 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,6 +1,6 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "9.2.0106";
+  version = "9.2.0340";
 
   outputs = [
     "out"
@@ -11,7 +11,7 @@ rec {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    hash = "sha256-byOf2Gr1vA7xQw3YHV454te1QrVxRy3sXrLdFUp2XRg=";
+    hash = "sha256-jCnOVIafx+0o1nlHv7QJQrmxs1IAxh9BBshDOFdZdCM=";
   };
 
   enableParallelBuilding = true;

From c61b99ff8d5e3e6c84cdd50ce619da8d2dc1012f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Apr 2026 16:32:21 +0000
Subject: [PATCH 07/15] panache: 2.31.0 -> 2.34.0

---
 pkgs/by-name/pa/panache/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pa/panache/package.nix b/pkgs/by-name/pa/panache/package.nix
index c52b836e9961..992449bfdb44 100644
--- a/pkgs/by-name/pa/panache/package.nix
+++ b/pkgs/by-name/pa/panache/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "panache";
-  version = "2.31.0";
+  version = "2.34.0";
 
   src = fetchFromGitHub {
     owner = "jolars";
     repo = "panache";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/GOHWjIP8DsyLxxnIh0Lbh6qogFFe4+2QpF+uWhXBMU=";
+    hash = "sha256-/DgmAN89X7QqLssp3u1lV8AeWJ1LCWrtBp8QJMjtpzE=";
   };
 
-  cargoHash = "sha256-eaWmchae+HLI/oox1tgHZoRjrTt00XgQCIi9RVfTs4I=";
+  cargoHash = "sha256-1vjx4OAKsSuru0kzuQ9IlG4G99CKQndmM7hLRKH3sOo=";
 
   nativeBuildInputs = [
     installShellFiles

From 7e9c5353f60cf45c48383f9a58efaf43b3a3d87f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Apr 2026 20:37:05 +0000
Subject: [PATCH 08/15] cargo-machete: 0.9.1 -> 0.9.2

---
 pkgs/by-name/ca/cargo-machete/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-machete/package.nix b/pkgs/by-name/ca/cargo-machete/package.nix
index 54119634c2ae..67414e03e81c 100644
--- a/pkgs/by-name/ca/cargo-machete/package.nix
+++ b/pkgs/by-name/ca/cargo-machete/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-machete";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "bnjbvr";
     repo = "cargo-machete";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-4tzffZeHdhAq6/K1BGkThqT+CBa3rUw+kR7aLwnqZjc=";
+    hash = "sha256-vC7Oj42GU7YlNtP+TUp+4LH2gxGk55RZ5cOLRaiEQ3w=";
   };
 
-  cargoHash = "sha256-ahTvfxYYo3prPKDTalw2f2FPJLsPzGkE/2LCcyuniFY=";
+  cargoHash = "sha256-cmOMWJOSJxhjXVdwVdDnTORJRSZcQ8kdDUTJaIy8dbk=";
 
   # tests require internet access
   doCheck = false;

From c3f75226099c5f8c1d0bb4543c95bcf18cb1ca8b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Apr 2026 21:32:24 +0000
Subject: [PATCH 09/15] perplexity-mcp: 0-unstable-2026-03-23 ->
 0-unstable-2026-04-14

---
 pkgs/by-name/pe/perplexity-mcp/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pe/perplexity-mcp/package.nix b/pkgs/by-name/pe/perplexity-mcp/package.nix
index 14fb9ea3a67c..4784dfe39c19 100644
--- a/pkgs/by-name/pe/perplexity-mcp/package.nix
+++ b/pkgs/by-name/pe/perplexity-mcp/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "perplexity-mcp";
-  version = "0-unstable-2026-03-23";
+  version = "0-unstable-2026-04-14";
 
   src = fetchFromGitHub {
     owner = "perplexityai";
     repo = "modelcontextprotocol";
-    rev = "79ce21c5798f6993af7cac81da8067a6dc81e20d";
-    hash = "sha256-URatUVDEOmcwkIsSZ+DepeBuKS2HDu8V5niYxwtUBLE=";
+    rev = "dd5e0785520833ebc95d5e97c8fa68971dcae07b";
+    hash = "sha256-hMIPsUsI1e8bOdPQ9t6m4/vGv07NCuC8wnYLUKolNOo=";
   };
 
   npmDepsHash = "sha256-UWxUjneYQeM9GlbIr/zW2TrZuPJ2QOTKwbXKNuVazFg=";

From 3bc991b00fdadf7ef7b2eedcc38febc0f6be8270 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 16 Apr 2026 10:56:43 +1000
Subject: [PATCH 10/15] rasdaemon: add maintainer

---
 pkgs/by-name/ra/rasdaemon/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ra/rasdaemon/package.nix b/pkgs/by-name/ra/rasdaemon/package.nix
index 07cbc1bf030a..7daa019e2466 100644
--- a/pkgs/by-name/ra/rasdaemon/package.nix
+++ b/pkgs/by-name/ra/rasdaemon/package.nix
@@ -122,6 +122,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
     changelog = "${finalAttrs.meta.homepage}/releases/tag/v${finalAttrs.version}";
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.zowoq ];
   };
 })

From 10cfa23144e9aece536ff2014725eea5162d6246 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 16 Apr 2026 10:56:42 +1000
Subject: [PATCH 11/15] nixos/rasdaemon: inherit maintainers from package

---
 nixos/modules/services/hardware/rasdaemon.nix | 4 ++++
 nixos/tests/rasdaemon.nix                     | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/hardware/rasdaemon.nix b/nixos/modules/services/hardware/rasdaemon.nix
index cc1723793b9e..b33eb93ea085 100644
--- a/nixos/modules/services/hardware/rasdaemon.nix
+++ b/nixos/modules/services/hardware/rasdaemon.nix
@@ -10,6 +10,10 @@ let
 
 in
 {
+  meta = {
+    inherit (pkgs.rasdaemon.meta) maintainers;
+  };
+
   options.hardware.rasdaemon = {
 
     enable = lib.mkEnableOption "RAS logging daemon";
diff --git a/nixos/tests/rasdaemon.nix b/nixos/tests/rasdaemon.nix
index c8fc97808e50..a67c34578a6a 100644
--- a/nixos/tests/rasdaemon.nix
+++ b/nixos/tests/rasdaemon.nix
@@ -1,8 +1,8 @@
-{ ... }:
+{ pkgs, ... }:
 {
   name = "rasdaemon";
   meta = {
-    maintainers = [ ];
+    inherit (pkgs.rasdaemon.meta) maintainers;
     broken = true; # test timed out
   };
 

From 21d46f4397692d883ac45d307b28f6159e6bc363 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 16 Apr 2026 10:43:01 +1000
Subject: [PATCH 12/15] rasdaemon: add patch for ras-mc-ctl

---
 pkgs/by-name/ra/rasdaemon/package.nix               |  5 +++++
 ..._fix_invalid_column_in_signal_events_query.patch | 13 +++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/by-name/ra/rasdaemon/ras-mc-ctl_fix_invalid_column_in_signal_events_query.patch

diff --git a/pkgs/by-name/ra/rasdaemon/package.nix b/pkgs/by-name/ra/rasdaemon/package.nix
index 7daa019e2466..c8756368c802 100644
--- a/pkgs/by-name/ra/rasdaemon/package.nix
+++ b/pkgs/by-name/ra/rasdaemon/package.nix
@@ -26,6 +26,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-rk4CZrWQRe2wsx8/eXP0BIeaU/Gxmcb+Kry5F8t4YKQ=";
   };
 
+  patches = [
+    # https://github.com/mchehab/rasdaemon/pull/246
+    ./ras-mc-ctl_fix_invalid_column_in_signal_events_query.patch
+  ];
+
   strictDeps = true;
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/ra/rasdaemon/ras-mc-ctl_fix_invalid_column_in_signal_events_query.patch b/pkgs/by-name/ra/rasdaemon/ras-mc-ctl_fix_invalid_column_in_signal_events_query.patch
new file mode 100644
index 000000000000..88facf5c6001
--- /dev/null
+++ b/pkgs/by-name/ra/rasdaemon/ras-mc-ctl_fix_invalid_column_in_signal_events_query.patch
@@ -0,0 +1,13 @@
+diff --git a/util/ras-mc-ctl.in b/util/ras-mc-ctl.in
+index b00c9c1..e56402b 100755
+--- a/util/ras-mc-ctl.in
++++ b/util/ras-mc-ctl.in
+@@ -2497,7 +2497,7 @@ sub errors
+ 
+     # SIGNAL event
+     if ($has_signal == 1) {
+-	$query = "select id, timestamp, signal, errorno, code, comm, pid, grp, res from signal_event$conf{opt}{since} order by id";
++	$query = "select id, timestamp, sig, errorno, code, comm, pid, grp, res from signal_event$conf{opt}{since} order by id";
+ 	$query_handle = $dbh->prepare($query);
+ 	$query_handle->execute();
+ 	$query_handle->bind_columns(\($id, $timestamp, $signal, $errorno, $code, $comm, $pid, $grp, $res));

From bb3fb72adea545ef02488ac2cfa6870e497f99a7 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 16 Apr 2026 11:15:54 +1000
Subject: [PATCH 13/15] Revert "nixosTests.rasdaemon: mark as broken"

This reverts commit 57d2a63b1106999ce6436db91cc20bac967c1cc0.
---
 nixos/tests/rasdaemon.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/tests/rasdaemon.nix b/nixos/tests/rasdaemon.nix
index a67c34578a6a..b6f6bcbe658b 100644
--- a/nixos/tests/rasdaemon.nix
+++ b/nixos/tests/rasdaemon.nix
@@ -3,7 +3,6 @@
   name = "rasdaemon";
   meta = {
     inherit (pkgs.rasdaemon.meta) maintainers;
-    broken = true; # test timed out
   };
 
   nodes.machine =

From 57ef295d60871d2c671b038deeb24fdfa8eb447f Mon Sep 17 00:00:00 2001
From: ccicnce113424 <ccicnce113424@gmail.com>
Date: Thu, 16 Apr 2026 11:29:23 +0800
Subject: [PATCH 14/15] treewide: fix icon by moving to valid path

---
 pkgs/applications/misc/qtbitcointrader/default.nix | 2 +-
 pkgs/by-name/ai/airgorah/package.nix               | 2 +-
 pkgs/by-name/al/alisthelper/package.nix            | 5 +----
 pkgs/by-name/az/azuredatastudio/package.nix        | 2 +-
 pkgs/by-name/ba/badlion-client/package.nix         | 2 +-
 pkgs/by-name/bl/blackvoxel/package.nix             | 2 +-
 pkgs/by-name/bl/bluemail/package.nix               | 4 ++--
 pkgs/by-name/bo/bombsquad/package.nix              | 2 +-
 pkgs/by-name/ch/cherry-studio/package.nix          | 2 +-
 pkgs/by-name/cl/clockify/package.nix               | 2 +-
 pkgs/by-name/gr/graphest/package.nix               | 2 +-
 pkgs/by-name/no/notable/package.nix                | 6 ++++--
 pkgs/by-name/sh/show-midi/package.nix              | 2 +-
 pkgs/by-name/si/simple-live-app/package.nix        | 2 +-
 pkgs/by-name/sn/snowemu/package.nix                | 2 +-
 pkgs/by-name/th/thorium-reader/package.nix         | 2 +-
 pkgs/by-name/tk/tk-safe/package.nix                | 4 ++--
 pkgs/by-name/tt/tts-mod-vault/package.nix          | 2 +-
 pkgs/by-name/ve/venera/package.nix                 | 2 +-
 pkgs/by-name/vo/volanta/package.nix                | 2 +-
 pkgs/by-name/wi/winbox4/build-from-zip.nix         | 2 +-
 pkgs/by-name/wi/windterm/package.nix               | 2 +-
 pkgs/by-name/wo/wootility/package.nix              | 2 +-
 pkgs/by-name/wo/wox/package.nix                    | 2 +-
 pkgs/by-name/zo/zoho-mail-desktop/package.nix      | 6 ++++--
 25 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix
index 70e587f175c3..5a2a838b03b8 100644
--- a/pkgs/applications/misc/qtbitcointrader/default.nix
+++ b/pkgs/applications/misc/qtbitcointrader/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     qmake $qmakeFlags \
       PREFIX=$out \
       DESKTOPDIR=$out/share/applications \
-      ICONDIR=$out/share/icons/hicolor/1024x1024/apps \
+      ICONDIR=$out/share/icons \
       QtBitcoinTrader_Desktop.pro
 
     runHook postConfigure
diff --git a/pkgs/by-name/ai/airgorah/package.nix b/pkgs/by-name/ai/airgorah/package.nix
index 77f28ec81e43..16f5694ed438 100644
--- a/pkgs/by-name/ai/airgorah/package.nix
+++ b/pkgs/by-name/ai/airgorah/package.nix
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   postInstall = ''
-    install -Dm644 icons/app_icon.png $out/share/icons/hicolor/1024x1024/apps/airgorah.png
+    install -Dm644 icons/app_icon.png $out/share/icons/airgorah.png
   '';
 
   desktopItems = [
diff --git a/pkgs/by-name/al/alisthelper/package.nix b/pkgs/by-name/al/alisthelper/package.nix
index 0e79e0f962c0..9c0b0fa4b7a0 100644
--- a/pkgs/by-name/al/alisthelper/package.nix
+++ b/pkgs/by-name/al/alisthelper/package.nix
@@ -7,7 +7,6 @@
   makeDesktopItem,
   runCommand,
   yq-go,
-  imagemagick,
   _experimental-update-script-combinators,
   nix-update-script,
 }:
@@ -26,7 +25,6 @@ flutter341.buildFlutterApplication (finalAttrs: {
   pubspecLock = lib.importJSON ./pubspec.lock.json;
 
   nativeBuildInputs = [
-    imagemagick
     copyDesktopItems
   ];
 
@@ -47,8 +45,7 @@ flutter341.buildFlutterApplication (finalAttrs: {
   ];
 
   postInstall = ''
-    mkdir -p $out/share/icons/hicolor/1024x1024/apps
-    magick assets/alisthelper.png -resize 1024x1024 $out/share/icons/hicolor/1024x1024/apps/alisthelper.png
+    install -D assets/alisthelper.png $out/share/icons/alisthelper.png
   '';
 
   passthru = {
diff --git a/pkgs/by-name/az/azuredatastudio/package.nix b/pkgs/by-name/az/azuredatastudio/package.nix
index 6c1aa4a1bb77..6739d0cac653 100644
--- a/pkgs/by-name/az/azuredatastudio/package.nix
+++ b/pkgs/by-name/az/azuredatastudio/package.nix
@@ -129,7 +129,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    install -D ${targetPath}/resources/app/resources/linux/code.png $out/share/icons/hicolor/1024x1024/apps/azuredatastudio.png
+    install -D ${targetPath}/resources/app/resources/linux/code.png $out/share/icons/azuredatastudio.png
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/ba/badlion-client/package.nix b/pkgs/by-name/ba/badlion-client/package.nix
index aac370315d63..c309ec2983a3 100644
--- a/pkgs/by-name/ba/badlion-client/package.nix
+++ b/pkgs/by-name/ba/badlion-client/package.nix
@@ -23,7 +23,7 @@ appimageTools.wrapAppImage rec {
 
   extraInstallCommands = ''
     install -Dm444 ${src}/BadlionClient.desktop $out/share/applications/BadlionClient.desktop
-    install -Dm444 ${src}/BadlionClient.png -t $out/share/icons/hicolor/1024x1024/apps
+    install -Dm444 ${src}/BadlionClient.png -t $out/share/icons
     substituteInPlace $out/share/applications/BadlionClient.desktop \
       --replace-fail "Exec=AppRun --no-sandbox %U" "Exec=badlion-client"
     wrapProgram $out/bin/badlion-client \
diff --git a/pkgs/by-name/bl/blackvoxel/package.nix b/pkgs/by-name/bl/blackvoxel/package.nix
index 38faa31818c6..24428ad8a363 100644
--- a/pkgs/by-name/bl/blackvoxel/package.nix
+++ b/pkgs/by-name/bl/blackvoxel/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   postInstall = ''
-    install -Dm644 blackvoxel.png $out/share/icons/hicolor/1024x1024/apps/blackvoxel.png
+    install -Dm644 blackvoxel.png $out/share/icons/blackvoxel.png
   '';
 
   desktopItems = [
diff --git a/pkgs/by-name/bl/bluemail/package.nix b/pkgs/by-name/bl/bluemail/package.nix
index b131da910a02..6e48420afe4d 100644
--- a/pkgs/by-name/bl/bluemail/package.nix
+++ b/pkgs/by-name/bl/bluemail/package.nix
@@ -92,8 +92,8 @@ stdenv.mkDerivation rec {
     mv * $out/opt/bluemail
     ln -s $out/opt/bluemail/bluemail $out/bin/bluemail
 
-    mkdir -p $out/share/icons/hicolor/1024x1024/apps
-    ln -s $out/opt/bluemail/resources/assets/icons/bluemailx-icon.png $out/share/icons/hicolor/1024x1024/apps/bluemail.png
+    mkdir -p $out/share/icons
+    ln -s $out/opt/bluemail/resources/assets/icons/bluemailx-icon.png $out/share/icons/bluemail.png
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/bo/bombsquad/package.nix b/pkgs/by-name/bo/bombsquad/package.nix
index 054f1b11d491..700b2930652b 100644
--- a/pkgs/by-name/bo/bombsquad/package.nix
+++ b/pkgs/by-name/bo/bombsquad/package.nix
@@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
       --add-flags ${lib.escapeShellArg commandLineArgs} \
       --add-flags "-d $out/share/bombsquad"
 
-    install -Dm755 ${bombsquadIcon} $out/share/icons/hicolor/1024x1024/apps/bombsquad.png
+    install -Dm755 ${bombsquadIcon} $out/share/icons/bombsquad.png
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix
index 87b79a3b9452..890c5aed22e3 100644
--- a/pkgs/by-name/ch/cherry-studio/package.nix
+++ b/pkgs/by-name/ch/cherry-studio/package.nix
@@ -139,7 +139,7 @@ stdenv.mkDerivation (finalAttrs: {
       else
         "cp -r dist/linux-unpacked/{resources,LICENSE*} $out/opt/cherry-studio"
     }
-    install -Dm644 build/icon.png $out/share/icons/hicolor/1024x1024/apps/cherry-studio.png
+    install -Dm644 build/icon.png $out/share/icons/cherry-studio.png
     makeWrapper ${lib.getExe electron} $out/bin/cherry-studio \
       --inherit-argv0 \
       --add-flags $out/opt/cherry-studio/resources/app.asar \
diff --git a/pkgs/by-name/cl/clockify/package.nix b/pkgs/by-name/cl/clockify/package.nix
index 133293f75f87..0c20d0f69d0e 100644
--- a/pkgs/by-name/cl/clockify/package.nix
+++ b/pkgs/by-name/cl/clockify/package.nix
@@ -19,7 +19,7 @@ appimageTools.wrapType2 rec {
     in
     ''
       install -Dm 444 ${appimageContents}/clockify.desktop -t $out/share/applications
-      install -Dm 444 ${appimageContents}/clockify.png -t $out/share/icons/hicolor/1024x1024/apps
+      install -Dm 444 ${appimageContents}/clockify.png -t $out/share/icons
 
       substituteInPlace $out/share/applications/clockify.desktop \
         --replace-fail 'Exec=AppRun' 'Exec=${pname}'
diff --git a/pkgs/by-name/gr/graphest/package.nix b/pkgs/by-name/gr/graphest/package.nix
index 2c6093b385d2..1486521d5bad 100644
--- a/pkgs/by-name/gr/graphest/package.nix
+++ b/pkgs/by-name/gr/graphest/package.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
       --inherit-argv0
 
-    install -Dm444 build/icon.png $out/share/icons/hicolor/1024x1024/apps/graphest.png
+    install -Dm444 build/icon.png $out/share/icons/graphest.png
     install -Dm444 ${./mime.xml} $out/share/mime/packages/graphest.xml
   ''
   + lib.optionalString stdenv.hostPlatform.isDarwin ''
diff --git a/pkgs/by-name/no/notable/package.nix b/pkgs/by-name/no/notable/package.nix
index 771d0c4b5d75..9bea6881a001 100644
--- a/pkgs/by-name/no/notable/package.nix
+++ b/pkgs/by-name/no/notable/package.nix
@@ -36,8 +36,10 @@ appimageTools.wrapType2 rec {
 
   extraInstallCommands = ''
     install -m 444 -D ${appimageContents}/notable.desktop $out/share/applications/notable.desktop
-    install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/1024x1024/apps/notable.png \
-      $out/share/icons/hicolor/1024x1024/apps/notable.png
+    for size in 16 32 48 64 128 256 512 1024; do
+      install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/''${size}x''${size}/apps/notable.png \
+        $out/share/icons/hicolor/''${size}x''${size}/apps/notable.png
+    done
     substituteInPlace $out/share/applications/notable.desktop \
       --replace 'Exec=AppRun' 'Exec=${pname}'
     wrapProgram "$out/bin/${pname}" \
diff --git a/pkgs/by-name/sh/show-midi/package.nix b/pkgs/by-name/sh/show-midi/package.nix
index cc1001fac017..66971ddf716d 100644
--- a/pkgs/by-name/sh/show-midi/package.nix
+++ b/pkgs/by-name/sh/show-midi/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     install -Dt $out/share/ShowMIDI/themes Themes/*
 
-    install -D Design/icon.png $out/share/icons/hicolor/1024x1024/apps/show-midi.png
+    install -D Design/icon.png $out/share/icons/show-midi.png
 
     mkdir -p $out/bin $out/lib/lv2 $out/lib/vst3
     cd Builds/LinuxMakefile/build/
diff --git a/pkgs/by-name/si/simple-live-app/package.nix b/pkgs/by-name/si/simple-live-app/package.nix
index ebc2cab18324..24959753cb62 100644
--- a/pkgs/by-name/si/simple-live-app/package.nix
+++ b/pkgs/by-name/si/simple-live-app/package.nix
@@ -44,7 +44,7 @@ flutter332.buildFlutterApplication rec {
   ];
 
   postInstall = ''
-    install -Dm644 assets/logo.png $out/share/icons/hicolor/1024x1024/apps/simple-live-app.png
+    install -Dm644 assets/logo.png $out/share/icons/simple-live-app.png
   '';
 
   extraWrapProgramArgs = ''
diff --git a/pkgs/by-name/sn/snowemu/package.nix b/pkgs/by-name/sn/snowemu/package.nix
index 143ce6b49cf7..47c145d82602 100644
--- a/pkgs/by-name/sn/snowemu/package.nix
+++ b/pkgs/by-name/sn/snowemu/package.nix
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   postInstall = ''
     mv $out/bin/snow_frontend_egui $out/bin/snowemu
 
-    install -Dm644 assets/snow_icon.png $out/share/icons/hicolor/1024x1024/apps/snowemu.png
+    install -Dm644 assets/snow_icon.png $out/share/icons/snowemu.png
 
     wrapProgram $out/bin/snowemu \
       --prefix LD_LIBRARY_PATH : ${
diff --git a/pkgs/by-name/th/thorium-reader/package.nix b/pkgs/by-name/th/thorium-reader/package.nix
index ecb79563e9cf..13ae3960b747 100644
--- a/pkgs/by-name/th/thorium-reader/package.nix
+++ b/pkgs/by-name/th/thorium-reader/package.nix
@@ -31,7 +31,7 @@ buildNpmPackage (finalAttrs: {
   ];
 
   postInstall = ''
-    install -Dpm644 resources/icon.png $out/share/icons/hicolor/1024x1024/apps/thorium-reader.png
+    install -Dpm644 resources/icon.png $out/share/icons/thorium-reader.png
 
     cp -r dist/* $out/lib/node_modules/EDRLab.ThoriumReader/
 
diff --git a/pkgs/by-name/tk/tk-safe/package.nix b/pkgs/by-name/tk/tk-safe/package.nix
index 63659292d6cd..395801cce4d6 100644
--- a/pkgs/by-name/tk/tk-safe/package.nix
+++ b/pkgs/by-name/tk/tk-safe/package.nix
@@ -80,8 +80,8 @@ stdenv.mkDerivation rec {
     mv * $out/opt/tk-safe
     ln -s $out/opt/tk-safe/app/tk-safe $out/bin/tk-safe
 
-    mkdir -p $out/share/icons/hicolor/1024x1024/apps
-    ln -s $out/opt/tk-safe/meta/gui/icon.png $out/share/icons/hicolor/1024x1024/apps/tk-safe.png
+    mkdir -p $out/share/icons
+    ln -s $out/opt/tk-safe/meta/gui/icon.png $out/share/icons/tk-safe.png
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/tt/tts-mod-vault/package.nix b/pkgs/by-name/tt/tts-mod-vault/package.nix
index addbe5f6c9d3..8a4a0bd5bc6c 100644
--- a/pkgs/by-name/tt/tts-mod-vault/package.nix
+++ b/pkgs/by-name/tt/tts-mod-vault/package.nix
@@ -42,7 +42,7 @@ flutter341.buildFlutterApplication (finalAttrs: {
   '';
 
   postInstall = ''
-    install -m 444 -D assets/icon/tts_mod_vault_icon.png $out/share/icons/hicolor/1024x1024/apps/tts_mod_vault.png
+    install -m 444 -D assets/icon/tts_mod_vault_icon.png $out/share/icons/tts_mod_vault.png
   '';
 
   passthru = {
diff --git a/pkgs/by-name/ve/venera/package.nix b/pkgs/by-name/ve/venera/package.nix
index 60b873425482..b8536ed9848c 100644
--- a/pkgs/by-name/ve/venera/package.nix
+++ b/pkgs/by-name/ve/venera/package.nix
@@ -50,7 +50,7 @@ flutter341.buildFlutterApplication (finalAttrs: {
   ];
 
   postInstall = ''
-    install -D --mode=0644 debian/gui/venera.png $out/share/icons/hicolor/1024x1024/apps/venera.png
+    install -D --mode=0644 debian/gui/venera.png $out/share/icons/venera.png
   '';
 
   extraWrapProgramArgs = ''
diff --git a/pkgs/by-name/vo/volanta/package.nix b/pkgs/by-name/vo/volanta/package.nix
index ada4ec6a9c0d..7a8fcd3f64bb 100644
--- a/pkgs/by-name/vo/volanta/package.nix
+++ b/pkgs/by-name/vo/volanta/package.nix
@@ -26,7 +26,7 @@ appimageTools.wrapType2 {
   extraInstallCommands = ''
     install -m 444 -D ${appImageContents}/volanta.desktop $out/share/applications/volanta.desktop
     install -m 444 -D ${appImageContents}/volanta.png \
-      $out/share/icons/hicolor/1024x1024/apps/volanta.png
+      $out/share/icons/volanta.png
     substituteInPlace $out/share/applications/volanta.desktop \
       --replace-fail 'Exec=AppRun' 'Exec=env APPIMAGE=true volanta'
     wrapProgram $out/bin/volanta \
diff --git a/pkgs/by-name/wi/winbox4/build-from-zip.nix b/pkgs/by-name/wi/winbox4/build-from-zip.nix
index b8292df399b6..3407520a589c 100644
--- a/pkgs/by-name/wi/winbox4/build-from-zip.nix
+++ b/pkgs/by-name/wi/winbox4/build-from-zip.nix
@@ -61,7 +61,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    install -Dm644 "assets/img/winbox.png" -t "$out/share/icons/hicolor/1024x1024/apps"
+    install -Dm644 "assets/img/winbox.png" -t "$out/share/icons"
     install -Dm755 "WinBox" "$out/bin/WinBox"
 
     wrapProgram "$out/bin/WinBox" --run "${lib.getExe finalAttrs.migrationScript}"
diff --git a/pkgs/by-name/wi/windterm/package.nix b/pkgs/by-name/wi/windterm/package.nix
index 9a9db4d4af50..eb8f89de010e 100644
--- a/pkgs/by-name/wi/windterm/package.nix
+++ b/pkgs/by-name/wi/windterm/package.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     ${builtins.toJSON profiles}
     EOF
     install -Dm644 $out/app/windterm/license.txt $out/share/licenses/windterm/license.txt
-    install -Dm644 $out/app/windterm/windterm.png -t $out/share/icons/hicolor/1024x1024/apps
+    install -Dm644 $out/app/windterm/windterm.png -t $out/share/icons
     substituteInPlace $out/app/windterm/windterm.desktop \
       --replace-fail "/usr/bin/" ""
     install -Dm644 $out/app/windterm/windterm.desktop $out/share/applications/windterm.desktop
diff --git a/pkgs/by-name/wo/wootility/package.nix b/pkgs/by-name/wo/wootility/package.nix
index 3ed0d5691ad1..2cd24f49b32a 100644
--- a/pkgs/by-name/wo/wootility/package.nix
+++ b/pkgs/by-name/wo/wootility/package.nix
@@ -28,7 +28,7 @@ appimageTools.wrapType2 {
         --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
 
       install -Dm444 ${contents}/wootility.desktop -t $out/share/applications
-      install -Dm444 ${contents}/wootility.png -t $out/share/icons/hicolor/1024x1024/apps
+      install -Dm444 ${contents}/wootility.png -t $out/share/icons
       substituteInPlace $out/share/applications/wootility.desktop \
         --replace-fail 'Exec=AppRun --no-sandbox' 'Exec=wootility'
     '';
diff --git a/pkgs/by-name/wo/wox/package.nix b/pkgs/by-name/wo/wox/package.nix
index e1a4ad1f1978..b9bc340f85e7 100644
--- a/pkgs/by-name/wo/wox/package.nix
+++ b/pkgs/by-name/wo/wox/package.nix
@@ -206,7 +206,7 @@ buildGoModule {
   ];
 
   postInstall = ''
-    install -Dm644 ../assets/app.png $out/share/icons/hicolor/1024x1024/apps/wox.png
+    install -Dm644 ../assets/app.png $out/share/icons/wox.png
   '';
 
   meta = metaCommon // {
diff --git a/pkgs/by-name/zo/zoho-mail-desktop/package.nix b/pkgs/by-name/zo/zoho-mail-desktop/package.nix
index a891a7f31e1d..eb9fad51bdc0 100644
--- a/pkgs/by-name/zo/zoho-mail-desktop/package.nix
+++ b/pkgs/by-name/zo/zoho-mail-desktop/package.nix
@@ -25,8 +25,10 @@ appimageTools.wrapType2 {
     install -Dm444 ${appimageContents}/zoho-mail-desktop.desktop \
       $out/share/applications/zoho-mail-desktop.desktop
 
-    install -Dm444 ${appimageContents}/usr/share/icons/hicolor/1024x1024/apps/zoho-mail-desktop.png \
-      $out/share/icons/hicolor/1024x1024/apps/zoho-mail-desktop.png
+    for size in 16 32 48 64 128 256 512 1024; do
+      install -Dm444 ${appimageContents}/usr/share/icons/hicolor/''${size}x''${size}/apps/zoho-mail-desktop.png \
+        $out/share/icons/hicolor/''${size}x''${size}/apps/zoho-mail-desktop.png
+    done
 
     substituteInPlace $out/share/applications/zoho-mail-desktop.desktop \
       --replace-fail 'Exec=AppRun' 'Exec=${pname}'

From b71c3965ae02e6788567965c91976020509a0710 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 16 Apr 2026 10:53:09 +0300
Subject: [PATCH 15/15] mesa: 26.0.4 -> 26.0.5

Diff: https://gitlab.freedesktop.org/mesa/mesa/-/compare/mesa-26.0.4...mesa-26.0.5

Changelog: https://docs.mesa3d.org/relnotes/26.0.5.html
---
 pkgs/development/libraries/mesa/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix
index 98a47c617d02..bf631907ad72 100644
--- a/pkgs/development/libraries/mesa/common.nix
+++ b/pkgs/development/libraries/mesa/common.nix
@@ -5,14 +5,14 @@
 # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
 rec {
   pname = "mesa";
-  version = "26.0.4";
+  version = "26.0.5";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "mesa";
     repo = "mesa";
     rev = "mesa-${version}";
-    hash = "sha256-gsrqhFCxZRrTbA5MMWARrN6lFVp4Q3D5Jz7MDYbXznY=";
+    hash = "sha256-fhe3mHZQmZ3lm0XMKWWL8MKBbK5aAJCFFvDPyiI9K/A=";
   };
 
   meta = {