From ee20de5347aa2569240a251272f7ab0210047e7b Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Wed, 13 May 2026 00:36:01 +0200
Subject: [PATCH 01/23] pbkdf2-password-hash: init at 0-unstable-2024-03-21

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 .../pb/pbkdf2-password-hash/package.nix       | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 pkgs/by-name/pb/pbkdf2-password-hash/package.nix

diff --git a/pkgs/by-name/pb/pbkdf2-password-hash/package.nix b/pkgs/by-name/pb/pbkdf2-password-hash/package.nix
new file mode 100644
index 000000000000..e4dcf6fc2bee
--- /dev/null
+++ b/pkgs/by-name/pb/pbkdf2-password-hash/package.nix
@@ -0,0 +1,31 @@
+{
+  fetchgit,
+  lib,
+  rustPlatform,
+}:
+
+rustPlatform.buildRustPackage {
+  pname = "pbkdf2-password-hash";
+  version = "0-unstable-2024-03-21";
+
+  src = fetchgit {
+    url = "https://git.sr.ht/~laalsaas/pbkdf2-password-hash";
+    rev = "9dfc0fd353bda7a6ccffbf681efc9a26dcc29a90";
+    hash = "sha256-eBRArvcGU+63VT8Fx6iIi5RP9F55860CwF4Q3YwT8WU=";
+  };
+
+  cargoHash = "sha256-n3VxmR+bjFN/mEJ/SuDYQJWcndR7QFmcVJdZhSHDdmQ=";
+
+  __structuredAttrs = true;
+
+  meta = {
+    description = "Prompts for a password and prints the pbkdf2 hash";
+    homepage = "https://git.sr.ht/~laalsaas/pbkdf2-password-hash";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      felixsinger
+    ];
+    platforms = lib.platforms.linux;
+    mainProgram = "pbkdf2-hash-password";
+  };
+}

From 1f13af463507fbdd1999c5de380581617ba99260 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 May 2026 05:26:07 +0000
Subject: [PATCH 02/23] netbeans: 29 -> 30

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

diff --git a/pkgs/by-name/ne/netbeans/package.nix b/pkgs/by-name/ne/netbeans/package.nix
index 6a45497cac80..60a06763f297 100644
--- a/pkgs/by-name/ne/netbeans/package.nix
+++ b/pkgs/by-name/ne/netbeans/package.nix
@@ -13,7 +13,7 @@
 }:
 
 let
-  version = "29";
+  version = "30";
   desktopItem = makeDesktopItem {
     name = "netbeans";
     exec = "netbeans";
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
   inherit version;
   src = fetchurl {
     url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip";
-    hash = "sha256-Xoyhp8Z5fiG7JbZ8F8dDBoiHwXCxW8mDvr9wTX5R7Dg=";
+    hash = "sha256-q5Ufx1vdLtU75+TkfiKBWu65I7HD5yS/BTbGXM1c1GY=";
   };
 
   buildCommand = ''
@@ -57,7 +57,7 @@ stdenv.mkDerivation {
     # Extract pngs from the Apple icon image and create
     # the missing ones from the 1024x1024 image.
     icns2png --extract $out/netbeans/nb/netbeans.icns
-    for size in 16 24 32 48 64 129 256 512 1024; do
+    for size in 16 24 32 48 64 130 256 512 1024; do
       mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps
       if [ -e netbeans_"$size"x"$size"x32.png ]
       then

From 0d4d32f1481a8ad3c53cd29a10075f68a8b2322c Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Wed, 15 Apr 2026 22:35:48 +0200
Subject: [PATCH 03/23] pandora-launcher: init at 5.2.2

---
 .../pa/pandora-launcher-unwrapped/package.nix | 144 ++++++++++++++++++
 pkgs/by-name/pa/pandora-launcher/package.nix  | 142 +++++++++++++++++
 2 files changed, 286 insertions(+)
 create mode 100644 pkgs/by-name/pa/pandora-launcher-unwrapped/package.nix
 create mode 100644 pkgs/by-name/pa/pandora-launcher/package.nix

diff --git a/pkgs/by-name/pa/pandora-launcher-unwrapped/package.nix b/pkgs/by-name/pa/pandora-launcher-unwrapped/package.nix
new file mode 100644
index 000000000000..d0d2314ed177
--- /dev/null
+++ b/pkgs/by-name/pa/pandora-launcher-unwrapped/package.nix
@@ -0,0 +1,144 @@
+{
+  addDriverRunpath,
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  imagemagick,
+  patchelf,
+  pkg-config,
+
+  alsa-lib,
+  dbus,
+  fontconfig,
+  libGL,
+  libseccomp,
+  libxcb,
+  libxkbcommon,
+  openssl,
+  vulkan-loader,
+  wayland,
+
+  copyDesktopItems,
+  makeDesktopItem,
+
+  apple-sdk_15,
+
+  msaClientID ? null,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "pandora-launcher-unwrapped";
+  version = "5.2.2";
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "Moulberry";
+    repo = "PandoraLauncher";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-jUvCrz8srRRlXcrFWQ5Kx8V6KLc8cozZg+QYrcnMOUE=";
+  };
+
+  # Currently the client id is hardcoded and must be patched like this.
+  postPatch = lib.optionalString (msaClientID != null) ''
+    substituteInPlace crates/auth/src/constants.rs \
+      --replace-fail \
+      'pub const CLIENT_ID: &str = "e5226706-5096-431d-9516-ae48fe263401";' \
+      'pub const CLIENT_ID: &str = "${msaClientID}";'
+  '';
+
+  nativeBuildInputs = [
+    rustPlatform.bindgenHook
+    copyDesktopItems
+
+    imagemagick
+    patchelf
+    pkg-config
+  ];
+
+  buildInputs = [
+    fontconfig
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    dbus
+    libseccomp
+    libxcb
+    libxkbcommon
+    wayland
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_15
+  ];
+
+  buildFeatures = lib.optionals stdenv.hostPlatform.isDarwin [ "gpui/runtime_shaders" ];
+
+  doCheck = false; # there aren't any tests
+
+  env.OPENSSL_NO_VENDOR = true;
+
+  dontUpdateAutotoolsGnuConfigScripts = true; # will modify vendor dir, which cargo doesn't allow
+  cargoVendorDir = "vendor"; # everything is vendored in-tree
+  dontCargoSetupPostUnpack = true;
+
+  desktopItems = lib.singleton (makeDesktopItem {
+    name = "com.moulberry.pandoralauncher";
+    desktopName = "Pandora Launcher";
+    genericName = "Unofficial Minecraft Launcher";
+    exec = "pandora_launcher";
+    icon = "pandora_launcher";
+  });
+
+  postInstall = ''
+    for size in 16 24 32 48 64 128 256; do
+      geometry="$size"x"$size"
+      mkdir -p "$out/share/icons/hicolor/$geometry/apps"
+      magick package/windows.svg -resize "$geometry" \
+        "$out/share/icons/hicolor/$geometry/apps/pandora_launcher.png"
+    done
+  '';
+
+  doInstallCheck = true;
+
+  installCheckPhase =
+    let
+      expectedOutput = builtins.toFile "pandora-launcher-help-expected" ''
+        Usage: pandora_launcher [OPTIONS]
+
+        Options:
+              --run-instance <RUN_INSTANCE>  Instance to launch, instead of opening the launcher
+          -h, --help                         Print help
+      '';
+    in
+    ''
+      runHook preInstallCheck
+
+      diff <($out/bin/pandora_launcher --help) ${expectedOutput}
+
+      runHook postInstallCheck
+    '';
+
+  postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
+    patchelf --add-rpath "${addDriverRunpath.driverLink}/lib:${
+      lib.makeLibraryPath [
+        libGL
+        vulkan-loader
+        wayland
+      ]
+    }" $out/bin/pandora_launcher
+  '';
+
+  meta = {
+    description = "Minecraft launcher that balances ease-of-use with powerful instance management features";
+    homepage = "https://github.com/Moulberry/PandoraLauncher";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      dtomvan
+      eveeifyeve
+    ];
+    mainProgram = "pandora_launcher";
+  };
+})
diff --git a/pkgs/by-name/pa/pandora-launcher/package.nix b/pkgs/by-name/pa/pandora-launcher/package.nix
new file mode 100644
index 000000000000..a8c218d72033
--- /dev/null
+++ b/pkgs/by-name/pa/pandora-launcher/package.nix
@@ -0,0 +1,142 @@
+# adapted from prismlauncher's wrapper, since they both include libs for
+# launching minecraft. I can't do `prismlauncher.override
+# { prismlauncher-unwrapped = pandora-launcher-unwrapped; }` though, since
+# pandora isn't a QT app (and most likely future subtle differences).
+{
+  addDriverRunpath,
+  alsa-lib,
+  flite,
+  gamemode,
+  glfw3-minecraft,
+  jdk17,
+  jdk21,
+  jdk25,
+  jdk8,
+  lib,
+  libGL,
+  libjack2,
+  libpulseaudio,
+  libusb1,
+  libx11,
+  libxcursor,
+  libxext,
+  libxrandr,
+  libxxf86vm,
+  makeWrapper,
+  openal,
+  pandora-launcher-unwrapped,
+  pciutils,
+  pipewire,
+  stdenv,
+  symlinkJoin,
+  udev,
+  vulkan-loader,
+  xrandr,
+
+  additionalLibs ? [ ],
+  additionalPrograms ? [ ],
+  controllerSupport ? stdenv.hostPlatform.isLinux,
+  gamemodeSupport ? stdenv.hostPlatform.isLinux,
+  jdks ? [
+    jdk25
+    jdk21
+    jdk17
+    jdk8
+  ],
+  msaClientID ? null,
+  textToSpeechSupport ? stdenv.hostPlatform.isLinux,
+}:
+
+assert lib.assertMsg (
+  controllerSupport -> stdenv.hostPlatform.isLinux
+) "controllerSupport only has an effect on Linux.";
+
+assert lib.assertMsg (
+  textToSpeechSupport -> stdenv.hostPlatform.isLinux
+) "textToSpeechSupport only has an effect on Linux.";
+
+let
+  pandora-launcher' = pandora-launcher-unwrapped.override { inherit msaClientID; };
+in
+
+symlinkJoin {
+  pname = "pandora-launcher";
+  inherit (pandora-launcher') version;
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  paths = [ pandora-launcher' ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  makeWrapperArgs =
+    let
+      runtimeLibs = [
+
+        (lib.getLib stdenv.cc.cc)
+        ## native versions
+        glfw3-minecraft
+        openal
+
+        ## openal
+        alsa-lib
+        libjack2
+        libpulseaudio
+        pipewire
+
+        ## glfw
+        libGL
+        libx11
+        libxcursor
+        libxext
+        libxrandr
+        libxxf86vm
+
+        udev # oshi
+
+        vulkan-loader # VulkanMod's lwjgl
+      ]
+      ++ lib.optional textToSpeechSupport flite
+      ++ lib.optional gamemodeSupport gamemode.lib
+      ++ lib.optional controllerSupport libusb1
+      ++ additionalLibs;
+
+      runtimePrograms = [
+        pciutils # need lspci
+        xrandr # needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
+      ]
+      ++ additionalPrograms;
+
+    in
+    [
+      "--prefix"
+      "FORCE_EXTERNAL_JAVA"
+      ":"
+      (lib.concatStringsSep ":" (map (jdk: jdk.home) jdks))
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      "--set"
+      "LD_LIBRARY_PATH"
+      "${addDriverRunpath.driverLink}/lib:${lib.makeLibraryPath runtimeLibs}"
+
+      "--prefix"
+      "PATH"
+      ":"
+      (lib.makeBinPath runtimePrograms)
+    ];
+
+  postBuild = ''
+    wrapProgram $out/bin/pandora_launcher "''${makeWrapperArgs[@]}"
+  '';
+
+  meta = {
+    inherit (pandora-launcher'.meta)
+      description
+      homepage
+      license
+      maintainers
+      mainProgram
+      ;
+  };
+}

From ee586b56a8e56759211921bf970da85666b1e45b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 22 May 2026 11:53:54 -0700
Subject: [PATCH 04/23] libdeltachat: 2.49.0 -> 2.50.0

Diff: https://github.com/chatmail/core/compare/v2.49.0...v2.50.0

Changelog: https://github.com/chatmail/core/blob/v2.50.0/CHANGELOG.md
---
 pkgs/by-name/li/libdeltachat/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix
index 56120089890f..526412f32587 100644
--- a/pkgs/by-name/li/libdeltachat/package.nix
+++ b/pkgs/by-name/li/libdeltachat/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libdeltachat";
-  version = "2.49.0";
+  version = "2.50.0";
 
   src = fetchFromGitHub {
     owner = "chatmail";
     repo = "core";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iMgWXlffbGG25iM/SMCQzer1J6clDWwP0hURloL3n2k=";
+    hash = "sha256-UUMmfQq1zBn6c0dOH0A9t6ChxIE8d1th6MnQYwq9j08=";
   };
 
   patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   cargoDeps = rustPlatform.fetchCargoVendor {
     pname = "chatmail-core";
     inherit (finalAttrs) version src;
-    hash = "sha256-0QhMJis1Hbl/Tn3Rwiz+UjCSieodfYhgL060DWjEOIM=";
+    hash = "sha256-j2cYCAVMjFZaus/v7GJW3IeX5S/OwYkIWYFJ++CIFB4=";
   };
 
   nativeBuildInputs = [

From 65a978ffb95bc39f87438cd11dae13f0e8b6638b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 22 May 2026 12:18:53 -0700
Subject: [PATCH 05/23] python3Packages.py-aosmith: 1.0.17 -> 1.0.18

Diff: https://github.com/bdr99/py-aosmith/compare/1.0.17...1.0.18
---
 pkgs/development/python-modules/py-aosmith/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/py-aosmith/default.nix b/pkgs/development/python-modules/py-aosmith/default.nix
index 58e72275d643..ad6bd00223ae 100644
--- a/pkgs/development/python-modules/py-aosmith/default.nix
+++ b/pkgs/development/python-modules/py-aosmith/default.nix
@@ -9,20 +9,18 @@
 
 buildPythonPackage rec {
   pname = "py-aosmith";
-  version = "1.0.17";
+  version = "1.0.18";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bdr99";
     repo = "py-aosmith";
     tag = version;
-    hash = "sha256-qBnHe4w59QW18osEf+9Y46eEx/W/GzARkwJlJ+9wPr0=";
+    hash = "sha256-sR7yUl97MlxdJHLrA8IjODNk7LJhVxqraaUkPljuMZg=";
   };
 
   build-system = [ poetry-core ];
 
-  pythonRelaxDeps = [ "tenacity" ];
-
   dependencies = [
     aiohttp
     tenacity

From c806afe2b8db19ad5749e50c36ef1184ba9b3836 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 22 May 2026 13:00:04 -0700
Subject: [PATCH 06/23] python3Packages.victron-mqtt: 2026.5.4 -> 2026.5.5

Diff: https://github.com/tomer-w/victron_mqtt/compare/v2026.5.4...v2026.5.5

Changelog: https://github.com/tomer-w/victron_mqtt/releases/tag/v2026.5.5
---
 pkgs/development/python-modules/victron-mqtt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/victron-mqtt/default.nix b/pkgs/development/python-modules/victron-mqtt/default.nix
index 232ee4ef0704..acaf7e50a757 100644
--- a/pkgs/development/python-modules/victron-mqtt/default.nix
+++ b/pkgs/development/python-modules/victron-mqtt/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "victron-mqtt";
-  version = "2026.5.4";
+  version = "2026.5.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tomer-w";
     repo = "victron_mqtt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oiik7n2eT71v814N0LhebTNecT5FuZSObbwqmon6BZI=";
+    hash = "sha256-8tl158Pd7TkrQbKfAFePjQRBc5tmyAUsz9cEd06blDs=";
   };
 
   build-system = [

From 276b6ac1717a7f60a7677a8159f0835ad3593a8d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 May 2026 21:56:57 +0000
Subject: [PATCH 07/23] s7: 11.8-unstable-2026-05-14 ->
 11.8-unstable-2026-05-22

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

diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix
index d87d533b07c3..31bea400be81 100644
--- a/pkgs/by-name/s7/s7/package.nix
+++ b/pkgs/by-name/s7/s7/package.nix
@@ -26,14 +26,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "s7";
-  version = "11.8-unstable-2026-05-14";
+  version = "11.8-unstable-2026-05-22";
 
   src = fetchFromGitLab {
     domain = "cm-gitlab.stanford.edu";
     owner = "bil";
     repo = "s7";
-    rev = "64c58a5c6414cefa54b221ae77a09c20564c091e";
-    hash = "sha256-Q8IT2Hific1VC59h2q23vko5HyzcvQJocsCqq/D0R6g=";
+    rev = "d8791be9964708ccb98c7cabb39acd2b8f97fdbb";
+    hash = "sha256-kT2zFadlKc0JWqxnuoQ9hVinGhZb0XOwC3WEVeYcLPw=";
   };
 
   buildInputs =

From b84836826e27e90e5eccb036cb7eb6e5ea13b04b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 22 May 2026 15:29:54 -0700
Subject: [PATCH 08/23] python3Packages.cucumber-expressions: 19.0.0 -> 19.0.1

Diff: https://github.com/cucumber/cucumber-expressions/compare/v19.0.0...v19.0.1

Changelog: https://github.com/cucumber/cucumber-expressions/blob/v19.0.1/CHANGELOG.md
---
 .../python-modules/cucumber-expressions/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/cucumber-expressions/default.nix b/pkgs/development/python-modules/cucumber-expressions/default.nix
index 757b5eded4bd..548b0e83a5df 100644
--- a/pkgs/development/python-modules/cucumber-expressions/default.nix
+++ b/pkgs/development/python-modules/cucumber-expressions/default.nix
@@ -9,21 +9,21 @@
 
 buildPythonPackage rec {
   pname = "cucumber-expressions";
-  version = "19.0.0";
+  version = "19.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cucumber";
     repo = "cucumber-expressions";
     tag = "v${version}";
-    hash = "sha256-0KuHvByHYx7/mjySfWIKp1+ZYw+XNO25eoo5DhPcUsY=";
+    hash = "sha256-RosIA8LaXdpnqJYfowB4d1gWZTd8OfuetiBLNYX5dRc=";
   };
 
   sourceRoot = "${src.name}/python";
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "uv_build>=0.9.0,<0.10.0" uv_build
+      --replace-fail "uv_build>=0.11.0,<0.12.0" uv_build
   '';
 
   build-system = [ uv-build ];

From 34b06668e60e939331911e8943ef10c17aa798f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 03:34:09 +0000
Subject: [PATCH 09/23] python3Packages.xiaomi-ble: 1.11.0 -> 1.12.2

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

diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix
index 0af15e1f58d4..51199e478c91 100644
--- a/pkgs/development/python-modules/xiaomi-ble/default.nix
+++ b/pkgs/development/python-modules/xiaomi-ble/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "xiaomi-ble";
-  version = "1.11.0";
+  version = "1.12.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "xiaomi-ble";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZxsG9qA69ocZc3M3r6EnnQfmBKf13N5EYM6J0VmXNy0=";
+    hash = "sha256-iixyZm/PjWBsaxNCZZa5TJA4eNVVhr42OV4MHHzWt7g=";
   };
 
   build-system = [ poetry-core ];

From 946d605fa7dfbee89d0e2761a1a57fcf64b6c7c5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 05:38:55 +0000
Subject: [PATCH 10/23] brutus: 1.4.0 -> 1.5.1

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

diff --git a/pkgs/by-name/br/brutus/package.nix b/pkgs/by-name/br/brutus/package.nix
index 6ff86fd4bc0a..f4bd5ee04df1 100644
--- a/pkgs/by-name/br/brutus/package.nix
+++ b/pkgs/by-name/br/brutus/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "brutus";
-  version = "1.4.0";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "praetorian-inc";
     repo = "brutus";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1UuxEYhMNyzBTqRzObwsq4Kb4hQG/yU/V8AxA3jrqAw=";
+    hash = "sha256-Jk4O0euYvW7e8iwS0zmKAmw4yXMNU0ABovznzv5tXVM=";
   };
 
-  vendorHash = "sha256-vG4Ld0OTxVk/qnEiACgNXTGq4kt1yjaLIneZ2KbEGpg=";
+  vendorHash = "sha256-YdnKRxPagV6h22QEEOpC/HNUGfyFyWwIsh2LxMUmMrk=";
 
   ldflags = [
     "-s"

From 3c920af4a476981017bbf12d8b1aba5d6714f80d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 12:27:44 +0000
Subject: [PATCH 11/23] goodvibes: 0.8.3 -> 0.8.4

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

diff --git a/pkgs/by-name/go/goodvibes/package.nix b/pkgs/by-name/go/goodvibes/package.nix
index a1413acae3e5..989f4e6300eb 100644
--- a/pkgs/by-name/go/goodvibes/package.nix
+++ b/pkgs/by-name/go/goodvibes/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "goodvibes";
-  version = "0.8.3";
+  version = "0.8.4";
 
   src = fetchFromGitLab {
     owner = "goodvibes";
     repo = "goodvibes";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Lh4FPH0Bdxg2J4IxsZPs8Zjc7Tcobb4bTpvJzVNIy0Y=";
+    hash = "sha256-KEB6qSbsi+Q8NRHx5O9xOViIhuBDZceto53sWJv7As8=";
   };
 
   nativeBuildInputs = [

From 178b76501e956f9cab7a6e33e348d8484a949240 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 18:53:24 +0000
Subject: [PATCH 12/23] turso-cli: 1.0.25 -> 1.0.26

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

diff --git a/pkgs/by-name/tu/turso-cli/package.nix b/pkgs/by-name/tu/turso-cli/package.nix
index b89b6d8a515a..e3a6bba5e2a7 100644
--- a/pkgs/by-name/tu/turso-cli/package.nix
+++ b/pkgs/by-name/tu/turso-cli/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "turso-cli";
-  version = "1.0.25";
+  version = "1.0.26";
 
   src = fetchFromGitHub {
     owner = "tursodatabase";
     repo = "turso-cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-rjh0uxv6mR+wohQMSWoyGqAEYMUWl434QkVr+pml8Xo=";
+    hash = "sha256-M7bYt5eH+beUMQYh/dFhEALot6MRdfc2vH0b9iEvhqc=";
   };
 
   vendorHash = "sha256-4OIJVL3N2mWOw7ZDP4xFCxa9zmUTPCA8N79TVoi1lys=";

From 7b83131834b74922c98fe4b963f44fe6bdeaa446 Mon Sep 17 00:00:00 2001
From: 2kybe3 <kybe@kybe.xyz>
Date: Sun, 24 May 2026 00:37:17 +0200
Subject: [PATCH 13/23] uncover: 1.1.0 -> 1.2.1

Diff: https://github.com/projectdiscovery/uncover/compare/v1.1.0...v1.2.1

Changelog:

- https://github.com/projectdiscovery/uncover/releases/tag/v1.2.0
- https://github.com/projectdiscovery/uncover/releases/tag/v1.2.1
---
 pkgs/by-name/un/uncover/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/un/uncover/package.nix b/pkgs/by-name/un/uncover/package.nix
index 3e78c3f0f62c..41fe96a1dbc7 100644
--- a/pkgs/by-name/un/uncover/package.nix
+++ b/pkgs/by-name/un/uncover/package.nix
@@ -7,16 +7,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "uncover";
-  version = "1.1.0";
+  version = "1.2.1";
+
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "uncover";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BRh25lvk3Zut5M6dedLuSET4514R9j0fUHmamw4rp5U=";
+    hash = "sha256-LFKCUBBgG7dTQhJF9iciyU7GTnQsO+ZdVCtaOnl+Et0=";
   };
 
-  vendorHash = "sha256-6TvPKp/P0v/ZJRGRICp77C/8FHupyr9Hy2+zlYc2HIU=";
+  vendorHash = "sha256-Pkpp2D3b3A5TQ8eXaOf6qKUY/bamdytmuqOVAozK9k0=";
 
   subPackages = [ "cmd/uncover" ];
 
@@ -29,8 +31,6 @@ buildGoModule (finalAttrs: {
 
   doInstallCheck = true;
 
-  versionCheckProgramArg = "-version";
-
   meta = {
     description = "API wrapper to search for exposed hosts";
     longDescription = ''
@@ -40,7 +40,7 @@ buildGoModule (finalAttrs: {
       Currently, it supports shodan,shodan-internetdb, censys, and fofa search API.
     '';
     homepage = "https://github.com/projectdiscovery/uncover";
-    changelog = "https://github.com/projectdiscovery/uncover/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/projectdiscovery/uncover/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "uncover";

From 9e90c1d001be6cc74b9466b11231e8e0149690cf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 24 May 2026 01:13:09 +0200
Subject: [PATCH 14/23] python3Packages.pydantic-graph: 1.101.0 -> 1.102.0

https://github.com/pydantic/pydantic-ai/compare/v1.101.0...v1.102.0
---
 pkgs/development/python-modules/pydantic-graph/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pydantic-graph/default.nix b/pkgs/development/python-modules/pydantic-graph/default.nix
index 9b68c457ca53..ae1f19129b20 100644
--- a/pkgs/development/python-modules/pydantic-graph/default.nix
+++ b/pkgs/development/python-modules/pydantic-graph/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pydantic-graph";
-  version = "1.101.0";
+  version = "1.102.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "pydantic-ai";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Giir7Q6Jfo2Pm7//kn/AvyDTb+r4nLzVux2GxNrSfdw=";
+    hash = "sha256-5mX4o/LqiLAUmn1WXV6RVf2KwDYJ5pxFPtF2meVFp1o=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/pydantic_graph";

From 3293fcc29322f2c5b67ab52a8bba72c523e69bd3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 24 May 2026 01:13:43 +0200
Subject: [PATCH 15/23] python3Packages.pydantic-ai-slim: 1.101.0 -> 1.102.0

https://github.com/pydantic/pydantic-ai/compare/v1.101.0...v1.102.0
---
 pkgs/development/python-modules/pydantic-ai-slim/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pydantic-ai-slim/default.nix b/pkgs/development/python-modules/pydantic-ai-slim/default.nix
index 49d5daa40abf..a5848ca599fc 100644
--- a/pkgs/development/python-modules/pydantic-ai-slim/default.nix
+++ b/pkgs/development/python-modules/pydantic-ai-slim/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pydantic-ai-slim";
-  version = "1.101.0";
+  version = "1.102.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "pydantic-ai";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Giir7Q6Jfo2Pm7//kn/AvyDTb+r4nLzVux2GxNrSfdw=";
+    hash = "sha256-5mX4o/LqiLAUmn1WXV6RVf2KwDYJ5pxFPtF2meVFp1o=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/pydantic_ai_slim";

From 088d581f87df958ab4de71d8b4ee366a1f05a57f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 23:49:26 +0000
Subject: [PATCH 16/23] vscode-extensions.oxc.oxc-vscode: 1.55.0 -> 1.56.0

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

diff --git a/pkgs/applications/editors/vscode/extensions/oxc.oxc-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/oxc.oxc-vscode/default.nix
index 78ec78385a86..e68f0a702232 100644
--- a/pkgs/applications/editors/vscode/extensions/oxc.oxc-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/oxc.oxc-vscode/default.nix
@@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "oxc";
     name = "oxc-vscode";
-    version = "1.55.0";
-    hash = "sha256-QAuN9Qe1AErcGIbbqsYYO6kikgaEiX0Y3ddnNhuOB6Q=";
+    version = "1.56.0";
+    hash = "sha256-wosNcp6CaS7WrH3NwXnsnEdABG2G9BZxRflh+lhr9+Q=";
   };
 
   nativeBuildInputs = [

From 320d9131d2550fe1a6b543d12900f20b70bf30d1 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Sat, 23 May 2026 23:58:38 +0000
Subject: [PATCH 17/23] gexiv2_0_16: fix cross compilation

gi-docgen is only used at build time, so place it in
`nativeBuildInputs` (or rather, remove the extra copy from
`buildInputs`). for the upstream build script to discover the gi-docgen
from `nativeBuildInputs`, it needs a `pkg-config` that would search
there instead of in `buildInputs`, i.e. `depsBuildBuild = [ pkg-config ];`
---
 pkgs/by-name/ge/gexiv2_0_16/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ge/gexiv2_0_16/package.nix b/pkgs/by-name/ge/gexiv2_0_16/package.nix
index 4bfb01eddae5..800d2f25767a 100644
--- a/pkgs/by-name/ge/gexiv2_0_16/package.nix
+++ b/pkgs/by-name/ge/gexiv2_0_16/package.nix
@@ -31,6 +31,10 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "2W+JXyRTn5ZvV3srskia6E+CMpcKjQwGTkoAdHSne7s=";
   };
 
+  depsBuildBuild = [
+    pkg-config
+  ];
+
   nativeBuildInputs = [
     meson
     ninja
@@ -46,7 +50,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     glib
-    gi-docgen
   ];
 
   propagatedBuildInputs = [

From 3415124bf018f43ac014df4ec29eb11a96ff6d66 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 23 May 2026 23:59:03 +0000
Subject: [PATCH 18/23] topgrade: 17.5.0 -> 17.5.1

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

diff --git a/pkgs/by-name/to/topgrade/package.nix b/pkgs/by-name/to/topgrade/package.nix
index 6d8d3ca93244..a2df50a7f08c 100644
--- a/pkgs/by-name/to/topgrade/package.nix
+++ b/pkgs/by-name/to/topgrade/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "topgrade";
-  version = "17.5.0";
+  version = "17.5.1";
 
   src = fetchFromGitHub {
     owner = "topgrade-rs";
     repo = "topgrade";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-50aBypH6TaydbxBif739K1vQOOlSjZvVS9uaVOqZHJU=";
+    hash = "sha256-VNh490nYPPsyWX8DUujTUUMY0hMDisjdBIw1LcCHNGc=";
   };
 
-  cargoHash = "sha256-uoaVc+IQxuPZaO0hA4aXQ2LvmfgeEfBujuD/FkEaH24=";
+  cargoHash = "sha256-eAmfYjbKU9zyIh2lsZ/+bmhqON85tYjT2YJ5iHoVyRs=";
 
   nativeBuildInputs = [
     installShellFiles

From 51179c74cd8b81a551b843826b2f2af9a7fd0726 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 May 2026 00:34:51 +0000
Subject: [PATCH 19/23] home-assistant-custom-lovelace-modules.sankey-chart:
 5.0.1 -> 6.0.0

---
 .../custom-lovelace-modules/sankey-chart/package.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix
index 59a9fa5ad391..614e0dafd54e 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "sankey-chart";
-  version = "5.0.1";
+  version = "6.0.0";
 
   src = fetchFromGitHub {
     owner = "MindFreeze";
     repo = "ha-sankey-chart";
     rev = "v${version}";
-    hash = "sha256-KpdxXZDNdUfV/h4D9Ucx8cTtPt0dbG5iBvJ6TVUulqY=";
+    hash = "sha256-LNJvUy0vj6j5FKaEN2l9AD92pY6qKie1tRiuiA61Q58=";
   };
 
-  npmDepsHash = "sha256-8gHH4C54l2JiGTGpSiRtRHd8Sg6F9B0SCwvXz9zioO0=";
+  npmDepsHash = "sha256-VLByimuvXO+PMTzuK4M07An7nnMXHe8dHS4ptdIt/sc=";
 
   installPhase = ''
     runHook preInstall

From 84f3a33e2727f01e742a080f4c7130a5b817b6f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 May 2026 01:12:08 +0000
Subject: [PATCH 20/23] cargo-shear: 1.12.0 -> 1.12.4

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

diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix
index 29a7b6a42fd8..08e8f65954c8 100644
--- a/pkgs/by-name/ca/cargo-shear/package.nix
+++ b/pkgs/by-name/ca/cargo-shear/package.nix
@@ -8,15 +8,15 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-shear";
-  version = "1.12.0";
+  version = "1.12.4";
 
   src = fetchCrate {
     pname = "cargo-shear";
     version = finalAttrs.version;
-    hash = "sha256-We5VIA/UplWOYliGpLvZe06NdEKaP03Le+5HsBWIJEE=";
+    hash = "sha256-nYAZfUh0ZMU0H+Eb5DOHvENCtDWiCLhzuEB3MFAKWpc=";
   };
 
-  cargoHash = "sha256-Q663sjqg/gguFh5T17Q+QpLN87KxFF3TKUC2pfE9Hoc=";
+  cargoHash = "sha256-xJGITXhC02nOky5P5gzUHAmVyiolchcVofDiaHEX14o=";
 
   env = {
     # https://github.com/Boshen/cargo-shear/blob/v1.6.2/src/lib.rs#L51-L54

From 4016950bbeece085de2f83fe86c2b225687dc0c8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 May 2026 01:59:37 +0000
Subject: [PATCH 21/23] terraform-providers.splunk-terraform_signalfx: 9.28.0
 -> 9.29.0

---
 .../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 5149709d3a87..28981865c82b 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1247,13 +1247,13 @@
     "vendorHash": "sha256-C8TE7uxMf6LOTS6v22mXwUdk2eqQRinwrCH4ZVUCx4k="
   },
   "splunk-terraform_signalfx": {
-    "hash": "sha256-pzro0Uyu12u1pKy22GrZAktoTKngjn4h5mZpABqARk0=",
+    "hash": "sha256-x7mpVptTJ60tJfGt2svzAGErMmYYoMmt7+bT7frb8Lc=",
     "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx",
     "owner": "splunk-terraform",
     "repo": "terraform-provider-signalfx",
-    "rev": "v9.28.0",
+    "rev": "v9.29.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-L+J3vsxxmF3TjQaDL5Uo9IentkDJfGpjfzBYTQzzGvY="
+    "vendorHash": "sha256-41c6wsahOn1AAPz/vx9JJpUjmXGf+DNMORjSto4lca4="
   },
   "spotinst_spotinst": {
     "hash": "sha256-b+Bk3W3/xNF863+kflRVZ0gyk5YyziVS4Ok+H5A3VEg=",

From 3526ef8b97fa87bee7d0969b9679686100b93aa6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 May 2026 03:57:47 +0000
Subject: [PATCH 22/23] vscode-extensions.databricks.databricks: 2.10.7 ->
 2.10.8

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 4d3ee9fa331b..5175b6e3f7c6 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1226,8 +1226,8 @@ let
         mktplcRef = {
           name = "databricks";
           publisher = "databricks";
-          version = "2.10.7";
-          hash = "sha256-ODAUmYiomllLMGbncU4T+8SfLZnhULggFB6Mfw7vn1o=";
+          version = "2.10.8";
+          hash = "sha256-pBfD6HwPP9CybROC2W27CAq2RSAgRJ3ZrxvUOBzRyC8=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/databricks.databricks/changelog";

From 4526b218036b9a059356c8aba76a946d68cfc6bb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 May 2026 04:33:29 +0000
Subject: [PATCH 23/23] vscode-extensions.julialang.language-julia: 1.209.2 ->
 1.215.2

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 4d3ee9fa331b..11a7985f958d 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2648,8 +2648,8 @@ let
         mktplcRef = {
           name = "language-julia";
           publisher = "julialang";
-          version = "1.209.2";
-          hash = "sha256-uS0KYSqJJ1IXEcDy1Y3Fl0GHpEpq6eskgBCoBZqYuUo=";
+          version = "1.215.2";
+          hash = "sha256-/3ULGcywO6SHvABRxaLXJQpjcrVs/vZxUGpG+NaSx3s=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/julialang.language-julia/changelog";