From 4a80f62ecbe36ca1de4265d187e85556f479710c Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 9 May 2025 13:10:37 +0200
Subject: [PATCH 01/49] arrow-cpp: ignore one more test

---
 pkgs/by-name/ar/arrow-cpp/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix
index 44c23d06329c..eef9bf284287 100644
--- a/pkgs/by-name/ar/arrow-cpp/package.nix
+++ b/pkgs/by-name/ar/arrow-cpp/package.nix
@@ -281,6 +281,8 @@ stdenv.mkDerivation (finalAttrs: {
         # requires networking
         "arrow-gcsfs-test"
         "arrow-flight-integration-test"
+        # File already exists in database: orc_proto.proto
+        "arrow-orc-adapter-test"
       ];
     in
     ''

From 62fb31ee74ebc169f83dfe6a73bcf3f2cb820cd8 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 9 May 2025 12:35:04 +0200
Subject: [PATCH 02/49] arrow-cpp: update for protobuf 30

fix:
arrow-cpp> /nix/store/wcv8n2k53w8sbffpf716gxj6mjb5jf26-binutils-2.44/bin/ld: release/libarrow.so.1900.1.0: undefined reference to `google::protobuf::internal::fixed_address_empty_string'
arrow-cpp> collect2: error: ld returned 1 exit status
---
 pkgs/by-name/ar/arrow-cpp/package.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix
index eef9bf284287..3ab226007d48 100644
--- a/pkgs/by-name/ar/arrow-cpp/package.nix
+++ b/pkgs/by-name/ar/arrow-cpp/package.nix
@@ -36,7 +36,7 @@
   openssl,
   perl,
   pkg-config,
-  protobuf_29,
+  protobuf,
   python3,
   rapidjson,
   re2,
@@ -61,9 +61,6 @@
 }:
 
 let
-  # https://github.com/apache/arrow/issues/45807
-  protobuf = protobuf_29;
-
   arrow-testing = fetchFromGitHub {
     name = "arrow-testing";
     owner = "apache";

From 93e26688f170c65813929728b5e7748a1dd21a19 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 9 May 2025 12:10:14 +0200
Subject: [PATCH 03/49] arrow-cpp: enable Apache ORC

---
 pkgs/by-name/ar/arrow-cpp/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix
index 3ab226007d48..4ae15af60d36 100644
--- a/pkgs/by-name/ar/arrow-cpp/package.nix
+++ b/pkgs/by-name/ar/arrow-cpp/package.nix
@@ -4,6 +4,7 @@
   fetchurl,
   fetchFromGitHub,
   fixDarwinDylibNames,
+  apache-orc,
   autoconf,
   aws-sdk-cpp,
   aws-sdk-cpp-arrow ? aws-sdk-cpp.override {
@@ -133,6 +134,7 @@ stdenv.mkDerivation (finalAttrs: {
   ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
   buildInputs =
     [
+      apache-orc
       boost
       brotli
       bzip2
@@ -170,6 +172,12 @@ stdenv.mkDerivation (finalAttrs: {
       nlohmann_json
     ];
 
+  # apache-orc looks for things in caps
+  env = {
+    LZ4_ROOT = lz4;
+    ZSTD_ROOT = zstd.dev;
+  };
+
   preConfigure = ''
     patchShebangs build-support/
     substituteInPlace "src/arrow/vendored/datetime/tz.cpp" \
@@ -214,6 +222,7 @@ stdenv.mkDerivation (finalAttrs: {
       "-DARROW_FLIGHT_TESTING=${if enableFlight then "ON" else "OFF"}"
       "-DARROW_S3=${if enableS3 then "ON" else "OFF"}"
       "-DARROW_GCS=${if enableGcs then "ON" else "OFF"}"
+      "-DARROW_ORC=ON"
       # Parquet options:
       "-DARROW_PARQUET=ON"
       "-DPARQUET_BUILD_EXECUTABLES=ON"

From 493cbcc714712f050bb97ab0eeb6fe346e4400e6 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 9 May 2025 12:04:54 +0200
Subject: [PATCH 04/49] python3Packages.pyarrow: check orc import

---
 pkgs/development/python-modules/pyarrow/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix
index 9b0cf844422a..15b489bd7b73 100644
--- a/pkgs/development/python-modules/pyarrow/default.nix
+++ b/pkgs/development/python-modules/pyarrow/default.nix
@@ -164,6 +164,7 @@ buildPythonPackage rec {
       "flight"
       "fs"
       "json"
+      "orc"
       "parquet"
     ];
 

From bd6c30c1b0efdb44609301bd357d750bc9e87cf5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 20 May 2025 20:23:49 +0000
Subject: [PATCH 05/49] python3Packages.dep-logic: 0.5.0 -> 0.5.1

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

diff --git a/pkgs/development/python-modules/dep-logic/default.nix b/pkgs/development/python-modules/dep-logic/default.nix
index fbad80861cee..c85fc1b95e29 100644
--- a/pkgs/development/python-modules/dep-logic/default.nix
+++ b/pkgs/development/python-modules/dep-logic/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "dep-logic";
-  version = "0.5.0";
+  version = "0.5.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "pdm-project";
     repo = "dep-logic";
     tag = version;
-    hash = "sha256-30n3ZojY3hFUIRViap88V7HjyRiC6rHvnSHxESfK+o4=";
+    hash = "sha256-W/y5iM9dHnle7y3VzqvW7DSGy8ALvjqt5CN/2z5oEi8=";
   };
 
   nativeBuildInputs = [ pdm-backend ];

From c65ce3613cdd21a3cf421c22060124764a4b2001 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Sat, 24 May 2025 17:05:35 +0300
Subject: [PATCH 06/49] arc-browser: 1.91.2-62278 -> 1.97.0-63507

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

diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix
index 957c24aafd49..4b99df96fc20 100644
--- a/pkgs/by-name/ar/arc-browser/package.nix
+++ b/pkgs/by-name/ar/arc-browser/package.nix
@@ -10,11 +10,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "arc-browser";
-  version = "1.91.2-62278";
+  version = "1.97.0-63507";
 
   src = fetchurl {
     url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg";
-    hash = "sha256-8ry7FomJem6rMv3q6w0LffWl3bDHSdyxlWzDf58oNnc=";
+    hash = "sha256-8HdPyJJT1boiMpflIe6wX4oOTqw4oKm982gm1Ei8h4w=";
   };
 
   nativeBuildInputs = [ undmg ];

From 073e616f6cf398051fc41731c3084e4df27c3bb2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 13:08:56 +0000
Subject: [PATCH 07/49] typos-lsp: 0.1.37 -> 0.1.38

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

diff --git a/pkgs/by-name/ty/typos-lsp/package.nix b/pkgs/by-name/ty/typos-lsp/package.nix
index 3aaf61196e42..013cbbb5d5e7 100644
--- a/pkgs/by-name/ty/typos-lsp/package.nix
+++ b/pkgs/by-name/ty/typos-lsp/package.nix
@@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec {
   pname = "typos-lsp";
   # Please update the corresponding VSCode extension too.
   # See pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
-  version = "0.1.37";
+  version = "0.1.38";
 
   src = fetchFromGitHub {
     owner = "tekumara";
     repo = "typos-lsp";
     tag = "v${version}";
-    hash = "sha256-+G4jOoC8AdCE5tEb7qN8cord/pe8Qsa/U1YpL0fWSeo=";
+    hash = "sha256-WzQh+XGROekMzjnR292REI0S1hhaxSHYNWbtwPHy/tA=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-D3XmCPQYBbr5OwY62xigtYnHATSePZQnkGoUZWqGMR8=";
+  cargoHash = "sha256-TDcf8AyvpgpVUC5Pw2y+N6ZBhnimrpt39appwZAE8T0=";
 
   # fix for compilation on aarch64
   # see https://github.com/NixOS/nixpkgs/issues/145726

From f024e46cb628a3d525adeecfac597a35dfae1f54 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 12:33:47 +0000
Subject: [PATCH 08/49] pipenv: 2025.0.2 -> 2025.0.3

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

diff --git a/pkgs/by-name/pi/pipenv/package.nix b/pkgs/by-name/pi/pipenv/package.nix
index d1ce0561ebea..1e9dceda7935 100644
--- a/pkgs/by-name/pi/pipenv/package.nix
+++ b/pkgs/by-name/pi/pipenv/package.nix
@@ -33,14 +33,14 @@ let
 in
 buildPythonApplication rec {
   pname = "pipenv";
-  version = "2025.0.2";
+  version = "2025.0.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pypa";
     repo = "pipenv";
     tag = "v${version}";
-    hash = "sha256-FCpHrsKUfrv876RRfskUl01jYhmOjZ5D86PjSJnDcV0=";
+    hash = "sha256-3uf0nCTv6ebq4am4mqJpdkidx6dbO8jI4IMtjZQ+8Qc=";
   };
 
   env.LC_ALL = "en_US.UTF-8";

From f15baddeaa6738d700fda2c5b4e20653564f4b93 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 12:40:27 +0000
Subject: [PATCH 09/49] xmrig: 6.22.2 -> 6.22.3

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

diff --git a/pkgs/by-name/xm/xmrig/package.nix b/pkgs/by-name/xm/xmrig/package.nix
index bd8895534285..d7b4335293fd 100644
--- a/pkgs/by-name/xm/xmrig/package.nix
+++ b/pkgs/by-name/xm/xmrig/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xmrig";
-  version = "6.22.2";
+  version = "6.22.3";
 
   src = fetchFromGitHub {
     owner = "xmrig";
     repo = "xmrig";
     rev = "v${version}";
-    hash = "sha256-/1pSGbKBfin7xqoILacKp2//65NNiBXZxzhO39FOOjY=";
+    hash = "sha256-MS1JDYajtLCvc9kVATKmZrFwXNcAbdGSSUseL2S+tiQ=";
   };
 
   patches = [

From 7012a4885252ee27a02d01a9c73d030d08e4d6c6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 13:08:21 +0000
Subject: [PATCH 10/49] restinio: 0.7.6 -> 0.7.7

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

diff --git a/pkgs/by-name/re/restinio/package.nix b/pkgs/by-name/re/restinio/package.nix
index 486fc3c9287c..3b3b61e829ef 100644
--- a/pkgs/by-name/re/restinio/package.nix
+++ b/pkgs/by-name/re/restinio/package.nix
@@ -21,13 +21,13 @@ assert !with_boost_asio -> asio != null;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "restinio";
-  version = "0.7.6";
+  version = "0.7.7";
 
   src = fetchFromGitHub {
     owner = "Stiffstream";
     repo = "restinio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wQIJsybPz5GNcQMECcYhs8nh/h8gWEocS+M+lnP8EOE=";
+    hash = "sha256-bbiBz/WkQc3HiS7+x/qsRdHoravPX8LBKb+a2WeC81s=";
   };
 
   # https://www.github.com/Stiffstream/restinio/issues/230

From 93e3fa7e05482f959e7a6a37f029672f054e713e Mon Sep 17 00:00:00 2001
From: Twingate Build Bot <build-bot@twingate.com>
Date: Wed, 4 Jun 2025 13:09:54 +0000
Subject: [PATCH 11/49] twingate: 2025.114.149850 -> 2025.155.154210

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

diff --git a/pkgs/by-name/tw/twingate/package.nix b/pkgs/by-name/tw/twingate/package.nix
index 60756975e8e4..25fec007ae26 100644
--- a/pkgs/by-name/tw/twingate/package.nix
+++ b/pkgs/by-name/tw/twingate/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation rec {
   pname = "twingate";
-  version = "2025.114.149850";
+  version = "2025.155.154174";
 
   src = fetchurl {
     url = "https://binaries.twingate.com/client/linux/DEB/x86_64/${version}/twingate-amd64.deb";
-    hash = "sha256-rsV05HuGPrY6sNWP8JRaniwaj8Bn2V2Dk7yXX7gibFs=";
+    hash = "sha256-TPXw9PDNZ/0X3yZ51mEBtCi9/NO7T6M66nauoBOn6HQ=";
   };
 
   buildInputs = [

From 862ed7c1a4de0a4a52f3093dc9673d3a48f0b7a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 13:10:46 +0000
Subject: [PATCH 12/49] partclone: 0.3.36 -> 0.3.37

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

diff --git a/pkgs/by-name/pa/partclone/package.nix b/pkgs/by-name/pa/partclone/package.nix
index c01867172d95..014f70123f4b 100644
--- a/pkgs/by-name/pa/partclone/package.nix
+++ b/pkgs/by-name/pa/partclone/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "partclone";
-  version = "0.3.36";
+  version = "0.3.37";
 
   src = fetchFromGitHub {
     owner = "Thomas-Tsai";
     repo = "partclone";
     rev = version;
-    sha256 = "sha256-TZkWDs0KC2Kb7l5QFiHITJqWyq+ryj5mnhNY1wxcUyE=";
+    sha256 = "sha256-VqPCj2DjWux17vgLb13AJd0EAHkqRGdIL0aPxkT3JlY=";
   };
 
   nativeBuildInputs = [

From 6be7baab536590d68d1267d14c9f2021b4a533a8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 14:07:56 +0000
Subject: [PATCH 13/49] python3Packages.types-mock: 5.2.0.20250306 ->
 5.2.0.20250516

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

diff --git a/pkgs/development/python-modules/types-mock/default.nix b/pkgs/development/python-modules/types-mock/default.nix
index 0f9dac90ddd8..441e0a83c540 100644
--- a/pkgs/development/python-modules/types-mock/default.nix
+++ b/pkgs/development/python-modules/types-mock/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-mock";
-  version = "5.2.0.20250306";
+  version = "5.2.0.20250516";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_mock";
     inherit version;
-    hash = "sha256-FYgstc+ZgFh6dgfjGJCAEiOAHXmX9VloaAXOCbZTYIc=";
+    hash = "sha256-qrfT2a04FPL42hLMjkLZvn04IAxfIU48AnjDj6ASmdc=";
   };
 
   build-system = [ setuptools ];

From f6a34109d892c379d03e8ed2474b6b5d5eddd8c2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 14:09:12 +0000
Subject: [PATCH 14/49] hugo: 0.147.5 -> 0.147.7

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

diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix
index a22d5f3f9d4c..7e3baaf717a5 100644
--- a/pkgs/by-name/hu/hugo/package.nix
+++ b/pkgs/by-name/hu/hugo/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "hugo";
-  version = "0.147.5";
+  version = "0.147.7";
 
   src = fetchFromGitHub {
     owner = "gohugoio";
     repo = "hugo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Or1aRiNbCW1h4+PU9XsYD9lMW243+8VjpWXATGADxMo=";
+    hash = "sha256-4TIdxujzlRc3y2yUzrJg2IhzWE4ZuqySRHqlhlHuzpc=";
   };
 
-  vendorHash = "sha256-lnUz3MqQVQqfbNweGLsehrdQuHS1Xa/L7pWKrmB4tNw=";
+  vendorHash = "sha256-ejdBxm0OL3J97SLXtt++Z/1feUlN/yu6vsw+CQt1PX8=";
 
   checkFlags =
     let

From f15f81efb8918ecd9d9ba6cb5530c7be27ddbf8d Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Wed, 4 Jun 2025 22:24:38 +0800
Subject: [PATCH 15/49] c-blosc: partially revert "c-blosc2: add cmake-config
 and propagate buildInputs"

partially revert commit https://github.com/NixOS/nixpkgs/commit/bb3d46c9943623f078d3fcd46a336b3c5d9346c0.
c-blosc does not provide a *cmake.config module and should not propagate lz4, zlib, zstd.
---
 pkgs/development/libraries/c-blosc/1.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/c-blosc/1.nix b/pkgs/development/libraries/c-blosc/1.nix
index 6349063e3dd9..169f27b0f937 100644
--- a/pkgs/development/libraries/c-blosc/1.nix
+++ b/pkgs/development/libraries/c-blosc/1.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
 
-  propagatedBuildInputs = [
+  buildInputs = [
     lz4
     zlib
     zstd
@@ -54,19 +54,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = !static;
 
-  passthru.tests = {
-    pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-    cmake-config = testers.hasCmakeConfigModules {
-      moduleNames = [ "Blosc2" ];
-      package = finalAttrs.finalPackage;
-    };
-  };
+  passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
 
   meta = with lib; {
     description = "Blocking, shuffling and loss-less compression library";
     homepage = "https://www.blosc.org";
     changelog = "https://github.com/Blosc/c-blosc/releases/tag/v${finalAttrs.version}";
-    pkgConfigModules = [ "blosc2" ];
+    pkgConfigModules = [ "blosc" ];
     license = licenses.bsd3;
     platforms = platforms.all;
     maintainers = with maintainers; [ ris ];

From 13fb53529fd1dd445772f493bcf7a889a3a61b95 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 4 Jun 2025 17:20:02 +0200
Subject: [PATCH 16/49] bugstalker: 0.3.0 -> 0.3.1

Diff: https://github.com/godzie44/BugStalker/compare/v0.3.0...v0.3.1
---
 pkgs/by-name/bu/bugstalker/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bu/bugstalker/package.nix b/pkgs/by-name/bu/bugstalker/package.nix
index 86135b2abd44..1f3667ab6cd3 100644
--- a/pkgs/by-name/bu/bugstalker/package.nix
+++ b/pkgs/by-name/bu/bugstalker/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "bugstalker";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "godzie44";
     repo = "BugStalker";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-8Iqg2coFsPQY3ws5MEC1LhTu+Z1lXeI3ccjgoBS454o=";
+    hash = "sha256-c3NyYDz+Ha5jHTpXLw9xsY+h0NjW9Uvpyn2PStmahKA=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-a5YI6bOo/rsi9hZO1BcVMjJtdrYq2aHqxtlO3F+P+8s=";
+  cargoHash = "sha256-/FSV/avsg7kbgtinmKBb0+gemLFZdSE+A+tfLvtfNas=";
 
   buildInputs = [ libunwind ];
 

From a4778902695dc35a66b173b73608b55d7b4044b0 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Wed, 4 Jun 2025 09:03:20 -0700
Subject: [PATCH 17/49] python3Packages.firebase-admin: disable flaky tests for
 all platforms

Tests that were marked as flaky on darwin fail on other platforms in Hydra. Disabled for all.
---
 .../python-modules/firebase-admin/default.nix | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/firebase-admin/default.nix b/pkgs/development/python-modules/firebase-admin/default.nix
index 4d87e969cec1..d2d91cfe4bfe 100644
--- a/pkgs/development/python-modules/firebase-admin/default.nix
+++ b/pkgs/development/python-modules/firebase-admin/default.nix
@@ -50,18 +50,16 @@ buildPythonPackage rec {
 
   __darwinAllowLocalNetworking = true;
 
-  disabledTests =
-    [
-      # Flaky (AssertionError)
-      # >       assert delta <= timedelta(seconds=15)
-      # E       assert datetime.timedelta(seconds=17, microseconds=28239) <= datetime.timedelta(seconds=15)
-      "test_task_options"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Flaky / timing sensitive
-      "test_expired_cookie_with_tolerance"
-      "test_expired_token_with_tolerance"
-    ];
+  disabledTests = [
+    # Flaky (AssertionError)
+    # >       assert delta <= timedelta(seconds=15)
+    # E       assert datetime.timedelta(seconds=17, microseconds=28239) <= datetime.timedelta(seconds=15)
+    "test_task_options"
+
+    # Flaky / timing sensitive
+    "test_expired_cookie_with_tolerance"
+    "test_expired_token_with_tolerance"
+  ];
 
   meta = {
     description = "Firebase Admin Python SDK";

From 2ab69f487dd7a9f0edf97e0a90a23495062c6342 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Wed, 4 Jun 2025 09:17:00 -0700
Subject: [PATCH 18/49] python3Packages.google-cloud-spanner: disable flaky
 test

`test_retry_helper` is retrying too quickly on fast machines.
---
 .../development/python-modules/google-cloud-spanner/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix
index a580a84ded06..4cd1785cbc7b 100644
--- a/pkgs/development/python-modules/google-cloud-spanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix
@@ -94,6 +94,8 @@ buildPythonPackage rec {
     "test_generate_client_hash"
     # Flaky, compares to execution time
     "test_snapshot_read_concurrent"
+    # Flaky, can retry too quickly and fail
+    "test_retry_helper"
   ];
 
   disabledTestPaths = [

From 076a9680992a478de62ec53c15ae2773977ce7be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 4 Jun 2025 18:23:17 +0200
Subject: [PATCH 19/49] dnscontrol: 4.20.0 -> 4.21.0

Diff: https://github.com/StackExchange/dnscontrol/compare/refs/tags/v4.20.0...refs/tags/v4.21.0

Changelog: https://github.com/StackExchange/dnscontrol/releases/tag/v4.21.0
---
 pkgs/by-name/dn/dnscontrol/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/dn/dnscontrol/package.nix b/pkgs/by-name/dn/dnscontrol/package.nix
index b152cb2a70e3..c20f49edb89d 100644
--- a/pkgs/by-name/dn/dnscontrol/package.nix
+++ b/pkgs/by-name/dn/dnscontrol/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "dnscontrol";
-  version = "4.20.0";
+  version = "4.21.0";
 
   src = fetchFromGitHub {
     owner = "StackExchange";
     repo = "dnscontrol";
     tag = "v${version}";
-    hash = "sha256-GiwmSAcExafo5fJcdNsMF8BuvHdUaNoCLpl5y1pautw=";
+    hash = "sha256-M1Ertf/0GBICci8CV/LyfuubsVTvQ1dql7hDKuHGM6k=";
   };
 
-  vendorHash = "sha256-8KSqPDEI5gmxzcgFsaCzeXzYN6tO9Fjq7rnQN/vSThw=";
+  vendorHash = "sha256-BTysXvuE+LOHkUhsV+p8+5VOFcMUidz2i7uo2fdzyXg=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 32b9dc0f982f60958e3250a15b8a15e81f666e14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 4 Jun 2025 09:25:23 -0700
Subject: [PATCH 20/49] python3Packages.aiokem: 0.5.12 -> 1.0.1

Diff: https://github.com/kohlerlibs/aiokem/compare/refs/tags/v0.5.12...refs/tags/v1.0.1

Changelog: https://github.com/kohlerlibs/aiokem/blob/v1.0.1/CHANGELOG.md
---
 pkgs/development/python-modules/aiokem/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiokem/default.nix b/pkgs/development/python-modules/aiokem/default.nix
index 1ff1e3d60909..04b1cf6fd5bb 100644
--- a/pkgs/development/python-modules/aiokem/default.nix
+++ b/pkgs/development/python-modules/aiokem/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aiokem";
-  version = "0.5.12";
+  version = "1.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "kohlerlibs";
     repo = "aiokem";
     tag = "v${version}";
-    hash = "sha256-/NbPKN47aSfM7SllP04fHXV2fr+QQRr1x6NfbpeTfzc=";
+    hash = "sha256-1mhsHoHttMMdMkHJ4awDHQhoMHWLHnNkeC6scEd25Z4=";
   };
 
   build-system = [ setuptools ];

From bd4ae3282774a9414b0aae059410ec09b8a7c62c Mon Sep 17 00:00:00 2001
From: Jost Alemann <jost_alemann@me.com>
Date: Wed, 4 Jun 2025 19:41:44 +0200
Subject: [PATCH 21/49] neohtop: 1.1.2 -> 1.2.0

Changelog: https://github.com/Abdenasser/neohtop/releases/tag/v1.2.0
Diff: https://github.com/Abdenasser/neohtop/compare/v1.1.2...v1.2.0
---
 pkgs/by-name/ne/neohtop/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ne/neohtop/package.nix b/pkgs/by-name/ne/neohtop/package.nix
index 4ed54a841699..68de52fa7d01 100644
--- a/pkgs/by-name/ne/neohtop/package.nix
+++ b/pkgs/by-name/ne/neohtop/package.nix
@@ -17,23 +17,23 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "neohtop";
-  version = "1.1.2";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "Abdenasser";
     repo = "neohtop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5hDxMQlDPXf0llu51Hwb/9n0GX0YSvVJUS+RvEiLsnM=";
+    hash = "sha256-a6yHg3LqnVQJPi4+WpsxHjvWC2hZhZZkAFqgOVmfWfg=";
   };
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
-    hash = "sha256-qhAdKLtTQ2iUFc7UNJNeB1Mzbzg/NrGAWrKQTdGiN4Y=";
+    hash = "sha256-t0REXcsy9XIIARiI7lkOc5lO/ZSL50KOUK+SMsXpjdM=";
   };
 
   useFetchCargoVendor = true;
 
-  cargoHash = "sha256-nYBPvfBzRIJdvfuOZnzs+kuSozlkBB/ImqjDYfvNBrA=";
+  cargoHash = "sha256-nFWF1ER3vk1G/MBw8to+lDJAv6HJNobhdPXV0hVERFE=";
 
   cargoRoot = "src-tauri";
 

From 99b3566b61ef91909bbf2d7c771018bcccff0795 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 18:02:02 +0000
Subject: [PATCH 22/49] repomix: 0.3.6 -> 0.3.8

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

diff --git a/pkgs/by-name/re/repomix/package.nix b/pkgs/by-name/re/repomix/package.nix
index 5d7b83c81d8b..dc760d7e09cc 100644
--- a/pkgs/by-name/re/repomix/package.nix
+++ b/pkgs/by-name/re/repomix/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "repomix";
-  version = "0.3.6";
+  version = "0.3.8";
 
   src = fetchFromGitHub {
     owner = "yamadashy";
     repo = "repomix";
     tag = "v${version}";
-    hash = "sha256-OTbExzeBHqYVvxXMQVAv+WM4Brvg4BZx2iLGRK6YyIk=";
+    hash = "sha256-yvzZQXBJFroSSb4j+ifzM3Qe/iIFVFDCqyfaJTH/65Q=";
   };
 
-  npmDepsHash = "sha256-Q9j5cGEldwb93+ddsLjDF4FW/U6QkT7xiJLp4eA4Uc0=";
+  npmDepsHash = "sha256-VWW9JkLlk3OoMQ7yneTsUdyepe4bDezoM1t2RxF4zVY=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;

From c2cf0107ab6bf19ffae1a4b4072bb1e9f439e07d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 18:46:06 +0000
Subject: [PATCH 23/49] vals: 0.41.1 -> 0.41.2

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

diff --git a/pkgs/by-name/va/vals/package.nix b/pkgs/by-name/va/vals/package.nix
index 67468de32c8d..8718efca779f 100644
--- a/pkgs/by-name/va/vals/package.nix
+++ b/pkgs/by-name/va/vals/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "vals";
-  version = "0.41.1";
+  version = "0.41.2";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "helmfile";
     repo = "vals";
-    sha256 = "sha256-zgIU4J7p7tXFTdwznC4solJD22QlizzJyBkKyCprayA=";
+    sha256 = "sha256-cwyEg+5vysVaW+pe77e+CUJpYLJ6BediJZTaz/eZRAA=";
   };
 
-  vendorHash = "sha256-Kn3X/85+aZXEFSpWZf7DC8l1tM4OjZrbQXd+cFYoxjE=";
+  vendorHash = "sha256-VOKvXovE/aagZOBFtF2o6/RhJMZhoZAHlVNqXD5Y7L4=";
 
   proxyVendor = true;
 

From 934210a0afb3424ba96bfefa11e1826beca8687e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 18:58:19 +0000
Subject: [PATCH 24/49] smtprelay: 1.11.2 -> 1.12.0

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

diff --git a/pkgs/by-name/sm/smtprelay/package.nix b/pkgs/by-name/sm/smtprelay/package.nix
index ecda6b770905..8e26c63cc584 100644
--- a/pkgs/by-name/sm/smtprelay/package.nix
+++ b/pkgs/by-name/sm/smtprelay/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "smtprelay";
-  version = "1.11.2";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "decke";
     repo = "smtprelay";
     tag = "v${version}";
-    hash = "sha256-SwLRodyg6DC9gssmwbdKk426V71bKt3yhj9nqn0X3nU=";
+    hash = "sha256-mlaTZXzbZLdtzDqj8y2e8WjyaNxOPQ1a6YXbPhCxc1c=";
   };
 
-  vendorHash = "sha256-poTToZlC/yNM4tD9PCVUGTMFEtbA7N8xgK/fmJfUMnE=";
+  vendorHash = "sha256-wr53cIkygsM0+R02PjQAtIPrQDu7vploRTsMOrPBt4o=";
 
   subPackages = [
     "."

From 4aae235aaf100bb63c7d3c7619fb7af03a2e3824 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 19:10:19 +0000
Subject: [PATCH 25/49] powerstation: 0.5.0 -> 0.5.1

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

diff --git a/pkgs/by-name/po/powerstation/package.nix b/pkgs/by-name/po/powerstation/package.nix
index 9072bf77669c..5da9d2aac8d4 100644
--- a/pkgs/by-name/po/powerstation/package.nix
+++ b/pkgs/by-name/po/powerstation/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "powerstation";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "ShadowBlip";
     repo = "PowerStation";
     tag = "v${version}";
-    hash = "sha256-m8o2sg0qsn+QyPWiOFDIYgfNb/gT5UO6w6Fjo0sg2u0=";
+    hash = "sha256-SrVtVeG3rcQ0Og3Vm0S1bB8zETpj1oK11KJ288I3J9M=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-/C9BJBKhkBpvxMonbctmdRa697u3SgGQHyzTbP/dt78=";
+  cargoHash = "sha256-GTsYmSrr98ni8DrJ4klGb/Cph8ECc6pmJGv4WPv1Ap8=";
 
   nativeBuildInputs = [
     cmake

From 9b15fe08d7cf02714b2cc8eea543fce3545c8ea0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 19:10:32 +0000
Subject: [PATCH 26/49] pgmoneta: 0.17.0 -> 0.17.1

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

diff --git a/pkgs/by-name/pg/pgmoneta/package.nix b/pkgs/by-name/pg/pgmoneta/package.nix
index 2b278ca155b8..108ae819fbde 100644
--- a/pkgs/by-name/pg/pgmoneta/package.nix
+++ b/pkgs/by-name/pg/pgmoneta/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pgmoneta";
-  version = "0.17.0";
+  version = "0.17.1";
 
   src = fetchFromGitHub {
     owner = "pgmoneta";
     repo = "pgmoneta";
     rev = version;
-    hash = "sha256-UMsINV0Atl1bWN4v9XfuwDkxNJCye8R8V8n0EnHf2w0=";
+    hash = "sha256-5yatgiNl9szTnZbn6nKaGKgfnm2bOG4gvXGN5SqtbJI=";
   };
 
   nativeBuildInputs = [

From 4b22b47fea0687bfd60181bfab664a358e87b591 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 19:23:44 +0000
Subject: [PATCH 27/49] nelm: 1.4.1 -> 1.5.0

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

diff --git a/pkgs/by-name/ne/nelm/package.nix b/pkgs/by-name/ne/nelm/package.nix
index b6cb82cf5230..58e034f39dd0 100644
--- a/pkgs/by-name/ne/nelm/package.nix
+++ b/pkgs/by-name/ne/nelm/package.nix
@@ -9,13 +9,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "nelm";
-  version = "1.4.1";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "nelm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4GvxDlSoTtAiia64Fq5hwrKcD21OgZ/mwk0/nll52/8=";
+    hash = "sha256-GywpByQ6GCx47VKFYPaF1fpd6A03sSTjCxSWjWhUzrc=";
   };
 
   vendorHash = "sha256-jzzIvxEJhGPb0bO5S400PGIWCEaOxQcgsybXziY652E=";

From f7464c553046e3b1f22b4fdd8411a2463d581674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 4 Jun 2025 12:35:48 -0700
Subject: [PATCH 28/49] python3Packages.pysmlight: 0.2.5 -> 0.2.6

Diff: https://github.com/smlight-tech/pysmlight/compare/refs/tags/v0.2.5...refs/tags/v0.2.6

Changelog: https://github.com/smlight-tech/pysmlight/releases/tag/v0.2.6
---
 pkgs/development/python-modules/pysmlight/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pysmlight/default.nix b/pkgs/development/python-modules/pysmlight/default.nix
index 64a6ed10946c..475c21daeac0 100644
--- a/pkgs/development/python-modules/pysmlight/default.nix
+++ b/pkgs/development/python-modules/pysmlight/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "pysmlight";
-  version = "0.2.5";
+  version = "0.2.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "smlight-tech";
     repo = "pysmlight";
     tag = "v${version}";
-    hash = "sha256-ylfOro/GqgXDAPdtwbAWOMBO207zp5T26HRnDYrIw34=";
+    hash = "sha256-mK9bWRo5l2t2E/TP7POj04z45zD/XZbNOkFXGvD23k8=";
   };
 
   build-system = [ poetry-core ];

From 591327c05d0d2d93ea609d11e7ad24f6051ea781 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 19:37:21 +0000
Subject: [PATCH 29/49] kubectl-ai: 0.0.9 -> 0.0.11

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

diff --git a/pkgs/by-name/ku/kubectl-ai/package.nix b/pkgs/by-name/ku/kubectl-ai/package.nix
index 0545b0caa33d..94296e998872 100644
--- a/pkgs/by-name/ku/kubectl-ai/package.nix
+++ b/pkgs/by-name/ku/kubectl-ai/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubectl-ai";
-  version = "0.0.9";
+  version = "0.0.11";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "kubectl-ai";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-zsqHRXUyRguDbY3yPCWJ9KLzF6VR/y7juzI9uaVPSAE=";
+    hash = "sha256-ui8DpqsgJlNh3q+hq4Y7XG7yO/ZPtlffd5s4lf1zU1k=";
   };
 
-  vendorHash = "sha256-VpTAq9rXDPBOdaZIXm7h4AP1YFOk7HzLiUxYaCOP/w8=";
+  vendorHash = "sha256-gufDSIDmC8jtLgY+mg13pc5njGWxAk0osZpOh7RBsHA=";
 
   # Build the main command
   subPackages = [ "cmd" ];

From ec003ba04416c67215deaff74d77537565f95636 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 4 Jun 2025 22:53:20 +0200
Subject: [PATCH 30/49] python3Packages.cvxpy: 1.6.5 -> 1.6.6

Diff: https://github.com/cvxpy/cvxpy/compare/refs/tags/v1.6.5...refs/tags/v1.6.6

Changelog: https://github.com/cvxpy/cvxpy/releases/tag/v1.6.6
---
 pkgs/development/python-modules/cvxpy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix
index f6670d52ffe6..c5b779eb01d0 100644
--- a/pkgs/development/python-modules/cvxpy/default.nix
+++ b/pkgs/development/python-modules/cvxpy/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "cvxpy";
-  version = "1.6.5";
+  version = "1.6.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cvxpy";
     repo = "cvxpy";
     tag = "v${version}";
-    hash = "sha256-utTd/13RQ3WKWreCKFMqGwPUFbPw3TaKKbS4T1BGGP4=";
+    hash = "sha256-xbynw/9jUI41H7tYcARqqw5X+Cr8jDBMwxM6E9thpp0=";
   };
 
   # we need to patch out numpy version caps from upstream

From b3144dd06198790e7b16ea426216127dc6184f41 Mon Sep 17 00:00:00 2001
From: s0me1newithhand7s <litvinovb0@gmail.com>
Date: Thu, 5 Jun 2025 00:11:42 +0300
Subject: [PATCH 31/49] cpc: init at 3.0.0

---
 pkgs/by-name/cp/cpc/package.nix | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 pkgs/by-name/cp/cpc/package.nix

diff --git a/pkgs/by-name/cp/cpc/package.nix b/pkgs/by-name/cp/cpc/package.nix
new file mode 100644
index 000000000000..2c3ab8378cc3
--- /dev/null
+++ b/pkgs/by-name/cp/cpc/package.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "cpc";
+  version = "3.0.0";
+
+  src = fetchFromGitHub {
+    owner = "probablykasper";
+    repo = "cpc";
+    tag = "v${version}";
+    hash = "sha256-DjJIXV5rJxQOiMH8/0yZQBvDh+jbejzADt4WSGyhozI=";
+  };
+
+  cargoHash = "sha256-2k+aFrP/PQmlGr3gIF1queDjuo/+3KtnrOrx1+wrqEg=";
+
+  meta = {
+    mainProgram = "cpc";
+    description = "Text calculator with support for units and conversion";
+    homepage = "https://github.com/probablykasper/cpc";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      s0me1newithhand7s
+    ];
+  };
+}

From e6155d1fb49f739ed926976d50c72b00d0632268 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Jun 2025 23:51:32 +0200
Subject: [PATCH 32/49] python312Packages.mypy-boto3-amplify: 1.38.26 ->
 1.38.30

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 84dc690bfa12..5a6178c9a395 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -66,8 +66,8 @@ rec {
       "sha256-NoNqTKRj7/wlqoBwsEW/wgj1cBAHYRXgLVfZvkP5EV0=";
 
   mypy-boto3-amplify =
-    buildMypyBoto3Package "amplify" "1.38.26"
-      "sha256-m+R9I+UnOmamcErUqyzSgmJJB1Z8aM+GiF4m+vKNb1w=";
+    buildMypyBoto3Package "amplify" "1.38.30"
+      "sha256-Ld+K3tUHZzW6xa3xksYRsH9g4+sM9jpQfTh2T9kEyUA=";
 
   mypy-boto3-amplifybackend =
     buildMypyBoto3Package "amplifybackend" "1.38.0"

From b3f4008a6b975d6e0184376d982438fe06e0b307 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Jun 2025 23:51:34 +0200
Subject: [PATCH 33/49] python312Packages.mypy-boto3-apigateway: 1.38.0 ->
 1.38.29

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 5a6178c9a395..63b42706130b 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -78,8 +78,8 @@ rec {
       "sha256-w+elhGa7/tXU8nzaE8FNLbt2f3iBCulaW1kdU2pK0wY=";
 
   mypy-boto3-apigateway =
-    buildMypyBoto3Package "apigateway" "1.38.0"
-      "sha256-KAjxv+ojo7xTGvzeHCdoQAHDXcuEkU5SQPKbmpljl5w=";
+    buildMypyBoto3Package "apigateway" "1.38.29"
+      "sha256-PKdlOC4Li7dIAq2LZql9XRsSCn4Xj1W5kVVNJYZsAdM=";
 
   mypy-boto3-apigatewaymanagementapi =
     buildMypyBoto3Package "apigatewaymanagementapi" "1.38.0"

From 5350e14d55ffcf3e0671e61b92174c61b71d0355 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Jun 2025 23:51:36 +0200
Subject: [PATCH 34/49] python312Packages.mypy-boto3-apigatewayv2: 1.38.0 ->
 1.38.29

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 63b42706130b..8e94120a8179 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -86,8 +86,8 @@ rec {
       "sha256-Bn9zu0z1JgU6vUp5rJzcD4H6OenB+3QIYnA/EnjxEzI=";
 
   mypy-boto3-apigatewayv2 =
-    buildMypyBoto3Package "apigatewayv2" "1.38.0"
-      "sha256-ol6Gj+NsSOK3hInNvwLTDfWIpfD6tuSVyH52c6UhSNI=";
+    buildMypyBoto3Package "apigatewayv2" "1.38.29"
+      "sha256-UMLg/PboAE4RCyiYXWzZXXu8f5cmUVO1TaN8Uci8HAA=";
 
   mypy-boto3-appconfig =
     buildMypyBoto3Package "appconfig" "1.38.7"

From 7fa057aa7ca7a025e1184b27ae84e9ce63a48d44 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Jun 2025 23:52:05 +0200
Subject: [PATCH 35/49] python312Packages.mypy-boto3-emr-serverless: 1.38.27 ->
 1.38.29

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 8e94120a8179..26dabc4c6175 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -506,8 +506,8 @@ rec {
       "sha256-Lr2cpSBkWl30iIS3fc4qiOWBTbIu5L0MMW5O9Au+COM=";
 
   mypy-boto3-emr-serverless =
-    buildMypyBoto3Package "emr-serverless" "1.38.27"
-      "sha256-+BU0uQBQmQSxGwXalJ9A95Y8RXaFy9L6Lk8Z3D6QwkM=";
+    buildMypyBoto3Package "emr-serverless" "1.38.29"
+      "sha256-xpnGaEw19k0XRjJjYi3APhwZ9uS7WZflWhgCnQDY0cs=";
 
   mypy-boto3-entityresolution =
     buildMypyBoto3Package "entityresolution" "1.38.28"

From 9941c2bfec383956d1d829045849b3c9fd438e7c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Jun 2025 23:52:29 +0200
Subject: [PATCH 36/49] python312Packages.mypy-boto3-mediaconnect: 1.38.0 ->
 1.38.30

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 26dabc4c6175..d73f5b9576d8 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -858,8 +858,8 @@ rec {
       "sha256-umSucGwSnfOwHbi+ywjTKO6Tvqv1buUI7InHy87KH7Y=";
 
   mypy-boto3-mediaconnect =
-    buildMypyBoto3Package "mediaconnect" "1.38.0"
-      "sha256-F6Yv7tgHnzgsekH7HJ8s7/Kpq1JiZkHs+qZEez5snUI=";
+    buildMypyBoto3Package "mediaconnect" "1.38.30"
+      "sha256-2h5gCpyHFR81p48scesRhcETZYJm+R1FWPE/STWsnps=";
 
   mypy-boto3-mediaconvert =
     buildMypyBoto3Package "mediaconvert" "1.38.16"

From 25b105da383e9be7c0c06800814e535e13ec77db Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Jun 2025 23:52:30 +0200
Subject: [PATCH 37/49] python312Packages.mypy-boto3-mediaconvert: 1.38.16 ->
 1.38.30

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index d73f5b9576d8..341ee076a23a 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -862,8 +862,8 @@ rec {
       "sha256-2h5gCpyHFR81p48scesRhcETZYJm+R1FWPE/STWsnps=";
 
   mypy-boto3-mediaconvert =
-    buildMypyBoto3Package "mediaconvert" "1.38.16"
-      "sha256-13hTO6ZkJl+6IuEjJFl4Yy0McVURcRxfeefzgPnrULs=";
+    buildMypyBoto3Package "mediaconvert" "1.38.30"
+      "sha256-npwBRNcqJRzYlXCkgPQRmf2gKenfS2nNuc5FPBxMVeM=";
 
   mypy-boto3-medialive =
     buildMypyBoto3Package "medialive" "1.38.14"

From 47389c0bcc36d635f652836fd2c31dc52403c5ce Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Jun 2025 23:52:36 +0200
Subject: [PATCH 38/49] python312Packages.mypy-boto3-network-firewall: 1.38.25
 -> 1.38.30

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 341ee076a23a..aad786281972 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -950,8 +950,8 @@ rec {
       "sha256-U0fMJNyZpqwYlMuqTBSZCgAtls7IuyKnjWBAJ+6rTV8=";
 
   mypy-boto3-network-firewall =
-    buildMypyBoto3Package "network-firewall" "1.38.25"
-      "sha256-R2uEXo+0gtP1b76aKT9VWCKM0Uy3PulOO2T9WH2V8dM=";
+    buildMypyBoto3Package "network-firewall" "1.38.30"
+      "sha256-0LNUmv+qHecNzVPHyv8fG5DzGva89wSj0D4f4+0F7QI=";
 
   mypy-boto3-networkmanager =
     buildMypyBoto3Package "networkmanager" "1.38.0"

From 6aaf4bb2ac8ee3777a76db96622b4e1f09911e3d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Jun 2025 23:52:51 +0200
Subject: [PATCH 39/49] python312Packages.mypy-boto3-sagemaker: 1.38.27 ->
 1.38.30

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index aad786281972..4ce707c3e819 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1174,8 +1174,8 @@ rec {
       "sha256-lBWZesgIKYnjSjUOPBhF4GNsNSk09YDSEyX0qweT3iM=";
 
   mypy-boto3-sagemaker =
-    buildMypyBoto3Package "sagemaker" "1.38.27"
-      "sha256-uzh49125b/AmTSUP5MtNqeahVwFpUZn7KclG2kgiCJE=";
+    buildMypyBoto3Package "sagemaker" "1.38.30"
+      "sha256-HXwk6q4GB4h9j9MxMMgXXf61Q7rTbyBhdsl8zoJOmIc=";
 
   mypy-boto3-sagemaker-a2i-runtime =
     buildMypyBoto3Package "sagemaker-a2i-runtime" "1.38.0"

From 2bfe9af6c91e544d2602481b26461014ffb7aff5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Jun 2025 23:53:04 +0200
Subject: [PATCH 40/49] python312Packages.mypy-boto3-transcribe: 1.38.0 ->
 1.38.30

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 4ce707c3e819..55130de6c032 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1366,8 +1366,8 @@ rec {
       "sha256-X+cq+zQQnUm/8iusKqzkKzVUSFDvQYToiEwRb4rwSGc=";
 
   mypy-boto3-transcribe =
-    buildMypyBoto3Package "transcribe" "1.38.0"
-      "sha256-yfJCkmK3H/QJ0xApdUGfabwjgrHgu8r0mzKNDOsEDqk=";
+    buildMypyBoto3Package "transcribe" "1.38.30"
+      "sha256-stpcFDzkwOjnOHaeOjOSfZg4AQI3VhH/TFD3VsVZDL8=";
 
   mypy-boto3-transfer =
     buildMypyBoto3Package "transfer" "1.38.0"

From 380e689bcb15919504fad726f633ff3be5e6460a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Jun 2025 23:53:12 +0200
Subject: [PATCH 41/49] python313Packages.botocore-stubs: 1.38.28 -> 1.38.30

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

diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index 8538f3d24f3c..fc1920df72ba 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.38.28";
+  version = "1.38.30";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-uVSQULgQUb27kZZjI9aitsXHjKjcwyjhbfxEt2W+Ob4=";
+    hash = "sha256-KR1785oxbACopVtyVUibAsDOoaNDSC53hOjR4jW66ZU=";
   };
 
   nativeBuildInputs = [ setuptools ];

From e248093e1af3b5c02e9e30593d5b143402add0b9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Jun 2025 23:53:15 +0200
Subject: [PATCH 42/49] python313Packages.boto3-stubs: 1.38.28 -> 1.38.30

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

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index 1e1fe1867c43..816e6516e1fd 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -359,7 +359,7 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.38.28";
+  version = "1.38.30";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-+ujgCepNgQt35J2IJHGDtdjRU78mjr3otKvfWKcBgC8=";
+    hash = "sha256-dSwG+AEjONb1mSiArcRn41ljisLIusmiFE3dA/Scyds=";
   };
 
   build-system = [ setuptools ];

From e2cb8c6cd519bd6fa95ac876306d8f4c730b9042 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Jun 2025 23:54:55 +0200
Subject: [PATCH 43/49] python313Packages.holidays: 0.73 -> 0.74

Diff: https://github.com/vacanza/python-holidays/compare/refs/tags/v0.73...refs/tags/v0.74

Changelog: https://github.com/vacanza/python-holidays/releases/tag/v0.74
---
 pkgs/development/python-modules/holidays/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix
index 049904b5f5a9..c1ffa46c7724 100644
--- a/pkgs/development/python-modules/holidays/default.nix
+++ b/pkgs/development/python-modules/holidays/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "holidays";
-  version = "0.73";
+  version = "0.74";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "vacanza";
     repo = "python-holidays";
     tag = "v${version}";
-    hash = "sha256-ErSu47rJ2ehUl4AuYn/yE0N0yNYGlk95IHH7dixUqDI=";
+    hash = "sha256-lc8yNZ7ZFBjIPiIlT7uCvHX81uMstTGv0Rsbx8RUGh0=";
   };
 
   build-system = [

From cb46c25408a848e2762364fd26745e7412663b3f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Jun 2025 23:55:51 +0200
Subject: [PATCH 44/49] python313Packages.publicsuffixlist: 1.0.2.20250529 ->
 1.0.2.20250603

Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20250603-gha/CHANGES.md
---
 pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index fcf7ba5ddab0..db8b08db1f00 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20250529";
+  version = "1.0.2.20250603";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-0hK9gd9nW5WVCDbc7BqvBi0Xn5Vysn0wS08UwNpyY3s=";
+    hash = "sha256-yilOA8vKLb7Q1KTAM7+iO5HIkphALi+BL64RdXIpcX4=";
   };
 
   build-system = [ setuptools ];

From c7c6a3a73ea54f8e5f7eb04618f5acea1cb34870 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 16:46:48 +0000
Subject: [PATCH 45/49] plexRaw: 1.41.7.9799-5bce000f7 -> 1.41.7.9823-59f304c16

---
 pkgs/servers/plex/raw.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index 0b055e24a467..63bdf06ecfb0 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -14,7 +14,7 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.41.7.9799-5bce000f7";
+  version = "1.41.7.9823-59f304c16";
   pname = "plexmediaserver";
 
   # Fetch the source
@@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
     if stdenv.hostPlatform.system == "aarch64-linux" then
       fetchurl {
         url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
-        sha256 = "0pzyzgp6w04zrc8wxdkna939wmb7f64wklqlar0bb6g0270hx40v";
+        sha256 = "1gnrb3kc9l7rvbs1yb1640f4csvwdp0kpabhgbq7ql55yk1rcfg8";
       }
     else
       fetchurl {
         url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
-        sha256 = "1p26cgzds3h229npp839fll5wdvz29z580xh34mws2ayq25lk796";
+        sha256 = "1r73w7bgpv5nabi8w5fh8np8ghny308s574izmr1damcczz5d0z2";
       };
 
   outputs = [

From 1d717d180a3df6ca463c171f48ded69dd37b6074 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Jun 2025 00:03:55 +0200
Subject: [PATCH 46/49] python313Packages.seedir: 0.5.0 -> 0.5.1

Diff: https://github.com/earnestt1234/seedir/compare/refs/tags/v0.5.0...refs/tags/v0.5.1

Changelog: https://github.com/earnestt1234/seedir/releases/tag/v0.5.1
---
 pkgs/development/python-modules/seedir/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/seedir/default.nix b/pkgs/development/python-modules/seedir/default.nix
index 5a2891df8e07..ea29422911f8 100644
--- a/pkgs/development/python-modules/seedir/default.nix
+++ b/pkgs/development/python-modules/seedir/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "seedir";
-  version = "0.5.0";
+  version = "0.5.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "earnestt1234";
     repo = "seedir";
     tag = "v${version}";
-    hash = "sha256-ilL2KKN5sJclVcStO/kZoacsPoMgcFW1/8M/PQjxw/U=";
+    hash = "sha256-o2CUK00WdoYyLqbDlh+wa30Q23ZkWZC+RvGDCSiCwH4=";
   };
 
   build-system = [ setuptools ];

From c912c0f3210d6ded130b4c698483fd2fb9242450 Mon Sep 17 00:00:00 2001
From: Ilan Joselevich <personal@ilanjoselevich.com>
Date: Wed, 4 Jun 2025 20:53:28 +0300
Subject: [PATCH 47/49] home-assistant-custom-lovelace-modules.custom-sidebar:
 init at 10.2.0

---
 .../custom-sidebar/package.nix                | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix
new file mode 100644
index 000000000000..f9ff95311ea7
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  pnpm,
+  nodejs,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "custom-sidebar";
+  version = "10.2.0";
+
+  src = fetchFromGitHub {
+    owner = "elchininet";
+    repo = "custom-sidebar";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-KJ22IAHMIDTyDvm0mPCYymXNEEEUr2Mx+jZTp6wjkko=";
+  };
+
+  pnpmDeps = pnpm.fetchDeps {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-V0lu91aLMIjcFsDfqXJldQGfJVALErrl49qMnR2hplw=";
+  };
+
+  nativeBuildInputs = [
+    pnpm.configHook
+    nodejs
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    pnpm run build
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out"
+    cp dist/* "$out"
+
+    runHook postInstall
+  '';
+
+  passthru.entrypoint = "custom-sidebar-yaml.js";
+
+  meta = with lib; {
+    description = "Custom plugin that allows you to personalise the Home Assistant's sidebar per user or device basis";
+    homepage = "https://elchininet.github.io/custom-sidebar";
+    downloadPage = "https://github.com/elchininet/custom-sidebar";
+    changelog = "https://github.com/elchininet/custom-sidebar/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    maintainers = with maintainers; [ kranzes ];
+  };
+})

From 30e3aac86abd9bd37b38e094f240c75a4c0114ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 22:52:42 +0000
Subject: [PATCH 48/49] ts_query_ls: 3.1.0 -> 3.2.0

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

diff --git a/pkgs/by-name/ts/ts_query_ls/package.nix b/pkgs/by-name/ts/ts_query_ls/package.nix
index af79a75f46f4..ef8b5b4dca83 100644
--- a/pkgs/by-name/ts/ts_query_ls/package.nix
+++ b/pkgs/by-name/ts/ts_query_ls/package.nix
@@ -6,7 +6,7 @@
 }:
 let
   pname = "ts_query_ls";
-  version = "3.1.0";
+  version = "3.2.0";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -15,13 +15,13 @@ rustPlatform.buildRustPackage {
     owner = "ribru17";
     repo = "ts_query_ls";
     rev = "v${version}";
-    hash = "sha256-gnJqSxK8iT48cvgLsJXgQrk2Wo7XQkK0oRirsmfgdAo=";
+    hash = "sha256-sr9uSjSbX/Af/g8OSrSMQXCpObxTblZw7qe5OTfqXvA=";
   };
 
   nativeBuildInputs = [ cmake ];
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-67/bvQ5jMsYdSe0gSTdbxRsG91Sxd8PMaitByQ6jWyQ=";
+  cargoHash = "sha256-y9AR9qWJXRHcf8vtOvBZxMCUZvC/ty/4jF5mkhdMy9Y=";
 
   meta = {
     description = "LSP implementation for Tree-sitter's query files";

From a0e101bd1bd9f2ca2531861e9a1ebdb200d8be60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 4 Jun 2025 16:02:20 -0700
Subject: [PATCH 49/49] python3Packages.pysmlight: fix tests on Darwin

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

diff --git a/pkgs/development/python-modules/pysmlight/default.nix b/pkgs/development/python-modules/pysmlight/default.nix
index 475c21daeac0..e2c7c3126fd6 100644
--- a/pkgs/development/python-modules/pysmlight/default.nix
+++ b/pkgs/development/python-modules/pysmlight/default.nix
@@ -41,6 +41,8 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     changelog = "https://github.com/smlight-tech/pysmlight/releases/tag/${src.tag}";
     description = "Library implementing API control of the SMLIGHT SLZB-06 LAN Coordinators";