From d7bb93c20b22b94894a6b8b708bf4f84a5293a92 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 6 May 2025 22:09:40 +0000
Subject: [PATCH 01/99] cargo-flamegraph: 0.6.7 -> 0.6.8

(cherry picked from commit dfa3f7706b7a1aa6512437add280669c2ff91c6a)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/development/tools/rust/cargo-flamegraph/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-flamegraph/default.nix b/pkgs/development/tools/rust/cargo-flamegraph/default.nix
index 8a37c1d524db..63c8b27b195e 100644
--- a/pkgs/development/tools/rust/cargo-flamegraph/default.nix
+++ b/pkgs/development/tools/rust/cargo-flamegraph/default.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-flamegraph";
-  version = "0.6.7";
+  version = "0.6.8";
 
   src = fetchFromGitHub {
     owner = "flamegraph-rs";
     repo = "flamegraph";
     rev = "v${version}";
-    sha256 = "sha256-OpneGyulSreUKhmnLfsJ2sEbkDPCcrDjkRu9ccKZcJc=";
+    sha256 = "sha256-JGUABNCZhDyTTrjFCRsT+wkuAeZn9mCHCI6XgGYEl7Y=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-uErlNPkacAmURNKAZp1wLsV2NB1w9HfjLZl5PgeMRu0=";
+  cargoHash = "sha256-FjLjEoorbZC2WZ424w2aFLmd4dIfy5s13sR8BSRVNIo=";
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ];
 

From 180e1c3570dc9b29ad33427126151f17cec2b99e Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 7 May 2025 07:55:13 +0200
Subject: [PATCH 02/99] cargo-flamegraph: Move to by-name

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 .../default.nix => by-name/ca/cargo-flamegraph/package.nix}     | 0
 pkgs/top-level/all-packages.nix                                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/{development/tools/rust/cargo-flamegraph/default.nix => by-name/ca/cargo-flamegraph/package.nix} (100%)

diff --git a/pkgs/development/tools/rust/cargo-flamegraph/default.nix b/pkgs/by-name/ca/cargo-flamegraph/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-flamegraph/default.nix
rename to pkgs/by-name/ca/cargo-flamegraph/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af08305faa5c..5f030b9e908b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6069,7 +6069,7 @@ with pkgs;
     );
   buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { };
 
-  cargo-flamegraph = callPackage ../development/tools/rust/cargo-flamegraph {
+  cargo-flamegraph = callPackage ../by-name/ca/cargo-flamegraph/package.nix {
     inherit (linuxPackages) perf;
   };
 

From 7ae41a1d593d9ef8682936ed0dbb6f31ee5fb8f6 Mon Sep 17 00:00:00 2001
From: Alexander <blue.coral070@slmails.com>
Date: Sun, 4 May 2025 15:42:22 -0500
Subject: [PATCH 03/99] python312Packages.x3dh: init at 1.1.0

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

diff --git a/pkgs/development/python-modules/x3dh/default.nix b/pkgs/development/python-modules/x3dh/default.nix
new file mode 100644
index 000000000000..7dccc3edf2bb
--- /dev/null
+++ b/pkgs/development/python-modules/x3dh/default.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  xeddsa,
+  cryptography,
+  pydantic,
+  typing-extensions,
+  pytestCheckHook,
+  pytest-asyncio,
+}:
+buildPythonPackage rec {
+  pname = "x3dh";
+  version = "1.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Syndace";
+    repo = "python-x3dh";
+    tag = "v${version}";
+    hash = "sha256-/hC1Kze4yBOlgbWJcGddcYty9fqwZ08Lyi0IiqSDibI=";
+  };
+
+  strictDeps = true;
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    xeddsa
+    cryptography
+    pydantic
+    typing-extensions
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-asyncio
+  ];
+
+  pythonImportsCheck = [ "x3dh" ];
+
+  meta = {
+    description = "Python Implementation of the Extended Triple Diffie-Hellman key Agreement Protocol";
+    homepage = "https://github.com/Syndace/python-x3dh";
+    changelog = "https://github.com/Syndace/python-x3dh/blob/v${version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    teams = with lib.teams; [ ngi ];
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cbe1e52e24ae..da8ef8d30614 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19106,6 +19106,8 @@ self: super: with self; {
 
   x256 = callPackage ../development/python-modules/x256 { };
 
+  x3dh = callPackage ../development/python-modules/x3dh { };
+
   x690 = callPackage ../development/python-modules/x690 { };
 
   xapian = callPackage ../development/python-modules/xapian { inherit (pkgs) xapian; };

From 001ed1d783c5569b5786a132d36953daae74e39d Mon Sep 17 00:00:00 2001
From: themadbit <marktanui75@gmail.com>
Date: Tue, 29 Apr 2025 13:04:25 +0300
Subject: [PATCH 04/99] maintainers: add themadbit

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c5bdd834fd57..9b869d1b7b6b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -24350,6 +24350,12 @@
     github = "thelissimus";
     githubId = 70096720;
   };
+  themadbit = {
+    name = "Mark Tanui";
+    email = "marktanui75@gmail.com";
+    github = "themadbit";
+    githubId = 84702057;
+  };
   themaxmur = {
     name = "Maxim Muravev";
     email = "muravjev.mak@yandex.ru";

From b242ada52054b8f98dccd08c86823f68708048d1 Mon Sep 17 00:00:00 2001
From: themadbit <marktanui75@gmail.com>
Date: Fri, 9 May 2025 11:17:10 +0300
Subject: [PATCH 05/99] holo-cli: init at 0.5.0

---
 pkgs/by-name/ho/holo-cli/package.nix | 47 ++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 pkgs/by-name/ho/holo-cli/package.nix

diff --git a/pkgs/by-name/ho/holo-cli/package.nix b/pkgs/by-name/ho/holo-cli/package.nix
new file mode 100644
index 000000000000..6816036a48f1
--- /dev/null
+++ b/pkgs/by-name/ho/holo-cli/package.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  protobuf,
+  pcre2,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "holo-cli";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "holo-routing";
+    repo = "holo-cli";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-f34M3U7pitWuH1UQa4uJ/scIOAZiUtDXijOk8wZEm+c=";
+  };
+
+  cargoHash = "sha256-s2em9v4SRQdC0aCD4ZXyhNNYnVKkg9XFzxkOlEFHmL0=";
+  passthru.updateScript = nix-update-script { };
+
+  # Use rust nightly features
+  RUSTC_BOOTSTRAP = 1;
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    protobuf
+  ];
+  buildInputs = [
+    pcre2
+  ];
+
+  meta = {
+    description = "Holo` Command Line Interface";
+    homepage = "https://github.com/holo-routing/holo-cli";
+    teams = with lib.teams; [ ngi ];
+    maintainers = with lib.maintainers; [ themadbit ];
+    license = lib.licenses.mit;
+    mainProgram = "holo-cli";
+    platforms = lib.platforms.all;
+  };
+})

From 60c420a6078e3d82dbf223fd01bb537e865974f0 Mon Sep 17 00:00:00 2001
From: themadbit <marktanui75@gmail.com>
Date: Fri, 9 May 2025 11:54:12 +0300
Subject: [PATCH 06/99] holo-daemon: init at 0.7.0

---
 pkgs/by-name/ho/holo-daemon/package.nix | 61 +++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 pkgs/by-name/ho/holo-daemon/package.nix

diff --git a/pkgs/by-name/ho/holo-daemon/package.nix b/pkgs/by-name/ho/holo-daemon/package.nix
new file mode 100644
index 000000000000..c704a02c5e59
--- /dev/null
+++ b/pkgs/by-name/ho/holo-daemon/package.nix
@@ -0,0 +1,61 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  protobuf,
+  pcre2,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "holo-daemon";
+  version = "0.7.0";
+
+  src = fetchFromGitHub {
+    owner = "holo-routing";
+    repo = "holo";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-wASY+binAflxaXjKdSfUXS8jgdEHjdIF3AOzjN/a1Fo=";
+  };
+
+  passthru.updateScript = nix-update-script { };
+
+  cargoHash = "sha256-5X6a86V3Y9+KK0kGbS/ovelqXyLv15gQRFI7GhiYBjY=";
+
+  # Use rust nightly features
+  RUSTC_BOOTSTRAP = 1;
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    protobuf
+  ];
+  buildInputs = [
+    pcre2
+  ];
+
+  # Might not be needed if latest nightly compiler version is used
+  preConfigure = ''
+    # Find all lib.rs and main.rs files and add required unstable features
+    # Add the feature flag at the top of the file if not present`
+    find . -name "lib.rs" -o -name "main.rs" | while read -r file; do
+      for feature in extract_if let_chains hash_extract_if; do
+        if ! grep -q "feature.*$feature" "$file"; then
+          sed -i "1i #![feature($feature)]" "$file"
+        fi
+      done
+    done
+  '';
+
+  meta = {
+    description = "`holo` daemon that provides the routing protocols, tools and policies";
+    homepage = "https://github.com/holo-routing/holo";
+    teams = with lib.teams; [ ngi ];
+    maintainers = with lib.maintainers; [ themadbit ];
+    license = lib.licenses.mit;
+    mainProgram = "holod";
+    platforms = lib.platforms.linux;
+  };
+})

From 9cb2d266fbc044da9c0b23a34c02d77f05e0776e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 May 2025 13:16:41 +0000
Subject: [PATCH 07/99] openterface-qt: 0.3.9 -> 0.3.12

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

diff --git a/pkgs/by-name/op/openterface-qt/package.nix b/pkgs/by-name/op/openterface-qt/package.nix
index c353ebce0c3d..543c192aa972 100644
--- a/pkgs/by-name/op/openterface-qt/package.nix
+++ b/pkgs/by-name/op/openterface-qt/package.nix
@@ -22,12 +22,12 @@ let
 in
 stdenv.mkDerivation (final: {
   pname = "openterface-qt";
-  version = "0.3.9";
+  version = "0.3.12";
   src = fetchFromGitHub {
     owner = "TechxArtisanStudio";
     repo = "Openterface_QT";
     rev = "${final.version}";
-    hash = "sha256-hJxouOB4J0E0tm2Vr0OcqSMi4CDpjckPPMd/dWDsu4k=";
+    hash = "sha256-VB2DTfm6X5xY+bGQBq9VXe6boJJTDxBkPEdLvPbd71g=";
   };
   nativeBuildInputs = [
     copyDesktopItems

From 0b9cefaddd15c5b60ca916d7eb8a206de998b217 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 May 2025 13:52:58 +0000
Subject: [PATCH 08/99] libvgm: 0-unstable-2025-04-06 -> 0-unstable-2025-05-03

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

diff --git a/pkgs/by-name/li/libvgm/package.nix b/pkgs/by-name/li/libvgm/package.nix
index e5be42b677f3..33c0241dd862 100644
--- a/pkgs/by-name/li/libvgm/package.nix
+++ b/pkgs/by-name/li/libvgm/package.nix
@@ -38,13 +38,13 @@ assert enableTools -> enableAudio && enableEmulation && enableLibplayer;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libvgm";
-  version = "0-unstable-2025-04-06";
+  version = "0-unstable-2025-05-03";
 
   src = fetchFromGitHub {
     owner = "ValleyBell";
     repo = "libvgm";
-    rev = "0833b26bcda4fce9d870a22f2adb8e0cd525be22";
-    hash = "sha256-7LdC4DA2quLCBBRO71sFubch4AeFyEEeXdXq9A6OK0M=";
+    rev = "47581c5cf51748c8c948cfc1a8473e563529e9bb";
+    hash = "sha256-BJBQ/qAOZ2ykU2+zZ+FaGK2gK0R4Bu3+u3WmJVnjgMw=";
   };
 
   outputs = [

From c2d411b6dac5a1d3503ee4b1ca35e8b4c653763d Mon Sep 17 00:00:00 2001
From: William Vandervalk <git@williamvandervalk.com>
Date: Fri, 9 May 2025 10:24:11 -0400
Subject: [PATCH 09/99] backrest: 1.8.0 -> 1.8.1

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

diff --git a/pkgs/by-name/ba/backrest/package.nix b/pkgs/by-name/ba/backrest/package.nix
index ad0cc70edb98..73472f3d62b0 100644
--- a/pkgs/by-name/ba/backrest/package.nix
+++ b/pkgs/by-name/ba/backrest/package.nix
@@ -11,13 +11,13 @@
 }:
 let
   pname = "backrest";
-  version = "1.8.0";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "garethgeorge";
     repo = "backrest";
     tag = "v${version}";
-    hash = "sha256-p2CKXQeA0rHhS6uP0x2tNsFzHBCOi6sRDlr+o4HeBjk=";
+    hash = "sha256-lpYny+5bXIxj+ZFhbSn200sBrDShISESZw+L5sy+X+Q=";
   };
 
   frontend = stdenv.mkDerivation (finalAttrs: {
@@ -32,7 +32,7 @@ let
 
     pnpmDeps = pnpm_9.fetchDeps {
       inherit (finalAttrs) pname version src;
-      hash = "sha256-rBu+6QwTmQsjHh0yd8QjdHPc3VOmadJQ+NK9X6qbSx8=";
+      hash = "sha256-q7VMQb/FRT953yT2cyGMxUPp8p8XkA9mvqGI7S7Eifg=";
     };
 
     buildPhase = ''
@@ -53,7 +53,7 @@ in
 buildGoModule {
   inherit pname src version;
 
-  vendorHash = "sha256-OVJnJ5fdpa1vpYTCxtvRGbnICbfwZeYiCwAS8c4Tg2Y=";
+  vendorHash = "sha256-AINnBkP+e9C/f/C3t6NK+6PYSVB4NON0C71S6SwUXbE=";
 
   nativeBuildInputs = [ gzip ];
 

From fce30ec63384ce4c3d772911638640f3177d3dba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 May 2025 15:16:16 +0000
Subject: [PATCH 10/99] spire: 1.12.0 -> 1.12.1

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

diff --git a/pkgs/by-name/sp/spire/package.nix b/pkgs/by-name/sp/spire/package.nix
index d4563bebf85f..ee1cd4d2f56d 100644
--- a/pkgs/by-name/sp/spire/package.nix
+++ b/pkgs/by-name/sp/spire/package.nix
@@ -6,7 +6,7 @@
 
 buildGoModule rec {
   pname = "spire";
-  version = "1.12.0";
+  version = "1.12.1";
 
   outputs = [
     "out"
@@ -18,10 +18,10 @@ buildGoModule rec {
     owner = "spiffe";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-hNa1e6h4IhD2SfhZZ5xkwQ7e7X5x3Gk4v33nw2t+cvk=";
+    sha256 = "sha256-SevKI+DH0YI/FHkmozJFY2/iuE8Pl7ZZZFRKQOC1Kxc=";
   };
 
-  vendorHash = "sha256-6qtR9SF6QQKqsVpKpp6YBkB9wOLFwm8C3PF0DlN0Ud0=";
+  vendorHash = "sha256-1ngjcqGwUNMyR/wBCo0MYguD1gGH8rbI2j9BB+tGL9k=";
 
   subPackages = [
     "cmd/spire-agent"

From 326d30375d1905188cfe5803733480b0ef0c688b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 May 2025 16:38:31 +0000
Subject: [PATCH 11/99] python3Packages.txredisapi: 1.4.9 -> 1.4.11

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

diff --git a/pkgs/development/python-modules/txredisapi/default.nix b/pkgs/development/python-modules/txredisapi/default.nix
index 27443da459bb..a3c64f64ee83 100644
--- a/pkgs/development/python-modules/txredisapi/default.nix
+++ b/pkgs/development/python-modules/txredisapi/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "txredisapi";
-  version = "1.4.9";
+  version = "1.4.11";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "IlyaSkriblovsky";
     repo = "txredisapi";
     tag = version;
-    hash = "sha256-6Z2vurTAw9YHxvEiixtdxBH0YHj+Y9aTdsSkafPMZus=";
+    hash = "sha256-gPXkpUcHAuXx/olB/nKstRrfIUFFLf4gFyv7ReRvV2E=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 6216ebfd91b077997c53bd5405009cb5eb8d9265 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Fri, 9 May 2025 10:46:22 -0700
Subject: [PATCH 12/99] signalbackup-tools: 20250507 -> 20250509-1

Diff: https://github.com/bepaald/signalbackup-tools/compare/20250507...20250509-1
---
 pkgs/by-name/si/signalbackup-tools/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix
index b926ec87adf5..dd0854220160 100644
--- a/pkgs/by-name/si/signalbackup-tools/package.nix
+++ b/pkgs/by-name/si/signalbackup-tools/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "signalbackup-tools";
-  version = "20250507";
+  version = "20250509-1";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     rev = version;
-    hash = "sha256-i7hL+HrCd2XUdWiySvg3JJhyrfviUeIiyWH8I0pIobA=";
+    hash = "sha256-nblaom9eB29STgNxO8oVWYDZC5yoLci99GAps8a0tzM=";
   };
 
   nativeBuildInputs =

From 41e060f51ba0d67bddb754d9bb61b82e2b835065 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 May 2025 18:00:34 +0000
Subject: [PATCH 13/99] aspectj: 1.9.22.1 -> 1.9.24

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

diff --git a/pkgs/by-name/as/aspectj/package.nix b/pkgs/by-name/as/aspectj/package.nix
index 55b9cf5af86c..744ade323008 100644
--- a/pkgs/by-name/as/aspectj/package.nix
+++ b/pkgs/by-name/as/aspectj/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "1.9.22.1";
+  version = "1.9.24";
   versionSnakeCase = builtins.replaceStrings [ "." ] [ "_" ] version;
 in
 stdenvNoCC.mkDerivation {
@@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/eclipse/org.aspectj/releases/download/V${versionSnakeCase}/aspectj-${version}.jar";
-    hash = "sha256-NIyYVhJIGXz+vNVoAQzYsDfmOYc4QrRzJGWeQjS4X0U=";
+    hash = "sha256-p+UOtuP8hNymfvmL/SPg99YrhU7m5GDudtLISqL5TWQ=";
   };
 
   dontUnpack = true;

From 06c59626fd214328d56258ffb62921c3141325d1 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Fri, 9 May 2025 19:41:34 +0200
Subject: [PATCH 14/99] emacsPackages.copilot: Switch to
 copilot-language-server to copilot-language-server-fhs

This is because it seems like the normal package doesn't work properly
and the FHS version was introduced, see #393260 and #391748.

This also has been reported as an issue upstream:
https://github.com/copilot-emacs/copilot.el/issues/326
---
 .../emacs/elisp-packages/manual-packages/copilot/package.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
index 4d53cecada38..dd3a6ce44680 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
@@ -8,7 +8,7 @@
   nodejs,
   s,
   melpaBuild,
-  copilot-language-server,
+  copilot-language-server-fhs,
 }:
 melpaBuild (finalAttrs: {
   pname = "copilot";
@@ -26,7 +26,7 @@ melpaBuild (finalAttrs: {
   postPatch = ''
     substituteInPlace copilot.el \
       --replace-fail "defcustom copilot-server-executable \"copilot-language-server\"" \
-                     "defcustom copilot-server-executable \"${lib.getExe copilot-language-server}\""
+                     "defcustom copilot-server-executable \"${lib.getExe copilot-language-server-fhs}\""
   '';
 
   packageRequires = [

From c7c732aee9dab348095097ba0e7f7009d7a3e1c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 May 2025 18:38:56 +0000
Subject: [PATCH 15/99] aws-nuke: 3.51.1 -> 3.52.1

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

diff --git a/pkgs/by-name/aw/aws-nuke/package.nix b/pkgs/by-name/aw/aws-nuke/package.nix
index a5f362c1b094..4e7d2640ce39 100644
--- a/pkgs/by-name/aw/aws-nuke/package.nix
+++ b/pkgs/by-name/aw/aws-nuke/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "aws-nuke";
-  version = "3.51.1";
+  version = "3.52.1";
 
   src = fetchFromGitHub {
     owner = "ekristen";
     repo = "aws-nuke";
     tag = "v${version}";
-    hash = "sha256-sInF2z9m5BQALE7a1/72HhLfvfdY2mIcMSurhz/jmpg=";
+    hash = "sha256-yTGAW9q511dI55Zbz729D1nOddvNdrjptRZN21ngodU=";
   };
 
-  vendorHash = "sha256-DK7nR5P/Y/aSpG+AORYHmVypeVNfRqWE7X8J40lVyjY=";
+  vendorHash = "sha256-6BIPF4bBEBnMHLjnH1rSCrh+cbwWjcpBKxHeQcTbEPk=";
 
   overrideModAttrs = _: {
     preBuild = ''

From da80007af52136c6624bc165390dd33fbbdf7d6f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 May 2025 19:13:53 +0000
Subject: [PATCH 16/99] oksh: 7.6 -> 7.7

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

diff --git a/pkgs/by-name/ok/oksh/package.nix b/pkgs/by-name/ok/oksh/package.nix
index 68c1ba57f3b3..780b83c1f43a 100644
--- a/pkgs/by-name/ok/oksh/package.nix
+++ b/pkgs/by-name/ok/oksh/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "oksh";
-  version = "7.6";
+  version = "7.7";
 
   src = fetchFromGitHub {
     owner = "ibara";
     repo = "oksh";
     rev = "oksh-${version}";
-    hash = "sha256-iEV0ibEXwJioBaKN2Tuy0+SaVs8q0Ac4bImP8zhI7oI=";
+    hash = "sha256-Go73MvL9Mi/Rz1KzrKM7KP9UkI9GQFTduMPSUxEbl70=";
   };
 
   strictDeps = true;

From bbd0bec7c47b2dd4e6ec064ed4643f08815814c9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 May 2025 20:19:06 +0000
Subject: [PATCH 17/99] htgettoken: 2.2 -> 2.2-2

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

diff --git a/pkgs/by-name/ht/htgettoken/package.nix b/pkgs/by-name/ht/htgettoken/package.nix
index 75b67969093a..b40ad82713d6 100644
--- a/pkgs/by-name/ht/htgettoken/package.nix
+++ b/pkgs/by-name/ht/htgettoken/package.nix
@@ -7,13 +7,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "htgettoken";
-  version = "2.2";
+  version = "2.2-2";
 
   src = fetchFromGitHub {
     owner = "fermitools";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-O0OHnYaoTkqUqD4s+wEAzN3Paq9qsjBZdZ0QUXdFefE=";
+    hash = "sha256-BHDLDAbssDCU59nUAVjKo1cCkXoht1lB+2BA6mGbDFU=";
   };
 
   nativeBuildInputs = with python3.pkgs; [

From a351ec71222fdef1915a4c79664cf3a813d702f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 May 2025 21:51:10 +0000
Subject: [PATCH 18/99] kargo: 1.4.3 -> 1.4.4

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

diff --git a/pkgs/by-name/ka/kargo/package.nix b/pkgs/by-name/ka/kargo/package.nix
index 398c38e263e6..a4dd129d1f57 100644
--- a/pkgs/by-name/ka/kargo/package.nix
+++ b/pkgs/by-name/ka/kargo/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "kargo";
-  version = "1.4.3";
+  version = "1.4.4";
 
   src = fetchFromGitHub {
     owner = "akuity";
     repo = "kargo";
     tag = "v${version}";
-    hash = "sha256-qrMvEVKOUsRjIfnY/u7o56oPxCWXZbj+XU6c8/7fugQ=";
+    hash = "sha256-dWrszpDPAVVsTDiPiqZhtGniZSaGeA7LzFyHUuuESiY=";
   };
 
   vendorHash = "sha256-1J/9AXKU6jLZh6B5jWCoQeStborTOGjxFkZ1Vk2Yw+8=";

From be241077587c073163b29d75d824b5a83f47d5d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 May 2025 21:54:49 +0000
Subject: [PATCH 19/99] chezmoi: 2.62.2 -> 2.62.3

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

diff --git a/pkgs/by-name/ch/chezmoi/package.nix b/pkgs/by-name/ch/chezmoi/package.nix
index 6b5a6b510034..852c3f9a268c 100644
--- a/pkgs/by-name/ch/chezmoi/package.nix
+++ b/pkgs/by-name/ch/chezmoi/package.nix
@@ -8,16 +8,16 @@
 let
   argset = {
     pname = "chezmoi";
-    version = "2.62.2";
+    version = "2.62.3";
 
     src = fetchFromGitHub {
       owner = "twpayne";
       repo = "chezmoi";
       rev = "v${argset.version}";
-      hash = "sha256-Bma7w/Nhpht02eOVyVJDJq+JDUXR7svD8TdMZhuNw10=";
+      hash = "sha256-xcVfiQYPh1AHmRKbWFcsApzGLnasIQqg65CpUfRZFr4=";
     };
 
-    vendorHash = "sha256-L089chsoaEDo2+ahTKs9w0Np3S2fWVtt9jWRJmBrP3w=";
+    vendorHash = "sha256-21jrXFJkE3Iiq4URY7DZxci32IxKx25i90iGXpfq6aw=";
 
     nativeBuildInputs = [
       installShellFiles

From 1a13182fb9872f2e5e593bcd253222c962ecf8f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 May 2025 23:54:05 +0000
Subject: [PATCH 20/99] rops: 0.1.4 -> 0.1.5

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

diff --git a/pkgs/by-name/ro/rops/package.nix b/pkgs/by-name/ro/rops/package.nix
index 1e3e599ababf..c9329526804f 100644
--- a/pkgs/by-name/ro/rops/package.nix
+++ b/pkgs/by-name/ro/rops/package.nix
@@ -7,17 +7,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rops";
-  version = "0.1.4";
+  version = "0.1.5";
 
   src = fetchFromGitHub {
     owner = "gibbz00";
     repo = "rops";
     tag = version;
-    hash = "sha256-532rV7ISNy8vbqq8yW9FdIqj5Ei/HJKZoEocM7Vwvg8=";
+    hash = "sha256-wwZ/4yOB4pE6lZgX8ytCC3plMYt6kxOakQoLy8SWN+k=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-HVYMC6NgkK5FPFetvxRUOHZ/Pn2uMYlF1VQJQXpNh9g=";
+  cargoHash = "sha256-sKPVdvMoQ2nV29rjau/6YpO1zpAQOuZhouPCvDf2goc=";
 
   # will true when tests is fixed from source.
   doCheck = false;

From abd19d01b4250fa7a59fcd285e8c6b895204499b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 00:17:51 +0000
Subject: [PATCH 21/99] terraform-providers.baiducloud: 1.21.12 -> 1.21.13

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 2bc1c10d3f01..9191797df306 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -153,11 +153,11 @@
     "vendorHash": null
   },
   "baiducloud": {
-    "hash": "sha256-YcQq0FK76XjF80yOjOMhDp+aRoFOewXObVksDAzQSh8=",
+    "hash": "sha256-n+vKQ6IE1PV/09OCeYj28o1YKVP0cCDCTYLLq/4PClg=",
     "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
     "owner": "baidubce",
     "repo": "terraform-provider-baiducloud",
-    "rev": "v1.21.12",
+    "rev": "v1.21.13",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 7c0fe96efa2ea7540f0acd50616454cffb293eb2 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sat, 10 May 2025 08:27:05 +0800
Subject: [PATCH 22/99] mycli: 1.29.2 -> 1.31.2

Diff: https://github.com/dbcli/mycli/compare/refs/tags/v1.29.2...refs/tags/v1.31.2
---
 pkgs/by-name/my/mycli/package.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/my/mycli/package.nix b/pkgs/by-name/my/mycli/package.nix
index 3454dfec7dd3..c902ed3eaa64 100644
--- a/pkgs/by-name/my/mycli/package.nix
+++ b/pkgs/by-name/my/mycli/package.nix
@@ -7,17 +7,20 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "mycli";
-  version = "1.29.2";
+  version = "1.31.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dbcli";
     repo = "mycli";
     tag = "v${version}";
-    hash = "sha256-d90HJszhnYDxFkvLmTkt/LZ6XctcBjgKBoMUD3m+Sdw=";
+    hash = "sha256-s5PzWrxG2z0sOyQIyACLkG7dau+MHYLtLNLig6UfuCs=";
   };
 
-  pythonRelaxDeps = [ "sqlparse" ];
+  pythonRelaxDeps = [
+    "sqlparse"
+    "click"
+  ];
 
   build-system = with python3Packages; [
     setuptools

From 4f858c28cb3576f335d40d3f0a07ae38c139cf3a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 02:29:25 +0000
Subject: [PATCH 23/99] python3Packages.botocore-stubs: 1.38.12 -> 1.38.13

---
 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 23814df88032..e5f55369f333 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.12";
+  version = "1.38.13";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-2GVra+ICCPu/1C/e6BuMU3TIrjF6AEbfbBVRQKYGpX4=";
+    hash = "sha256-x2bLqukcE3oc5RYGAfTMIzEuvWCece16Pbz2qJazs1A=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 89ef382dde8ac46d11f992757f56ad2bced82f31 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 02:46:58 +0000
Subject: [PATCH 24/99] heynote: 2.2.1 -> 2.2.2

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

diff --git a/pkgs/by-name/he/heynote/package.nix b/pkgs/by-name/he/heynote/package.nix
index 75062d8752fe..859d175f46f6 100644
--- a/pkgs/by-name/he/heynote/package.nix
+++ b/pkgs/by-name/he/heynote/package.nix
@@ -7,11 +7,11 @@
 }:
 let
   pname = "heynote";
-  version = "2.2.1";
+  version = "2.2.2";
 
   src = fetchurl {
     url = "https://github.com/heyman/heynote/releases/download/v${version}/Heynote_${version}_x86_64.AppImage";
-    sha256 = "sha256-IUy5EAtUk5+e64DC4VXXTgkyrG3mNJiItf1d4DR/fms=";
+    sha256 = "sha256-DFJ7j8eFElbsU7EiIZuH9DdkuBVmmDQ66tkRDYBApCc=";
   };
 
   appimageContents = appimageTools.extractType2 {

From c6bf37aa955ee92c863516160cee2505b2550980 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 02:49:26 +0000
Subject: [PATCH 25/99] terraform-providers.ibm: 1.77.1 -> 1.78.1

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 7030c9b5a6a0..9e88eaaca53b 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -642,13 +642,13 @@
     "vendorHash": null
   },
   "ibm": {
-    "hash": "sha256-3dOwxmWt2EqGkr/wL+qA1HNbloXlJcbvxI8NDnmA+rg=",
+    "hash": "sha256-MMVZnGQ8MWczkbMC9VUoRcplmIk4TdiahZ/ZSYhbQlM=",
     "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
     "owner": "IBM-Cloud",
     "repo": "terraform-provider-ibm",
-    "rev": "v1.77.1",
+    "rev": "v1.78.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-w6M4506BykzV1oLadsq3Tgck5Lvf5V3Y8v+pwhlu80c="
+    "vendorHash": "sha256-8P5GnDXY8n/NhSY0Oo/7CP7U7pH7f0Z0GfiFnicCxdo="
   },
   "icinga2": {
     "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",

From 342aa491c1c28e1f68f32fe8d35465a0499a1a1a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 03:15:18 +0000
Subject: [PATCH 26/99] libmamba: 2.1.0 -> 2.1.1

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

diff --git a/pkgs/by-name/li/libmamba/package.nix b/pkgs/by-name/li/libmamba/package.nix
index c3b8c302b84c..4f8c8cc0c843 100644
--- a/pkgs/by-name/li/libmamba/package.nix
+++ b/pkgs/by-name/li/libmamba/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libmamba";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "mamba-org";
     repo = "mamba";
     tag = finalAttrs.version;
-    hash = "sha256-7YR3ToPz80I9d1pRNiEaoIacVyaz2mqzdm0h5WGSb2g=";
+    hash = "sha256-JBwdfYM7J5R7HZyw5kVXwu4FlZUd2QPrsTaGuXnyAJI=";
   };
 
   nativeBuildInputs = [

From 1d61f28f3c067c1552740e7245794a0605358126 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 03:23:12 +0000
Subject: [PATCH 27/99] python3Packages.pcffont: 0.0.19 -> 0.0.20

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

diff --git a/pkgs/development/python-modules/pcffont/default.nix b/pkgs/development/python-modules/pcffont/default.nix
index 9a8a01ad0f92..6b1af865550d 100644
--- a/pkgs/development/python-modules/pcffont/default.nix
+++ b/pkgs/development/python-modules/pcffont/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pcffont";
-  version = "0.0.19";
+  version = "0.0.20";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pcffont";
     inherit version;
-    hash = "sha256-ci4E+e4jzHgfSpLPYhh6di1NUwlsPlq5ajzq61vQKwc=";
+    hash = "sha256-dkf0irrrlSoj8TH+C/kmkVPJORWGl0EbgvckfPBes7I=";
   };
 
   build-system = [ hatchling ];

From 87818d16977702e00f71d637247d7a2809606e20 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 04:03:41 +0000
Subject: [PATCH 28/99] lefthook: 1.11.11 -> 1.11.12

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

diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix
index cb8a21b8649e..0b07054ce7cb 100644
--- a/pkgs/by-name/le/lefthook/package.nix
+++ b/pkgs/by-name/le/lefthook/package.nix
@@ -7,7 +7,7 @@
 
 let
   pname = "lefthook";
-  version = "1.11.11";
+  version = "1.11.12";
 in
 buildGoModule {
   inherit pname version;
@@ -16,7 +16,7 @@ buildGoModule {
     owner = "evilmartians";
     repo = "lefthook";
     rev = "v${version}";
-    hash = "sha256-uaCGIsCfuGKxr5b9Oo68ruQNuOSXjLUri9IzIFXfNDs=";
+    hash = "sha256-jb2pNdsuk45lC/wHjXIkHe2/CefxvE8VQzx8aW8CPhg=";
   };
 
   vendorHash = "sha256-DMB7OQkkY3FUPVirRKfGsvH2fl4+g9kJ2FS930WaKvY=";

From 232317f62188eb34fdaae11a061b96d6e3dd14e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 04:48:10 +0000
Subject: [PATCH 29/99] ergo: 5.0.25 -> 5.0.26

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

diff --git a/pkgs/by-name/er/ergo/package.nix b/pkgs/by-name/er/ergo/package.nix
index b9d8f66439b8..c575777d2ac1 100644
--- a/pkgs/by-name/er/ergo/package.nix
+++ b/pkgs/by-name/er/ergo/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ergo";
-  version = "5.0.25";
+  version = "5.0.26";
 
   src = fetchurl {
     url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
-    sha256 = "sha256-4Eoo1f9oLxYdFC1M46Bq1D9RbIeOoWh0qECzcBbv3KA=";
+    sha256 = "sha256-WVrImdtn6UPWMpd6ltUbJGyqnLPud7JuFPuU4lHS8AE=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From a33d0a7d7d9530f69712258a08db62e4cde02ec0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 04:55:03 +0000
Subject: [PATCH 30/99] cargo-tarpaulin: 0.32.3 -> 0.32.5

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

diff --git a/pkgs/by-name/ca/cargo-tarpaulin/package.nix b/pkgs/by-name/ca/cargo-tarpaulin/package.nix
index b2b1e69d1baa..3d08cbd550f1 100644
--- a/pkgs/by-name/ca/cargo-tarpaulin/package.nix
+++ b/pkgs/by-name/ca/cargo-tarpaulin/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-tarpaulin";
-  version = "0.32.3";
+  version = "0.32.5";
 
   src = fetchFromGitHub {
     owner = "xd009642";
     repo = "tarpaulin";
     rev = version;
-    hash = "sha256-sKb+e2aROl1IBUUR0LB8aHxQfEOkbqz9WYqUWVNj8W8=";
+    hash = "sha256-68WDe0Fp0QJ6WCVJFeMniJTpGSzfxLGLM/a/CZxVxrA=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-dPWdBNrY57tLV/YTcnM7SAQs6mfRynZZelNao1tNj2c=";
+  cargoHash = "sha256-Uf+l4LqPoG8FKvZD0lYGC2hz7gLZYJf6HAUe0SQiT9s=";
 
   nativeBuildInputs = [
     pkg-config

From d34a475606f2b8e66d1e39d133dc25555f7602f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 05:11:42 +0000
Subject: [PATCH 31/99] squeezelite: 2.0.0.1524 -> 2.0.0.1533

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

diff --git a/pkgs/by-name/sq/squeezelite/package.nix b/pkgs/by-name/sq/squeezelite/package.nix
index 8980661212e7..426e054b4752 100644
--- a/pkgs/by-name/sq/squeezelite/package.nix
+++ b/pkgs/by-name/sq/squeezelite/package.nix
@@ -39,13 +39,13 @@ stdenv.mkDerivation {
   pname = binName;
   # versions are specified in `squeezelite.h`
   # see https://github.com/ralph-irving/squeezelite/issues/29
-  version = "2.0.0.1524";
+  version = "2.0.0.1533";
 
   src = fetchFromGitHub {
     owner = "ralph-irving";
     repo = "squeezelite";
-    rev = "db51a7b16934f41b72437394bf8114c3a85e0a91";
-    hash = "sha256-nPlIvyxhka4ANk74209RFW0Ok5eSZwKFDQw7AJO3qPs=";
+    rev = "bb7ae0615f6e661c217a1c77fdff70122859c3c5";
+    hash = "sha256-R3yCJJMsrD3dkrfkm4q69YkqfjBdZTiB9UXIriyPawA=";
   };
 
   buildInputs =

From 6df03ab2c9e39f06e0069402196ef3c3d097579e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 06:38:00 +0000
Subject: [PATCH 32/99] python3Packages.githubkit: 0.12.11 -> 0.12.12

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

diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix
index 73f8d84fc8d4..b1f8fb1d5aca 100644
--- a/pkgs/development/python-modules/githubkit/default.nix
+++ b/pkgs/development/python-modules/githubkit/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "githubkit";
-  version = "0.12.11";
+  version = "0.12.12";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "yanyongyu";
     repo = "githubkit";
     tag = "v${version}";
-    hash = "sha256-uCOxLr60ePeEdsWpXKhYwzzZaj8mwiQMWwprNm9i1DE=";
+    hash = "sha256-QAEPcSjMJi4BXkc3owM+fRlplOa+IlKdYYzf08iqLOQ=";
   };
 
   pythonRelaxDeps = [ "hishel" ];

From 719dc8e88109d5866ad985ad7c326790914282b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 06:39:22 +0000
Subject: [PATCH 33/99] heptabase: 1.55.7 -> 1.56.1

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

diff --git a/pkgs/by-name/he/heptabase/package.nix b/pkgs/by-name/he/heptabase/package.nix
index a77eb2fb44d2..758119ba8839 100644
--- a/pkgs/by-name/he/heptabase/package.nix
+++ b/pkgs/by-name/he/heptabase/package.nix
@@ -5,10 +5,10 @@
 }:
 let
   pname = "heptabase";
-  version = "1.55.7";
+  version = "1.56.1";
   src = fetchurl {
     url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage";
-    hash = "sha256-hWNzJZ/oxcPZPozv3EfANcWP5/TfboePcvvBiP1qy7g=";
+    hash = "sha256-OPLE0OhTZfDVPODd/vCfpqpqBGGBQlzONcfDgkVhEic=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit pname version src; };

From 954d69f159b8e229b32988a75ebba05a2469a5c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 07:33:27 +0000
Subject: [PATCH 34/99] mpvpaper: 1.7 -> 1.8

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

diff --git a/pkgs/by-name/mp/mpvpaper/package.nix b/pkgs/by-name/mp/mpvpaper/package.nix
index 91d6d33634bd..69e25ab380e9 100644
--- a/pkgs/by-name/mp/mpvpaper/package.nix
+++ b/pkgs/by-name/mp/mpvpaper/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mpvpaper";
-  version = "1.7";
+  version = "1.8";
 
   src = fetchFromGitHub {
     owner = "GhostNaN";
     repo = pname;
     rev = version;
-    sha256 = "sha256-uBitJM2Z5RFH4nfgdJ6ZbqkcMumu+K+3f6S49G7nEx8=";
+    sha256 = "sha256-JTlZSl8CZmWx7YTd0T58pwq10L1GKXNfAw0XlIsz7F8=";
   };
 
   strictDeps = true;

From 6f435490e99999c333017672425db7980d36c1ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 08:02:54 +0000
Subject: [PATCH 35/99] spacectl: 1.11.0 -> 1.13.0

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

diff --git a/pkgs/by-name/sp/spacectl/package.nix b/pkgs/by-name/sp/spacectl/package.nix
index 5be2be78aa8b..570f7da08da7 100644
--- a/pkgs/by-name/sp/spacectl/package.nix
+++ b/pkgs/by-name/sp/spacectl/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "spacectl";
-  version = "1.11.0";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "spacelift-io";
     repo = "spacectl";
     rev = "v${version}";
-    hash = "sha256-3s64o4rmkbvT9rOdqYZN1No08Lh1S4oNlIal+otfhWU=";
+    hash = "sha256-UNucwxFafGiMimbOeYVbz1+udW8faJ+Y8/QDW7HRFtc=";
   };
 
-  vendorHash = "sha256-TvniuTdw7zRS/x5aPaWtdaEdET4tHbH5gokSiWiaqDo=";
+  vendorHash = "sha256-L0Dm9LymnXLMj6Yv+K4x85VsH+QKfSnVsOPLXHZ/Knc=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From c7aa36ba34e3c11b4340cd297396afe34f45b574 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 09:07:47 +0000
Subject: [PATCH 36/99] terraform-providers.okta: 4.17.0 -> 4.18.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 7030c9b5a6a0..5e8b46c10bdc 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -922,11 +922,11 @@
     "vendorHash": null
   },
   "okta": {
-    "hash": "sha256-1/GKJWRy+epeEwReieN6aVNP4/oPT3FTkHeHtticL8k=",
+    "hash": "sha256-vsOes4rBULwQ3JX5A7GBKTMvTpjb0CEOWqd6OaO3ujI=",
     "homepage": "https://registry.terraform.io/providers/okta/okta",
     "owner": "okta",
     "repo": "terraform-provider-okta",
-    "rev": "v4.17.0",
+    "rev": "v4.18.0",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-5BkKjne3r3V8T+SkqjfHVEpXXK8sKTYMc23g1EaLoOE="
   },

From 2cfcce262e2f7642ffbd6f0cd96a3b800368ae3e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 09:32:11 +0000
Subject: [PATCH 37/99] kclvm: 0.11.1 -> 0.11.2

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

diff --git a/pkgs/by-name/kc/kclvm/package.nix b/pkgs/by-name/kc/kclvm/package.nix
index 94eb2b4bf18d..dbe6b3bf8d79 100644
--- a/pkgs/by-name/kc/kclvm/package.nix
+++ b/pkgs/by-name/kc/kclvm/package.nix
@@ -9,19 +9,19 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "kclvm";
-  version = "0.11.1";
+  version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "kcl-lang";
     repo = "kcl";
     rev = "v${version}";
-    hash = "sha256-14yFGa8y8w3wbCmx0JOSN0TShXLZZpTdVynEfUKkjuE=";
+    hash = "sha256-6XDLxTpgENhP7F51kicAJB7BNMtX4cONKJApAhqgdno=";
   };
 
   sourceRoot = "${src.name}/kclvm";
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-o7YFyqRWAMjq23mcAqDrcN4infdBgp1KNvviYOLR35s=";
+  cargoHash = "sha256-eJ3Gh2l6T2DxJRQRHamPOr/ILtzsqFB497DdXVJ90RE=";
 
   buildInputs = [ rustc ];
 

From 438c15e6a31c380a0e5646f0e22688809dbefb80 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 10:11:34 +0000
Subject: [PATCH 38/99] testkube: 2.1.147 -> 2.1.150

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

diff --git a/pkgs/by-name/te/testkube/package.nix b/pkgs/by-name/te/testkube/package.nix
index c6798b866c68..38e05bedd5cd 100644
--- a/pkgs/by-name/te/testkube/package.nix
+++ b/pkgs/by-name/te/testkube/package.nix
@@ -5,16 +5,16 @@
 }:
 buildGoModule rec {
   pname = "testkube";
-  version = "2.1.147";
+  version = "2.1.150";
 
   src = fetchFromGitHub {
     owner = "kubeshop";
     repo = "testkube";
     rev = "v${version}";
-    hash = "sha256-0DjpADPB1NwUJfDEX46+l7xMq/oyUwrA31fTiIkPm2I=";
+    hash = "sha256-n+R8HBx8KhSnQHRd0zNBW6nHH82UCjwN+TjX4XJn5B8=";
   };
 
-  vendorHash = "sha256-A/DrmX5lZMlFcBnswetNvW9UfGd5BIh7S31FDAkgqwA=";
+  vendorHash = "sha256-C+8MXX7BAbccahDAVZWmuxHb16LqcCY6/QaIkZ7J0mQ=";
 
   ldflags = [
     "-X main.version=${version}"

From 7f1aeb03175593fbfb5356357a5f580fbf7659dd Mon Sep 17 00:00:00 2001
From: langsjo <roylangsjo@gmail.com>
Date: Sat, 10 May 2025 13:56:53 +0300
Subject: [PATCH 39/99] uucp: patch code for GCC 14 compilation

The original code uses `size_t` for two variables that hold the sizes of
structs, but the function they get passed to requires pointer to
`socklen_t`, which is type `unsigned int *`. As far as I can tell, using
`socklen_t` has been the standard for at least a couple decades. Stricter
GCC 14 rules made this code not compile
---
 pkgs/by-name/uu/uucp/package.nix     |  4 ++++
 pkgs/by-name/uu/uucp/socklen_t.patch | 26 ++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/by-name/uu/uucp/socklen_t.patch

diff --git a/pkgs/by-name/uu/uucp/package.nix b/pkgs/by-name/uu/uucp/package.nix
index f94b84b646d6..c32f40589ad9 100644
--- a/pkgs/by-name/uu/uucp/package.nix
+++ b/pkgs/by-name/uu/uucp/package.nix
@@ -28,6 +28,10 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail '(void) exit (0)' '(void) (0)'
   '';
 
+  patches = [
+    ./socklen_t.patch
+  ];
+
   # Regenerate `configure`; the checked in version was generated in 2002 and
   # contains snippets like `main(){return(0);}` that modern compilers dislike.
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/by-name/uu/uucp/socklen_t.patch b/pkgs/by-name/uu/uucp/socklen_t.patch
new file mode 100644
index 000000000000..3c8f1c0f6fa4
--- /dev/null
+++ b/pkgs/by-name/uu/uucp/socklen_t.patch
@@ -0,0 +1,26 @@
+diff --git a/unix/portnm.c b/unix/portnm.c
+index 9eda4ab..019337c 100644
+--- a/unix/portnm.c
++++ b/unix/portnm.c
+@@ -32,7 +32,7 @@ zsysdep_port_name (ftcp_port)
+ 
+ #if HAVE_TCP
+   {
+-    size_t clen;
++    socklen_t clen;
+     struct sockaddr s;
+ 
+     clen = sizeof (struct sockaddr);
+diff --git a/unix/tcp.c b/unix/tcp.c
+index 1bbcec7..af52cab 100644
+--- a/unix/tcp.c
++++ b/unix/tcp.c
+@@ -395,7 +395,7 @@ ftcp_open (qconn, ibaud, fwait, fuser)
+   while (! FGOT_SIGNAL ())
+     {
+       sockaddr_storage speer;
+-      size_t clen;
++      socklen_t clen;
+       int onew;
+       pid_t ipid;
+ 

From 3abad5dc87aa813727db3cb39ffefd61aaa0a3b0 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 10 May 2025 18:25:13 +0800
Subject: [PATCH 40/99] mate.atril: 1.28.1 -> 1.28.2

https://github.com/mate-desktop/atril/compare/v1.28.1...v1.28.2

Upstream is experiencing problems releasing tarballs, so switch to
fetchFromGitHub for now.
---
 pkgs/desktops/mate/atril/default.nix | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix
index 26f8541abeb2..b868ab49865f 100644
--- a/pkgs/desktops/mate/atril/default.nix
+++ b/pkgs/desktops/mate/atril/default.nix
@@ -1,9 +1,12 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
   pkg-config,
+  autoreconfHook,
+  gtk-doc,
   gettext,
+  yelp-tools,
   caja,
   gtk3,
   glib,
@@ -25,22 +28,29 @@
   enableXps ? true,
   libgxps,
   enableImages ? false,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
 stdenv.mkDerivation rec {
   pname = "atril";
-  version = "1.28.1";
+  version = "1.28.2";
 
-  src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "dMT0KXnz6tUt7yN2dEjQatf3FUIeA8m1CUBLCW3oGT4=";
+  src = fetchFromGitHub {
+    owner = "mate-desktop";
+    repo = "atril";
+    tag = "v${version}";
+    fetchSubmodules = true;
+    hash = "sha256-NnWD3Gcxn8ZZKdHzg6iclLiSwj3sBvF+BwpNtcU+dSY=";
   };
 
   nativeBuildInputs = [
+    autoreconfHook
+    gtk-doc
+    itstool
     pkg-config
     gettext
     wrapGAppsHook3
+    yelp-tools
   ];
 
   buildInputs =
@@ -48,7 +58,6 @@ stdenv.mkDerivation rec {
       caja
       gtk3
       glib
-      itstool
       libarchive
       libsecret
       libxml2
@@ -76,7 +85,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "v";
+    odd-unstable = true;
+  };
 
   meta = with lib; {
     description = "Simple multi-page document viewer for the MATE desktop";

From daf712f5b830a879cbc90f8ceb5beed1dabdb3c5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 13:48:37 +0000
Subject: [PATCH 41/99] git-mit: 5.14.3 -> 5.14.4

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

diff --git a/pkgs/by-name/gi/git-mit/package.nix b/pkgs/by-name/gi/git-mit/package.nix
index 67243bc79901..26cf93af31c2 100644
--- a/pkgs/by-name/gi/git-mit/package.nix
+++ b/pkgs/by-name/gi/git-mit/package.nix
@@ -10,7 +10,7 @@
 }:
 
 let
-  version = "5.14.3";
+  version = "5.14.4";
 in
 rustPlatform.buildRustPackage {
   pname = "git-mit";
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage {
     owner = "PurpleBooth";
     repo = "git-mit";
     rev = "v${version}";
-    hash = "sha256-+7rl4wxVQq4bLBsnLSeJD+1kkRuf7FCi81pXGrNNOPI=";
+    hash = "sha256-8XWwzR9TiSCU6fKbrulKpCDFDEyzQpaT2nrahF8iac8=";
   };
 
   useFetchCargoVendor = true;
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage {
     ./libgit2-update.patch
   ];
 
-  cargoHash = "sha256-uoS6vmHmOVkHS81mrsbbXqP/dAC/FNHAlpTDHSa632k=";
+  cargoHash = "sha256-B2XRdcwcFxMwnDl5ndIw72OEsn6D2Y8rIoeO4tclJkk=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 3bcf95763e23bd75bd6c42a12cdb675640f8b978 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 14:11:12 +0000
Subject: [PATCH 42/99] nushellPlugins.units: 0.1.5 -> 0.1.6

---
 pkgs/shells/nushell/plugins/units.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/nushell/plugins/units.nix b/pkgs/shells/nushell/plugins/units.nix
index 179242bf2a1d..0ec44bbab3fa 100644
--- a/pkgs/shells/nushell/plugins/units.nix
+++ b/pkgs/shells/nushell/plugins/units.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nushell_plugin_units";
-  version = "0.1.5";
+  version = "0.1.6";
 
   src = fetchFromGitHub {
     repo = "nu_plugin_units";
     owner = "JosephTLyons";
     rev = "v${version}";
-    hash = "sha256-Uw8OcfSETRceaoEnJP1B++v0SqGjzaYz1wCMVMe774s=";
+    hash = "sha256-1KyuUaWN+OiGpo8Ohc/8B+nisdb8uT+T3qBu+JbaVYo=";
   };
   useFetchCargoVendor = true;
-  cargoHash = "sha256-3v9jP8nL0JqtC76igsCytkQAVTgWqzHH0KQX3o6bi0c=";
+  cargoHash = "sha256-LYVwFM8znN96LwOwRnauehrucSqHnKNPoMzl2HRczww=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
   cargoBuildFlags = [ "--package nu_plugin_units" ];

From 95279e2752bcab3aec61eeb8d03d75deae40a8b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 14:40:49 +0000
Subject: [PATCH 43/99] python3Packages.concurrent-log-handler: 0.9.25 ->
 0.9.26

---
 .../python-modules/concurrent-log-handler/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/concurrent-log-handler/default.nix b/pkgs/development/python-modules/concurrent-log-handler/default.nix
index 384beaff25db..777a232ce1dd 100644
--- a/pkgs/development/python-modules/concurrent-log-handler/default.nix
+++ b/pkgs/development/python-modules/concurrent-log-handler/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "concurrent-log-handler";
-  version = "0.9.25";
+  version = "0.9.26";
   pyproject = true;
 
   src = fetchPypi {
     pname = "concurrent_log_handler";
     inherit version;
-    hash = "sha256-HixvAhQU4hTT2sZhB4lIJ6PnjbYwGDBKTynlW6VJrCI=";
+    hash = "sha256-jyK/eXJKAVK56X2cLc9OyzOWB8gL8xL2gGYHAkMAa0k=";
   };
 
   build-system = [ hatchling ];

From e3a136368fc28d8f0de72a1bfe119138ca99d23d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 16:01:22 +0000
Subject: [PATCH 44/99] nimlangserver: 1.10.2 -> 1.12.0

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

diff --git a/pkgs/by-name/ni/nimlangserver/package.nix b/pkgs/by-name/ni/nimlangserver/package.nix
index 0f49bc7494ba..c7fc8872c5c7 100644
--- a/pkgs/by-name/ni/nimlangserver/package.nix
+++ b/pkgs/by-name/ni/nimlangserver/package.nix
@@ -6,7 +6,7 @@
 buildNimPackage (
   final: prev: rec {
     pname = "nimlangserver";
-    version = "1.10.2";
+    version = "1.12.0";
 
     # nix build ".#nimlangserver.src"
     # nix run "github:daylinmorgan/nnl" -- result/nimble.lock -o:pkgs/by-name/ni/nimlangserver/lock.json --git,=,bearssl,zlib
@@ -16,7 +16,7 @@ buildNimPackage (
       owner = "nim-lang";
       repo = "langserver";
       rev = "v${version}";
-      hash = "sha256-CbdlDcEkX/pPXEbIsSM6S9INeBCwgjx7NxonjUJAHrk=";
+      hash = "sha256-yf3oiKwsJoQxRPhbEBMJN+TR7j58t6ggjq51DJ3ypGQ=";
     };
 
     doCheck = false;

From c24d45063ddd50b1072ac9cee53d9386cd50ad34 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 17:06:30 +0000
Subject: [PATCH 45/99] jotdown: 0.7.0 -> 0.8.0

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

diff --git a/pkgs/by-name/jo/jotdown/package.nix b/pkgs/by-name/jo/jotdown/package.nix
index 7f9579cf8578..5cb3048f4ca4 100644
--- a/pkgs/by-name/jo/jotdown/package.nix
+++ b/pkgs/by-name/jo/jotdown/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "jotdown";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "hellux";
     repo = "jotdown";
     rev = version;
-    hash = "sha256-1s0J6TF/iDSqKUF4/sgq2irSPENjinftPFZnMgE8Dn8=";
+    hash = "sha256-StlF+KjQ+UrKnZMuexwDhMI0ztFLsbexubx5s8Qtzho=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-SGmlNpauPk2qSIIdP0hfGUplCV9ZvyHhZss8XXuxfHg=";
+  cargoHash = "sha256-UroMKPDh0RbUu6oqjfbRkX6ZlKi5rJRVBu1apcJENyU=";
 
   meta = with lib; {
     description = "Minimal Djot CLI";

From acbb1d9702272dc1bece4a4d55ac04e3b62ca0e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 18:09:28 +0000
Subject: [PATCH 46/99] python3Packages.google-cloud-netapp: 0.3.21 -> 0.3.22

---
 .../python-modules/google-cloud-netapp/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-netapp/default.nix b/pkgs/development/python-modules/google-cloud-netapp/default.nix
index af987c906bd0..572b18ad7983 100644
--- a/pkgs/development/python-modules/google-cloud-netapp/default.nix
+++ b/pkgs/development/python-modules/google-cloud-netapp/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-netapp";
-  version = "0.3.21";
+  version = "0.3.22";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_netapp";
     inherit version;
-    hash = "sha256-H6nkC+D2HSMV/ascQoKa3gJmRH5iuXugDiYM1NFR7tU=";
+    hash = "sha256-umh9DcaAAW8Naa1+TRdLosICAIQ+71VT3cHR2pl78mk=";
   };
 
   build-system = [ setuptools ];

From 1b6414df1ea608785c0310347ead31082f02238d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 18:42:51 +0000
Subject: [PATCH 47/99] python3Packages.uritools: 4.0.3 -> 5.0.0

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

diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix
index 946bb76e4040..101034a62f87 100644
--- a/pkgs/development/python-modules/uritools/default.nix
+++ b/pkgs/development/python-modules/uritools/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "uritools";
-  version = "4.0.3";
+  version = "5.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7gahgqnISUZM6dX6kXU5qsyO3SpJJNG3qr7uyryuO8I=";
+    hash = "sha256-aBgMrRVAYr1bXZ/83UZPjeaTRBSyVGKugHsAuN+TRd4=";
   };
 
   pythonImportsCheck = [ "uritools" ];

From e57773204d152f35051b06c08f9f533cb882a356 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 18:47:43 +0000
Subject: [PATCH 48/99] waveterm: 0.11.2 -> 0.11.3

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

diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix
index 6a6a851d765a..9cdc708575b4 100644
--- a/pkgs/by-name/wa/waveterm/package.nix
+++ b/pkgs/by-name/wa/waveterm/package.nix
@@ -31,7 +31,7 @@
 let
   selectSystem = attrs: attrs.${stdenv.hostPlatform.system};
   pname = "waveterm";
-  version = "0.11.2";
+  version = "0.11.3";
 
   passthru.updateScript = ./update.sh;
 
@@ -62,8 +62,8 @@ let
       fetchurl {
         url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/waveterm-linux-${arch}-${version}.deb";
         hash = selectSystem {
-          x86_64-linux = "sha256-KsE7/L5fRnpAdvcHkZGk3s0qKRDfyO00UtNH0uaCs78=";
-          aarch64-linux = "sha256-l2Uz2y4GQhU0UNtPMumWPPdpMqmZH1i79gg53V3wfA8=";
+          x86_64-linux = "sha256-pcYJHj8Jt5RazHZNAgXuSL6mu0MnUVqM9lmAUVJvGfg=";
+          aarch64-linux = "sha256-HAnlEHhbl15W/ynRWTG7TLtGkC7EPPpJzWQfMK52loA=";
         };
       };
 
@@ -136,8 +136,8 @@ let
       fetchurl {
         url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/Wave-darwin-${arch}-${version}.zip";
         hash = selectSystem {
-          x86_64-darwin = "sha256-SWISlOG/NIrp7leCCSI4yH8k30Ky280yMY+yirLNGfA=";
-          aarch64-darwin = "sha256-9zNYpUP2KizYWUr3+o6lBgGP9S9VwIrfcY9E3L+o3KU=";
+          x86_64-darwin = "sha256-KmH5az2p2dRC1UCXCt7SBVfomj6dDaAtevIai1YIYO0=";
+          aarch64-darwin = "sha256-SdZY5MPi+oP3+ywW3BASMzYr16QiYS3MXyPs9jCqD+Y=";
         };
       };
 

From 57d91c535bc6012545d171fdb69867a54e65a095 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Sat, 10 May 2025 20:49:57 +0200
Subject: [PATCH 49/99] nixos/ssh: add the systemd-ssh-proxy include directive
 to the Host * block

Otherwise, then any Host or Match block in the extraConfig will absorb the include
---
 nixos/modules/programs/ssh.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 0faf14fd4c29..27a56034d86c 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -341,13 +341,13 @@ in
       # Custom options from `extraConfig`, to override generated options
       ${cfg.extraConfig}
 
+      # Generated options from other settings
+      Host *
       ${lib.optionalString cfg.systemd-ssh-proxy.enable ''
         # See systemd-ssh-proxy(1)
         Include ${config.systemd.package}/lib/systemd/ssh_config.d/20-systemd-ssh-proxy.conf
       ''}
 
-      # Generated options from other settings
-      Host *
       GlobalKnownHostsFile ${builtins.concatStringsSep " " knownHostsFiles}
 
       ${lib.optionalString (!config.networking.enableIPv6) "AddressFamily inet"}

From 7c0a31fc19f23ad3cf9cbc1fb4d633687c96bb33 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 10 May 2025 21:50:42 +0200
Subject: [PATCH 50/99] evolution-data-server: drop unused pcre dependency

No occurences in upstream code, no references in git history or the build output.
---
 pkgs/by-name/ev/evolution-data-server/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix
index a12e71bd042d..94a8bea2e331 100644
--- a/pkgs/by-name/ev/evolution-data-server/package.nix
+++ b/pkgs/by-name/ev/evolution-data-server/package.nix
@@ -24,7 +24,6 @@
   wrapGAppsHook3,
   glib-networking,
   gsettings-desktop-schemas,
-  pcre,
   vala,
   cmake,
   ninja,
@@ -102,7 +101,6 @@ stdenv.mkDerivation rec {
       openldap
       glib-networking
       libcanberra-gtk3
-      pcre
       libphonenumber
       libuuid
       boost

From 4d55c3af7629e92588596b9e01b77b2e0c0f329a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 20:10:50 +0000
Subject: [PATCH 51/99] ipv6calc: 4.3.0 -> 4.3.1

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

diff --git a/pkgs/by-name/ip/ipv6calc/package.nix b/pkgs/by-name/ip/ipv6calc/package.nix
index 53059e5567be..5c8a4cb73be0 100644
--- a/pkgs/by-name/ip/ipv6calc/package.nix
+++ b/pkgs/by-name/ip/ipv6calc/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ipv6calc";
-  version = "4.3.0";
+  version = "4.3.1";
 
   src = fetchFromGitHub {
     owner = "pbiering";
     repo = pname;
     rev = version;
-    sha256 = "sha256-ObJn7T7dGp6HjICWHWAbJjgHM08FrJx31AxIMmIexuQ=";
+    sha256 = "sha256-zQ8azAd6q7mY3Jtx58cI2OL/xNZi+aA03y5QWHWjnm4=";
   };
 
   buildInputs = [

From 3162732cf071e934b34348dd6cadf64359222be0 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sat, 10 May 2025 14:23:00 -0700
Subject: [PATCH 52/99] python3Packages.datadog: fixes

1) Build from source 2) disable flaky tests 3) add maintainer
---
 .../python-modules/datadog/default.nix        | 43 ++++++++++++-------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix
index 4232b5307b14..9b0576b5e41c 100644
--- a/pkgs/development/python-modules/datadog/default.nix
+++ b/pkgs/development/python-modules/datadog/default.nix
@@ -1,17 +1,22 @@
 {
   lib,
   buildPythonPackage,
-  click,
-  fetchPypi,
-  freezegun,
+  fetchFromGitHub,
+  pythonAtLeast,
+
+  # build-system
   hatchling,
+
+  # dependencies
+  requests,
+
+  # testing
+  click,
+  freezegun,
   mock,
   pytest-vcr,
   pytestCheckHook,
   python-dateutil,
-  pythonAtLeast,
-  pythonOlder,
-  requests,
   vcrpy,
 }:
 
@@ -20,16 +25,16 @@ buildPythonPackage rec {
   version = "0.51.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-MnlTT4Ma4LSuLYzkLvA4tKs45mfX7W/3Q3mC16DPUlA=";
+  src = fetchFromGitHub {
+    owner = "DataDog";
+    repo = "datadogpy";
+    tag = "v${version}";
+    hash = "sha256-DIuKawqOzth8XYF+M3fYm2kMeo3UbfS34/Qa4Y9V1h8=";
   };
 
-  nativeBuildInputs = [ hatchling ];
+  build-system = [ hatchling ];
 
-  propagatedBuildInputs = [ requests ];
+  dependencies = [ requests ];
 
   __darwinAllowLocalNetworking = true;
 
@@ -54,6 +59,12 @@ buildPythonPackage rec {
       "test_default_settings_set"
       # https://github.com/DataDog/datadogpy/issues/746
       "TestDogshell"
+
+      # Flaky: test execution time aganst magic values
+      "test_distributed"
+      "test_timed"
+      "test_timed_in_ms"
+      "test_timed_start_stop_calls"
     ]
     ++ lib.optionals (pythonAtLeast "3.13") [
       # https://github.com/DataDog/datadogpy/issues/880
@@ -62,11 +73,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "datadog" ];
 
-  meta = with lib; {
+  meta = {
     description = "Datadog Python library";
     homepage = "https://github.com/DataDog/datadogpy";
     changelog = "https://github.com/DataDog/datadogpy/blob/v${version}/CHANGELOG.md";
-    license = licenses.bsd3;
-    maintainers = [ ];
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.sarahec ];
   };
 }

From 72a99658533673107638ccd52ad2bd1f2f4865a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 22:44:50 +0000
Subject: [PATCH 53/99] reddit-tui: 0.3.5 -> 0.3.6

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

diff --git a/pkgs/by-name/re/reddit-tui/package.nix b/pkgs/by-name/re/reddit-tui/package.nix
index afe93bfdd911..fa006713799d 100644
--- a/pkgs/by-name/re/reddit-tui/package.nix
+++ b/pkgs/by-name/re/reddit-tui/package.nix
@@ -7,12 +7,12 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "reddit-tui";
-  version = "0.3.5";
+  version = "0.3.6";
   src = fetchFromGitHub {
     owner = "tonymajestro";
     repo = "reddit-tui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-M6GYfsKKvqVlDzEndaX92Zo5wwqVgrYGUKtbs94Krz4=";
+    hash = "sha256-5S5wEPoVqYxIIEBXlrP5a+0xF66n6FMWkH0iTdIxioo=";
   };
   vendorHash = "sha256-Yqo80adzA9gtSD3qzM+fObzRt3WbcMATQef0g7/z2Dw=";
   doCheck = false;

From 512f819b2c877839281d6a8c80d60f0e10410c22 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 23:11:47 +0000
Subject: [PATCH 54/99] atasm: 1.28 -> 1.29

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

diff --git a/pkgs/by-name/at/atasm/package.nix b/pkgs/by-name/at/atasm/package.nix
index 05afee43d7a7..5021f93eaf2b 100644
--- a/pkgs/by-name/at/atasm/package.nix
+++ b/pkgs/by-name/at/atasm/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "atasm";
-  version = "1.28";
+  version = "1.29";
 
   src = fetchFromGitHub {
     owner = "CycoPH";
     repo = "atasm";
     rev = "V${version}";
-    hash = "sha256-9hDY+DQ2qA6zgVMCfvXW7QErH+eL1TKya4PpQ3vHQLQ=";
+    hash = "sha256-TGSmlNz8kxsHlIhq4ZNDBU8uhpsZGK0oEp2qD4SndE8=";
   };
 
   makefile = "Makefile";

From c7748211b9920cdaf5de7e630de65e88647cd23b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 May 2025 23:16:37 +0000
Subject: [PATCH 55/99] aws-iam-authenticator: 0.7.1 -> 0.7.2

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

diff --git a/pkgs/by-name/aw/aws-iam-authenticator/package.nix b/pkgs/by-name/aw/aws-iam-authenticator/package.nix
index 4e7805019a17..40957f4d229c 100644
--- a/pkgs/by-name/aw/aws-iam-authenticator/package.nix
+++ b/pkgs/by-name/aw/aws-iam-authenticator/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "aws-iam-authenticator";
-  version = "0.7.1";
+  version = "0.7.2";
 
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-IjV07F0PyXhOMz3/FoJLhcX8SSgTvV6dInvFp0GDjS8=";
+    hash = "sha256-ZoK6GYAGNIRNzKAn1m5SaytBwEpufqDBWo2oJB4YA8c=";
   };
 
-  vendorHash = "sha256-dMoX3qfmLKrmof80KTfRiH2VLv0UOOrSofSz73HYpO0=";
+  vendorHash = "sha256-OEiU9m5oQ7zQDp6OAj2L7wk61ul7zSDXyxIVthfkpQg=";
 
   ldflags =
     let

From bbbdf6ec109439c4fc1dc661e3b5516a1e7e697d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 00:22:13 +0000
Subject: [PATCH 56/99] geteduroam-cli: 0.8 -> 0.10

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

diff --git a/pkgs/by-name/ge/geteduroam-cli/package.nix b/pkgs/by-name/ge/geteduroam-cli/package.nix
index f9e6f4dfa4cc..082e254ce61a 100644
--- a/pkgs/by-name/ge/geteduroam-cli/package.nix
+++ b/pkgs/by-name/ge/geteduroam-cli/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "geteduroam-cli";
-  version = "0.8";
+  version = "0.10";
 
   src = fetchFromGitHub {
     owner = "geteduroam";
     repo = "linux-app";
     tag = finalAttrs.version;
-    hash = "sha256-2iAvE38r3iwulBqW+rrbrpNVgQlDhhcVUsjZSOT5P1A=";
+    hash = "sha256-Mtzt6i8vJ5M8T0vrAOxXhawlhCmCMEnDQz0Jo6uV88A=";
   };
 
   vendorHash = "sha256-b06wnqT88J7etNTFJ6nE9Uo0gOQOGvvs0vPNnJr6r4Q=";

From 26e00259851c05729172ba2322b46211a291443c Mon Sep 17 00:00:00 2001
From: cy <cy@cy7.sh>
Date: Sat, 10 May 2025 20:32:03 -0400
Subject: [PATCH 57/99] python3Packages.mobi: depend on standard-imghdr

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

diff --git a/pkgs/development/python-modules/mobi/default.nix b/pkgs/development/python-modules/mobi/default.nix
index 16a17e91fa9c..826b259b119a 100644
--- a/pkgs/development/python-modules/mobi/default.nix
+++ b/pkgs/development/python-modules/mobi/default.nix
@@ -6,6 +6,7 @@
   poetry-core,
   pythonOlder,
   setuptools,
+  standard-imghdr,
 }:
 
 buildPythonPackage rec {
@@ -24,6 +25,8 @@ buildPythonPackage rec {
 
   pythonRelaxDeps = [ "loguru" ];
 
+  dependencies = [ standard-imghdr ];
+
   nativeBuildInputs = [
     poetry-core
     setuptools

From fca960066084d5528308fefd06b81df4230a6950 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 00:34:14 +0000
Subject: [PATCH 58/99] hoppscotch: 25.3.2-0 -> 25.4.2-0

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

diff --git a/pkgs/by-name/ho/hoppscotch/package.nix b/pkgs/by-name/ho/hoppscotch/package.nix
index ce8fcd155d4c..11fed297344e 100644
--- a/pkgs/by-name/ho/hoppscotch/package.nix
+++ b/pkgs/by-name/ho/hoppscotch/package.nix
@@ -8,22 +8,22 @@
 
 let
   pname = "hoppscotch";
-  version = "25.3.2-0";
+  version = "25.4.2-0";
 
   src =
     fetchurl
       {
         aarch64-darwin = {
           url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg";
-          hash = "sha256-l8R6pWu8lJSuji8lITFJFUagvFUFbJ5KKUBJ/1jE9WI=";
+          hash = "sha256-f3Ar5QUm1MJ/kfLRsjxAU1mudpJhU63uxEdu17Y2rmo=";
         };
         x86_64-darwin = {
           url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg";
-          hash = "sha256-6HT2IwdjaMjf+PcN6/keCSIqKAIOsQqocEibA+v5GJc=";
+          hash = "sha256-Q21XD+LWx6b/2e4qUabDpjxaJ7h1yz2T4ZbyIDWAljE=";
         };
         x86_64-linux = {
           url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage";
-          hash = "sha256-TpR0vfOba34C+BMi5Yn1C1M83gPXzRnqi1w0+Jt5GNc=";
+          hash = "sha256-Y+zvpTfsVwvM8clyTeE8bFCJfsOTJkkGOWzzVQtZrYI=";
         };
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

From b655b993cfbee97d9919ba8225d32a9cc05b9b01 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 00:36:34 +0000
Subject: [PATCH 59/99] terraform-providers.ns1: 2.6.3 -> 2.6.4

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 7030c9b5a6a0..dbca0a22d452 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -885,13 +885,13 @@
     "vendorHash": "sha256-U8eA/9og4LIedhPSEN9SyInLQuJSzvm0AeFhzC3oqyQ="
   },
   "ns1": {
-    "hash": "sha256-Ufj6mrxeTVpc9rWJX3hpzoBGNnNxOMMb8TgC39Z1vqo=",
+    "hash": "sha256-fR64hIM14Bc+7xn7lPfsfZnGew7bd1TAkORwwL6NBsw=",
     "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1",
     "owner": "ns1-terraform",
     "repo": "terraform-provider-ns1",
-    "rev": "v2.6.3",
+    "rev": "v2.6.4",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-QmL/LghZgOtdkgy102/76zFD+1lxnxn2d/11WaETIE4="
+    "vendorHash": "sha256-YfbhYhFMdGYQlijaYoAdJFmsjric4Oi4no+sBCq5d6g="
   },
   "null": {
     "hash": "sha256-hPAcFWkeK1vjl1Cg/d7FaZpPhyU3pkU6VBIwxX2gEvA=",

From 2d64111765c4480c66a76fdfc63297af4e67b9d8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 00:46:19 +0000
Subject: [PATCH 60/99] mill: 0.12.10 -> 0.12.11

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

diff --git a/pkgs/by-name/mi/mill/package.nix b/pkgs/by-name/mi/mill/package.nix
index 105a0b306a7d..17a9165ec1aa 100644
--- a/pkgs/by-name/mi/mill/package.nix
+++ b/pkgs/by-name/mi/mill/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mill";
-  version = "0.12.10";
+  version = "0.12.11";
 
   src = fetchurl {
     url = "https://repo1.maven.org/maven2/com/lihaoyi/mill-dist/${finalAttrs.version}/mill-dist-${finalAttrs.version}-assembly.jar";
-    hash = "sha256-TESwISFz4Xf/F4kgnaTQbi/uVrc75bearih8mydPqHM=";
+    hash = "sha256-VnpEvukAaslD+MvsGMOGN8VEFEcmzcaZqk81hO1SrpM=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From f14adb22426480b1fa1ef0afa651c218dca4a2f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 00:46:30 +0000
Subject: [PATCH 61/99] tenv: 4.4.0 -> 4.6.2

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

diff --git a/pkgs/by-name/te/tenv/package.nix b/pkgs/by-name/te/tenv/package.nix
index a02d828d5da1..d1deefc5a25d 100644
--- a/pkgs/by-name/te/tenv/package.nix
+++ b/pkgs/by-name/te/tenv/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "tenv";
-  version = "4.4.0";
+  version = "4.6.2";
 
   src = fetchFromGitHub {
     owner = "tofuutils";
     repo = "tenv";
     tag = "v${version}";
-    hash = "sha256-3SaS1Uk2fzYRz7sd5wKJx0crt7F1Vrmh5ZNgtu9bVDU=";
+    hash = "sha256-oYAl388/PBIL7LxOWUCZLHYfOKkkB/BEaTKpTN8rp5U=";
   };
 
-  vendorHash = "sha256-If6de0brzOiaO81MmKlTF6V4djGxUR4k4XDBJbx7nqE=";
+  vendorHash = "sha256-5aWf5O25cudtIny159t3Mllp2wV0C+JxWe7RDkYOxVM=";
 
   excludedPackages = [ "tools" ];
 

From edb46d7eb53562d9d6e70e651b7f6b21049442d8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 01:10:08 +0000
Subject: [PATCH 62/99] nova-password: 0.5.8 -> 0.5.9

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

diff --git a/pkgs/by-name/no/nova-password/package.nix b/pkgs/by-name/no/nova-password/package.nix
index 83fde0d4362a..ab7e136c73ed 100644
--- a/pkgs/by-name/no/nova-password/package.nix
+++ b/pkgs/by-name/no/nova-password/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "nova-password";
-  version = "0.5.8";
+  version = "0.5.9";
 
   src = fetchFromGitHub {
     owner = "sapcc";
     repo = "nova-password";
     tag = "v${version}";
-    hash = "sha256-+qFbBjjbp1Nazpo21oOytvEPzn6Nmc4Cr8du045Ab/E=";
+    hash = "sha256-+RW+uJ9mLEiNMGYio+FcAJHvga8uzDLmgcylwoUJIho=";
   };
 
-  vendorHash = "sha256-tRBWniPM/IPR/JKi7R46tnx9rgyCb5hOkOR1oy7iVcc=";
+  vendorHash = "sha256-7Hg5s3yZezLVwoUoeF4125QtjeLSCcsjnCD6+zbMz8I=";
 
   meta = {
     description = "Decrypt the admin password generated for the VM in OpenStack";

From ad44eb62a3287ea351d65cee12bc29a1b00e6f89 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 01:16:09 +0000
Subject: [PATCH 63/99] ianny: 2.0.0 -> 2.1.0

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

diff --git a/pkgs/by-name/ia/ianny/package.nix b/pkgs/by-name/ia/ianny/package.nix
index 27d4899ee101..8d14be02987a 100644
--- a/pkgs/by-name/ia/ianny/package.nix
+++ b/pkgs/by-name/ia/ianny/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ianny";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "zefr0x";
     repo = "ianny";
     rev = "v${version}";
-    hash = "sha256-F8Uc2BsQ5f7yaUXXDhLvyyYKUDAuvP9cCR2h3vblr0g=";
+    hash = "sha256-XNXlU9cCXPJhPytnVGHol8Cd5nZOEDDoDM4sm1+I/Qc=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-QqdcOftbVt/yNzmvvy6AI66oTZvTgWHfY3Q/ikWGaLM=";
+  cargoHash = "sha256-7XpM6WWJaHHui85HCZ7SL1G2ICNw453xfZx5kUa/oeg=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ dbus.dev ];

From e6803a5ea4793846b79cd7a7e0a2e90c89533a30 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 01:49:39 +0000
Subject: [PATCH 64/99] prrte: 3.0.9 -> 3.0.10

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

diff --git a/pkgs/by-name/pr/prrte/package.nix b/pkgs/by-name/pr/prrte/package.nix
index 845bf3bb5115..075e86594fb3 100644
--- a/pkgs/by-name/pr/prrte/package.nix
+++ b/pkgs/by-name/pr/prrte/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "prrte";
-  version = "3.0.9";
+  version = "3.0.10";
 
   src = fetchFromGitHub {
     owner = "openpmix";
     repo = "prrte";
     rev = "v${version}";
-    hash = "sha256-wLM+txjngY5gh/+yiaSKrenG6oIzF2dPgMumIGyCsXU=";
+    hash = "sha256-Pnm0t7dJhT0MEYEKBHh6l16V5b/zOSxsd5OWda5SIzI=";
     fetchSubmodules = true;
   };
 

From dba8615383cdf8680dc91dc273c8e9b72b1681b3 Mon Sep 17 00:00:00 2001
From: cy <cy@cy7.sh>
Date: Sat, 10 May 2025 21:31:48 -0400
Subject: [PATCH 65/99] python3Packages.hydrogram: don't use async in tests

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

diff --git a/pkgs/development/python-modules/hydrogram/default.nix b/pkgs/development/python-modules/hydrogram/default.nix
index cb68f754c9d9..d0430d7e06a6 100644
--- a/pkgs/development/python-modules/hydrogram/default.nix
+++ b/pkgs/development/python-modules/hydrogram/default.nix
@@ -3,6 +3,7 @@
   aiosqlite,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
   hatchling,
   pyaes,
   pysocks,
@@ -25,6 +26,15 @@ buildPythonPackage rec {
     hash = "sha256-QpweUDCypTxOOWL08gCUuMgbuE4130iNyxRpUNuSBac=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      name = "fix-async-in-test.patch";
+      excludes = [ ".github/workflows/code-style.yml" ];
+      url = "https://github.com/hydrogram/hydrogram/commit/7431319a1d990aa838012bd566a9746da7df2a6e.patch";
+      hash = "sha256-MPv13cxnNPDD+p9EPjDPFqydGy57oXzLeRxL3lG8JKU=";
+    })
+  ];
+
   build-system = [ hatchling ];
 
   dependencies = [

From 32b868ac6e6e2fad46e3f49f2018d9d9440b3f75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 04:50:17 +0000
Subject: [PATCH 66/99] svn-all-fast-export: 1.0.19 -> 1.0.20

---
 .../version-management/svn-all-fast-export/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/svn-all-fast-export/default.nix b/pkgs/applications/version-management/svn-all-fast-export/default.nix
index 2780a6e3398c..f40d7a3b4d1a 100644
--- a/pkgs/applications/version-management/svn-all-fast-export/default.nix
+++ b/pkgs/applications/version-management/svn-all-fast-export/default.nix
@@ -10,7 +10,7 @@
 }:
 
 let
-  version = "1.0.19";
+  version = "1.0.20";
 in
 stdenv.mkDerivation {
   pname = "svn-all-fast-export";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
     owner = "svn-all-fast-export";
     repo = "svn2git";
     rev = version;
-    sha256 = "sha256-r8tS1fbpSWp9btC2hkCg304G4lftQZ09QXWwC943miU=";
+    sha256 = "sha256-ALZ9wGEM2woELUdCxG1SSzIhOCHERsnrSnCVN2MH9Lo=";
   };
 
   nativeBuildInputs = [

From 241eb70267a52abaf3be1b30a50920a978cbbd37 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 05:03:33 +0000
Subject: [PATCH 67/99] git-codereview: 1.14.0 -> 1.15.0

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

diff --git a/pkgs/by-name/gi/git-codereview/package.nix b/pkgs/by-name/gi/git-codereview/package.nix
index a732301b1f43..8adeea2c21d0 100644
--- a/pkgs/by-name/gi/git-codereview/package.nix
+++ b/pkgs/by-name/gi/git-codereview/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "git-codereview";
-  version = "1.14.0";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "review";
     rev = "v${version}";
-    hash = "sha256-ZKu/roqkTIJWwvgKWrrDN5UL53n7QVsUqpqtXnunwiQ=";
+    hash = "sha256-CMe7xnR/cCjphuSI0/I0zqHehkRFX6DhLFpQNKwFErU=";
   };
 
   vendorHash = null;

From bb50d62e2d1ceafd1f22aa320641592077f88665 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 11 May 2025 07:50:47 +0200
Subject: [PATCH 68/99] sd-switch: 0.5.3 -> 0.5.4

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

diff --git a/pkgs/by-name/sd/sd-switch/package.nix b/pkgs/by-name/sd/sd-switch/package.nix
index 6b22add6d81f..72b7d5bc1555 100644
--- a/pkgs/by-name/sd/sd-switch/package.nix
+++ b/pkgs/by-name/sd/sd-switch/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "0.5.3";
+  version = "0.5.4";
 in
 rustPlatform.buildRustPackage {
   pname = "sd-switch";
@@ -16,11 +16,11 @@ rustPlatform.buildRustPackage {
     owner = "~rycee";
     repo = "sd-switch";
     rev = version;
-    hash = "sha256-9aIu37mmf4ZnmZZrU0GA6z+bHKwtfkA5KnLRLY0c2r8=";
+    hash = "sha256-lP65PrMFhbNoWyObFsJK06Hgv9w83hyI/YiKcL5rXhY=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-2DpaO64EehlgG5zSzqERmenmEqUbhEwFmIQEmCKs4Wg=";
+  cargoHash = "sha256-sWYKJz/wfx0XG150cTOguvhdN3UEn8QE0P0+2lSeVkc=";
 
   passthru = {
     updateScript = nix-update-script { };

From b0414f5b13774767f1f43edcdc2aa1461768b4c9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 06:01:03 +0000
Subject: [PATCH 69/99] pgroll: 0.11.1 -> 0.12.0

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

diff --git a/pkgs/by-name/pg/pgroll/package.nix b/pkgs/by-name/pg/pgroll/package.nix
index f9054bf62240..18f4647e8484 100644
--- a/pkgs/by-name/pg/pgroll/package.nix
+++ b/pkgs/by-name/pg/pgroll/package.nix
@@ -8,18 +8,18 @@
 
 buildGoModule rec {
   pname = "pgroll";
-  version = "0.11.1";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "xataio";
     repo = "pgroll";
     tag = "v${version}";
-    hash = "sha256-3ZA3qLAwwu0sT9R6R26GB/FF6vLxbofO5HUfPSBLcrg=";
+    hash = "sha256-hmFCXVlcqvOXbDkHcsWcdVoxZoMe+Gaji011kCqU0lI=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-tPGqa2Sa1N+WY5iprryil1Yzx0FbbgSp4CcNc9dNWhY=";
+  vendorHash = "sha256-o1ei6KSZUclKqAxkzQgtLnvttzMOK1IWrpbwq7AufO8=";
 
   excludedPackages = [ "dev" ];
 

From 9263c7e26f55942a825cdb51fbf7286ba1d8e421 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 06:09:20 +0000
Subject: [PATCH 70/99] python3Packages.metaflow: 2.15.9 -> 2.15.11

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

diff --git a/pkgs/development/python-modules/metaflow/default.nix b/pkgs/development/python-modules/metaflow/default.nix
index ad4da62cbe0c..7d6d55452d6e 100644
--- a/pkgs/development/python-modules/metaflow/default.nix
+++ b/pkgs/development/python-modules/metaflow/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "metaflow";
-  version = "2.15.9";
+  version = "2.15.11";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Netflix";
     repo = "metaflow";
     tag = version;
-    hash = "sha256-so9bmMD0IgUP9FJCyVZa6rCp1iHhbHfB92KScW/ltQU=";
+    hash = "sha256-hL1+uVjM7VQPz3Lt3QsOdvSTkXLv38zFm6YWQ2j0w0o=";
   };
 
   build-system = [

From cebe337b04db77d8d678c954f4ef6c6c76fce753 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 07:21:21 +0000
Subject: [PATCH 71/99] python3Packages.django-hijack: 3.7.1 -> 3.7.2

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

diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix
index af616c963c3a..55b6bf4244f9 100644
--- a/pkgs/development/python-modules/django-hijack/default.nix
+++ b/pkgs/development/python-modules/django-hijack/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "django-hijack";
-  version = "3.7.1";
+  version = "3.7.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "django-hijack";
     repo = "django-hijack";
     tag = version;
-    hash = "sha256-3P7SCKS+ThBRNfXpN17N1y5vhYYWRL2JGVBOUHRdhK8=";
+    hash = "sha256-JGcVXM/kWsahGNh1llV4NB+/FLAh3hqFRbs3PyYqRnA=";
   };
 
   build-system = [

From 02df051ff0103e401308187c5ca2b0e581755ebd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 07:39:01 +0000
Subject: [PATCH 72/99] python3Packages.slepc4py: 3.23.0 -> 3.23.1

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

diff --git a/pkgs/by-name/sl/slepc/package.nix b/pkgs/by-name/sl/slepc/package.nix
index c45ce6b525d5..f4fc8afd9593 100644
--- a/pkgs/by-name/sl/slepc/package.nix
+++ b/pkgs/by-name/sl/slepc/package.nix
@@ -16,13 +16,13 @@ assert petsc.mpiSupport;
 assert pythonSupport -> petsc.pythonSupport;
 stdenv.mkDerivation (finalAttrs: {
   pname = "slepc";
-  version = "3.23.0";
+  version = "3.23.1";
 
   src = fetchFromGitLab {
     owner = "slepc";
     repo = "slepc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Z9CVZQ/Ezb1S2EkTb9amAPxaN4tiUnKrbvQIc3BnVuU=";
+    hash = "sha256-K38/QH4AG8/SksrRLc+jIs1WO8FKFFTNkuHFbBER/tg=";
   };
 
   postPatch = ''

From 84eb337e6f803436f40c4c59cdb50a4df795c2a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 08:03:45 +0000
Subject: [PATCH 73/99] civo: 1.2.2 -> 1.2.3

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

diff --git a/pkgs/by-name/ci/civo/package.nix b/pkgs/by-name/ci/civo/package.nix
index 3c22e76f3d72..2775c9a504bc 100644
--- a/pkgs/by-name/ci/civo/package.nix
+++ b/pkgs/by-name/ci/civo/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "civo";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "civo";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-+gDdUbVgAaid1Eufd1xpvRyVtIOxcU0ZoSyJy1wlAfI=";
+    hash = "sha256-NREiQA/zAxClwKZDq5SR43/AAT6HqdfR6/ud9Xhe5rM=";
   };
 
-  vendorHash = "sha256-yRhY/+lDZ3dOVj34tD+1YLU178LSgSb9YVBVZfnoVIg=";
+  vendorHash = "sha256-xSvq8ZrkdzRhfD2gPKSJkLnwVQuFuWnSYJ89iUDOpUU=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From c18e321f5391797efb410d064cae4c3a29e53316 Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Sun, 11 May 2025 11:10:43 +0200
Subject: [PATCH 74/99] step-ca: Set mainProgram

Added to avoid lib.getExe showing warnings.
---
 pkgs/by-name/st/step-ca/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/st/step-ca/package.nix b/pkgs/by-name/st/step-ca/package.nix
index d0a241f2606c..6ee922e90865 100644
--- a/pkgs/by-name/st/step-ca/package.nix
+++ b/pkgs/by-name/st/step-ca/package.nix
@@ -63,6 +63,7 @@ buildGoModule rec {
     homepage = "https://smallstep.com/certificates/";
     changelog = "https://github.com/smallstep/certificates/releases/tag/v${version}";
     license = licenses.asl20;
+    mainProgram = "step-ca";
     maintainers = with maintainers; [
       cmcdragonkai
       techknowlogick

From 73161194c7558422837237daafc4f57e3ed816f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 09:40:15 +0000
Subject: [PATCH 75/99] vault-bin: 1.19.2 -> 1.19.3

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

diff --git a/pkgs/by-name/va/vault-bin/package.nix b/pkgs/by-name/va/vault-bin/package.nix
index 89f58628b170..f92e5d2b4908 100644
--- a/pkgs/by-name/va/vault-bin/package.nix
+++ b/pkgs/by-name/va/vault-bin/package.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   pname = "vault-bin";
-  version = "1.19.2";
+  version = "1.19.3";
 
   src =
     let
@@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
         aarch64-darwin = "darwin_arm64";
       };
       hash = selectSystem {
-        x86_64-linux = "sha256-11c1zmYHjefDX2bRXfFSzwzhOtAO4hbrbL9bTeAkvDM=";
-        aarch64-linux = "sha256-Y5KKw6IMNM9Zix98mRy4HNKBchGrQ3hLhWIlVZwNsK4=";
-        i686-linux = "sha256-iFldcD9Tr2oV//PhT3uvG9+xck5c5GWstbVobkyck8U=";
-        x86_64-darwin = "sha256-Z678lFCTXmbX4Dtsbrp9pwwP9Qfok01nHpet9yTbn8c=";
-        aarch64-darwin = "sha256-uKQHSekbuluRTrwWItQkAJFydsBolmLzCBQ9gMpDbt8=";
+        x86_64-linux = "sha256-tdDMyvZHH9Lh4ZP0umGeWOQ01F4O7eq0n+8zz18/zlQ=";
+        aarch64-linux = "sha256-WXRElEsmEQsk2CEno1oHk+e6UPcbE15uHrAgZkLS8Oc=";
+        i686-linux = "sha256-+XDdrhHVLsaVqqYedp99uIKgfNiw7wHjZg6BTuiWAGw=";
+        x86_64-darwin = "sha256-rXqAR/bnuwNjmt+KmbixV4RFC04ZRF9BNwM9uYYLGTI=";
+        aarch64-darwin = "sha256-roHDJmgv8GfebhQnYeNrBc/pvwS2yoSB0YJwy/6eHVk=";
       };
     in
     fetchzip {

From 27431ae151043663c25511341c3bd36683f795e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 10:18:44 +0000
Subject: [PATCH 76/99] python3Packages.petsc4py: 3.23.0 -> 3.23.2

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

diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix
index 8f45a30a051a..7d067f7566fa 100644
--- a/pkgs/by-name/pe/petsc/package.nix
+++ b/pkgs/by-name/pe/petsc/package.nix
@@ -111,11 +111,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "petsc";
-  version = "3.23.0";
+  version = "3.23.2";
 
   src = fetchzip {
     url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${finalAttrs.version}.tar.gz";
-    hash = "sha256-OcI4iyDOR0YTVV+JoOhbfutoW00EmfapNaMnD/JJFsI=";
+    hash = "sha256-I/vxSo0CVvkcEPmbSahPog1MiyyG4IyNorrZUAPSTYw=";
   };
 
   strictDeps = true;

From 759e3dfeb0ca8ac6a08d2aed714912b1cf361198 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 11 May 2025 13:14:10 +0200
Subject: [PATCH 77/99] librdf_rasqal: remove pcre

Upstream declared the fallback to `regex.h` sufficient for functionality [1].

Fedora also disabled pcre for rasqal back in 2023 [2].

[1] https://github.com/dajobe/rasqal/issues/12#issuecomment-1713075496
[2] https://src.fedoraproject.org/rpms/rasqal/c/89316c895ce79ce3441686eb45f9a8b3943b0933?branch=rawhide
---
 pkgs/development/libraries/librdf/rasqal.nix | 21 +++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix
index f8af85bfb50e..1cc684ae5d30 100644
--- a/pkgs/development/libraries/librdf/rasqal.nix
+++ b/pkgs/development/libraries/librdf/rasqal.nix
@@ -5,17 +5,17 @@
   librdf_raptor2,
   gmp,
   pkg-config,
-  pcre,
   libxml2,
   perl,
+  testers,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "rasqal";
   version = "0.9.33";
 
   src = fetchurl {
-    url = "http://download.librdf.org/source/rasqal-${version}.tar.gz";
+    url = "http://download.librdf.org/source/rasqal-${finalAttrs.version}.tar.gz";
     sha256 = "0z6rrwn4jsagvarg8d5zf0j352kjgi33py39jqd29gbhcnncj939";
   };
 
@@ -23,18 +23,28 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gmp
-    pcre
     libxml2
   ];
 
   propagatedBuildInputs = [ librdf_raptor2 ];
 
+  confiugureFlags = [
+    # uses 'regex.h' as a fallback, which is preferrable
+    "--disable-pcre"
+  ];
+
   postInstall = "rm -rvf $out/share/gtk-doc";
 
   nativeCheckInputs = [ perl ];
   doCheck = false; # fails with "No testsuite plan file sparql-query-plan.ttl could be created in build/..."
   doInstallCheck = false; # fails with "rasqal-config does not support (--help|--version)"
 
+  passthru.tests = {
+    # rasqal-config --version just checks the pkg-config module.
+    # That check is broken, checking the pkg-config ourselves is a good replacement.
+    pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
   meta = {
     description = "Library that handles Resource Description Framework (RDF)";
     homepage = "https://librdf.org/rasqal";
@@ -44,5 +54,6 @@ stdenv.mkDerivation rec {
     ];
     maintainers = with lib.maintainers; [ marcweber ];
     platforms = lib.platforms.unix;
+    pkgConfigModules = [ "rasqal" ];
   };
-}
+})

From f0230627586bc5378984ab7c1c24dd37d8a5342c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 11:35:47 +0000
Subject: [PATCH 78/99] vals: 0.40.1 -> 0.41.0

---
 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 04f0fe27fb39..20f8e4ca0395 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.40.1";
+  version = "0.41.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "helmfile";
     repo = pname;
-    sha256 = "sha256-1mN8JbFgzHjzuuSoagDo9f4zFrrZc2iNk8AoSrBsyBs=";
+    sha256 = "sha256-548gr+piqZsFy+DoKtNaAxWaa/gBS7yYTPucj0aFWhw=";
   };
 
-  vendorHash = "sha256-LI0NEjkE22ljSWd3qbZX7fTdwEriQJBSuKyX3hv1yFk=";
+  vendorHash = "sha256-/E9yT/cgYc3SkwfebJ6HwMWRaG+7LI+z26RcHenDgHk=";
 
   proxyVendor = true;
 

From d7d8df680ee48a3ffab131617240d3fe761b25fc Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 11 May 2025 13:43:13 +0200
Subject: [PATCH 79/99] nixdoc: modernize

---
 pkgs/by-name/ni/nixdoc/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ni/nixdoc/package.nix b/pkgs/by-name/ni/nixdoc/package.nix
index 9f6077c56768..617a1acddd2d 100644
--- a/pkgs/by-name/ni/nixdoc/package.nix
+++ b/pkgs/by-name/ni/nixdoc/package.nix
@@ -4,29 +4,29 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nixdoc";
   version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nixdoc";
-    rev = "v${version}";
-    sha256 = "sha256-7UOjmW8Ef4mEvj7SINaKWh2ZuyNMVEXB82mtuZTQiPA=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-7UOjmW8Ef4mEvj7SINaKWh2ZuyNMVEXB82mtuZTQiPA=";
   };
 
   useFetchCargoVendor = true;
   cargoHash = "sha256-Aw794yhIET8/pnlQiK2xKVbYC/Kd5MExvFTwkv4LLTc=";
 
-  meta = with lib; {
+  meta = {
     description = "Generate documentation for Nix functions";
     mainProgram = "nixdoc";
     homepage = "https://github.com/nix-community/nixdoc";
-    license = [ licenses.gpl3 ];
-    maintainers = with maintainers; [
+    license = [ lib.licenses.gpl3 ];
+    maintainers = with lib.maintainers; [
       infinisil
       hsjobeki
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
-}
+})

From 1ec25c351966af1d05e5d8092a4d7860d6357e04 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 11:47:21 +0000
Subject: [PATCH 80/99] aocl-utils: 5.0 -> 5.1

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

diff --git a/pkgs/by-name/ao/aocl-utils/package.nix b/pkgs/by-name/ao/aocl-utils/package.nix
index 1dc44ad7c08c..bdeb5ce95216 100644
--- a/pkgs/by-name/ao/aocl-utils/package.nix
+++ b/pkgs/by-name/ao/aocl-utils/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "aocl-utils";
-  version = "5.0";
+  version = "5.1";
 
   src = fetchFromGitHub {
     owner = "amd";
     repo = "aocl-utils";
     rev = version;
-    hash = "sha256-96j3Sw+Ts+CZzjPpUlt8cRYO5z0iASo+W/x1nrrAyQE=";
+    hash = "sha256-1g5gERVxXKAeCyNR9/HheUfj+MPxJso3NzqDonvuyMo=";
   };
 
   patches = [ ./pkg-config.patch ];

From 765f400d3039ed78362b76d29487341554de1e72 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 11 May 2025 19:59:13 +0800
Subject: [PATCH 81/99] is-fast: 0.8.5 -> 0.16.2

---
 pkgs/by-name/is/is-fast/package.nix | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/is/is-fast/package.nix b/pkgs/by-name/is/is-fast/package.nix
index 47e93a82797d..c1cad113e46c 100644
--- a/pkgs/by-name/is/is-fast/package.nix
+++ b/pkgs/by-name/is/is-fast/package.nix
@@ -4,39 +4,36 @@
   fetchFromGitHub,
   stdenv,
   pkg-config,
-  openssl,
   oniguruma,
+  writableTmpDirAsHomeHook,
   nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "is-fast";
-  version = "0.8.5";
+  version = "0.16.2";
 
   src = fetchFromGitHub {
     owner = "Magic-JD";
     repo = "is-fast";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6gMXYOgPlVaN5UM+U55Jtbva8/i9BFghBaqboqTwdPg=";
+    hash = "sha256-Wzpd8yA3IpCN3sye1Fk3CUkCihEP6trqPI+oskULS7c=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-EQdO4K3AQL0BR9hnoViiCMhDbcg2db8Ho2Ilvysr1dU=";
+  cargoHash = "sha256-+v1cxH1NKF1tjyc7Bqpd77q6Le8CqvtQ5p0H2ICqc1I=";
 
-  nativeBuildInputs = [
-    pkg-config
-  ];
+  nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [
-    openssl
-    oniguruma
-  ];
+  buildInputs = [ oniguruma ];
 
   env = {
     OPENSSL_NO_VENDOR = true;
     RUSTONIG_SYSTEM_LIBONIG = true;
   };
 
+  nativeCheckInputs = [ writableTmpDirAsHomeHook ];
+
   checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [
     # Error creating config directory: Operation not permitted (os error 1)
     # Using writableTmpDirAsHomeHomeHook is not working

From 079ead620ac97c089a0eaabe87438ea2cb5f6f49 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Fri, 9 May 2025 00:01:59 +0200
Subject: [PATCH 82/99] ladybird: do not put Adobe ICC profiles in the build
 cache

They do not appear to be needed in recent versions (could not find a reference
in Ladybird build system).
If they are needed for the build it would likely they would make the package
`unfreeRedistributable` given the EULA attached to them.
---
 pkgs/by-name/la/ladybird/package.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix
index f279d6ff4e74..e4a91b3ca794 100644
--- a/pkgs/by-name/la/ladybird/package.nix
+++ b/pkgs/by-name/la/ladybird/package.nix
@@ -32,11 +32,6 @@
 }:
 
 let
-  adobe-icc-profiles = fetchurl {
-    url = "https://download.adobe.com/pub/adobe/iccprofiles/win/AdobeICCProfilesCS4Win_end-user.zip";
-    hash = "sha256-kgQ7fDyloloPaXXQzcV9tgpn3Lnr37FbFiZzEb61j5Q=";
-    name = "adobe-icc-profiles.zip";
-  };
   # Note: The cacert version is synthetic and must match the version in the package's CMake
   cacert_version = "2023-12-12";
 in
@@ -83,10 +78,6 @@ stdenv.mkDerivation (finalAttrs: {
 
     mkdir build/Caches/PublicSuffix
     cp ${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat build/Caches/PublicSuffix
-
-    mkdir build/Caches/AdobeICCProfiles
-    cp ${adobe-icc-profiles} build/Caches/AdobeICCProfiles/adobe-icc-profiles.zip
-    chmod +w build/Caches/AdobeICCProfiles
   '';
 
   nativeBuildInputs = [

From 55116ee2c87a8c3c4b845dc1612d1ddf6f853dc5 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 11 May 2025 17:07:12 +0400
Subject: [PATCH 83/99] =?UTF-8?q?postgresqlPackages.pgrouting:=203.7.3=20?=
 =?UTF-8?q?=E2=86=92=203.8.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix
index a9f15f87ce19..9ecd06f4d67f 100644
--- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix
@@ -10,7 +10,7 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pgrouting";
-  version = "3.7.3";
+  version = "3.8.0";
 
   nativeBuildInputs = [
     cmake
@@ -22,7 +22,7 @@ postgresqlBuildExtension (finalAttrs: {
     owner = "pgRouting";
     repo = "pgrouting";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jaevnDCJ6hRQeDhdAkvMTvnnFWElMNvo9gZRW53proQ=";
+    hash = "sha256-Lvf7TQ3GywbzZmcd9wi3s8I5sCXIQAPeXNTRk/J46to=";
   };
 
   meta = {

From 402d74c45ba8e042e0dbd0ecccc00a8c3c6859c9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 13:28:50 +0000
Subject: [PATCH 84/99] terraform-providers.digitalocean: 2.51.0 -> 2.53.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 7030c9b5a6a0..bd22f85d41ee 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -354,11 +354,11 @@
     "vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM="
   },
   "digitalocean": {
-    "hash": "sha256-q5RMK1HwjnAhgPsdjGSvza83j+gHpbsAcVaUHVrwM+Q=",
+    "hash": "sha256-AWRBSdz4nS5Mi4BUqy5J0Vi/2w4qFyXzGxKdboN8aTM=",
     "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
     "owner": "digitalocean",
     "repo": "terraform-provider-digitalocean",
-    "rev": "v2.51.0",
+    "rev": "v2.53.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 29eb743dc98c8fbaa18d23b94fc42e0f14a728b6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 13:47:08 +0000
Subject: [PATCH 85/99] eigenmath: 338-unstable-2025-04-18 ->
 340-unstable-2025-05-05

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

diff --git a/pkgs/by-name/ei/eigenmath/package.nix b/pkgs/by-name/ei/eigenmath/package.nix
index 02f72b00d352..4f9c41f5b012 100644
--- a/pkgs/by-name/ei/eigenmath/package.nix
+++ b/pkgs/by-name/ei/eigenmath/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "eigenmath";
-  version = "338-unstable-2025-04-18";
+  version = "340-unstable-2025-05-05";
 
   src = fetchFromGitHub {
     owner = "georgeweigt";
     repo = pname;
-    rev = "2e11a03c19d9f8194a14b8578bcffc3d76d3b113";
-    hash = "sha256-Clsch47VfLqGi6RaQF8T+6cSRpsZjjJDMUYTK3tSidg=";
+    rev = "94fee6b02ebd4cd718dd9ea45583a6af2129dd28";
+    hash = "sha256-2bdO0nRXhDZlEmGRfNf6g9zwc65Ih9Ymlo6PxlpAxes=";
   };
 
   checkPhase =

From 2e72d6ddfb93bc1bd4d3d180b20ead3f337484fd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 2 May 2025 15:22:01 +0000
Subject: [PATCH 86/99] pkg: 2.1.0 -> 2.1.2

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

diff --git a/pkgs/by-name/pk/pkg/package.nix b/pkgs/by-name/pk/pkg/package.nix
index af42943ebc52..45c1319334e5 100644
--- a/pkgs/by-name/pk/pkg/package.nix
+++ b/pkgs/by-name/pk/pkg/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pkg";
-  version = "2.1.0";
+  version = "2.1.2";
 
   src = fetchFromGitHub {
     owner = "freebsd";
     repo = "pkg";
     rev = finalAttrs.version;
-    hash = "sha256-tOHt5Ra628qg/4N7fkUnL/xq4qV6Vmv2vsJpwSaDba8=";
+    hash = "sha256-mIuUewuW+aw0ZDGstUadfHkjamDxPRp1O/YVZ9JuCtg=";
   };
 
   setOutputFlags = false;

From d0be8642d866133b65bbf934fad44d6bac73322a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 13:57:20 +0000
Subject: [PATCH 87/99] python3Packages.echo: 0.9.0 -> 0.10.0

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

diff --git a/pkgs/development/python-modules/echo/default.nix b/pkgs/development/python-modules/echo/default.nix
index c2d5f1ac4bc6..d4e7b1c43627 100644
--- a/pkgs/development/python-modules/echo/default.nix
+++ b/pkgs/development/python-modules/echo/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "echo";
-  version = "0.9.0";
+  version = "0.10.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "glue-viz";
     repo = pname;
     tag = "v${version}";
-    sha256 = "sha256-IKd5n8+U6+0dgV4PbLcPaormXCX4srGcXmvYSrnCt60=";
+    sha256 = "sha256-RlTscoStJQ0vjrrk14xHRsMZOJt8eJSqinc4rY/lW4k=";
   };
 
   nativeBuildInputs = [

From 745e7e83e3b8ec41e612003a3be7dd4c90115a47 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Sun, 11 May 2025 16:08:47 +0200
Subject: [PATCH 88/99] home-assistant-custom-components.solax_modbus: fix
 incompatibility with latest pymodbus version

The pymodbus API changed. Without this change, solax_modbus fails to start.
---
 .../custom-components/solax_modbus/package.nix              | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
index c44f1eb7d506..664d8c13f4ac 100644
--- a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
@@ -17,6 +17,12 @@ buildHomeAssistantComponent rec {
     hash = "sha256-fgvhF+1fz3pNOZJQjf/iF2Lh9j6mMkUXjgLyCja84K0=";
   };
 
+  postPatch = ''
+    substituteInPlace custom_components/solax_modbus/payload.py --replace-fail \
+      'from pymodbus.utilities import (' \
+      'from pymodbus.pdu.pdu import ('
+  '';
+
   dependencies = [ pymodbus ];
 
   meta = {

From 1f66be63c81cf0d7cca04a47aa5538956901f205 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 13:18:34 +0000
Subject: [PATCH 89/99] warp-terminal: 0.2025.04.30.08.11.stable_01 ->
 0.2025.05.07.08.12.stable_02

---
 pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json
index bd7f1c1000a7..49dfc25da975 100644
--- a/pkgs/by-name/wa/warp-terminal/versions.json
+++ b/pkgs/by-name/wa/warp-terminal/versions.json
@@ -1,14 +1,14 @@
 {
   "darwin": {
-    "hash": "sha256-GQ4ZkvbK5Nzo933WTWk5+ddBacd3zL26lUPOA0NOlV0=",
-    "version": "0.2025.04.30.08.11.stable_01"
+    "hash": "sha256-c6+LEdAWgRrm3UrHRK8N0IGuxoxHpz4j5sgCz+eJOco=",
+    "version": "0.2025.05.07.08.12.stable_02"
   },
   "linux_x86_64": {
-    "hash": "sha256-zILlZJc0AR4NLLMw3+8TrlzLT3u2BtPRn+9dWSJ/CI8=",
-    "version": "0.2025.04.30.08.11.stable_01"
+    "hash": "sha256-uEaQecj5h6if5Hc7BjuXxxVO+SqOYE/xop08ujQFgGg=",
+    "version": "0.2025.05.07.08.12.stable_02"
   },
   "linux_aarch64": {
-    "hash": "sha256-Bbj3oalH5qg8edpCkPp3JEZfEbuU6Yv8NrB5m4geylA=",
-    "version": "0.2025.04.30.08.11.stable_01"
+    "hash": "sha256-543oTSzBZLxWem3EnpqVyWgQvrbduurEhFEC7XpKHWk=",
+    "version": "0.2025.05.07.08.12.stable_02"
   }
 }

From 24cc461b66967487d20fdd41c964daccae256dc5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 14:12:58 +0000
Subject: [PATCH 90/99] e1s: 1.0.46 -> 1.0.47

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

diff --git a/pkgs/by-name/e1/e1s/package.nix b/pkgs/by-name/e1/e1s/package.nix
index cc5fe66c21a0..adf6a1742977 100644
--- a/pkgs/by-name/e1/e1s/package.nix
+++ b/pkgs/by-name/e1/e1s/package.nix
@@ -5,7 +5,7 @@
 }:
 let
   pname = "e1s";
-  version = "1.0.46";
+  version = "1.0.47";
 in
 buildGoModule {
   inherit pname version;
@@ -14,10 +14,10 @@ buildGoModule {
     owner = "keidarcy";
     repo = "e1s";
     tag = "v${version}";
-    hash = "sha256-Wnj6HNxVdhnmGMtw+Da/LRxMkXBm+rWDUcHPOxFXDLU=";
+    hash = "sha256-5lb2j3cfQ2W+r+3UOdxXt15PQNWIMRM+pwChdzL+HUQ=";
   };
 
-  vendorHash = "sha256-bBl4D7HNIiAym6BWSJ0x4LZnIEUMfECj6dDDVZIFrHA=";
+  vendorHash = "sha256-1lise/u40Q8W9STsuyrWIbhf2HY+SFCytUL1PTSWvfY=";
 
   meta = with lib; {
     description = "Easily Manage AWS ECS Resources in Terminal 🐱";

From caeddd0fd8539d1f3238036122d0dd32abf72a8d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 14:50:22 +0000
Subject: [PATCH 91/99] cargo-nextest: 0.9.94 -> 0.9.95

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

diff --git a/pkgs/by-name/ca/cargo-nextest/package.nix b/pkgs/by-name/ca/cargo-nextest/package.nix
index 4c4202a7f969..e9576697c014 100644
--- a/pkgs/by-name/ca/cargo-nextest/package.nix
+++ b/pkgs/by-name/ca/cargo-nextest/package.nix
@@ -7,17 +7,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-nextest";
-  version = "0.9.94";
+  version = "0.9.95";
 
   src = fetchFromGitHub {
     owner = "nextest-rs";
     repo = "nextest";
     rev = "cargo-nextest-${version}";
-    hash = "sha256-r1Q4/CQwu4FRiymKacmg9SfM/sqagtzNF904TbjaB4c=";
+    hash = "sha256-OtCFehXzcdE8kBUkDg8y5ygTOtH2eP5aMzTpugDSg/E=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-OXxmJcARh94lYxlRgv1fCCifYJwrWaQ21UxRNWI2yFw=";
+  cargoHash = "sha256-nrRq5ET++jplx5argN04Ax+HTE6VqvBhnSsS/ZFNYr8=";
 
   cargoBuildFlags = [
     "-p"

From 2392a760aff76b365928b2dffdf71715795ecea0 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 11 May 2025 15:33:10 +0100
Subject: [PATCH 92/99] mkclean: expand meta.platforms to unix

builds for me on macos 12 x86_64
---
 pkgs/by-name/mk/mkclean/package.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/mk/mkclean/package.nix b/pkgs/by-name/mk/mkclean/package.nix
index ef63e7af3f91..13e6da9a0945 100644
--- a/pkgs/by-name/mk/mkclean/package.nix
+++ b/pkgs/by-name/mk/mkclean/package.nix
@@ -27,9 +27,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.matroska.org";
     license = lib.licenses.bsdOriginal;
     maintainers = with lib.maintainers; [ cawilliamson ];
-    platforms = [
-      "i686-linux"
-      "x86_64-linux"
-    ];
+    platforms = lib.platforms.unix;
   };
 })

From f3a9d810331ecb0dc3f6d8938cd638f20e4ecda6 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 11 May 2025 20:05:20 +0800
Subject: [PATCH 93/99] ncftp: remove with lib

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

diff --git a/pkgs/by-name/nc/ncftp/package.nix b/pkgs/by-name/nc/ncftp/package.nix
index 9ed5733d8925..b7d7ed2c27ac 100644
--- a/pkgs/by-name/nc/ncftp/package.nix
+++ b/pkgs/by-name/nc/ncftp/package.nix
@@ -53,12 +53,12 @@ stdenv.mkDerivation (finalAttrs: {
     "--mandir=$(out)/share/man/"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Command line FTP (File Transfer Protocol) client";
     homepage = "https://www.ncftp.com/ncftp/";
-    maintainers = with maintainers; [ bjornfor ];
-    platforms = platforms.unix;
-    license = licenses.clArtistic;
+    maintainers = with lib.maintainers; [ bjornfor ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.clArtistic;
     mainProgram = "ncftp";
   };
 })

From 7d5a7afba489584b8420e57c473e48e0312ad449 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 11 May 2025 20:05:44 +0800
Subject: [PATCH 94/99] ncftp: 3.2.7 -> 3.3.0

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

diff --git a/pkgs/by-name/nc/ncftp/package.nix b/pkgs/by-name/nc/ncftp/package.nix
index b7d7ed2c27ac..85146b1b2527 100644
--- a/pkgs/by-name/nc/ncftp/package.nix
+++ b/pkgs/by-name/nc/ncftp/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ncftp";
-  version = "3.2.7";
+  version = "3.3.0";
 
   src = fetchurl {
-    url = "https://www.ncftp.com/public_ftp/ncftp/ncftp-${finalAttrs.version}-src.tar.xz";
-    hash = "sha256-1BxcTWYUqOri7U5NetprbTr8yftlpO2bhxE0S+8k9+g=";
+    url = "https://www.ncftp.com/public_ftp/ncftp/ncftp-${finalAttrs.version}-src.tar.gz";
+    hash = "sha256-eSD4hMKtr8gsjkHEbW89ImmHhcez9W9Wd6jVyGY5Y4Y=";
   };
 
   buildInputs = [ ncurses ];

From c5427604c76fa5a4bf33f113fe54e4a3f64e1e8d Mon Sep 17 00:00:00 2001
From: nsfisis <54318333+nsfisis@users.noreply.github.com>
Date: Mon, 12 May 2025 01:11:32 +0900
Subject: [PATCH 95/99] gomi: embed version information (#403076)

---
 pkgs/by-name/go/gomi/package.nix | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/go/gomi/package.nix b/pkgs/by-name/go/gomi/package.nix
index 82f16f3de703..84403bd18a61 100644
--- a/pkgs/by-name/go/gomi/package.nix
+++ b/pkgs/by-name/go/gomi/package.nix
@@ -12,13 +12,32 @@ buildGoModule rec {
     owner = "b4b4r07";
     repo = "gomi";
     tag = "v${version}";
-    hash = "sha256-FZCvUG6lQH8CFivV/hbIgGQx4FCk1UtreiWXTQVi4+4=";
+    hash = "sha256-0C+us4GO8Jd51ATaaf0aRU3NnhmDvu0I3qDDXBoaiXU=";
+    # populate values that require us to use git. By doing this in postFetch we
+    # can delete .git afterwards and maintain better reproducibility of the src.
+    leaveDotGit = true;
+    postFetch = ''
+      cd $out
+      git show --format='%h' HEAD --quiet > ldflags_revision
+      date --utc --date="@$(git show --format='%ct' HEAD --quiet)" +'%Y-%m-%dT%H:%M:%SZ' > ldflags_buildDate
+      find . -type d -name .git -print0 | xargs -0 rm -rf
+    '';
   };
 
   vendorHash = "sha256-8aw81DKBmgNsQzgtHCsUkok5e5+LeAC8BUijwKVT/0s=";
 
   subPackages = [ "." ];
 
+  # Add version information fetched from the repository to ldflags.
+  # https://github.com/babarot/gomi/blob/v1.6.0/.goreleaser.yaml#L20-L22
+  ldflags = [
+    "-X main.version=v${version}"
+  ];
+  preBuild = ''
+    ldflags+=" -X main.revision=$(cat ldflags_revision)"
+    ldflags+=" -X main.buildDate=$(cat ldflags_buildDate)"
+  '';
+
   meta = {
     description = "Replacement for UNIX rm command";
     homepage = "https://github.com/b4b4r07/gomi";

From b6c615196e151edb50091ff08d88c4d696c7b18d Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Sun, 11 May 2025 13:46:04 -0300
Subject: [PATCH 96/99] nixos/kde-pim: include kcontacts for merkuro's widgets

When using Merkuro in Plasma 6, the 'Contacts' widget will automatically
be added to the default panel. Unfortunately, it does not work unless
`kdePackages.kcontacts` is also present in the environment. This adds
the dependency if Plasma 6 is also enabled alongside Merkuro.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 nixos/modules/programs/kde-pim.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/programs/kde-pim.nix b/nixos/modules/programs/kde-pim.nix
index d0acaddd4b87..f00a316f20ff 100644
--- a/nixos/modules/programs/kde-pim.nix
+++ b/nixos/modules/programs/kde-pim.nix
@@ -33,8 +33,14 @@ in
       ++ lib.optionals cfg.kontact [
         kontact
       ]
-      ++ lib.optionals cfg.merkuro [
-        merkuro
-      ];
+      ++ lib.optionals cfg.merkuro (
+        [
+          merkuro
+        ]
+        # Only needed when using the Merkuro Contacts widget in Plasma.
+        ++ lib.optionals config.services.desktopManager.plasma6.enable [
+          kcontacts
+        ]
+      );
   };
 }

From 6e85f6c7cce32be7b5e671a959d23dd30624f76a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 07:19:30 +0000
Subject: [PATCH 97/99] cosmic-protocols: 0-unstable-2025-04-14 ->
 0-unstable-2025-05-02

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

diff --git a/pkgs/by-name/co/cosmic-protocols/package.nix b/pkgs/by-name/co/cosmic-protocols/package.nix
index 3b36455926c1..915552203b0b 100644
--- a/pkgs/by-name/co/cosmic-protocols/package.nix
+++ b/pkgs/by-name/co/cosmic-protocols/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation {
   pname = "cosmic-protocols";
-  version = "0-unstable-2025-04-14";
+  version = "0-unstable-2025-05-02";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-protocols";
-    rev = "67df697105486fa4c9dd6ce00889c8b0526c9bb4";
-    hash = "sha256-rogV5BTloAatfinrgl7I6hakybLkPRKhnwlILBGKkQU=";
+    rev = "1425bd44ed2b318a552201cc752ae11f2f483ef5";
+    hash = "sha256-rzLust1BKbITEgN7Hwjy1CT+4iOipv+4VIixfUAuCms=";
   };
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];

From cd560fbe9f6c12296b9e15fe9cf283b52f7c1b27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Sun, 11 May 2025 22:43:52 +0700
Subject: [PATCH 98/99] =?UTF-8?q?lightningcss:=201.29.3=20=E2=86=92=201.30?=
 =?UTF-8?q?.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/li/lightningcss/package.nix b/pkgs/by-name/li/lightningcss/package.nix
index 22b0361b3b9f..4a25ccd17c61 100644
--- a/pkgs/by-name/li/lightningcss/package.nix
+++ b/pkgs/by-name/li/lightningcss/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lightningcss";
-  version = "1.29.3";
+  version = "1.30.0";
 
   src = fetchFromGitHub {
     owner = "parcel-bundler";
     repo = "lightningcss";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+rSqRJaB6UMdCsAcr0X2BZuHk2o6NWDn1yIX4Yjn+Y4=";
+    hash = "sha256-vFOQrrTaKM6UcpdgJqj89P7ojCowg7MyK8Wam2hmLXg=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-6P559K7hKZcd/hjyEQGf4V+cTHoS9H0wprfpMqG3ugk=";
+  cargoHash = "sha256-aNho9NavEgY4dwGcNXsLDnlVCB2rODIPae3LnfOwJIA=";
 
   patches = [
     # Backport fix for build error for lightningcss-napi

From a5e6c18f8e40ce3171ae744639e792fec1c1c040 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Sun, 11 May 2025 16:57:16 +0530
Subject: [PATCH 99/99] Revert "code-cursor: use chromium's inbuilt x11wayland
 renderer by defaullt"

This reverts commit 8ceaa4acec7ac3111b118bc7245a18450d9033af.

This is just bad and not intended behaviour.

`x11` is the default, and setting this to "auto" means Electron will choose the platform to run automatically (potentially switching to use Wayland backend).

if an user does not want to run this app on Wayland they should unset `NIXOS_OZONE_WL` instead.

General distro wide (NixOS) expectation is that `NIXOS_OZONE_WL` will make all electron apps use Wayland backend. and this contradicts that.

If the idea is to force X11, due to upstream not having proper Wayland support, this whole line should be removed instead.
https://github.com/NixOS/nixpkgs/pull/401864/files#r2083493979
---
 pkgs/by-name/co/code-cursor/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix
index c37d700c0bba..2e37479f805f 100644
--- a/pkgs/by-name/co/code-cursor/package.nix
+++ b/pkgs/by-name/co/code-cursor/package.nix
@@ -163,7 +163,7 @@ stdenvNoCC.mkDerivation {
 
       wrapProgram $out/bin/cursor \
         --add-flags "--update=false" \
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=x11 --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}} --no-update" \
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}} --no-update" \
         --add-flags ${lib.escapeShellArg commandLineArgs}
     ''}