From 339e8fcf68bfab7892b1588e470b0a09412de0a4 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Thu, 12 Jun 2025 19:45:15 +0200
Subject: python3Packages.declinate: init at 0.0.6

---
 .../python-modules/declinate/default.nix           | 53 ++++++++++++++++++++++
 pkgs/top-level/python-packages.nix                 |  2 +
 2 files changed, 55 insertions(+)
 create mode 100644 pkgs/development/python-modules/declinate/default.nix

diff --git a/pkgs/development/python-modules/declinate/default.nix b/pkgs/development/python-modules/declinate/default.nix
new file mode 100644
index 000000000000..ed51b39cca11
--- /dev/null
+++ b/pkgs/development/python-modules/declinate/default.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitLab,
+
+  # build-system
+  setuptools,
+  setuptools-scm,
+
+  # dependencies
+  typing-extensions,
+
+  # nativeCheckInputs
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "declinate";
+  version = "0.0.6";
+  pyproject = true;
+
+  src = fetchFromGitLab {
+    owner = "ternaris";
+    repo = "declinate";
+    rev = "v${version}";
+    hash = "sha256-JEO/GtbG/yQuj8vJJaWex9mGy6qpWOPHGlKrdG9vt28=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    typing-extensions
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "declinate"
+  ];
+
+  meta = {
+    description = "Command line interface generator";
+    homepage = "https://gitlab.com/ternaris/declinate";
+    changelog = "https://gitlab.com/ternaris/declinate/-/blob/${src.rev}/CHANGES.rst";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ nim65s ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 14cb710f929a..1e87fefafc40 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3373,6 +3373,8 @@ self: super: with self; {
 
   decli = callPackage ../development/python-modules/decli { };
 
+  declinate = callPackage ../development/python-modules/declinate { };
+
   decopatch = callPackage ../development/python-modules/decopatch { };
 
   decora-wifi = callPackage ../development/python-modules/decora-wifi { };
-- 
cgit v1.2.3


From 9cb24fe48da6ffc1856a41e4c28a85b450cc9b58 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Thu, 12 Jun 2025 19:36:28 +0200
Subject: python3Packages.rosbags: init at 0.10.10

---
 .../development/python-modules/rosbags/default.nix | 66 ++++++++++++++++++++++
 pkgs/top-level/python-packages.nix                 |  2 +
 2 files changed, 68 insertions(+)
 create mode 100644 pkgs/development/python-modules/rosbags/default.nix

diff --git a/pkgs/development/python-modules/rosbags/default.nix b/pkgs/development/python-modules/rosbags/default.nix
new file mode 100644
index 000000000000..18a4340d1475
--- /dev/null
+++ b/pkgs/development/python-modules/rosbags/default.nix
@@ -0,0 +1,66 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitLab,
+
+  # build-system
+  setuptools,
+  setuptools-scm,
+
+  # dependencies
+  lz4,
+  numpy,
+  ruamel-yaml,
+  typing-extensions,
+  zstandard,
+
+  # nativeCheckInputs
+  pytestCheckHook,
+
+  # checkInputs
+  declinate,
+}:
+
+buildPythonPackage rec {
+  pname = "rosbags";
+  version = "0.10.10";
+  pyproject = true;
+
+  src = fetchFromGitLab {
+    owner = "ternaris";
+    repo = "rosbags";
+    rev = "v${version}";
+    hash = "sha256-EOuvvC6VTnhZA9M6ZKn0TNjbCm+lXH4/TboDS0hcw1A=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    lz4
+    numpy
+    ruamel-yaml
+    typing-extensions
+    zstandard
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  checkInputs = [
+    declinate
+  ];
+
+  pythonImportsCheck = [
+    "rosbags"
+  ];
+
+  meta = {
+    description = "Pure Python library to read, modify, convert, and write rosbag files";
+    homepage = "https://gitlab.com/ternaris/rosbags";
+    changelog = "https://gitlab.com/ternaris/rosbags/-/blob/${src.rev}/CHANGES.rst";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ nim65s ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1e87fefafc40..81672202c763 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15510,6 +15510,8 @@ self: super: with self; {
 
   ropper = callPackage ../development/python-modules/ropper { };
 
+  rosbags = callPackage ../development/python-modules/rosbags { };
+
   rotary-embedding-torch = callPackage ../development/python-modules/rotary-embedding-torch { };
 
   rouge-score = callPackage ../development/python-modules/rouge-score { };
-- 
cgit v1.2.3


From 654c6df53a567ec5c21a6f860ceb19917ba09e8f Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 13 Jun 2025 01:10:50 +0200
Subject: python3Packages.rosbags: rev -> tag

Co-authored-by: Luke Bailey <156000062+baileyluTCD@users.noreply.github.com>
---
 pkgs/development/python-modules/declinate/default.nix | 4 ++--
 pkgs/development/python-modules/rosbags/default.nix   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/declinate/default.nix b/pkgs/development/python-modules/declinate/default.nix
index ed51b39cca11..58bd28b1d53e 100644
--- a/pkgs/development/python-modules/declinate/default.nix
+++ b/pkgs/development/python-modules/declinate/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchFromGitLab {
     owner = "ternaris";
     repo = "declinate";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JEO/GtbG/yQuj8vJJaWex9mGy6qpWOPHGlKrdG9vt28=";
   };
 
@@ -46,7 +46,7 @@ buildPythonPackage rec {
   meta = {
     description = "Command line interface generator";
     homepage = "https://gitlab.com/ternaris/declinate";
-    changelog = "https://gitlab.com/ternaris/declinate/-/blob/${src.rev}/CHANGES.rst";
+    changelog = "https://gitlab.com/ternaris/declinate/-/blob/${src.tag}/CHANGES.rst";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ nim65s ];
   };
diff --git a/pkgs/development/python-modules/rosbags/default.nix b/pkgs/development/python-modules/rosbags/default.nix
index 18a4340d1475..b847cff2f6cf 100644
--- a/pkgs/development/python-modules/rosbags/default.nix
+++ b/pkgs/development/python-modules/rosbags/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchFromGitLab {
     owner = "ternaris";
     repo = "rosbags";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-EOuvvC6VTnhZA9M6ZKn0TNjbCm+lXH4/TboDS0hcw1A=";
   };
 
@@ -59,7 +59,7 @@ buildPythonPackage rec {
   meta = {
     description = "Pure Python library to read, modify, convert, and write rosbag files";
     homepage = "https://gitlab.com/ternaris/rosbags";
-    changelog = "https://gitlab.com/ternaris/rosbags/-/blob/${src.rev}/CHANGES.rst";
+    changelog = "https://gitlab.com/ternaris/rosbags/-/blob/${src.tag}/CHANGES.rst";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ nim65s ];
   };
-- 
cgit v1.2.3


From 541afad2ab47d3b2c74ff34f7ec326db45bc032d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jul 2025 16:55:25 +0000
Subject: python3Packages.app-model: 0.3.1 -> 0.4.0

---
 pkgs/development/python-modules/app-model/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/app-model/default.nix b/pkgs/development/python-modules/app-model/default.nix
index 707990d470fc..3dc700a076b9 100644
--- a/pkgs/development/python-modules/app-model/default.nix
+++ b/pkgs/development/python-modules/app-model/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "app-model";
-  version = "0.3.1";
+  version = "0.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "pyapp-kit";
     repo = "app-model";
     tag = "v${version}";
-    hash = "sha256-bIqcbKjAj5TMZD9mZ+7G4q+sR0aRqn6E4hf99srgRIE=";
+    hash = "sha256-T7aUwdne1rUzhVRotlxDvEBm3mi/frUQziZdLo53Lsg=";
   };
 
   build-system = [
@@ -47,7 +47,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Module to implement generic application schema";
     homepage = "https://github.com/pyapp-kit/app-model";
-    changelog = "https://github.com/pyapp-kit/app-model/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/pyapp-kit/app-model/blob/${src.tag}/CHANGELOG.md";
     license = licenses.bsd3;
     maintainers = with maintainers; [ fab ];
   };
-- 
cgit v1.2.3


From 84e39be3fc284ae717337621ce1abc001988dc77 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 00:39:49 +0000
Subject: python3Packages.gotrue: 2.12.0 -> 2.12.3

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

diff --git a/pkgs/development/python-modules/gotrue/default.nix b/pkgs/development/python-modules/gotrue/default.nix
index 8ef7436ecc04..28cdc92a1307 100644
--- a/pkgs/development/python-modules/gotrue/default.nix
+++ b/pkgs/development/python-modules/gotrue/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "gotrue";
-  version = "2.12.0";
+  version = "2.12.3";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ueoWTuUpZNg2TFUM3hbdDpV2JBpM/+qlLsozn2HR0Us=";
+    hash = "sha256-+HTPnQsvAzW/vQ1uKeP3r/eZmM0cFNKtgU24wGzuOFI=";
   };
 
   build-system = [ poetry-core ];
-- 
cgit v1.2.3


From c9207b0f818a25e200dc723ae922628fdce6dab2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 01:32:31 +0000
Subject: grafanaPlugins.volkovlabs-variable-panel: 4.0.0 -> 4.1.0

---
 .../monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix
index 3f42e65c2f4b..dbfb4c90a859 100644
--- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "volkovlabs-variable-panel";
-  version = "4.0.0";
-  zipHash = "sha256-fHOo/Au8yPQXIkG/BupNcMpFNgDLRrqpwRpmbq6xYhM=";
+  version = "4.1.0";
+  zipHash = "sha256-3AkCebT9KcQdsi+T3+0XMhwZaEmqlOmY90RidcVqUb4=";
   meta = with lib; {
     description = "Variable panel allows you to have dashboard filters in a separate panel which you can place anywhere on the dashboard";
     license = licenses.asl20;
-- 
cgit v1.2.3


From f273a07dffcf96d69644ab12457341205312aaf7 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Fri, 1 Aug 2025 13:50:00 -0700
Subject: linuxPackages.openafs: Patch for Linux kernel 6.16

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 pkgs/servers/openafs/1.8/module.nix | 76 ++++++++++++++++++++++++++-----------
 1 file changed, 54 insertions(+), 22 deletions(-)

diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix
index c630ce82451e..8e5f9f5d54de 100644
--- a/pkgs/servers/openafs/1.8/module.nix
+++ b/pkgs/servers/openafs/1.8/module.nix
@@ -30,51 +30,83 @@ stdenv.mkDerivation {
   patches = [
     # LINUX: Refactor afs_linux_dentry_revalidate()
     (fetchpatch {
-      url = "https://gerrit.openafs.org/changes/16276/revisions/c1d074317e5c8cb8212e0b19a29f7d710bcabb32/patch";
-      decode = "base64 -d";
-      hash = "sha256-8ga9ks9pr6pWaV2t67v+FaG0yVExhqELkvkpdLvO8Nc=";
+      url = "https://github.com/openafs/openafs/commit/02603ec7bb2b6dadd9fc6f30f1d180732673f3d9.patch";
+      hash = "sha256-A5fM6v/WMzl7Jj1liHaPYqlZRa2/q2rxj6H3r25VpXY=";
     })
     # Linux-6.14: Handle dops.d_revalidate with parent
     (fetchpatch {
-      url = "https://gerrit.openafs.org/changes/16277/revisions/0051bd0ee82b05e8caacdc0596e5b62609bebd2e/patch";
-      decode = "base64 -d";
+      url = "https://github.com/openafs/openafs/commit/5f85032cdb7f0148dc6165773acb6d6ffe4b6914.patch";
       hash = "sha256-08jedwZ1KX1RSs8y9sh7BUvv5xK9tlzZ6uBOR4kS0Jo=";
     })
     # Linux: Add required MODULE_DESCRIPTION
     (fetchpatch {
-      url = "https://gerrit.openafs.org/changes/16372/revisions/39189eba45542376e668636bd79a93ae6a8a7cd2/patch";
-      decode = "base64 -d";
-      hash = "sha256-j5ckKQvybEvmlnFs5jX8g8Dfw37LYWGnfsl4hnZ3+A4=";
+      url = "https://github.com/openafs/openafs/commit/e76b520f1316e7059a7855078f117ce194734317.patch";
+      hash = "sha256-B3h2XLaRL3jaFFKl2naydVedugVo25A2PEK4ds5WHJo=";
     })
     # linux: inode_ops mkdir returns struct dentry *
     (fetchpatch {
-      url = "https://gerrit.openafs.org/changes/16373/revisions/769847e205d5908a0c430f7bcfbd2f48e19f8bf8/patch";
-      decode = "base64 -d";
-      hash = "sha256-znv5gunyPnJgi4SRFERJudtYFqiS+AVYDWfvr52Ku3s=";
+      url = "https://github.com/openafs/openafs/commit/eeb4f7012ce8b22ff24d073e52e837ef36507afb.patch";
+      hash = "sha256-2LqB2QGTMoE4Z7fcW4XZV/R9OzR6BI6pD99ODtKQHk8=";
+    })
+    # cf: check for dentry flag macros/enums
+    (fetchpatch {
+      url = "https://github.com/openafs/openafs/commit/62e2df3182bea9ea7d5e86d4d3a0dfc955bc3753.patch";
+      hash = "sha256-d8zRwt/Wq3UmI/hW033ZyzEP/6her/jspzGTfbunGxw=";
+    })
+    # Linux: Use folio_wait_locked()
+    (fetchpatch {
+      url = "https://github.com/openafs/openafs/commit/16070e998960f7fe0c15dfa13b88c7b1fa36dce2.patch";
+      hash = "sha256-GbqXEviQJUqzEOpRtUHP2iM0Gx6+PYkflmMDAd21t/Y=";
+    })
+    # Linux: Refactor afs_linux_write_end()/begin()
+    (fetchpatch {
+      url = "https://github.com/openafs/openafs/commit/d946ce6f218a2013bc002fb44ad23b89f2d21212.patch";
+      hash = "sha256-9JxMasRbpbdsdcwkJdaiIbNmqqC7VF++/Dl1WmsnRkg=";
     })
     # Linux: Use __filemap_get_folio()
     (fetchpatch {
-      url = "https://gerrit.openafs.org/changes/16374/revisions/f187add554da9e9c52752edbfa98f486f683cf25/patch";
+      url = "https://github.com/openafs/openafs/commit/0c44e9f27fd0e058b59a9b63d755036829590e81.patch";
+      hash = "sha256-9/anvdp/Pw6Iy4+FC6qTZUTZ318gh88jTr7uDDtu2+Q=";
+    })
+    # LINUX: Use folio_page() to convert folio to page
+    (fetchpatch {
+      url = "https://github.com/openafs/openafs/commit/39ce8f11df2d650bb4d86c76c127c292880a5c76.patch";
+      hash = "sha256-C0ESzTaYq2S41bcuz4Zkd35Sucw+8xrD0E9gx1lHeJ4=";
+    })
+    # LINUX: Remove test for DCACHE_NFSFS_RENAMED
+    (fetchpatch {
+      url = "https://github.com/openafs/openafs/commit/78f5daf8bd79603c53630ba6eb712ab87ebc5dc5.patch";
+      hash = "sha256-CwKp+8toPsKlagcN0r6uafGH0M2bcpFJMbMjd0FsRr8=";
+    })
+    # linux: change lookup_one_len to lookup_noperm
+    (fetchpatch {
+      url = "https://gerrit.openafs.org/changes/16435/revisions/d3c424dcaba6ed8415a7617f0ae3622fe84e988a/patch";
       decode = "base64 -d";
-      hash = "sha256-+ay87ThSn6QyPZcN0+oE01Wqbxmz0Z1KXYwocQCvYLg=";
+      hash = "sha256-AqLhS6A68E5M+3CyNnIgv7CB5jGC/hQ4PIqPv0zggq4=";
     })
-    # Linux: Use folio_wait_locked()
+    # linux: refactor afs_linux_writepage
     (fetchpatch {
-      url = "https://gerrit.openafs.org/changes/16375/revisions/87a93f6488585553d833e1397e7f0dae0545cb7e/patch";
+      url = "https://gerrit.openafs.org/changes/16436/revisions/1f488463969b436a882c656020d1f3b92c6df440/patch";
       decode = "base64 -d";
-      hash = "sha256-MOVX2LFe8OBnvsQ2UdLvwKrwztOmnu1rdIou4CF+EBs=";
+      hash = "sha256-Wx8Xx97Kox76sSFOdpqxjMzXFrA2IFqKptpYEsfRTac=";
     })
-    # cf: Introduce AC_CHECK_LINUX_SYMBOL
+    # linux: convert aops->writepage to writepages
     (fetchpatch {
-      url = "https://gerrit.openafs.org/changes/16376/revisions/bab5968d7f4639d4a0cbe81aaa3e9716dda00632/patch";
+      url = "https://gerrit.openafs.org/changes/16437/revisions/fd33425820589ed52dc712df63ea8d4b5944de87/patch";
       decode = "base64 -d";
-      hash = "sha256-d6DZqDTW1uEKSB5PsomS4ix9fYYQzdQVmDATKl6n7x4=";
+      hash = "sha256-B011gge+vzGeUxkGOkKoK/jZn16pvGGc8DpAzzbjV+8=";
     })
-    # cf: check for dentry flag macros/enums
+    # Linux: Use __readahead_folio
+    (fetchpatch {
+      url = "https://gerrit.openafs.org/changes/16438/revisions/8a2cbf0ba08097de4b8ab0c57fe2fddf83739b9b/patch";
+      decode = "base64 -d";
+      hash = "sha256-MDb7vOekq/lwBgELMq+VfuvAXiHQmd0vp04ToqIm3lI=";
+    })
+    # Linux: Rename page->index to page->__folio_index
     (fetchpatch {
-      url = "https://gerrit.openafs.org/changes/16377/revisions/f791d8ca4804486c656bc7c221076480df39b465/patch";
+      url = "https://gerrit.openafs.org/changes/16439/revisions/9a5596a25618f153be7ae7eb17f29f3b7752d863/patch";
       decode = "base64 -d";
-      hash = "sha256-7B0VJE3FeSQU1ElvXI5zXCPq1JRLAycyhqIQuDdR7xE=";
+      hash = "sha256-OYlMcmnIkoC841E0ONNWtSCUKokyxOmd0d+AWcXwbAI=";
     })
   ];
 
-- 
cgit v1.2.3


From e31923bdf47a9db7ef019bd90e50aa1ef2f5e69c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 20:24:58 +0000
Subject: coin3d: 4.0.3 -> 4.0.4

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

diff --git a/pkgs/by-name/co/coin3d/package.nix b/pkgs/by-name/co/coin3d/package.nix
index 186a5a3102b0..1d50662a8560 100644
--- a/pkgs/by-name/co/coin3d/package.nix
+++ b/pkgs/by-name/co/coin3d/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "coin";
-  version = "4.0.3";
+  version = "4.0.4";
 
   src = fetchFromGitHub {
     owner = "coin3d";
     repo = "coin";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-dUFmcUOdNc3ZFtr+Hnh3Q3OY/JA/WxmiRJiU2RFSSus=";
+    hash = "sha256-Zk9tlGMbNhfHKv+Z5VFWr1g3wNuPFzof+7vsLAlOBC4=";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
cgit v1.2.3


From 6bb4d5d44d326b63416a2a962830d55f7363bf60 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 13:59:46 +0000
Subject: python3Packages.pytransportnswv2: 0.8.7 -> 0.8.10

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

diff --git a/pkgs/development/python-modules/pytransportnswv2/default.nix b/pkgs/development/python-modules/pytransportnswv2/default.nix
index f512ae5cb7ab..eba1a0311454 100644
--- a/pkgs/development/python-modules/pytransportnswv2/default.nix
+++ b/pkgs/development/python-modules/pytransportnswv2/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pytransportnswv2";
-  version = "0.8.7";
+  version = "0.8.10";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "PyTransportNSWv2";
     inherit version;
-    hash = "sha256-Jg/oEgbxn0eGf9Bn9wte6Wqc1TYVb8GjzU1mLWk1qtE=";
+    hash = "sha256-/9NtytE2zjIfrhVz1gTMLXtiSWlICjhQUFHtVCeg7FA=";
   };
 
   build-system = [ setuptools ];
-- 
cgit v1.2.3


From c8e54fd7dde98d34c70017064804ec72b559c379 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 17:27:42 +0000
Subject: python3Packages.axisregistry: 0.4.12 -> 0.4.16

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

diff --git a/pkgs/development/python-modules/axisregistry/default.nix b/pkgs/development/python-modules/axisregistry/default.nix
index fe5efc40c7fe..e9cb74745b95 100644
--- a/pkgs/development/python-modules/axisregistry/default.nix
+++ b/pkgs/development/python-modules/axisregistry/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "axisregistry";
-  version = "0.4.12";
+  version = "0.4.16";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-d60VbzlDiAL+J8sCE0sp2RgB02WGrigqcdzqW55ex1s=";
+    hash = "sha256-eohwtlFSTuttPv0PsOy1uezGT1NNlwm8ZunVJd1a9zo=";
   };
 
   # Relax the dependency on protobuf 3. Other packages in the Google Fonts
-- 
cgit v1.2.3


From da31c0c8d04dbf490fcf43a1540b7d2254a7be72 Mon Sep 17 00:00:00 2001
From: Austin Butler <austin@butler.lol>
Date: Mon, 4 Aug 2025 12:33:02 -0700
Subject: python3Packages.identify: remove editdistance-s dependency

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

diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix
index f59607f9981e..114d232e0af7 100644
--- a/pkgs/development/python-modules/identify/default.nix
+++ b/pkgs/development/python-modules/identify/default.nix
@@ -1,10 +1,10 @@
 {
   lib,
   buildPythonPackage,
-  editdistance-s,
   fetchFromGitHub,
   pytestCheckHook,
   pythonOlder,
+  cffi,
   setuptools,
   ukkonen,
 }:
@@ -26,18 +26,18 @@ buildPythonPackage rec {
   build-system = [ setuptools ];
 
   dependencies = [
-    editdistance-s
+    cffi
     pytestCheckHook
     ukkonen
   ];
 
   pythonImportsCheck = [ "identify" ];
 
-  meta = with lib; {
+  meta = {
     description = "File identification library for Python";
-    homepage = "https://github.com/chriskuehl/identify";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    homepage = "https://github.com/pre-commit/identify";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "identify-cli";
   };
 }
-- 
cgit v1.2.3


From fd16fc7d51b008069881b178d1452bcffa2508a4 Mon Sep 17 00:00:00 2001
From: Austin Butler <austin@butler.lol>
Date: Mon, 4 Aug 2025 12:33:20 -0700
Subject: python3Packages.editdistance-s: remove

---
 .../python-modules/editdistance-s/default.nix      | 35 ----------------------
 pkgs/top-level/python-aliases.nix                  |  1 +
 pkgs/top-level/python-packages.nix                 |  2 --
 3 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 pkgs/development/python-modules/editdistance-s/default.nix

diff --git a/pkgs/development/python-modules/editdistance-s/default.nix b/pkgs/development/python-modules/editdistance-s/default.nix
deleted file mode 100644
index a50fe7321dfc..000000000000
--- a/pkgs/development/python-modules/editdistance-s/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  pytestCheckHook,
-  cffi,
-}:
-
-buildPythonPackage rec {
-  pname = "editdistance-s";
-  version = "1.0.0";
-  format = "setuptools";
-
-  src = fetchFromGitHub {
-    owner = "asottile";
-    repo = "editdistance-s";
-    rev = "v${version}";
-    sha256 = "0w2qd5b6a3c3ahd0xy9ykq4wzqk0byqwdqrr26dyn8j2425j46lg";
-  };
-
-  propagatedNativeBuildInputs = [ cffi ];
-
-  propagatedBuildInputs = [ cffi ];
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  pythonImportsCheck = [ "editdistance_s" ];
-
-  meta = with lib; {
-    description = "Fast implementation of the edit distance (Levenshtein distance)";
-    homepage = "https://github.com/asottile/editdistance-s";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ austinbutler ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 307b307774ff..c94f5c591ceb 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -230,6 +230,7 @@ mapAliases ({
   dogpile_cache = dogpile-cache; # added 2021-10-28
   dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20
   dugong = throw "dugong is unmaintained since 2022 and has therefore been removed"; # added 2024-12-12
+  editdistance-s = throw "editdistance-s has been removed since it was added solely for the identity package, which has moved on to ukkonen"; # added 2025-08-04
   eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03
   EasyProcess = easyprocess; # added 2023-02-19
   email_validator = email-validator; # added 2022-06-22
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7457cb63d539..2b1122b5c61e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4527,8 +4527,6 @@ self: super: with self; {
 
   editdistance = callPackage ../development/python-modules/editdistance { };
 
-  editdistance-s = callPackage ../development/python-modules/editdistance-s { };
-
   editdistpy = callPackage ../development/python-modules/editdistpy { };
 
   editor = callPackage ../development/python-modules/editor { };
-- 
cgit v1.2.3


From 1353bdccc434578a14ca4431a2067c5a901ebbaa Mon Sep 17 00:00:00 2001
From: techknowlogick <git@tklk.dev>
Date: Wed, 6 Aug 2025 14:38:11 -0400
Subject: rancher: fix build on darwin

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

diff --git a/pkgs/by-name/ra/rancher/package.nix b/pkgs/by-name/ra/rancher/package.nix
index e5ada61609f9..12dcd424d283 100644
--- a/pkgs/by-name/ra/rancher/package.nix
+++ b/pkgs/by-name/ra/rancher/package.nix
@@ -15,6 +15,8 @@ buildGoModule rec {
     hash = "sha256-K0uMo/sRol2F02iV7b9NcmZcQGZ9iSEIdbZgT+Ea+/c=";
   };
 
+  env.CGO_ENABLED = 0;
+
   ldflags = [
     "-w"
     "-s"
-- 
cgit v1.2.3


From 9138b45a0fd3a438b7153bf26e695a3828ef949b Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Thu, 7 Aug 2025 08:20:44 +0200
Subject: pdns-recursor: 5.2.2 -> 5.2.5

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

diff --git a/pkgs/by-name/pd/pdns-recursor/package.nix b/pkgs/by-name/pd/pdns-recursor/package.nix
index 0461163607c7..bf5c07b37059 100644
--- a/pkgs/by-name/pd/pdns-recursor/package.nix
+++ b/pkgs/by-name/pd/pdns-recursor/package.nix
@@ -20,11 +20,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pdns-recursor";
-  version = "5.2.2";
+  version = "5.2.5";
 
   src = fetchurl {
     url = "https://downloads.powerdns.com/releases/pdns-recursor-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-+clSdCMe48XJQZf20FAR1Vq/BrKTdTW6jnjiTqT7vW4=";
+    hash = "sha256-qKZXp6vW6dI3zdJnU/fc9czVuMSKyBILCNK41XodhWo=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-- 
cgit v1.2.3


From 096e373c318c97d8dbbb44b47ed4a9ab498b0be9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Aug 2025 11:04:15 +0000
Subject: vscode-extensions.ms-dotnettools.csdevkit: 1.30.44 -> 1.41.11

---
 .../vscode/extensions/ms-dotnettools.csdevkit/default.nix      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix
index 1d3f6a0a3c9b..78ad89046f74 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix
@@ -16,19 +16,19 @@ let
     {
       x86_64-linux = {
         arch = "linux-x64";
-        hash = "sha256-vGHRgaqoxRU14BjmQM68SVdhe6ElvJrp6NUQXkVU5OU=";
+        hash = "sha256-1NGZTdAw2VS7txYuyKrpsm0bvLYYpsFZfkLCT5j2MIk=";
       };
       aarch64-linux = {
         arch = "linux-arm64";
-        hash = "sha256-aGRXxUpuOhsxULg7mAe1t04hfwLF5t4bSSthLlz7Mes=";
+        hash = "sha256-7d5tSZOGkmtfaL/IFk7ksFRAOlv58/Jw/N+nhlyJEHE=";
       };
       x86_64-darwin = {
         arch = "darwin-x64";
-        hash = "sha256-e4+rr3k9SYIVH01wG0RxL+sush0rTuvkJu08cctXmYo=";
+        hash = "sha256-1qinxbsBU5Ot/ce5OcIH9ybhhHoRSHv98Mwr/Piwmis=";
       };
       aarch64-darwin = {
         arch = "darwin-arm64";
-        hash = "sha256-iOF9aDk9okoZsHvaW4mDOulLPGxVViAk1TQkIH0XK+A=";
+        hash = "sha256-1LMV1e9xCoXa0UhyUkNFJJ0Nr0xJasPbfYAr6h7l6EE=";
       };
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
@@ -38,7 +38,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "csdevkit";
     publisher = "ms-dotnettools";
-    version = "1.30.44";
+    version = "1.41.11";
     inherit (extInfo) hash arch;
   };
   sourceRoot = "extension"; # This has more than one folder.
-- 
cgit v1.2.3


From 4b674fa47230db050958a4459c6a17c8b8b2892c Mon Sep 17 00:00:00 2001
From: NullCube <nullcub3@gmail.com>
Date: Thu, 7 Aug 2025 05:58:36 -0700
Subject: catppuccin-qt5ct: add nullcube as maintainer

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

diff --git a/pkgs/by-name/ca/catppuccin-qt5ct/package.nix b/pkgs/by-name/ca/catppuccin-qt5ct/package.nix
index d0b4c5380931..5705518c2fc1 100644
--- a/pkgs/by-name/ca/catppuccin-qt5ct/package.nix
+++ b/pkgs/by-name/ca/catppuccin-qt5ct/package.nix
@@ -25,7 +25,10 @@ stdenvNoCC.mkDerivation {
     description = "Soothing pastel theme for qt5ct";
     homepage = "https://github.com/catppuccin/qt5ct";
     license = licenses.mit;
-    maintainers = with maintainers; [ pluiedev ];
+    maintainers = with maintainers; [
+      pluiedev
+      nullcube
+    ];
     platforms = platforms.all;
   };
 }
-- 
cgit v1.2.3


From e21a96a1b48613b6afb856cead380840f0afb905 Mon Sep 17 00:00:00 2001
From: NullCube <nullcub3@gmail.com>
Date: Thu, 7 Aug 2025 06:01:11 -0700
Subject: catppuccin-qt5ct: remove with lib;

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

diff --git a/pkgs/by-name/ca/catppuccin-qt5ct/package.nix b/pkgs/by-name/ca/catppuccin-qt5ct/package.nix
index 5705518c2fc1..2b3358ce6f63 100644
--- a/pkgs/by-name/ca/catppuccin-qt5ct/package.nix
+++ b/pkgs/by-name/ca/catppuccin-qt5ct/package.nix
@@ -21,14 +21,14 @@ stdenvNoCC.mkDerivation {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Soothing pastel theme for qt5ct";
     homepage = "https://github.com/catppuccin/qt5ct";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       pluiedev
       nullcube
     ];
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
   };
 }
-- 
cgit v1.2.3


From 41e3c55a6f44dfe0dd8be0876c210ff1c97551c1 Mon Sep 17 00:00:00 2001
From: NullCube <nullcub3@gmail.com>
Date: Thu, 7 Aug 2025 05:57:10 -0700
Subject: catppuccin-qt5ct: 2023-03-21 -> 0-unstable-2025-03-29

---
 pkgs/by-name/ca/catppuccin-qt5ct/package.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ca/catppuccin-qt5ct/package.nix b/pkgs/by-name/ca/catppuccin-qt5ct/package.nix
index 2b3358ce6f63..9212dab435e5 100644
--- a/pkgs/by-name/ca/catppuccin-qt5ct/package.nix
+++ b/pkgs/by-name/ca/catppuccin-qt5ct/package.nix
@@ -5,24 +5,25 @@
 }:
 stdenvNoCC.mkDerivation {
   pname = "catppuccin-qt5ct";
-  version = "2023-03-21";
+  version = "0-unstable-2025-03-29";
 
   src = fetchFromGitHub {
     owner = "catppuccin";
     repo = "qt5ct";
-    rev = "89ee948e72386b816c7dad72099855fb0d46d41e";
-    hash = "sha256-t/uyK0X7qt6qxrScmkTU2TvcVJH97hSQuF0yyvSO/qQ=";
+    rev = "cb585307edebccf74b8ae8f66ea14f21e6666535";
+    hash = "sha256-wDj6kQ2LQyMuEvTQP6NifYFdsDLT+fMCe3Fxr8S783w=";
   };
 
   installPhase = ''
     runHook preInstall
-    mkdir -p $out/share/qt5ct
+    mkdir -p $out/share/qt{5,6}ct
     cp -r themes $out/share/qt5ct/colors
+    cp -r themes $out/share/qt6ct/colors
     runHook postInstall
   '';
 
   meta = {
-    description = "Soothing pastel theme for qt5ct";
+    description = "Soothing pastel theme for qt5ct & qt6ct";
     homepage = "https://github.com/catppuccin/qt5ct";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-- 
cgit v1.2.3


From 2e7793d4ba66b8c712be35d05f97ac4c7e29edb1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Aug 2025 12:40:19 +0000
Subject: python3Packages.langgraph-runtime-inmem: 0.6.8 -> 0.6.10

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

diff --git a/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix b/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix
index 87d660138956..bef0dd77c95b 100644
--- a/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix
+++ b/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "langgraph-runtime-inmem";
-  version = "0.6.8";
+  version = "0.6.10";
   pyproject = true;
 
   # Not available in any repository
   src = fetchPypi {
     pname = "langgraph_runtime_inmem";
     inherit version;
-    hash = "sha256-chPmwJ+tUJoRK5xX9+r6mbYf95ZbX4Z3mP6Ra19nBxM=";
+    hash = "sha256-wwd6Ru1xMMO95cOyzB7qjMvSWWIjH2mjSQlt92JHyLk=";
   };
 
   build-system = [
-- 
cgit v1.2.3


From 3985afc65c20a020ae24820d9ccb23eb2fa40c85 Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yuriy.taraday@tweag.io>
Date: Fri, 18 Jul 2025 16:45:45 +0200
Subject: nix-prefetch-git: Add --root-dir argument

With this argument nix-prefetch-git will make a subdirectory of the Git
repository a root of the resulting store path. This is helpful for
dealing with monorepos where many projects are in separate directories
and don't need a new source hash every time the monorepo is updated.

The corresponding fetchgit change follows.
---
 pkgs/build-support/fetchgit/nix-prefetch-git | 62 ++++++++++++++++++++--------
 1 file changed, 45 insertions(+), 17 deletions(-)

diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index f8dd93912644..e8bcca7f6b42 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -59,6 +59,7 @@ Options:
       --fetch-submodules Fetch submodules.
       --fetch-tags    Fetch all tags (useful for git describe).
       --builder       Clone as fetchgit does, but url, rev, and out option are mandatory.
+      --root-dir dir  Directory in the repository that will be copied to the output instead of the full repository.
       --quiet         Only print the final json summary.
 "
     exit 1
@@ -90,6 +91,7 @@ for arg; do
             --fetch-submodules) fetchSubmodules=true;;
             --fetch-tags) fetchTags=true;;
             --builder) builder=true;;
+            --root-dir) argfun=set_rootDir;;
             -h|--help) usage; exit;;
             *)
                 : $((++argi))
@@ -150,10 +152,16 @@ url_to_name(){
     local base
     base=$(basename "$url" .git | cut -d: -f2)
 
-    if [[ $ref =~ ^[a-z0-9]+$ ]]; then
-        echo "$base-${ref:0:7}"
+    if test -n "$rootDir"; then
+        # Sanitize by removing leading dots and replacing all invalid character sequences with dashes.
+        # See sanitizeDerivationName in ../../../lib/strings.nix for reference.
+        echo "$base-$(sed -E 's/^\.+//;s/[^[:alnum:]+._?=-]+/-/g' <<< $rootDir)"
     else
-        echo "$base"
+        if [[ $ref =~ ^[a-z0-9]+$ ]]; then
+            echo "$base-${ref:0:7}"
+        else
+            echo "$base"
+        fi
     fi
 }
 
@@ -348,6 +356,23 @@ clone_user_rev() {
     fi
 }
 
+clone_user_rev_to_tmpfile(){
+    local url="$1"
+    local rev="${2:-HEAD}"
+
+    # nix>=2.20 rejects adding symlinked paths to the store, so use realpath
+    # to resolve to a physical path. https://github.com/NixOS/nix/issues/11941
+    tmpPath="$(realpath "$(mktemp -d --tmpdir git-checkout-tmp-XXXXXXXX)")"
+    exit_handlers+=(remove_tmpPath)
+
+    tmpOut="$tmpPath/out/$storePathName"
+    tmpClone="$tmpPath/clone"
+    mkdir -p "$tmpPath/out" "$tmpClone"
+
+    # Perform the checkout.
+    clone_user_rev "$tmpClone" "$url" "$rev"
+}
+
 exit_handlers=()
 
 run_exit_handlers() {
@@ -413,7 +438,8 @@ print_results() {
   "fetchSubmodules": $([[ -n "$fetchSubmodules" ]] && echo true || echo false),
   "deepClone": $([[ -n "$deepClone" ]] && echo true || echo false),
   "fetchTags": $([[ -n "$fetchTags" ]] && echo true || echo false),
-  "leaveDotGit": $([[ -n "$leaveDotGit" ]] && echo true || echo false)
+  "leaveDotGit": $([[ -n "$leaveDotGit" ]] && echo true || echo false),
+  "rootDir": "$(json_escape "$rootDir")"
 }
 EOF
     fi
@@ -451,8 +477,13 @@ export GIT_CONFIG_NOSYSTEM=1
 
 if test -n "$builder"; then
     test -n "$out" -a -n "$url" -a -n "$rev" || usage
-    mkdir -p "$out"
-    clone_user_rev "$out" "$url" "$rev"
+    if test -n "$rootDir"; then
+        clone_user_rev_to_tmpfile "$url" "$rev"
+        mv "$tmpClone/$rootDir" "$out"
+    else
+        mkdir -p "$out"
+        clone_user_rev "$out" "$url" "$rev"
+    fi
 else
     if test -z "$hashType"; then
         hashType=sha256
@@ -471,22 +502,19 @@ else
     # If we don't know the hash or a path with that hash doesn't exist,
     # download the file and add it to the store.
     if test -z "$finalPath"; then
-        # nix>=2.20 rejects adding symlinked paths to the store, so use realpath
-        # to resolve to a physical path. https://github.com/NixOS/nix/issues/11941
-        tmpPath="$(realpath "$(mktemp -d --tmpdir git-checkout-tmp-XXXXXXXX)")"
-        exit_handlers+=(remove_tmpPath)
+        clone_user_rev_to_tmpfile "$url" "$rev"
 
-        tmpFile="$tmpPath/$storePathName"
-        mkdir -p "$tmpFile"
-
-        # Perform the checkout.
-        clone_user_rev "$tmpFile" "$url" "$rev"
+        if test -z "$rootDir"; then
+            mv "$tmpClone" "$tmpOut"
+        else
+            mv "$tmpClone/$rootDir" "$tmpOut"
+        fi
 
         # Compute the hash.
-        hash=$(nix-hash --type $hashType --base32 "$tmpFile")
+        hash=$(nix-hash --type $hashType --base32 "$tmpOut")
 
         # Add the downloaded file to the Nix store.
-        finalPath=$(nix-store --add-fixed --recursive "$hashType" "$tmpFile")
+        finalPath=$(nix-store --add-fixed --recursive "$hashType" "$tmpOut")
 
         if test -n "$expHash" -a "$expHash" != "$hash"; then
             echo "hash mismatch for URL \`$url'. Got \`$hash'; expected \`$expHash'." >&2
-- 
cgit v1.2.3


From 34612851db874ad188732c24429b3d1057f461fd Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yuriy.taraday@tweag.io>
Date: Fri, 18 Jul 2025 16:45:45 +0200
Subject: fetchgit: Add rootDir argument

With this argument fetchgit will make a subdirectory of the Git
repository a root of the resulting store path. This is helpful for
dealing with monorepos where many projects are in separate directories
and don't need a new source hash every time the monorepo is updated.

Commit hash is removed from the name of the derivation to prevent it
from changing the store path when nothing in the subdirectory changes.
---
 doc/build-helpers/fetchers.chapter.md   |  4 ++++
 doc/release-notes/rl-2511.section.md    |  1 +
 pkgs/build-support/fetchgit/builder.sh  |  3 ++-
 pkgs/build-support/fetchgit/default.nix | 23 ++++++++++++++++++-----
 pkgs/build-support/fetchgit/tests.nix   |  8 ++++++++
 5 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/doc/build-helpers/fetchers.chapter.md b/doc/build-helpers/fetchers.chapter.md
index 8ff1fdf11a19..bd606ea924f1 100644
--- a/doc/build-helpers/fetchers.chapter.md
+++ b/doc/build-helpers/fetchers.chapter.md
@@ -827,6 +827,10 @@ Additionally, the following optional arguments can be given:
 
   See [git sparse-checkout](https://git-scm.com/docs/git-sparse-checkout) for more information.
 
+*`rootDir`* (String)
+
+: When not empty, copy only contents of the subdirectory of the repository to the result. Automatically sets `sparseCheckout` and `nonConeMode` to avoid checking out any extra pieces. Incompatible with `leaveDotGit`.
+
 Some additional parameters for niche use-cases can be found listed in the function parameters in the declaration of `fetchgit`: `pkgs/build-support/fetchgit/default.nix`.
 Future parameters additions might also happen without immediately being documented here.
 
diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 2e54b34da408..023650e2664c 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -75,6 +75,7 @@
   * `$debug/lib/debug/.build-id/48/3bd7f7229bdb06462222e1e353e4f37e15c293.sourceoverlay` is a symlink to a directory with the same structure as the expanded `$sourceRoot` but containing only a copy of files which were patched during the build
   * `$debug/lib/debug/.build-id/48/3bd7f7229bdb06462222e1e353e4f37e15c293.debug` is the file containing debug symbols (like before).
 
+- `fetchgit`: Add `rootDir` argument to limit the resulting source to one subdirectory of the whole Git repository. Corresponding `--root-dir` option added to `nix-prefetch-git`.
 
 ## Nixpkgs Library {#sec-nixpkgs-release-25.11-lib}
 
diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh
index 819b0127a852..393d0a57d163 100644
--- a/pkgs/build-support/fetchgit/builder.sh
+++ b/pkgs/build-support/fetchgit/builder.sh
@@ -16,6 +16,7 @@ $SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" --name "$name"
   ${fetchTags:+--fetch-tags} \
   ${sparseCheckout:+--sparse-checkout "$sparseCheckout"} \
   ${nonConeMode:+--non-cone-mode} \
-  ${branchName:+--branch-name "$branchName"}
+  ${branchName:+--branch-name "$branchName"} \
+  ${rootDir:+--root-dir "$rootDir"}
 
 runHook postFetch
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index 374d55b0456c..f6099fddd984 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -8,12 +8,16 @@
 
 let
   urlToName =
-    url: rev:
+    {
+      url,
+      rev,
+      append,
+    }:
     let
       shortRev = lib.sources.shortRev rev;
       appendShort = lib.optionalString ((builtins.match "[a-f0-9]*" rev) != null) "-${shortRev}";
     in
-    "${lib.sources.urlToName url}${appendShort}";
+    "${lib.sources.urlToName url}${if append == "" then appendShort else append}";
 in
 
 lib.makeOverridable (
@@ -24,15 +28,20 @@ lib.makeOverridable (
       url,
       tag ? null,
       rev ? null,
-      name ? urlToName url (lib.revOrTag rev tag),
+      name ? urlToName {
+        inherit url;
+        rev = lib.revOrTag rev tag;
+        # when rootDir is specified, avoid invalidating the result when rev changes
+        append = if rootDir != "" then "-${lib.strings.sanitizeDerivationName rootDir}" else "";
+      },
       leaveDotGit ? deepClone || fetchTags,
       outputHash ? lib.fakeHash,
       outputHashAlgo ? null,
       fetchSubmodules ? true,
       deepClone ? false,
       branchName ? null,
-      sparseCheckout ? [ ],
-      nonConeMode ? false,
+      sparseCheckout ? lib.optional (rootDir != "") rootDir,
+      nonConeMode ? rootDir != "",
       nativeBuildInputs ? [ ],
       # Shell code executed before the file has been fetched.  This, in
       # particular, can do things like set NIX_PREFETCH_GIT_CHECKOUT_HOOK to
@@ -53,6 +62,8 @@ lib.makeOverridable (
       allowedRequisites ? null,
       # fetch all tags after tree (useful for git describe)
       fetchTags ? false,
+      # make this subdirectory the root of the result
+      rootDir ? "",
     }:
 
     /*
@@ -80,6 +91,7 @@ lib.makeOverridable (
 
     assert nonConeMode -> (sparseCheckout != [ ]);
     assert fetchTags -> leaveDotGit;
+    assert rootDir != "" -> !leaveDotGit;
 
     let
       revWithTag =
@@ -136,6 +148,7 @@ lib.makeOverridable (
           preFetch
           postFetch
           fetchTags
+          rootDir
           ;
         rev = revWithTag;
 
diff --git a/pkgs/build-support/fetchgit/tests.nix b/pkgs/build-support/fetchgit/tests.nix
index fd6aebc335f7..e3fdd5fb8672 100644
--- a/pkgs/build-support/fetchgit/tests.nix
+++ b/pkgs/build-support/fetchgit/tests.nix
@@ -97,4 +97,12 @@
       rm -rf .git
     '';
   };
+
+  rootDir = testers.invalidateFetcherByDrvHash fetchgit {
+    name = "fetchgit-with-rootdir";
+    url = "https://github.com/NixOS/nix";
+    rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";
+    rootDir = "misc/systemd";
+    sha256 = "sha256-UhxHk4SrXYq7ZDMtXLig5SigpbITrVgkpFTmryuvpcM=";
+  };
 }
-- 
cgit v1.2.3


From ccd90a5627aaecc881b00d4f95c8f9a2b957c8fa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Aug 2025 14:55:51 +0000
Subject: vscode-extensions.ms-dotnettools.csharp: 2.84.19 -> 2.87.31

---
 .../vscode/extensions/ms-dotnettools.csharp/default.nix        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
index 5c2b46d5fe72..7d6318ca2093 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
@@ -17,19 +17,19 @@ let
     {
       x86_64-linux = {
         arch = "linux-x64";
-        hash = "sha256-2UeXsvj1W62Ath0hcNomgyQF58uCKkwr8UfjoLhOyWs=";
+        hash = "sha256-PlA1uuudUPnKCas5brviS8ZMDweFEdti6N5fu8XCzvY=";
       };
       aarch64-linux = {
         arch = "linux-arm64";
-        hash = "sha256-Qn2PFh2O3ouoH1T9pDPDKVVoowTSyKYqY+FZ579J0nU=";
+        hash = "sha256-DyOT9AZAdW48G7SZfiFdveY9JwZDZjtT4Mp/LYY2JRk=";
       };
       x86_64-darwin = {
         arch = "darwin-x64";
-        hash = "sha256-lXwkoVw/t+1A0sVPSYaCoXtOusQtCZEjACEE0bLpr14=";
+        hash = "sha256-vew5YkrX7soPNiYO+KX5Uy2HOiJ701YWWZULtH5Aq+I=";
       };
       aarch64-darwin = {
         arch = "darwin-arm64";
-        hash = "sha256-b7NaFjoAlyeW5PJc4OwnvJ18FSbcpchDjhGQPahM8tg=";
+        hash = "sha256-rc6KVNZWNJYt8RkbqyPB4Q7aJB6jtlWMsd4UHGbqsoI=";
       };
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
@@ -39,7 +39,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "csharp";
     publisher = "ms-dotnettools";
-    version = "2.84.19";
+    version = "2.87.31";
     inherit (extInfo) hash arch;
   };
 
-- 
cgit v1.2.3


From 806baa807abae847caab5bddd720d6a144d01e58 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Aug 2025 19:24:50 +0000
Subject: python3Packages.groq: 0.30.0 -> 0.31.0

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

diff --git a/pkgs/development/python-modules/groq/default.nix b/pkgs/development/python-modules/groq/default.nix
index 180df1e23be5..984a8cbbf98a 100644
--- a/pkgs/development/python-modules/groq/default.nix
+++ b/pkgs/development/python-modules/groq/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "groq";
-  version = "0.30.0";
+  version = "0.31.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "groq";
     repo = "groq-python";
     tag = "v${version}";
-    hash = "sha256-URjfgZC+6YIY7SBfaOmDavQ73YWAqHf9KHunyvniy2E=";
+    hash = "sha256-6oTRqAt421WE0s5e2kqDtCgOLg1bSqTTQldQ5D05Flo=";
   };
 
   postPatch = ''
-- 
cgit v1.2.3


From 30ce336d565ebac32b830e34d9065956d48221f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 00:30:35 +0000
Subject: gremlin-console: 3.7.3 -> 3.7.4

---
 pkgs/applications/misc/gremlin-console/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix
index 2494d30d9ee2..c2c0334a6858 100644
--- a/pkgs/applications/misc/gremlin-console/default.nix
+++ b/pkgs/applications/misc/gremlin-console/default.nix
@@ -8,10 +8,10 @@
 
 stdenv.mkDerivation rec {
   pname = "gremlin-console";
-  version = "3.7.3";
+  version = "3.7.4";
   src = fetchzip {
     url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip";
-    sha256 = "sha256-27S1ukq9rHncFuPBZmwIP/bKuPYm3AxdBK3PliYTGEQ=";
+    sha256 = "sha256-Z971M4W359WKs2NjLeWej5IVHnFu5LLsffxl0jraB60=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
cgit v1.2.3


From 0cd2f02f3f78eed1e2efecd29bd2ac8cdc3ad327 Mon Sep 17 00:00:00 2001
From: Muhammad Falak R Wani <falakreyaz@gmail.com>
Date: Sat, 9 Aug 2025 09:40:36 +0530
Subject: tailscale: 1.86.2 -> 1.86.4

Diff: https://github.com/tailscale/tailscale/compare/refs/tags/v1.86.2...v1.86.4
Changelog: https://github.com/tailscale/tailscale/releases/tag/v1.86.4
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
---
 pkgs/by-name/ta/tailscale/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index 149737474d5f..91772517b429 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -23,7 +23,7 @@
 }:
 
 let
-  version = "1.86.2";
+  version = "1.86.4";
 in
 buildGoModule {
   pname = "tailscale";
@@ -38,7 +38,7 @@ buildGoModule {
     owner = "tailscale";
     repo = "tailscale";
     tag = "v${version}";
-    hash = "sha256-hozfvKkvTeaabN1tYl0NlEpjfD4sZQe9Z+agdoXFHNE=";
+    hash = "sha256-cYj04DtoYKejygz1Euir/6/Eq1M046nzzhqSfpTi0OE=";
   };
 
   vendorHash = "sha256-4QTSspHLYJfzlontQ7msXyOB5gzq7ZwSvWmKuYY5klA=";
-- 
cgit v1.2.3


From 05025c9f8e3400686ef39d9afb1ec64b1ddfbba2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 08:08:08 +0000
Subject: fsautocomplete: 0.78.4 -> 0.78.5

---
 pkgs/by-name/fs/fsautocomplete/deps.json   | 12 ++++++------
 pkgs/by-name/fs/fsautocomplete/package.nix |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/fs/fsautocomplete/deps.json b/pkgs/by-name/fs/fsautocomplete/deps.json
index 104e36eb51c2..4078a2c8a143 100644
--- a/pkgs/by-name/fs/fsautocomplete/deps.json
+++ b/pkgs/by-name/fs/fsautocomplete/deps.json
@@ -76,8 +76,8 @@
   },
   {
     "pname": "fsharp-analyzers",
-    "version": "0.32.0",
-    "hash": "sha256-MnhsK5tOeexL6uQhsV4nTRz8CGbz2o8VyHwAK8x91pE="
+    "version": "0.32.1",
+    "hash": "sha256-le6rPnAF7cKGBZ2w8H2u9glK+6rT2ZjiAVnrkH2IhrM="
   },
   {
     "pname": "FSharp.Analyzers.Build",
@@ -86,8 +86,8 @@
   },
   {
     "pname": "FSharp.Analyzers.SDK",
-    "version": "0.32.0",
-    "hash": "sha256-0mdnqvE4ltEfehzS+ylah5MSy+sXbYrKRHrNDlWvIjg="
+    "version": "0.32.1",
+    "hash": "sha256-JOqyzBUVMm1wx9g0YZmAZghj3/9f7nh9YenVt4mQI0M="
   },
   {
     "pname": "FSharp.Compiler.Service",
@@ -206,8 +206,8 @@
   },
   {
     "pname": "Ionide.Analyzers",
-    "version": "0.14.6",
-    "hash": "sha256-56FJUeWvxE2xbaX/qhfCN6ksiNWz7aGQySEskOnzFB0="
+    "version": "0.14.7",
+    "hash": "sha256-capdHUKfY3W8QYgg5Q6/dRggEF6w/yQ9rEKIh+VQLlc="
   },
   {
     "pname": "Ionide.KeepAChangelog.Tasks",
diff --git a/pkgs/by-name/fs/fsautocomplete/package.nix b/pkgs/by-name/fs/fsautocomplete/package.nix
index ae6a2172f084..8c6e9e98d1cb 100644
--- a/pkgs/by-name/fs/fsautocomplete/package.nix
+++ b/pkgs/by-name/fs/fsautocomplete/package.nix
@@ -9,13 +9,13 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "fsautocomplete";
-  version = "0.78.4";
+  version = "0.78.5";
 
   src = fetchFromGitHub {
     owner = "fsharp";
     repo = "FsAutoComplete";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SBNtVtPVQ+l0U+jsvSiJVdS6TR4+wZ8rScFrRKWJSX8=";
+    hash = "sha256-4Y3QUq5oa01a1S5+h3ccdeqjPfkUe8GaqxHjh9VFhXE=";
   };
 
   nugetDeps = ./deps.json;
-- 
cgit v1.2.3


From 9c89ed249c45847aa299850f4f4a3fffea638b94 Mon Sep 17 00:00:00 2001
From: Olivér Falvai <ofalvai@gmail.com>
Date: Fri, 25 Apr 2025 21:47:45 +0200
Subject: drone-cli: doCheck = true

---
 pkgs/by-name/dr/drone-cli/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/dr/drone-cli/package.nix b/pkgs/by-name/dr/drone-cli/package.nix
index d7c1222e1643..36b42718c186 100644
--- a/pkgs/by-name/dr/drone-cli/package.nix
+++ b/pkgs/by-name/dr/drone-cli/package.nix
@@ -26,8 +26,6 @@ buildGoModule rec {
     "-X main.version=${version}"
   ];
 
-  doCheck = false;
-
   meta = with lib; {
     mainProgram = "drone";
     maintainers = with maintainers; [ techknowlogick ];
-- 
cgit v1.2.3


From 071c7fb4b7fe0be1e23816af50b8141ce6e63778 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 9 Aug 2025 15:08:18 +0200
Subject: python313Packages.inlinestyler: remove

Module is no longer maintained
---
 .../python-modules/inlinestyler/default.nix        | 62 ----------------------
 pkgs/top-level/python-aliases.nix                  |  1 +
 pkgs/top-level/python-packages.nix                 |  2 -
 3 files changed, 1 insertion(+), 64 deletions(-)
 delete mode 100644 pkgs/development/python-modules/inlinestyler/default.nix

diff --git a/pkgs/development/python-modules/inlinestyler/default.nix b/pkgs/development/python-modules/inlinestyler/default.nix
deleted file mode 100644
index bf0262aac439..000000000000
--- a/pkgs/development/python-modules/inlinestyler/default.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  fetchpatch2,
-
-  # build system
-  setuptools,
-
-  # dependencies
-  cssutils,
-  lxml,
-  requests,
-
-  # tests
-  ipdb,
-  pytestCheckHook,
-}:
-
-buildPythonPackage rec {
-  pname = "inlinestyler";
-  version = "0.2.5";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "dlanger";
-    repo = "inlinestyler";
-    tag = version;
-    hash = "sha256-9TKXqW+5SiiNXnHW2lOVh3zhFhodM7a1UB2yXsEuX3I=";
-  };
-
-  patches = [
-    # https://github.com/dlanger/inlinestyler/pull/33
-    (fetchpatch2 {
-      url = "https://github.com/dlanger/inlinestyler/commit/29fc1c256fd8f37c3e2fda34c975f0bcfe72cf9a.patch";
-      hash = "sha256-35GWrfvXgpy1KAZ/0pdxsiKNTpDku6/ZX3KWfRUGQmc=";
-    })
-  ];
-
-  build-system = [ setuptools ];
-
-  dependencies = [
-    cssutils
-    lxml
-    requests
-  ];
-
-  pythonImportsCheck = [ "inlinestyler" ];
-
-  nativeCheckInputs = [
-    ipdb
-    pytestCheckHook
-  ];
-
-  meta = with lib; {
-    description = "Simple CSS inliner for generating HTML email messages";
-    homepage = "https://github.com/dlanger/inlinestyler";
-    changelog = "https://github.com/dlanger/inlinestyler/blob/${src.rev}/CHANGELOG";
-    license = licenses.bsd3;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 759d13f186ff..f5194a25f3f4 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -347,6 +347,7 @@ mapAliases ({
   ipdbplugin = throw "ipdbplugin has been removed because it has no longer maintained for 6 years"; # added 2024-05-21
   ipython_genutils = ipython-genutils; # added 2023-10-12
   influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10
+  inlinestyler = throw "inlinestyler has been removed because it is no longer maintained"; # added 2025-08-09
   itanium_demangler = itanium-demangler; # added 2022-10-17
   jaeger-client = throw "jaeger-client was removed because it is deprecated upstream. OpenTelemetry is recommended instead."; # Added 2024-12-09
   jaraco_classes = jaraco-classes; # added 2023-07-14
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5566867bdfd2..512bfa331e45 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7017,8 +7017,6 @@ self: super: with self; {
 
   inline-snapshot = callPackage ../development/python-modules/inline-snapshot { };
 
-  inlinestyler = callPackage ../development/python-modules/inlinestyler { };
-
   inotify = callPackage ../development/python-modules/inotify { };
 
   inotify-simple = callPackage ../development/python-modules/inotify-simple { };
-- 
cgit v1.2.3


From 3ae92296001da9f508a8b6f2b67e2919b354aff3 Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Mon, 28 Jul 2025 23:42:14 +0200
Subject: nixos/test-instrumentation: use bash directly

---
 nixos/modules/testing/test-instrumentation.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index 5afdcc868a3f..9fb3ad6ab774 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -67,7 +67,7 @@ let
       # we can also run non-NixOS guests during tests. This, however, is
       # mostly futureproofing as the test instrumentation is still very
       # tightly coupled to NixOS.
-      PS1="" exec ${pkgs.coreutils}/bin/env bash --norc /dev/hvc0
+      PS1="" exec ${pkgs.bashNonInteractive}/bin/bash --norc /dev/hvc0
     '';
     serviceConfig.KillSignal = "SIGHUP";
   };
-- 
cgit v1.2.3


From 4316829d6f8d859ff39b3ea2c96aec25d892ffde Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 16:36:27 +0000
Subject: shellhub-agent: 0.19.2 -> 0.20.0

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

diff --git a/pkgs/by-name/sh/shellhub-agent/package.nix b/pkgs/by-name/sh/shellhub-agent/package.nix
index 48baf1ab40a4..4893f271fff1 100644
--- a/pkgs/by-name/sh/shellhub-agent/package.nix
+++ b/pkgs/by-name/sh/shellhub-agent/package.nix
@@ -12,18 +12,18 @@
 
 buildGoModule rec {
   pname = "shellhub-agent";
-  version = "0.19.2";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "shellhub-io";
     repo = "shellhub";
     rev = "v${version}";
-    hash = "sha256-ZUsu/zfzCrn0tvmKxcFwKYQbS7JoPUSpg6/l3QHE4Cw=";
+    hash = "sha256-cDCpZB9lkEnkltY2OQ/Y5HSZmlukeQFbuxhtbeb8E2s=";
   };
 
   modRoot = "./agent";
 
-  vendorHash = "sha256-1UI/JRDRnsRrdV1AfPyE/rWEDAytEYmr+EyXn60UB/Y=";
+  vendorHash = "sha256-17D8xrLlwX57JW4yXfPlo9RQRMCxVa7MjQQmzI/MBas=";
 
   ldflags = [
     "-s"
-- 
cgit v1.2.3


From e3c148f727d30e8437e877e7cbeb3208e53b2465 Mon Sep 17 00:00:00 2001
From: Ken Micklas <git@kmicklas.com>
Date: Sat, 9 Aug 2025 18:59:06 +0100
Subject: wdisplays: fix homepage

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

diff --git a/pkgs/by-name/wd/wdisplays/package.nix b/pkgs/by-name/wd/wdisplays/package.nix
index d24bb42b8a73..1c2bf46d8ff4 100644
--- a/pkgs/by-name/wd/wdisplays/package.nix
+++ b/pkgs/by-name/wd/wdisplays/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = with lib; {
     description = "Graphical application for configuring displays in Wayland compositors";
-    homepage = "https://github.com/luispabon/wdisplays";
+    homepage = "https://github.com/artizirk/wdisplays";
     maintainers = with maintainers; [ ma27 ];
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
-- 
cgit v1.2.3


From 8014092835c3fb881102ba927c97a600981d6c77 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 18:39:31 +0000
Subject: python3Packages.python-can: 4.5.0 -> 4.6.0

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

diff --git a/pkgs/development/python-modules/python-can/default.nix b/pkgs/development/python-modules/python-can/default.nix
index cb94e9697dcb..693c3611e5bc 100644
--- a/pkgs/development/python-modules/python-can/default.nix
+++ b/pkgs/development/python-modules/python-can/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "python-can";
-  version = "4.5.0";
+  version = "4.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "hardbyte";
     repo = "python-can";
     tag = "v${version}";
-    hash = "sha256-XCv2oOkGq8c2gTo+8UcZbuBYXyhhQstWLyddk3db38s=";
+    hash = "sha256-oKa/LT7tTBLp47t6CQFCEmzBu8b6NQzFCSfi6Ii3NTI=";
   };
 
   build-system = [
@@ -90,7 +90,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "CAN support for Python";
     homepage = "https://python-can.readthedocs.io";
-    changelog = "https://github.com/hardbyte/python-can/releases/tag/v${version}";
+    changelog = "https://github.com/hardbyte/python-can/releases/tag/${src.tag}";
     license = licenses.lgpl3Only;
     maintainers = with maintainers; [
       fab
-- 
cgit v1.2.3


From 822069c9edabf024ef8a1a69e5525272de3c1512 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 19:30:05 +0000
Subject: s7: 11.5-unstable-2025-07-31 -> 11.5-unstable-2025-08-09

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

diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix
index 78c5effc3fb6..aca440fc37d5 100644
--- a/pkgs/by-name/s7/s7/package.nix
+++ b/pkgs/by-name/s7/s7/package.nix
@@ -25,14 +25,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "s7";
-  version = "11.5-unstable-2025-07-31";
+  version = "11.5-unstable-2025-08-09";
 
   src = fetchFromGitLab {
     domain = "cm-gitlab.stanford.edu";
     owner = "bil";
     repo = "s7";
-    rev = "71e547b1a210d1ff06daeb4dee5247cd949d0178";
-    hash = "sha256-gMZCmpGPSgM73PRbRY5BgyaTeRnojduNnZntvr75jzw=";
+    rev = "76c6f2b28cdada1e71dfbc0932df595f763e375a";
+    hash = "sha256-QB6aUF8538vd5IF8eQhYAbzU7jAxqw70RrUB1ewzY6s=";
   };
 
   buildInputs =
-- 
cgit v1.2.3


From 39a845667e970d7230b195d3f9c0163a71e55a34 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 19:49:09 +0000
Subject: typescript-language-server: 4.3.4 -> 4.4.0

---
 pkgs/by-name/ty/typescript-language-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ty/typescript-language-server/package.nix b/pkgs/by-name/ty/typescript-language-server/package.nix
index 97818eaa60b5..5bad96099d66 100644
--- a/pkgs/by-name/ty/typescript-language-server/package.nix
+++ b/pkgs/by-name/ty/typescript-language-server/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "typescript-language-server";
-  version = "4.3.4";
+  version = "4.4.0";
 
   src = fetchFromGitHub {
     owner = "typescript-language-server";
     repo = "typescript-language-server";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-H+SEwvoLsKfwZgKqp0Bymkk0m4hk0PsGlMceL0GsEFY=";
+    hash = "sha256-5JvYTVHZUoTGokOiaJ6FF5dsNXaY7oFsWLf2doZv36Q=";
   };
 
   patches = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-nSMhPfbWD93sGIKehBBE/bh4RzHXFtGAjeyG20m/LWQ=";
+    hash = "sha256-05o1aOaUEL/KI5hf7dKL2lKEDxbzpg89CyR8qMi1G8s=";
   };
 
   nativeBuildInputs = [
-- 
cgit v1.2.3


From 4814941663df2e3fb099b93425735ef47c426f82 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Aug 2025 21:29:39 +0000
Subject: libmsquic: 2.4.14 -> 2.5.0

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

diff --git a/pkgs/by-name/li/libmsquic/package.nix b/pkgs/by-name/li/libmsquic/package.nix
index 594bab45668d..14cf36810b94 100644
--- a/pkgs/by-name/li/libmsquic/package.nix
+++ b/pkgs/by-name/li/libmsquic/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libmsquic";
-  version = "2.4.14";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "msquic";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hsdtRxvAbo7pfsM6ioG3CiGJhgRilrydA6zvAcoux4c=";
+    hash = "sha256-GWkdwPms0jqVADp8D4HtvOi+9YORZpqbJ7OqKnS/jB0=";
     fetchSubmodules = true;
   };
 
-- 
cgit v1.2.3


From 769e1877ca8262e0f08b2a385283393a83de215b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 01:35:15 +0000
Subject: basedpyright: 1.31.0 -> 1.31.1

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

diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix
index 0e4b469bb483..12b95291209c 100644
--- a/pkgs/by-name/ba/basedpyright/package.nix
+++ b/pkgs/by-name/ba/basedpyright/package.nix
@@ -16,13 +16,13 @@
 
 buildNpmPackage rec {
   pname = "basedpyright";
-  version = "1.31.0";
+  version = "1.31.1";
 
   src = fetchFromGitHub {
     owner = "detachhead";
     repo = "basedpyright";
     tag = "v${version}";
-    hash = "sha256-vgOo44ZvuySxQP9qJC7kXUVkOT1RhJ+/giqNBTCzpAg=";
+    hash = "sha256-chwIsjMg91fLZ0VRSUo3ydtHXVNKtjqX539b0IlOPI4=";
   };
 
   npmDepsHash = "sha256-aJte4ApeXJQ9EYn87Uo+Xx7s+wi80I1JsZHeqklHGs4=";
-- 
cgit v1.2.3


From dd12e5035f170dbc59ed0e554ac30d0caf69a27e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 04:23:53 +0000
Subject: grafanaPlugins.ventura-psychrometric-panel: 5.0.1 -> 5.0.2

---
 .../grafana/plugins/ventura-psychrometric-panel/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix
index 1bb0a1f34a38..1a0898f0d1a1 100644
--- a/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "ventura-psychrometric-panel";
-  version = "5.0.1";
-  zipHash = "sha256-WcMgjgDobexUrfZOBmXRWv0FD3us3GgglxRdpo9BecA=";
+  version = "5.0.2";
+  zipHash = "sha256-375akpkIh4aB2N0T+O++VKmQkuVVMpn8V1/wugbzThU=";
   meta = with lib; {
     description = "Grafana plugin to display air conditions on a psychrometric chart";
     license = licenses.bsd3Lbnl;
-- 
cgit v1.2.3


From 5795f1d8a042c9e0e052f220bc93b0861ae23312 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 05:36:18 +0000
Subject: grafanaPlugins.grafana-metricsdrilldown-app: 1.0.8 -> 1.0.9

---
 .../grafana/plugins/grafana-metricsdrilldown-app/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
index c4cd945ee329..9ba934a4dad7 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "grafana-metricsdrilldown-app";
-  version = "1.0.8";
-  zipHash = "sha256-fydkuhaGNrIL+byFwvgp2kG5nm02WnO7t77qtSuj7pY=";
+  version = "1.0.9";
+  zipHash = "sha256-YEchhyKvHmUErLs5IY1ECPOiaaYRzVHRyObk0XvzCBo=";
   meta = with lib; {
     description = "Queryless experience for browsing Prometheus-compatible metrics. Quickly find related metrics without writing PromQL queries";
     license = licenses.agpl3Only;
-- 
cgit v1.2.3


From 977f44c84a781124b888ce1d24a17fb8395aabd5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 07:54:08 +0000
Subject: babashka-unwrapped: 1.12.206 -> 1.12.207

---
 pkgs/development/interpreters/babashka/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/babashka/default.nix b/pkgs/development/interpreters/babashka/default.nix
index 545aca3c175d..a2132508f48d 100644
--- a/pkgs/development/interpreters/babashka/default.nix
+++ b/pkgs/development/interpreters/babashka/default.nix
@@ -8,11 +8,11 @@
 
 buildGraalvmNativeImage (finalAttrs: {
   pname = "babashka-unwrapped";
-  version = "1.12.206";
+  version = "1.12.207";
 
   src = fetchurl {
     url = "https://github.com/babashka/babashka/releases/download/v${finalAttrs.version}/babashka-${finalAttrs.version}-standalone.jar";
-    sha256 = "sha256-2JrfFddG5ZSJkDXjaNnAyYfvuwR3muDgEVyG82KRFkU=";
+    sha256 = "sha256-bFZZkST5rMWyRTEsviMS2KnKfJXGUBI2UefZ3XY1V0I=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
-- 
cgit v1.2.3


From e8f47291c454f85667f256df4fbfe2a67c741a20 Mon Sep 17 00:00:00 2001
From: a-kenji <aks.kenji@protonmail.com>
Date: Sun, 10 Aug 2025 10:51:15 +0200
Subject: rstfmt: add meta.mainProgram

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

diff --git a/pkgs/by-name/rs/rstfmt/package.nix b/pkgs/by-name/rs/rstfmt/package.nix
index f933f6e204c3..41ef77bf20b6 100644
--- a/pkgs/by-name/rs/rstfmt/package.nix
+++ b/pkgs/by-name/rs/rstfmt/package.nix
@@ -39,5 +39,6 @@ python3.pkgs.buildPythonApplication rec {
     changelog = "https://github.com/dzhu/rstfmt/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "rstfmt";
   };
 }
-- 
cgit v1.2.3


From ae4cae1e97f66f7951b4da203096e3e40f3bcab7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 10 Aug 2025 11:00:24 +0200
Subject: python313Packages.google-genai: 1.20.0 -> 1.29.0

Changelog: https://github.com/googleapis/python-genai/blob/v1.29.0/CHANGELOG.md
---
 pkgs/development/python-modules/google-genai/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-genai/default.nix b/pkgs/development/python-modules/google-genai/default.nix
index 76c5c3b78d66..e37cce0dfe31 100644
--- a/pkgs/development/python-modules/google-genai/default.nix
+++ b/pkgs/development/python-modules/google-genai/default.nix
@@ -12,6 +12,7 @@
   pytestCheckHook,
   requests,
   setuptools,
+  tenacity,
   twine,
   typing-extensions,
   websockets,
@@ -19,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "google-genai";
-  version = "1.20.0";
+  version = "1.29.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "python-genai";
     tag = "v${version}";
-    hash = "sha256-7DwLIK3/VCVSt9lq0Q0IRbhfLXOWw1TbPpDgI4jr9cg=";
+    hash = "sha256-EOwIXZ373hsEfGxCE6DRjPRuqPQQoFHTzIDGK1K9X6Q=";
   };
 
   build-system = [
@@ -44,6 +45,7 @@ buildPythonPackage rec {
     httpx
     pydantic
     requests
+    tenacity
     typing-extensions
     websockets
   ];
-- 
cgit v1.2.3


From 296906a8bbe88f91743d3b0fa0f26ae491fdb0c7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 10:04:59 +0000
Subject: python3Packages.accelerate: 1.9.0 -> 1.10.0

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

diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix
index 2d31ed1af77b..98059e764114 100644
--- a/pkgs/development/python-modules/accelerate/default.nix
+++ b/pkgs/development/python-modules/accelerate/default.nix
@@ -33,14 +33,14 @@
 
 buildPythonPackage rec {
   pname = "accelerate";
-  version = "1.9.0";
+  version = "1.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "accelerate";
     tag = "v${version}";
-    hash = "sha256-h1XfBG7M8aAN9W09RgIowJ2vgWAjWbUnV1KBXa5aGJU=";
+    hash = "sha256-UsnGLBCt3uodzaBLeOKV4eYEoxwHkUlHDBAe6kAleDc=";
   };
 
   buildInputs = [ llvmPackages.openmp ];
-- 
cgit v1.2.3


From 965003cab2fdbea8ad8aabd76ca0c3a9eae7da87 Mon Sep 17 00:00:00 2001
From: Jonas <1020064+jfietz@user.noreply.github.com>
Date: Sun, 10 Aug 2025 11:43:40 +0200
Subject: yaziPlugins.jump-to-char: Fix description

The description seems to have been incorrectly copy & pasted from
another plugin. The new description stems from the plugin's homepage: https://search.nixos.org/packages?channel=unstable&show=yaziPlugins.jump-to-char&from=0&size=50&sort=relevance&type=packages&query=jump
---
 pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix b/pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix
index 95fca5f6c711..8b4c7ba5e578 100644
--- a/pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix
@@ -15,7 +15,7 @@ mkYaziPlugin {
   };
 
   meta = {
-    description = "Switch the preview pane between hidden and shown";
+    description = "Vim-like f<char>, jump to the next file whose name starts with <char>.";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ khaneliman ];
   };
-- 
cgit v1.2.3


From 28347060acf5aaf5700edf4e7c52ea92279fc7ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 10:17:37 +0000
Subject: python3Packages.letpot: 0.6.0 -> 0.6.1

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

diff --git a/pkgs/development/python-modules/letpot/default.nix b/pkgs/development/python-modules/letpot/default.nix
index 2a5d9ea44fa9..c5a776479534 100644
--- a/pkgs/development/python-modules/letpot/default.nix
+++ b/pkgs/development/python-modules/letpot/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "letpot";
-  version = "0.6.0";
+  version = "0.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jpelgrom";
     repo = "python-letpot";
     tag = "v${version}";
-    hash = "sha256-CUTZvzLC7YGiKXOJSj6gdPOznHQIQ+Bu2YW7LyLB0Sg=";
+    hash = "sha256-xcuBDygUpkPzwdGGG+GLQBaMPpkrj49Y/1KKh6w9jmA=";
   };
 
   build-system = [ poetry-core ];
-- 
cgit v1.2.3


From 004c346b6da79575998d392d742b69e3722f3720 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 10:35:50 +0000
Subject: shopify-cli: 3.83.1 -> 3.83.3

---
 pkgs/by-name/sh/shopify-cli/manifests/package-lock.json | 12 ++++++------
 pkgs/by-name/sh/shopify-cli/manifests/package.json      |  4 ++--
 pkgs/by-name/sh/shopify-cli/package.nix                 |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/sh/shopify-cli/manifests/package-lock.json b/pkgs/by-name/sh/shopify-cli/manifests/package-lock.json
index 3298bc397e49..2adde4384f84 100644
--- a/pkgs/by-name/sh/shopify-cli/manifests/package-lock.json
+++ b/pkgs/by-name/sh/shopify-cli/manifests/package-lock.json
@@ -1,14 +1,14 @@
 {
   "name": "shopify",
-  "version": "3.83.1",
+  "version": "3.83.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "shopify",
-      "version": "3.83.1",
+      "version": "3.83.3",
       "dependencies": {
-        "@shopify/cli": "3.83.1"
+        "@shopify/cli": "3.83.3"
       },
       "bin": {
         "shopify": "node_modules/@shopify/cli/bin/run.js"
@@ -579,9 +579,9 @@
       }
     },
     "node_modules/@shopify/cli": {
-      "version": "3.83.1",
-      "resolved": "https://registry.npmjs.org/@shopify/cli/-/cli-3.83.1.tgz",
-      "integrity": "sha512-jjyfKXZjYVHwWBAool91Yh6HTUsy8CuQiEYhMFl6gXa/aRiq/YW5jfEqeMA6XEFiqBtdMSQGLZ10pk9FbHVvMQ==",
+      "version": "3.83.3",
+      "resolved": "https://registry.npmjs.org/@shopify/cli/-/cli-3.83.3.tgz",
+      "integrity": "sha512-p98L8+NxEdZF2vHiUKgxB63kJNSLeV+vp7aipyjkOYVMH7FCJQ4/JJBWQ+69D2zcJEj/S+QD+ciLt4rHifb4mg==",
       "license": "MIT",
       "os": [
         "darwin",
diff --git a/pkgs/by-name/sh/shopify-cli/manifests/package.json b/pkgs/by-name/sh/shopify-cli/manifests/package.json
index c0986b86b481..cd29a5ec22ea 100644
--- a/pkgs/by-name/sh/shopify-cli/manifests/package.json
+++ b/pkgs/by-name/sh/shopify-cli/manifests/package.json
@@ -1,11 +1,11 @@
 {
   "name": "shopify",
-  "version": "3.83.1",
+  "version": "3.83.3",
   "private": true,
   "bin": {
     "shopify": "node_modules/@shopify/cli/bin/run.js"
   },
   "dependencies": {
-    "@shopify/cli": "3.83.1"
+    "@shopify/cli": "3.83.3"
   }
 }
diff --git a/pkgs/by-name/sh/shopify-cli/package.nix b/pkgs/by-name/sh/shopify-cli/package.nix
index f8f0b06c7f88..86810478b211 100644
--- a/pkgs/by-name/sh/shopify-cli/package.nix
+++ b/pkgs/by-name/sh/shopify-cli/package.nix
@@ -5,7 +5,7 @@
   shopify-cli,
 }:
 let
-  version = "3.83.1";
+  version = "3.83.3";
 in
 buildNpmPackage {
   pname = "shopify";
@@ -13,7 +13,7 @@ buildNpmPackage {
 
   src = ./manifests;
 
-  npmDepsHash = "sha256-2vjhdUIylVVTkFHy9hLcrYwN5rIqBI92axY/eXlQjK8=";
+  npmDepsHash = "sha256-HUBdnxKVpEIT+PbKYC8ZUKzUR26rqLI9LJReFdfG2y8=";
   dontNpmBuild = true;
 
   passthru = {
-- 
cgit v1.2.3


From d784bcf0d8ed57fbf52d160b2a7fcd9c1abed588 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 11:20:59 +0000
Subject: python3Packages.imgw-pib: 1.5.2 -> 1.5.3

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

diff --git a/pkgs/development/python-modules/imgw-pib/default.nix b/pkgs/development/python-modules/imgw-pib/default.nix
index eda351264543..8aee6a1bbbe0 100644
--- a/pkgs/development/python-modules/imgw-pib/default.nix
+++ b/pkgs/development/python-modules/imgw-pib/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "imgw-pib";
-  version = "1.5.2";
+  version = "1.5.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bieniu";
     repo = "imgw-pib";
     tag = version;
-    hash = "sha256-7x6tqgyFkFLil8R20/v05wrsnoq+mLlsyKVvGDmwmpo=";
+    hash = "sha256-rsR1ZlbNCAlJmiTefgJ4gurGaC17z/kKgDHpuMkyxz8=";
   };
 
   build-system = [ setuptools ];
-- 
cgit v1.2.3


From d600ebaa1bf51e869909ed42ba1d7cb4df55b5de Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Sun, 10 Aug 2025 13:21:05 +0200
Subject: python3Packages.rosbags: 0.10.10 -> 0.10.11

Diff: https://gitlab.com/ternaris/rosbags/-/compare/v0.10.10...v0.10.11

Changelog: https://gitlab.com/ternaris/rosbags/-/blob/v0.10.11/CHANGES.rst
---
 pkgs/development/python-modules/rosbags/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rosbags/default.nix b/pkgs/development/python-modules/rosbags/default.nix
index b847cff2f6cf..7c2a97aeb49f 100644
--- a/pkgs/development/python-modules/rosbags/default.nix
+++ b/pkgs/development/python-modules/rosbags/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "rosbags";
-  version = "0.10.10";
+  version = "0.10.11";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "ternaris";
     repo = "rosbags";
     tag = "v${version}";
-    hash = "sha256-EOuvvC6VTnhZA9M6ZKn0TNjbCm+lXH4/TboDS0hcw1A=";
+    hash = "sha256-uHRmeHwNswZt5q+RSlzjqZiXhH6qYAkf8AufrRNbBtY=";
   };
 
   build-system = [
-- 
cgit v1.2.3


From 9e5d8147fa52cbbae931447303d78754b54a118f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 13:06:00 +0000
Subject: python3Packages.types-markdown: 3.8.0.20250708 -> 3.8.0.20250809

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

diff --git a/pkgs/development/python-modules/types-markdown/default.nix b/pkgs/development/python-modules/types-markdown/default.nix
index 0a5073d4cc8a..b1055bcbfdff 100644
--- a/pkgs/development/python-modules/types-markdown/default.nix
+++ b/pkgs/development/python-modules/types-markdown/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-markdown";
-  version = "3.8.0.20250708";
+  version = "3.8.0.20250809";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_markdown";
     inherit version;
-    hash = "sha256-KGkCUf6QdX9amc1nHHlQK8LeB67y01/lQRfDsceZgEo=";
+    hash = "sha256-+mGec1h4okQzKku+Frz8ROSf9iZMJpYFYnjwZCzfoiM=";
   };
 
   build-system = [ setuptools ];
-- 
cgit v1.2.3


From dd3890a451e7f2d2b9faad5060cdf7545947e20a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 14:46:52 +0000
Subject: iosevka: 33.2.7 -> 33.2.8

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

diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix
index 0d27d83a06b1..ad3ede680110 100644
--- a/pkgs/by-name/io/iosevka/package.nix
+++ b/pkgs/by-name/io/iosevka/package.nix
@@ -56,16 +56,16 @@ assert (extraParameters != null) -> set != null;
 
 buildNpmPackage rec {
   pname = "Iosevka${toString set}";
-  version = "33.2.7";
+  version = "33.2.8";
 
   src = fetchFromGitHub {
     owner = "be5invis";
     repo = "iosevka";
     rev = "v${version}";
-    hash = "sha256-LS4c79/QmBSgsgSY/Tddmf2M6U0LcISMapnWK7Eu1Ak=";
+    hash = "sha256-rHkIvfS20A0cvFBcLfFLAvcVVF5BgbtMdDxMvwH0B+I=";
   };
 
-  npmDepsHash = "sha256-DyExvgNJBRlz8iVezlrJfTyobK0L6CMQN+gIMGoYYrw=";
+  npmDepsHash = "sha256-PYzNg5gduwtwc99GyatXnmHCh9mpAulz43Ehdle0rAM=";
 
   nativeBuildInputs = [
     remarshal
-- 
cgit v1.2.3


From f8cc6dae675bbeeee23434bb1ef870eefefd198c Mon Sep 17 00:00:00 2001
From: Commander <commander@te.rrori.st>
Date: Sun, 10 Aug 2025 18:15:10 +0200
Subject: mgba: add `libsForQt5.qt5.qtwayland` as a buildInput

Fixes a crash when the qt frontend is opened.
---
 pkgs/by-name/mg/mgba/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/mg/mgba/package.nix b/pkgs/by-name/mg/mgba/package.nix
index 5d42106e7fe9..3c8c2823445f 100644
--- a/pkgs/by-name/mg/mgba/package.nix
+++ b/pkgs/by-name/mg/mgba/package.nix
@@ -24,6 +24,7 @@ let
     qtmultimedia
     qttools
     wrapQtAppsHook
+    qtwayland
     ;
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -66,7 +67,8 @@ stdenv.mkDerivation (finalAttrs: {
     qtmultimedia
     qttools
   ]
-  ++ lib.optionals enableDiscordRpc [ discord-rpc ];
+  ++ lib.optionals enableDiscordRpc [ discord-rpc ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ];
 
   cmakeFlags = [
     (lib.cmakeBool "USE_DISCORD_RPC" enableDiscordRpc)
-- 
cgit v1.2.3


From aa4eb4912e55fb79a3d8081b3421c85d16600999 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 17:33:15 +0000
Subject: sydbox: 3.37.2 -> 3.37.6

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

diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix
index 59dac6afe740..a0edff5679fb 100644
--- a/pkgs/by-name/sy/sydbox/package.nix
+++ b/pkgs/by-name/sy/sydbox/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sydbox";
-  version = "3.37.2";
+  version = "3.37.6";
 
   outputs = [
     "out"
@@ -24,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "Sydbox";
     repo = "sydbox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XV3eB6XGDwoJK+wpfuARV7F4OqZJfoAqDmsYS8D2AK4=";
+    hash = "sha256-dcUK6GQK/l6HCTh/k5yaC5VetQmY6J+YWu8VHU1037g=";
   };
 
-  cargoHash = "sha256-uIcF4mzIYOgSfQVFl6kh3337AmdVFDDXIMXtVCqcoXg=";
+  cargoHash = "sha256-Ca4h7B5Vukd21HCEDpA5I+hgyQh7IFDLKeRxlVL0Uzo=";
 
   nativeBuildInputs = [
     mandoc
-- 
cgit v1.2.3


From f08e21aae4a83bae6e50fa266b0de94c736232b9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 17:37:52 +0000
Subject: python3Packages.sqlmap: 1.9.7 -> 1.9.8

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

diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix
index ba87c81b4ac6..c165c04091ce 100644
--- a/pkgs/development/python-modules/sqlmap/default.nix
+++ b/pkgs/development/python-modules/sqlmap/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "sqlmap";
-  version = "1.9.7";
+  version = "1.9.8";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-E2cb/hp7sg56S9By3AT3BGnqQSVlQzRV3wEW+uuJozI=";
+    hash = "sha256-CQiJ/8MtsoGcfnVA3hI4KZaX+p0ihQmasfwgOTd9we8=";
   };
 
   postPatch = ''
-- 
cgit v1.2.3


From 1fb3026f0aa431a9f268d1b8f60244c493d1adf6 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sat, 9 Aug 2025 21:59:55 -0700
Subject: python3Packages.ebudspy: init at 0.0.17

---
 .../development/python-modules/ebusdpy/default.nix | 31 ++++++++++++++++++++++
 pkgs/top-level/python-packages.nix                 |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/ebusdpy/default.nix

diff --git a/pkgs/development/python-modules/ebusdpy/default.nix b/pkgs/development/python-modules/ebusdpy/default.nix
new file mode 100644
index 000000000000..e0d27afd0783
--- /dev/null
+++ b/pkgs/development/python-modules/ebusdpy/default.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "ebusdpy";
+  version = "0.0.17";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-t6O/fOBrJuDYpCVnkL+hUzyqMoGKFj5UYNoD6ExikNM=";
+  };
+
+  build-system = [ setuptools ];
+
+  # Package has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "ebusdpy" ];
+
+  meta = {
+    description = "eBusd python integration library";
+    homepage = "https://github.com/CrazYoshi/ebusdpy";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1510628eb390..1bf8107468e1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4500,6 +4500,8 @@ self: super: with self; {
 
   ebooklib = callPackage ../development/python-modules/ebooklib { };
 
+  ebusdpy = callPackage ../development/python-modules/ebusdpy { };
+
   ec2-metadata = callPackage ../development/python-modules/ec2-metadata { };
 
   ec2instanceconnectcli = callPackage ../tools/virtualization/ec2instanceconnectcli { };
-- 
cgit v1.2.3


From 96c3909f3b8f595511dfb764e95c41e425363205 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sat, 9 Aug 2025 22:00:08 -0700
Subject: home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 4a4e24d518a1..2dd506968adb 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -1361,7 +1361,8 @@
       ]; # missing inputs: pyebox
     "ebusd" =
       ps: with ps; [
-      ]; # missing inputs: ebusdpy
+        ebusdpy
+      ];
     "ecoal_boiler" =
       ps: with ps; [
         ecoaliface
-- 
cgit v1.2.3


From 33e841a2fd939da8f3f5699d2a58a346f58ab7ca Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 10 Aug 2025 10:52:37 -0700
Subject: python3Packages.pyrecswitch: init at 1.0.2

---
 .../python-modules/pyrecswitch/default.nix         | 36 ++++++++++++++++++++++
 pkgs/top-level/python-packages.nix                 |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyrecswitch/default.nix

diff --git a/pkgs/development/python-modules/pyrecswitch/default.nix b/pkgs/development/python-modules/pyrecswitch/default.nix
new file mode 100644
index 000000000000..751ed9aa3b3b
--- /dev/null
+++ b/pkgs/development/python-modules/pyrecswitch/default.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pycryptodome,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "pyrecswitch";
+  version = "1.0.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "marcolertora";
+    repo = "pyrecswitch";
+    tag = version;
+    hash = "sha256-z9dOJ7WgUR2ntU6boUInRyKxSPBSoNWGtE3pOZcFYA0=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ pycryptodome ];
+
+  # Package has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "pyrecswitch" ];
+
+  meta = {
+    description = "Pure-python interface for controlling Ankuoo RecSwitch MS6126";
+    homepage = "https://github.com/marcolertora/pyrecswitch";
+    license = lib.licenses.agpl3Plus;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1510628eb390..cd6a51e54a5b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13762,6 +13762,8 @@ self: super: with self; {
     }
   );
 
+  pyrecswitch = callPackage ../development/python-modules/pyrecswitch { };
+
   pyrect = callPackage ../development/python-modules/pyrect { };
 
   pyregion = callPackage ../development/python-modules/pyregion { };
-- 
cgit v1.2.3


From d511a2f1a92fe8235f4443acd5f7a55d0efb1197 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 17:52:46 +0000
Subject: trilium-next-desktop: 0.97.1 -> 0.97.2

---
 pkgs/by-name/tr/trilium-next-desktop/package.nix | 10 +++++-----
 pkgs/by-name/tr/trilium-next-server/package.nix  |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/tr/trilium-next-desktop/package.nix b/pkgs/by-name/tr/trilium-next-desktop/package.nix
index 292383aae9c7..08ecf72c2075 100644
--- a/pkgs/by-name/tr/trilium-next-desktop/package.nix
+++ b/pkgs/by-name/tr/trilium-next-desktop/package.nix
@@ -15,7 +15,7 @@
 
 let
   pname = "trilium-next-desktop";
-  version = "0.97.1";
+  version = "0.97.2";
 
   triliumSource = os: arch: sha256: {
     url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-${os}-${arch}.zip";
@@ -26,10 +26,10 @@ let
   darwinSource = triliumSource "macos";
 
   # exposed like this for update.sh
-  x86_64-linux.sha256 = "1lb1mp031pa4wg6wrp8l84vw1glmqc27l4gf85a47bi4b63das2l";
-  aarch64-linux.sha256 = "1yrxk8q2aafgcvipwhkwmjidymwia0dgqnhchhngmris6zrbb3wj";
-  x86_64-darwin.sha256 = "0d8li5h2rn3iyzxsbs4g7a98zzdn58x4iwhzvxcjxy7b6h4hldvg";
-  aarch64-darwin.sha256 = "07r1rw84mlszr2bzjwz62lsy14j9xm22li2ksdc4ra93q58kmip1";
+  x86_64-linux.sha256 = "12ms6knzaawryf7qisfnj5fj7v1icvkq7r0fpw55aajm7y0mpmf0";
+  aarch64-linux.sha256 = "0qgvasic531crlckwqn8mm9aimm7kliab2y7i264k60pb8h5spmp";
+  x86_64-darwin.sha256 = "1dam3ig7z21vi6icd4ww46smgn4d7kis3r51h0r5cvi8mc9ahq1i";
+  aarch64-darwin.sha256 = "0wysa3kacxryv1g1rmqm4ikjv9hfp1bqjcv1yn8drsi80zscm4lj";
 
   sources = {
     x86_64-linux = linuxSource "x64" x86_64-linux.sha256;
diff --git a/pkgs/by-name/tr/trilium-next-server/package.nix b/pkgs/by-name/tr/trilium-next-server/package.nix
index 6ea019bf45f3..a8f92ae6f744 100644
--- a/pkgs/by-name/tr/trilium-next-server/package.nix
+++ b/pkgs/by-name/tr/trilium-next-server/package.nix
@@ -7,12 +7,12 @@
 }:
 
 let
-  version = "0.97.1";
+  version = "0.97.2";
 
   serverSource_x64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-x64.tar.xz";
-  serverSource_x64.sha256 = "1y0ass5b3c8qx28b31x2h7i1rlvdyjimsklgjpv8d47micsg6m7z";
+  serverSource_x64.sha256 = "1zbi1jh2iib6wcaab0wdhb2rhslmn06dn22h28h8jjj5qjpbqqz0";
   serverSource_arm64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-arm64.tar.xz";
-  serverSource_arm64.sha256 = "12bnmbm1p98633xsyxq6rr05jl79bn820915a0gmq14np7vskhmp";
+  serverSource_arm64.sha256 = "1a6gnfprskq0cqvg625dazqq39h89d3g9rssdcyw7w0a7kw8nfrv";
 
   serverSource =
     if stdenv.hostPlatform.isx86_64 then
-- 
cgit v1.2.3


From 561864f00892d9a0fea659d6c01567411536b5b9 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 10 Aug 2025 10:53:26 -0700
Subject: home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 4a4e24d518a1..f76b50cc208c 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -4881,7 +4881,8 @@
       ];
     "recswitch" =
       ps: with ps; [
-      ]; # missing inputs: pyrecswitch
+        pyrecswitch
+      ];
     "reddit" =
       ps: with ps; [
         praw
-- 
cgit v1.2.3


From ba49919982acad7d34279ddb1dfa6df003c948af Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 18:48:22 +0000
Subject: fabric-ai: 1.4.272 -> 1.4.280

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

diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix
index b31ba804afde..27bdb4b69f28 100644
--- a/pkgs/by-name/fa/fabric-ai/package.nix
+++ b/pkgs/by-name/fa/fabric-ai/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "fabric-ai";
-  version = "1.4.272";
+  version = "1.4.280";
 
   src = fetchFromGitHub {
     owner = "danielmiessler";
     repo = "fabric";
     tag = "v${version}";
-    hash = "sha256-4ohZC+TKCKljawf0DAqzNQmEeFXi2jp4571uN+0UqZA=";
+    hash = "sha256-sORFkqT8+d0Cwo5W6hCNvNvgoMH/rsDPK6+sFm+lmf8=";
   };
 
-  vendorHash = "sha256-wPd0Rgc081ueK12MTeeJfuwUDyFfwXN/MveeOArjkqg=";
+  vendorHash = "sha256-VuP0ICBNH7FnXOjHLDv4pJZgKvpjSaudoV1K/ZmB7pY=";
 
   # Fabric introduced plugin tests that fail in the nix build sandbox.
   doCheck = false;
-- 
cgit v1.2.3


From 083b3ca9e636015141a682a79b98f885a16cdb02 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 18:48:41 +0000
Subject: baddns: 1.7.86 -> 1.10.185

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

diff --git a/pkgs/by-name/ba/baddns/package.nix b/pkgs/by-name/ba/baddns/package.nix
index c36e0b7eb0ec..65397f4b1e31 100644
--- a/pkgs/by-name/ba/baddns/package.nix
+++ b/pkgs/by-name/ba/baddns/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "baddns";
-  version = "1.7.86";
+  version = "1.10.185";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "blacklanternsecurity";
     repo = "baddns";
     tag = version;
-    hash = "sha256-Jj36aNNYCwqK/Yux92YmCxywftoizXZE39qLhLpjAaw=";
+    hash = "sha256-pstfEpcEk0k5T/Os9pEyxTQ62MTW/XFQPOwY/OyHHwY=";
   };
 
   pythonRelaxDeps = true;
@@ -63,7 +63,7 @@ python3.pkgs.buildPythonApplication rec {
   meta = {
     description = "Tool to check subdomains for subdomain takeovers and other DNS issues";
     homepage = "https://github.com/blacklanternsecurity/baddns/";
-    changelog = "https://github.com/blacklanternsecurity/baddns/releases/tag/v${version}";
+    changelog = "https://github.com/blacklanternsecurity/baddns/releases/tag/${src.tag}";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "baddns";
-- 
cgit v1.2.3


From f309ac2440ff8a91e40e00259c55889a8dd03b6d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 18:35:43 +0000
Subject: pyprland: 2.4.6 -> 2.4.7

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

diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix
index 730da05985ee..509225403b6b 100644
--- a/pkgs/by-name/py/pyprland/package.nix
+++ b/pkgs/by-name/py/pyprland/package.nix
@@ -7,7 +7,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pyprland";
-  version = "2.4.6";
+  version = "2.4.7";
   format = "pyproject";
 
   disabled = python3Packages.pythonOlder "3.10";
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
     owner = "hyprland-community";
     repo = "pyprland";
     tag = version;
-    hash = "sha256-OH+BTPw574FykVYWG6TIOpSPeYB39UxyMy/gzMDw0z4=";
+    hash = "sha256-rtAw6tdZY0BKb6Qjk/LHYYMB9nCPzkmw95wdjhJ191s=";
   };
 
   nativeBuildInputs = with python3Packages; [ poetry-core ];
-- 
cgit v1.2.3


From fdba84e20a4a4d51fc16cfa92beb7c2e7e78435f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 10 Aug 2025 20:56:36 +0200
Subject: python313Packages.gwcs: 0.25.1 -> 0.25.2

Diff: https://github.com/spacetelescope/gwcs/compare/refs/tags/0.25.1...refs/tags/0.25.2

Changelog: https://github.com/spacetelescope/gwcs/blob/0.25.2/CHANGES.rst
---
 pkgs/development/python-modules/gwcs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gwcs/default.nix b/pkgs/development/python-modules/gwcs/default.nix
index 58359d328efb..7d73a5aa4ce5 100644
--- a/pkgs/development/python-modules/gwcs/default.nix
+++ b/pkgs/development/python-modules/gwcs/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "gwcs";
-  version = "0.25.1";
+  version = "0.25.2";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "spacetelescope";
     repo = "gwcs";
     tag = version;
-    hash = "sha256-jGO3/qFNL8aovlU/jXIZpk2GHmwZ+o8tSSqnPHgtFqU=";
+    hash = "sha256-Pj/Ly/qMJdhdY8C/ZPaEV+hsYEh//ARvHitvlkjI8sM=";
   };
 
   build-system = [
-- 
cgit v1.2.3


From df9adc3ddd58c6375c18454eb798b04c2a1211ec Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 10 Aug 2025 21:15:21 +0200
Subject: python313Packages.identify: 2.6.12 -> 2.6.13

Diff: https://github.com/pre-commit/identify/compare/refs/tags/v2.6.12...refs/tags/v2.6.13
---
 pkgs/development/python-modules/identify/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix
index f59607f9981e..23d006a3e12d 100644
--- a/pkgs/development/python-modules/identify/default.nix
+++ b/pkgs/development/python-modules/identify/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "identify";
-  version = "2.6.12";
+  version = "2.6.13";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "pre-commit";
     repo = "identify";
     tag = "v${version}";
-    hash = "sha256-zV9NRHFh/bfbg+pO0xX5aXunc1y4aGfKDugyCFLj/xA=";
+    hash = "sha256-Du96uRQCymduvAruHSgjKv/OrDIPaMwPU+x/OTchERQ=";
   };
 
   build-system = [ setuptools ];
-- 
cgit v1.2.3


From 733f7ee8951a434e016c3a7b02424d2ef8a21033 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 10 Aug 2025 21:18:05 +0200
Subject: checkov: 3.2.458 -> 3.2.460

Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.458...refs/tags/3.2.460

Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.460
---
 pkgs/by-name/ch/checkov/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix
index 5f30b9bc8b05..4eb22073b259 100644
--- a/pkgs/by-name/ch/checkov/package.nix
+++ b/pkgs/by-name/ch/checkov/package.nix
@@ -25,14 +25,14 @@ with py.pkgs;
 
 python3.pkgs.buildPythonApplication rec {
   pname = "checkov";
-  version = "3.2.458";
+  version = "3.2.460";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "checkov";
     tag = version;
-    hash = "sha256-0tIDwUKYK4HIdvSu0xr01avwedlEKOF+COvfUHYn00o=";
+    hash = "sha256-DThOzb6ja0kdJ9X99hFsn7FCdk86xJeDKVdqRC1KLHw=";
   };
 
   pythonRelaxDeps = [
-- 
cgit v1.2.3


From 6884cfa29158bd404a10a83a67fb157b79abeda0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 19:30:36 +0000
Subject: nakama: 3.29.0 -> 3.30.0

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

diff --git a/pkgs/by-name/na/nakama/package.nix b/pkgs/by-name/na/nakama/package.nix
index 8dd1f286076a..5f26b8548a8e 100644
--- a/pkgs/by-name/na/nakama/package.nix
+++ b/pkgs/by-name/na/nakama/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "nakama";
-  version = "3.29.0";
+  version = "3.30.0";
 
   src = fetchFromGitHub {
     owner = "heroiclabs";
     repo = "nakama";
     tag = "v${version}";
-    hash = "sha256-mgHvgq/sbwWVIKpfQuZVp9xHgVHOMYJt2YEdeKTaDqA=";
+    hash = "sha256-G+cNR4Ny8aR3ByuKvrCTp3U+GXpdYaHlrZqifoWDce0=";
   };
 
   vendorHash = null;
-- 
cgit v1.2.3


From bce489340c6a6f36d738e4452ac72fa92cb4f545 Mon Sep 17 00:00:00 2001
From: Diego <diego@strebel.com>
Date: Sun, 10 Aug 2025 21:41:47 +0200
Subject: cdncheck: 1.1.30 -> 1.1.31

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

diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix
index 55989c4848a0..224fe159079e 100644
--- a/pkgs/by-name/cd/cdncheck/package.nix
+++ b/pkgs/by-name/cd/cdncheck/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "cdncheck";
-  version = "1.1.30";
+  version = "1.1.31";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "cdncheck";
     tag = "v${version}";
-    hash = "sha256-DA68sGa1CbWfNjmRjzh+/NpMPUIxe8HCj2QjzFjDXz4=";
+    hash = "sha256-1rt+vXfsM8hotCmZmel1MiP7VDqahhAMpJYn3Vyo3lY=";
   };
 
   vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4=";
-- 
cgit v1.2.3


From 3c63428e11e37f179025c193f077ef19540d721e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 19:50:19 +0000
Subject: python3Packages.nicegui: 2.22.1 -> 2.22.2

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

diff --git a/pkgs/development/python-modules/nicegui/default.nix b/pkgs/development/python-modules/nicegui/default.nix
index 618815b655b8..aba43f7c77cb 100644
--- a/pkgs/development/python-modules/nicegui/default.nix
+++ b/pkgs/development/python-modules/nicegui/default.nix
@@ -42,14 +42,14 @@
 
 buildPythonPackage rec {
   pname = "nicegui";
-  version = "2.22.1";
+  version = "2.22.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zauberzeug";
     repo = "nicegui";
     tag = "v${version}";
-    hash = "sha256-v9ELS0EzmqbaUhyqKidvN7UvvCHwBne2QkJJmTkheBg=";
+    hash = "sha256-sxbQVMX7zN+sSKDzMzOpgt9WqNVF/yjOnKKzDFb3+So=";
   };
 
   pythonRelaxDeps = [ "requests" ];
-- 
cgit v1.2.3


From 6a98a4c5965962ada18850cd1341f6173d3534b7 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 10 Aug 2025 12:50:40 -0700
Subject: python3Packages.pyswitchmate: init at 0.5.1

---
 .../python-modules/pyswitchmate/default.nix        | 36 ++++++++++++++++++++++
 pkgs/top-level/python-packages.nix                 |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyswitchmate/default.nix

diff --git a/pkgs/development/python-modules/pyswitchmate/default.nix b/pkgs/development/python-modules/pyswitchmate/default.nix
new file mode 100644
index 000000000000..e047bc78ddab
--- /dev/null
+++ b/pkgs/development/python-modules/pyswitchmate/default.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  bleak,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "pyswitchmate";
+  version = "0.5.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Danielhiversen";
+    repo = "pySwitchmate";
+    tag = version;
+    hash = "sha256-14rjlIsSFNP2OzuRamAJw9BaA+Z5EuQBEsrD02uQdFk=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ bleak ];
+
+  # Project has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "switchmate" ];
+
+  meta = {
+    description = "A library to communicate with Switchmate";
+    homepage = "https://github.com/Danielhiversen/pySwitchmate";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c457a7041d67..3a297921b74f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14111,6 +14111,8 @@ self: super: with self; {
 
   pyswitchbot = callPackage ../development/python-modules/pyswitchbot { };
 
+  pyswitchmate = callPackage ../development/python-modules/pyswitchmate { };
+
   pysychonaut = callPackage ../development/python-modules/pysychonaut { };
 
   pysyncobj = callPackage ../development/python-modules/pysyncobj { };
-- 
cgit v1.2.3


From b1c8fa9e58246fb4a304b8f94555f4dc1009113d Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 10 Aug 2025 12:51:24 -0700
Subject: home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 022994030913..d3dab1154da8 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -5760,7 +5760,8 @@
       ];
     "switchmate" =
       ps: with ps; [
-      ]; # missing inputs: PySwitchmate
+        pyswitchmate
+      ];
     "symfonisk" =
       ps: with ps; [
       ];
-- 
cgit v1.2.3


From deb6fff3f56baede2f4aeddb38fb9d882ec9bbab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 20:00:18 +0000
Subject: gocryptfs: 2.6.0 -> 2.6.1

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

diff --git a/pkgs/by-name/go/gocryptfs/package.nix b/pkgs/by-name/go/gocryptfs/package.nix
index eace2edb9f10..cc3047df55b7 100644
--- a/pkgs/by-name/go/gocryptfs/package.nix
+++ b/pkgs/by-name/go/gocryptfs/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule rec {
   pname = "gocryptfs";
-  version = "2.6.0";
+  version = "2.6.1";
 
   src = fetchFromGitHub {
     owner = "rfjakob";
     repo = "gocryptfs";
     rev = "v${version}";
-    sha256 = "sha256-zvem4Uc+pNCDVMsnl/BwMYLp3DSYnYy6jwWM2kduq7k=";
+    sha256 = "sha256-uQLFcabN418m1dvogJ71lJeTF3F9JycK/8qCPaXblSU=";
   };
 
   vendorHash = "sha256-dvOROh5TsMl+52RvKmDG4ftNv3WF19trgttu5BGWktU=";
-- 
cgit v1.2.3


From d5ae87bdebb57a326b825acf4f5c592ae2b9002d Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Sun, 10 Aug 2025 22:22:08 +0200
Subject: Revert "nixos: allow more things to be disabled"

---
 nixos/modules/config/system-path.nix               | 101 ++++-------
 nixos/modules/programs/bash/bash.nix               | 200 +++++++++++----------
 nixos/modules/programs/fuse.nix                    |  33 +---
 nixos/modules/programs/ssh.nix                     |   2 -
 nixos/modules/security/wrappers/default.nix        |   2 +
 .../system/activation/activation-script.nix        |   2 +-
 nixos/modules/system/boot/kernel.nix               |   4 +-
 nixos/modules/system/boot/kexec.nix                |  19 +-
 nixos/modules/tasks/filesystems.nix                |   8 +-
 nixos/modules/tasks/network-interfaces.nix         |  24 ++-
 10 files changed, 165 insertions(+), 230 deletions(-)

diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index 93574ffcb2ea..42e40e2af5e4 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -8,47 +8,41 @@
 }:
 let
 
-  corePackageNames = [
-    "acl"
-    "attr"
-    "bashInteractive" # bash with ncurses support
-    "bzip2"
-    "coreutils-full"
-    "cpio"
-    "curl"
-    "diffutils"
-    "findutils"
-    "gawk"
-    "getent"
-    "getconf"
-    "gnugrep"
-    "gnupatch"
-    "gnused"
-    "gnutar"
-    "gzip"
-    "xz"
-    "less"
-    "libcap"
-    "ncurses"
-    "netcat"
-    "mkpasswd"
-    "procps"
-    "su"
-    "time"
-    "util-linux"
-    "which"
-    "zstd"
-  ];
-  corePackages =
-    (map (
-      n:
-      let
-        pkg = pkgs.${n};
-      in
-      lib.setPrio ((pkg.meta.priority or lib.meta.defaultPriority) + 3) pkg
-    ) corePackageNames)
-    ++ [ pkgs.stdenv.cc.libc ];
-  corePackagesText = "[ ${lib.concatMapStringsSep " " (n: "pkgs.${n}") corePackageNames} ]";
+  requiredPackages =
+    map (pkg: lib.setPrio ((pkg.meta.priority or lib.meta.defaultPriority) + 3) pkg)
+      [
+        pkgs.acl
+        pkgs.attr
+        pkgs.bashInteractive # bash with ncurses support
+        pkgs.bzip2
+        pkgs.coreutils-full
+        pkgs.cpio
+        pkgs.curl
+        pkgs.diffutils
+        pkgs.findutils
+        pkgs.gawk
+        pkgs.stdenv.cc.libc
+        pkgs.getent
+        pkgs.getconf
+        pkgs.gnugrep
+        pkgs.gnupatch
+        pkgs.gnused
+        pkgs.gnutar
+        pkgs.gzip
+        pkgs.xz
+        pkgs.less
+        pkgs.libcap
+        pkgs.ncurses
+        pkgs.netcat
+        config.programs.ssh.package
+        pkgs.mkpasswd
+        pkgs.procps
+        pkgs.su
+        pkgs.time
+        pkgs.util-linux
+        pkgs.which
+        pkgs.zstd
+      ];
 
   defaultPackageNames = [
     "perl"
@@ -86,29 +80,6 @@ in
         '';
       };
 
-      corePackages = lib.mkOption {
-        type = lib.types.listOf lib.types.package;
-        default = corePackages;
-        defaultText = lib.literalMD ''
-          these packages, with their `meta.priority` numerically increased
-          (thus lowering their installation priority):
-
-              ${corePackagesText}
-        '';
-        example = [ ];
-        description = ''
-          Set of core packages for a normal interactive system.
-
-          Only change this if you know what you're doing!
-
-          Like with systemPackages, packages are installed to
-          {file}`/run/current-system/sw`. They are
-          automatically available to all users, and are
-          automatically updated every time you rebuild the system
-          configuration.
-        '';
-      };
-
       defaultPackages = lib.mkOption {
         type = lib.types.listOf lib.types.package;
         default = defaultPackages;
@@ -180,7 +151,7 @@ in
 
   config = {
 
-    environment.systemPackages = config.environment.corePackages ++ config.environment.defaultPackages;
+    environment.systemPackages = requiredPackages ++ config.environment.defaultPackages;
 
     environment.pathsToLink = [
       "/bin"
diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index b21822369a51..05b41ae619fc 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -23,23 +23,28 @@ let
 in
 
 {
+  imports = [
+    (lib.mkRemovedOptionModule [ "programs" "bash" "enable" ] "")
+  ];
 
   options = {
 
     programs.bash = {
 
-      enable = lib.mkOption {
-        default = true;
-        description = ''
-          Whenever to configure Bash as an interactive shell.
-          Note that this tries to make Bash the default
-          {option}`users.defaultUserShell`,
-          which in turn means that you might need to explicitly
-          set this variable if you have another shell configured
-          with NixOS.
-        '';
-        type = lib.types.bool;
-      };
+      /*
+        enable = lib.mkOption {
+          default = true;
+          description = ''
+            Whenever to configure Bash as an interactive shell.
+            Note that this tries to make Bash the default
+            {option}`users.defaultUserShell`,
+            which in turn means that you might need to explicitly
+            set this variable if you have another shell configured
+            with NixOS.
+          '';
+          type = lib.types.bool;
+        };
+      */
 
       shellAliases = lib.mkOption {
         default = { };
@@ -124,120 +129,121 @@ in
 
   };
 
-  config = lib.mkIf cfg.enable {
+  config = # lib.mkIf cfg.enable
+    {
 
-    programs.bash = {
+      programs.bash = {
 
-      shellAliases = builtins.mapAttrs (name: lib.mkDefault) cfge.shellAliases;
+        shellAliases = builtins.mapAttrs (name: lib.mkDefault) cfge.shellAliases;
 
-      shellInit = ''
-        if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then
-            . ${config.system.build.setEnvironment}
-        fi
+        shellInit = ''
+          if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then
+              . ${config.system.build.setEnvironment}
+          fi
 
-        ${cfge.shellInit}
-      '';
+          ${cfge.shellInit}
+        '';
 
-      loginShellInit = cfge.loginShellInit;
+        loginShellInit = cfge.loginShellInit;
 
-      interactiveShellInit = ''
-        # Check the window size after every command.
-        shopt -s checkwinsize
+        interactiveShellInit = ''
+          # Check the window size after every command.
+          shopt -s checkwinsize
 
-        # Disable hashing (i.e. caching) of command lookups.
-        set +h
+          # Disable hashing (i.e. caching) of command lookups.
+          set +h
 
-        ${cfg.promptInit}
-        ${cfg.promptPluginInit}
-        ${bashAliases}
+          ${cfg.promptInit}
+          ${cfg.promptPluginInit}
+          ${bashAliases}
 
-        ${cfge.interactiveShellInit}
-      '';
+          ${cfge.interactiveShellInit}
+        '';
 
-    };
+      };
 
-    environment.etc.profile.text = ''
-      # /etc/profile: DO NOT EDIT -- this file has been generated automatically.
-      # This file is read for login shells.
+      environment.etc.profile.text = ''
+        # /etc/profile: DO NOT EDIT -- this file has been generated automatically.
+        # This file is read for login shells.
 
-      # Only execute this file once per shell.
-      if [ -n "$__ETC_PROFILE_SOURCED" ]; then return; fi
-      __ETC_PROFILE_SOURCED=1
+        # Only execute this file once per shell.
+        if [ -n "$__ETC_PROFILE_SOURCED" ]; then return; fi
+        __ETC_PROFILE_SOURCED=1
 
-      # Prevent this file from being sourced by interactive non-login child shells.
-      export __ETC_PROFILE_DONE=1
+        # Prevent this file from being sourced by interactive non-login child shells.
+        export __ETC_PROFILE_DONE=1
 
-      ${cfg.shellInit}
-      ${cfg.loginShellInit}
+        ${cfg.shellInit}
+        ${cfg.loginShellInit}
 
-      # Read system-wide modifications.
-      if test -f /etc/profile.local; then
-          . /etc/profile.local
-      fi
+        # Read system-wide modifications.
+        if test -f /etc/profile.local; then
+            . /etc/profile.local
+        fi
 
-      if [ -n "''${BASH_VERSION:-}" ]; then
-          . /etc/bashrc
-      fi
-    '';
+        if [ -n "''${BASH_VERSION:-}" ]; then
+            . /etc/bashrc
+        fi
+      '';
 
-    environment.etc.bashrc.text = ''
-      # /etc/bashrc: DO NOT EDIT -- this file has been generated automatically.
+      environment.etc.bashrc.text = ''
+        # /etc/bashrc: DO NOT EDIT -- this file has been generated automatically.
 
-      # Only execute this file once per shell.
-      if [ -n "$__ETC_BASHRC_SOURCED" ] || [ -n "$NOSYSBASHRC" ]; then return; fi
-      __ETC_BASHRC_SOURCED=1
+        # Only execute this file once per shell.
+        if [ -n "$__ETC_BASHRC_SOURCED" ] || [ -n "$NOSYSBASHRC" ]; then return; fi
+        __ETC_BASHRC_SOURCED=1
 
-      # If the profile was not loaded in a parent process, source
-      # it.  But otherwise don't do it because we don't want to
-      # clobber overridden values of $PATH, etc.
-      if [ -z "$__ETC_PROFILE_DONE" ]; then
-          . /etc/profile
-      fi
+        # If the profile was not loaded in a parent process, source
+        # it.  But otherwise don't do it because we don't want to
+        # clobber overridden values of $PATH, etc.
+        if [ -z "$__ETC_PROFILE_DONE" ]; then
+            . /etc/profile
+        fi
 
-      # We are not always an interactive shell.
-      if [ -n "$PS1" ]; then
-          ${cfg.interactiveShellInit}
-      fi
+        # We are not always an interactive shell.
+        if [ -n "$PS1" ]; then
+            ${cfg.interactiveShellInit}
+        fi
 
-      # Read system-wide modifications.
-      if test -f /etc/bashrc.local; then
-          . /etc/bashrc.local
-      fi
-    '';
+        # Read system-wide modifications.
+        if test -f /etc/bashrc.local; then
+            . /etc/bashrc.local
+        fi
+      '';
 
-    environment.etc.bash_logout.text = ''
-      # /etc/bash_logout: DO NOT EDIT -- this file has been generated automatically.
+      environment.etc.bash_logout.text = ''
+        # /etc/bash_logout: DO NOT EDIT -- this file has been generated automatically.
 
-      # Only execute this file once per shell.
-      if [ -n "$__ETC_BASHLOGOUT_SOURCED" ] || [ -n "$NOSYSBASHLOGOUT" ]; then return; fi
-      __ETC_BASHLOGOUT_SOURCED=1
+        # Only execute this file once per shell.
+        if [ -n "$__ETC_BASHLOGOUT_SOURCED" ] || [ -n "$NOSYSBASHLOGOUT" ]; then return; fi
+        __ETC_BASHLOGOUT_SOURCED=1
 
-      ${cfg.logout}
+        ${cfg.logout}
 
-      # Read system-wide modifications.
-      if test -f /etc/bash_logout.local; then
-          . /etc/bash_logout.local
-      fi
-    '';
+        # Read system-wide modifications.
+        if test -f /etc/bash_logout.local; then
+            . /etc/bash_logout.local
+        fi
+      '';
 
-    # Configuration for readline in bash. We use "option default"
-    # priority to allow user override using both .text and .source.
-    environment.etc.inputrc.source = lib.mkOptionDefault ./inputrc;
+      # Configuration for readline in bash. We use "option default"
+      # priority to allow user override using both .text and .source.
+      environment.etc.inputrc.source = lib.mkOptionDefault ./inputrc;
 
-    users.defaultUserShell = lib.mkDefault pkgs.bashInteractive;
+      users.defaultUserShell = lib.mkDefault pkgs.bashInteractive;
 
-    environment.pathsToLink = lib.optionals cfg.completion.enable [
-      "/etc/bash_completion.d"
-      "/share/bash-completion"
-    ];
+      environment.pathsToLink = lib.optionals cfg.completion.enable [
+        "/etc/bash_completion.d"
+        "/share/bash-completion"
+      ];
 
-    environment.shells = [
-      "/run/current-system/sw/bin/bash"
-      "/run/current-system/sw/bin/sh"
-      "${pkgs.bashInteractive}/bin/bash"
-      "${pkgs.bashInteractive}/bin/sh"
-    ];
+      environment.shells = [
+        "/run/current-system/sw/bin/bash"
+        "/run/current-system/sw/bin/sh"
+        "${pkgs.bashInteractive}/bin/bash"
+        "${pkgs.bashInteractive}/bin/sh"
+      ];
 
-  };
+    };
 
 }
diff --git a/nixos/modules/programs/fuse.nix b/nixos/modules/programs/fuse.nix
index 9096ce7812b4..6d225089f33d 100644
--- a/nixos/modules/programs/fuse.nix
+++ b/nixos/modules/programs/fuse.nix
@@ -1,9 +1,4 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
+{ config, lib, ... }:
 
 let
   cfg = config.programs.fuse;
@@ -12,10 +7,6 @@ in
   meta.maintainers = with lib.maintainers; [ ];
 
   options.programs.fuse = {
-    enable = lib.mkEnableOption "fuse" // {
-      default = true;
-    };
-
     mountMax = lib.mkOption {
       # In the C code it's an "int" (i.e. signed and at least 16 bit), but
       # negative numbers obviously make no sense:
@@ -36,30 +27,10 @@ in
     };
   };
 
-  config = lib.mkIf cfg.enable {
-    environment.systemPackages = [
-      pkgs.fuse
-      pkgs.fuse3
-    ];
-
-    security.wrappers =
-      let
-        mkSetuidRoot = source: {
-          setuid = true;
-          owner = "root";
-          group = "root";
-          inherit source;
-        };
-      in
-      {
-        fusermount = mkSetuidRoot "${lib.getBin pkgs.fuse}/bin/fusermount";
-        fusermount3 = mkSetuidRoot "${lib.getBin pkgs.fuse3}/bin/fusermount3";
-      };
-
+  config = {
     environment.etc."fuse.conf".text = ''
       ${lib.optionalString (!cfg.userAllowOther) "#"}user_allow_other
       mount_max = ${builtins.toString cfg.mountMax}
     '';
-
   };
 }
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index cbf1800e8e3b..a950a1c12b12 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -335,8 +335,6 @@ in
       }
     );
 
-    environment.corePackages = [ cfg.package ];
-
     # SSH configuration. Slight duplication of the sshd_config
     # generation in the sshd service.
     environment.etc."ssh/ssh_config".text = ''
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index edbed8120e24..cc1810c534bc 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -266,6 +266,8 @@ in
       in
       {
         # These are mount related wrappers that require the +s permission.
+        fusermount = mkSetuidRoot "${lib.getBin pkgs.fuse}/bin/fusermount";
+        fusermount3 = mkSetuidRoot "${lib.getBin pkgs.fuse3}/bin/fusermount3";
         mount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/mount";
         umount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/umount";
       };
diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index dd3973c8073e..f56be5f71f18 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -317,7 +317,7 @@ in
       source ${config.system.build.earlyMountScript}
     '';
 
-    systemd.user = lib.mkIf config.system.activatable {
+    systemd.user = {
       services.nixos-activation = {
         description = "Run user-specific NixOS activation";
         script = config.system.userActivationScripts.script;
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index b19e3ac5c787..3a7f0d19db94 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -414,9 +414,7 @@ in
 
           ln -s ${initrdPath} $out/initrd
 
-          ${optionalString (config.boot.initrd.secrets != { }) ''
-            ln -s ${config.system.build.initialRamdiskSecretAppender}/bin/append-initrd-secrets $out
-          ''}
+          ln -s ${config.system.build.initialRamdiskSecretAppender}/bin/append-initrd-secrets $out
 
           ln -s ${config.hardware.firmware}/lib/firmware $out/firmware
         '';
diff --git a/nixos/modules/system/boot/kexec.nix b/nixos/modules/system/boot/kexec.nix
index 9a4818d874dd..580ccab5e29e 100644
--- a/nixos/modules/system/boot/kexec.nix
+++ b/nixos/modules/system/boot/kexec.nix
@@ -1,22 +1,7 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
+{ pkgs, lib, ... }:
 
-let
-  cfg = config.boot.kexec;
-in
 {
-  options.boot.kexec = {
-    enable = lib.mkEnableOption "kexec" // {
-      default = lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.kexec-tools;
-      defaultText = lib.literalExpression ''lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.kexec-tools'';
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf (lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.kexec-tools) {
     environment.systemPackages = [ pkgs.kexec-tools ];
 
     systemd.services.prepare-kexec = {
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index ad27284d6991..5e52591a560b 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -461,7 +461,13 @@ in
     # Add the mount helpers to the system path so that `mount' can find them.
     system.fsPackages = [ pkgs.dosfstools ];
 
-    environment.systemPackages = config.system.fsPackages;
+    environment.systemPackages =
+      with pkgs;
+      [
+        fuse3
+        fuse
+      ]
+      ++ config.system.fsPackages;
 
     environment.etc.fstab.text =
       let
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 24781f230e75..6f4ef6492026 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -1767,19 +1767,17 @@ in
       text = cfg.hostName + "\n";
     };
 
-    environment.corePackages = lib.mkOptionDefault (
-      [
-        pkgs.host
-        pkgs.hostname-debian
-        pkgs.iproute2
-        pkgs.iputils
-      ]
-      ++ optionals config.networking.wireless.enable [
-        pkgs.wirelesstools # FIXME: obsolete?
-        pkgs.iw
-      ]
-      ++ bridgeStp
-    );
+    environment.systemPackages = [
+      pkgs.host
+      pkgs.hostname-debian
+      pkgs.iproute2
+      pkgs.iputils
+    ]
+    ++ optionals config.networking.wireless.enable [
+      pkgs.wirelesstools # FIXME: obsolete?
+      pkgs.iw
+    ]
+    ++ bridgeStp;
 
     # Wake-on-LAN configuration is shared by the scripted and networkd backends.
     systemd.network.links = pipe interfaces [
-- 
cgit v1.2.3


From bc51c2f2ad98e5574900125428dcd34a828f1cf7 Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
Date: Mon, 23 Jun 2025 14:34:51 +0200
Subject: python3Packages.nampa: 1.0 -> 1.0-unstable-2024-12-18

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

diff --git a/pkgs/development/python-modules/nampa/default.nix b/pkgs/development/python-modules/nampa/default.nix
index c9f31d7e615d..3b810808eb09 100644
--- a/pkgs/development/python-modules/nampa/default.nix
+++ b/pkgs/development/python-modules/nampa/default.nix
@@ -2,14 +2,13 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  future,
   pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "nampa";
-  version = "1.0";
+  version = "1.0-unstable-2024-12-18";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,20 +16,12 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "thebabush";
     repo = "nampa";
-    tag = version;
-    hash = "sha256-ylDthh6fO0jKiYib0bed31Dxt4afiD0Jd5mfRKrsZpE=";
+    rev = "cb6a63aae64324f57bdc296064bc6aa2b99ff99a";
+    hash = "sha256-4NEfrx5cR6Zk713oBRZBe52mrbHKhs1doJFAdjnobig=";
   };
 
-  postPatch = ''
-    # https://github.com/thebabush/nampa/pull/13
-    substituteInPlace setup.py \
-      --replace "0.1.1" "${version}"
-  '';
-
   build-system = [ setuptools ];
 
-  dependencies = [ future ];
-
   # Not used for binaryninja as plugin
   doCheck = false;
 
@@ -39,7 +30,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python implementation of the FLIRT technology";
     homepage = "https://github.com/thebabush/nampa";
-    changelog = "https://github.com/thebabush/nampa/releases/tag/${version}";
+    changelog = "https://github.com/thebabush/nampa/commits/cb6a63aae64324f57bdc296064bc6aa2b99ff99a/";
     license = licenses.lgpl3Only;
     maintainers = with maintainers; [ fab ];
   };
-- 
cgit v1.2.3


From 898ebf78ef1fc8f3bb90922fb4a95e939f69254b Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Sun, 27 Jul 2025 21:19:00 +0200
Subject: nixos/bash: re-introduce enable option

---
 nixos/modules/programs/bash/bash.nix | 200 +++++++++++++++++------------------
 1 file changed, 97 insertions(+), 103 deletions(-)

diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index 05b41ae619fc..b21822369a51 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -23,28 +23,23 @@ let
 in
 
 {
-  imports = [
-    (lib.mkRemovedOptionModule [ "programs" "bash" "enable" ] "")
-  ];
 
   options = {
 
     programs.bash = {
 
-      /*
-        enable = lib.mkOption {
-          default = true;
-          description = ''
-            Whenever to configure Bash as an interactive shell.
-            Note that this tries to make Bash the default
-            {option}`users.defaultUserShell`,
-            which in turn means that you might need to explicitly
-            set this variable if you have another shell configured
-            with NixOS.
-          '';
-          type = lib.types.bool;
-        };
-      */
+      enable = lib.mkOption {
+        default = true;
+        description = ''
+          Whenever to configure Bash as an interactive shell.
+          Note that this tries to make Bash the default
+          {option}`users.defaultUserShell`,
+          which in turn means that you might need to explicitly
+          set this variable if you have another shell configured
+          with NixOS.
+        '';
+        type = lib.types.bool;
+      };
 
       shellAliases = lib.mkOption {
         default = { };
@@ -129,121 +124,120 @@ in
 
   };
 
-  config = # lib.mkIf cfg.enable
-    {
+  config = lib.mkIf cfg.enable {
 
-      programs.bash = {
+    programs.bash = {
 
-        shellAliases = builtins.mapAttrs (name: lib.mkDefault) cfge.shellAliases;
+      shellAliases = builtins.mapAttrs (name: lib.mkDefault) cfge.shellAliases;
 
-        shellInit = ''
-          if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then
-              . ${config.system.build.setEnvironment}
-          fi
+      shellInit = ''
+        if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then
+            . ${config.system.build.setEnvironment}
+        fi
 
-          ${cfge.shellInit}
-        '';
+        ${cfge.shellInit}
+      '';
 
-        loginShellInit = cfge.loginShellInit;
+      loginShellInit = cfge.loginShellInit;
 
-        interactiveShellInit = ''
-          # Check the window size after every command.
-          shopt -s checkwinsize
+      interactiveShellInit = ''
+        # Check the window size after every command.
+        shopt -s checkwinsize
 
-          # Disable hashing (i.e. caching) of command lookups.
-          set +h
+        # Disable hashing (i.e. caching) of command lookups.
+        set +h
 
-          ${cfg.promptInit}
-          ${cfg.promptPluginInit}
-          ${bashAliases}
+        ${cfg.promptInit}
+        ${cfg.promptPluginInit}
+        ${bashAliases}
 
-          ${cfge.interactiveShellInit}
-        '';
+        ${cfge.interactiveShellInit}
+      '';
 
-      };
+    };
 
-      environment.etc.profile.text = ''
-        # /etc/profile: DO NOT EDIT -- this file has been generated automatically.
-        # This file is read for login shells.
+    environment.etc.profile.text = ''
+      # /etc/profile: DO NOT EDIT -- this file has been generated automatically.
+      # This file is read for login shells.
 
-        # Only execute this file once per shell.
-        if [ -n "$__ETC_PROFILE_SOURCED" ]; then return; fi
-        __ETC_PROFILE_SOURCED=1
+      # Only execute this file once per shell.
+      if [ -n "$__ETC_PROFILE_SOURCED" ]; then return; fi
+      __ETC_PROFILE_SOURCED=1
 
-        # Prevent this file from being sourced by interactive non-login child shells.
-        export __ETC_PROFILE_DONE=1
+      # Prevent this file from being sourced by interactive non-login child shells.
+      export __ETC_PROFILE_DONE=1
 
-        ${cfg.shellInit}
-        ${cfg.loginShellInit}
+      ${cfg.shellInit}
+      ${cfg.loginShellInit}
 
-        # Read system-wide modifications.
-        if test -f /etc/profile.local; then
-            . /etc/profile.local
-        fi
+      # Read system-wide modifications.
+      if test -f /etc/profile.local; then
+          . /etc/profile.local
+      fi
 
-        if [ -n "''${BASH_VERSION:-}" ]; then
-            . /etc/bashrc
-        fi
-      '';
+      if [ -n "''${BASH_VERSION:-}" ]; then
+          . /etc/bashrc
+      fi
+    '';
 
-      environment.etc.bashrc.text = ''
-        # /etc/bashrc: DO NOT EDIT -- this file has been generated automatically.
+    environment.etc.bashrc.text = ''
+      # /etc/bashrc: DO NOT EDIT -- this file has been generated automatically.
 
-        # Only execute this file once per shell.
-        if [ -n "$__ETC_BASHRC_SOURCED" ] || [ -n "$NOSYSBASHRC" ]; then return; fi
-        __ETC_BASHRC_SOURCED=1
+      # Only execute this file once per shell.
+      if [ -n "$__ETC_BASHRC_SOURCED" ] || [ -n "$NOSYSBASHRC" ]; then return; fi
+      __ETC_BASHRC_SOURCED=1
 
-        # If the profile was not loaded in a parent process, source
-        # it.  But otherwise don't do it because we don't want to
-        # clobber overridden values of $PATH, etc.
-        if [ -z "$__ETC_PROFILE_DONE" ]; then
-            . /etc/profile
-        fi
+      # If the profile was not loaded in a parent process, source
+      # it.  But otherwise don't do it because we don't want to
+      # clobber overridden values of $PATH, etc.
+      if [ -z "$__ETC_PROFILE_DONE" ]; then
+          . /etc/profile
+      fi
 
-        # We are not always an interactive shell.
-        if [ -n "$PS1" ]; then
-            ${cfg.interactiveShellInit}
-        fi
+      # We are not always an interactive shell.
+      if [ -n "$PS1" ]; then
+          ${cfg.interactiveShellInit}
+      fi
 
-        # Read system-wide modifications.
-        if test -f /etc/bashrc.local; then
-            . /etc/bashrc.local
-        fi
-      '';
+      # Read system-wide modifications.
+      if test -f /etc/bashrc.local; then
+          . /etc/bashrc.local
+      fi
+    '';
 
-      environment.etc.bash_logout.text = ''
-        # /etc/bash_logout: DO NOT EDIT -- this file has been generated automatically.
+    environment.etc.bash_logout.text = ''
+      # /etc/bash_logout: DO NOT EDIT -- this file has been generated automatically.
 
-        # Only execute this file once per shell.
-        if [ -n "$__ETC_BASHLOGOUT_SOURCED" ] || [ -n "$NOSYSBASHLOGOUT" ]; then return; fi
-        __ETC_BASHLOGOUT_SOURCED=1
+      # Only execute this file once per shell.
+      if [ -n "$__ETC_BASHLOGOUT_SOURCED" ] || [ -n "$NOSYSBASHLOGOUT" ]; then return; fi
+      __ETC_BASHLOGOUT_SOURCED=1
 
-        ${cfg.logout}
+      ${cfg.logout}
 
-        # Read system-wide modifications.
-        if test -f /etc/bash_logout.local; then
-            . /etc/bash_logout.local
-        fi
-      '';
+      # Read system-wide modifications.
+      if test -f /etc/bash_logout.local; then
+          . /etc/bash_logout.local
+      fi
+    '';
 
-      # Configuration for readline in bash. We use "option default"
-      # priority to allow user override using both .text and .source.
-      environment.etc.inputrc.source = lib.mkOptionDefault ./inputrc;
+    # Configuration for readline in bash. We use "option default"
+    # priority to allow user override using both .text and .source.
+    environment.etc.inputrc.source = lib.mkOptionDefault ./inputrc;
 
-      users.defaultUserShell = lib.mkDefault pkgs.bashInteractive;
+    users.defaultUserShell = lib.mkDefault pkgs.bashInteractive;
 
-      environment.pathsToLink = lib.optionals cfg.completion.enable [
-        "/etc/bash_completion.d"
-        "/share/bash-completion"
-      ];
+    environment.pathsToLink = lib.optionals cfg.completion.enable [
+      "/etc/bash_completion.d"
+      "/share/bash-completion"
+    ];
 
-      environment.shells = [
-        "/run/current-system/sw/bin/bash"
-        "/run/current-system/sw/bin/sh"
-        "${pkgs.bashInteractive}/bin/bash"
-        "${pkgs.bashInteractive}/bin/sh"
-      ];
+    environment.shells = [
+      "/run/current-system/sw/bin/bash"
+      "/run/current-system/sw/bin/sh"
+      "${pkgs.bashInteractive}/bin/bash"
+      "${pkgs.bashInteractive}/bin/sh"
+    ];
 
-    };
+  };
 
 }
-- 
cgit v1.2.3


From 9e0ac0c7e644b03836180d2f791f8d60b80c5a2d Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Sun, 27 Jul 2025 23:49:14 +0200
Subject: nixos/kexec: add enable option

It is still enabled by default but now you can actively exclude it if
you don't need it.
---
 nixos/modules/system/boot/kexec.nix | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/kexec.nix b/nixos/modules/system/boot/kexec.nix
index 580ccab5e29e..9a4818d874dd 100644
--- a/nixos/modules/system/boot/kexec.nix
+++ b/nixos/modules/system/boot/kexec.nix
@@ -1,7 +1,22 @@
-{ pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
+let
+  cfg = config.boot.kexec;
+in
 {
-  config = lib.mkIf (lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.kexec-tools) {
+  options.boot.kexec = {
+    enable = lib.mkEnableOption "kexec" // {
+      default = lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.kexec-tools;
+      defaultText = lib.literalExpression ''lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.kexec-tools'';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
     environment.systemPackages = [ pkgs.kexec-tools ];
 
     systemd.services.prepare-kexec = {
-- 
cgit v1.2.3


From 0d9a5c2059c2d05267cd3895cfccea7feb2fb319 Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Sun, 27 Jul 2025 21:19:00 +0200
Subject: nixos/fuse: add enable option

Fuse is stil enabled by default so the default behaviour of NixOS
doesn't change. However, now it's possible to actively exclude fuse when
you don't need it.
---
 nixos/modules/programs/fuse.nix             | 33 +++++++++++++++++++++++++++--
 nixos/modules/security/wrappers/default.nix |  2 --
 nixos/modules/tasks/filesystems.nix         |  8 +------
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/programs/fuse.nix b/nixos/modules/programs/fuse.nix
index 6d225089f33d..9096ce7812b4 100644
--- a/nixos/modules/programs/fuse.nix
+++ b/nixos/modules/programs/fuse.nix
@@ -1,4 +1,9 @@
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 let
   cfg = config.programs.fuse;
@@ -7,6 +12,10 @@ in
   meta.maintainers = with lib.maintainers; [ ];
 
   options.programs.fuse = {
+    enable = lib.mkEnableOption "fuse" // {
+      default = true;
+    };
+
     mountMax = lib.mkOption {
       # In the C code it's an "int" (i.e. signed and at least 16 bit), but
       # negative numbers obviously make no sense:
@@ -27,10 +36,30 @@ in
     };
   };
 
-  config = {
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [
+      pkgs.fuse
+      pkgs.fuse3
+    ];
+
+    security.wrappers =
+      let
+        mkSetuidRoot = source: {
+          setuid = true;
+          owner = "root";
+          group = "root";
+          inherit source;
+        };
+      in
+      {
+        fusermount = mkSetuidRoot "${lib.getBin pkgs.fuse}/bin/fusermount";
+        fusermount3 = mkSetuidRoot "${lib.getBin pkgs.fuse3}/bin/fusermount3";
+      };
+
     environment.etc."fuse.conf".text = ''
       ${lib.optionalString (!cfg.userAllowOther) "#"}user_allow_other
       mount_max = ${builtins.toString cfg.mountMax}
     '';
+
   };
 }
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index cc1810c534bc..edbed8120e24 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -266,8 +266,6 @@ in
       in
       {
         # These are mount related wrappers that require the +s permission.
-        fusermount = mkSetuidRoot "${lib.getBin pkgs.fuse}/bin/fusermount";
-        fusermount3 = mkSetuidRoot "${lib.getBin pkgs.fuse3}/bin/fusermount3";
         mount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/mount";
         umount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/umount";
       };
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index 5e52591a560b..ad27284d6991 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -461,13 +461,7 @@ in
     # Add the mount helpers to the system path so that `mount' can find them.
     system.fsPackages = [ pkgs.dosfstools ];
 
-    environment.systemPackages =
-      with pkgs;
-      [
-        fuse3
-        fuse
-      ]
-      ++ config.system.fsPackages;
+    environment.systemPackages = config.system.fsPackages;
 
     environment.etc.fstab.text =
       let
-- 
cgit v1.2.3


From bc5eefd2a5488748405aaabccc643c299d28ee4e Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Sun, 27 Jul 2025 22:28:27 +0200
Subject: nixos/activation-script: disable userActivationScripts when system is
 not activatable

---
 nixos/modules/system/activation/activation-script.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index f56be5f71f18..dd3973c8073e 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -317,7 +317,7 @@ in
       source ${config.system.build.earlyMountScript}
     '';
 
-    systemd.user = {
+    systemd.user = lib.mkIf config.system.activatable {
       services.nixos-activation = {
         description = "Run user-specific NixOS activation";
         script = config.system.userActivationScripts.script;
-- 
cgit v1.2.3


From e63a403bfb14e0d6a7e0168791d5c6ff1fc55384 Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Sun, 27 Jul 2025 21:19:00 +0200
Subject: nixos/kernel: don't include append-initrd-secrets when unused

---
 nixos/modules/system/boot/kernel.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index 3a7f0d19db94..b19e3ac5c787 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -414,7 +414,9 @@ in
 
           ln -s ${initrdPath} $out/initrd
 
-          ln -s ${config.system.build.initialRamdiskSecretAppender}/bin/append-initrd-secrets $out
+          ${optionalString (config.boot.initrd.secrets != { }) ''
+            ln -s ${config.system.build.initialRamdiskSecretAppender}/bin/append-initrd-secrets $out
+          ''}
 
           ln -s ${config.hardware.firmware}/lib/firmware $out/firmware
         '';
-- 
cgit v1.2.3


From f087e5c94b5d4c1f9f739032a309dcc1af1e646a Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Sun, 27 Jul 2025 21:19:01 +0200
Subject: nixos/network-interfaces: add packages to corePackages

This allows users to override (i.e. exclude) these packages from their
system closure if they don't need them.
---
 nixos/modules/tasks/network-interfaces.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 6f4ef6492026..09b6cec4e7ea 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -1767,7 +1767,7 @@ in
       text = cfg.hostName + "\n";
     };
 
-    environment.systemPackages = [
+    environment.corePackages = [
       pkgs.host
       pkgs.hostname-debian
       pkgs.iproute2
-- 
cgit v1.2.3


From 42cf56db0921e70703f9e4bcd9467bf6d425a668 Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Sun, 10 Aug 2025 22:47:37 +0200
Subject: nixos/system-path: add corePackages option

This allows users to override all packages. This is useful to build
minimal systems that really don't required these packages that
previously were "required".
---
 nixos/modules/config/system-path.nix | 104 +++++++++++++++++++++++------------
 nixos/modules/programs/ssh.nix       |   2 +
 2 files changed, 70 insertions(+), 36 deletions(-)

diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index 42e40e2af5e4..b9d58685f52a 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -8,41 +8,47 @@
 }:
 let
 
-  requiredPackages =
-    map (pkg: lib.setPrio ((pkg.meta.priority or lib.meta.defaultPriority) + 3) pkg)
-      [
-        pkgs.acl
-        pkgs.attr
-        pkgs.bashInteractive # bash with ncurses support
-        pkgs.bzip2
-        pkgs.coreutils-full
-        pkgs.cpio
-        pkgs.curl
-        pkgs.diffutils
-        pkgs.findutils
-        pkgs.gawk
-        pkgs.stdenv.cc.libc
-        pkgs.getent
-        pkgs.getconf
-        pkgs.gnugrep
-        pkgs.gnupatch
-        pkgs.gnused
-        pkgs.gnutar
-        pkgs.gzip
-        pkgs.xz
-        pkgs.less
-        pkgs.libcap
-        pkgs.ncurses
-        pkgs.netcat
-        config.programs.ssh.package
-        pkgs.mkpasswd
-        pkgs.procps
-        pkgs.su
-        pkgs.time
-        pkgs.util-linux
-        pkgs.which
-        pkgs.zstd
-      ];
+  corePackageNames = [
+    "acl"
+    "attr"
+    "bashInteractive" # bash with ncurses support
+    "bzip2"
+    "coreutils-full"
+    "cpio"
+    "curl"
+    "diffutils"
+    "findutils"
+    "gawk"
+    "getent"
+    "getconf"
+    "gnugrep"
+    "gnupatch"
+    "gnused"
+    "gnutar"
+    "gzip"
+    "xz"
+    "less"
+    "libcap"
+    "ncurses"
+    "netcat"
+    "mkpasswd"
+    "procps"
+    "su"
+    "time"
+    "util-linux"
+    "which"
+    "zstd"
+  ];
+  corePackages =
+    (map (
+      n:
+      let
+        pkg = pkgs.${n};
+      in
+      lib.setPrio ((pkg.meta.priority or lib.meta.defaultPriority) + 3) pkg
+    ) corePackageNames)
+    ++ [ pkgs.stdenv.cc.libc ];
+  corePackagesText = "[ ${lib.concatMapStringsSep " " (n: "pkgs.${n}") corePackageNames} ]";
 
   defaultPackageNames = [
     "perl"
@@ -80,6 +86,28 @@ in
         '';
       };
 
+      corePackages = lib.mkOption {
+        type = lib.types.listOf lib.types.package;
+        defaultText = lib.literalMD ''
+          these packages, with their `meta.priority` numerically increased
+          (thus lowering their installation priority):
+
+              ${corePackagesText}
+        '';
+        example = [ ];
+        description = ''
+          Set of core packages for a normal interactive system.
+
+          Only change this if you know what you're doing!
+
+          Like with systemPackages, packages are installed to
+          {file}`/run/current-system/sw`. They are
+          automatically available to all users, and are
+          automatically updated every time you rebuild the system
+          configuration.
+        '';
+      };
+
       defaultPackages = lib.mkOption {
         type = lib.types.listOf lib.types.package;
         default = defaultPackages;
@@ -151,7 +179,11 @@ in
 
   config = {
 
-    environment.systemPackages = requiredPackages ++ config.environment.defaultPackages;
+    # Set this here so that it has the right priority and allows ergonomic
+    # merging.
+    environment.corePackages = corePackages;
+
+    environment.systemPackages = config.environment.corePackages ++ config.environment.defaultPackages;
 
     environment.pathsToLink = [
       "/bin"
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index a950a1c12b12..cbf1800e8e3b 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -335,6 +335,8 @@ in
       }
     );
 
+    environment.corePackages = [ cfg.package ];
+
     # SSH configuration. Slight duplication of the sshd_config
     # generation in the sshd service.
     environment.etc."ssh/ssh_config".text = ''
-- 
cgit v1.2.3


From 9f4863ae2a6c22879855338376fde8813d99574b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 21:07:31 +0000
Subject: openimageio: 3.0.9.0 -> 3.0.9.1

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

diff --git a/pkgs/by-name/op/openimageio/package.nix b/pkgs/by-name/op/openimageio/package.nix
index bda0ef11c3b4..3c380a5b5545 100644
--- a/pkgs/by-name/op/openimageio/package.nix
+++ b/pkgs/by-name/op/openimageio/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "openimageio";
-  version = "3.0.9.0";
+  version = "3.0.9.1";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "OpenImageIO";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-N90Ll3ambwh83Ng5N7ToaE0ng2/WT37uhyvecn0crP0=";
+    hash = "sha256-tvtot+TZ2dPg8XlVBKT/kcKYKUPKjEcNDU7To5SCMrs=";
   };
 
   outputs = [
-- 
cgit v1.2.3


From 5adc3ad6fe39bea2778258d9d6ecd79d64697e71 Mon Sep 17 00:00:00 2001
From: mksafavi <mksafavi@gmail.com>
Date: Wed, 28 May 2025 16:43:45 +0330
Subject: rocmPackages.hiprt: init at 2.5.a21e075.3

---
 pkgs/development/rocm-modules/6/default.nix       |  4 ++
 pkgs/development/rocm-modules/6/hiprt/default.nix | 59 +++++++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 pkgs/development/rocm-modules/6/hiprt/default.nix

diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix
index c399061c1992..47588fd29446 100644
--- a/pkgs/development/rocm-modules/6/default.nix
+++ b/pkgs/development/rocm-modules/6/default.nix
@@ -142,6 +142,8 @@ let
 
       hipfft = self.callPackage ./hipfft { };
 
+      hiprt = self.callPackage ./hiprt { };
+
       tensile = pyPackages.callPackage ./tensile {
         inherit (self)
           rocmUpdateScript
@@ -323,6 +325,7 @@ let
             rocprim
             rocalution
             hipfft
+            hiprt
             rocm-core
             hipcub
             hipblas
@@ -355,6 +358,7 @@ let
             hipblaslt
             rocfft
             hipfft
+            hiprt
             rccl
             rocsparse
             hipsparse
diff --git a/pkgs/development/rocm-modules/6/hiprt/default.nix b/pkgs/development/rocm-modules/6/hiprt/default.nix
new file mode 100644
index 000000000000..01deca5685bd
--- /dev/null
+++ b/pkgs/development/rocm-modules/6/hiprt/default.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  clr,
+  gcc,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "hiprt";
+  version = "2.5.a21e075.3";
+
+  src = fetchFromGitHub {
+    owner = "GPUOpen-LibrariesAndSDKs";
+    repo = "HIPRT";
+    tag = finalAttrs.version;
+    sha256 = "sha256-3yGhwIsFHlFMCEzuYnXuXNzs99m7f2LTkYaTGs0GEcI=";
+  };
+
+  postPatch = ''
+    g++ contrib/easy-encryption/cl.cpp -o contrib/easy-encryption/bin/linux/ee64 #replacing prebuilt binary
+  '';
+
+  nativeBuildInputs = [
+    gcc # required for replacing easy-encryption binary
+    cmake
+  ];
+
+  buildInputs = [
+    clr
+  ];
+
+  cmakeFlags = [
+    "-D CMAKE_BUILD_TYPE=Release"
+    "-D BAKE_KERNEL=OFF"
+    "-D BAKE_COMPILED_KERNEL=OFF"
+    "-D BITCODE=ON"
+    "-D PRECOMPILE=ON"
+    "-D NO_UNITTEST=ON"
+    "-D FORCE_DISABLE_CUDA=ON"
+  ];
+
+  postInstall = ''
+    mv $out/bin $out/lib
+    ln -sr $out/lib/libhiprt*64.so $out/lib/libhiprt64.so
+    install -v -Dm644 ../scripts/bitcodes/hiprt*_amd_lib_linux.bc $out/lib/
+  '';
+
+  meta = {
+    homepage = "https://gpuopen.com/hiprt";
+    description = "Ray tracing library for HIP";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      mksafavi
+    ];
+    platforms = lib.platforms.linux;
+  };
+})
-- 
cgit v1.2.3


From aa822ab65720cdd8beb04a52bc60aae15d13d609 Mon Sep 17 00:00:00 2001
From: adeci <alex.decious@gmail.com>
Date: Sat, 9 Aug 2025 12:33:43 -0700
Subject: nixos-install: add root directory ownership check

Prevents installation when mount point is not owned by root:root, which can cause systemd warnings and session failures.

Fixes #432261
---
 pkgs/by-name/ni/nixos-install/nixos-install.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/ni/nixos-install/nixos-install.sh b/pkgs/by-name/ni/nixos-install/nixos-install.sh
index 2a592223a921..b15103c5ce14 100755
--- a/pkgs/by-name/ni/nixos-install/nixos-install.sh
+++ b/pkgs/by-name/ni/nixos-install/nixos-install.sh
@@ -122,6 +122,14 @@ while [[ "$checkPath" != "/" ]]; do
     checkPath="$(dirname "$checkPath")"
 done
 
+# Check if the mount point root directory is owned by root
+if [[ "$(stat -c '%u:%g' "$mountPoint")" != "0:0" ]]; then
+    echo "$0: $mountPoint is not owned by root:root (owned by $(stat -c '%U:%G' "$mountPoint"))"
+    echo "$0: installation root directory must be owned by root to avoid system issues"
+    echo "$0: run 'sudo chown root:root $mountPoint' to fix this"
+    exit 1
+fi
+
 # Verify that user is not trying to use attribute building and flake
 # at the same time
 if [[ -z $buildingAttribute && -n $flake ]]; then
-- 
cgit v1.2.3


From 9094f9759253a0889dd960b8afe5d474f1ad0f33 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 10 Aug 2025 23:42:49 +0200
Subject: rstfmt: refactor

---
 pkgs/by-name/rs/rstfmt/package.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/rs/rstfmt/package.nix b/pkgs/by-name/rs/rstfmt/package.nix
index 41ef77bf20b6..657c0e9c1141 100644
--- a/pkgs/by-name/rs/rstfmt/package.nix
+++ b/pkgs/by-name/rs/rstfmt/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
-  python3,
   fetchFromGitHub,
+  python3,
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -16,11 +16,10 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-zvmKgNzfxyWYHoaD+q84I48r1Mpp4kU4oIGAwMSRRlA=";
   };
 
-  build-system = with python3.pkgs; [
-    setuptools
-  ];
+  build-system = with python3.pkgs; [ setuptools ];
 
   dependencies = with python3.pkgs; [
+    aiohttp
     black
     docutils
     sphinx
@@ -29,14 +28,12 @@ python3.pkgs.buildPythonApplication rec {
   # Project has no unittest just sample files
   doCheck = false;
 
-  pythonImportsCheck = [
-    "rstfmt"
-  ];
+  pythonImportsCheck = [ "rstfmt" ];
 
   meta = {
     description = "Formatter for reStructuredText";
     homepage = "https://github.com/dzhu/rstfmt";
-    changelog = "https://github.com/dzhu/rstfmt/releases/tag/v${version}";
+    changelog = "https://github.com/dzhu/rstfmt/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "rstfmt";
-- 
cgit v1.2.3


From a1bb0a6e2e36734d1b8e8f8a07c33cf16564024f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 Aug 2025 21:45:04 +0000
Subject: mympd: 22.0.3 -> 22.0.4

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

diff --git a/pkgs/by-name/my/mympd/package.nix b/pkgs/by-name/my/mympd/package.nix
index 76b9aa0356b0..215d93172dde 100644
--- a/pkgs/by-name/my/mympd/package.nix
+++ b/pkgs/by-name/my/mympd/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mympd";
-  version = "22.0.3";
+  version = "22.0.4";
 
   src = fetchFromGitHub {
     owner = "jcorporation";
     repo = "myMPD";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-dQroukc25q81sMIbXsmGjaOT3FoRZwoZ6QkCBZ3plX4=";
+    sha256 = "sha256-sVZj79NUrymwi8L8akqyGGKnm4OAKr3Qf/K5U2iqm5E=";
   };
 
   nativeBuildInputs = [
-- 
cgit v1.2.3


From 6eb15d0d4586eb2dfc46448504d93ae0708587ba Mon Sep 17 00:00:00 2001
From: Haylin Moore <me@haylinmoore.com>
Date: Sat, 9 Aug 2025 13:05:02 -0700
Subject: home-assistant-custom-components.luxer_one: init at
 0-unstable-2023-03-27

---
 .../custom-components/luxer_one/package.nix        | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 pkgs/servers/home-assistant/custom-components/luxer_one/package.nix

diff --git a/pkgs/servers/home-assistant/custom-components/luxer_one/package.nix b/pkgs/servers/home-assistant/custom-components/luxer_one/package.nix
new file mode 100644
index 000000000000..efda15717365
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-components/luxer_one/package.nix
@@ -0,0 +1,26 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildHomeAssistantComponent,
+  ruff,
+}:
+
+buildHomeAssistantComponent rec {
+  owner = "tjhorner";
+  domain = "luxer";
+  version = "0-unstable-2023-03-27";
+
+  src = fetchFromGitHub {
+    owner = "tjhorner";
+    repo = "home-assistant-luxer-one";
+    rev = "f6a810034ab76e6a8635de755c4a1750e86b1674";
+    hash = "sha256-WmsL0NLe2ICqNGbEQ4vg1EzcZgIGi++G9aDyKjnmJMs=";
+  };
+
+  meta = {
+    description = "Home Assistant integration for Luxer One";
+    homepage = "https://github.com/tjhorner/home-assistant-luxer-one";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.haylin ];
+  };
+}
-- 
cgit v1.2.3