From 8292d56c430f3a4724bd09cc9f52dbb7d06ad35f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Mar 2026 04:39:39 +0000
Subject: [PATCH 01/91] deskflow: 1.25.0 -> 1.26.0

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

diff --git a/pkgs/by-name/de/deskflow/package.nix b/pkgs/by-name/de/deskflow/package.nix
index e391c3410856..f159d015d3a3 100644
--- a/pkgs/by-name/de/deskflow/package.nix
+++ b/pkgs/by-name/de/deskflow/package.nix
@@ -32,13 +32,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "deskflow";
-  version = "1.25.0";
+  version = "1.26.0";
 
   src = fetchFromGitHub {
     owner = "deskflow";
     repo = "deskflow";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IclKXYCvYHMK4e1z1efmOHUaJqnmZgofK5r6Ml+i5OI=";
+    hash = "sha256-XcSG47Ysjn+wrJH5DC/XXGXcneXcW7xIhAn6sguuv+s=";
   };
 
   postPatch = ''

From 004a5b908d637b6bcd8d949e2c929cfd63648a1d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 23:35:20 +0000
Subject: [PATCH 02/91] opencolorio: 2.5.1 -> 2.5.2

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

diff --git a/pkgs/by-name/op/opencolorio/package.nix b/pkgs/by-name/op/opencolorio/package.nix
index 64c6ef1defee..a18f3a0f3843 100644
--- a/pkgs/by-name/op/opencolorio/package.nix
+++ b/pkgs/by-name/op/opencolorio/package.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation rec {
   pname = "opencolorio";
-  version = "2.5.1";
+  version = "2.5.2";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "OpenColorIO";
     rev = "v${version}";
-    hash = "sha256-iI32dnGZdizLBOs7IQtmLUYMPWxadvWNeqZjy49AWb0=";
+    hash = "sha256-b4tdQ9VH9M7hAD5Uuxu4QKwwpaVwroj/Bvg+Zsy0M1M=";
   };
 
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''

From b82f9c4f6295e05099340ea35b098955baa1cc31 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 May 2026 17:37:48 +0000
Subject: [PATCH 03/91] blender: 5.1.1 -> 5.1.2

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

diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix
index b4ee49c517aa..db6861b8c26d 100644
--- a/pkgs/by-name/bl/blender/package.nix
+++ b/pkgs/by-name/bl/blender/package.nix
@@ -116,12 +116,12 @@ in
 
 stdenv'.mkDerivation (finalAttrs: {
   pname = "blender";
-  version = "5.1.1";
+  version = "5.1.2";
 
   src = fetchzip {
     name = "source";
     url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";
-    hash = "sha256-iJolR8iS2go0doO96ibyseCeMunFL+XPoQ25NbX6oOA=";
+    hash = "sha256-FnReSNsP8U1/4jSgZN3cMQV2qkP7OZPh0f/9JA1lAxs=";
   };
 
   patches = [

From 341137ac3ce1c6ad7d07c677c92fb52fdde8f951 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Thu, 14 May 2026 02:21:26 -0400
Subject: [PATCH 04/91] libreoffice-bin: 25.8.6 -> 26.2.4

---
 pkgs/applications/office/libreoffice/darwin/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/default.nix
index 2798742204e2..5a36fda68a8b 100644
--- a/pkgs/applications/office/libreoffice/darwin/default.nix
+++ b/pkgs/applications/office/libreoffice/darwin/default.nix
@@ -9,21 +9,21 @@
 let
   appName = "LibreOffice.app";
   scriptName = "soffice";
-  version = "25.8.6";
+  version = "26.2.4";
 
   dist = {
     aarch64-darwin = rec {
       arch = "aarch64";
       archSuffix = arch;
       url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg";
-      sha256 = "57ddee0f8ef2d06fd7a9b0e3cf191107e6cb97ec03f0a7f6b137f732e251fde2";
+      sha256 = "64e0ad05564554eeee639d49b08b20908a38d4722ec95f1620d05c99bcbe9fb1";
     };
 
     x86_64-darwin = rec {
       arch = "x86_64";
       archSuffix = "x86-64";
       url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg";
-      sha256 = "017c64b6e2992db9cbb44f9b1fc3fd2ede3e332c8b481746b780b8a282f09692";
+      sha256 = "f92ba40fdada173232fe929bf77973a1ffcccec55ae7971957a6de84d33f0f1e";
     };
   };
 in

From 5a6eff4063456c6a811fa79c07af06c642fad0a9 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Mon, 15 Jun 2026 21:29:59 +0700
Subject: [PATCH 05/91] python3Packages.xstatic-asciinema-player: migrate to
 pyproject

---
 .../python-modules/xstatic-asciinema-player/default.nix      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/xstatic-asciinema-player/default.nix b/pkgs/development/python-modules/xstatic-asciinema-player/default.nix
index fc28f23bcdd9..6e75a387f2b1 100644
--- a/pkgs/development/python-modules/xstatic-asciinema-player/default.nix
+++ b/pkgs/development/python-modules/xstatic-asciinema-player/default.nix
@@ -2,12 +2,13 @@
   buildPythonPackage,
   lib,
   fetchPypi,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "xstatic-asciinema-player";
   version = "2.6.1.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "XStatic-asciinema-player";
@@ -15,6 +16,8 @@ buildPythonPackage rec {
     hash = "sha256-yA6WC067St82Dm6StaCKdWrRBhmNemswetIO8iodfcw=";
   };
 
+  build-system = [ setuptools ];
+
   # no tests implemented
   doCheck = false;
 

From c8b4c4ff0e63dd8cfe448e0426bf3ef6e53fd78f Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Mon, 15 Jun 2026 21:31:02 +0700
Subject: [PATCH 06/91] python3Packages.xstatic-asciinema-player: modernize

---
 .../xstatic-asciinema-player/default.nix               | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/xstatic-asciinema-player/default.nix b/pkgs/development/python-modules/xstatic-asciinema-player/default.nix
index 6e75a387f2b1..595c898b9b92 100644
--- a/pkgs/development/python-modules/xstatic-asciinema-player/default.nix
+++ b/pkgs/development/python-modules/xstatic-asciinema-player/default.nix
@@ -5,14 +5,16 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "xstatic-asciinema-player";
   version = "2.6.1.1";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
     pname = "XStatic-asciinema-player";
-    inherit version;
+    inherit (finalAttrs) version;
     hash = "sha256-yA6WC067St82Dm6StaCKdWrRBhmNemswetIO8iodfcw=";
   };
 
@@ -21,10 +23,12 @@ buildPythonPackage rec {
   # no tests implemented
   doCheck = false;
 
+  pythonImportsCheck = [ "xstatic.pkg.asciinema_player" ];
+
   meta = {
     homepage = "https://github.com/python-xstatic/asciinema-player";
     description = "Asciinema-player packaged for python";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ aither64 ];
   };
-}
+})

From f101a8b6084ef6375c54caf54d47bfa739c176fa Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Mon, 15 Jun 2026 21:32:02 +0700
Subject: [PATCH 07/91] python3Packages.xstatic-asciinema-player: fix
 meta.homepage URL

---
 .../python-modules/xstatic-asciinema-player/default.nix         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/xstatic-asciinema-player/default.nix b/pkgs/development/python-modules/xstatic-asciinema-player/default.nix
index 595c898b9b92..c46ae917ccef 100644
--- a/pkgs/development/python-modules/xstatic-asciinema-player/default.nix
+++ b/pkgs/development/python-modules/xstatic-asciinema-player/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage (finalAttrs: {
   pythonImportsCheck = [ "xstatic.pkg.asciinema_player" ];
 
   meta = {
-    homepage = "https://github.com/python-xstatic/asciinema-player";
+    homepage = "https://github.com/xstatic-py/xstatic-asciinema-player";
     description = "Asciinema-player packaged for python";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ aither64 ];

From 669874b4515ba82311d26d0f8a0984b149d95e03 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 20 Jun 2026 22:05:45 +0200
Subject: [PATCH 08/91] maintaines: remove trepetti

---
 maintainers/maintainer-list.nix                       | 6 ------
 maintainers/team-list.nix                             | 1 -
 pkgs/by-name/fu/fujprog/package.nix                   | 2 +-
 pkgs/by-name/le/lemon-graph/package.nix               | 2 +-
 pkgs/by-name/ma/marker/package.nix                    | 1 -
 pkgs/by-name/no/noaa-apt/package.nix                  | 1 -
 pkgs/by-name/op/openroad/package.nix                  | 1 -
 pkgs/by-name/sv/svlint/package.nix                    | 2 +-
 pkgs/by-name/sv/svls/package.nix                      | 2 +-
 pkgs/development/python-modules/pyverilog/default.nix | 2 +-
 pkgs/development/python-modules/rfcat/default.nix     | 2 +-
 pkgs/development/python-modules/svglib/default.nix    | 2 +-
 12 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3b887d7d83a8..c7c6d89d2b67 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -28350,12 +28350,6 @@
     githubId = 207457;
     name = "Matthieu Chevrier";
   };
-  trepetti = {
-    email = "trepetti@cs.columbia.edu";
-    github = "trepetti";
-    githubId = 25440339;
-    name = "Tom Repetti";
-  };
   trespaul = {
     email = "paul@trespaul.com";
     github = "trespaul";
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 0f89279d11ed..3645b4e8befb 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -736,7 +736,6 @@ with lib.maintainers;
       dduan
       samasaur
       stephank
-      trepetti
     ];
     scope = "Maintain Swift compiler suite for NixOS.";
     shortName = "Swift";
diff --git a/pkgs/by-name/fu/fujprog/package.nix b/pkgs/by-name/fu/fujprog/package.nix
index 87363e2402c7..be9d78e695ef 100644
--- a/pkgs/by-name/fu/fujprog/package.nix
+++ b/pkgs/by-name/fu/fujprog/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "fujprog";
     homepage = "https://github.com/kost/fujprog";
     license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ trepetti ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
     changelog = "https://github.com/kost/fujprog/releases/tag/v${finalAttrs.version}";
   };
diff --git a/pkgs/by-name/le/lemon-graph/package.nix b/pkgs/by-name/le/lemon-graph/package.nix
index ca1ea2a627cc..21bb819ce076 100644
--- a/pkgs/by-name/le/lemon-graph/package.nix
+++ b/pkgs/by-name/le/lemon-graph/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://lemon.cs.elte.hu/trac/lemon";
     description = "Efficient library for combinatorial optimization tasks on graphs and networks";
     license = lib.licenses.boost;
-    maintainers = with lib.maintainers; [ trepetti ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/ma/marker/package.nix b/pkgs/by-name/ma/marker/package.nix
index 5a79599b0881..f22d93f73584 100644
--- a/pkgs/by-name/ma/marker/package.nix
+++ b/pkgs/by-name/ma/marker/package.nix
@@ -55,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://fabiocolacio.github.io/Marker/";
     description = "Markdown editor for the Linux desktop made with GTK3";
     maintainers = with lib.maintainers; [
-      trepetti
       aleksana
     ];
     license = lib.licenses.gpl3Plus;
diff --git a/pkgs/by-name/no/noaa-apt/package.nix b/pkgs/by-name/no/noaa-apt/package.nix
index 43a451a2c90b..9790b51beee7 100644
--- a/pkgs/by-name/no/noaa-apt/package.nix
+++ b/pkgs/by-name/no/noaa-apt/package.nix
@@ -60,7 +60,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://noaa-apt.mbernardi.com.ar/";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [
-      trepetti
       tmarkus
     ];
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/op/openroad/package.nix b/pkgs/by-name/op/openroad/package.nix
index 295af9848ab8..c93e1076f5ed 100644
--- a/pkgs/by-name/op/openroad/package.nix
+++ b/pkgs/by-name/op/openroad/package.nix
@@ -183,7 +183,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.bsd3;
     mainProgram = "openroad";
     maintainers = with lib.maintainers; [
-      trepetti
       hzeller
     ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
diff --git a/pkgs/by-name/sv/svlint/package.nix b/pkgs/by-name/sv/svlint/package.nix
index ab034ccce9f5..816b2e51d2c7 100644
--- a/pkgs/by-name/sv/svlint/package.nix
+++ b/pkgs/by-name/sv/svlint/package.nix
@@ -26,6 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/dalance/svlint";
     changelog = "https://github.com/dalance/svlint/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ trepetti ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/sv/svls/package.nix b/pkgs/by-name/sv/svls/package.nix
index 6afe43436a5d..21c7f35669ac 100644
--- a/pkgs/by-name/sv/svls/package.nix
+++ b/pkgs/by-name/sv/svls/package.nix
@@ -22,6 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "svls";
     homepage = "https://github.com/dalance/svls";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ trepetti ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/development/python-modules/pyverilog/default.nix b/pkgs/development/python-modules/pyverilog/default.nix
index 02bfa9ff45d5..a22a0abfba21 100644
--- a/pkgs/development/python-modules/pyverilog/default.nix
+++ b/pkgs/development/python-modules/pyverilog/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/PyHDI/Pyverilog";
     description = "Python-based Hardware Design Processing Toolkit for Verilog HDL";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ trepetti ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/rfcat/default.nix b/pkgs/development/python-modules/rfcat/default.nix
index 58acfd52f50a..689706172c31 100644
--- a/pkgs/development/python-modules/rfcat/default.nix
+++ b/pkgs/development/python-modules/rfcat/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage rec {
     description = "Swiss Army knife of sub-GHz ISM band radio";
     homepage = "https://github.com/atlas0fd00m/rfcat";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ trepetti ];
+    maintainers = [ ];
     changelog = "https://github.com/atlas0fd00m/rfcat/releases/tag/v${version}";
   };
 }
diff --git a/pkgs/development/python-modules/svglib/default.nix b/pkgs/development/python-modules/svglib/default.nix
index 24e202a5aa23..a9be7a710a11 100644
--- a/pkgs/development/python-modules/svglib/default.nix
+++ b/pkgs/development/python-modules/svglib/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/deeplook/svglib";
     changelog = "https://github.com/deeplook/svglib/blob/v${version}/CHANGELOG.rst";
     license = lib.licenses.lgpl3Only;
-    maintainers = with lib.maintainers; [ trepetti ];
+    maintainers = [ ];
   };
 }

From 29d4c28ad718031c1cd5f57c906531a240d01463 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 20 Jun 2026 22:10:56 +0200
Subject: [PATCH 09/91] maintainers: remove vbmithr

---
 maintainers/maintainer-list.nix                  | 6 ------
 pkgs/development/ocaml-modules/pcre/default.nix  | 4 +---
 pkgs/development/ocaml-modules/react/default.nix | 1 -
 pkgs/development/tools/ocaml/findlib/default.nix | 4 +---
 4 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3b887d7d83a8..fa0e1b7d569c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -29020,12 +29020,6 @@
     githubId = 2612464;
     name = "Vincent Laporte";
   };
-  vbmithr = {
-    email = "vb@luminar.eu.org";
-    github = "vbmithr";
-    githubId = 797581;
-    name = "Vincent Bernardoff";
-  };
   vbrandl = {
     name = "Valentin Brandl";
     email = "mail+nixpkgs@vbrandl.net";
diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix
index b5c6020c5947..11a345cebeb4 100644
--- a/pkgs/development/ocaml-modules/pcre/default.nix
+++ b/pkgs/development/ocaml-modules/pcre/default.nix
@@ -23,8 +23,6 @@ buildDunePackage (finalAttrs: {
     homepage = "https://mmottl.github.io/pcre-ocaml";
     description = "Efficient C-library for pattern matching with Perl-style regular expressions in OCaml";
     license = lib.licenses.lgpl21Plus;
-    maintainers = with lib.maintainers; [
-      vbmithr
-    ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix
index cb096401a66c..4cd701032331 100644
--- a/pkgs/development/ocaml-modules/react/default.nix
+++ b/pkgs/development/ocaml-modules/react/default.nix
@@ -34,7 +34,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.bsd3;
     inherit (ocaml.meta) platforms;
     maintainers = with lib.maintainers; [
-      vbmithr
       gal_bolle
     ];
   };
diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index 6864132d99c3..b7888b3d4b29 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -90,9 +90,7 @@ stdenv.mkDerivation rec {
     description = "O'Caml library manager";
     homepage = "http://projects.camlcity.org/projects/findlib.html";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [
-      vbmithr
-    ];
+    maintainers = [ ];
     mainProgram = "ocamlfind";
     platforms = ocaml.meta.platforms or [ ];
   };

From e5ebfc9291158dea9b09acf8e1d602b45098e7b7 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 20 Jun 2026 22:13:52 +0200
Subject: [PATCH 10/91] maintainers: remove afldcr

---
 maintainers/maintainer-list.nix     | 6 ------
 pkgs/by-name/po/polybar/package.nix | 1 -
 2 files changed, 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3b887d7d83a8..b94cd328172f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -772,12 +772,6 @@
     githubId = 168;
     name = "Alexander Flatter";
   };
-  afldcr = {
-    email = "alex@fldcr.com";
-    github = "afldcr";
-    githubId = 335271;
-    name = "James Alexander Feldman-Crough";
-  };
   afontain = {
     email = "afontain@posteo.net";
     github = "necessarily-equal";
diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix
index 1890481c389c..6dbc1090a714 100644
--- a/pkgs/by-name/po/polybar/package.nix
+++ b/pkgs/by-name/po/polybar/package.nix
@@ -132,7 +132,6 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      afldcr
       moni
     ];
     mainProgram = "polybar";

From a08d0192d83b0cacad1e178b508885a554b57b3b Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 20 Jun 2026 22:16:47 +0200
Subject: [PATCH 11/91] maintainers: remove f4814n

---
 maintainers/maintainer-list.nix                | 6 ------
 nixos/modules/services/games/quake3-server.nix | 2 --
 pkgs/by-name/ra/razergenie/package.nix         | 4 +---
 pkgs/by-name/rc/rcon/package.nix               | 2 +-
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3b887d7d83a8..f9188df8acf7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8648,12 +8648,6 @@
     github = "f2k1de";
     githubId = 11199213;
   };
-  f4814n = {
-    email = "me@f4814n.de";
-    github = "f4814";
-    githubId = 11909469;
-    name = "Fabian Geiselhart";
-  };
   f4z3r = {
     email = "f4z3r-github@pm.me";
     name = "Jakob Beckmann";
diff --git a/nixos/modules/services/games/quake3-server.nix b/nixos/modules/services/games/quake3-server.nix
index 9a94ce2293db..43aad73a4b04 100644
--- a/nixos/modules/services/games/quake3-server.nix
+++ b/nixos/modules/services/games/quake3-server.nix
@@ -127,6 +127,4 @@ in
         };
       };
     };
-
-  meta.maintainers = with lib.maintainers; [ f4814n ];
 }
diff --git a/pkgs/by-name/ra/razergenie/package.nix b/pkgs/by-name/ra/razergenie/package.nix
index 0e5f5ad38ca8..6104d7eeb5a1 100644
--- a/pkgs/by-name/ra/razergenie/package.nix
+++ b/pkgs/by-name/ra/razergenie/package.nix
@@ -74,9 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Qt application for configuring your Razer devices under GNU/Linux";
     mainProgram = "razergenie";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [
-      f4814n
-    ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/rc/rcon/package.nix b/pkgs/by-name/rc/rcon/package.nix
index 2ac7ad475d0d..c19772fe4d8c 100644
--- a/pkgs/by-name/rc/rcon/package.nix
+++ b/pkgs/by-name/rc/rcon/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/n0la/rcon";
     description = "Source RCON client for command line";
-    maintainers = with lib.maintainers; [ f4814n ];
+    maintainers = [ ];
     platforms = with lib.platforms; linux ++ darwin;
     license = lib.licenses.bsd2;
     mainProgram = "rcon";

From 82f5fdbac446d0f5ac273312d07dff8710fb07f0 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 20 Jun 2026 22:24:56 +0200
Subject: [PATCH 12/91] maintainers: remove deepfire

---
 maintainers/maintainer-list.nix                 | 6 ------
 pkgs/by-name/au/aurulent-sans/package.nix       | 2 +-
 pkgs/by-name/ch/chntpw/package.nix              | 2 +-
 pkgs/by-name/op/openwsman/package.nix           | 2 +-
 pkgs/by-name/sa/sayonara/package.nix            | 2 +-
 pkgs/by-name/sb/sblim-sfcc/package.nix          | 2 +-
 pkgs/by-name/xf/xfs-undelete/package.nix        | 2 +-
 pkgs/development/tools/irony-server/default.nix | 2 +-
 8 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3b887d7d83a8..7a6601daf9fe 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6544,12 +6544,6 @@
     githubId = 48378098;
     name = "Danila Danko";
   };
-  deepfire = {
-    email = "_deepfire@feelingofgreen.ru";
-    github = "deepfire";
-    githubId = 452652;
-    name = "Kosyrev Serge";
-  };
   DeeUnderscore = {
     email = "d.anzorge@gmail.com";
     github = "DeeUnderscore";
diff --git a/pkgs/by-name/au/aurulent-sans/package.nix b/pkgs/by-name/au/aurulent-sans/package.nix
index 162664f9f879..4dd1754302ac 100644
--- a/pkgs/by-name/au/aurulent-sans/package.nix
+++ b/pkgs/by-name/au/aurulent-sans/package.nix
@@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation rec {
     description = "Aurulent Sans";
     longDescription = "Aurulent Sans is a humanist sans serif intended to be used as an interface font.";
     homepage = "http://delubrum.org/";
-    maintainers = with lib.maintainers; [ deepfire ];
+    maintainers = [ ];
     license = lib.licenses.ofl;
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/ch/chntpw/package.nix b/pkgs/by-name/ch/chntpw/package.nix
index fe3d1e9e34aa..85229cf74f3b 100644
--- a/pkgs/by-name/ch/chntpw/package.nix
+++ b/pkgs/by-name/ch/chntpw/package.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://pogostick.net/~pnh/ntpasswd/";
     description = "Utility to reset the password of any user that has a valid local account on a Windows system";
-    maintainers = with lib.maintainers; [ deepfire ];
+    maintainers = [ ];
     license = lib.licenses.gpl2Only;
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/op/openwsman/package.nix b/pkgs/by-name/op/openwsman/package.nix
index 2fb657312206..5dccd50555ad 100644
--- a/pkgs/by-name/op/openwsman/package.nix
+++ b/pkgs/by-name/op/openwsman/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     downloadPage = "https://github.com/Openwsman/openwsman/releases";
     homepage = "https://openwsman.github.io";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ deepfire ];
+    maintainers = [ ];
     platforms = lib.platforms.linux; # PAM is not available on Darwin
   };
 })
diff --git a/pkgs/by-name/sa/sayonara/package.nix b/pkgs/by-name/sa/sayonara/package.nix
index 87ba38c1cf00..4a34c298a366 100644
--- a/pkgs/by-name/sa/sayonara/package.nix
+++ b/pkgs/by-name/sa/sayonara/package.nix
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Sayonara music player";
     homepage = "https://sayonara-player.com/";
     license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ deepfire ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/sb/sblim-sfcc/package.nix b/pkgs/by-name/sb/sblim-sfcc/package.nix
index 3013bb600e97..ce0ebffca886 100644
--- a/pkgs/by-name/sb/sblim-sfcc/package.nix
+++ b/pkgs/by-name/sb/sblim-sfcc/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
     description = "Small Footprint CIM Client Library";
     homepage = "https://sourceforge.net/projects/sblim/";
     license = lib.licenses.cpl10;
-    maintainers = with lib.maintainers; [ deepfire ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/xf/xfs-undelete/package.nix b/pkgs/by-name/xf/xfs-undelete/package.nix
index 0da90eddb8e6..5d6595b43a96 100644
--- a/pkgs/by-name/xf/xfs-undelete/package.nix
+++ b/pkgs/by-name/xf/xfs-undelete/package.nix
@@ -54,6 +54,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/ianka/xfs_undelete";
     license = lib.licenses.gpl3;
     platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.deepfire ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix
index df196cf112eb..37e146d6732c 100644
--- a/pkgs/development/tools/irony-server/default.nix
+++ b/pkgs/development/tools/irony-server/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     description = "Server part of irony";
     mainProgram = "irony-server";
     homepage = "https://melpa.org/#/irony";
-    maintainers = [ lib.maintainers.deepfire ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
     license = lib.licenses.free;
   };

From 66d04231d742c3c28703f90cd7d48fcff56cf488 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sun, 21 Jun 2026 12:10:53 +0200
Subject: [PATCH 13/91] aurulent-sans: add pancaek as maintainer

---
 pkgs/by-name/au/aurulent-sans/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/au/aurulent-sans/package.nix b/pkgs/by-name/au/aurulent-sans/package.nix
index 4dd1754302ac..6ffa590a1c8f 100644
--- a/pkgs/by-name/au/aurulent-sans/package.nix
+++ b/pkgs/by-name/au/aurulent-sans/package.nix
@@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation rec {
     description = "Aurulent Sans";
     longDescription = "Aurulent Sans is a humanist sans serif intended to be used as an interface font.";
     homepage = "http://delubrum.org/";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ pancaek ];
     license = lib.licenses.ofl;
     platforms = lib.platforms.all;
   };

From 57cbfa4e94b939000bc1509338633f858a795b28 Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Sun, 21 Jun 2026 17:00:30 +0000
Subject: [PATCH 14/91] detect-it-easy: 3.10 -> 3.21

---
 ...-remove-hard-coded-paths-in-xoptions.patch | 44 -------------------
 pkgs/by-name/de/detect-it-easy/package.nix    | 20 +++++++--
 2 files changed, 17 insertions(+), 47 deletions(-)
 delete mode 100644 pkgs/by-name/de/detect-it-easy/0001-remove-hard-coded-paths-in-xoptions.patch

diff --git a/pkgs/by-name/de/detect-it-easy/0001-remove-hard-coded-paths-in-xoptions.patch b/pkgs/by-name/de/detect-it-easy/0001-remove-hard-coded-paths-in-xoptions.patch
deleted file mode 100644
index 02ca8649949e..000000000000
--- a/pkgs/by-name/de/detect-it-easy/0001-remove-hard-coded-paths-in-xoptions.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/XOptions/xoptions.cpp b/XOptions/xoptions.cpp
-index 8c887c3..36cdbc3 100755
---- a/XOptions/xoptions.cpp
-+++ b/XOptions/xoptions.cpp
-@@ -1754,14 +1754,7 @@ bool XOptions::checkNative(const QString &sIniFileName)
- #if defined(Q_OS_MAC)
-     bResult = true;
- #elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
--    QString sApplicationDirPath = qApp->applicationDirPath();
--
--    if ((sApplicationDirPath == "/bin") || (sApplicationDirPath == "/usr/bin") || (sApplicationDirPath == "/usr/local/bin") || (sApplicationDirPath == "/app/bin") ||
--        (sApplicationDirPath.contains("/usr/local/bin$")) || isAppImage()) {
--        bResult = true;
--    } else {
--        bResult = false;
--    }
-+    bResult = true;
- #elif defined(Q_OS_WIN)
-     QString sApplicationDirPath = qApp->applicationDirPath();
- 
-@@ -1788,22 +1781,7 @@ QString XOptions::getApplicationDataPath()
- #ifdef Q_OS_MAC
-     sResult = sApplicationDirPath + "/../Resources";
- #elif defined(Q_OS_LINUX)
--    if (isNative()) {
--        if (sApplicationDirPath.contains("/usr/local/bin$")) {
--            QString sPrefix = sApplicationDirPath.section("/usr/local/bin", 0, 0);
--
--            sResult += sPrefix + QString("/usr/local/lib/%1").arg(qApp->applicationName());
--        } else {
--            if (sApplicationDirPath.contains("/tmp/.mount_"))  // AppImage
--            {
--                sResult = sApplicationDirPath.section("/", 0, 2);
--            }
--
--            sResult += QString("/usr/lib/%1").arg(qApp->applicationName());
--        }
--    } else {
--        sResult = sApplicationDirPath;
--    }
-+    sResult = sApplicationDirPath + "/../lib/die";
- #elif defined(Q_OS_FREEBSD)
-     sResult = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation).at(1) + QDir::separator() + qApp->applicationName();
- #else
diff --git a/pkgs/by-name/de/detect-it-easy/package.nix b/pkgs/by-name/de/detect-it-easy/package.nix
index 000e587214f6..a6a1060eb8ff 100644
--- a/pkgs/by-name/de/detect-it-easy/package.nix
+++ b/pkgs/by-name/de/detect-it-easy/package.nix
@@ -13,17 +13,31 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "detect-it-easy";
-  version = "3.10";
+  version = "3.21";
 
   src = fetchFromGitHub {
     owner = "horsicq";
     repo = "DIE-engine";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-yHgxYig5myY2nExweUk2muKbJTKN3SiwOLgQcMIY/BQ=";
+    hash = "sha256-gst0suw5mNR3A0s/jIfte41cOOxKR0IsTFkO7ydwKMs=";
   };
 
-  patches = [ ./0001-remove-hard-coded-paths-in-xoptions.patch ];
+  postPatch = ''
+        # Convert CRLF to LF so substituteInPlace works
+        tr -d '\r' < XOptions/xoptions.cpp > XOptions/xoptions.cpp.tmp
+        mv XOptions/xoptions.cpp.tmp XOptions/xoptions.cpp
+
+        substituteInPlace XOptions/xoptions.cpp \
+          --replace-fail 'QString XOptions::getApplicationDataPath()
+    {
+        QString sResult;' 'QString XOptions::getApplicationDataPath()
+    {
+    #if defined(Q_OS_LINUX)
+        return qApp->applicationDirPath() + "/../lib/die";
+    #endif
+        QString sResult;'
+  '';
 
   buildInputs = [
     libsForQt5.qtbase

From 34613b1c072b1186c74558daee49cb72ef769b2b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Jun 2026 15:02:32 +0000
Subject: [PATCH 15/91] kak-tree-sitter-unwrapped: 3.2.1 -> 3.2.2

---
 pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix b/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix
index bd5090c83370..c5bd601b5317 100644
--- a/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix
+++ b/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "kak-tree-sitter-unwrapped";
-  version = "3.2.1";
+  version = "3.2.2";
 
   src = fetchFromSourcehut {
     owner = "~hadronized";
     repo = "kak-tree-sitter";
     rev = "kak-tree-sitter-v${finalAttrs.version}";
-    hash = "sha256-w+taJzr9tPLXdpV5RLTedVGR48Qodq/4M5IhlKAM/lU=";
+    hash = "sha256-RzPfQstjHdfLH6cF6KuMXB/J7UeR9DeJRypnGdb89TQ=";
   };
 
-  cargoHash = "sha256-ztVBBeLU1AByDz3yVDMZ102bDG6JfL/6IoJlcqRmCmU=";
+  cargoHash = "sha256-5hCBFQsZpUyPlgO/iUmBXmdcC5ceG1w4IiB27oBxRxQ=";
 
   passthru = {
     updateScript = nix-update-script { };

From d8a592339a349e82234e16cc1662f77da942d076 Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Thu, 25 Jun 2026 16:18:41 -0300
Subject: [PATCH 16/91] sd: do not install workspace xtask helper

The sd 1.1.0 Cargo workspace builds both the sd CLI and an internal
xtask build helper. Restrict cargo build/test to the sd-cli package so
only the intended binary is installed.

Resolves #512682

Assisted-by: Grok 4.3 (xAI)
---
 pkgs/by-name/sd/sd/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/sd/sd/package.nix b/pkgs/by-name/sd/sd/package.nix
index 4fa27641f1f0..e81eb4a00c00 100644
--- a/pkgs/by-name/sd/sd/package.nix
+++ b/pkgs/by-name/sd/sd/package.nix
@@ -18,6 +18,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-iOCIX7hq8RqRihVQrVoU2qCTSziuJePxsexkDSCZS9c=";
 
+  # Only build the CLI; the workspace also has a build-only `xtask` helper.
+  cargoBuildFlags = [ "--package=sd-cli" ];
+  cargoTestFlags = [ "--package=sd-cli" ];
+
   nativeBuildInputs = [ installShellFiles ];
 
   postInstall = ''

From b31e4206d90ca4e280355115f1fccd0c85a06166 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Tue, 23 Jun 2026 16:05:50 +0200
Subject: [PATCH 17/91] python3Packages.nltk: 3.9.2 -> 3.9.4

Diff: https://github.com/nltk/nltk/compare/3.9.2...3.9.4
---
 .../python-modules/nltk/default.nix           | 42 ++++++++-----------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix
index 129b09cd84ff..f51db1e810d6 100644
--- a/pkgs/development/python-modules/nltk/default.nix
+++ b/pkgs/development/python-modules/nltk/default.nix
@@ -1,12 +1,12 @@
 {
   lib,
   pkgs,
-  fetchPypi,
-  fetchpatch,
+  fetchFromGitHub,
   buildPythonPackage,
   click,
   joblib,
   regex,
+  setuptools,
   tqdm,
 
   # preInstallCheck
@@ -20,33 +20,25 @@
   pytest-mock,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "nltk";
-  version = "3.9.2";
-  format = "setuptools";
+  version = "3.9.4";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-D0CemwacpBd8GQPD6EPu+Qx+kpkvpJMa5gfabeSeFBk=";
+  src = fetchFromGitHub {
+    owner = "nltk";
+    repo = "nltk";
+    tag = finalAttrs.version;
+    hash = "sha256-kDfMiqXgLq91zzDjv/qDn0XwQkYRn2sITI6E4pgWe/8=";
   };
 
-  patches = [
-    # https://github.com/nltk/nltk/security/advisories/GHSA-jm6w-m3j8-898g
-    # https://github.com/NixOS/nixpkgs/issues/502599
-    (fetchpatch {
-      name = "fix-unauthed-shutdown";
-      url = "https://github.com/nltk/nltk/commit/bbaae83db86a0f49e00f5b0db44a7254c268de9b.patch";
-      hash = "sha256-1ZzOQXiNxZ6o7JQs0b9FpsUjZtuUAjXEmDkc9mV3dYU=";
-    })
+  postPatch = ''
+    # In the nix store we trust
+    substituteInPlace nltk/pathsec.py \
+      --replace-fail 'if not (target == scoped_root or target.is_relative_to(scoped_root)):' 'if not (target == scoped_root or target.is_relative_to(scoped_root) or target.is_relative_to("/nix/store")):'
+  '';
 
-    # https://github.com/nltk/nltk/security/advisories/GHSA-469j-vmhf-r6v7
-    # https://github.com/NixOS/nixpkgs/issues/502535
-    (fetchpatch {
-      name = "fix-downloader-path-traversal";
-      url = "https://github.com/nltk/nltk/commit/89fe2ec2c6bae6e2e7a46dad65cc34231976ed8a.patch";
-      hash = "sha256-hQJmVEDDcio4Ew+Y10WzMV53mpYZuuDsFcEZKEzl7nk=";
-    })
-  ];
+  build-system = [ setuptools ];
 
   dependencies = [
     click
@@ -122,4 +114,4 @@ buildPythonPackage rec {
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.bengsparks ];
   };
-}
+})

From fd0bcdc69448a33bda4a390d160954692f11577b Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 26 Jun 2026 20:10:17 +0100
Subject: [PATCH 18/91] diffoscope: 321 -> 322

Changes: https://diffoscope.org/news/diffoscope-322-released/
---
 pkgs/by-name/di/diffoscope/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix
index d44773153194..f821ac668755 100644
--- a/pkgs/by-name/di/diffoscope/package.nix
+++ b/pkgs/by-name/di/diffoscope/package.nix
@@ -109,12 +109,12 @@ in
 # Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
 python.pkgs.buildPythonApplication rec {
   pname = "diffoscope";
-  version = "321";
+  version = "322";
   pyproject = true;
 
   src = fetchurl {
     url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
-    hash = "sha256-M/rsyUGlJDpU3o1RMfaN9fNMpOn9Xpz2ydflPUXVhD4=";
+    hash = "sha256-dina2JdbLL/jfo4eMuUo62KggST95w0b7oonY86zjgk=";
   };
 
   outputs = [

From 412b6c2ced73b7b95ed8cdd90ab4d8c7ca2886b9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 27 Jun 2026 02:04:20 +0000
Subject: [PATCH 19/91] clickhouse: 26.5.2.39-stable -> 26.6.1.1193-stable

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

diff --git a/pkgs/by-name/cl/clickhouse/package.nix b/pkgs/by-name/cl/clickhouse/package.nix
index e364e6a97376..8b47eaffca68 100644
--- a/pkgs/by-name/cl/clickhouse/package.nix
+++ b/pkgs/by-name/cl/clickhouse/package.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "26.5.2.39-stable";
-  rev = "8462fd8f3dea8603e67666414b2781ab57a8adb6";
-  hash = "sha256-lbVveT6cFT9ZhSl+0qh3NhtO4FHakFWDBJd757J8WJg=";
+  version = "26.6.1.1193-stable";
+  rev = "6615864161fd5332edfcb2864658bd9ccc65197b";
+  hash = "sha256-S+JJ/bOziG6w+9GSe+KDT2GliL3osRf4Y+WI8x5n2CI=";
   lts = false;
 }

From bf5d1cd8ffe24c1d3e77dbba9696042fc805f043 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 27 Jun 2026 22:33:55 +0000
Subject: [PATCH 20/91] slint-lsp: 1.16.1 -> 1.17.0

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

diff --git a/pkgs/by-name/sl/slint-lsp/package.nix b/pkgs/by-name/sl/slint-lsp/package.nix
index 52d75af7c003..f477b22e8125 100644
--- a/pkgs/by-name/sl/slint-lsp/package.nix
+++ b/pkgs/by-name/sl/slint-lsp/package.nix
@@ -18,14 +18,14 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "slint-lsp";
-  version = "1.16.1";
+  version = "1.17.0";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-+REZRGPgdbBUDZaZ+3R2AKF56MouPIsjx8IVv1LUl50=";
+    hash = "sha256-6TwEB3t0vwDnvGmZU1LSIkYbA02NEyVI4wbEeqYbatM=";
   };
 
-  cargoHash = "sha256-BP50c1GCAFTpRGqZDw3I5WtXabdN/2CcVhX2d1eXtck=";
+  cargoHash = "sha256-RTWfR/RmijSj5DlS+9tJ6uG534NmG5jy+p1hliEsdiE=";
 
   rpathLibs = [
     fontconfig

From 3741dfbe765dfce73c5bb3f980fd3da85b3bccc4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 00:13:54 +0000
Subject: [PATCH 21/91] pi-coding-agent: 0.79.8 -> 0.80.2

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

diff --git a/pkgs/by-name/pi/pi-coding-agent/package.nix b/pkgs/by-name/pi/pi-coding-agent/package.nix
index e067a5d0c043..0ff3cd77017d 100644
--- a/pkgs/by-name/pi/pi-coding-agent/package.nix
+++ b/pkgs/by-name/pi/pi-coding-agent/package.nix
@@ -12,16 +12,16 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "pi-coding-agent";
-  version = "0.79.8";
+  version = "0.80.2";
 
   src = fetchFromGitHub {
     owner = "earendil-works";
     repo = "pi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eH1+vHrKBu1GcUXnTdvRtNuLuf0EdReAnFit8UqiXB4=";
+    hash = "sha256-aKtgPc3rwHEp856jP3N7nImph0CSG+gsWq9OVci3hmE=";
   };
 
-  npmDepsHash = "sha256-xrTpu4TkRmlflg7pMaw/QVsN+poQ41slVA5PET+NDoI=";
+  npmDepsHash = "sha256-1EGs8lX8XoAnRtS+pw4lBRm24U/vtVB2loVRmZyd4Z8=";
 
   npmWorkspace = "packages/coding-agent";
 

From 05f57a7e9c40dbb80390b79212232c79f63cc61d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 28 Jun 2026 02:40:25 +0200
Subject: [PATCH 22/91] openresty: add update script

---
 pkgs/servers/http/openresty/default.nix | 38 +++++++++++++++++++++----
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix
index 8e60573f4a51..c58ddabc4ea3 100644
--- a/pkgs/servers/http/openresty/default.nix
+++ b/pkgs/servers/http/openresty/default.nix
@@ -7,17 +7,21 @@
   libpq,
   nixosTests,
   withPostgres ? true,
+  curl,
+  jq,
+  nix-update,
+  writeShellApplication,
   ...
 }@args:
 
 callPackage ../nginx/generic.nix args rec {
   pname = "openresty";
-  nginxVersion = "1.27.1";
-  version = "${nginxVersion}.2";
+  version = "1.27.1.2";
+  nginxVersion = lib.concatStringsSep "." (lib.init (lib.splitString "." version));
 
   src = fetchurl {
     url = "https://openresty.org/download/openresty-${version}.tar.gz";
-    sha256 = "sha256-dPB29+NksqmabF+btTHCdhDHiYWr6Va0QrGSoilfdUg=";
+    hash = "sha256-dPB29+NksqmabF+btTHCdhDHiYWr6Va0QrGSoilfdUg=";
   };
 
   # generic.nix applies fixPatch on top of every patch defined there.
@@ -59,8 +63,32 @@ callPackage ../nginx/generic.nix args rec {
     ln -s $out/nginx/html $out/html
   '';
 
-  passthru.tests = {
-    inherit (nixosTests) openresty-lua;
+  passthru = {
+    tests = {
+      inherit (nixosTests) openresty-lua;
+    };
+    updateScript = lib.getExe (writeShellApplication {
+      name = "openresty-update";
+      runtimeInputs = [
+        curl
+        jq
+        nix-update
+      ];
+      text = ''
+        version="$(
+          curl -fsSL https://api.github.com/repos/openresty/openresty/tags?per_page=1 |
+            jq -r '.[0].name' |
+            sed 's/^v//'
+        )"
+        echo "Local: ${version}"
+        echo "Latest: $version"
+
+        nix-update \
+          --override-filename="pkgs/servers/http/openresty/default.nix" \
+          --version="''${version}" \
+          openresty
+      '';
+    });
   };
 
   meta = {

From f15c92705f8c2702756d6458a41eae4c815d1dcb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 01:25:05 +0000
Subject: [PATCH 23/91] linux_zen: 7.0.12 -> 7.1.2

---
 pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index aca3b795ba1e..147503fe1c30 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -18,7 +18,7 @@ in
 buildLinux (
   args
   // rec {
-    version = "7.0.12";
+    version = "7.1.2";
     pname = "linux-zen";
     modDirVersion = lib.versions.pad 3 "${version}-${suffix}";
     isZen = true;
@@ -27,7 +27,7 @@ buildLinux (
       owner = "zen-kernel";
       repo = "zen-kernel";
       rev = "v${version}-${suffix}";
-      sha256 = "02fkkmmc28rw0kg02807jvv6k745zqfb9wg65dfd8sl298krp0fp";
+      sha256 = "0d02lgwl0x415xrbznsldd7j1krpzlnbd2ciis3shz8zhmbhfg1f";
     };
 
     # This is based on the following source:

From e9f301fcf7c34eca2691c6f321b2e6e3a349abe9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 28 Jun 2026 02:40:44 +0200
Subject: [PATCH 24/91] nginx: fix test and update script passthru

Otherwise all nginx forks gain all of nginx' tests.
---
 pkgs/servers/http/nginx/generic.nix | 45 +++++++++++++++--------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index f65cd0044fbb..019261aecfcb 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -46,9 +46,7 @@ outer@{
   postInstall ? "",
   meta ? null,
   nginx-doc ? outer.nginx-doc,
-  passthru ? {
-    tests = { };
-  },
+  passthru ? { },
 }:
 
 let
@@ -281,25 +279,28 @@ stdenv.mkDerivation {
 
   passthru = {
     inherit modules;
-    tests = {
-      inherit (nixosTests)
-        nginx
-        nginx-auth
-        nginx-etag
-        nginx-etag-compression
-        nginx-globalredirect
-        nginx-http3
-        nginx-proxyprotocol
-        nginx-pubhtml
-        nginx-sso
-        nginx-status-page
-        nginx-unix-socket
-        ;
-      variants = lib.recurseIntoAttrs nixosTests.nginx-variants;
-      acme-integration = nixosTests.acme.nginx;
-      acme-integration-without-reload = nixosTests.acme.nginx-without-reload;
-    }
-    // passthru.tests;
+    tests =
+      passthru.tests or {
+        inherit (nixosTests)
+          nginx
+          nginx-auth
+          nginx-etag
+          nginx-etag-compression
+          nginx-globalredirect
+          nginx-http3
+          nginx-proxyprotocol
+          nginx-pubhtml
+          nginx-sso
+          nginx-status-page
+          nginx-unix-socket
+          ;
+        variants = lib.recurseIntoAttrs nixosTests.nginx-variants;
+        acme-integration = nixosTests.acme.nginx;
+        acme-integration-without-reload = nixosTests.acme.nginx-without-reload;
+      };
+  }
+  // lib.optionalAttrs (passthru ? updateScript) {
+    inherit (passthru) updateScript;
   };
 
   meta =

From e9f2aca3d1d2bcd255fec2f86fa10e5e93cd1528 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 28 Jun 2026 02:51:13 +0200
Subject: [PATCH 25/91] openresty: 1.27.1.2 -> 1.31.1.1

https://openresty.org/en/changelog-1031001.html (1.31.x)
https://openresty.org/en/changelog-1029002.html (1.29.x)

Fixes:
CVE-2026-1642
CVE-2026-9256
CVE-2026-27651
CVE-2026-27654
CVE-2026-27784
CVE-2026-28753
CVE-2026-28755
CVE-2026-32647
CVE-2026-40460
CVE-2026-40701
CVE-2026-42934
CVE-2026-42945
CVE-2026-42946
---
 pkgs/servers/http/openresty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix
index c58ddabc4ea3..36e3acade7a8 100644
--- a/pkgs/servers/http/openresty/default.nix
+++ b/pkgs/servers/http/openresty/default.nix
@@ -16,12 +16,12 @@
 
 callPackage ../nginx/generic.nix args rec {
   pname = "openresty";
-  version = "1.27.1.2";
+  version = "1.31.1.1";
   nginxVersion = lib.concatStringsSep "." (lib.init (lib.splitString "." version));
 
   src = fetchurl {
     url = "https://openresty.org/download/openresty-${version}.tar.gz";
-    hash = "sha256-dPB29+NksqmabF+btTHCdhDHiYWr6Va0QrGSoilfdUg=";
+    hash = "sha256-ZbeLqt0/CYQFXeib8T9KGTLlv+nDGTIDehNOorGgzkI=";
   };
 
   # generic.nix applies fixPatch on top of every patch defined there.

From ad3a0656fb8beae4da9985a2de862f49391f5589 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 28 Jun 2026 03:04:29 +0200
Subject: [PATCH 26/91] openresty: include nginx-variants test in
 passthru.tests

---
 pkgs/servers/http/openresty/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix
index 36e3acade7a8..a6dac861edca 100644
--- a/pkgs/servers/http/openresty/default.nix
+++ b/pkgs/servers/http/openresty/default.nix
@@ -66,6 +66,7 @@ callPackage ../nginx/generic.nix args rec {
   passthru = {
     tests = {
       inherit (nixosTests) openresty-lua;
+      inherit (nixosTests.nginx-variants) openresty;
     };
     updateScript = lib.getExe (writeShellApplication {
       name = "openresty-update";

From b09918a07d4587bb36a8e097066b2813120494e7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 28 Jun 2026 03:47:25 +0200
Subject: [PATCH 27/91] openresty: wrap restydoc with groff

Fixes: #416400
---
 pkgs/servers/http/openresty/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix
index a6dac861edca..27f0bd52ee89 100644
--- a/pkgs/servers/http/openresty/default.nix
+++ b/pkgs/servers/http/openresty/default.nix
@@ -3,8 +3,10 @@
   runCommand,
   lib,
   fetchurl,
+  groff,
   perl,
   libpq,
+  makeWrapper,
   nixosTests,
   withPostgres ? true,
   curl,
@@ -40,6 +42,7 @@ callPackage ../nginx/generic.nix args rec {
 
   nativeBuildInputs = [
     libpq.pg_config
+    makeWrapper
     perl
   ];
 
@@ -61,6 +64,9 @@ callPackage ../nginx/generic.nix args rec {
     ln -s $out/nginx/bin/nginx $out/bin/nginx
     ln -s $out/nginx/conf $out/conf
     ln -s $out/nginx/html $out/html
+
+    wrapProgram $out/bin/restydoc \
+      --prefix PATH : ${groff}/bin
   '';
 
   passthru = {

From 743bfdaf106a80368a87bfba56207dd515304b98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 27 Jun 2026 18:50:32 -0700
Subject: [PATCH 28/91] pdns-recursor: 5.4.1 -> 5.4.3

Changelog: https://doc.powerdns.com/recursor/changelog/5.4.html#change-5.4.3
---
 pkgs/by-name/pd/pdns-recursor/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pd/pdns-recursor/package.nix b/pkgs/by-name/pd/pdns-recursor/package.nix
index 1fc443fc526b..ca52e36885b4 100644
--- a/pkgs/by-name/pd/pdns-recursor/package.nix
+++ b/pkgs/by-name/pd/pdns-recursor/package.nix
@@ -21,17 +21,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pdns-recursor";
-  version = "5.4.1";
+  version = "5.4.3";
 
   src = fetchurl {
     url = "https://downloads.powerdns.com/releases/pdns-recursor-${finalAttrs.version}.tar.xz";
-    hash = "sha256-k/I+6T+w06n9SIFyZWMezkdYuAAa9ybDWO46+2ZFtjo=";
+    hash = "sha256-opICnFQ6xFOMpXYouBQsntypsoOjqAyzk+2UfgWE8A8=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src;
     sourceRoot = "pdns-recursor-${finalAttrs.version}/rec-rust-lib/rust";
-    hash = "sha256-PxnLv1VbZgyQl83Bcvxyf7REsbTKI1MBV4RllHcyJyc=";
+    hash = "sha256-eAiXdsHWZca0wx5FONGfa7JDcpDHyCABJOUROhwAsZo=";
   };
 
   cargoRoot = "rec-rust-lib/rust";
@@ -72,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
+    changelog = "https://doc.powerdns.com/recursor/changelog/${lib.versions.majorMinor finalAttrs.version}.html#change-${finalAttrs.version}";
     description = "Recursive DNS server";
     homepage = "https://www.powerdns.com/";
     platforms = lib.platforms.linux;

From 881a5eba9fa859a99ce3af1885adf492fa7b82db Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 28 Jun 2026 03:54:03 +0200
Subject: [PATCH 29/91] openresty: fix nginx path in resty script

Fixes: #383002
---
 pkgs/servers/http/openresty/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix
index 27f0bd52ee89..4910c45a196a 100644
--- a/pkgs/servers/http/openresty/default.nix
+++ b/pkgs/servers/http/openresty/default.nix
@@ -67,6 +67,9 @@ callPackage ../nginx/generic.nix args rec {
 
     wrapProgram $out/bin/restydoc \
       --prefix PATH : ${groff}/bin
+
+    substituteInPlace $out/bin/resty \
+      --replace-fail "'bin/nginx'" "'$out/bin/nginx'"
   '';
 
   passthru = {

From ec1dbcbbd1300dd09b51afb3dc78976a121df88f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 27 Jun 2026 18:58:36 -0700
Subject: [PATCH 30/91] pdns: add meta.changelog

---
 pkgs/by-name/pd/pdns/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/pd/pdns/package.nix b/pkgs/by-name/pd/pdns/package.nix
index ca5771180a2d..c67432a4d584 100644
--- a/pkgs/by-name/pd/pdns/package.nix
+++ b/pkgs/by-name/pd/pdns/package.nix
@@ -101,6 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
   __structuredAttrs = true;
 
   meta = {
+    changelog = "https://doc.powerdns.com/authoritative/changelog/${lib.versions.majorMinor finalAttrs.version}.html#change-${finalAttrs.version}";
     description = "Authoritative DNS server";
     homepage = "https://www.powerdns.com";
     platforms = lib.platforms.unix;

From a263c5bc1d103e5d34af98eee5a23c85e5eb3e5e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 02:01:57 +0000
Subject: [PATCH 31/91] dutctl: 1.0.0-alpha.1-unstable-2026-06-11 ->
 1.0.0-alpha.1-unstable-2026-06-25

---
 pkgs/by-name/du/dutctl/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/du/dutctl/package.nix b/pkgs/by-name/du/dutctl/package.nix
index b232d645120f..dfaf7fadd47a 100644
--- a/pkgs/by-name/du/dutctl/package.nix
+++ b/pkgs/by-name/du/dutctl/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "dutctl";
-  version = "1.0.0-alpha.1-unstable-2026-06-11";
+  version = "1.0.0-alpha.1-unstable-2026-06-25";
 
   src = fetchFromGitHub {
     owner = "BlindspotSoftware";
     repo = "dutctl";
-    rev = "416a8d169880883345531a2f67ec71a65f41b474";
-    hash = "sha256-Y4bILPe7PBCHsBbgI6ckqdh0S4UBh1z8vpDs/CIyYxg=";
+    rev = "9f57498b4ebf99cc1960015832986f059673020b";
+    hash = "sha256-Xif0qngaMtje67QTvLANlfMAuQZNVJMDGtnDAwznyO8=";
   };
 
-  vendorHash = "sha256-s0pRzcueJCwUP5+ckRMYTc9FPYGqQiILGIuwQ83EhIM=";
+  vendorHash = "sha256-6ne0gvVbdb4OIQmc0nHa7I4ms4gb0CXO8c1GuFqmefc=";
 
   ldflags = [
     "-s"

From 27b031b4545774211ad62685d7bb3eff50921e9c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 05:06:41 +0000
Subject: [PATCH 32/91] vscode-extensions.betterthantomorrow.calva: 2.0.591 ->
 2.0.593

---
 .../vscode/extensions/betterthantomorrow.calva/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix
index f65cdbcba280..d2b8e6dab445 100644
--- a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix
@@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "calva";
     publisher = "betterthantomorrow";
-    version = "2.0.591";
-    hash = "sha256-VgRBah9j/4g2fG/qkrwxwqQ7gUw95UjzMkun/BZBpZs=";
+    version = "2.0.593";
+    hash = "sha256-/pPDghizzU/EulLyeFzmsufEwegR4ngo0rxW1Qnjock=";
   };
 
   nativeBuildInputs = [

From 4b5f0a166da3bc9143276e7c6caa0cc1964f018b Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Mon, 22 Jun 2026 17:49:38 -0600
Subject: [PATCH 33/91] comaps: 2026.03.23-5 -> 2026.06.05-11

https://codeberg.org/comaps/comaps/releases/tag/v2026.06.05-11
Diff: https://codeberg.org/comaps/comaps/compare/v2026.03.23-5...v2026.06.05-11
---
 pkgs/by-name/co/comaps/package.nix            | 82 ++++++++++++++-----
 .../co/comaps/use-vendored-protobuf.patch     | 33 ++++----
 2 files changed, 78 insertions(+), 37 deletions(-)

diff --git a/pkgs/by-name/co/comaps/package.nix b/pkgs/by-name/co/comaps/package.nix
index 511829b29bf4..22fe26b9fd90 100644
--- a/pkgs/by-name/co/comaps/package.nix
+++ b/pkgs/by-name/co/comaps/package.nix
@@ -1,32 +1,53 @@
 {
   lib,
-  organicmaps,
+  stdenv,
+  fetchFromGitHub,
   fetchurl,
   fetchFromCodeberg,
+  cmake,
   boost,
   expat,
-  gtest,
-  glm,
+  getopt,
   gflags,
+  glm,
+  gtest,
+  icu,
   imgui,
   jansson,
+  libxcursor,
+  libxinerama,
+  libxrandr,
+  ninja,
+  pkg-config,
+  pugixml,
   python3,
+  qt6,
   optipng,
   utf8cpp,
+  which,
   nix-update-script,
 }:
 let
-  # https://codeberg.org/comaps/comaps/src/branch/main/data/countries.txt
-  mapRev = 260321;
+  world_feed_integration_tests_data = fetchFromGitHub {
+    owner = "organicmaps";
+    repo = "world_feed_integration_tests_data";
+    rev = "30ecb0b3fe694a582edfacc2a7425b6f01f9fec6";
+    hash = "sha256-1FF658OhKg8a5kKX/7TVmsxZ9amimn4lB6bX9i7pnI4=";
+  };
+
+  # Update mapRev here based on v field near the top in https://codeberg.org/comaps/comaps/src/branch/main/data/countries.txt
+  mapRev = 260603;
 
   worldMap = fetchurl {
+    name = "World-${toString mapRev}.mwm";
     url = "https://cdn-fi-1.comaps.app/maps/${toString mapRev}/World.mwm";
-    hash = "sha256-pMmzPcWbS9drQzJCfiac2dfSMihiHDfhFyG5ux0pG54=";
+    hash = "sha256-1cq2gDiqeybA7VxjuSUFnlLagdZipdWiuAy5QI1LdZE=";
   };
 
   worldCoasts = fetchurl {
+    name = "WorldCoasts-${toString mapRev}.mwm";
     url = "https://cdn-fi-1.comaps.app/maps/${toString mapRev}/WorldCoasts.mwm";
-    hash = "sha256-5LI6itC6LhprVfgGbT/HYy1lzZLZLUe2QoSil0/7kIc=";
+    hash = "sha256-MLRUPEXvXW2GqYdlxfhS5ODRiiWya4i2U+mpXnqc6rY=";
   };
 
   pythonEnv = python3.withPackages (
@@ -35,26 +56,27 @@ let
     ]
   );
 in
-organicmaps.overrideAttrs (oldAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "comaps";
-  version = "2026.03.23-5";
+  version = "2026.06.05-11";
 
   src = fetchFromCodeberg {
     owner = "comaps";
     repo = "comaps";
-    tag = "v${version}";
-    hash = "sha256-1bD0QiEZu6nB7wwBpfpEf+WypqbOd9XuXbq7FDTL7bw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-W05fZT82H78TqlH4MFaIexX1LYhjATYL1E6e0WCYrBI=";
     fetchSubmodules = true;
   };
 
   patches = [
     ./use-vendored-protobuf.patch
-
-    # Include missing editor_tests_support.
-    ./fix-editor-tests.patch
   ];
 
-  postPatch = (oldAttrs.postPatch or "") + ''
+  postPatch = ''
+    patchShebangs 3party/boost/tools/build/src/engine/build.sh
+
+    ln -s ${world_feed_integration_tests_data} data/test_data/world_feed_integration_tests_data
+
     rm -f 3party/boost/b2
     substituteInPlace configure.sh \
       --replace-fail "git submodule update --init --recursive --depth 1" ""
@@ -64,19 +86,34 @@ organicmaps.overrideAttrs (oldAttrs: rec {
       --replace-fail "/usr/bin/env python3" "${pythonEnv.interpreter}"
   '';
 
-  nativeBuildInputs = (builtins.filter (x: x != python3) oldAttrs.nativeBuildInputs or [ ]) ++ [
+  nativeBuildInputs = [
+    cmake
+    ninja
+    getopt
+    which
+    pkg-config
     pythonEnv
+    qt6.wrapQtAppsHook
     optipng
   ];
 
-  buildInputs = (oldAttrs.buildInputs or [ ]) ++ [
+  buildInputs = [
+    qt6.qtbase
+    qt6.qtpositioning
+    qt6.qtsvg
+
     boost
     expat
     gtest
     gflags
     glm
+    icu
     imgui
     jansson
+    libxcursor
+    libxinerama
+    libxrandr
+    pugixml
     utf8cpp
   ];
 
@@ -85,6 +122,7 @@ organicmaps.overrideAttrs (oldAttrs: rec {
   '';
 
   cmakeFlags = [
+    (lib.cmakeBool "SKIP_TESTS" false)
     (lib.cmakeBool "WITH_SYSTEM_PROVIDED_3PARTY" true)
   ];
 
@@ -98,7 +136,6 @@ organicmaps.overrideAttrs (oldAttrs: rec {
   postInstall = ''
     install -Dm644 ${worldMap} $out/share/comaps/data/World.mwm
     install -Dm644 ${worldCoasts} $out/share/comaps/data/WorldCoasts.mwm
-    ln -s $out/bin/CoMaps $out/bin/comaps
   '';
 
   passthru.updateScript = nix-update-script {
@@ -108,11 +145,14 @@ organicmaps.overrideAttrs (oldAttrs: rec {
     ];
   };
 
-  meta = oldAttrs.meta // {
+  meta = {
+    broken = stdenv.hostPlatform.isDarwin;
     description = "Community-led fork of Organic Maps";
     homepage = "https://comaps.app";
-    changelog = "https://codeberg.org/comaps/comaps/releases/tag/v${version}";
+    changelog = "https://codeberg.org/comaps/comaps/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.ryand56 ];
-    mainProgram = "comaps";
+    platforms = lib.platforms.unix;
+    mainProgram = "CoMaps";
   };
 })
diff --git a/pkgs/by-name/co/comaps/use-vendored-protobuf.patch b/pkgs/by-name/co/comaps/use-vendored-protobuf.patch
index 01634f925256..1746411d69e6 100644
--- a/pkgs/by-name/co/comaps/use-vendored-protobuf.patch
+++ b/pkgs/by-name/co/comaps/use-vendored-protobuf.patch
@@ -1,21 +1,21 @@
 diff --git a/3party/CMakeLists.txt b/3party/CMakeLists.txt
-index dd851d7d..1b4e3ed3 100644
+index 2146a5fdcf..9fc67abfb3 100644
 --- a/3party/CMakeLists.txt
 +++ b/3party/CMakeLists.txt
-@@ -41,9 +41,6 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
+@@ -41,9 +41,6 @@
    # Add pugixml library.
    add_subdirectory(pugixml)
-
+ 
 -  # Add protobuf library.
 -  add_subdirectory(protobuf)
 -
    if (NOT PLATFORM_LINUX)
      add_subdirectory(freetype)
      add_subdirectory(icu)
-@@ -55,6 +52,9 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
+@@ -55,6 +52,9 @@
    target_include_directories(utf8cpp INTERFACE "${OMIM_ROOT}/3party/utfcpp/source")
  endif()
-
+ 
 +# Add protobuf library.
 +add_subdirectory(protobuf)
 +
@@ -23,13 +23,13 @@ index dd851d7d..1b4e3ed3 100644
  add_subdirectory(bsdiff-courgette)
  add_subdirectory(glaze)
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3ba193a9..dd2df855 100644
+index 096d31389e..c6e4aabdeb 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -225,25 +225,6 @@ endif()
- # Used in qt/ and shaders/
- find_package(Python3 REQUIRED COMPONENTS Interpreter)
-
+@@ -212,26 +212,6 @@
+   message(STATUS "==> Python Virtual Environment detected : ${PYTHON_VENV_PATH}"  "  ==>  "  "Using python command: ${Python3_EXECUTABLE}" )
+ endif()
+ 
 -execute_process(
 -    COMMAND ${Python3_EXECUTABLE} -c "import google.protobuf; 
 -print(google.protobuf.__version__)"
@@ -40,15 +40,16 @@ index 3ba193a9..dd2df855 100644
 -)
 -
 -if(PROTOBUF_CHECK EQUAL 0)
--    if(PROTOBUF_VERSION VERSION_LESS "4.0.0")
--        message(STATUS "Python protobuf ${PROTOBUF_VERSION} found (< 4.0)")
+-    if(PROTOBUF_VERSION VERSION_LESS "3.20.0" OR PROTOBUF_VERSION VERSION_GREATER_EQUAL "4.0.0")
+-        message(FATAL_ERROR "Python protobuf ${PROTOBUF_VERSION} found, but version (>=3.20, <4.0) is required")
 -    else()
--        message(FATAL_ERROR "Python protobuf ${PROTOBUF_VERSION} found, but version < 4.0 required")
+-        message(STATUS "Python protobuf ${PROTOBUF_VERSION} found (>=3.20, <4.0)")
 -    endif()
 -else()
--    message(FATAL_ERROR "Python protobuf not found. Install version <4.0")
+-    message(FATAL_ERROR "Python protobuf not found. Install version (>=3.20, <4.0)")
 -endif()
 -
-
+-
  add_subdirectory(libs)
-
+ 
+ if (PLATFORM_DESKTOP)

From b21c2e764c721226ae94af1f57c5962e9f03a54b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 06:43:53 +0000
Subject: [PATCH 34/91] libretro.dolphin: 0-unstable-2026-04-08 ->
 0-unstable-2026-06-26

---
 pkgs/applications/emulators/libretro/cores/dolphin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/dolphin.nix b/pkgs/applications/emulators/libretro/cores/dolphin.nix
index 9ff08b1ff89f..f1fe5b891b01 100644
--- a/pkgs/applications/emulators/libretro/cores/dolphin.nix
+++ b/pkgs/applications/emulators/libretro/cores/dolphin.nix
@@ -20,13 +20,13 @@
 }:
 mkLibretroCore {
   core = "dolphin";
-  version = "0-unstable-2026-04-08";
+  version = "0-unstable-2026-06-26";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "dolphin";
-    rev = "0cd3bb89c29535db9b7552fc86871867ccf5b471";
-    hash = "sha256-cSiJO/EvspNvHopo/RLfuz8ONpbXk2NrrSDhkiAm7/s=";
+    rev = "fec5e8e106489e0d00e69dd4afaabc3d95688047";
+    hash = "sha256-GNAZgFHZCnokL3HYU+xsFtghpN09QbsZpwMW1eMtSvU=";
     fetchSubmodules = true;
   };
 

From 21ae749caec2b4e5edeab35fd8d74323f9daecbc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 07:24:30 +0000
Subject: [PATCH 35/91] kimai: 2.60.0 -> 2.61.0

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

diff --git a/pkgs/by-name/ki/kimai/package.nix b/pkgs/by-name/ki/kimai/package.nix
index a35072984522..2766a5417924 100644
--- a/pkgs/by-name/ki/kimai/package.nix
+++ b/pkgs/by-name/ki/kimai/package.nix
@@ -7,13 +7,13 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "kimai";
-  version = "2.60.0";
+  version = "2.61.0";
 
   src = fetchFromGitHub {
     owner = "kimai";
     repo = "kimai";
     tag = finalAttrs.version;
-    hash = "sha256-TdeoFbgLXbLsBeMK8YUKimRyx+nJ4QMigY9YxicmPDA=";
+    hash = "sha256-T/eHJeEosRRWPSxvDpBkeGEx8zwqFz/v2CflhjLqpO4=";
   };
 
   php = php.buildEnv {
@@ -38,7 +38,7 @@ php.buildComposerProject2 (finalAttrs: {
     '';
   };
 
-  vendorHash = "sha256-0byb0lsi9nU1qKksU6BeBB/JCXoHSaliLyErz6Z14QQ=";
+  vendorHash = "sha256-rwCLPLJwVaykWimmuZ7wM2KLZqDE1YIhMbD7q86w0OE=";
 
   composerNoPlugins = false;
   postInstall = ''

From ff88e99af9d0fcb2e9ad0dba7fa460d3ac2c5ba1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 08:53:28 +0000
Subject: [PATCH 36/91] libretro.melonds: 0-unstable-2026-04-20 ->
 0-unstable-2026-06-25

---
 pkgs/applications/emulators/libretro/cores/melonds.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/melonds.nix b/pkgs/applications/emulators/libretro/cores/melonds.nix
index b6846e4d1e89..099248a22c0d 100644
--- a/pkgs/applications/emulators/libretro/cores/melonds.nix
+++ b/pkgs/applications/emulators/libretro/cores/melonds.nix
@@ -7,13 +7,13 @@
 }:
 mkLibretroCore {
   core = "melonds";
-  version = "0-unstable-2026-04-20";
+  version = "0-unstable-2026-06-25";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "melonds";
-    rev = "634e51477364edc39aaccd3bebf8bcab5776148c";
-    hash = "sha256-/u6CQKpb9eIls0TYpSpWoIf+IQ0CTIx48oq8LscfhFw=";
+    rev = "c9550d18923fe86a5ad9faa159399b55c12b47f1";
+    hash = "sha256-xvBdt/TMxZOrC//DLHRWRMqIibt7dNsfLM/FeMTRA60=";
   };
 
   extraBuildInputs = [

From 422a255dd364ff481be7cc4ade5596afbdd088fe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 10:10:31 +0000
Subject: [PATCH 37/91] google-chrome: 149.0.7827.196 -> 149.0.7827.200

---
 pkgs/by-name/go/google-chrome/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index b9a1210b604f..a0b030218353 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -179,11 +179,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "149.0.7827.196";
+    version = "149.0.7827.200";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-B4XIuL7q/kGRd/w2vPmfkvsvFtvHevhL5IfC5u14IuY=";
+      hash = "sha256-HDCPrhH44nKTr6Fzm9SqAV/Vdmtyx1znIZXsPkGmEqg=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -289,11 +289,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "149.0.7827.197";
+    version = "149.0.7827.201";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/fs52wiq74uymls47lfo23m5l2q_149.0.7827.197/GoogleChrome-149.0.7827.197.dmg";
-      hash = "sha256-kXN4dPtx0MkTKO3VJnoyTqT8uS4JDXJ16DmojZ3zT+o=";
+      url = "http://dl.google.com/release2/chrome/ph3mj7mqtvbfhr67ckmjvjj5a4_149.0.7827.201/GoogleChrome-149.0.7827.201.dmg";
+      hash = "sha256-AI5oBE0uB2/YacF9LB4d6rXlAqEuZtlPYNQwLbs1K7E=";
     };
 
     dontPatch = true;

From 8c8159cdfdaf1a9ef9901e1ac0c97aa630178b78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Plagborg=20Bak=20S=C3=B8rensen?=
 <kristoffer.plagborgbak.soerensen@beumer.com>
Date: Fri, 22 May 2026 07:19:40 +0200
Subject: [PATCH 38/91] psleep: init at 0.3.0

---
 pkgs/by-name/ps/psleep/package.nix | 36 ++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 pkgs/by-name/ps/psleep/package.nix

diff --git a/pkgs/by-name/ps/psleep/package.nix b/pkgs/by-name/ps/psleep/package.nix
new file mode 100644
index 000000000000..d0824f8c09b8
--- /dev/null
+++ b/pkgs/by-name/ps/psleep/package.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "psleep";
+  version = "0.3.0";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "Yesh-02";
+    repo = "psleep";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-/Zi572GA0Stwl0JHUyFzvQ4V1GsbTetF7T74gaFoWM8=";
+  };
+
+  cargoHash = "sha256-5yzCQfuVSI02B9HQ9+HMkl7qSoMOH0so4zBPwop4KX4=";
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Like sleep but shows a live progress bar";
+    homepage = "https://github.com/Yesh-02/psleep";
+    changelog = "https://github.com/Yesh-02/psleep/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ kpbaks ];
+    mainProgram = "psleep";
+  };
+})

From 3b283631a6dcfba4cc9b358af9bf0b643ced155c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 12:42:30 +0000
Subject: [PATCH 39/91] vscode-extensions.waderyan.gitblame: 13.0.1 -> 13.1.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index bbaef26e8f88..cbd4ca6d30b3 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5282,8 +5282,8 @@ let
         mktplcRef = {
           name = "gitblame";
           publisher = "waderyan";
-          version = "13.0.1";
-          sha256 = "sha256-N0UgWdwGj3NW4x0Ea+jKL5Jvp0YE+HfK5tkUjmynPuY=";
+          version = "13.1.0";
+          sha256 = "sha256-32ohvlIV7ogX+hGgcrCyHrv2hKWSpi+YuRMv0SGDYYA=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/waderyan.gitblame/changelog";

From 2d410b8a1be7e55a10251600ad95e4bb230610cd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 12:49:20 +0000
Subject: [PATCH 40/91] postgresqlPackages.pg_roaringbitmap: 1.1.0 -> 1.2.0

---
 pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix b/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix
index 94a077b3f8ba..f86edf860bc0 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix
@@ -7,13 +7,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg_roaringbitmap";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "ChenHuajun";
     repo = "pg_roaringbitmap";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XX68Kgx9uFhnWSUIhErw3yOjo7K/seP/6oca3vS7b84=";
+    hash = "sha256-edNqeeO2VHkoIbvpmGCkpVAF6jRNL7MqetS2I5Sjhl4=";
   };
 
   meta = {

From 18db003df1598240a4fc7559df4494d0f122cf98 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 12:58:37 +0000
Subject: [PATCH 41/91] lstk: 0.13.0 -> 0.14.0

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

diff --git a/pkgs/by-name/ls/lstk/package.nix b/pkgs/by-name/ls/lstk/package.nix
index 2da809ad248d..18987681c2c4 100644
--- a/pkgs/by-name/ls/lstk/package.nix
+++ b/pkgs/by-name/ls/lstk/package.nix
@@ -7,7 +7,7 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "lstk";
-  version = "0.13.0";
+  version = "0.14.0";
 
   __structuredAttrs = true;
 
@@ -15,10 +15,10 @@ buildGoModule (finalAttrs: {
     owner = "localstack";
     repo = "lstk";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-UF+ySjw3fdb9aTA/tRDmFR3EXYA7nvbuv/esT/3Rsv4=";
+    sha256 = "sha256-+CvW9rhEPGEs07+d/PEMtnUhy6NRq850D3KYpKABQMA=";
   };
 
-  vendorHash = "sha256-zKEUGn9eKYdxSinS+NXc7PrgZkrQRZnIxTNH3yNL4GE=";
+  vendorHash = "sha256-ZWezMbvUUwOoWMU+zHL4hHMKAncI/oCsWMaLt5qN+YM=";
 
   excludedPackages = "test/integration";
 

From 4cb2e00fc470dee0cc07ec68a51309c0b6c5c486 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 13:36:15 +0000
Subject: [PATCH 42/91] nbping: 0.7.0 -> 0.7.1

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

diff --git a/pkgs/by-name/nb/nbping/package.nix b/pkgs/by-name/nb/nbping/package.nix
index da50cdb5eb4c..0c50e7389e3a 100644
--- a/pkgs/by-name/nb/nbping/package.nix
+++ b/pkgs/by-name/nb/nbping/package.nix
@@ -5,7 +5,7 @@
 }:
 let
   pname = "nbping";
-  version = "0.7.0";
+  version = "0.7.1";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -14,10 +14,10 @@ rustPlatform.buildRustPackage {
     owner = "hanshuaikang";
     repo = "Nping";
     tag = "v${version}";
-    hash = "sha256-rGWYvYJs6vkG+HQuT4NJGMUUG9QzIhyJThgDWTC6/JI=";
+    hash = "sha256-QaJTV5RNvsYuBUPrWcmbBj1QSKtfDNTvHd5fMfuoU3c=";
   };
 
-  cargoHash = "sha256-6AdqPm07lbMzeqihQC3mCoBYZ1cduGo1rCvYsF+4XL4=";
+  cargoHash = "sha256-H0FG3BE/iP3knosnUVzJtNXt8hQ9E8Jh/2MTmviNhfA=";
 
   meta = {
     description = "Ping Tool in Rust with Real-Time Data and Visualizations";

From 43a579fdae1f7f0273ec841a15d9f3755420bac0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 13:38:20 +0000
Subject: [PATCH 43/91] phpPackages.grumphp: 2.21.0 -> 2.22.0

---
 pkgs/development/php-packages/grumphp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix
index 2da8698a4e07..c5f623868222 100644
--- a/pkgs/development/php-packages/grumphp/default.nix
+++ b/pkgs/development/php-packages/grumphp/default.nix
@@ -7,16 +7,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "grumphp";
-  version = "2.21.0";
+  version = "2.22.0";
 
   src = fetchFromGitHub {
     owner = "phpro";
     repo = "grumphp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vQ6H8IpHHSfmlRcRgXcYhQeV3vmtkB3S5F8WltJqcKE=";
+    hash = "sha256-qcgz6RWq5kzh0Vopkz3Gr1cU4lo/VNM6yAGQq4v34NY=";
   };
 
-  vendorHash = "sha256-Z3v5n7YhcyRF5iZhGa+iju81bObD0Nzls2V8DZ2WBVk=";
+  vendorHash = "sha256-g6iKl+o0kzvjuxE4lJP783ey+pNH2CZCKBLAKPxjb+Y=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From 947ea00c4f82f049c8b5762e01d146ec5259117d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 14:29:02 +0000
Subject: [PATCH 44/91] fselect: 0.10.1 -> 0.10.2

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

diff --git a/pkgs/by-name/fs/fselect/package.nix b/pkgs/by-name/fs/fselect/package.nix
index a0f51ed11bd2..33476559b84d 100644
--- a/pkgs/by-name/fs/fselect/package.nix
+++ b/pkgs/by-name/fs/fselect/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "fselect";
-  version = "0.10.1";
+  version = "0.10.2";
 
   src = fetchFromGitHub {
     owner = "jhspetersson";
     repo = "fselect";
     rev = finalAttrs.version;
-    sha256 = "sha256-eu2OAxdhDaKewMKL02rj8ED6tfB9OI3br7g0WoKOejk=";
+    sha256 = "sha256-j9Md3yfL1tQkjCQ/Wo+oKaI/6OsJsCRsSscSiRuLOV0=";
   };
 
-  cargoHash = "sha256-6XV8O3Ko4NKw5PaVbazrh6LQ0eQpbiPh/cB3Y9dkcb8=";
+  cargoHash = "sha256-+4dtpBcCOC1iwXKQHqgvvVtAvIFM3ZCAaefk9oPM1l0=";
 
   nativeBuildInputs = [ installShellFiles ];
   buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;

From e4c6a36155679081f20ee5495097c924d03b8694 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 14:54:26 +0000
Subject: [PATCH 45/91] editorconfig-checker: 3.7.0 -> 3.8.0

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

diff --git a/pkgs/by-name/ed/editorconfig-checker/package.nix b/pkgs/by-name/ed/editorconfig-checker/package.nix
index 4fb4f70d6eef..e4fc49db0a09 100644
--- a/pkgs/by-name/ed/editorconfig-checker/package.nix
+++ b/pkgs/by-name/ed/editorconfig-checker/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "editorconfig-checker";
-  version = "3.7.0";
+  version = "3.8.0";
 
   src = fetchFromGitHub {
     owner = "editorconfig-checker";
     repo = "editorconfig-checker";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8DNxLACoTtB86JUkHUDopKY0SVFdhdye/ThbUXwAYQE=";
+    hash = "sha256-t0EliFWYYxKfPbfLKP4p3wJvmIfXF6CPpWIgUuD3pXY=";
   };
 
-  vendorHash = "sha256-sOpa9aYWAQ5qahHhV0XgKOtuGWDu1+i0lcMCyc1FvMI=";
+  vendorHash = "sha256-5x7c8v+uMmqvyQnN47XgD8FFMoEq5/MPFO2WEj0WevU=";
 
   # Tests run on source and don't expect vendor dir.
   doCheck = false;

From 6c34a26998ffebf408973236fbec1179265c4b9d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 15:17:04 +0000
Subject: [PATCH 46/91] cloudflare-dynamic-dns: 4.4.5 -> 4.5.0

---
 pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix
index 661c184be155..a7f751921b0e 100644
--- a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix
+++ b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix
@@ -7,16 +7,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "cloudflare-dynamic-dns";
-  version = "4.4.5";
+  version = "4.5.0";
 
   src = fetchFromGitHub {
     owner = "zebradil";
     repo = "cloudflare-dynamic-dns";
     tag = finalAttrs.version;
-    hash = "sha256-TIun4EZuk4lgtNiNRA8P0x3+hkh3UFMVMUa75YecUk0=";
+    hash = "sha256-4QbgtzzPUzDQqPTiKMnA0/MNovDTJD+sm3u3Zorn6f4=";
   };
 
-  vendorHash = "sha256-Pu73TKBgEgLhUktnY4o/fR4KBLT2s2CUGFSf2Jo3SbQ=";
+  vendorHash = "sha256-qcJZp86ZBYrL3bWO94H2yba95oAqyYp57eRcC8U1Xog=";
 
   subPackages = ".";
 

From 80b0785e2e55f663e057e7b719613687f2ca6acb Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 28 Jun 2026 15:46:33 +0000
Subject: [PATCH 47/91] pyp: cleanup

---
 pkgs/by-name/py/pyp/package.nix | 83 ++++++++++++++++-----------------
 1 file changed, 39 insertions(+), 44 deletions(-)

diff --git a/pkgs/by-name/py/pyp/package.nix b/pkgs/by-name/py/pyp/package.nix
index 0822f93a9d43..6d0a126f84c1 100644
--- a/pkgs/by-name/py/pyp/package.nix
+++ b/pkgs/by-name/py/pyp/package.nix
@@ -10,49 +10,44 @@
   versionCheckHook,
 }:
 
-let
-  finalAttrs = {
-    pname = "pyp";
-    version = "1.3.0";
+python3Packages.buildPythonApplication (finalAttrs: {
+  pname = "pyp";
+  version = "1.3.0";
+  pyproject = true;
+  __structuredAttrs = true;
 
-    src = fetchFromGitHub {
-      owner = "hauntsaninja";
-      repo = "pyp";
-      tag = "v${finalAttrs.version}";
-      hash = "sha256-u9yxjYNQrtYtFtUh5tTJ1mGmGB+Ry+FRupli8RzRu3c=";
-    };
-
-    pyproject = true;
-
-    build-system = with python3Packages; [
-      flit-core
-    ];
-
-    nativeCheckInputs =
-      (with python3Packages; [
-        pytestCheckHook
-      ])
-      ++ [
-        addBinToPathHook
-        bc
-        jq
-        versionCheckHook
-      ];
-
-    pythonImportsCheck = [
-      "pyp"
-    ];
-
-    meta = {
-      homepage = "https://github.com/hauntsaninja/pyp";
-      description = "Easily run Python at the shell";
-      changelog = "https://github.com/hauntsaninja/pyp/blob/${finalAttrs.version}/CHANGELOG.md";
-      license = with lib.licenses; [ mit ];
-      mainProgram = "pyp";
-      maintainers = with lib.maintainers; [
-        rmcgibbo
-      ];
-    };
+  src = fetchFromGitHub {
+    owner = "hauntsaninja";
+    repo = "pyp";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-u9yxjYNQrtYtFtUh5tTJ1mGmGB+Ry+FRupli8RzRu3c=";
   };
-in
-python3Packages.buildPythonPackage finalAttrs
+
+  build-system = with python3Packages; [
+    flit-core
+  ];
+
+  nativeCheckInputs =
+    (with python3Packages; [
+      pytestCheckHook
+    ])
+    ++ [
+      addBinToPathHook
+      bc
+      jq
+      versionCheckHook
+    ];
+
+  pythonImportsCheck = [ "pyp" ];
+
+  meta = {
+    homepage = "https://github.com/hauntsaninja/pyp";
+    description = "Easily run Python at the shell";
+    changelog = "https://github.com/hauntsaninja/pyp/blob/${finalAttrs.version}/CHANGELOG.md";
+    license = with lib.licenses; [ mit ];
+    mainProgram = "pyp";
+    maintainers = with lib.maintainers; [
+      rmcgibbo
+    ];
+  };
+})

From 4bd105af4cb255e4bfb3f4b81361db5edc4a2c17 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 28 Jun 2026 15:53:45 +0000
Subject: [PATCH 48/91] md-tui: 0.10.2 -> 0.10.3

Diff: https://github.com/henriklovhaug/md-tui/compare/v0.10.2...v0.10.3

Changelog: https://github.com/henriklovhaug/md-tui/blob/v0.10.3/CHANGELOG.md
---
 pkgs/by-name/md/md-tui/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/md/md-tui/package.nix b/pkgs/by-name/md/md-tui/package.nix
index 41c58989f376..cc1949debea5 100644
--- a/pkgs/by-name/md/md-tui/package.nix
+++ b/pkgs/by-name/md/md-tui/package.nix
@@ -8,7 +8,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "md-tui";
-  version = "0.10.2";
+  version = "0.10.3";
 
   __structuredAttrs = true;
 
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "henriklovhaug";
     repo = "md-tui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VSOAeFY3TsdeOlKt3f9cbEsSNSwvhcYQl129oQMOTaM=";
+    hash = "sha256-1E3R1pR5f65rMMEa3Wh2I1W7JV+WgJuVN23XNpaxWTc=";
   };
 
-  cargoHash = "sha256-l1VXrf19KB6zTrVmINyinz0YpGDDUH9B77CN6CMz/X8=";
+  cargoHash = "sha256-IjT5YnU9hJd9trsMEM/lDtZIWd0XFHFesq0XF+j9zPg=";
 
   nativeBuildInputs = [ pkg-config ];
 

From d86f222ad02aad7a6f4811019b48516597ccf70b Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sun, 28 Jun 2026 17:56:48 +0200
Subject: [PATCH 49/91] lemon-graph: add hzeller as maintainer

---
 pkgs/by-name/le/lemon-graph/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/le/lemon-graph/package.nix b/pkgs/by-name/le/lemon-graph/package.nix
index 21bb819ce076..0490bbc5187e 100644
--- a/pkgs/by-name/le/lemon-graph/package.nix
+++ b/pkgs/by-name/le/lemon-graph/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://lemon.cs.elte.hu/trac/lemon";
     description = "Efficient library for combinatorial optimization tasks on graphs and networks";
     license = lib.licenses.boost;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ hzeller ];
     platforms = lib.platforms.all;
   };
 })

From 4c9314a3739a35b4cc4b854ece315832588bc182 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 16:02:24 +0000
Subject: [PATCH 50/91] czkawka: 11.0.1 -> 12.0.0

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

diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix
index c83dee38753c..5c226e630e4e 100644
--- a/pkgs/by-name/cz/czkawka/package.nix
+++ b/pkgs/by-name/cz/czkawka/package.nix
@@ -29,16 +29,16 @@
 let
   self = rustPlatform.buildRustPackage {
     pname = "czkawka";
-    version = "11.0.1";
+    version = "12.0.0";
 
     src = fetchFromGitHub {
       owner = "qarmin";
       repo = "czkawka";
       tag = self.version;
-      hash = "sha256-ke6N3vuKPGolfh6XpAg3/9dtwd09eX53fN2klUwwNwQ=";
+      hash = "sha256-KbGcaeQcpf2IL3I2PmsBpg8n+IfSuJl5tkLOxNCtYaQ=";
     };
 
-    cargoHash = "sha256-fx2ZH4I2WYCdMgNoKQuBBEJrPjmgTRPeVM2L+TWYn54=";
+    cargoHash = "sha256-+1K2a64XcbBePiQ/LeaSVCU/Ih0Fr4EjzNU5xpzfz2Q=";
 
     nativeBuildInputs = [
       gobject-introspection

From 0b9cbdebbaad1ebeda5710570e0b0cfd6a663161 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 28 Jun 2026 16:18:47 +0000
Subject: [PATCH 51/91] invidious: fix update script

---
 pkgs/by-name/in/invidious/update.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/in/invidious/update.sh b/pkgs/by-name/in/invidious/update.sh
index a23cc7de0cfe..a61a48286c7d 100755
--- a/pkgs/by-name/in/invidious/update.sh
+++ b/pkgs/by-name/in/invidious/update.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl crystal crystal2nix jq git moreutils nix nix-prefetch pkg-config pcre gnugrep
+#!nix-shell -i bash -p curl crystal crystal2nix jq git moreutils nix nurl pkg-config pcre gnugrep
 git_url='https://github.com/iv-org/invidious.git'
 git_branch='master'
 git_dir='/var/tmp/invidious.git'
@@ -51,7 +51,7 @@ json_set '.invidious.date' "$date"
 json_set '.invidious.commit' "$commit"
 json_set '.invidious.version' "$new_version"
 
-new_hash=$(nix-prefetch -I 'nixpkgs=../../../..' "$pkg")
+new_hash=$(nurl --submodules --hash "$git_url" "$new_tag")
 json_set '.invidious.hash' "$new_hash"
 
 # fetch video.js dependencies

From a0656f797f4bfa0bca53036552be370bdd9af763 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 16:29:36 +0000
Subject: [PATCH 52/91] terraform-providers.hashicorp_azurerm: 4.76.0 -> 4.79.0

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 1adf5b594b7d..29e3869e50cd 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -535,11 +535,11 @@
     "vendorHash": null
   },
   "hashicorp_azurerm": {
-    "hash": "sha256-NJ3g5w9bkY7tM/f67HOEiq6Uz99CHaJBKaW+mLHrxFM=",
+    "hash": "sha256-XJmSVCX6rigPD4oi0S4qUyvgvR5SkCHZV2rMAqsmIIo=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
     "owner": "hashicorp",
     "repo": "terraform-provider-azurerm",
-    "rev": "v4.76.0",
+    "rev": "v4.79.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 53f74469c3f4d814f4165172b59c8a96ddb04311 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 28 Jun 2026 16:19:09 +0000
Subject: [PATCH 53/91] invidious: 2.20260207.0 -> 2.20260626.0

Diff:
https://github.com/iv-org/invidious/compare/v2.20260207.0...v2.20260626.0

Changelog:
https://github.com/iv-org/invidious/releases/tag/v2.20260626.0
---
 pkgs/by-name/in/invidious/versions.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/in/invidious/versions.json b/pkgs/by-name/in/invidious/versions.json
index cf592f33e7b1..74b6e3663d93 100644
--- a/pkgs/by-name/in/invidious/versions.json
+++ b/pkgs/by-name/in/invidious/versions.json
@@ -1,11 +1,11 @@
 {
   "invidious": {
-    "hash": "sha256-tACx4+HqouftDalZlrurS75gYvS02qnmxQoL91YfTjg=",
-    "version": "2.20260207.0",
-    "date": "2026.02.07",
-    "commit": "118d6356"
+    "hash": "sha256-xJZjEnSeMnDo37ohtSAI2ucaPPv+nBYdrslHUCL/Pd8=",
+    "version": "2.20260626.0",
+    "date": "2026.06.27",
+    "commit": "ad0bd928"
   },
   "videojs": {
     "hash": "sha256-jED3zsDkPN8i6GhBBJwnsHujbuwlHdsVpVqa1/pzSH4="
   }
-}
\ No newline at end of file
+}

From f996d69b98daf1c220cb78ac362bca8867011f25 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 28 Jun 2026 16:55:11 +0000
Subject: [PATCH 54/91] invidious: enable __structuredAttrs

---
 pkgs/by-name/in/invidious/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/in/invidious/package.nix b/pkgs/by-name/in/invidious/package.nix
index e32b5816a5e9..589f0e55d209 100644
--- a/pkgs/by-name/in/invidious/package.nix
+++ b/pkgs/by-name/in/invidious/package.nix
@@ -31,6 +31,7 @@ in
 crystal.buildCrystalPackage rec {
   pname = "invidious";
   inherit (versions.invidious) version;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "iv-org";

From 93263c0068f20064b9bf8f980f2e5b5fd32f1535 Mon Sep 17 00:00:00 2001
From: Diffumist <git@diffumist.me>
Date: Mon, 29 Jun 2026 01:01:10 +0800
Subject: [PATCH 55/91] linphonePackages.mediastreamer2: add libsm to
 propagatedBuildInputs

---
 .../instant-messengers/linphone/mediastreamer2/default.nix      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/linphone/mediastreamer2/default.nix b/pkgs/applications/networking/instant-messengers/linphone/mediastreamer2/default.nix
index f4f3561ecd3e..cc90b0138a50 100644
--- a/pkgs/applications/networking/instant-messengers/linphone/mediastreamer2/default.nix
+++ b/pkgs/applications/networking/instant-messengers/linphone/mediastreamer2/default.nix
@@ -5,6 +5,7 @@
   glew,
   gsm,
   lib,
+  libsm,
   libx11,
   libxext,
   libopus,
@@ -47,6 +48,7 @@ mkLinphoneDerivation (finalAttrs: {
 
     ffmpeg_4
     glew
+    libsm
     libx11
     libxext
     libpulseaudio

From 03b08f64803d605dd8d4934fb8dd4740d69a79f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 28 Jun 2026 19:46:52 +0200
Subject: [PATCH 56/91] codebase-memory-mcp: disable updater and
 install/uninstall

---
 .../co/codebase-memory-mcp/package.nix        |  5 ++++
 .../remove-install-update.diff                | 30 +++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/by-name/co/codebase-memory-mcp/remove-install-update.diff

diff --git a/pkgs/by-name/co/codebase-memory-mcp/package.nix b/pkgs/by-name/co/codebase-memory-mcp/package.nix
index 702932bfc286..2dce136ff75c 100644
--- a/pkgs/by-name/co/codebase-memory-mcp/package.nix
+++ b/pkgs/by-name/co/codebase-memory-mcp/package.nix
@@ -8,6 +8,7 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "codebase-memory-mcp";
   version = "0.8.1";
+
   src = fetchFromGitHub {
     owner = "DeusData";
     repo = "codebase-memory-mcp";
@@ -15,6 +16,10 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-H0l8H2JhPT1Rs0p+CJC1a1qYtnZNgLGe6n7PmM+WvE4=";
   };
 
+  patches = [
+    ./remove-install-update.diff
+  ];
+
   nativeBuildInputs = [ gnumake ];
 
   buildInputs = [ zlib ];
diff --git a/pkgs/by-name/co/codebase-memory-mcp/remove-install-update.diff b/pkgs/by-name/co/codebase-memory-mcp/remove-install-update.diff
new file mode 100644
index 000000000000..fa35f0c3dec0
--- /dev/null
+++ b/pkgs/by-name/co/codebase-memory-mcp/remove-install-update.diff
@@ -0,0 +1,30 @@
+diff --git a/src/main.c b/src/main.c
+index f2b72cb..1663138 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -284,9 +284,6 @@ static void print_help(void) {
+     printf("Usage:\n");
+     printf("  codebase-memory-mcp              Run MCP server on stdio\n");
+     printf("  codebase-memory-mcp cli <tool> [json]  Run a single tool\n");
+-    printf("  codebase-memory-mcp install [-y|-n] [--force] [--dry-run]\n");
+-    printf("  codebase-memory-mcp uninstall [-y|-n] [--dry-run]\n");
+-    printf("  codebase-memory-mcp update [-y|-n]\n");
+     printf("  codebase-memory-mcp config <list|get|set|reset>\n");
+     printf("  codebase-memory-mcp --version    Print version\n");
+     printf("  codebase-memory-mcp --help       Print this help\n");
+@@ -331,15 +328,6 @@ static int handle_subcommand(int argc, char **argv) {
+             cbm_mem_init(MAIN_RAM_FRACTION);
+             return cbm_cmd_hook_augment();
+         }
+-        if (strcmp(argv[i], "install") == 0) {
+-            return cbm_cmd_install(argc - i - SKIP_ONE, argv + i + SKIP_ONE);
+-        }
+-        if (strcmp(argv[i], "uninstall") == 0) {
+-            return cbm_cmd_uninstall(argc - i - SKIP_ONE, argv + i + SKIP_ONE);
+-        }
+-        if (strcmp(argv[i], "update") == 0) {
+-            return cbm_cmd_update(argc - i - SKIP_ONE, argv + i + SKIP_ONE);
+-        }
+         if (strcmp(argv[i], "config") == 0) {
+             return cbm_cmd_config(argc - i - SKIP_ONE, argv + i + SKIP_ONE);
+         }

From f212032b09cf2d2d6be511ceb3e949bc2bf00eb3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 17:51:25 +0000
Subject: [PATCH 57/91] cargo-shear: 1.12.4 -> 1.13.1

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

diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix
index 08e8f65954c8..09de9e544fe2 100644
--- a/pkgs/by-name/ca/cargo-shear/package.nix
+++ b/pkgs/by-name/ca/cargo-shear/package.nix
@@ -8,15 +8,15 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-shear";
-  version = "1.12.4";
+  version = "1.13.1";
 
   src = fetchCrate {
     pname = "cargo-shear";
     version = finalAttrs.version;
-    hash = "sha256-nYAZfUh0ZMU0H+Eb5DOHvENCtDWiCLhzuEB3MFAKWpc=";
+    hash = "sha256-Luf6/kG0MgnBDyMLZGUSadPI60DOx5Jra3I3ezOGM4w=";
   };
 
-  cargoHash = "sha256-xJGITXhC02nOky5P5gzUHAmVyiolchcVofDiaHEX14o=";
+  cargoHash = "sha256-d+3ZfygD4CzHLgT45KcCw2rr313eVO7PhGZpgJpbxW8=";
 
   env = {
     # https://github.com/Boshen/cargo-shear/blob/v1.6.2/src/lib.rs#L51-L54

From 555349c5d2395bc14720272ba1cc172d6ddf58c8 Mon Sep 17 00:00:00 2001
From: patka <patka@patka.dev>
Date: Sun, 28 Jun 2026 18:08:41 +0200
Subject: [PATCH 58/91] openroad: removed unused pcre dependency

---
 pkgs/by-name/op/openroad/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/op/openroad/package.nix b/pkgs/by-name/op/openroad/package.nix
index 295af9848ab8..31f216021bce 100644
--- a/pkgs/by-name/op/openroad/package.nix
+++ b/pkgs/by-name/op/openroad/package.nix
@@ -29,7 +29,6 @@
   lemon-graph,
   libjpeg,
   or-tools,
-  pcre,
   python3,
   re2,
   readline,
@@ -82,7 +81,6 @@ stdenv.mkDerivation (finalAttrs: {
     libsForQt5.qtdeclarative
     libsForQt5.qtsvg
     or-tools
-    pcre
     python3
     re2
     readline

From 3b217131407a08b1b3b016856439d0f5cc802d2a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 18:02:15 +0000
Subject: [PATCH 59/91] python3Packages.pykwb: 0.0.10 -> 0.0.21

---
 pkgs/development/python-modules/pykwb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pykwb/default.nix b/pkgs/development/python-modules/pykwb/default.nix
index 7ec0ba604f71..d21ead6a02c9 100644
--- a/pkgs/development/python-modules/pykwb/default.nix
+++ b/pkgs/development/python-modules/pykwb/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "pykwb";
-  version = "0.0.10";
+  version = "0.0.21";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-mor2TKhq08w4HzaUaspWOMEFwJaAKjXKoNAaoZJqWPQ=";
+    hash = "sha256-53or6KOjZujOIq9yZ30Ph704I8T93AX/EoJZeVS3ihI=";
   };
 
   propagatedBuildInputs = [ pyserial ];

From 04e31ca14a42f0b1f83d1498f5ba2f5db7c4a64f Mon Sep 17 00:00:00 2001
From: eveeifyeve <kbkk7250@outlook.com>
Date: Mon, 29 Jun 2026 03:45:14 +1000
Subject: [PATCH 60/91] rift-wm: init at 0.4.3

Assisted-by: nix-init 0.3.6
---
 pkgs/by-name/ri/rift-wm/package.nix | 35 +++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 pkgs/by-name/ri/rift-wm/package.nix

diff --git a/pkgs/by-name/ri/rift-wm/package.nix b/pkgs/by-name/ri/rift-wm/package.nix
new file mode 100644
index 000000000000..981b86abaa4b
--- /dev/null
+++ b/pkgs/by-name/ri/rift-wm/package.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  apple-sdk,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "rift-wm";
+  version = "0.4.3";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "acsandmann";
+    repo = "rift";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-oOVNq4/hdiRcCbc9kaMxynnq2gXVezviQRTvjrdkfPs=";
+  };
+
+  nativeBuildInputs = [
+    apple-sdk
+  ];
+
+  cargoHash = "sha256-eb3Z5NIUusJApQWa6sDMRP//Y0BOToQsEIhQqqR728o=";
+
+  meta = {
+    description = "Tiling window manager for macos";
+    homepage = "https://github.com/acsandmann/rift";
+    changelog = "https://github.com/acsandmann/rift/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ eveeifyeve ];
+    mainProgram = "rift";
+    platforms = lib.platforms.darwin;
+  };
+})

From d1293cadd93233df5723d586eb9bc26ca8bb36c1 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sun, 28 Jun 2026 13:12:57 -0500
Subject: [PATCH 61/91] abella: move all args out of top-level, refactor

Assisted-by: Cursor Composer 2.5
---
 pkgs/applications/science/logic/abella/default.nix | 3 ++-
 pkgs/top-level/all-packages.nix                    | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix
index 210211a6b948..5902450717b6 100644
--- a/pkgs/applications/science/logic/abella/default.nix
+++ b/pkgs/applications/science/logic/abella/default.nix
@@ -13,10 +13,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "http://abella-prover.org/distributions/abella-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-80b/RUpE3KRY0Qu8eeTxAbk6mwGG6jVTPOP0qFjyj2M=";
+    hash = "sha256-80b/RUpE3KRY0Qu8eeTxAbk6mwGG6jVTPOP0qFjyj2M=";
   };
 
   strictDeps = true;
+  __structuredAttrs = true;
 
   nativeBuildInputs = [
     rsync
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89e8ab34a9ae..e1804ddd67af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10513,9 +10513,7 @@ with pkgs;
 
   ### SCIENCE/LOGIC
 
-  abella = callPackage ../applications/science/logic/abella {
-    ocamlPackages = ocaml-ng.ocamlPackages_4_12;
-  };
+  abella = callPackage ../applications/science/logic/abella { };
 
   inherit
     (callPackage ./rocq-packages.nix {

From cfd5429d2119e051625f27317f9dc01b2856c9e2 Mon Sep 17 00:00:00 2001
From: Angel J <78835633+Iamanaws@users.noreply.github.com>
Date: Sun, 28 Jun 2026 11:12:12 -0700
Subject: [PATCH 62/91] claude-monitor: 3.1.0 -> 4.0.0

---
 pkgs/by-name/cl/claude-monitor/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cl/claude-monitor/package.nix b/pkgs/by-name/cl/claude-monitor/package.nix
index b474ef62e23a..3cff1c73bc1e 100644
--- a/pkgs/by-name/cl/claude-monitor/package.nix
+++ b/pkgs/by-name/cl/claude-monitor/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "claude-monitor";
-  version = "3.1.0";
+  version = "4.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Maciek-roboblog";
     repo = "Claude-Code-Usage-Monitor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-v5ooniaN1iVerBW77/00SpghIVE1j8cl2WENcPnS66M=";
+    hash = "sha256-f/g8OygQYYfZqboTNePwCW3OxcH/wlvsHvL8Cv+iyCU=";
   };
 
   build-system = with python3Packages; [ setuptools ];
@@ -25,6 +25,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     pyyaml
     pytz
     rich
+    wcwidth
   ];
 
   # Tests require Claude API access and local data files
@@ -39,7 +40,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
       and get intelligent predictions about session limits.
     '';
     homepage = "https://github.com/Maciek-roboblog/Claude-Code-Usage-Monitor";
-    changelog = "https://github.com/Maciek-roboblog/Claude-Code-Usage-Monitor/blob/v${finalAttrs.version}/CHANGELOG.md";
+    changelog = "https://github.com/Maciek-roboblog/Claude-Code-Usage-Monitor/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ iamanaws ];
     mainProgram = "claude-monitor";

From 558c28699212d45f85208c70f6639f2343522904 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sun, 28 Jun 2026 13:15:21 -0500
Subject: [PATCH 63/91] abella: migrate to by-name

Assisted-by: Cursor Composer 2.5
---
 .../logic/abella/default.nix => by-name/ab/abella/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/science/logic/abella/default.nix => by-name/ab/abella/package.nix} (100%)

diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/by-name/ab/abella/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/abella/default.nix
rename to pkgs/by-name/ab/abella/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e1804ddd67af..cdbd50d537e5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10513,8 +10513,6 @@ with pkgs;
 
   ### SCIENCE/LOGIC
 
-  abella = callPackage ../applications/science/logic/abella { };
-
   inherit
     (callPackage ./rocq-packages.nix {
       inherit (ocaml-ng)

From ac29053902dcd0d02605d2d1e0bfbfb7bd4a3ffe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 18:16:36 +0000
Subject: [PATCH 64/91] terraform-providers.splunk-terraform_signalfx: 9.30.2
 -> 9.30.3

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 1adf5b594b7d..dfd0356075a0 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1247,11 +1247,11 @@
     "vendorHash": "sha256-C8TE7uxMf6LOTS6v22mXwUdk2eqQRinwrCH4ZVUCx4k="
   },
   "splunk-terraform_signalfx": {
-    "hash": "sha256-zwq7jCST2EkNk+UlKgLY2r3rCm5D009HYMru9KSVmuc=",
+    "hash": "sha256-bWZ5TvTVoYA6J67mi24rSzf5Qf6jk0RUgiC9CAa1s1o=",
     "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx",
     "owner": "splunk-terraform",
     "repo": "terraform-provider-signalfx",
-    "rev": "v9.30.2",
+    "rev": "v9.30.3",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-27mA2OAApUtPawZZk7Wxme9TfQY19TraIJSqHh8MFZg="
   },

From 0562ace3b5d97859299f5f1d565a6183a4800240 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 28 Jun 2026 20:23:39 +0200
Subject: [PATCH 65/91] python3Packages.pykwb: modernize

---
 pkgs/development/python-modules/pykwb/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pykwb/default.nix b/pkgs/development/python-modules/pykwb/default.nix
index d21ead6a02c9..3a4d94ab0457 100644
--- a/pkgs/development/python-modules/pykwb/default.nix
+++ b/pkgs/development/python-modules/pykwb/default.nix
@@ -3,19 +3,22 @@
   buildPythonPackage,
   fetchPypi,
   pyserial,
+  setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pykwb";
   version = "0.0.21";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-53or6KOjZujOIq9yZ30Ph704I8T93AX/EoJZeVS3ihI=";
   };
 
-  propagatedBuildInputs = [ pyserial ];
+  build-system = [ setuptools ];
+
+  dependencies = [ pyserial ];
 
   # Module has no tests
   doCheck = false;
@@ -25,7 +28,7 @@ buildPythonPackage rec {
   meta = {
     description = "Library for interacting with KWB Easyfire Pellet Central Heating Units";
     homepage = "https://github.com/bimbar/pykwb";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 4b15247cf2654f363661d35295cad0388f4d7a7c Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Sun, 28 Jun 2026 11:58:51 -0400
Subject: [PATCH 66/91] ndg: 2.8.0 -> 2.9.0

---
 pkgs/by-name/nd/ndg/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/nd/ndg/package.nix b/pkgs/by-name/nd/ndg/package.nix
index ef5c17e03fc1..ecdb4bf013dd 100644
--- a/pkgs/by-name/nd/ndg/package.nix
+++ b/pkgs/by-name/nd/ndg/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ndg";
-  version = "2.8.0";
+  version = "2.9.0";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "feel-co";
     repo = "ndg";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-YIKEyzh0NFQlD0O92LQQNMoVCDwV8yw1Xz0Iu+4ZC5U=";
+    hash = "sha256-be9NxraQyoB4wLjiPHxpmklfJYuB+Qs/x69P395I1Fk=";
   };
 
-  cargoHash = "sha256-r4lNSZuGFtNTOkIyd7skdEmA61lfbetI03tIUD+MO+Y=";
+  cargoHash = "sha256-N0em5kNY94sdPv3Fcpprk09yx1yKo8GZMWND/FJSSIw=";
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -59,7 +59,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/feel-co/ndg";
     changelog = "https://github.com/feel-co/ndg/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mpl20;
-    maintainers = [ lib.teams.feel-co ];
     mainProgram = "ndg";
+    teams = [ lib.teams.feel-co ];
   };
 })

From 48447120b4b79072d15e8b899296529ec629e607 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 18:36:31 +0000
Subject: [PATCH 67/91] whichllm: 0.5.12 -> 0.5.13

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

diff --git a/pkgs/by-name/wh/whichllm/package.nix b/pkgs/by-name/wh/whichllm/package.nix
index 221bf6313553..bd1e9d069713 100644
--- a/pkgs/by-name/wh/whichllm/package.nix
+++ b/pkgs/by-name/wh/whichllm/package.nix
@@ -7,7 +7,7 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "whichllm";
-  version = "0.5.12";
+  version = "0.5.13";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     owner = "Andyyyy64";
     repo = "whichllm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-B/pJyRMJBkxs9ANGVDN+ub8yKCOxtNQ+uHsy7i71BOE=";
+    hash = "sha256-54gM7ChlpWjT2L1lQkdnOttdx7TgDZf3SdXzqtRcbQs=";
   };
 
   build-system = with python3Packages; [ hatchling ];

From 4a5a56bca2b0766661ebfb45e717f6e38957a74b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 28 Jun 2026 04:59:37 +0200
Subject: [PATCH 68/91] botamusique: drop

Upstream archived the repo mid-2024 and I killed my own instance because
it became unreliable. The NixOS test has also been failing for a while
now, so I conclude that nobody cares about this package any more.
---
 ci/OWNERS                                     |   2 -
 nixos/modules/module-list.nix                 |   1 -
 nixos/modules/rename.nix                      |   3 +
 nixos/modules/services/audio/botamusique.nix  | 111 ------------
 nixos/tests/all-tests.nix                     |   1 -
 nixos/tests/botamusique.nix                   |  48 -----
 .../botamusique/catch-invalid-versions.patch  |  24 ---
 .../bo/botamusique/no-runtime-update.patch    |  12 --
 pkgs/by-name/bo/botamusique/package.nix       | 167 ------------------
 pkgs/by-name/bo/botamusique/src.json          |  13 --
 .../unconditional-relative-state-paths.patch  |  22 ---
 pkgs/top-level/aliases.nix                    |   1 +
 12 files changed, 4 insertions(+), 401 deletions(-)
 delete mode 100644 nixos/modules/services/audio/botamusique.nix
 delete mode 100644 nixos/tests/botamusique.nix
 delete mode 100644 pkgs/by-name/bo/botamusique/catch-invalid-versions.patch
 delete mode 100644 pkgs/by-name/bo/botamusique/no-runtime-update.patch
 delete mode 100644 pkgs/by-name/bo/botamusique/package.nix
 delete mode 100644 pkgs/by-name/bo/botamusique/src.json
 delete mode 100644 pkgs/by-name/bo/botamusique/unconditional-relative-state-paths.patch

diff --git a/ci/OWNERS b/ci/OWNERS
index a37d9b33ae67..e49f6fd54df4 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -233,9 +233,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix  @Artturin @Ericson2314 @lo
 /doc/toolchains/llvm.chapter.md @NixOS/llvm
 
 # Audio
-/nixos/modules/services/audio/botamusique.nix @mweinelt
 /nixos/modules/services/audio/snapserver.nix @mweinelt
-/nixos/tests/botamusique.nix @mweinelt
 /nixos/tests/snapcast.nix @mweinelt
 
 # Browsers
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 6c9f8c03dc5e..5d23788ca4a0 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -429,7 +429,6 @@
   ./services/amqp/activemq/default.nix
   ./services/amqp/rabbitmq.nix
   ./services/audio/alsa.nix
-  ./services/audio/botamusique.nix
   ./services/audio/gmediarender.nix
   ./services/audio/gonic.nix
   ./services/audio/goxlr-utility.nix
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index bacb7275cea0..9920ab3ccb16 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -150,6 +150,9 @@ in
     ] "The baget module was removed due to the upstream package being unmaintained.")
     (mkRemovedOptionModule [ "services" "beegfs" ] "The BeeGFS module has been removed")
     (mkRemovedOptionModule [ "services" "beegfsEnable" ] "The BeeGFS module has been removed")
+    (mkRemovedOptionModule [ "services" "botamusique" ]
+      "The botamusique module has been removed. The project was archived upstream in 2024: https://github.com/azlux/botamusique"
+    )
     (mkRemovedOptionModule [
       "services"
       "cgmanager"
diff --git a/nixos/modules/services/audio/botamusique.nix b/nixos/modules/services/audio/botamusique.nix
deleted file mode 100644
index 1017d8d6fd0b..000000000000
--- a/nixos/modules/services/audio/botamusique.nix
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.services.botamusique;
-
-  format = pkgs.formats.ini { };
-  configFile = format.generate "botamusique.ini" cfg.settings;
-in
-{
-  options.services.botamusique = {
-    enable = lib.mkEnableOption "botamusique, a bot to play audio streams on mumble";
-
-    package = lib.mkPackageOption pkgs "botamusique" { };
-
-    settings = lib.mkOption {
-      type =
-        with lib.types;
-        submodule {
-          freeformType = format.type;
-          options = {
-            server.host = lib.mkOption {
-              type = types.str;
-              default = "localhost";
-              example = "mumble.example.com";
-              description = "Hostname of the mumble server to connect to.";
-            };
-
-            server.port = lib.mkOption {
-              type = types.port;
-              default = 64738;
-              description = "Port of the mumble server to connect to.";
-            };
-
-            bot.username = lib.mkOption {
-              type = types.str;
-              default = "botamusique";
-              description = "Name the bot should appear with.";
-            };
-
-            bot.comment = lib.mkOption {
-              type = types.str;
-              default = "Hi, I'm here to play radio, local music or youtube/soundcloud music. Have fun!";
-              description = "Comment displayed for the bot.";
-            };
-          };
-        };
-      default = { };
-      description = ''
-        Your {file}`configuration.ini` as a Nix attribute set. Look up
-        possible options in the [configuration.example.ini](https://github.com/azlux/botamusique/blob/master/configuration.example.ini).
-      '';
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    systemd.services.botamusique = {
-      after = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-
-      unitConfig.Documentation = "https://github.com/azlux/botamusique/wiki";
-
-      environment.HOME = "/var/lib/botamusique";
-
-      serviceConfig = {
-        ExecStart = "${cfg.package}/bin/botamusique --config ${configFile}";
-        Restart = "always"; # the bot exits when the server connection is lost
-
-        # Hardening
-        CapabilityBoundingSet = [ "" ];
-        DynamicUser = true;
-        IPAddressDeny = [
-          "link-local"
-          "multicast"
-        ];
-        LockPersonality = true;
-        MemoryDenyWriteExecute = true;
-        ProcSubset = "pid";
-        PrivateDevices = true;
-        PrivateUsers = true;
-        PrivateTmp = true;
-        ProtectClock = true;
-        ProtectControlGroups = true;
-        ProtectHome = true;
-        ProtectHostname = true;
-        ProtectKernelLogs = true;
-        ProtectKernelModules = true;
-        ProtectKernelTunables = true;
-        ProtectProc = "invisible";
-        ProtectSystem = "strict";
-        RestrictNamespaces = true;
-        RestrictRealtime = true;
-        RestrictAddressFamilies = [
-          "AF_INET"
-          "AF_INET6"
-        ];
-        StateDirectory = "botamusique";
-        SystemCallArchitectures = "native";
-        SystemCallFilter = [
-          "@system-service @resources"
-          "~@privileged"
-        ];
-        UMask = "0077";
-        WorkingDirectory = "/var/lib/botamusique";
-      };
-    };
-  };
-}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 6a1c6f8e1065..9f91d7411be4 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -303,7 +303,6 @@ in
   bootspec = handleTestOn [ "x86_64-linux" ] ./bootspec.nix { };
   borgbackup = runTest ./borgbackup.nix;
   borgmatic = runTest ./borgmatic.nix;
-  botamusique = runTest ./botamusique.nix;
   bpf = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./bpf.nix;
   bpftune = runTest ./bpftune.nix;
   breitbandmessung = runTest ./breitbandmessung.nix;
diff --git a/nixos/tests/botamusique.nix b/nixos/tests/botamusique.nix
deleted file mode 100644
index 2a5c23000235..000000000000
--- a/nixos/tests/botamusique.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  name = "botamusique";
-
-  nodes = {
-    machine = {
-      networking.extraHosts = ''
-        127.0.0.1 all.api.radio-browser.info
-      '';
-
-      services.murmur = {
-        enable = true;
-        registerName = "NixOS tests";
-      };
-
-      services.botamusique = {
-        enable = true;
-        settings = {
-          server = {
-            channel = "NixOS tests";
-          };
-          bot = {
-            version = false;
-            auto_check_update = false;
-          };
-        };
-      };
-    };
-  };
-
-  testScript = ''
-    start_all()
-
-    machine.wait_for_unit("murmur.service")
-    machine.wait_for_unit("botamusique.service")
-
-    machine.sleep(10)
-
-    machine.wait_until_succeeds(
-        "journalctl -u murmur.service -e | grep -q '<1:botamusique(-1)> Authenticated'"
-    )
-
-    with subtest("Check systemd hardening"):
-        output = machine.execute("systemctl show botamusique.service")[1]
-        machine.log(output)
-        output = machine.execute("systemd-analyze security botamusique.service")[1]
-        machine.log(output)
-  '';
-}
diff --git a/pkgs/by-name/bo/botamusique/catch-invalid-versions.patch b/pkgs/by-name/bo/botamusique/catch-invalid-versions.patch
deleted file mode 100644
index 39b9aae8514c..000000000000
--- a/pkgs/by-name/bo/botamusique/catch-invalid-versions.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/mumbleBot.py b/mumbleBot.py
-index 11bc480..7395f41 100644
---- a/mumbleBot.py
-+++ b/mumbleBot.py
-@@ -188,11 +188,14 @@ class MumbleBot:
-             th.start()
- 
-         last_startup_version = var.db.get("bot", "version", fallback=None)
--        if not last_startup_version or version.parse(last_startup_version) < version.parse(self.version):
--            var.db.set("bot", "version", self.version)
--            if var.config.getboolean("bot", "auto_check_update"):
--                changelog = util.fetch_changelog()
--                self.send_channel_msg(tr("update_successful", version=self.version, changelog=changelog))
-+        try:
-+            if not last_startup_version or version.parse(last_startup_version) < version.parse(self.version):
-+                var.db.set("bot", "version", self.version)
-+                if var.config.getboolean("bot", "auto_check_update"):
-+                    changelog = util.fetch_changelog()
-+                    self.send_channel_msg(tr("update_successful", version=self.version, changelog=changelog))
-+        except version.InvalidVersion:
-+            pass
- 
-     # Set the CTRL+C shortcut
-     def ctrl_caught(self, signal, frame):
diff --git a/pkgs/by-name/bo/botamusique/no-runtime-update.patch b/pkgs/by-name/bo/botamusique/no-runtime-update.patch
deleted file mode 100644
index 8fc8580fce83..000000000000
--- a/pkgs/by-name/bo/botamusique/no-runtime-update.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/util.py b/util.py
-index bfec1ed..5147757 100644
---- a/util.py
-+++ b/util.py
-@@ -132,6 +132,7 @@ def check_update(current_version):
- 
- 
- def update(current_version):
-+    return "Can't update Nix installation at runtime"
-     global log
- 
-     target = var.config.get('bot', 'target_version')
diff --git a/pkgs/by-name/bo/botamusique/package.nix b/pkgs/by-name/bo/botamusique/package.nix
deleted file mode 100644
index 8d86a367d3ee..000000000000
--- a/pkgs/by-name/bo/botamusique/package.nix
+++ /dev/null
@@ -1,167 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  python3Packages,
-  ffmpeg-headless,
-  makeWrapper,
-  nixosTests,
-  nodejs,
-  npmHooks,
-  fetchNpmDeps,
-
-  # For the update script
-  coreutils,
-  curl,
-  nix-prefetch-git,
-  prefetch-npm-deps,
-  jq,
-  writeShellScript,
-}:
-let
-  srcJson = lib.importJSON ./src.json;
-  src = fetchFromGitHub {
-    owner = "azlux";
-    repo = "botamusique";
-    inherit (srcJson) rev sha256;
-  };
-
-  # Python needed to instantiate the html templates
-  buildPython = python3Packages.python.withPackages (ps: [ ps.jinja2 ]);
-in
-
-stdenv.mkDerivation rec {
-  pname = "botamusique";
-  version = srcJson.version;
-
-  inherit src;
-
-  npmDeps = fetchNpmDeps {
-    src = "${src}/web";
-    hash = srcJson.npmDepsHash;
-  };
-
-  npmRoot = "web";
-
-  patches = [
-    # botamusique by default resolves relative state paths by first checking
-    # whether it exists in the working directory, then falls back to using the
-    # installation directory. With Nix however, the installation directory is
-    # not writable, so that won't work. So we change this so that it uses
-    # relative paths unconditionally, whether they exist or not.
-    ./unconditional-relative-state-paths.patch
-
-    # We can't update the package at runtime with NixOS, so this patch makes
-    # the !update command mention that
-    ./no-runtime-update.patch
-
-    # Fix passing of invalid "git" version into version.parse, which results
-    # in an InvalidVersion exception. The upstream fix is insufficient, so
-    # we carry the correct patch downstream for now.
-    ./catch-invalid-versions.patch
-  ];
-
-  postPatch = ''
-    # However, the function that's patched above is also used for
-    # configuration.default.ini, which is in the installation directory
-    # after all. So we need to counter-patch it here so it can find it absolutely
-    substituteInPlace mumbleBot.py \
-      --replace "configuration.default.ini" "$out/share/botamusique/configuration.default.ini" \
-      --replace "version = 'git'" "version = '${version}'"
-  '';
-
-  env.NODE_OPTIONS = "--openssl-legacy-provider";
-
-  nativeBuildInputs = [
-    makeWrapper
-    nodejs
-    npmHooks.npmConfigHook
-    python3Packages.wrapPython
-  ];
-
-  pythonPath = with python3Packages; [
-    audioop-lts
-    flask
-    magic
-    mutagen
-    packaging
-    pillow
-    pymumble
-    pyradios
-    requests
-    yt-dlp
-  ];
-
-  buildPhase = ''
-    runHook preBuild
-
-    # Generates artifacts in ./static
-    (
-      cd web
-      npm run build
-    )
-
-    # Fills out http templates
-    ${buildPython}/bin/python scripts/translate_templates.py --lang-dir lang/ --template-dir templates/
-
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/share $out/bin
-    cp -r . $out/share/botamusique
-    chmod +x $out/share/botamusique/mumbleBot.py
-    wrapPythonProgramsIn $out/share/botamusique "$out ''${pythonPath[*]}"
-
-    # Convenience binary and wrap with ffmpeg dependency
-    makeWrapper $out/share/botamusique/mumbleBot.py $out/bin/botamusique \
-      --prefix PATH : ${lib.makeBinPath [ ffmpeg-headless ]}
-
-    runHook postInstall
-  '';
-
-  passthru.updateScript = writeShellScript "botamusique-updater" ''
-    export PATH=${
-      lib.makeBinPath [
-        coreutils
-        curl
-        nix-prefetch-git
-        jq
-        prefetch-npm-deps
-      ]
-    }
-    set -ex
-
-    OWNER=azlux
-    REPO=botamusique
-    VERSION="$(curl https://api.github.com/repos/$OWNER/$REPO/releases/latest | jq -r '.tag_name')"
-
-    nix-prefetch-git --rev "$VERSION" --url https://github.com/$OWNER/$REPO | \
-      jq > "${toString ./src.json}" \
-        --arg version "$VERSION" \
-        '.version |= $version'
-    path="$(jq '.path' -r < "${toString ./src.json}")"
-
-    tmp="$(mktemp -d)"
-    trap 'rm -rf "$tmp"' exit
-
-    npmHash="$(prefetch-npm-deps $path/web/package-lock.json)"
-    jq '. + { npmDepsHash: "'"$npmHash"'" }' < "${toString ./src.json}" > "$tmp/src.json"
-    mv "$tmp/src.json" "${toString ./src.json}"
-  '';
-
-  passthru.tests = {
-    inherit (nixosTests) botamusique;
-  };
-
-  meta = {
-    description = "Bot to play youtube / soundcloud / radio / local music on Mumble";
-    homepage = "https://github.com/azlux/botamusique";
-    license = lib.licenses.mit;
-    platforms = lib.platforms.all;
-    maintainers = [ ];
-    mainProgram = "botamusique";
-  };
-}
diff --git a/pkgs/by-name/bo/botamusique/src.json b/pkgs/by-name/bo/botamusique/src.json
deleted file mode 100644
index 034129ab9956..000000000000
--- a/pkgs/by-name/bo/botamusique/src.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "url": "https://github.com/azlux/botamusique",
-  "rev": "9b9b4e40ce7b077ebfa3b9be08d32025d1e43bc3",
-  "date": "2021-10-27T02:29:59+02:00",
-  "path": "/nix/store/9gxn2bw0757yrmx0xhhwq642lixyy88x-botamusique",
-  "sha256": "07n6nyi84ddqp2x8xrds7q83yfqapl5qhkcprzjsmvxhv4a3ar8q",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false,
-  "version": "7.2.2",
-  "npmDepsHash": "sha256-IzEO7TFqIZUkhNGf0pnHbK/WFexF27RPD9lkYvmFmDw="
-}
diff --git a/pkgs/by-name/bo/botamusique/unconditional-relative-state-paths.patch b/pkgs/by-name/bo/botamusique/unconditional-relative-state-paths.patch
deleted file mode 100644
index 3642a034fc88..000000000000
--- a/pkgs/by-name/bo/botamusique/unconditional-relative-state-paths.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/util.py b/util.py
-index bfec1ed..0546772 100644
---- a/util.py
-+++ b/util.py
-@@ -22,16 +22,7 @@ log = logging.getLogger("bot")
- 
- 
- def solve_filepath(path):
--    if not path:
--        return ''
--
--    if path[0] == '/':
--        return path
--    elif os.path.exists(path):
--        return path
--    else:
--        mydir = os.path.dirname(os.path.realpath(__file__))
--        return mydir + '/' + path
-+    return path
- 
- 
- def get_recursive_file_list_sorted(path):
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4fa6ffb07f94..05bfaf71ecfe 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -409,6 +409,7 @@ mapAliases {
   bob = throw "'bob' has been removed as it is unmaintained upstream and has vulnerable dependencies."; # Added 2025-12-29
   bodyclose = throw "'bodyclose' has been removed because it was broken for an entire release cycle."; # Added 2026-05-31
   boost177 = throw "Boost 1.77 has been removed as it is obsolete and no longer used by anything in Nixpkgs"; # Added 2026-04-20
+  botamusique = throw "botamusique has been removed as upstream stopped maintenance"; # Added 2026-06-28
   botan2 = throw "botan2 has been removed as it is EOL"; # Added 2025-10-20
   bower2nix = throw "bower2nix has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17
   boxfs = throw "'boxfs' has been removed, as it depends on unsupported fuse2 and unmaintained upstream"; # Added 2026-05-30

From f91bc654080da391318a4a680f8636343e0a23e4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 18:48:56 +0000
Subject: [PATCH 69/91] terraform-providers.sysdiglabs_sysdig: 3.8.1 -> 3.8.2

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 1adf5b594b7d..a9bd202eda35 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1283,11 +1283,11 @@
     "vendorHash": "sha256-R/+PS4cUtr8/twUXOPRiVweb5I9NNiD6mGOcAFr9IDs="
   },
   "sysdiglabs_sysdig": {
-    "hash": "sha256-yjuh6JVIt+FYVe9yILORklwt/KiBFcjmZnEHf5oeQQw=",
+    "hash": "sha256-r14FsYrLqcZLcQlm25qOCKICTAb3dMBkphRAHiUeXrs=",
     "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig",
     "owner": "sysdiglabs",
     "repo": "terraform-provider-sysdig",
-    "rev": "v3.8.1",
+    "rev": "v3.8.2",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-HjrB7C0KaLJz9NVLfZdq5EZbNbF9lJPxSkQwnWUF978="
   },

From 71c36646dd32fa5f99ec2421129ccf4c83e741b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 19:35:07 +0000
Subject: [PATCH 70/91] vscode-extensions.databricks.databricks: 2.11.1 ->
 2.12.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index bbaef26e8f88..a0d184a5752d 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1226,8 +1226,8 @@ let
         mktplcRef = {
           name = "databricks";
           publisher = "databricks";
-          version = "2.11.1";
-          hash = "sha256-QegVk1SJM/RegAVj7isgFcHwAJyQj9YDuP90u/7weSo=";
+          version = "2.12.0";
+          hash = "sha256-dDkJI9j79pFnZlEH9dokUoEYqjMmDyiU00IGGxzno1A=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/databricks.databricks/changelog";

From 2b3763c395207f46aaf0910033d5a64e480ece5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 28 Jun 2026 21:39:08 +0200
Subject: [PATCH 71/91] codebase-memory-mcp: build parallel again

I disabled that when migrating to makeFlags by accident
---
 pkgs/by-name/co/codebase-memory-mcp/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/co/codebase-memory-mcp/package.nix b/pkgs/by-name/co/codebase-memory-mcp/package.nix
index 2dce136ff75c..5ccfeb9d1b8a 100644
--- a/pkgs/by-name/co/codebase-memory-mcp/package.nix
+++ b/pkgs/by-name/co/codebase-memory-mcp/package.nix
@@ -27,6 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
   strictDeps = true;
   __structuredAttrs = true;
 
+  enableParallelBuilding = true;
+
   makefile = "Makefile.cbm";
 
   # scripts/build.sh verifies CC via `file`, which fails on Nix's compiler wrapper.

From 1a0fe662869eb17d3438430b468b3d20dca6d200 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 28 Jun 2026 21:39:37 +0200
Subject: [PATCH 72/91] codebase-memory-mcp: build web ui

We do not need gnumake in nativeBuildInputs as it is included in stdenv.
---
 .../co/codebase-memory-mcp/package.nix        | 35 ++++++++++++++++---
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/co/codebase-memory-mcp/package.nix b/pkgs/by-name/co/codebase-memory-mcp/package.nix
index 5ccfeb9d1b8a..e27c09b5cd86 100644
--- a/pkgs/by-name/co/codebase-memory-mcp/package.nix
+++ b/pkgs/by-name/co/codebase-memory-mcp/package.nix
@@ -1,8 +1,11 @@
 {
   lib,
-  stdenv,
+  bash,
   fetchFromGitHub,
-  gnumake,
+  fetchNpmDeps,
+  nodejs,
+  npmHooks,
+  stdenv,
   zlib,
 }:
 stdenv.mkDerivation (finalAttrs: {
@@ -20,9 +23,31 @@ stdenv.mkDerivation (finalAttrs: {
     ./remove-install-update.diff
   ];
 
-  nativeBuildInputs = [ gnumake ];
+  postPatch = ''
+    substituteInPlace Makefile.cbm \
+      --replace-fail "npm ci &&" ""
 
-  buildInputs = [ zlib ];
+    substituteInPlace scripts/embed-frontend.sh \
+      --replace-fail "/bin/bash" "${bash}/bin/bash"
+  '';
+
+  npmDeps = fetchNpmDeps {
+    inherit (finalAttrs) src;
+    sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
+    hash = "sha256-feoZNsZfrPgoLdjlnnh3w3vTxR6AwPdUkPubaR93TAk=";
+  };
+
+  npmRoot = "graph-ui";
+
+  nativeBuildInputs = [
+    nodejs
+    npmHooks.npmConfigHook
+  ];
+
+  buildInputs = [
+    bash
+    zlib
+  ];
 
   strictDeps = true;
   __structuredAttrs = true;
@@ -34,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
   # scripts/build.sh verifies CC via `file`, which fails on Nix's compiler wrapper.
   # Call make directly — mirrors upstream flake.nix.
   makeFlags = [
-    "cbm"
+    "cbm-with-ui"
     "CFLAGS_EXTRA='-DCBM_VERSION=\"${finalAttrs.version}\"'"
   ];
 

From c23c3a5516d43112f03f573169faf66bda6335d0 Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 28 Jun 2026 16:45:53 -0300
Subject: [PATCH 73/91] pgdog: 0.1.45 -> 0.1.46

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

diff --git a/pkgs/by-name/pg/pgdog/package.nix b/pkgs/by-name/pg/pgdog/package.nix
index a434d61df55c..5bc4427ae404 100644
--- a/pkgs/by-name/pg/pgdog/package.nix
+++ b/pkgs/by-name/pg/pgdog/package.nix
@@ -14,16 +14,16 @@ let
 in
 rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: {
   pname = "pgdog";
-  version = "0.1.45";
+  version = "0.1.46";
 
   src = fetchFromGitHub {
     owner = "pgdogdev";
     repo = "pgdog";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XMJNnkSV6c/0wWipFg59ZnnvCp4NwPELpVsQKCOViwA=";
+    hash = "sha256-9NW/LL6GaiYF2p/4MoGXGRS2jv9bLi+dmRDPPNPhnVw=";
   };
 
-  cargoHash = "sha256-6Eeon5+KRNFum7AGy8fkdpvtaMLduKzbtuqtJvpB8AY=";
+  cargoHash = "sha256-qt7CD4rTDt5DrQSSYvmheD+ib+JgM1IjbkKFKm6wXBE=";
 
   # Hardcoded paths for C compiler and linker
   postPatch = ''

From 67ebf03c9ff8b36e7c76da49a9561637cc92ed9f Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <github@brightone.cloud>
Date: Sun, 28 Jun 2026 20:46:50 +0100
Subject: [PATCH 74/91] ente-desktop: 1.7.22 -> 1.7.24

Assisted-By: pi coding agent with kimi-k2.7-code
---
 pkgs/by-name/en/ente-desktop/package.nix | 84 ++++++++++++++++--------
 1 file changed, 55 insertions(+), 29 deletions(-)

diff --git a/pkgs/by-name/en/ente-desktop/package.nix b/pkgs/by-name/en/ente-desktop/package.nix
index e803b56b463f..d579610bf834 100644
--- a/pkgs/by-name/en/ente-desktop/package.nix
+++ b/pkgs/by-name/en/ente-desktop/package.nix
@@ -17,16 +17,22 @@
   rustPlatform,
   cargo,
   rustc,
-  wasm-bindgen-cli_0_2_108,
+  wasm-bindgen-cli_0_2_121,
   binaryen,
 }:
 let
   electron = electron_41;
+
+  resourcesDir =
+    if stdenv.hostPlatform.isDarwin then
+      "$out/Applications/ente.app/Contents/Resources"
+    else
+      "$out/share/ente-desktop/resources";
 in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ente-desktop";
-  version = "1.7.22";
+  version = "1.7.24";
 
   src = fetchFromGitHub {
     owner = "ente-io";
@@ -38,11 +44,11 @@ stdenv.mkDerivation (finalAttrs: {
       "rust"
     ];
     tag = "photosd-v${finalAttrs.version}";
-    hash = "sha256-iEPUlWe1dmXm0dkl12faKbfqffu8LCm8JTa+uVIBwrA=";
+    hash = "sha256-/dO9qLJKbqR5h/GEJW9rLO1jNTa5GkqnJ9ORPSf5R8o=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/desktop";
-  cargoRoot = "../web/packages/wasm";
+  cargoRoot = "../rust";
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs)
@@ -52,26 +58,24 @@ stdenv.mkDerivation (finalAttrs: {
       sourceRoot
       cargoRoot
       ;
-    hash = "sha256-/FkAxi9KpW/Z6sdo7gfxvCmaAe0JzjubScrcGjbLD88=";
+    hash = "sha256-F+g/6mcMnplOkTlR/vedS3MhimFAbXFZi6CTJ/cqoU0=";
   };
   offlineCache = fetchYarnDeps {
     name = "ente-desktop-${finalAttrs.version}-offline-cache";
     inherit (finalAttrs) src sourceRoot;
-    hash = "sha256-OnqrowsT0Yion563QD4RA5whN///q4RbkgMDWXs9icg=";
+    hash = "sha256-ne3gyI6psDpYzCPpepIIWao0yBiiv9qXQ+Iri3ELK/U=";
   };
   webOfflineCache = fetchYarnDeps {
     name = "ente-desktop-${finalAttrs.version}-web-offline-cache";
     inherit (finalAttrs) src;
     sourceRoot = "${finalAttrs.src.name}/web";
-    hash = "sha256-bWOwIa7SD0z2StoUg9HlQGTBq2xXltLgQ2ft8umjg/Y=";
+    hash = "sha256-MqsmOHVyPz+YiwNmrs447wrQ/Nk+t5TrLMsbDITM8p0=";
   };
 
   nativeBuildInputs = [
     nodejs
     yarnConfigHook
     makeWrapper
-    autoPatchelfHook # for onnxruntime
-    copyDesktopItems
     imagemagick
 
     wasm-pack
@@ -79,8 +83,12 @@ stdenv.mkDerivation (finalAttrs: {
     cargo
     rustc
     rustc.llvmPackages.lld
-    wasm-bindgen-cli_0_2_108
+    wasm-bindgen-cli_0_2_121
     binaryen
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    autoPatchelfHook # for onnxruntime
+    copyDesktopItems
   ];
 
   buildInputs = [
@@ -90,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
   # Path to vips (otherwise it looks within the electron derivation)
   postPatch = ''
     substituteInPlace src/main/services/image.ts src/main.ts \
-      --replace-fail "process.resourcesPath" "\"$out/share/ente-desktop/resources\""
+      --replace-fail "process.resourcesPath" "\"${resourcesDir}\""
   '';
 
   postConfigure = ''
@@ -114,7 +122,14 @@ stdenv.mkDerivation (finalAttrs: {
     cp -r ../web/apps/photos/out out
 
     yarn run tsc
-    yarn run electron-builder --dir -c.electronDist=./electron_dist -c.electronVersion=${electron.version}
+    yarn run electron-builder -- \
+      --dir \
+      --c.electronDist=./electron_dist \
+      --c.electronVersion=${electron.version} \
+      ${lib.optionalString stdenv.hostPlatform.isDarwin ''
+        --c.mac.identity=null \
+        --c.mac.notarize=false \
+      ''}
 
     runHook postBuild
   '';
@@ -122,29 +137,40 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    for size in 16 32 48 64 72 96 128 192 256 512 1024; do
-      mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
-      convert -resize "$size"x"$size" build/icon.png $out/share/icons/hicolor/"$size"x"$size"/apps/ente-desktop.png
-    done
+    ${lib.optionalString stdenv.hostPlatform.isDarwin ''
+      mkdir -p $out/Applications
+      cp -r dist/*/ente.app $out/Applications
 
-    mkdir -p $out/share/ente-desktop
-    cp -r dist/*/resources $out/share/ente-desktop
-    ln -s ${vips}/bin/vips $out/share/ente-desktop/resources/vips
-    ln -s ${ffmpeg}/bin/ffmpeg $out/share/ente-desktop/resources/app.asar.unpacked/node_modules/ffmpeg-static/ffmpeg
+      mkdir -p $out/bin
+      ln -s $out/Applications/ente.app/Contents/MacOS/ente $out/bin/ente-desktop
+    ''}
 
-    # executable wrapper
-    makeWrapper '${electron}/bin/electron' "$out/bin/ente-desktop" \
-      --set ELECTRON_FORCE_IS_PACKAGED 1 \
-      --set ELECTRON_IS_DEV 0 \
-      --add-flags "$out/share/ente-desktop/resources/app.asar" \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
+    ${lib.optionalString stdenv.hostPlatform.isLinux ''
+      for size in 16 32 48 64 72 96 128 192 256 512 1024; do
+        mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
+        convert -resize "$size"x"$size" build/icon.png $out/share/icons/hicolor/"$size"x"$size"/apps/ente-desktop.png
+      done
+
+      mkdir -p $out/share/ente-desktop
+      cp -r dist/*/resources $out/share/ente-desktop
+
+      # executable wrapper
+      makeWrapper '${electron}/bin/electron' "$out/bin/ente-desktop" \
+        --set ELECTRON_FORCE_IS_PACKAGED 1 \
+        --set ELECTRON_IS_DEV 0 \
+        --add-flags "${resourcesDir}/app.asar" \
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
+    ''}
+
+    ln -s ${vips}/bin/vips ${resourcesDir}/vips
+    ln -s ${ffmpeg}/bin/ffmpeg ${resourcesDir}/app.asar.unpacked/node_modules/ffmpeg-static/ffmpeg
 
     runHook postInstall
   '';
 
   # The desktop item properties should be kept in sync with data from upstream:
   # https://github.com/ente-io/ente/blob/main/desktop/electron-builder.yml
-  desktopItems = [
+  desktopItems = lib.optionals (!stdenv.hostPlatform.isDarwin) [
     (makeDesktopItem {
       name = "ente-desktop";
       desktopName = "Ente";
@@ -169,8 +195,8 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       pinpox
       yuka
+      Br1ght0ne
     ];
-    platforms = lib.platforms.all;
-    broken = stdenv.hostPlatform.isDarwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 })

From 3c14c2c266a4b82840b72abe7571e3c751dbf925 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 19:49:07 +0000
Subject: [PATCH 75/91] python3Packages.dsmr-parser: 1.9.0 -> 1.11.0

---
 pkgs/development/python-modules/dsmr-parser/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dsmr-parser/default.nix b/pkgs/development/python-modules/dsmr-parser/default.nix
index ef3761c32691..a5013edf7e7a 100644
--- a/pkgs/development/python-modules/dsmr-parser/default.nix
+++ b/pkgs/development/python-modules/dsmr-parser/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "dsmr-parser";
-  version = "1.9.0";
+  version = "1.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ndokter";
     repo = "dsmr_parser";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KoSRfkTKdAusDi1twiU4Xs0p4nijDslkDPJMTfUvWsE=";
+    hash = "sha256-utpirGJ9M+2HAOcTAE325hIHOHgHrsBYisDGGQ1PKWY=";
   };
 
   pythonRelaxDeps = [ "dlms_cosem" ];

From 729aed726be7196ed697b5208c052b1e3e7e41ea Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Sun, 28 Jun 2026 18:13:10 +0200
Subject: [PATCH 76/91] ntpd-rs: skip more tests on darwin

---
 pkgs/by-name/nt/ntpd-rs/package.nix | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/nt/ntpd-rs/package.nix b/pkgs/by-name/nt/ntpd-rs/package.nix
index 6e2c72d6910b..9c49e4b37a17 100644
--- a/pkgs/by-name/nt/ntpd-rs/package.nix
+++ b/pkgs/by-name/nt/ntpd-rs/package.nix
@@ -33,13 +33,26 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   # These fail based on timestamp issues with bundled certificates
   # See https://github.com/NixOS/nixpkgs/issues/497682 & https://github.com/pendulum-project/ntpd-rs/pull/2133
-  checkFlags = [
-    "--skip=daemon::keyexchange::tests::key_exchange_connection_limiter"
-    "--skip=daemon::keyexchange::tests::key_exchange_roundtrip_with_port_server"
-    "--skip=daemon::ntp_source::tests::test_deny_stops_poll"
-    "--skip=daemon::ntp_source::tests::test_timeroundtrip"
-    "--skip=daemon::server::tests::test_server_serves"
-    "--skip=daemon::spawn::nts::tests::allow_srv_direct_name_resolution"
+  checkFlags = map (t: "--skip=${t}") [
+    "daemon::keyexchange::tests::key_exchange_connection_limiter"
+    "daemon::keyexchange::tests::key_exchange_roundtrip_with_port_server"
+    "daemon::ntp_source::tests::test_deny_stops_poll"
+    "daemon::ntp_source::tests::test_timeroundtrip"
+    "daemon::server::tests::test_server_serves"
+    "daemon::spawn::nts::tests::allow_srv_direct_name_resolution"
+    "daemon::spawn::standard::tests::reresolves_on_unreachable"
+    "nts::tests::test_key_exchange_roundtrip_no_cookies"
+    "nts::tests::test_keyexchange_fixed_key_no_permission"
+    "nts::tests::test_keyexchange_roundtrip_fixed_key"
+    "nts::tests::test_keyexchange_roundtrip_fixed_key_keep_alive"
+    "nts::tests::test_keyexchange_roundtrip_fixed_key_no_permit"
+    "nts::tests::test_keyexchange_roundtrip_no_proto_overlap"
+    "nts::tests::test_keyexchange_roundtrip_no_upgrade_possible"
+    "nts::tests::test_keyexchange_roundtrip_supports"
+    "nts::tests::test_keyexchange_roundtrip_upgrading"
+    "nts::tests::test_keyexchange_roundtrip_v4"
+    "nts::tests::test_keyexchange_roundtrip_v5"
+    "nts::tests::test_keyexchange_supports_no_permission"
   ];
 
   postPatch = ''

From 9d5af9d5c8ca80d4cd09e292b6ef51f2437dea4f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 20:12:54 +0000
Subject: [PATCH 77/91] libretro.pcsx-rearmed: 0-unstable-2026-06-13 ->
 0-unstable-2026-06-28

---
 pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
index 1c619b065a43..d2f42d2e655b 100644
--- a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
+++ b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "pcsx-rearmed";
-  version = "0-unstable-2026-06-13";
+  version = "0-unstable-2026-06-28";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "pcsx_rearmed";
-    rev = "d26eaee5c8fb47c1832b8bf32c1358d625da8a02";
-    hash = "sha256-p8sPQDnxIBMuFD9nCtdFp1DEJwRuifgUrOFYdY1EfME=";
+    rev = "050981b6eeb715f142854f57c68086f62921f027";
+    hash = "sha256-MFNA3YPhLKa5q9hYM11O5/BIrj5xOsiNXkFLnCzugzo=";
   };
 
   dontConfigure = true;

From 99f3b0d320df697890bc977705d24472211bfae5 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 28 Jun 2026 16:28:12 -0400
Subject: [PATCH 78/91] diffoscope: fix tests

---
 .../fix-tests-with-zipdetails-4.006.patch     | 97 +++++++++++++++++++
 pkgs/by-name/di/diffoscope/package.nix        |  2 +
 2 files changed, 99 insertions(+)
 create mode 100644 pkgs/by-name/di/diffoscope/fix-tests-with-zipdetails-4.006.patch

diff --git a/pkgs/by-name/di/diffoscope/fix-tests-with-zipdetails-4.006.patch b/pkgs/by-name/di/diffoscope/fix-tests-with-zipdetails-4.006.patch
new file mode 100644
index 000000000000..04593b366e76
--- /dev/null
+++ b/pkgs/by-name/di/diffoscope/fix-tests-with-zipdetails-4.006.patch
@@ -0,0 +1,97 @@
+From fade8d04bfdbf473f3930feba7183957372e7fa7 Mon Sep 17 00:00:00 2001
+From: Michael Daniels <mdaniels5757@gmail.com>
+Date: Sun, 28 Jun 2026 16:20:43 -0400
+Subject: [PATCH] fix tests with zipdetails 4.006
+
+---
+ tests/comparators/test_zip.py            |  3 ++-
+ tests/data/zip2_zipdetails_expected_diff |  2 +-
+ tests/data/zip_zipdetails_expected_diff  | 10 +++++-----
+ 3 files changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/tests/comparators/test_zip.py b/tests/comparators/test_zip.py
+index 75ec38be..ecff1930 100644
+--- a/tests/comparators/test_zip.py
++++ b/tests/comparators/test_zip.py
+@@ -81,7 +81,7 @@ def differences2(zip1, zip3):
+ 
+ 
+ @skip_unless_tools_exist("zipinfo", "zipdetails")
+-@skip_unless_tool_is_at_least("zipdetails", zipdetails_version, "4.004")
++@skip_unless_tool_is_at_least("zipdetails", zipdetails_version, "4.006")
+ @skip_unless_tool_is_at_least("perl", io_compress_zip_version, "2.212")
+ def test_metadata(differences):
+     assert_diff(differences[0], "zip_zipinfo_expected_diff")
+@@ -96,6 +96,7 @@ def test_compressed_files(differences):
+ 
+ 
+ @skip_unless_tools_exist("zipinfo", "bsdtar", "zipdetails")
++@skip_unless_tool_is_at_least("zipdetails", zipdetails_version, "4.006")
+ @skip_unless_tool_is_at_least("perl", io_compress_zip_version, "2.212")
+ def test_extra_fields(differences2):
+     assert_diff(differences2[0], "zip_bsdtar_expected_diff")
+diff --git a/tests/data/zip2_zipdetails_expected_diff b/tests/data/zip2_zipdetails_expected_diff
+index 291dca88..281cf6c5 100644
+--- a/tests/data/zip2_zipdetails_expected_diff
++++ b/tests/data/zip2_zipdetails_expected_diff
+@@ -5,7 +5,7 @@
+  #
+  0064 Extra ID #1           5455 (21589) 'Extended Timestamp [UT]'
+  0066   Length              0009 (9)
+- 0068   Flags               03 (3) 'Modification Access'
++ 0068   Flags               03 (3) 'Modification & Access'
+ -0069   Modification Time   558AB455 (1435153493) 'Wed Jun 24 13:44:53 2015'
+ -006D   Access Time         558AB45F (1435153503) 'Wed Jun 24 13:45:03 2015'
+ +0069   Modification Time   41414141 (1094795585) 'Fri Sep 10 05:53:05 2004'
+diff --git a/tests/data/zip_zipdetails_expected_diff b/tests/data/zip_zipdetails_expected_diff
+index 978c2583..50df2696 100644
+--- a/tests/data/zip_zipdetails_expected_diff
++++ b/tests/data/zip_zipdetails_expected_diff
+@@ -23,7 +23,7 @@
+  #
+  0064 Extra ID #1           5455 (21589) 'Extended Timestamp [UT]'
+  0066   Length              0009 (9)
+- 0068   Flags               03 (3) 'Modification Access'
++ 0068   Flags               03 (3) 'Modification & Access'
+ -0069   Modification Time   558AB455 (1435153493) 'Wed Jun 24 13:44:53 2015'
+ +0069   Modification Time   558AB474 (1435153524) 'Wed Jun 24 13:45:24 2015'
+  006D   Access Time         558AB45F (1435153503) 'Wed Jun 24 13:45:03 2015'
+@@ -85,7 +85,7 @@
+  #
+ -01BF Extra ID #1           5455 (21589) 'Extended Timestamp [UT]'
+ -01C1   Length              0005 (5)
+--01C3   Flags               03 (3) 'Modification Access'
++-01C3   Flags               03 (3) 'Modification & Access'
+ -01C4   Modification Time   558AB455 (1435153493) 'Wed Jun 24 13:44:53 2015'
+ -01C8 Extra ID #2           7875 (30837) 'Unix Extra type 3 [ux]'
+ -01CA   Length              000B (11)
+@@ -96,7 +96,7 @@
+ -01D3   GID                 000003E8 (1000)
+ +024E Extra ID #1           5455 (21589) 'Extended Timestamp [UT]'
+ +0250   Length              0005 (5)
+-+0252   Flags               03 (3) 'Modification Access'
+++0252   Flags               03 (3) 'Modification & Access'
+ +0253   Modification Time   558AB455 (1435153493) 'Wed Jun 24 13:44:53 2015'
+ +0257 Extra ID #2           7875 (30837) 'Unix Extra type 3 [ux]'
+ +0259   Length              000B (11)
+@@ -163,7 +163,7 @@
+  #
+ -020D Extra ID #1           5455 (21589) 'Extended Timestamp [UT]'
+ -020F   Length              0005 (5)
+--0211   Flags               03 (3) 'Modification Access'
++-0211   Flags               03 (3) 'Modification & Access'
+ -0212   Modification Time   558AB455 (1435153493) 'Wed Jun 24 13:44:53 2015'
+ -0216 Extra ID #2           7875 (30837) 'Unix Extra type 3 [ux]'
+ -0218   Length              000B (11)
+@@ -174,7 +174,7 @@
+ -0221   GID                 000003E8 (1000)
+ +029C Extra ID #1           5455 (21589) 'Extended Timestamp [UT]'
+ +029E   Length              0005 (5)
+-+02A0   Flags               03 (3) 'Modification Access'
+++02A0   Flags               03 (3) 'Modification & Access'
+ +02A1   Modification Time   558AB474 (1435153524) 'Wed Jun 24 13:45:24 2015'
+ +02A5 Extra ID #2           7875 (30837) 'Unix Extra type 3 [ux]'
+ +02A7   Length              000B (11)
+-- 
+2.54.0
+
diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix
index f821ac668755..dc5169673518 100644
--- a/pkgs/by-name/di/diffoscope/package.nix
+++ b/pkgs/by-name/di/diffoscope/package.nix
@@ -126,6 +126,8 @@ python.pkgs.buildPythonApplication rec {
     ./ignore_links.patch
     # Remove flags output from an OCaml test's diff, as it's Debian-specific
     ./remove-flags-from-ocaml-diff.patch
+    # https://salsa.debian.org/reproducible-builds/diffoscope/-/merge_requests/166
+    ./fix-tests-with-zipdetails-4.006.patch
   ];
 
   postPatch = ''

From 3f3a29643f8257b5732b7cf59bfa7b8e834939cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 20:43:48 +0000
Subject: [PATCH 79/91] gtree: 1.14.2 -> 1.14.5

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

diff --git a/pkgs/by-name/gt/gtree/package.nix b/pkgs/by-name/gt/gtree/package.nix
index fcd242aaf754..6fbaff137fa3 100644
--- a/pkgs/by-name/gt/gtree/package.nix
+++ b/pkgs/by-name/gt/gtree/package.nix
@@ -11,13 +11,13 @@
 # it's updated.
 buildGo126Module (finalAttrs: {
   pname = "gtree";
-  version = "1.14.2";
+  version = "1.14.5";
 
   src = fetchFromGitHub {
     owner = "ddddddO";
     repo = "gtree";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LMVXC22fTrPt4S5HkErMrpZwwanN5blY/TPUE8bg95s=";
+    hash = "sha256-tGmRVRy+xUq/WEYz7QktR7xuxKFbCWO7LSbAmSAodYw=";
   };
 
   vendorHash = "sha256-Vd5VKKl79Qu5R7jOYS1CTtQuAis9vWUbpBWnEI7sgpk=";

From d7c50a53252f59a67619058d3fb315d7b663f855 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 20:47:37 +0000
Subject: [PATCH 80/91] home-assistant-custom-components.home_connect_alt:
 1.4.1 -> 1.4.2

---
 .../custom-components/home_connect_alt/package.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/home_connect_alt/package.nix b/pkgs/servers/home-assistant/custom-components/home_connect_alt/package.nix
index a31a6a8b1a7d..31fbabf7f090 100644
--- a/pkgs/servers/home-assistant/custom-components/home_connect_alt/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/home_connect_alt/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "ekutner";
   domain = "home_connect_alt";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "ekutner";
     repo = "home-connect-hass";
     tag = version;
-    hash = "sha256-zrLDV5rO+i0nAXGnPuuPbQKbB8TAjNL0eOcvDuLiOF0=";
+    hash = "sha256-B8FQBvxHhTCSCnq40QiZKU+OnN9knzeUedpEmI04uss=";
   };
 
   dependencies = [ home-connect-async ];

From b5ce98eff275f654b9a95674629f6509e59c6464 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Fri, 26 Jun 2026 01:47:54 +0300
Subject: [PATCH 81/91] buildDubPackage: remove-references to all outputs of
 `compiler`

---
 pkgs/build-support/dlang/builddubpackage/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/dlang/builddubpackage/default.nix b/pkgs/build-support/dlang/builddubpackage/default.nix
index 8c9937ef50a9..8ce675a5644b 100644
--- a/pkgs/build-support/dlang/builddubpackage/default.nix
+++ b/pkgs/build-support/dlang/builddubpackage/default.nix
@@ -58,10 +58,12 @@ lib.extendMkDerivation {
       preFixup = ''
         ${args.preFixup or ""}
 
-        find "$out" -type f -exec remove-references-to -t ${compiler} '{}' +
+        find "$out" -type f -exec remove-references-to ${
+          lib.concatMapStringsSep " " (output: "-t ${output}") compiler.all
+        } '{}' +
       '';
 
-      disallowedReferences = args.disallowedReferences or [ compiler ];
+      disallowedReferences = args.disallowedReferences or compiler.all;
 
       meta = {
         platforms = dub.meta.platforms;

From 1602a466a1d0442af22e0284a0e12260fbc920c8 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Fri, 26 Jun 2026 01:47:54 +0300
Subject: [PATCH 82/91] buildDubPackage: default `__structuredAttrs` to true

---
 pkgs/build-support/dlang/builddubpackage/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/dlang/builddubpackage/default.nix b/pkgs/build-support/dlang/builddubpackage/default.nix
index 8ce675a5644b..9785e2f89c74 100644
--- a/pkgs/build-support/dlang/builddubpackage/default.nix
+++ b/pkgs/build-support/dlang/builddubpackage/default.nix
@@ -35,6 +35,7 @@ lib.extendMkDerivation {
       };
 
       strictDeps = args.strictDeps or true;
+      __structuredAttrs = args.__structuredAttrs or true;
 
       nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [
         dubSetupHook

From b49b0ecef1aece2bffda0bd62a008ea26789f311 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 21:17:46 +0000
Subject: [PATCH 83/91] python3Packages.elevenlabs: 2.53.0 -> 2.54.0

---
 pkgs/development/python-modules/elevenlabs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/elevenlabs/default.nix b/pkgs/development/python-modules/elevenlabs/default.nix
index b24800a0117e..4a773104dd4b 100644
--- a/pkgs/development/python-modules/elevenlabs/default.nix
+++ b/pkgs/development/python-modules/elevenlabs/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "elevenlabs";
-  version = "2.53.0";
+  version = "2.54.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "elevenlabs";
     repo = "elevenlabs-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-V/6zky0jekajrFZh+D6jlK3GSDN4Ms0mByi9CHceGo8=";
+    hash = "sha256-YA7rh/mz522f5Ak9s+NeXCl91ugJ+pnpwZijNEGBn+I=";
   };
 
   build-system = [ poetry-core ];

From 4c06c426639bb79834a542e35fe1c1b4e2f8c273 Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Tue, 23 Jun 2026 16:09:43 +0200
Subject: [PATCH 84/91] dpdk: 25.07 -> 26.03

---
 pkgs/by-name/dp/dpdk/package.nix | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/dp/dpdk/package.nix b/pkgs/by-name/dp/dpdk/package.nix
index 3c3a66aa8ff5..24434ed3aa0e 100644
--- a/pkgs/by-name/dp/dpdk/package.nix
+++ b/pkgs/by-name/dp/dpdk/package.nix
@@ -19,7 +19,6 @@
   doxygen,
   python3,
   pciutils,
-  fetchpatch,
   withExamples ? [ ],
   shared ? false,
   machine ? (
@@ -32,15 +31,18 @@
   ),
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "dpdk";
-  version = "25.07";
+  version = "26.03";
 
   src = fetchurl {
-    url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz";
-    sha256 = "sha256-aIbL7cNQu4y+80fRA2fWJZ42Q1Yn+7J9V4rb3A07QQ0=";
+    url = "https://fast.dpdk.org/rel/dpdk-${finalAttrs.version}.tar.xz";
+    hash = "sha256-hJiSArvg+67rYvj9xj9pGICsC2bNDcZMFnhDxZ2ynSw=";
   };
 
+  __structuredAttrs = true;
+  strictDeps = true;
+
   nativeBuildInputs = [
     makeWrapper
     doxygen
@@ -55,12 +57,14 @@ stdenv.mkDerivation rec {
     jansson
     libbpf
     elfutils
-    intel-ipsec-mb
     libpcap
     numactl
     openssl.dev
     zlib
     python3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isx86_64 [
+    intel-ipsec-mb
   ];
 
   propagatedBuildInputs = [
@@ -76,13 +80,15 @@ stdenv.mkDerivation rec {
   '';
 
   mesonFlags = [
-    "-Dtests=false"
-    "-Denable_docs=true"
-    "-Ddeveloper_mode=disabled"
+    (lib.mesonBool "tests" false)
+    (lib.mesonBool "enable_docs" true)
+    (lib.mesonEnable "developer_mode" false)
+    (lib.mesonOption "default_library" (if shared then "shared" else "static"))
   ]
-  ++ [ (if shared then "-Ddefault_library=shared" else "-Ddefault_library=static") ]
-  ++ lib.optional (machine != null) "-Dmachine=${machine}"
-  ++ lib.optional (withExamples != [ ]) "-Dexamples=${builtins.concatStringsSep "," withExamples}";
+  ++ lib.optionals (machine != null) [ (lib.mesonOption "machine" machine) ]
+  ++ lib.optionals (withExamples != [ ]) [
+    (lib.mesonOption "examples" (lib.concatStringsSep "," withExamples))
+  ];
 
   postInstall = ''
     # Remove Sphinx cache files. Not only are they not useful, but they also
@@ -117,4 +123,4 @@ stdenv.mkDerivation rec {
       zhaofengli
     ];
   };
-}
+})

From 7f81f12bc73e36d7bf76e944b7fd2156edf6dd44 Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Sun, 28 Jun 2026 23:29:52 +0200
Subject: [PATCH 85/91] dpdk: add stepbrodb to maintainers

---
 pkgs/by-name/dp/dpdk/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/dp/dpdk/package.nix b/pkgs/by-name/dp/dpdk/package.nix
index 24434ed3aa0e..45895af76e35 100644
--- a/pkgs/by-name/dp/dpdk/package.nix
+++ b/pkgs/by-name/dp/dpdk/package.nix
@@ -120,6 +120,7 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
       mic92
+      stepbrobd
       zhaofengli
     ];
   };

From 1baf495cd74251d579be979c2ac5438dadd6b91f Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Sun, 28 Jun 2026 22:34:40 +0200
Subject: [PATCH 86/91] pktgen: 24.10.3 -> 26.03.0

---
 pkgs/by-name/pk/pktgen/package.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pk/pktgen/package.nix b/pkgs/by-name/pk/pktgen/package.nix
index 2c7cf0cc9f32..21bb364784e3 100644
--- a/pkgs/by-name/pk/pktgen/package.nix
+++ b/pkgs/by-name/pk/pktgen/package.nix
@@ -14,17 +14,21 @@
   gtk2,
   which,
   withGtk ? false,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pktgen";
-  version = "24.10.3";
+  version = "26.03.0";
+
+  __structuredAttrs = true;
+  strictDeps = true;
 
   src = fetchFromGitHub {
     owner = "pktgen";
     repo = "Pktgen-DPDK";
-    rev = "pktgen-${finalAttrs.version}";
-    sha256 = "sha256-6KC1k+LWNSU/mdwcUKjCaq8pGOcO+dFzeXX4PJm0QgE=";
+    tag = "pktgen-${finalAttrs.version}";
+    hash = "sha256-GNBo0WsHevoge97gUgDdNygCHSA5fQ/73ibsTvDvVYI=";
   };
 
   nativeBuildInputs = [
@@ -57,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   postPatch = ''
-    substituteInPlace lib/common/lscpu.h --replace /usr/bin/lscpu ${util-linux}/bin/lscpu
+    substituteInPlace lib/common/lscpu.h --replace /usr/bin/lscpu ${lib.getExe' util-linux "lscpu"}
   '';
 
   postInstall = ''
@@ -66,6 +70,8 @@ stdenv.mkDerivation (finalAttrs: {
     rm -rf $out/include $out/lib
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Traffic generator powered by DPDK";
     homepage = "http://dpdk.org/";

From c57504fe36dd384cbb77324f670dbace175344e9 Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Sun, 28 Jun 2026 23:32:27 +0200
Subject: [PATCH 87/91] pktgen: add stepbrodb to maintainers

---
 pkgs/by-name/pk/pktgen/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/pk/pktgen/package.nix b/pkgs/by-name/pk/pktgen/package.nix
index 21bb364784e3..2084beea66c2 100644
--- a/pkgs/by-name/pk/pktgen/package.nix
+++ b/pkgs/by-name/pk/pktgen/package.nix
@@ -77,6 +77,9 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "http://dpdk.org/";
     license = lib.licenses.bsdOriginal;
     platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.abuibrahim ];
+    maintainers = with lib.maintainers; [
+      abuibrahim
+      stepbrobd
+    ];
   };
 })

From 321a3bf3397dec86b31f7ddf073c7d45a504912d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 21:32:46 +0000
Subject: [PATCH 88/91] libretro.stella: 0-unstable-2026-06-19 ->
 0-unstable-2026-06-28

---
 pkgs/applications/emulators/libretro/cores/stella.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/stella.nix b/pkgs/applications/emulators/libretro/cores/stella.nix
index 183bdb93d559..e33d2c161206 100644
--- a/pkgs/applications/emulators/libretro/cores/stella.nix
+++ b/pkgs/applications/emulators/libretro/cores/stella.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "stella";
-  version = "0-unstable-2026-06-19";
+  version = "0-unstable-2026-06-28";
 
   src = fetchFromGitHub {
     owner = "stella-emu";
     repo = "stella";
-    rev = "65fc7d66abfc8dfba5033d88523437b83664ea2b";
-    hash = "sha256-hYYZyHtWjo3BgX73Vxj8JG/2vQ7JtqT+4jPWLN+zZHw=";
+    rev = "62522a804dec6b5aa683fa5e37f5f6c48aefded1";
+    hash = "sha256-YALzsYJwZDtVkVx9yvkkEZ1AHxT4fAc+epoFDwStmSI=";
   };
 
   makefile = "Makefile";

From 27a5de5f15f9826255681729f4339213c7914de0 Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Sun, 28 Jun 2026 22:51:27 +0200
Subject: [PATCH 89/91] odp-dpdk: 1.46.0.0_DPDK_22.11 -> 1.50.0.0_DPDK_24.11

---
 pkgs/by-name/od/odp-dpdk/dpdk_25.03.patch     | 46 -----------------
 pkgs/by-name/od/odp-dpdk/odp-dpdk_25.03.patch | 50 -------------------
 pkgs/by-name/od/odp-dpdk/package.nix          | 28 ++++-------
 3 files changed, 10 insertions(+), 114 deletions(-)
 delete mode 100644 pkgs/by-name/od/odp-dpdk/dpdk_25.03.patch
 delete mode 100644 pkgs/by-name/od/odp-dpdk/odp-dpdk_25.03.patch

diff --git a/pkgs/by-name/od/odp-dpdk/dpdk_25.03.patch b/pkgs/by-name/od/odp-dpdk/dpdk_25.03.patch
deleted file mode 100644
index daafdfad8584..000000000000
--- a/pkgs/by-name/od/odp-dpdk/dpdk_25.03.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/lib/eal/include/rte_bitops.h b/lib/eal/include/rte_bitops.h
-index deb1fd43f2..0f63ebe1d5 100644
---- a/lib/eal/include/rte_bitops.h
-+++ b/lib/eal/include/rte_bitops.h
-@@ -525,10 +525,12 @@ __rte_bit_ ## variant ## flip ## size(qualifier uint ## size ## _t *addr, unsign
- 	__RTE_GEN_BIT_OPS(,, size) \
- 	__RTE_GEN_BIT_OPS(v_, volatile, size)
- 
-+#ifndef __cplusplus
- #ifdef ALLOW_EXPERIMENTAL_API
- __RTE_GEN_BIT_OPS_SIZE(32)
- __RTE_GEN_BIT_OPS_SIZE(64)
- #endif
-+#endif
- 
- #define __RTE_GEN_BIT_ATOMIC_TEST(variant, qualifier, size) \
- __rte_experimental \
-@@ -653,10 +655,12 @@ __rte_bit_atomic_ ## variant ## test_and_assign ## size( \
- 	__RTE_GEN_BIT_ATOMIC_OPS(,, size) \
- 	__RTE_GEN_BIT_ATOMIC_OPS(v_, volatile, size)
- 
-+#ifndef __cplusplus
- #ifdef ALLOW_EXPERIMENTAL_API
- __RTE_GEN_BIT_ATOMIC_OPS_SIZE(32)
- __RTE_GEN_BIT_ATOMIC_OPS_SIZE(64)
- #endif
-+#endif
- 
- /*------------------------ 32-bit relaxed operations ------------------------*/
- 
-@@ -1485,6 +1489,7 @@ rte_bit_ ## family ## fun(qualifier uint ## size ## _t *addr, arg1_type arg1_nam
- 	__RTE_BIT_OVERLOAD_SZ_4R(family, fun, qualifier, 64, ret_type, arg1_type, arg1_name, \
- 		arg2_type, arg2_name, arg3_type, arg3_name)
- 
-+#ifndef __cplusplus
- #ifdef ALLOW_EXPERIMENTAL_API
- __RTE_BIT_OVERLOAD_2R(, test, const, bool, unsigned int, nr)
- __RTE_BIT_OVERLOAD_2(, set,, unsigned int, nr)
-@@ -1502,6 +1507,7 @@ __RTE_BIT_OVERLOAD_3R(atomic_, test_and_clear,, bool, unsigned int, nr, int, mem
- __RTE_BIT_OVERLOAD_4R(atomic_, test_and_assign,, bool, unsigned int, nr, bool, value,
- 	int, memory_order)
- #endif
-+#endif
- 
- #endif
- 
diff --git a/pkgs/by-name/od/odp-dpdk/odp-dpdk_25.03.patch b/pkgs/by-name/od/odp-dpdk/odp-dpdk_25.03.patch
deleted file mode 100644
index a62c9a0796a3..000000000000
--- a/pkgs/by-name/od/odp-dpdk/odp-dpdk_25.03.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/platform/linux-dpdk/odp_packet_dpdk.c b/platform/linux-dpdk/odp_packet_dpdk.c
-index cd95ba0f9..7e8b7e3f1 100644
---- a/platform/linux-dpdk/odp_packet_dpdk.c
-+++ b/platform/linux-dpdk/odp_packet_dpdk.c
-@@ -372,13 +372,18 @@ static void prepare_rss_conf(pktio_entry_t *pktio_entry,
- 	uint64_t rss_hf_capa;
- 	pkt_dpdk_t *pkt_dpdk = pkt_priv(pktio_entry);
- 	uint16_t port_id = pkt_dpdk->port_id;
-+	int ret;
- 
- 	memset(&pkt_dpdk->rss_conf, 0, sizeof(struct rte_eth_rss_conf));
- 
- 	if (!p->hash_enable)
- 		return;
- 
--	rte_eth_dev_info_get(port_id, &dev_info);
-+	ret = rte_eth_dev_info_get(port_id, &dev_info);
-+	if (ret) {
-+		_ODP_ERR("Failed to read device info: %d\n", ret);
-+		return;
-+	}
- 	rss_hf_capa = dev_info.flow_type_rss_offloads;
- 
- 	/* Print debug info about unsupported hash protocols */
-@@ -842,7 +847,11 @@ static int dpdk_start(pktio_entry_t *pktio_entry)
- 	    pktio_entry->state == PKTIO_STATE_STOP_PENDING)
- 		rte_eth_dev_stop(pkt_dpdk->port_id);
- 
--	rte_eth_dev_info_get(port_id, &dev_info);
-+	ret = rte_eth_dev_info_get(port_id, &dev_info);
-+	if (ret) {
-+		_ODP_ERR("Failed to read device info: %d\n", ret);
-+		return -1;
-+	}
- 
- 	/* Pcap driver reconfiguration may fail if number of rx/tx queues is set to zero */
- 	if (!strncmp(dev_info.driver_name, PCAP_DRV_NAME, strlen(PCAP_DRV_NAME))) {
-@@ -1258,7 +1267,11 @@ static uint32_t _dpdk_vdev_mtu(uint16_t port_id)
- 	int ret;
- 	int sockfd;
- 
--	rte_eth_dev_info_get(port_id, &dev_info);
-+	ret = rte_eth_dev_info_get(port_id, &dev_info);
-+	if (ret) {
-+		_ODP_ERR("Failed to read device info: %d\n", ret);
-+		return 0;
-+	}
- 	if_indextoname(dev_info.if_index, ifr.ifr_name);
- 	sockfd = socket(AF_INET, SOCK_DGRAM, 0);
- 	ret = ioctl(sockfd, SIOCGIFMTU, &ifr);
diff --git a/pkgs/by-name/od/odp-dpdk/package.nix b/pkgs/by-name/od/odp-dpdk/package.nix
index 90b71a6e523b..570379c74804 100644
--- a/pkgs/by-name/od/odp-dpdk/package.nix
+++ b/pkgs/by-name/od/odp-dpdk/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch2,
   autoreconfHook,
   pkg-config,
   dpdk,
@@ -18,39 +17,30 @@
   elfutils,
   jansson,
   libnl,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "odp-dpdk";
-  version = "1.46.0.0_DPDK_22.11";
+  version = "1.50.0.0_DPDK_24.11";
+
+  __structuredAttrs = true;
+  strictDeps = true;
 
   src = fetchFromGitHub {
     owner = "OpenDataPlane";
     repo = "odp-dpdk";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-9stWGupRSQwUXOdPEQ9Rhkim22p5BBA5Z+2JCYS7Za0=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Q1xJ5JCrR/RH5Mxnrs6+gR3D7I2BpmPDki0yJ+5N/UE=";
   };
 
-  patches = [
-    ./odp-dpdk_25.03.patch
-    # Fix gcc 15 -Wunterminated-string-initialization errors in test code.
-    (fetchpatch2 {
-      url = "https://github.com/OpenDataPlane/odp-dpdk/commit/56c6bdbe8fe9db4c0441162ec269ef4e1ebd1a6a.patch";
-      hash = "sha256-aj4HuGb0BUxsKtFS3X3gXqBoRVRnKEBNxa/4heWhBlE=";
-    })
-  ];
-
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
   ];
 
   buildInputs = [
-    (dpdk.overrideAttrs {
-      patches = [
-        ./dpdk_25.03.patch
-      ];
-    })
+    dpdk
     intel-ipsec-mb
     libconfig
     libpcap
@@ -70,6 +60,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Open Data Plane optimized for DPDK";
     homepage = "https://www.opendataplane.org";

From 58d658e120821f5585bfbd7078a1509511a6c3d4 Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Sun, 28 Jun 2026 23:34:11 +0200
Subject: [PATCH 90/91] odp-dpdk: add stepbrodb to maintainers

---
 pkgs/by-name/od/odp-dpdk/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/od/odp-dpdk/package.nix b/pkgs/by-name/od/odp-dpdk/package.nix
index 570379c74804..28b021e77535 100644
--- a/pkgs/by-name/od/odp-dpdk/package.nix
+++ b/pkgs/by-name/od/odp-dpdk/package.nix
@@ -67,6 +67,9 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.opendataplane.org";
     license = lib.licenses.bsd3;
     platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.abuibrahim ];
+    maintainers = with lib.maintainers; [
+      abuibrahim
+      stepbrobd
+    ];
   };
 })

From 1c8d0fb81872e5b28209a5407b391e9994093ec9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 22:23:22 +0000
Subject: [PATCH 91/91] 
 home-assistant-custom-lovelace-modules.atomic-calendar-revive: 10.3.0 ->
 10.3.1

---
 .../atomic-calendar-revive/package.nix                      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix
index c3d79c35aeee..929423483c6a 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix
@@ -15,20 +15,20 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "atomic-calendar-revive";
-  version = "10.3.0";
+  version = "10.3.1";
 
   src = fetchFromGitHub {
     owner = "totaldebug";
     repo = "atomic-calendar-revive";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VgXLQXxA7QIUvVXRUvVmdKIZbyMIAbIn9adZIjEf2Yk=";
+    hash = "sha256-qqEQrbLQU5zhMcDDtg5f9Py4raOSYKCy4uv2omK6eO8=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
     fetcherVersion = 3;
-    hash = "sha256-qJIFvn8/p2wEkH4r1XGKWfwHdHPtU0AYLjWcy40kFTw=";
+    hash = "sha256-yxB142cM4Qe3bzs5ZHD+Bfi+AEoBdq5n2K2Mmm0nIhs=";
   };
 
   nativeBuildInputs = [