From dbef88f5e0924a6ab32bad0b1d7f6c550f2924f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 14 Dec 2025 09:46:11 +0000
Subject: [PATCH 001/197] python3Packages.pyannote-database: 6.1.0 -> 6.1.1

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

diff --git a/pkgs/development/python-modules/pyannote-database/default.nix b/pkgs/development/python-modules/pyannote-database/default.nix
index 8b060139d4a5..19b292939c76 100644
--- a/pkgs/development/python-modules/pyannote-database/default.nix
+++ b/pkgs/development/python-modules/pyannote-database/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "pyannote-database";
-  version = "6.1.0";
+  version = "6.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyannote";
     repo = "pyannote-database";
     tag = version;
-    hash = "sha256-WDAkxoSI/IW2nIXCDoKa+p2ep1xcWW6WGNHCCZT51tY=";
+    hash = "sha256-72H1tVLtDSYHAgjHWmI7pPQhKGchHz5VP0eRU6NRj2g=";
   };
 
   build-system = [

From e4b9fd3714c0326a5929a7037f1fecf53384771a Mon Sep 17 00:00:00 2001
From: secufoe <135814375+secufoe@users.noreply.github.com>
Date: Mon, 15 Dec 2025 19:53:30 +0100
Subject: [PATCH 002/197] nixos/hardware: always add renesas kernel module to
 initrd

Renesas controllers are used on Dell x86 servers to mount virtual media through iDRAC
---
 nixos/modules/hardware/all-hardware.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/hardware/all-hardware.nix b/nixos/modules/hardware/all-hardware.nix
index 7e67cd7d43fe..83965933172e 100644
--- a/nixos/modules/hardware/all-hardware.nix
+++ b/nixos/modules/hardware/all-hardware.nix
@@ -81,6 +81,7 @@ in
       # USB support, especially for booting from USB CD-ROM
       # drives.
       "uas"
+      "xhci-pci-renesas"
 
       # SD cards.
       "sdhci_pci"
@@ -156,9 +157,6 @@ in
       "pinctrl-axp209"
       "mp8859"
 
-      # USB drivers
-      "xhci-pci-renesas"
-
       # Reset controllers
       "reset-raspberrypi" # Triggers USB chip firmware load.
 

From 938da573e5d020968e8399636c14fffa4988c785 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Mar 2026 00:30:28 +0000
Subject: [PATCH 003/197] appgate-sdp: 6.4.2 -> 6.5.4

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

diff --git a/pkgs/by-name/ap/appgate-sdp/package.nix b/pkgs/by-name/ap/appgate-sdp/package.nix
index baf8eca6ddf2..007ea35ad2e9 100644
--- a/pkgs/by-name/ap/appgate-sdp/package.nix
+++ b/pkgs/by-name/ap/appgate-sdp/package.nix
@@ -99,11 +99,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "appgate-sdp";
-  version = "6.4.2";
+  version = "6.5.4";
 
   src = fetchurl {
     url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb";
-    sha256 = "sha256-xFpBC6X95C01wUfzJ3a0kMz898k6BItkpJLcUmfd7oY=";
+    sha256 = "sha256-tVHGAP90C4Jxz+Ur1hmlCmQ2tOtaSuIvAUQAqu6BKRw=";
   };
 
   # just patch interpreter

From d6fac895224daf8a40ef7c95a1af19681d68a3e8 Mon Sep 17 00:00:00 2001
From: Bart Louwers <bart@emeel.net>
Date: Thu, 2 Apr 2026 16:33:32 +0200
Subject: [PATCH 004/197] awatcher: 0.3.1 -> 0.3.3

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

diff --git a/pkgs/by-name/aw/awatcher/package.nix b/pkgs/by-name/aw/awatcher/package.nix
index e536a00b6423..d70a02326c02 100644
--- a/pkgs/by-name/aw/awatcher/package.nix
+++ b/pkgs/by-name/aw/awatcher/package.nix
@@ -4,24 +4,28 @@
   fetchFromGitHub,
   openssl,
   pkg-config,
+  libxkbcommon,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "awatcher";
-  version = "0.3.1";
+  version = "0.3.3";
 
   src = fetchFromGitHub {
     owner = "2e3s";
     repo = "awatcher";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-bxFc6oM+evIQTjrsWmb7dXOUlSjurjc4CzHpxB+667c=";
+    hash = "sha256-wxnbyWkfRFN+aWa7rrSIv5PdNHNU/D/w7y/VIwzxxaI=";
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ openssl ];
+  buildInputs = [
+    openssl
+    libxkbcommon
+  ];
   doCheck = false;
 
-  cargoHash = "sha256-pUqwg7jblSWRLPcsUDqkir/asSM8zY0jrvrre4OIeZc=";
+  cargoHash = "sha256-/dI0gaTRElAQnZNRo2sKMUc33fphubcG/fXOflPHXWs=";
 
   meta = {
     description = "Activity and idle watchers";

From c7fcbdc5445a2b73cd2f90319e086733617d2d6a Mon Sep 17 00:00:00 2001
From: Peter Collingbourne <peter@pcc.me.uk>
Date: Tue, 14 Apr 2026 00:17:58 -0700
Subject: [PATCH 005/197] elfutils: always depend on pkg-config

This elfutils commit:
https://github.com/roolebo/elfutils/commit/30b5592a34a69b43018763428a0bfbe29d91ab68
moved the pkg-config check to the top level, causing the build to fail
with debuginfod disabled. Fix it by making our pkg-config depdendency
unconditional.
---
 pkgs/by-name/el/elfutils/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/el/elfutils/package.nix b/pkgs/by-name/el/elfutils/package.nix
index af61f576933c..d56511853384 100644
--- a/pkgs/by-name/el/elfutils/package.nix
+++ b/pkgs/by-name/el/elfutils/package.nix
@@ -87,8 +87,8 @@ stdenv.mkDerivation (finalAttrs: {
     flex
     gettext
     bzip2
-  ]
-  ++ lib.optional enableDebuginfod pkg-config;
+    pkg-config
+  ];
   buildInputs = [
     zlib
     zstd

From 63b5d39440b087498fa511697165bcf7d534c164 Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Fri, 8 May 2026 21:20:10 +0000
Subject: [PATCH 006/197] lc0: 0.31.2 -> 0.32.1

---
 pkgs/by-name/lc/lc0/package.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lc/lc0/package.nix b/pkgs/by-name/lc/lc0/package.nix
index 468ccf10ab6a..cc79a4b3665a 100644
--- a/pkgs/by-name/lc/lc0/package.nix
+++ b/pkgs/by-name/lc/lc0/package.nix
@@ -9,20 +9,28 @@
   zlib,
   gtest,
   eigen,
+  abseil-cpp,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lc0";
-  version = "0.31.2";
+  version = "0.32.1";
 
   src = fetchFromGitHub {
     owner = "LeelaChessZero";
     repo = "lc0";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8watDDxSyZ5khYqpXPyjQso2MkOzfI6o2nt0vkuiEUI=";
+    hash = "sha256-Dvq698ZfYumoax7i1nN5GwTQKXgby9+TdTZT6C7/jgc=";
     fetchSubmodules = true;
   };
 
+  postPatch = ''
+    substituteInPlace meson.build \
+      --replace-fail "absl = subproject('abseil-cpp', default_options : ['warning_level=0', 'cpp_std=c++20'])" "" \
+      --replace-fail "deps += absl.get_variable('absl_container_dep').as_system()" "deps += [dependency('absl_flat_hash_map'), dependency('absl_cleanup'), dependency('absl_base')]" \
+      --replace-fail "if eigen_dep.found() and cc.has_header('Eigen/Core')" "if eigen_dep.found()"
+  '';
+
   patchPhase = ''
     runHook prePatch
 
@@ -44,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     eigen
     gtest
     zlib
+    abseil-cpp
   ];
 
   mesonFlags = [
@@ -57,6 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
+  doCheck = true;
+
   meta = {
     homepage = "https://lczero.org/";
     description = "Open source neural network based chess engine";

From 6316ae4c30ec956a32ad8e5b588fbfceabb6f76f Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 10 Mar 2026 00:56:42 +0000
Subject: [PATCH 007/197] dovecot: add mysql-config dependency

Required when using `withMySQL` with `strictDeps` set to true.
---
 pkgs/by-name/do/dovecot/generic.nix | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/do/dovecot/generic.nix b/pkgs/by-name/do/dovecot/generic.nix
index 7c6c2768f505..40326745401c 100644
--- a/pkgs/by-name/do/dovecot/generic.nix
+++ b/pkgs/by-name/do/dovecot/generic.nix
@@ -7,6 +7,7 @@
   autoreconfHook,
   stdenv,
   lib,
+  buildPackages,
   fetchzip,
   flex,
   bison,
@@ -54,7 +55,20 @@
   withLua ? false,
   lua5_3,
 }:
-
+let
+  # The `nativeBuildInputs` version of `mysql_config` emits headers and libraries for
+  # the build platform, not the host platform; `pkg-config` emits the correct versions.
+  fake_mysql_config = buildPackages.writeShellScriptBin "mysql_config" ''
+    if [ "$1" == "--include" ]; then
+      "$PKG_CONFIG" --cflags mysqlclient
+    elif [ "$1" == "--libs" ]; then
+      "$PKG_CONFIG" --libs mysqlclient
+    else
+      echo "fake_mysql_config: unsupported option: $1" >&2
+      exit 1
+    fi
+  '';
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "dovecot";
   inherit version;
@@ -66,7 +80,8 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ]
   ++ lib.optionals (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]
-  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ autoreconfHook ];
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ autoreconfHook ]
+  ++ lib.optional (withMySQL && lib.versionOlder version "2.4") fake_mysql_config;
 
   buildInputs = [
     openssl

From ecd6e3e99aac38fa529c1c96ab177eabbd78f287 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Fri, 22 May 2026 15:17:56 +0300
Subject: [PATCH 008/197] python3Packages.pycups: modernize and migrate to
 pyproject

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

diff --git a/pkgs/development/python-modules/pycups/default.nix b/pkgs/development/python-modules/pycups/default.nix
index 178eddc96390..d4167a661254 100644
--- a/pkgs/development/python-modules/pycups/default.nix
+++ b/pkgs/development/python-modules/pycups/default.nix
@@ -5,18 +5,21 @@
   fetchPypi,
   cups,
   libiconv,
+  setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pycups";
   version = "2.0.4";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-hD44XB2/aUmWyoTvAqfzDCg3YDVYj1++rNa64AXPfI0=";
   };
 
+  build-system = [ setuptools ];
+
   buildInputs = [ cups ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
 
   # Wants to connect to CUPS
@@ -27,4 +30,4 @@ buildPythonPackage rec {
     homepage = "http://cyberelk.net/tim/software/pycups/";
     license = with lib.licenses; [ gpl2Plus ];
   };
-}
+})

From 687b46d1eb812daa171c8ca858575de65b762b24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniels=20=C5=A0atcs?= <dev@dshatz.com>
Date: Fri, 29 May 2026 19:10:03 +0300
Subject: [PATCH 009/197] maintainers: add dshatz

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index baf912a567cf..ca36ed670ad8 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7366,6 +7366,13 @@
     github = "DSeeLP";
     githubId = 46624152;
   };
+  dshatz = {
+    email = "dev@dshatz.com";
+    github = "dshatz";
+    githubId = 23437798;
+    name = "Daniels Šatcs";
+    keys = [ { fingerprint = "7452B4B47EA8F6635AB545CA4B974CC26375BB06"; } ];
+  };
   dsluijk = {
     name = "Dany Sluijk";
     email = "nix@dany.dev";

From 9f49d219bfcd63b65f724005e322b0b85cd81809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniels=20=C5=A0atcs?= <dev@dshatz.com>
Date: Fri, 29 May 2026 16:14:37 +0300
Subject: [PATCH 010/197] python3Packages.adbutils: init at 2.12.0

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

diff --git a/pkgs/development/python-modules/adbutils/default.nix b/pkgs/development/python-modules/adbutils/default.nix
new file mode 100644
index 000000000000..61787192397b
--- /dev/null
+++ b/pkgs/development/python-modules/adbutils/default.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  buildPythonPackage,
+  setuptools,
+  fetchFromGitHub,
+  pytestCheckHook,
+  requests,
+  deprecation,
+  retry2,
+  pillow,
+  pbr,
+  stdenv,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "adbutils";
+  version = "2.12.0";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "openatx";
+    repo = "adbutils";
+    tag = finalAttrs.version;
+    hash = "sha256-zJz4fBekKOUeqBBfBPgGnHXVEKddelqReAQ2CEblObs=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  env = {
+    PBR_VERSION = finalAttrs.version;
+  };
+
+  nativeCheckInputs = [ pytestCheckHook ];
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
+  dependencies = [
+    pbr
+    deprecation
+    pillow
+    requests
+    retry2
+  ];
+
+  pythonImportsCheck = [ "adbutils" ];
+
+  meta = {
+    description = "Pure python adb library for google adb service";
+    homepage = "https://github.com/openatx/adbutils";
+    changelog = "https://github.com/openatx/adbutils/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dshatz ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cdd6de621e08..d765c05825eb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -85,6 +85,8 @@ self: super: with self; {
 
   adblock = callPackage ../development/python-modules/adblock { };
 
+  adbutils = callPackage ../development/python-modules/adbutils { };
+
   add-trailing-comma = callPackage ../development/python-modules/add-trailing-comma { };
 
   addict = callPackage ../development/python-modules/addict { };

From 0432f5e6f3f446ee1cdd38eee728f8681be98068 Mon Sep 17 00:00:00 2001
From: Philip Munksgaard <philip@munksgaard.me>
Date: Tue, 2 Jun 2026 09:33:36 +0200
Subject: [PATCH 011/197] graphite-cli: 1.7.20 -> 1.8.6

Since 1.8, graphite has started relying on binary packages prebuilt per host
platform, kind of like obsidian. Therefore, to support newer versions of
graphite, I've altered the package definition to download those binary packages
directly (one for each platform). On Linux we need a FHS environment wrapper,
which makes the code a bit more complex.

I've taken the liberty of also adding a version check to the package.
---
 .../by-name/gr/graphite-cli/package-lock.json |  36 -----
 pkgs/by-name/gr/graphite-cli/package.nix      | 135 ++++++++++++++----
 pkgs/by-name/gr/graphite-cli/update.sh        |  30 ++--
 3 files changed, 122 insertions(+), 79 deletions(-)
 delete mode 100644 pkgs/by-name/gr/graphite-cli/package-lock.json

diff --git a/pkgs/by-name/gr/graphite-cli/package-lock.json b/pkgs/by-name/gr/graphite-cli/package-lock.json
deleted file mode 100644
index 35da6f75584d..000000000000
--- a/pkgs/by-name/gr/graphite-cli/package-lock.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "name": "@withgraphite/graphite-cli",
-  "version": "1.7.20",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "@withgraphite/graphite-cli",
-      "version": "1.7.20",
-      "hasInstallScript": true,
-      "license": "None",
-      "dependencies": {
-        "semver": "^7.5.4"
-      },
-      "bin": {
-        "graphite": "graphite.js",
-        "gt": "graphite.js"
-      },
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "node_modules/semver": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
-      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    }
-  }
-}
diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix
index d8e487c11a11..c9fe9e7f899d 100644
--- a/pkgs/by-name/gr/graphite-cli/package.nix
+++ b/pkgs/by-name/gr/graphite-cli/package.nix
@@ -1,42 +1,26 @@
 {
   lib,
   stdenv,
-  buildNpmPackage,
   fetchurl,
+  buildFHSEnv,
   git,
   installShellFiles,
+  testers,
+  graphite-cli,
 }:
 
-buildNpmPackage rec {
-  pname = "graphite-cli";
-  version = "1.7.20";
-
-  src = fetchurl {
-    url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz";
-    hash = "sha256-Xzq6+fsWRPoiPxtk1zNARCkIPBu64ipAKqPVU2dnV9E=";
+let
+  selectSystem =
+    attrs:
+    attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+  suffix = selectSystem {
+    x86_64-linux = "linux-x64";
+    aarch64-linux = "linux-arm64";
+    x86_64-darwin = "darwin-x64";
+    aarch64-darwin = "darwin-arm64";
   };
 
-  npmDepsHash = "sha256-6JzVDgrV5kUKES7/z+0aU+Rs6VabdKhcfru38j3Jmcw=";
-
-  postPatch = ''
-    ln -s ${./package-lock.json} package-lock.json
-  '';
-
-  nativeBuildInputs = [
-    git
-    installShellFiles
-  ];
-
-  dontNpmBuild = true;
-
-  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-    installShellCompletion --cmd gt \
-      --bash <($out/bin/gt completion) \
-      --fish <(GT_PAGER= $out/bin/gt fish) \
-      --zsh <(ZSH_NAME=zsh $out/bin/gt completion)
-  '';
-
-  passthru.updateScript = ./update.sh;
+  version = "1.8.6";
 
   meta = {
     changelog = "https://graphite.dev/docs/cli-changelog";
@@ -46,5 +30,96 @@ buildNpmPackage rec {
     license = lib.licenses.unfree; # no license specified
     mainProgram = "gt";
     maintainers = with lib.maintainers; [ joshheinrichs-shopify ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
   };
-}
+
+  passthru = {
+    updateScript = ./update.sh;
+    tests.version = testers.testVersion {
+      package = graphite-cli;
+      command = "gt --version";
+    };
+  };
+
+  shellCompletions = ''
+    installShellCompletion --cmd gt \
+      --bash <($out/bin/gt completion) \
+      --zsh <(ZSH_NAME=zsh $out/bin/gt completion) \
+      --fish <($out/bin/gt fish)
+  '';
+
+  unwrapped = stdenv.mkDerivation {
+    pname = "graphite-cli-unwrapped";
+    inherit version meta passthru;
+    strictDeps = true;
+
+    src = fetchurl {
+      url = "https://registry.npmjs.org/@withgraphite/graphite-cli-${suffix}/-/graphite-cli-${suffix}-${version}.tgz";
+      hash = selectSystem {
+        x86_64-linux = "sha256-YnG3iw35ZEyGbB9vGdcnj0qkvUfyLuaIEB5l09hkRck=";
+        aarch64-linux = "sha256-Z4yY26hXf8++TX5tJcqufsAULTn9oUL90d9tDZj5d/k=";
+        x86_64-darwin = "sha256-oV0tanuk2dzB62uChni9CJtSw3eFECQi3aMBc+ZV7Do=";
+        aarch64-darwin = "sha256-6eogi8fMOD5IgRyEdPRxdDa17WytB1JwTpKRzyyhQ2Q=";
+      };
+    };
+
+    nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+      git
+      installShellFiles
+    ];
+
+    dontConfigure = true;
+    dontBuild = true;
+    # On Linux the binary is wrapped with buildFHSEnv; completions are
+    # generated there. Here we only need to skip fixup to avoid patchelf/strip.
+    dontFixup = stdenv.hostPlatform.isLinux;
+
+    installPhase = ''
+      runHook preInstall
+      install -Dm755 bin/gt $out/bin/gt
+      runHook postInstall
+    '';
+
+    postInstall = lib.optionalString stdenv.hostPlatform.isDarwin shellCompletions;
+  };
+in
+# The binary is built with vercel/pkg, which appends a virtual filesystem to
+# the executable at fixed byte offsets. patchelf and strip shift those offsets,
+# corrupting the embedded data, so the binary must remain completely unmodified.
+# On Linux we use buildFHSEnv to provide /lib64/ld-linux-*.so.* and shared
+# libraries without touching the binary. On Darwin this isn't needed.
+if stdenv.hostPlatform.isLinux then
+  (buildFHSEnv {
+    pname = "graphite-cli";
+    inherit version passthru;
+
+    targetPkgs = pkgs: [
+      unwrapped
+      pkgs.stdenv.cc.cc.lib
+      git
+    ];
+
+    runScript = "gt";
+
+    extraInstallCommands = ''
+      ln -s $out/bin/graphite-cli $out/bin/gt
+      source ${installShellFiles}/nix-support/setup-hook
+      ${shellCompletions}
+    '';
+
+    meta = meta // {
+      platforms = [
+        "x86_64-linux"
+        "aarch64-linux"
+      ];
+    };
+  }).overrideAttrs
+    { strictDeps = true; }
+else
+  unwrapped
diff --git a/pkgs/by-name/gr/graphite-cli/update.sh b/pkgs/by-name/gr/graphite-cli/update.sh
index 2f89e6fcd18b..e60ea11060b1 100755
--- a/pkgs/by-name/gr/graphite-cli/update.sh
+++ b/pkgs/by-name/gr/graphite-cli/update.sh
@@ -1,12 +1,10 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i bash -p gnused nix nodejs prefetch-npm-deps wget
+#! nix-shell -i bash -p gnused nix nodejs
 
 set -euo pipefail
 pushd "$(dirname "${BASH_SOURCE[0]}")"
 
 version=$(npm view @withgraphite/graphite-cli version)
-tarball="graphite-cli-$version.tgz"
-url="https://registry.npmjs.org/@withgraphite/graphite-cli/-/$tarball"
 
 if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then
     echo "Already up to date!"
@@ -15,16 +13,22 @@ fi
 
 sed -i 's#version = "[^"]*"#version = "'"$version"'"#' package.nix
 
-sha256=$(nix-prefetch-url "$url")
-src_hash=$(nix-hash --to-sri --type sha256 "$sha256")
-sed -i 's#hash = "[^"]*"#hash = "'"$src_hash"'"#' package.nix
+tmpdir=$(mktemp -d)
+trap 'rm -rf "$tmpdir"' EXIT
 
-rm -f package-lock.json package.json *.tgz
-wget "$url"
-tar xf "$tarball" --strip-components=1 package/package.json
-npm i --package-lock-only --ignore-scripts
-npm_hash=$(prefetch-npm-deps package-lock.json)
-sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' package.nix
-rm -f package.json *.tgz
+for platform in linux-x64 linux-arm64 darwin-x64 darwin-arm64; do
+    (
+        url="https://registry.npmjs.org/@withgraphite/graphite-cli-${platform}/-/graphite-cli-${platform}-${version}.tgz"
+        sha256=$(nix-prefetch-url "$url")
+        nix-hash --to-sri --type sha256 "$sha256" > "$tmpdir/$platform"
+    ) &
+done
+wait
+
+for platform in linux-x64 linux-arm64 darwin-x64 darwin-arm64; do
+    hash=$(cat "$tmpdir/$platform")
+    # Each platform hash appears only once in the file
+    sed -i "/${platform}/s#\"sha256-[^\"]*\"#\"${hash}\"#" package.nix
+done
 
 popd

From b5b1b487dea951e7dc28115bd74994962390647f Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 01:31:44 +0700
Subject: [PATCH 012/197] python3Packages.baselines: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/baselines/default.nix b/pkgs/development/python-modules/baselines/default.nix
index 7077da5601e3..641add7e269d 100644
--- a/pkgs/development/python-modules/baselines/default.nix
+++ b/pkgs/development/python-modules/baselines/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   pytest,
   gym,
   scipy,
@@ -19,7 +20,7 @@
 buildPythonPackage {
   pname = "baselines";
   version = "0.1.6"; # remember to manually adjust the rev
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "openai";
@@ -29,7 +30,9 @@ buildPythonPackage {
     sha256 = "0j2ck7rsrcyny9qbmrw9aqvzfhv70nbign8iva2dsisa2x24gbcl";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     gym
     scipy
     tqdm

From f3de18104755bec9584f6f836aa436122cff1d1a Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 01:36:26 +0700
Subject: [PATCH 013/197] python3Packages.baselines: modernize

---
 pkgs/development/python-modules/baselines/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/baselines/default.nix b/pkgs/development/python-modules/baselines/default.nix
index 641add7e269d..38eb1e4b66cd 100644
--- a/pkgs/development/python-modules/baselines/default.nix
+++ b/pkgs/development/python-modules/baselines/default.nix
@@ -22,12 +22,14 @@ buildPythonPackage {
   version = "0.1.6"; # remember to manually adjust the rev
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "openai";
     repo = "baselines";
     # Unfortunately releases are not tagged. This commit bumps the version in setup.py
     rev = "2bca7901f51c88cdef3ca0666c6a87c454a4dbe8";
-    sha256 = "0j2ck7rsrcyny9qbmrw9aqvzfhv70nbign8iva2dsisa2x24gbcl";
+    hash = "sha256-lK1HRBdKR92E2hHZF5cFZ0P3N1aJ57pw8tazrPOZTEg=";
   };
 
   build-system = [ setuptools ];
@@ -58,6 +60,8 @@ buildPythonPackage {
 
   nativeCheckInputs = [ pytest ];
 
+  pythonImportsCheck = [ "baselines" ];
+
   meta = {
     description = "High-quality implementations of reinforcement learning algorithms";
     homepage = "https://github.com/openai/baselines";

From 2c3f6afeb286fca3e8d4ce45d281899234ac75cc Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 02:46:41 +0700
Subject: [PATCH 014/197] python3Packages.bleach-allowlist: migrate to
 pyproject

---
 .../python-modules/bleach-allowlist/default.nix            | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bleach-allowlist/default.nix b/pkgs/development/python-modules/bleach-allowlist/default.nix
index 575d33f4f5e2..870266a36292 100644
--- a/pkgs/development/python-modules/bleach-allowlist/default.nix
+++ b/pkgs/development/python-modules/bleach-allowlist/default.nix
@@ -2,20 +2,23 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   bleach,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "bleach-allowlist";
   version = "1.0.3";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
     hash = "sha256-VuIghgeaDmoxAK6Z5NuvIOslhUhlmOsOmUAIoRQo2ps=";
   };
 
-  propagatedBuildInputs = [ bleach ];
+  build-system = [ setuptools ];
+
+  dependencies = [ bleach ];
 
   # No tests
   doCheck = false;

From 8ab3a9d763e8edbfb764ec2153d7f9b8c9f2ce73 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 02:48:10 +0700
Subject: [PATCH 015/197] python3Packages.bleach-allowlist: modernize

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

diff --git a/pkgs/development/python-modules/bleach-allowlist/default.nix b/pkgs/development/python-modules/bleach-allowlist/default.nix
index 870266a36292..3cfdea9dc06c 100644
--- a/pkgs/development/python-modules/bleach-allowlist/default.nix
+++ b/pkgs/development/python-modules/bleach-allowlist/default.nix
@@ -11,6 +11,8 @@ buildPythonPackage (finalAttrs: {
   version = "1.0.3";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
     inherit (finalAttrs) pname version;
     hash = "sha256-VuIghgeaDmoxAK6Z5NuvIOslhUhlmOsOmUAIoRQo2ps=";

From e65099c8f1691d30aa513c7fd272c562d318eb0f Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 09:12:54 +0700
Subject: [PATCH 016/197] python3Packages.bsdiff4: migrate to pyproject

---
 pkgs/development/python-modules/bsdiff4/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/bsdiff4/default.nix b/pkgs/development/python-modules/bsdiff4/default.nix
index e37b314f6b96..09e66e9312b4 100644
--- a/pkgs/development/python-modules/bsdiff4/default.nix
+++ b/pkgs/development/python-modules/bsdiff4/default.nix
@@ -2,18 +2,21 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "bsdiff4";
   version = "1.2.6";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-KrV9AaeLOeKeWszJz+rUEwmC3tncy8QmG9DpxR1rdR0=";
   };
 
+  build-system = [ setuptools ];
+
   pythonImportsCheck = [ "bsdiff4" ];
 
   checkPhase = ''

From a9be4d8f3cf5a734a7830e3fb553ade8b957383a Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 09:20:54 +0700
Subject: [PATCH 017/197] python3Packages.bsdiff4: modernize

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

diff --git a/pkgs/development/python-modules/bsdiff4/default.nix b/pkgs/development/python-modules/bsdiff4/default.nix
index 09e66e9312b4..7800d69a3194 100644
--- a/pkgs/development/python-modules/bsdiff4/default.nix
+++ b/pkgs/development/python-modules/bsdiff4/default.nix
@@ -5,13 +5,15 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "bsdiff4";
   version = "1.2.6";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-KrV9AaeLOeKeWszJz+rUEwmC3tncy8QmG9DpxR1rdR0=";
   };
 
@@ -27,8 +29,8 @@ buildPythonPackage rec {
   meta = {
     description = "Binary diff and patch using the BSDIFF4-format";
     homepage = "https://github.com/ilanschnell/bsdiff4";
-    changelog = "https://github.com/ilanschnell/bsdiff4/blob/${version}/CHANGELOG.txt";
+    changelog = "https://github.com/ilanschnell/bsdiff4/blob/${finalAttrs.version}/CHANGELOG.txt";
     license = lib.licenses.bsdProtection;
     maintainers = with lib.maintainers; [ ris ];
   };
-}
+})

From 9cfffc01fb075d79d9d63084b07933906ca407e9 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 7 Jun 2026 11:00:09 +0700
Subject: [PATCH 018/197] python3Packages.clean-fid: migrate to pyproject

---
 pkgs/development/python-modules/clean-fid/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/clean-fid/default.nix b/pkgs/development/python-modules/clean-fid/default.nix
index 3e2441c55024..7a856f935877 100644
--- a/pkgs/development/python-modules/clean-fid/default.nix
+++ b/pkgs/development/python-modules/clean-fid/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
 
   # dependencies
   numpy,
@@ -16,7 +17,7 @@
 buildPythonPackage {
   pname = "clean-fid";
   version = "0.1.35";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "GaParmar";
@@ -25,7 +26,9 @@ buildPythonPackage {
     hash = "sha256-fqBU/TmCXDTPU3KTP0+VYQoP+HsT2UMcZeLzQHKD9hw=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     numpy
     pillow
     requests

From 8724b8cd53b3f8ef3e7ed1e5969efb144c9b4195 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 7 Jun 2026 11:04:02 +0700
Subject: [PATCH 019/197] python3Packages.clean-fid: modernize

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

diff --git a/pkgs/development/python-modules/clean-fid/default.nix b/pkgs/development/python-modules/clean-fid/default.nix
index 7a856f935877..ececc55ddfa5 100644
--- a/pkgs/development/python-modules/clean-fid/default.nix
+++ b/pkgs/development/python-modules/clean-fid/default.nix
@@ -19,6 +19,8 @@ buildPythonPackage {
   version = "0.1.35";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "GaParmar";
     repo = "clean-fid";

From 4804ea1ac70ccc7580a12b28f9a52621adc06ce9 Mon Sep 17 00:00:00 2001
From: Eric Wolf <robo-eric@gmx.de>
Date: Wed, 10 Jun 2026 01:38:34 +0200
Subject: [PATCH 020/197] fail2ban: revert fix for dovecot filter's
 journalmatch

Since the dovecot systemd service has been renamed to `dovecot.service`
the fix causes fail2ban to ignore any log entries produced by dovecot.
Since it was originally added as a workaround for the service being
named `dovecot2.service` it can just be removed, see NixOS/nixpkgs#63600.
---
 pkgs/by-name/fa/fail2ban/package.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/by-name/fa/fail2ban/package.nix b/pkgs/by-name/fa/fail2ban/package.nix
index e851036fbafa..989edc8c7a3b 100644
--- a/pkgs/by-name/fa/fail2ban/package.nix
+++ b/pkgs/by-name/fa/fail2ban/package.nix
@@ -52,9 +52,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
       substituteInPlace $i \
         --replace /usr/sbin/sendmail sendmail
     done
-
-    substituteInPlace config/filter.d/dovecot.conf \
-      --replace dovecot.service dovecot2.service
   '';
 
   doCheck = false;

From 809df45b785db25c57d61466b92d35db0ecb4794 Mon Sep 17 00:00:00 2001
From: kashw2 <supra4keanu@hotmail.com>
Date: Thu, 11 Jun 2026 13:39:12 +1000
Subject: [PATCH 021/197] vwifi: 6.3-unstable-2025-02-04 -> 7.1

---
 pkgs/by-name/vw/vwifi/makefile.patch | 41 ----------------------------
 pkgs/by-name/vw/vwifi/package.nix    | 10 +++----
 2 files changed, 5 insertions(+), 46 deletions(-)
 delete mode 100644 pkgs/by-name/vw/vwifi/makefile.patch

diff --git a/pkgs/by-name/vw/vwifi/makefile.patch b/pkgs/by-name/vw/vwifi/makefile.patch
deleted file mode 100644
index 8d82129e8e5a..000000000000
--- a/pkgs/by-name/vw/vwifi/makefile.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 9430d7e..e46efd3 100644
---- a/Makefile
-+++ b/Makefile
-@@ -2,8 +2,10 @@
- #
- NAME	:=	vwifi
- VERSION	:=	6.3
--BINDIR	:=	$(DESTDIR)/usr/local/bin
--MANDIR	:=	$(DESTDIR)/usr/local/man/man1
-+PREFIX	?=	$(out)
-+DESTDIR	?=	$(PREFIX)
-+BINDIR	?=	$(PREFIX)/bin
-+MANDIR	?=	$(PREFIX)/share/man/man1
- 
- EXEC	:=	vwifi-server vwifi-client vwifi-ctrl vwifi-add-interfaces
- #EXEC	:=	vwifi-server vwifi-client vwifi-ctrl vwifi-add-interfaces vwifi-inet-monitor
-@@ -23,10 +25,8 @@ MODE+= -O3 -s -Wall -Wextra -pedantic # //////////      RELEASE
- 
- EDITOR	?=	geany
- 
--NETLINK_FLAGS_PATH := /usr/include/libnl3
--NETLINK_FLAGS := -I $(NETLINK_FLAGS_PATH)
--NETLINK_LIBS_PATH := .
--NETLINK_LIBS := -L $(NETLINK_LIBS_PATH) -lnl-genl-3 -lnl-3
-+NETLINK_FLAGS := $(shell pkg-config --cflags libnl-3.0 libnl-genl-3.0)
-+NETLINK_LIBS := $(shell pkg-config --libs libnl-3.0 libnl-genl-3.0)
- 
- THREAD_LIBS := -lpthread
- 
-@@ -101,10 +101,6 @@ gitversion: .git
- 	@sed -i "s/^\(VERSION.[^\-]*\)\(-.*\)\?/\1-$(shell git log --pretty=format:"%h" -n 1)/g" Makefile
- 
- install : build
--ifneq ($(EUID),0)
--	@echo "Please run 'make install' as root user"
--	@exit 1
--endif
- 	chmod +x $(EXEC)
- 	# Install binaire :
- 	mkdir -p $(BINDIR) && cp -p $(EXEC) $(BINDIR)
diff --git a/pkgs/by-name/vw/vwifi/package.nix b/pkgs/by-name/vw/vwifi/package.nix
index 21f40ff19916..2cf892b21ced 100644
--- a/pkgs/by-name/vw/vwifi/package.nix
+++ b/pkgs/by-name/vw/vwifi/package.nix
@@ -2,26 +2,26 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  cmake,
   libnl,
   pkg-config,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vwifi";
-  version = "6.3-unstable-2025-02-04";
+  version = "7.1";
   src = fetchFromGitHub {
     owner = "Raizo62";
     repo = "vwifi";
-    rev = "18c320b1b92bea241ad801d05e0f2b4748478fd9";
-    hash = "sha256-rlwBO5/xyr8KjvacxYt7dBrV1noXhwBJaElGhmM/eWU=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-ed7MLPLdKIK9e4EQq83GwKWiOX3tNJShiFdnNgFGj7Q=";
   };
 
-  patches = [ ./makefile.patch ];
-
   buildInputs = [
     libnl
   ];
 
   nativeBuildInputs = [
+    cmake
     pkg-config
   ];
 

From 070895c80ff68f31681c976005218c36c2fb04a3 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 12 Jun 2026 09:17:25 +0200
Subject: [PATCH 022/197] python3Packages.zict: disable one test

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

diff --git a/pkgs/development/python-modules/zict/default.nix b/pkgs/development/python-modules/zict/default.nix
index a5b9f41a374d..86b820395b40 100644
--- a/pkgs/development/python-modules/zict/default.nix
+++ b/pkgs/development/python-modules/zict/default.nix
@@ -28,6 +28,11 @@ buildPythonPackage (finalAttrs: {
     pytest-timeout
   ];
 
+  disabledTests = [
+    # timeout
+    "test_stress_different_keys_threadsafe"
+  ];
+
   meta = {
     description = "Mutable mapping tools";
     homepage = "https://github.com/dask/zict";

From 74a7a22ea1d26fec31df5205e2af0a78f62ef375 Mon Sep 17 00:00:00 2001
From: Cathal Mullan <contact@cathal.dev>
Date: Sun, 14 Jun 2026 03:06:08 +0100
Subject: [PATCH 023/197] aws-lc: generate Rust bindings

---
 pkgs/by-name/aw/aws-lc/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/aw/aws-lc/package.nix b/pkgs/by-name/aw/aws-lc/package.nix
index 1a41182017bd..b25568341333 100644
--- a/pkgs/by-name/aw/aws-lc/package.nix
+++ b/pkgs/by-name/aw/aws-lc/package.nix
@@ -4,10 +4,12 @@
   cmakeMinimal,
   fetchFromGitHub,
   ninja,
+  rust-bindgen,
   testers,
   aws-lc,
   nix-update-script,
   useSharedLibraries ? !stdenv.hostPlatform.isStatic,
+  withRustBindings ? true,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "aws-lc";
@@ -29,10 +31,14 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmakeMinimal
     ninja
+  ]
+  ++ lib.optionals withRustBindings [
+    rust-bindgen
   ];
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_SHARED_LIBS" useSharedLibraries)
+    (lib.cmakeBool "GENERATE_RUST_BINDINGS" withRustBindings)
     "-GNinja"
     "-DDISABLE_GO=ON"
     "-DDISABLE_PERL=ON"
@@ -50,6 +56,9 @@ stdenv.mkDerivation (finalAttrs: {
   postInstall = ''
     moveToOutput lib/crypto/cmake "$dev"
     moveToOutput lib/ssl/cmake "$dev"
+  ''
+  + lib.optionalString withRustBindings ''
+    moveToOutput share/rust "$dev"
   '';
 
   env.NIX_CFLAGS_COMPILE = toString (

From 7ecbcdbc955c65bebcfd6bd187d0f75840ed5493 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 15 Jun 2026 06:20:48 +0100
Subject: [PATCH 024/197] libetpan: 1.10 -> 1.10.1

Changes: https://github.com/dinhvh/libetpan/releases/tag/1.10.1
---
 pkgs/by-name/li/libetpan/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libetpan/package.nix b/pkgs/by-name/li/libetpan/package.nix
index d266c7600ca8..829f9cdbdc6c 100644
--- a/pkgs/by-name/li/libetpan/package.nix
+++ b/pkgs/by-name/li/libetpan/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libetpan";
-  version = "1.10";
+  version = "1.10.1";
 
   src = fetchFromGitHub {
     owner = "dinhviethoa";
     repo = "libetpan";
     tag = finalAttrs.version;
-    hash = "sha256-dG1qsYv9W0l6LLMW+XnKtUunga3IGVxEy34Tnp+K99o=";
+    hash = "sha256-OBLGek7WYjiAiMMhycbx4eUy8d4XLF/B9p7GGO6LFHA=";
   };
 
   outputs = [

From 71f1c075231ceb3e1ea27f69d91437312176df6f Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 14 Jun 2026 20:35:17 +0700
Subject: [PATCH 025/197] python3Packages.clean-fid: move to better homepage +
 add downloadPage

---
 pkgs/development/python-modules/clean-fid/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/clean-fid/default.nix b/pkgs/development/python-modules/clean-fid/default.nix
index ececc55ddfa5..7f1b5ce2c914 100644
--- a/pkgs/development/python-modules/clean-fid/default.nix
+++ b/pkgs/development/python-modules/clean-fid/default.nix
@@ -47,7 +47,8 @@ buildPythonPackage {
 
   meta = {
     description = "PyTorch - FID calculation with proper image resizing and quantization steps [CVPR 2022]";
-    homepage = "https://github.com/GaParmar/clean-fid";
+    homepage = "https://www.cs.cmu.edu/~clean-fid/";
+    downloadPage = "https://github.com/GaParmar/clean-fid";
     license = lib.licenses.mit;
     teams = [ lib.teams.tts ];
   };

From c20f86c3286dd6c954054e0bde74ba31e5e9e461 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Mon, 8 Jun 2026 17:26:30 -0700
Subject: [PATCH 026/197] privoxy: migrate to by-name

---
 .../pr/privoxy/package.nix}                       | 15 +++++++--------
 pkgs/top-level/all-packages.nix                   |  4 ----
 2 files changed, 7 insertions(+), 12 deletions(-)
 rename pkgs/{tools/networking/privoxy/default.nix => by-name/pr/privoxy/package.nix} (78%)

diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/by-name/pr/privoxy/package.nix
similarity index 78%
rename from pkgs/tools/networking/privoxy/default.nix
rename to pkgs/by-name/pr/privoxy/package.nix
index a0e3a713c9ac..9366d62919f0 100644
--- a/pkgs/tools/networking/privoxy/default.nix
+++ b/pkgs/by-name/pr/privoxy/package.nix
@@ -7,27 +7,27 @@
   autoreconfHook,
   zlib,
   pcre2,
-  w3m,
+  w3m-batch,
   man,
   openssl,
   brotli,
 }:
 
-stdenv.mkDerivation rec {
-
+stdenv.mkDerivation (finalAttrs: {
   pname = "privoxy";
   version = "4.1.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${pname}-${version}-stable-src.tar.gz";
-    sha256 = "sha256-I+RoblhIx0y2gMCcKBHwNXc57P5kH5xAcu5COZCSyXs=";
+    url = "mirror://sourceforge/ijbswa/Sources/${finalAttrs.version}%20%28stable%29/privoxy-${finalAttrs.version}-stable-src.tar.gz";
+    hash = "sha256-I+RoblhIx0y2gMCcKBHwNXc57P5kH5xAcu5COZCSyXs=";
   };
 
   nativeBuildInputs = [
     autoreconfHook
-    w3m
+    w3m-batch
     man
   ];
+
   buildInputs = [
     zlib
     pcre2
@@ -59,5 +59,4 @@ stdenv.mkDerivation rec {
     maintainers = [ ];
     mainProgram = "privoxy";
   };
-
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3bed7cc349ca..854e0119c3ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3055,10 +3055,6 @@ with pkgs;
     libxml2 = libxml2Python;
   };
 
-  privoxy = callPackage ../tools/networking/privoxy {
-    w3m = w3m-batch;
-  };
-
   tartube-yt-dlp = tartube.override {
     youtube-dl = yt-dlp;
   };

From 6baa82facdcc22b6b63c8da1e191a690ab3cdb85 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Mon, 8 Jun 2026 18:32:21 -0700
Subject: [PATCH 027/197] spoofer-gui: migrate to by-name

---
 pkgs/by-name/sp/spoofer-gui/package.nix | 11 +++++++++++
 pkgs/top-level/all-packages.nix         |  5 -----
 2 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/by-name/sp/spoofer-gui/package.nix

diff --git a/pkgs/by-name/sp/spoofer-gui/package.nix b/pkgs/by-name/sp/spoofer-gui/package.nix
new file mode 100644
index 000000000000..a8267764abb9
--- /dev/null
+++ b/pkgs/by-name/sp/spoofer-gui/package.nix
@@ -0,0 +1,11 @@
+{
+  spoofer,
+  ...
+}@args:
+
+spoofer.override (
+  {
+    withGUI = true;
+  }
+  // removeAttrs args [ "spoofer" ]
+)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 854e0119c3ac..58ecd135c2cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5543,11 +5543,6 @@ with pkgs;
     protobuf = protobuf_21;
   };
 
-  spoofer-gui = callPackage ../tools/networking/spoofer {
-    withGUI = true;
-    protobuf = protobuf_21;
-  };
-
   sqlite-utils = with python3Packages; toPythonApplication sqlite-utils;
 
   sqlmap = with python3Packages; toPythonApplication sqlmap;

From 4eeb359f65cdff75c10207770d59021b2e0ad648 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Mon, 8 Jun 2026 17:31:18 -0700
Subject: [PATCH 028/197] spoofer: migrate to by-name

---
 .../default.nix => by-name/sp/spoofer/package.nix}   | 12 ++++++------
 pkgs/top-level/all-packages.nix                      |  4 ----
 2 files changed, 6 insertions(+), 10 deletions(-)
 rename pkgs/{tools/networking/spoofer/default.nix => by-name/sp/spoofer/package.nix} (85%)

diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/by-name/sp/spoofer/package.nix
similarity index 85%
rename from pkgs/tools/networking/spoofer/default.nix
rename to pkgs/by-name/sp/spoofer/package.nix
index f5520158c93e..c4d5f26a4d9f 100644
--- a/pkgs/tools/networking/spoofer/default.nix
+++ b/pkgs/by-name/sp/spoofer/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   pkg-config,
-  protobuf,
+  protobuf_21,
   openssl,
   libpcap,
   traceroute,
@@ -15,19 +15,19 @@ let
   inherit (lib) optional;
 in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "spoofer";
   version = "1.4.13";
 
   src = fetchurl {
-    url = "https://www.caida.org/projects/spoofer/downloads/${pname}-${version}.tar.gz";
-    sha256 = "sha256-n3B2yAckbcm2kyv5QzBGh4nvKa0S/+EbGCxe0eyWG1U=";
+    url = "https://www.caida.org/projects/spoofer/downloads/spoofer-${finalAttrs.version}.tar.gz";
+    hash = "sha256-n3B2yAckbcm2kyv5QzBGh4nvKa0S/+EbGCxe0eyWG1U=";
   };
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     openssl
-    protobuf
+    protobuf_21
     libpcap
     traceroute
   ]
@@ -56,4 +56,4 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl3Plus;
     mainProgram = "spoofer-prober";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 58ecd135c2cb..bbf5b4e2a9da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5539,10 +5539,6 @@ with pkgs;
     flex = flex_2_5_35;
   };
 
-  spoofer = callPackage ../tools/networking/spoofer {
-    protobuf = protobuf_21;
-  };
-
   sqlite-utils = with python3Packages; toPythonApplication sqlite-utils;
 
   sqlmap = with python3Packages; toPythonApplication sqlmap;

From 50f2a13e49a21c2a6d017c7813970b27debcd863 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Mon, 8 Jun 2026 17:33:41 -0700
Subject: [PATCH 029/197] mir-qualia: migrate to by-name

---
 .../default.nix => by-name/mi/mir-qualia/package.nix}  | 10 +++++-----
 pkgs/top-level/all-packages.nix                        |  4 ----
 2 files changed, 5 insertions(+), 9 deletions(-)
 rename pkgs/{tools/text/mir-qualia/default.nix => by-name/mi/mir-qualia/package.nix} (70%)

diff --git a/pkgs/tools/text/mir-qualia/default.nix b/pkgs/by-name/mi/mir-qualia/package.nix
similarity index 70%
rename from pkgs/tools/text/mir-qualia/default.nix
rename to pkgs/by-name/mi/mir-qualia/package.nix
index 95da7c83e755..cf1ca8593f11 100644
--- a/pkgs/tools/text/mir-qualia/default.nix
+++ b/pkgs/by-name/mi/mir-qualia/package.nix
@@ -1,19 +1,19 @@
 {
   lib,
-  pythonPackages,
+  python3Packages,
   fetchurl,
 }:
 
-pythonPackages.buildPythonApplication rec {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "mir.qualia";
   version = "2.0.0";
   format = "setuptools";
   doCheck = false; # 2.0.0-released pytests are broken
 
-  buildInputs = with pythonPackages; [ pytest ];
+  buildInputs = with python3Packages; [ pytest ];
 
   src = fetchurl {
-    url = "mirror://pypi/m/mir.qualia/mir.qualia-${version}.tar.gz";
+    url = "mirror://pypi/m/mir.qualia/mir.qualia-${finalAttrs.version}.tar.gz";
     sha256 = "1ybq6jb5clh9hw0sp3idp4hjv2gkm9yiaph48gcc208affflc8m9";
   };
 
@@ -24,4 +24,4 @@ pythonPackages.buildPythonApplication rec {
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.srhb ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bbf5b4e2a9da..a1698fcfed5a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2629,10 +2629,6 @@ with pkgs;
 
   miniupnpd-nftables = miniupnpd.override { firewall = "nftables"; };
 
-  mir-qualia = callPackage ../tools/text/mir-qualia {
-    pythonPackages = python3Packages;
-  };
-
   mitmproxy = with python3Packages; toPythonApplication mitmproxy;
 
   mjpegtoolsFull = mjpegtools.override {

From 1aa08524d6282b64ffcef7e1aaa9b15aac748cb7 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Mon, 8 Jun 2026 17:54:14 -0700
Subject: [PATCH 030/197] openconnect{,_openssl}: migrate to by-name

---
 .../op/openconnect/package.nix}               | 15 ++++++++-----
 .../op/openconnect_openssl/package.nix        |  7 ++++++
 pkgs/tools/networking/openconnect/default.nix | 22 -------------------
 pkgs/top-level/all-packages.nix               |  6 ++---
 4 files changed, 19 insertions(+), 31 deletions(-)
 rename pkgs/{tools/networking/openconnect/common.nix => by-name/op/openconnect/package.nix} (82%)
 create mode 100644 pkgs/by-name/op/openconnect_openssl/package.nix
 delete mode 100644 pkgs/tools/networking/openconnect/default.nix

diff --git a/pkgs/tools/networking/openconnect/common.nix b/pkgs/by-name/op/openconnect/package.nix
similarity index 82%
rename from pkgs/tools/networking/openconnect/common.nix
rename to pkgs/by-name/op/openconnect/package.nix
index b9ff4d68382e..ff4056cfc531 100644
--- a/pkgs/tools/networking/openconnect/common.nix
+++ b/pkgs/by-name/op/openconnect/package.nix
@@ -1,11 +1,7 @@
-{
-  version,
-  src,
-}:
-
 {
   lib,
   stdenv,
+  fetchFromGitLab,
   pkg-config,
   gnutls,
   p11-kit,
@@ -25,7 +21,14 @@
 
 stdenv.mkDerivation {
   pname = "openconnect";
-  inherit version src;
+  version = "9.12-unstable-2025-11-03";
+
+  src = fetchFromGitLab {
+    owner = "openconnect";
+    repo = "openconnect";
+    rev = "0dcdff87db65daf692dc323732831391d595d98d";
+    hash = "sha256-AvowUEDkXvR+QkhJbZU759fZjIqj/mO8HjP2Ka3lH1U=";
+  };
 
   outputs = [
     "out"
diff --git a/pkgs/by-name/op/openconnect_openssl/package.nix b/pkgs/by-name/op/openconnect_openssl/package.nix
new file mode 100644
index 000000000000..42b85ff0fb1c
--- /dev/null
+++ b/pkgs/by-name/op/openconnect_openssl/package.nix
@@ -0,0 +1,7 @@
+{
+  openconnect,
+}:
+
+openconnect.override {
+  useOpenSSL = true;
+}
diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix
deleted file mode 100644
index 80409477f9bf..000000000000
--- a/pkgs/tools/networking/openconnect/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  callPackage,
-  fetchFromGitLab,
-}:
-let
-  common = opts: callPackage (import ./common.nix opts) { };
-in
-rec {
-  openconnect = common {
-    version = "9.12-unstable-2025-11-03";
-    src = fetchFromGitLab {
-      owner = "openconnect";
-      repo = "openconnect";
-      rev = "0dcdff87db65daf692dc323732831391d595d98d";
-      hash = "sha256-AvowUEDkXvR+QkhJbZU759fZjIqj/mO8HjP2Ka3lH1U=";
-    };
-  };
-
-  openconnect_openssl = openconnect.override {
-    useOpenSSL = true;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1698fcfed5a..56834e3bd07d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3114,9 +3114,9 @@ with pkgs;
   voxtype-vulkan = callPackage ../by-name/vo/voxtype/package.nix { vulkanSupport = true; };
   voxtype-onnx = callPackage ../by-name/vo/voxtype/package.nix { onnxSupport = true; };
 
-  openconnectPackages = callPackage ../tools/networking/openconnect { };
-
-  inherit (openconnectPackages) openconnect openconnect_openssl;
+  openconnectPackages = {
+    inherit openconnect openconnect_openssl;
+  };
 
   buildWasmBindgenCli = callPackage ../build-support/wasm-bindgen-cli { };
 

From 2d839f48efe00f8a42b2b99a42e4c1378caa238a Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Mon, 8 Jun 2026 18:01:57 -0700
Subject: [PATCH 031/197] apc-temp-fetch: migrate to by-name

---
 .../ap/apc-temp-fetch/package.nix}                 | 14 ++++++--------
 pkgs/top-level/all-packages.nix                    |  2 --
 2 files changed, 6 insertions(+), 10 deletions(-)
 rename pkgs/{tools/networking/apc-temp-fetch/default.nix => by-name/ap/apc-temp-fetch/package.nix} (73%)

diff --git a/pkgs/tools/networking/apc-temp-fetch/default.nix b/pkgs/by-name/ap/apc-temp-fetch/package.nix
similarity index 73%
rename from pkgs/tools/networking/apc-temp-fetch/default.nix
rename to pkgs/by-name/ap/apc-temp-fetch/package.nix
index 887421233df2..a1b4d2a48e5d 100644
--- a/pkgs/tools/networking/apc-temp-fetch/default.nix
+++ b/pkgs/by-name/ap/apc-temp-fetch/package.nix
@@ -1,27 +1,25 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchPypi,
-  requests,
-  setuptools,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "apc-temp-fetch";
   version = "0.0.2";
   pyproject = true;
 
   src = fetchPypi {
     pname = "APC-Temp-fetch";
-    inherit version;
+    inherit (finalAttrs) version;
     hash = "sha256-lXGj/xrOkdMMYvuyVVSCojjQlzISFUT14VTn//iOARo=";
   };
 
-  build-system = [
+  build-system = with python3Packages; [
     setuptools
   ];
 
-  dependencies = [
+  dependencies = with python3Packages; [
     requests
   ];
 
@@ -35,4 +33,4 @@ buildPythonApplication rec {
     license = lib.licenses.asl20;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 56834e3bd07d..6c0c1ace4016 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1810,8 +1810,6 @@ with pkgs;
     util-linux = util-linuxMinimal;
   };
 
-  apc-temp-fetch = with python3.pkgs; callPackage ../tools/networking/apc-temp-fetch { };
-
   asciidoc-full = asciidoc.override {
     enableStandardFeatures = true;
   };

From a591bc846de9c37d2a9dec896325d48d81b5d4c0 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Mon, 8 Jun 2026 18:11:12 -0700
Subject: [PATCH 032/197] knock: init at 0.0.2 by migrating to by-name

The derivation was never actually referenced from all-packages.nix, so
this commit causes it to appear as a new package.
---
 pkgs/{tools/networking => by-name/kn}/knock/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
 rename pkgs/{tools/networking => by-name/kn}/knock/package.nix (88%)

diff --git a/pkgs/tools/networking/knock/package.nix b/pkgs/by-name/kn/knock/package.nix
similarity index 88%
rename from pkgs/tools/networking/knock/package.nix
rename to pkgs/by-name/kn/knock/package.nix
index 2ac33f93294f..84badec6cbcf 100644
--- a/pkgs/tools/networking/knock/package.nix
+++ b/pkgs/by-name/kn/knock/package.nix
@@ -5,14 +5,16 @@
   installShellFiles,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "knock";
   version = "0.0.2";
 
+  __structuredAttrs = true;
+
   src = fetchFromCodeberg {
     owner = "nat-418";
     repo = "knock";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-K+L4F4bTERQSqISAmfyps/U5GJ2N0FdJ3RmpiUmt4uA=";
   };
 
@@ -36,4 +38,4 @@ buildGoModule rec {
     changelog = "https://codeberg.org/nat-418/knock/raw/branch/trunk/CHANGELOG.md";
     maintainers = with lib.maintainers; [ nat-418 ];
   };
-}
+})

From a8a39fcfb3483f7a9df3cb38c4f2e9d9792fc272 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Mon, 8 Jun 2026 18:19:32 -0700
Subject: [PATCH 033/197] rmlint: migrate to by-name

---
 .../default.nix => by-name/rm/rmlint/package.nix}     | 11 +++++------
 .../misc => by-name/rm}/rmlint/scons-nix-env.patch    |  0
 pkgs/top-level/all-packages.nix                       |  4 ----
 3 files changed, 5 insertions(+), 10 deletions(-)
 rename pkgs/{tools/misc/rmlint/default.nix => by-name/rm/rmlint/package.nix} (93%)
 rename pkgs/{tools/misc => by-name/rm}/rmlint/scons-nix-env.patch (100%)

diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/by-name/rm/rmlint/package.nix
similarity index 93%
rename from pkgs/tools/misc/rmlint/default.nix
rename to pkgs/by-name/rm/rmlint/package.nix
index 3646164672bb..069ff9e2dab7 100644
--- a/pkgs/tools/misc/rmlint/default.nix
+++ b/pkgs/by-name/rm/rmlint/package.nix
@@ -15,7 +15,6 @@
   polkit,
   python3,
   scons,
-  sphinx,
   util-linux,
   wrapGAppsHook3,
   withGui ? false,
@@ -23,15 +22,15 @@
 
 assert withGui -> !stdenv.hostPlatform.isDarwin;
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "rmlint";
   version = "2.10.2";
 
   src = fetchFromGitHub {
     owner = "sahib";
     repo = "rmlint";
-    rev = "v${version}";
-    sha256 = "sha256-pOo1YfeqHUU6xyBRFbcj2lX1MHJ+a5Hi31BMC1nYZGo=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-pOo1YfeqHUU6xyBRFbcj2lX1MHJ+a5Hi31BMC1nYZGo=";
   };
 
   patches = [
@@ -46,7 +45,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkg-config
-    sphinx
+    python3.pkgs.sphinx
     scons
   ]
   ++ lib.optionals withGui [
@@ -103,4 +102,4 @@ stdenv.mkDerivation rec {
     ];
     mainProgram = "rmlint";
   };
-}
+})
diff --git a/pkgs/tools/misc/rmlint/scons-nix-env.patch b/pkgs/by-name/rm/rmlint/scons-nix-env.patch
similarity index 100%
rename from pkgs/tools/misc/rmlint/scons-nix-env.patch
rename to pkgs/by-name/rm/rmlint/scons-nix-env.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c0c1ace4016..e5dbf81836bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2963,10 +2963,6 @@ with pkgs;
 
   rmate = rubyPackages.rmate;
 
-  rmlint = callPackage ../tools/misc/rmlint {
-    inherit (python3Packages) sphinx;
-  };
-
   rpatool = with python3Packages; toPythonApplication rpatool;
 
   rpm = callPackage ../tools/package-management/rpm {

From 831c33cd715f0698f35cfbd6d9a2a0747f55462d Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Sun, 7 Jun 2026 16:41:07 -0700
Subject: [PATCH 034/197] curaengine_stable: migrate to by-name

---
 .../stable.nix => by-name/cu/curaengine_stable/package.nix}   | 4 ++--
 pkgs/top-level/all-packages.nix                               | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)
 rename pkgs/{applications/misc/curaengine/stable.nix => by-name/cu/curaengine_stable/package.nix} (86%)

diff --git a/pkgs/applications/misc/curaengine/stable.nix b/pkgs/by-name/cu/curaengine_stable/package.nix
similarity index 86%
rename from pkgs/applications/misc/curaengine/stable.nix
rename to pkgs/by-name/cu/curaengine_stable/package.nix
index fcc0e6be5aaa..2e602b76a602 100644
--- a/pkgs/applications/misc/curaengine/stable.nix
+++ b/pkgs/by-name/cu/curaengine_stable/package.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "CuraEngine";
-    rev = finalAttrs.version;
-    sha256 = "sha256-8V21TRSqCN+hkTlz51d5A5oK5JOwEtx+ROt8cfJBL/0=";
+    tag = finalAttrs.version;
+    hash = "sha256-8V21TRSqCN+hkTlz51d5A5oK5JOwEtx+ROt8cfJBL/0=";
   };
 
   postPatch = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3bed7cc349ca..a1876b6c0d28 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9575,8 +9575,6 @@ with pkgs;
 
   lightdm_qt = lightdm.override { withQt5 = true; };
 
-  curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { };
-
   super-slicer-beta = super-slicer.beta;
 
   super-slicer-latest = super-slicer.latest;

From 8438e7f8db1205b30aacff3627b829128cd818b2 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Sun, 7 Jun 2026 16:46:05 -0700
Subject: [PATCH 035/197] attempto-clex: migrate to by-name

---
 .../misc/ape/clex.nix => by-name/at/attemptoClex/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                  | 1 -
 2 files changed, 1 deletion(-)
 rename pkgs/{applications/misc/ape/clex.nix => by-name/at/attemptoClex/package.nix} (100%)

diff --git a/pkgs/applications/misc/ape/clex.nix b/pkgs/by-name/at/attemptoClex/package.nix
similarity index 100%
rename from pkgs/applications/misc/ape/clex.nix
rename to pkgs/by-name/at/attemptoClex/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1876b6c0d28..53c013e054be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11343,7 +11343,6 @@ with pkgs;
   xml2rfc = with python3Packages; toPythonApplication xml2rfc;
 
   ape = callPackage ../applications/misc/ape { };
-  attemptoClex = callPackage ../applications/misc/ape/clex.nix { };
   apeClex = callPackage ../applications/misc/ape/apeclex.nix { };
 
   # Unix tools

From 8e530800899d1757f87155f1d3d801e86adc6e1e Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Sun, 7 Jun 2026 17:00:09 -0700
Subject: [PATCH 036/197] shogun: migrate to by-name

---
 .../machine-learning => by-name/sh}/shogun/eigen-3.4.patch    | 0
 .../sh}/shogun/fix-virtual-destruction.patch                  | 0
 .../shogun/default.nix => by-name/sh/shogun/package.nix}      | 4 ++--
 .../sh}/shogun/svmlight-scrubber.patch                        | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 5 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{applications/science/machine-learning => by-name/sh}/shogun/eigen-3.4.patch (100%)
 rename pkgs/{applications/science/machine-learning => by-name/sh}/shogun/fix-virtual-destruction.patch (100%)
 rename pkgs/{applications/science/machine-learning/shogun/default.nix => by-name/sh/shogun/package.nix} (99%)
 rename pkgs/{applications/science/machine-learning => by-name/sh}/shogun/svmlight-scrubber.patch (100%)

diff --git a/pkgs/applications/science/machine-learning/shogun/eigen-3.4.patch b/pkgs/by-name/sh/shogun/eigen-3.4.patch
similarity index 100%
rename from pkgs/applications/science/machine-learning/shogun/eigen-3.4.patch
rename to pkgs/by-name/sh/shogun/eigen-3.4.patch
diff --git a/pkgs/applications/science/machine-learning/shogun/fix-virtual-destruction.patch b/pkgs/by-name/sh/shogun/fix-virtual-destruction.patch
similarity index 100%
rename from pkgs/applications/science/machine-learning/shogun/fix-virtual-destruction.patch
rename to pkgs/by-name/sh/shogun/fix-virtual-destruction.patch
diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/by-name/sh/shogun/package.nix
similarity index 99%
rename from pkgs/applications/science/machine-learning/shogun/default.nix
rename to pkgs/by-name/sh/shogun/package.nix
index fae5f8a00782..e7ad0d79e559 100644
--- a/pkgs/applications/science/machine-learning/shogun/default.nix
+++ b/pkgs/by-name/sh/shogun/package.nix
@@ -15,7 +15,7 @@
   lapack,
   glpk,
   # data
-  protobuf,
+  protobuf_21,
   json_c,
   libxml2,
   hdf5,
@@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
     blas
     lapack
     glpk
-    protobuf
+    protobuf_21
     json_c
     libxml2
     hdf5
diff --git a/pkgs/applications/science/machine-learning/shogun/svmlight-scrubber.patch b/pkgs/by-name/sh/shogun/svmlight-scrubber.patch
similarity index 100%
rename from pkgs/applications/science/machine-learning/shogun/svmlight-scrubber.patch
rename to pkgs/by-name/sh/shogun/svmlight-scrubber.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 53c013e054be..24e30f7808db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9353,10 +9353,6 @@ with pkgs;
 
   scx = recurseIntoAttrs (callPackage ../os-specific/linux/scx { });
 
-  shogun = callPackage ../applications/science/machine-learning/shogun {
-    protobuf = protobuf_21;
-  };
-
   inherit
     ({
       softmaker-office = callPackage ../applications/office/softmaker/softmaker-office.nix { };

From 5e211460be6ee2721a940a8c06053b1f5c32aad2 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Sun, 7 Jun 2026 17:03:44 -0700
Subject: [PATCH 037/197] cubicle: migrate to by-name

---
 .../default.nix => by-name/cu/cubicle/package.nix}    | 11 +++++++----
 pkgs/top-level/all-packages.nix                       |  4 ----
 2 files changed, 7 insertions(+), 8 deletions(-)
 rename pkgs/{applications/science/logic/cubicle/default.nix => by-name/cu/cubicle/package.nix} (86%)

diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/pkgs/by-name/cu/cubicle/package.nix
similarity index 86%
rename from pkgs/applications/science/logic/cubicle/default.nix
rename to pkgs/by-name/cu/cubicle/package.nix
index 10a0b4044f13..4b74a10f6b4a 100644
--- a/pkgs/applications/science/logic/cubicle/default.nix
+++ b/pkgs/by-name/cu/cubicle/package.nix
@@ -4,14 +4,17 @@
   fetchurl,
   autoreconfHook,
   which,
-  ocamlPackages,
+  ocaml-ng,
 }:
 
-stdenv.mkDerivation rec {
+let
+  ocamlPackages = ocaml-ng.ocamlPackages_4_14;
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "cubicle";
   version = "1.2.0";
   src = fetchurl {
-    url = "https://github.com/cubicle-model-checker/cubicle/archive/refs/tags/${version}.tar.gz";
+    url = "https://github.com/cubicle-model-checker/cubicle/archive/refs/tags/${finalAttrs.version}.tar.gz";
     hash = "sha256-/EtbXpyXqRm0jGcMfGLAEwdr92061edjFys1V7/w6/Y=";
   };
 
@@ -45,4 +48,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ dwarfmaster ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24e30f7808db..ea82fe155297 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10723,10 +10723,6 @@ with pkgs;
     coq
     ;
 
-  cubicle = callPackage ../applications/science/logic/cubicle {
-    ocamlPackages = ocaml-ng.ocamlPackages_4_14;
-  };
-
   ekrhyper = callPackage ../applications/science/logic/ekrhyper {
     ocaml = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml;
   };

From 092b433c333ba418d4bde633f4630bd2e1a02a05 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Sun, 7 Jun 2026 17:07:18 -0700
Subject: [PATCH 038/197] statverif: migrae to by-name

---
 .../st/statverif/package.nix}                     | 15 +++++++++------
 pkgs/top-level/all-packages.nix                   |  4 ----
 2 files changed, 9 insertions(+), 10 deletions(-)
 rename pkgs/{applications/science/logic/statverif/default.nix => by-name/st/statverif/package.nix} (77%)

diff --git a/pkgs/applications/science/logic/statverif/default.nix b/pkgs/by-name/st/statverif/package.nix
similarity index 77%
rename from pkgs/applications/science/logic/statverif/default.nix
rename to pkgs/by-name/st/statverif/package.nix
index 6e6090ffaa14..8aabfaba4798 100644
--- a/pkgs/applications/science/logic/statverif/default.nix
+++ b/pkgs/by-name/st/statverif/package.nix
@@ -2,20 +2,23 @@
   lib,
   stdenv,
   fetchurl,
-  ocaml,
+  ocaml-ng,
 }:
 
-stdenv.mkDerivation rec {
+let
+  ocaml = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml;
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "statverif";
   version = "1.86pl4";
 
   src = fetchurl {
-    url = "http://prosecco.gforge.inria.fr/personal/bblanche/proverif/proverif${version}.tar.gz";
+    url = "http://prosecco.gforge.inria.fr/personal/bblanche/proverif/proverif${finalAttrs.version}.tar.gz";
     sha256 = "163vdcixs764jj8xa08w80qm4kcijf7xj911yp8jvz6pi1q5g13i";
   };
 
   pf-patch = fetchurl {
-    url = "http://markryan.eu/research/statverif/files/proverif-${version}-statverif-2657ab4.patch";
+    url = "http://markryan.eu/research/statverif/files/proverif-${finalAttrs.version}-statverif-2657ab4.patch";
     sha256 = "113jjhi1qkcggbsmbw8fa9ln8vs7vy2r288szks7rn0jjn0wxmbw";
   };
 
@@ -23,7 +26,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ ocaml ];
 
-  patchPhase = "patch -p1 < ${pf-patch}";
+  patchPhase = "patch -p1 < ${finalAttrs.pf-patch}";
   buildPhase = "./build";
   installPhase = ''
     mkdir -p $out/bin
@@ -38,4 +41,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     maintainers = [ lib.maintainers.thoughtpolice ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea82fe155297..72f3e478cbb3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10747,10 +10747,6 @@ with pkgs;
     inherit (ocaml-ng.ocamlPackages_4_14) ocaml;
   };
 
-  statverif = callPackage ../applications/science/logic/statverif {
-    ocaml = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml;
-  };
-
   why3 = callPackage ../applications/science/logic/why3 { coqPackages = coqPackages_8_20; };
 
   tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix {

From c88ffd2d5f6bf91a4d0525d10d93871edb604101 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Sun, 7 Jun 2026 17:11:21 -0700
Subject: [PATCH 039/197] tamarin-prover: migrate to by-name

---
 .../ta/tamarin-prover/package.nix}                   | 12 ++++++++----
 pkgs/top-level/all-packages.nix                      |  9 ---------
 2 files changed, 8 insertions(+), 13 deletions(-)
 rename pkgs/{applications/science/logic/tamarin-prover/default.nix => by-name/ta/tamarin-prover/package.nix} (95%)

diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/by-name/ta/tamarin-prover/package.nix
similarity index 95%
rename from pkgs/applications/science/logic/tamarin-prover/default.nix
rename to pkgs/by-name/ta/tamarin-prover/package.nix
index d26ca2578397..f9fc7fbbb31d 100644
--- a/pkgs/applications/science/logic/tamarin-prover/default.nix
+++ b/pkgs/by-name/ta/tamarin-prover/package.nix
@@ -1,5 +1,5 @@
 {
-  haskellPackages,
+  haskell,
   fetchFromGitHub,
   lib,
   stdenv,
@@ -8,11 +8,15 @@
   which,
   buildNpmPackage,
   maude,
-  graphviz,
+  graphviz-nox,
   glibcLocales,
 }:
 
 let
+  # 2025-03-07: dependency fclabels doesn't compile with GHC >= 9.8
+  # https://github.com/sebastiaanvisser/fclabels/issues/46
+  haskellPackages = haskell.packages.ghc96;
+
   inherit (haskellPackages) mkDerivation;
 
   version = "1.12.0";
@@ -177,7 +181,7 @@ mkDerivation (
       makeWrapper
       which
       maude
-      graphviz
+      graphviz-nox
     ];
     postInstall = ''
       wrapProgram $out/bin/tamarin-prover \
@@ -190,7 +194,7 @@ mkDerivation (
           lib.makeBinPath [
             which
             maude
-            graphviz
+            graphviz-nox
           ]
         }
       # so that the package can be used as a vim plugin to install syntax coloration
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 72f3e478cbb3..8aea356cda63 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3873,15 +3873,6 @@ with pkgs;
     callPackage ../development/tools/misc/coreboot-toolchain { }
   );
 
-  tamarin-prover = (
-    callPackage ../applications/science/logic/tamarin-prover {
-      # 2025-03-07: dependency fclabels doesn't compile with GHC >= 9.8
-      # https://github.com/sebastiaanvisser/fclabels/issues/46
-      haskellPackages = haskell.packages.ghc96;
-      graphviz = graphviz-nox;
-    }
-  );
-
   inherit
     (callPackage ../development/compilers/haxe {
     })

From dae9680cc0f379b96004939ab114f989d67852b4 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Sun, 7 Jun 2026 17:14:42 -0700
Subject: [PATCH 040/197] satallax: migrate to by-name

---
 .../sa}/satallax/fix-declaration-gcc9.patch          |  0
 .../logic => by-name/sa}/satallax/minisat-fenv.patch |  0
 .../default.nix => by-name/sa/satallax/package.nix}  | 12 ++++++++----
 pkgs/top-level/all-packages.nix                      |  4 ----
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename pkgs/{applications/science/logic => by-name/sa}/satallax/fix-declaration-gcc9.patch (100%)
 rename pkgs/{applications/science/logic => by-name/sa}/satallax/minisat-fenv.patch (100%)
 rename pkgs/{applications/science/logic/satallax/default.nix => by-name/sa/satallax/package.nix} (94%)

diff --git a/pkgs/applications/science/logic/satallax/fix-declaration-gcc9.patch b/pkgs/by-name/sa/satallax/fix-declaration-gcc9.patch
similarity index 100%
rename from pkgs/applications/science/logic/satallax/fix-declaration-gcc9.patch
rename to pkgs/by-name/sa/satallax/fix-declaration-gcc9.patch
diff --git a/pkgs/applications/science/logic/satallax/minisat-fenv.patch b/pkgs/by-name/sa/satallax/minisat-fenv.patch
similarity index 100%
rename from pkgs/applications/science/logic/satallax/minisat-fenv.patch
rename to pkgs/by-name/sa/satallax/minisat-fenv.patch
diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/by-name/sa/satallax/package.nix
similarity index 94%
rename from pkgs/applications/science/logic/satallax/default.nix
rename to pkgs/by-name/sa/satallax/package.nix
index 0c149fdb5be1..feefaaee36aa 100644
--- a/pkgs/applications/science/logic/satallax/default.nix
+++ b/pkgs/by-name/sa/satallax/package.nix
@@ -2,14 +2,18 @@
   lib,
   stdenv,
   fetchurl,
-  ocaml,
+  ocaml-ng,
   zlib,
   which,
   eprover,
   makeWrapper,
   coq,
 }:
-stdenv.mkDerivation rec {
+
+let
+  inherit (ocaml-ng.ocamlPackages_4_14) ocaml;
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "satallax";
   version = "2.7";
 
@@ -25,7 +29,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ zlib ];
 
   src = fetchurl {
-    url = "https://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${pname}-${version}.tar.gz";
+    url = "https://www.ps.uni-saarland.de/~cebrown/satallax/downloads/satallax-${finalAttrs.version}.tar.gz";
     sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib";
   };
 
@@ -108,4 +112,4 @@ stdenv.mkDerivation rec {
     downloadPage = "http://www.ps.uni-saarland.de/~cebrown/satallax/downloads.php";
     homepage = "http://www.ps.uni-saarland.de/~cebrown/satallax/index.php";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8aea356cda63..e6d3bb878a8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10734,10 +10734,6 @@ with pkgs;
     inherit (ocaml-ng.ocamlPackages_4_14_unsafe_string) ocaml camlp4;
   };
 
-  satallax = callPackage ../applications/science/logic/satallax {
-    inherit (ocaml-ng.ocamlPackages_4_14) ocaml;
-  };
-
   why3 = callPackage ../applications/science/logic/why3 { coqPackages = coqPackages_8_20; };
 
   tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix {

From f7d1edf68ecb911b85719d15547fdab08641df52 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Tue, 16 Jun 2026 17:20:18 +0200
Subject: [PATCH 041/197] bkyml: drop

---
 pkgs/by-name/bk/bkyml/package.nix | 49 -------------------------------
 pkgs/top-level/aliases.nix        |  1 +
 2 files changed, 1 insertion(+), 49 deletions(-)
 delete mode 100644 pkgs/by-name/bk/bkyml/package.nix

diff --git a/pkgs/by-name/bk/bkyml/package.nix b/pkgs/by-name/bk/bkyml/package.nix
deleted file mode 100644
index 7a0c32d596d9..000000000000
--- a/pkgs/by-name/bk/bkyml/package.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  lib,
-  python3,
-  fetchPypi,
-}:
-
-python3.pkgs.buildPythonApplication (finalAttrs: {
-  pname = "bkyml";
-  version = "1.4.3";
-  pyproject = true;
-
-  src = fetchPypi {
-    inherit (finalAttrs) pname version;
-    sha256 = "01kpx35572mp4xl2fjyvfk39jfgfjcyzymbifk76891kaqkjb7r9";
-  };
-
-  # The pyscaffold is not a runtime dependency but just a python project bootstrapping tool. Thus,
-  # instead of implement this package in nix we remove a dependency on it and fix up the version
-  # of the package, that has been affected by the pyscaffold package dependency removal.
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace-fail "['pyscaffold>=3.0a0,<3.1a0'] + " "" \
-      --replace-fail "use_pyscaffold=True"  ""
-    substituteInPlace src/bkyml/__init__.py \
-      --replace-fail "from pkg_resources" "# from pkg_resources" \
-      --replace-fail "get_distribution(dist_name).version" '"${finalAttrs.version}"'
-  '';
-
-  build-system = with python3.pkgs; [
-    setuptools
-  ];
-
-  dependencies = with python3.pkgs; [
-    ruamel-yaml
-  ];
-
-  # Don't run tests because they are broken when run within
-  # buildPythonApplication for reasons I don't quite understand.
-  doCheck = false;
-
-  pythonImportsCheck = [ "bkyml" ];
-
-  meta = {
-    homepage = "https://github.com/joscha/bkyml";
-    description = "CLI tool to generate a pipeline.yaml file for Buildkite on the fly";
-    license = lib.licenses.mit;
-    maintainers = [ ];
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6f5df2d5e35a..07b029198ae5 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -397,6 +397,7 @@ mapAliases {
   bitwarden_rs-postgresql = throw "'bitwarden_rs-postgresql' has been renamed to/replaced by 'vaultwarden-postgresql'"; # Converted to throw 2025-10-27
   bitwarden_rs-sqlite = throw "'bitwarden_rs-sqlite' has been renamed to/replaced by 'vaultwarden-sqlite'"; # Converted to throw 2025-10-27
   bitwarden_rs-vault = throw "'bitwarden_rs-vault' has been renamed to/replaced by 'vaultwarden-vault'"; # Converted to throw 2025-10-27
+  bkyml = throw "''bkyml' has been removed due to a lack of upstream maintainance"; # Added 2026-06-16
   blackbox = throw "'blackbox' has been removed since it has been deprecated and archived upstream. Consider using pass instead"; # Added 2026-01-16
   blas-reference = throw "blas-reference has been removed since it has been discontinued as free-standing package. It is now contained within lapack-reference."; # Added 2025-10-21
   blender-hip = throw "blender-hip has been removed in favor of setting `config.rocmSupport = true` or using `pkgsRocm.blender`"; # Added 2026-01-04

From 44b0aef16cfc9fe6812e95550cc667f53880c7fb Mon Sep 17 00:00:00 2001
From: daskladas <xvzrsm@tutanota.de>
Date: Tue, 16 Jun 2026 21:38:13 +0200
Subject: [PATCH 042/197] zabbix-cli: 3.6.2 -> 3.6.3

---
 pkgs/by-name/za/zabbix-cli/package.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/za/zabbix-cli/package.nix b/pkgs/by-name/za/zabbix-cli/package.nix
index 325024f10479..17f749e2ef3a 100644
--- a/pkgs/by-name/za/zabbix-cli/package.nix
+++ b/pkgs/by-name/za/zabbix-cli/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   python3Packages,
   testers,
   zabbix-cli,
@@ -10,25 +9,16 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "zabbix-cli";
-  version = "3.6.2";
+  version = "3.6.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "unioslo";
     repo = "zabbix-cli";
     tag = finalAttrs.version;
-    hash = "sha256-Y4IR/le+7X3MYmrVnZMr+Gu59LkCB5UfMJ2s9ovSjLM=";
+    hash = "sha256-FbLKU8pjnKpVLE85zkxOmvc6rbhc3x6JdKiI7SdSn1w=";
   };
 
-  patches = [
-    # Fix MarkupMode import with Typer >= 0.20.1
-    # https://github.com/unioslo/zabbix-cli/pull/333
-    (fetchpatch {
-      url = "https://github.com/unioslo/zabbix-cli/commit/b68f672f557ccb06fef3fd5a2d724633f1eb3c68.patch";
-      hash = "sha256-wc59c28aT8IsI4nvEH+CxfdvPAsN2R1uoLgN8tx+mBE=";
-    })
-  ];
-
   build-system = with python3Packages; [
     hatchling
   ];

From 913133b2f2a935cb5b59300010f50fdfbb8d3f4c Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 9 Jun 2026 22:24:15 +0100
Subject: [PATCH 043/197] rust-analyzer-unwrapped: 2026-06-01 -> 2026-06-15

Changes:
- https://github.com/rust-lang/rust-analyzer/releases/tag/2026-06-08
- https://github.com/rust-lang/rust-analyzer/releases/tag/2026-06-15
---
 pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
index 730d42925677..f767b271d601 100644
--- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
+++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
@@ -13,15 +13,15 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rust-analyzer-unwrapped";
-  version = "2026-06-01";
+  version = "2026-06-15";
 
-  cargoHash = "sha256-5njpo8AKVOSgCFwuqTL9sVODyjgsEfg5kHI3qM0DK9k=";
+  cargoHash = "sha256-gVQGlbO6ylFNWt1JwGu8v4oLT7DBy23FGCnbP67Dj/0=";
 
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "rust-analyzer";
     rev = finalAttrs.version;
-    hash = "sha256-yJIyzYb6LhvbVMmj2EH62Mt0JHU3pQefr+oPEgaoaI8=";
+    hash = "sha256-+V3nK4pCngbmgyVGXY6Kkrlevp4ocPkJJLf2aqwkDNA=";
   };
 
   cargoBuildFlags = [

From 49b87c1c96e2a444e03d979d8d1dc7e3a00767f5 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Tue, 16 Jun 2026 22:06:19 +0200
Subject: [PATCH 044/197] rasqal: remove erroned attribute

---
 pkgs/development/libraries/librdf/rasqal.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix
index 7567a0624310..22e75e138816 100644
--- a/pkgs/development/libraries/librdf/rasqal.nix
+++ b/pkgs/development/libraries/librdf/rasqal.nix
@@ -28,11 +28,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   propagatedBuildInputs = [ librdf_raptor2 ];
 
-  confiugureFlags = [
-    # uses 'regex.h' as a fallback, which is preferrable
-    "--disable-pcre"
-  ];
-
   postInstall = "rm -rvf $out/share/gtk-doc";
 
   nativeCheckInputs = [ perl ];

From 887dddbb10fdd5379c12d39f42a9d1698de34985 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Tue, 16 Jun 2026 22:17:15 +0200
Subject: [PATCH 045/197] python3Packages.archspec: remove erroned attribute

---
 pkgs/development/python-modules/archspec/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/archspec/default.nix b/pkgs/development/python-modules/archspec/default.nix
index 55a192f01c09..f12992324371 100644
--- a/pkgs/development/python-modules/archspec/default.nix
+++ b/pkgs/development/python-modules/archspec/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  click,
   fetchFromGitHub,
   jsonschema,
   poetry-core,
@@ -23,8 +22,6 @@ buildPythonPackage rec {
 
   build-system = [ poetry-core ];
 
-  dependecies = [ click ];
-
   nativeCheckInputs = [
     pytestCheckHook
     jsonschema

From 79d4812a85ebbdf6898a8c685bfe9400c8356808 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Jun 2026 21:13:33 +0000
Subject: [PATCH 046/197] mint: 0.28.1 -> 0.29.0

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

diff --git a/pkgs/by-name/mi/mint/package.nix b/pkgs/by-name/mi/mint/package.nix
index 763640599e22..7a67d556741d 100644
--- a/pkgs/by-name/mi/mint/package.nix
+++ b/pkgs/by-name/mi/mint/package.nix
@@ -8,13 +8,13 @@
 
 crystal.buildCrystalPackage rec {
   pname = "mint";
-  version = "0.28.1";
+  version = "0.29.0";
 
   src = fetchFromGitHub {
     owner = "mint-lang";
     repo = "mint";
     tag = version;
-    hash = "sha256-CC3+ygs2JnqtKRGOlP5hZqnVARrgLjV5EewAP+jDM0M=";
+    hash = "sha256-T8gbJ6IeheaiT3QZ/005IV3942wTMjMa/8lWUuyayX0=";
   };
 
   format = "shards";

From f7a123ebc8bfc1e5bb6ced26842ea761de3c04d7 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Wed, 17 Jun 2026 22:51:51 +0200
Subject: [PATCH 047/197] jffi: 1.3.13 -> 1.3.15

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

diff --git a/pkgs/by-name/jf/jffi/package.nix b/pkgs/by-name/jf/jffi/package.nix
index 0cddc9dec8a7..8e8b03cba33e 100644
--- a/pkgs/by-name/jf/jffi/package.nix
+++ b/pkgs/by-name/jf/jffi/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jffi";
-  version = "1.3.13";
+  version = "1.3.15";
 
   src = fetchFromGitHub {
     owner = "jnr";
     repo = "jffi";
     rev = "jffi-${finalAttrs.version}";
-    hash = "sha256-aBQkkZyXZkaJc4sr/jHnIRaJYP116u4Jqsr9XXzfOBA=";
+    hash = "sha256-CW9tB8g/xR01RB1Fl80vWVeXke1eLjHp9mSkMy6O4G4=";
   };
 
   nativeBuildInputs = [

From e8330e521e7aea8f08011b48ca54a58b8190232d Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Thu, 18 Jun 2026 11:05:34 +1000
Subject: [PATCH 048/197] rang: 3.2 -> 3.3
 https://github.com/agauniyal/rang/releases/tag/v3.3

---
 pkgs/by-name/ra/rang/package.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ra/rang/package.nix b/pkgs/by-name/ra/rang/package.nix
index d9776e7e4a6d..8ceefe8edf96 100644
--- a/pkgs/by-name/ra/rang/package.nix
+++ b/pkgs/by-name/ra/rang/package.nix
@@ -7,20 +7,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rang";
-  version = "3.2";
+  version = "3.3";
 
   src = fetchFromGitHub {
     owner = "agauniyal";
     repo = "rang";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NK7jB5ijcu9OObmfLgiWxlJi4cVAhr7p6m9HKf+5TnQ=";
+    hash = "sha256-YJn9SnTBAJ/lPhBRjIlFgRRageeX3wximuAvbXyhgfg=";
   };
 
-  postPatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
-  '';
-
   nativeBuildInputs = [ cmake ];
 
   meta = {

From 6a8949cbf9f8ab56d1086937e0897b00121b7402 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 17 Jun 2026 21:37:44 -0700
Subject: [PATCH 049/197] notable: move icon to spec-compliant location

---
 pkgs/by-name/no/notable/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/no/notable/package.nix b/pkgs/by-name/no/notable/package.nix
index 9bea6881a001..e838214dd216 100644
--- a/pkgs/by-name/no/notable/package.nix
+++ b/pkgs/by-name/no/notable/package.nix
@@ -36,10 +36,12 @@ appimageTools.wrapType2 rec {
 
   extraInstallCommands = ''
     install -m 444 -D ${appimageContents}/notable.desktop $out/share/applications/notable.desktop
-    for size in 16 32 48 64 128 256 512 1024; do
+    for size in 16 32 48 64 128 256 512; do
       install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/''${size}x''${size}/apps/notable.png \
         $out/share/icons/hicolor/''${size}x''${size}/apps/notable.png
     done
+    install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/1024x1024/apps/notable.png \
+      $out/share/icons/notable.png
     substituteInPlace $out/share/applications/notable.desktop \
       --replace 'Exec=AppRun' 'Exec=${pname}'
     wrapProgram "$out/bin/${pname}" \

From ed5a53fa5445cd31bc0c309e941c9b7e330a2615 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 17 Jun 2026 21:42:20 -0700
Subject: [PATCH 050/197] notable: cleanup

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

diff --git a/pkgs/by-name/no/notable/package.nix b/pkgs/by-name/no/notable/package.nix
index e838214dd216..cc51bd55e874 100644
--- a/pkgs/by-name/no/notable/package.nix
+++ b/pkgs/by-name/no/notable/package.nix
@@ -19,7 +19,7 @@ let
     inherit pname version src;
   };
 in
-appimageTools.wrapType2 rec {
+appimageTools.wrapType2 {
 
   inherit pname version src;
 
@@ -43,8 +43,8 @@ appimageTools.wrapType2 rec {
     install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/1024x1024/apps/notable.png \
       $out/share/icons/notable.png
     substituteInPlace $out/share/applications/notable.desktop \
-      --replace 'Exec=AppRun' 'Exec=${pname}'
-    wrapProgram "$out/bin/${pname}" \
+      --replace-fail 'Exec=AppRun' 'Exec=notable'
+    wrapProgram "$out/bin/notable" \
       --add-flags "--disable-seccomp-filter-sandbox"
   '';
 

From 59e4046c0f13788f016c31f7004b9dc1a3f42d1b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Jun 2026 05:18:59 +0000
Subject: [PATCH 051/197] clickable: 8.8.0 -> 8.9.0

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

diff --git a/pkgs/by-name/cl/clickable/package.nix b/pkgs/by-name/cl/clickable/package.nix
index f88311957c10..329d0742d1a9 100644
--- a/pkgs/by-name/cl/clickable/package.nix
+++ b/pkgs/by-name/cl/clickable/package.nix
@@ -11,14 +11,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "clickable";
-  version = "8.8.0";
+  version = "8.9.0";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "clickable";
     repo = "clickable";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-EEICNL5ydrtep+Lbo9ryKW3+vcJwQxPeXY/C4bZaAnI=";
+    hash = "sha256-hrtAx/RKBlVf8cguPAGd55/m0D6YLu678f+aqeIzRos=";
   };
 
   __structuredAttrs = true;

From 630908081af4b5923a7db6cc286077819ce9c973 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Jun 2026 09:32:54 +0000
Subject: [PATCH 052/197] turborepo-remote-cache: 2.7.3 -> 2.11.2

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

diff --git a/pkgs/by-name/tu/turborepo-remote-cache/package.nix b/pkgs/by-name/tu/turborepo-remote-cache/package.nix
index 0a151a358720..e1d74ca1e9ef 100644
--- a/pkgs/by-name/tu/turborepo-remote-cache/package.nix
+++ b/pkgs/by-name/tu/turborepo-remote-cache/package.nix
@@ -13,20 +13,20 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "turborepo-remote-cache";
-  version = "2.7.3";
+  version = "2.11.2";
 
   src = fetchFromGitHub {
     owner = "ducktors";
     repo = "turborepo-remote-cache";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-I5EySaE0SFUmJdK9AAR6Id1TpTS3IOclRazTio8wFeI=";
+    hash = "sha256-V56EEG5iO8lKXRfk5UUo5so58xCEZavYfT1Bj6QYfA8=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_10;
     fetcherVersion = 3;
-    hash = "sha256-CJE8fZEgde06Mm3sg9tRfbU/5jHT9caP67ODWCjQyJI=";
+    hash = "sha256-dMil3ZlCVDOp7q0IxmDQgyBqqsvwidizy3z9b3Bq0hE=";
   };
 
   nativeBuildInputs = [

From d5e79aa57ec2fb595a526c375998106a4d3b3bd4 Mon Sep 17 00:00:00 2001
From: Holiu <165534185+Holiu618@users.noreply.github.com>
Date: Sat, 20 Jun 2026 17:52:30 +0800
Subject: [PATCH 053/197] gpu-screen-recoder: 5.13.8 -> 5.13.9

---
 pkgs/by-name/gp/gpu-screen-recorder/package.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/gp/gpu-screen-recorder/package.nix b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
index f7c6d3b06211..b9306ae922a2 100644
--- a/pkgs/by-name/gp/gpu-screen-recorder/package.nix
+++ b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
@@ -14,7 +14,6 @@
   wayland,
   wayland-scanner,
   vulkan-headers,
-  vulkan-loader,
   pipewire,
   libdrm,
   libva,
@@ -29,12 +28,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gpu-screen-recorder";
-  version = "5.13.8";
+  version = "5.13.9";
 
   src = fetchgit {
     url = "https://repo.dec05eba.com/gpu-screen-recorder";
     tag = finalAttrs.version;
-    hash = "sha256-0uYj9NA6KqORr7ag8OOMphWWyHU27ptuOs5q0lGLGLc=";
+    hash = "sha256-rGjS21eY2XfcdRwmKE2hJO1+FIXAmmBJ4y2oKgSwoRM=";
   };
 
   nativeBuildInputs = [
@@ -53,7 +52,6 @@ stdenv.mkDerivation (finalAttrs: {
     wayland
     wayland-scanner
     vulkan-headers
-    vulkan-loader
     libdrm
     libva
     libxdamage

From f3e8af23b290d8722afcac59822990413b534078 Mon Sep 17 00:00:00 2001
From: Dmitry Bogatov <kaction.cc@gmail.com>
Date: Sun, 21 Jun 2026 06:00:00 -0400
Subject: [PATCH 054/197] treewide: Fix malformed input hashes

Nixcpp implementation of base64 decoder ignores everything that comes
after the first "=" symbol. Clean up the existing nixcpp code so the
decoder can be made strict one day.

https://github.com/NixOS/nix/blob/master/src/libutil/base-n.cc#L94
---
 pkgs/by-name/gu/guake/package.nix                  | 2 +-
 pkgs/by-name/hy/hyperssh/package.nix               | 2 +-
 pkgs/by-name/ja/jameica/package.nix                | 2 +-
 pkgs/by-name/ow/owncast/package.nix                | 2 +-
 pkgs/by-name/qu/quintom-cursor-theme/package.nix   | 2 +-
 pkgs/by-name/tr/trucky/package.nix                 | 2 +-
 pkgs/development/ocaml-modules/janestreet/0.17.nix | 2 +-
 pkgs/games/cataclysm-dda/stable.nix                | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/gu/guake/package.nix b/pkgs/by-name/gu/guake/package.nix
index 657ccb181a78..ce7051d62286 100644
--- a/pkgs/by-name/gu/guake/package.nix
+++ b/pkgs/by-name/gu/guake/package.nix
@@ -46,7 +46,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     # Note: This is not a long-term solution, setup.py is deprecated.
     (fetchpatch {
       url = "https://github.com/Guake/guake/commit/14abaa0c69cfab64fe3467fbbea211d830042de8.patch";
-      hash = "sha256-RjGRFJDTQX2meAaw3UZi/3OxAtIHbRZVpXTbcJk/scY= ";
+      hash = "sha256-RjGRFJDTQX2meAaw3UZi/3OxAtIHbRZVpXTbcJk/scY=";
       revert = true;
     })
 
diff --git a/pkgs/by-name/hy/hyperssh/package.nix b/pkgs/by-name/hy/hyperssh/package.nix
index 7a37467517e2..ee22d269d1e2 100644
--- a/pkgs/by-name/hy/hyperssh/package.nix
+++ b/pkgs/by-name/hy/hyperssh/package.nix
@@ -20,7 +20,7 @@ buildNpmPackage {
     owner = "mafintosh";
     repo = "hyperssh";
     rev = "v5.0.3";
-    hash = "sha256-vjPSNcQRsqu0ee0hownEE9y8dFf9dqaL7alGRc9WjcI=2";
+    hash = "sha256-vjPSNcQRsqu0ee0hownEE9y8dFf9dqaL7alGRc9WjcI=";
   };
 
   patches = [
diff --git a/pkgs/by-name/ja/jameica/package.nix b/pkgs/by-name/ja/jameica/package.nix
index 556acfc74307..e8d99bf3996e 100644
--- a/pkgs/by-name/ja/jameica/package.nix
+++ b/pkgs/by-name/ja/jameica/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     owner = "willuhn";
     repo = "jameica";
     tag = version;
-    hash = "sha256-7KpQas8ttL2DP+gFH87uLQyx4PMwVQ+FaqXpZBPWV5U=i";
+    hash = "sha256-7KpQas8ttL2DP+gFH87uLQyx4PMwVQ+FaqXpZBPWV5U=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ow/owncast/package.nix b/pkgs/by-name/ow/owncast/package.nix
index 4d9cdde6e826..ca162e5c2aee 100644
--- a/pkgs/by-name/ow/owncast/package.nix
+++ b/pkgs/by-name/ow/owncast/package.nix
@@ -22,7 +22,7 @@ buildGoModule {
     hash = "sha256-REgo9RC1izb9vJ6ae66Wti9yfP8DrCGetf6O4rX3DPY=";
   };
 
-  vendorHash = "sha256-T4nr4lNUEq6grZ21qumaOjIDIDoJK7Ql8j8WbCy2u3g=n";
+  vendorHash = "sha256-T4nr4lNUEq6grZ21qumaOjIDIDoJK7Ql8j8WbCy2u3g=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/by-name/qu/quintom-cursor-theme/package.nix b/pkgs/by-name/qu/quintom-cursor-theme/package.nix
index e34ed9bfd41b..85ac1c6d7e0f 100644
--- a/pkgs/by-name/qu/quintom-cursor-theme/package.nix
+++ b/pkgs/by-name/qu/quintom-cursor-theme/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation {
     owner = "Burning_Cube";
     repo = "quintom-cursor-theme";
     rev = "d23e57333e816033cf20481bdb47bb1245ed5d4d";
-    hash = "sha256-Sec2DSnWYal6wzYzP9W+DDuTKHsFHWdRYyMzliMU5bU=A";
+    hash = "sha256-Sec2DSnWYal6wzYzP9W+DDuTKHsFHWdRYyMzliMU5bU=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/tr/trucky/package.nix b/pkgs/by-name/tr/trucky/package.nix
index 66b0143ed9a2..bbad341ba646 100644
--- a/pkgs/by-name/tr/trucky/package.nix
+++ b/pkgs/by-name/tr/trucky/package.nix
@@ -10,7 +10,7 @@ let
 
   src = fetchurl {
     url = "https://web.archive.org/web/20260328182310/https://client-download.truckyapp.com/linux/latest/Trucky.AppImage";
-    hash = "sha256-8F6tIyooqzjgH2+qHsaoFwJkFzzW07fjqK9znDW/AyA=3";
+    hash = "sha256-8F6tIyooqzjgH2+qHsaoFwJkFzzW07fjqK9znDW/AyA=";
   };
 
   appimageContents = appimageTools.extract { inherit pname version src; };
diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix
index 1250dfe2b447..5ebd0770438d 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.17.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix
@@ -1577,7 +1577,7 @@ with self;
       if lib.versionAtLeast ppxlib.version "0.36" then
         {
           version = "0.17.1";
-          hash = "sha256-O3FtpXrFoyMI3iPL3BUwquREy+8TygOlyaTUGBUPk4Q=$";
+          hash = "sha256-O3FtpXrFoyMI3iPL3BUwquREy+8TygOlyaTUGBUPk4Q=";
         }
       else
         {
diff --git a/pkgs/games/cataclysm-dda/stable.nix b/pkgs/games/cataclysm-dda/stable.nix
index 8d73e2d162c6..224b4f097970 100644
--- a/pkgs/games/cataclysm-dda/stable.nix
+++ b/pkgs/games/cataclysm-dda/stable.nix
@@ -24,7 +24,7 @@ let
       repo = "Cataclysm-DDA";
       # Head of 0.H-branch
       tag = "cdda-${version}";
-      sha256 = "sha256-r4cl8cij68WmQRfg+DHQIeDBIwhgwSre6kAUYZaCPR8=n";
+      sha256 = "sha256-r4cl8cij68WmQRfg+DHQIeDBIwhgwSre6kAUYZaCPR8=";
     };
 
     patches = [

From 5e06a7bc76ee3d875b936171a97792acfae56a2a Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 21 Jun 2026 21:29:57 +0200
Subject: [PATCH 055/197] net-cpp: 3.2.1 -> 3.2.2

---
 pkgs/by-name/ne/net-cpp/package.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ne/net-cpp/package.nix b/pkgs/by-name/ne/net-cpp/package.nix
index cfe446269d9f..0befac7ca6c2 100644
--- a/pkgs/by-name/ne/net-cpp/package.nix
+++ b/pkgs/by-name/ne/net-cpp/package.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  fetchpatch,
   gitUpdater,
   makeFontsConf,
   testers,
@@ -31,13 +30,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "net-cpp";
-  version = "3.2.1";
+  version = "3.2.2";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lib-cpp/net-cpp";
     tag = finalAttrs.version;
-    hash = "sha256-1rUPdN62u4eYtrXgoVaeSHro4gnAfFAl1brt+tE45oE=";
+    hash = "sha256-6isbPSzoPcnqbv6+ju/Arbcy+PgFxFF376d4CGmQ6wM=";
   };
 
   outputs = [
@@ -46,15 +45,6 @@ stdenv.mkDerivation (finalAttrs: {
     "doc"
   ];
 
-  patches = [
-    # Remove when version > 3.2.1
-    (fetchpatch {
-      name = "0001-net-cpp-Look-for-python3-executable-at-configure-time-instead-of-hardcoding-a-path.patch";
-      url = "https://gitlab.com/ubports/development/core/lib-cpp/net-cpp/-/commit/811da28f36f34cc2ea32dc96b2c65932d4f954b0.patch";
-      hash = "sha256-CC7fEuRNuf5TNEfhFJr9VLWFWfTnFtIvSTUoCcwGe68=";
-    })
-  ];
-
   strictDeps = true;
 
   nativeBuildInputs = [

From 70cf3e5ed7caf9c44af12ee7cb0286b65b1532e4 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 21 Jun 2026 21:35:37 +0200
Subject: [PATCH 056/197] {lomiri,lomiri-qt6}.gmenuharness: 0.1.5 -> 0.1.6

---
 ...f-cmake_minimum_required-and-project.patch | 26 -------------------
 .../development/gmenuharness/default.nix      | 11 +++-----
 2 files changed, 3 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/desktops/lomiri/development/gmenuharness/1001-gmenuharness-Fix-order-of-cmake_minimum_required-and-project.patch

diff --git a/pkgs/desktops/lomiri/development/gmenuharness/1001-gmenuharness-Fix-order-of-cmake_minimum_required-and-project.patch b/pkgs/desktops/lomiri/development/gmenuharness/1001-gmenuharness-Fix-order-of-cmake_minimum_required-and-project.patch
deleted file mode 100644
index 5e86903f7400..000000000000
--- a/pkgs/desktops/lomiri/development/gmenuharness/1001-gmenuharness-Fix-order-of-cmake_minimum_required-and-project.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 15b5a78289cbc4c0146b7e7561a3539e8cdfaa29 Mon Sep 17 00:00:00 2001
-From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Date: Fri, 17 Apr 2026 11:18:51 +0200
-Subject: [PATCH] CMakeLists.txt: Fix order of calling cmake_minimum_required()
- and project().
-
----
- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c1b3eb3..0d0f66d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,6 +1,7 @@
--project(gmenu-harness VERSION 0.1.5 LANGUAGES C CXX)
- cmake_minimum_required(VERSION 3.10)
- 
-+project(gmenu-harness VERSION 0.1.5 LANGUAGES C CXX)
-+
- set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
- find_package(PkgConfig REQUIRED)
- include(GNUInstallDirs)
--- 
-GitLab
-
diff --git a/pkgs/desktops/lomiri/development/gmenuharness/default.nix b/pkgs/desktops/lomiri/development/gmenuharness/default.nix
index 21c02f1962b3..3f7fa2ee957f 100644
--- a/pkgs/desktops/lomiri/development/gmenuharness/default.nix
+++ b/pkgs/desktops/lomiri/development/gmenuharness/default.nix
@@ -17,24 +17,19 @@
 }:
 
 let
-  withQt6 = lib.strings.versionAtLeast qtbase.version "6";
+  withQt6 = lib.versions.major qtbase.version == "6";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gmenuharness";
-  version = "0.1.5";
+  version = "0.1.6";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/gmenuharness";
     rev = finalAttrs.version;
-    hash = "sha256-hPlCetQ+2gmRdOoVQg7dIndiTxPEKgf8JJtZlihyIYA=";
+    hash = "sha256-H6nwpvS4zK7uR3LspGQD03+CSc67oPaZeQyeAJh03zs=";
   };
 
-  patches = [
-    # Remove when https://gitlab.com/ubports/development/core/gmenuharness/-/merge_requests/10 merged & in release
-    ./1001-gmenuharness-Fix-order-of-cmake_minimum_required-and-project.patch
-  ];
-
   strictDeps = true;
 
   nativeBuildInputs = [

From d72a8cee3b8b0fc639f4cf3072b902b0daa3b5a0 Mon Sep 17 00:00:00 2001
From: ibizaman <ibizaman@tiserbox.com>
Date: Mon, 22 Jun 2026 13:17:35 +0200
Subject: [PATCH 057/197] turborepo-remote-cache: add ibizaman as maintainer

---
 pkgs/by-name/tu/turborepo-remote-cache/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/tu/turborepo-remote-cache/package.nix b/pkgs/by-name/tu/turborepo-remote-cache/package.nix
index 0a151a358720..bd79a956a140 100644
--- a/pkgs/by-name/tu/turborepo-remote-cache/package.nix
+++ b/pkgs/by-name/tu/turborepo-remote-cache/package.nix
@@ -84,6 +84,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "This project is an open-source implementation of the Turborepo custom remote cache server.";
     license = lib.licenses.mit;
     mainProgram = "turborepo-remote-cache";
-    maintainers = with lib.maintainers; [ humemm ];
+    maintainers = with lib.maintainers; [
+      humemm
+      ibizaman
+    ];
   };
 })

From 3a5486f70846ea75c9735f77b8b5bfee498cb117 Mon Sep 17 00:00:00 2001
From: kashw2 <supra4keanu@hotmail.com>
Date: Mon, 22 Jun 2026 21:55:26 +1000
Subject: [PATCH 058/197] deluge: guard gui libraries behind withGUI

---
 pkgs/applications/networking/p2p/deluge/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix
index e08d463c6300..b392057b53fc 100644
--- a/pkgs/applications/networking/p2p/deluge/default.nix
+++ b/pkgs/applications/networking/p2p/deluge/default.nix
@@ -48,10 +48,10 @@ let
           six
           zope-interface
           dbus-python
-          pycairo
-          librsvg
         ]
         ++ optionals withGUI [
+          pycairo
+          librsvg
           gtk3
           gobject-introspection
           pygobject3

From 24bb6a0c44cd68bae9b9ea6eee309d08cbcd6e0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandru=20Scvor=C8=9Bov?= <code@scvalex.net>
Date: Sat, 6 Jun 2026 11:10:16 +0300
Subject: [PATCH 059/197] matrix-tuwunel: build tests in debug profile

---
 pkgs/by-name/ma/matrix-tuwunel/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/ma/matrix-tuwunel/package.nix b/pkgs/by-name/ma/matrix-tuwunel/package.nix
index a7e994ee4dd7..da864bca6838 100644
--- a/pkgs/by-name/ma/matrix-tuwunel/package.nix
+++ b/pkgs/by-name/ma/matrix-tuwunel/package.nix
@@ -150,6 +150,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     libredirect.hook
   ];
 
+  # Make sure tuwunel doesn't try to write to arbitrary
+  # directories or have DNS timeouts during `cargo test`.
   preCheck =
     let
       fakeResolvConf = writeTextFile {
@@ -163,8 +165,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
       export NIX_REDIRECTS="/etc/resolv.conf=${fakeResolvConf}"
       export TUWUNEL_DATABASE_PATH="$(mktemp -d)/smoketest.db"
     '';
+
   doCheck = true;
 
+  # 2026-06-24: Tuwunel has 16 integration tests. Cargo turns each of these
+  # into a separate binary that links in all 110 MB worth of tuwunel.  Linking
+  # 16 big binaries like this takes a really long time and was causing Hydra
+  # to time out the build during `checkPhase`.  So, we run the checks in the
+  # "debug" profile.  This reduces the build+test time on my machine from
+  # 44min to 12min.
+  checkType = "debug";
+
   passthru = {
     rocksdb = rocksdb'; # make used rocksdb version available (e.g., for backup scripts)
     updateScript = nix-update-script { };

From fc0256086fde5f77ea3f0c626853cdaeebca2083 Mon Sep 17 00:00:00 2001
From: RoGreat <roguegreat@gmail.com>
Date: Thu, 25 Jun 2026 00:33:04 -0500
Subject: [PATCH 060/197] faugus-launcher: 1.22.4 -> 1.22.6

---
 pkgs/by-name/fa/faugus-launcher/package.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/fa/faugus-launcher/package.nix b/pkgs/by-name/fa/faugus-launcher/package.nix
index 282360f814c8..809531044406 100644
--- a/pkgs/by-name/fa/faugus-launcher/package.nix
+++ b/pkgs/by-name/fa/faugus-launcher/package.nix
@@ -19,14 +19,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "faugus-launcher";
-  version = "1.22.4";
+  version = "1.22.6";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "Faugus";
     repo = "faugus-launcher";
     tag = finalAttrs.version;
-    hash = "sha256-Npfoqa6A1YSNSxV3zcIQL6prlht47dVaZYpq9+Dx9LY=";
+    hash = "sha256-hN0DU7MFlG8+TVQ2pWRRIVIDlmmHE54Dv/PqFAwwECs=";
   };
 
   nativeBuildInputs = [
@@ -54,9 +54,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
       --replace-fail "/usr/bin/python3" "${python3Packages.python.interpreter}"
 
     substituteInPlace faugus/path_manager.py \
-      --replace-fail "PathManager.user_data('faugus-launcher/umu-run')" "'${lib.getExe umu-launcher}'"
-
-    substituteInPlace faugus/launcher.py faugus/shortcut.py \
+      --replace-fail "PathManager.user_data('faugus-launcher/umu-run')" "'${lib.getExe umu-launcher}'" \
       --replace-fail "/usr/lib/extensions/vulkan/lsfgvk/lib/liblsfg-vk.so" "${lsfg-vk}/lib/liblsfg-vk.so" \
       --replace-fail "/usr/lib/liblsfg-vk.so" "${lsfg-vk}/lib/liblsfg-vk.so"
   '';

From e073b0a69649a44a096c4878244f5e0a67e1f09d Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Thu, 25 Jun 2026 15:15:18 +0200
Subject: [PATCH 061/197] python3Packages.flask-expects-json: use finalAttrs

---
 .../python-modules/flask-expects-json/default.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/flask-expects-json/default.nix b/pkgs/development/python-modules/flask-expects-json/default.nix
index 550981483862..92e5969585e3 100644
--- a/pkgs/development/python-modules/flask-expects-json/default.nix
+++ b/pkgs/development/python-modules/flask-expects-json/default.nix
@@ -7,7 +7,7 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "flask-expects-json";
   version = "1.7.0";
   format = "setuptools";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Fischerfredl";
     repo = "flask-expects-json";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-CUxuwqjjAb9Fy6xWtX1WtSANYaYr5//vY8k89KghYoQ=";
   };
 
@@ -48,4 +48,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})

From 696b2f680060cdce570cf831c8972e6775922475 Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Thu, 25 Jun 2026 15:17:05 +0200
Subject: [PATCH 062/197] python3Packages.flask-expects-json: enable
 __structuredAttrs

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

diff --git a/pkgs/development/python-modules/flask-expects-json/default.nix b/pkgs/development/python-modules/flask-expects-json/default.nix
index 92e5969585e3..db57566e4345 100644
--- a/pkgs/development/python-modules/flask-expects-json/default.nix
+++ b/pkgs/development/python-modules/flask-expects-json/default.nix
@@ -12,6 +12,8 @@ buildPythonPackage (finalAttrs: {
   version = "1.7.0";
   format = "setuptools";
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "Fischerfredl";
     repo = "flask-expects-json";

From 789218b9fbec6e940f1c42f9364e0d5bc165714c Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Thu, 25 Jun 2026 15:19:08 +0200
Subject: [PATCH 063/197] python3Packages.flask-expects-json: migrate to
 pyproject

---
 .../python-modules/flask-expects-json/default.nix          | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/flask-expects-json/default.nix b/pkgs/development/python-modules/flask-expects-json/default.nix
index db57566e4345..d104e9f3e5b4 100644
--- a/pkgs/development/python-modules/flask-expects-json/default.nix
+++ b/pkgs/development/python-modules/flask-expects-json/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   flask,
   jsonschema,
   pytestCheckHook,
@@ -10,7 +11,7 @@
 buildPythonPackage (finalAttrs: {
   pname = "flask-expects-json";
   version = "1.7.0";
-  format = "setuptools";
+  pyproject = true;
 
   __structuredAttrs = true;
 
@@ -21,7 +22,9 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-CUxuwqjjAb9Fy6xWtX1WtSANYaYr5//vY8k89KghYoQ=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     flask
     jsonschema
   ]

From a684e807feb2731daa6383707c2a7ec04cefe75b Mon Sep 17 00:00:00 2001
From: Jan-Niklas Burfeind <git@aiyionpri.me>
Date: Fri, 19 Jun 2026 00:23:36 +0200
Subject: [PATCH 064/197] ndisc6: 1.0.4 -> 1.0.8

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

diff --git a/pkgs/by-name/nd/ndisc6/package.nix b/pkgs/by-name/nd/ndisc6/package.nix
index 8db2d17cac31..19ebae4cff9e 100644
--- a/pkgs/by-name/nd/ndisc6/package.nix
+++ b/pkgs/by-name/nd/ndisc6/package.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ndisc6";
-  version = "1.0.4";
+  version = "1.0.8";
 
   src = fetchurl {
-    url = "https://www.remlab.net/files/ndisc6/archive/ndisc6-${finalAttrs.version}.tar.bz2";
-    sha256 = "07swyar1hl83zxmd7fqwb2q0c0slvrswkcfp3nz5lknrk15dmcdb";
+    url = "https://www.remlab.net/files/ndisc6/ndisc6-${finalAttrs.version}.tar.bz2";
+    sha256 = "sha256-Hy+y3BFydwqloJ05c4pE2LdTzF4uJeMGynhoL5/qC08=";
   };
 
   buildInputs = [ perl ];

From 9fc012c17f94d8670270b3f3f75e4817a0f7c651 Mon Sep 17 00:00:00 2001
From: Jan-Niklas Burfeind <git@aiyionpri.me>
Date: Fri, 19 Jun 2026 00:24:03 +0200
Subject: [PATCH 065/197] ndisc6: modernize and adopt

---
 pkgs/by-name/nd/ndisc6/package.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/nd/ndisc6/package.nix b/pkgs/by-name/nd/ndisc6/package.nix
index 19ebae4cff9e..6a9f22e6958b 100644
--- a/pkgs/by-name/nd/ndisc6/package.nix
+++ b/pkgs/by-name/nd/ndisc6/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchurl,
   perl,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -11,11 +12,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://www.remlab.net/files/ndisc6/ndisc6-${finalAttrs.version}.tar.bz2";
-    sha256 = "sha256-Hy+y3BFydwqloJ05c4pE2LdTzF4uJeMGynhoL5/qC08=";
+    hash = "sha256-Hy+y3BFydwqloJ05c4pE2LdTzF4uJeMGynhoL5/qC08=";
   };
 
   buildInputs = [ perl ];
 
+  nativeBuildInputs = [ perl ];
+
   configureFlags = [
     "--sysconfdir=/etc"
     "--localstatedir=/var"
@@ -27,10 +30,16 @@ stdenv.mkDerivation (finalAttrs: {
     "localstatedir=$(TMPDIR)"
   ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
   meta = {
     homepage = "https://www.remlab.net/ndisc6/";
     description = "Small collection of useful tools for IPv6 networking";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ aiyion ];
     platforms = lib.platforms.linux;
     license = lib.licenses.gpl2Only;
   };

From 8f0f15a2cd385cecdbfc083cdb81bf769e1f6275 Mon Sep 17 00:00:00 2001
From: nwright <nathanwrightbusiness@gmail.com>
Date: Tue, 23 Jun 2026 18:26:15 -0400
Subject: [PATCH 066/197] nixos/sanoid: write config to standard location

---
 nixos/modules/services/backup/sanoid.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/backup/sanoid.nix b/nixos/modules/services/backup/sanoid.nix
index b8b64075b1d5..ff033e0e2a94 100644
--- a/nixos/modules/services/backup/sanoid.nix
+++ b/nixos/modules/services/backup/sanoid.nix
@@ -275,7 +275,7 @@ in
             "${cfg.package}/bin/sanoid"
             "--cron"
             "--configdir"
-            (pkgs.writeTextDir "sanoid.conf" configFile)
+            "/etc/sanoid"
           ]
           ++ cfg.extraArgs
         );
@@ -290,6 +290,8 @@ in
       after = [ "zfs.target" ];
       startAt = cfg.interval;
     };
+
+    environment.etc."sanoid/sanoid.conf".text = configFile;
   };
 
   meta.maintainers = with lib.maintainers; [ lopsided98 ];

From 14946bf27f45119fd89c9439dba12f70162c7651 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Jun 2026 21:50:59 +0000
Subject: [PATCH 067/197] buildkite-agent: 3.128.0 -> 3.129.0

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

diff --git a/pkgs/by-name/bu/buildkite-agent/package.nix b/pkgs/by-name/bu/buildkite-agent/package.nix
index 39a10e1c447a..1ff9748cd993 100644
--- a/pkgs/by-name/bu/buildkite-agent/package.nix
+++ b/pkgs/by-name/bu/buildkite-agent/package.nix
@@ -14,13 +14,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "buildkite-agent";
-  version = "3.128.0";
+  version = "3.129.0";
 
   src = fetchFromGitHub {
     owner = "buildkite";
     repo = "agent";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fBiIp9EyzIfoW4IbUZkePuBDyZRRWLGRClL57nio22E=";
+    hash = "sha256-k1q/7KRaIv5SE7CYFAzV8JB+czmX/bvwBp8JY9t77tI=";
   };
 
   vendorHash = "sha256-lRh5cAbg2yr+nvIaSRg3tG0tLvl7aDjyIoIjS1BvXNM=";

From 5a64512be0052dd84b1bc3050f4cb6ae63709ca2 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Thu, 25 Jun 2026 15:20:57 +0200
Subject: [PATCH 068/197] lobster: 2026.1 -> 2026.4

---
 pkgs/by-name/lo/lobster/package.nix | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/lo/lobster/package.nix b/pkgs/by-name/lo/lobster/package.nix
index a5c9b4dd9a2e..3e96a863080a 100644
--- a/pkgs/by-name/lo/lobster/package.nix
+++ b/pkgs/by-name/lo/lobster/package.nix
@@ -4,36 +4,59 @@
   fetchFromGitHub,
   cmake,
   callPackage,
+  pkg-config,
 
   # Linux deps
   libGL,
+  libxcursor,
   libxext,
+  libxi,
   libx11,
+  libxrandr,
+  libxscrnsaver,
+  libxtst,
 
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lobster";
-  version = "2026.1";
+  version = "2026.4";
 
   src = fetchFromGitHub {
     owner = "aardappel";
     repo = "lobster";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kN4KYd0wTHqF3J4wFGHLmHifkxsb6J+Ex7gGRGnFiGk=";
+    hash = "sha256-kqKOf0zrHyqRTs+57owHR5sORZgNIgGghtjUtSaFjZw=";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
   buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    # TODO devendor sdl3 and remove these
     libGL
+    libxcursor
     libx11
     libxext
+    libxi
+    libxrandr
+    libxscrnsaver
+    libxtst
   ];
 
   preConfigure = ''
     cd dev
   '';
 
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
+  # The test suite expects the executable to be in any of a number of locations
+  # that do not include the bin directory.
+  preCheck = ''
+    ln -s ../../bin/lobster lobster
+  '';
+
   passthru.tests.can-run-hello-world = callPackage ./test-can-run-hello-world.nix { };
 
   meta = {

From d37679718b6f9d6f89b7e6140b4417b8a788c629 Mon Sep 17 00:00:00 2001
From: kuflierl <41301536+kuflierl@users.noreply.github.com>
Date: Sat, 27 Jun 2026 12:57:11 +0200
Subject: [PATCH 069/197] python3Packages.pillow-heif: 1.3.0 -> 1.4.0

---
 .../python-modules/pillow-heif/default.nix        | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix
index cc00832bb662..8eb53f2d26a9 100644
--- a/pkgs/development/python-modules/pillow-heif/default.nix
+++ b/pkgs/development/python-modules/pillow-heif/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "pillow-heif";
-  version = "1.3.0";
+  version = "1.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bigcat88";
     repo = "pillow_heif";
     tag = "v${version}";
-    hash = "sha256-+SlDxNCbuqPqjgJx62snInsWQXWQwnO/sI4mll0Uu4Y=";
+    hash = "sha256-EaislmA4v2qKCDQ87I85Pn8IlS4VJWyNXkITipKSBC8=";
   };
 
   postPatch = ''
@@ -77,17 +77,6 @@ buildPythonPackage rec {
   disabledTests = [
     # Time sensitive speed test, not reproducible
     "test_decode_threads"
-    # Tests failing with libheif 1.22.0. To be removed in the next release
-    # https://github.com/bigcat88/pillow_heif/issues/424
-    # these check what happens when the ispe is not valid
-    "test_numpy_array_invalid_ispe"
-    "test_allow_incorrect_headers"
-    "test_invalid_ispe_ok"
-    "test_invalid_ispe_allow"
-    "test_invalid_ispe_stride"
-    "test_invalid_ispe_stride_pillow"
-    # disable version check for libheif
-    "test_libheif_info"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # https://github.com/bigcat88/pillow_heif/issues/89

From a31d43a2a09ccf6b32684e959d23c4de189513bc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 27 Jun 2026 12:02:59 +0000
Subject: [PATCH 070/197] vscode-extensions.gitlab.gitlab-workflow: 6.83.2 ->
 6.84.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 bbaef26e8f88..3060fdaf00cf 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2015,8 +2015,8 @@ let
         mktplcRef = {
           name = "gitlab-workflow";
           publisher = "gitlab";
-          version = "6.83.2";
-          hash = "sha256-IsiK3A+aVlYKnTSkgeTz4ZZc1rXiYCKDXPVrJsnSFRk=";
+          version = "6.84.2";
+          hash = "sha256-UBoZ6DxT5d7zeTycgmuLomzoVcB7iAnflfxAup6QslI=";
         };
         meta = {
           description = "GitLab extension for Visual Studio Code";

From 14b4d5c0fb7876db2d1593a8bdb95144ceebbb8f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 27 Jun 2026 20:38:20 +0000
Subject: [PATCH 071/197] fan2go: 0.14.0 -> 0.15.0

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

diff --git a/pkgs/by-name/fa/fan2go/package.nix b/pkgs/by-name/fa/fan2go/package.nix
index d71746f16620..1559695d5646 100644
--- a/pkgs/by-name/fa/fan2go/package.nix
+++ b/pkgs/by-name/fa/fan2go/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "fan2go";
-  version = "0.14.0";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "markusressel";
     repo = "fan2go";
     tag = finalAttrs.version;
-    hash = "sha256-TveCqAxZhxXT/nk/M14/tDhFQfNs++bRMmV7bN1VB3k=";
+    hash = "sha256-LEPyyVlVPbGnAfRF0E7wr4fQqRNSKKSsDSKGBCISt5A=";
     leaveDotGit = true;
     postFetch = ''
       cd $out
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
     '';
   };
 
-  vendorHash = "sha256-CzwZghOBKEiRnUl3NCP1PBfW68iGIAJPDsmPUJThGog=";
+  vendorHash = "sha256-LydoBk7qt3Xsf13isJ/yTf6a+FExV9TSSUfD5Tu8Hqk=";
 
   nativeBuildInputs = lib.optionals enableNVML [
     autoAddDriverRunpath

From 21c5a93751f1a74837b8fa48f202f66e755af41a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 27 Jun 2026 21:06:22 +0000
Subject: [PATCH 072/197] marimo: 0.23.10 -> 0.23.11

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

diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix
index 735bc28a10ce..565e40fa8fb5 100644
--- a/pkgs/development/python-modules/marimo/default.nix
+++ b/pkgs/development/python-modules/marimo/default.nix
@@ -32,13 +32,13 @@
 }:
 buildPythonPackage rec {
   pname = "marimo";
-  version = "0.23.10";
+  version = "0.23.11";
   pyproject = true;
 
   # The github archive does not include the static assets
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7XQ0NGLIhDbugeSM97f1zA8FyrJ/1lAnl8Zb1DtTvEA=";
+    hash = "sha256-8y/DCVqh5G07nPn2dymz4SHrkb//+3XzgOFEnYMoiHg=";
   };
 
   build-system = [ uv-build ];

From a8e085905b82b640cbc3ee5578c28d9b40962c04 Mon Sep 17 00:00:00 2001
From: Alexis Williams <alexis@typedr.at>
Date: Sat, 27 Jun 2026 14:29:11 -0700
Subject: [PATCH 073/197] dragonflydb: 1.34.2 -> 1.39.0

Fixes CVE-2026-54341 (RESTORE operations may crash the server; affects
versions < 1.39), and brings the package up to the current release.

The vendored dependency patches are regenerated against the v1.39.0
helio/dragonfly CMake files, which changed a large number of third-party
declarations:

- Pin abseil-cpp to 20250512.1, the release helio's in-tree patches target
  (nixpkgs' abseil-cpp now tracks a newer version the patches no longer apply
  to), and bump the vendored aws-sdk-cpp and jsoncons pins.
- hnswlib now comes from dragonfly's fork rather than nixpkgs, matching
  upstream's switch away from nmslib's hnswlib.
- Vendor the new snowball stemmer dependency (built in-tree); nixpkgs'
  libstemmer is an older snowball release.
- Drop the mimalloc 2.1.6 and jemalloc pins, which helio no longer builds.
- Disable aws-sdk-cpp's git-dependent submodule-version enforcement, which
  cannot run in the sandbox (the source is already fetched at the exact tag
  with submodules).

Assisted-by: Claude Code (Claude Opus 4.8)
---
 .../dr/dragonflydb/external-libs.patch        |  33 ++++--
 .../dr/dragonflydb/helio-third-party.patch    | 106 +++++++++---------
 pkgs/by-name/dr/dragonflydb/package.nix       |  81 ++++++++-----
 3 files changed, 127 insertions(+), 93 deletions(-)

diff --git a/pkgs/by-name/dr/dragonflydb/external-libs.patch b/pkgs/by-name/dr/dragonflydb/external-libs.patch
index 368c0b2a139e..7b0a7130171a 100644
--- a/pkgs/by-name/dr/dragonflydb/external-libs.patch
+++ b/pkgs/by-name/dr/dragonflydb/external-libs.patch
@@ -1,5 +1,5 @@
 diff --git a/src/external_libs.cmake b/src/external_libs.cmake
-index 62e6e879..8934777f 100644
+index 5a98540..1c5ab6d 100644
 --- a/src/external_libs.cmake
 +++ b/src/external_libs.cmake
 @@ -1,7 +1,6 @@
@@ -11,11 +11,13 @@ index 62e6e879..8934777f 100644
    CONFIGURE_COMMAND echo
    BUILD_IN_SOURCE 1
    BUILD_COMMAND ${DFLY_TOOLS_MAKE} all
-@@ -19,18 +18,16 @@ endif()
+@@ -19,20 +18,16 @@ endif()
  
  add_third_party(
    dconv
--  URL https://github.com/google/double-conversion/archive/refs/tags/v3.3.0.tar.gz
+-  GIT_REPOSITORY https://github.com/google/double-conversion
+-  # URL https://github.com/google/double-conversion/archive/refs/tags/v3.3.1.tar.gz
+-  GIT_TAG 0604b4c
 -  PATCH_COMMAND ${SED_REPL} "/static const std::ctype/d"
 -                <SOURCE_DIR>/double-conversion/string-to-double.cc
 -  COMMAND ${SED_REPL} "/std::use_facet</d" <SOURCE_DIR>/double-conversion/string-to-double.cc
@@ -35,12 +37,12 @@ index 62e6e879..8934777f 100644
    CONFIGURE_COMMAND <SOURCE_DIR>/configure --disable-avx2 --prefix=${THIRD_PARTY_LIB_DIR}/reflex
            CXX=${CMAKE_CXX_COMPILER} CC=${CMAKE_C_COMPILER}
  )
-@@ -41,16 +38,14 @@ set(REFLEX "${THIRD_PARTY_LIB_DIR}/reflex/bin/reflex")
+@@ -41,16 +36,14 @@ set(REFLEX "${THIRD_PARTY_LIB_DIR}/reflex/bin/reflex")
  
  add_third_party(
    jsoncons
 -  GIT_REPOSITORY https://github.com/dragonflydb/jsoncons
--  GIT_TAG Dragonfly.178
+-  GIT_TAG Dragonfly1.5.0
 -  GIT_SHALLOW 1
 +  DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/jsoncons/. <SOURCE_DIR>
    CMAKE_PASS_FLAGS "-DJSONCONS_BUILD_TESTS=OFF -DJSONCONS_HAS_POLYMORPHIC_ALLOCATOR=ON"
@@ -54,7 +56,7 @@ index 62e6e879..8934777f 100644
  
    BUILD_IN_SOURCE 1
    CONFIGURE_COMMAND echo skip
-@@ -65,7 +60,7 @@ set(MIMALLOC_C_FLAGS "-O3 -g -DMI_STAT=1 -DNDEBUG")
+@@ -65,7 +58,7 @@ set(MIMALLOC_C_FLAGS "-O3 -g -DMI_STAT=1 -DNDEBUG")
  file(MAKE_DIRECTORY ${MIMALLOC_INCLUDE_DIR})
  
  ExternalProject_Add(mimalloc2_project
@@ -63,7 +65,7 @@ index 62e6e879..8934777f 100644
    DOWNLOAD_DIR ${THIRD_PARTY_DIR}/mimalloc2
    SOURCE_DIR ${THIRD_PARTY_DIR}/mimalloc2
    # INSTALL_DIR ${MIMALLOC_ROOT_DIR}
-@@ -118,21 +113,21 @@ set_target_properties(TRDP::mimalloc2 PROPERTIES IMPORTED_LOCATION ${MIMALLOC_RO
+@@ -119,23 +112,21 @@ set_target_properties(TRDP::mimalloc2 PROPERTIES IMPORTED_LOCATION ${MIMALLOC_RO
  
  add_third_party(
    croncpp
@@ -78,17 +80,28 @@ index 62e6e879..8934777f 100644
 -    URL https://github.com/uni-algo/uni-algo/archive/refs/tags/v1.0.0.tar.gz
 +    DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/uni-algo/. <SOURCE_DIR>
  
-     CMAKE_PASS_FLAGS "-DCMAKE_CXX_STANDARD:STRING=17"
+     CMAKE_PASS_FLAGS "-DCMAKE_CXX_STANDARD:STRING=20"
    )
  
    add_third_party(
      hnswlib
--    URL https://github.com/nmslib/hnswlib/archive/refs/tags/v0.7.0.tar.gz
+-    GIT_REPOSITORY https://github.com/dragonflydb/hnswlib.git
+-    # HEAD of dragonfly branch
+-    GIT_TAG d07dd1da2bf48b85d2f03b8396193ad7120f75c2
 +    DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/hnswlib/. <SOURCE_DIR>
  
      BUILD_COMMAND echo SKIP
      INSTALL_COMMAND cp -R <SOURCE_DIR>/hnswlib ${THIRD_PARTY_LIB_DIR}/hnswlib/include/
-@@ -142,21 +137,20 @@ endif()
+@@ -145,7 +136,7 @@ if (WITH_SEARCH)
+   # No autoconf/cmake/install in upstream Makefile; manual install copy.
+   add_third_party(
+     stemmer
+-    URL https://github.com/snowballstem/snowball/archive/refs/tags/v3.0.1.tar.gz
++    DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/stemmer/. <SOURCE_DIR>
+     BUILD_IN_SOURCE 1
+     CONFIGURE_COMMAND echo skip
+     BUILD_COMMAND ${DFLY_TOOLS_MAKE} -j4 CFLAGS=-O3\ -fPIC libstemmer.a
+@@ -159,21 +150,20 @@ endif()
  
  add_third_party(
    fast_float
diff --git a/pkgs/by-name/dr/dragonflydb/helio-third-party.patch b/pkgs/by-name/dr/dragonflydb/helio-third-party.patch
index c10bd8e89871..74d91bfe5210 100644
--- a/pkgs/by-name/dr/dragonflydb/helio-third-party.patch
+++ b/pkgs/by-name/dr/dragonflydb/helio-third-party.patch
@@ -1,35 +1,52 @@
 diff --git a/helio/cmake/third_party.cmake b/helio/cmake/third_party.cmake
-index 810a8fa..8b11922 100644
+index 6cad93a..409e45f 100644
 --- a/helio/cmake/third_party.cmake
 +++ b/helio/cmake/third_party.cmake
-@@ -151,7 +151,7 @@ endfunction()
+@@ -189,24 +189,9 @@ function(download_and_validate url file out_status)
+   set(${out_status} "${st}" PARENT_SCOPE)
+ endfunction()
  
+-if(NOT EXISTS "${GTEST_TARBALL}")
+-  download_and_validate("${GTEST_RELEASE_URL}" "${GTEST_TARBALL}" st1)
+-  list(GET st1 0 rc1)
+-  if(NOT rc1 EQUAL 0)
+-    file(REMOVE "${GTEST_TARBALL}")
+-    message(STATUS "Primary download failed: ${st1}. Trying archive URL...")
+-    download_and_validate("${GTEST_ARCHIVE_URL}" "${GTEST_TARBALL}" st2)
+-    list(GET st2 0 rc2)
+-    if(NOT rc2 EQUAL 0)
+-      file(REMOVE "${GTEST_TARBALL}")
+-      message(FATAL_ERROR "Failed to download googletest.\nRelease: ${st1}\nArchive: ${st2}")
+-    endif()
+-  endif()
+-endif()
+-
  FetchContent_Declare(
    gtest
--  URL https://github.com/google/googletest/archive/v1.15.2.tar.gz
+-  URL "${GTEST_TARBALL}"
 +  DOWNLOAD_COMMAND true
  )
  
  FetchContent_GetProperties(gtest)
-@@ -162,7 +162,7 @@ endif ()
+@@ -217,7 +202,7 @@ endif ()
  
  FetchContent_Declare(
    benchmark
--  URL https://github.com/google/benchmark/archive/v1.9.1.tar.gz
+-  URL https://github.com/google/benchmark/archive/v1.9.5.tar.gz
 +  DOWNLOAD_COMMAND true
  )
  
  FetchContent_GetProperties(benchmark)
-@@ -181,7 +181,7 @@ endif ()
+@@ -236,7 +221,7 @@ endif ()
  
  FetchContent_Declare(
    abseil_cpp
 -  URL https://github.com/abseil/abseil-cpp/releases/download/20250512.1/abseil-cpp-20250512.1.tar.gz
 +  DOWNLOAD_COMMAND true
    PATCH_COMMAND patch -p1 < "${CMAKE_CURRENT_LIST_DIR}/../patches/abseil-20250512.1.patch"
+   COMMAND patch -p1 < "${CMAKE_CURRENT_LIST_DIR}/../patches/abseil-gcc-undefined-sanitizer-compilation-fix.patch"
  )
- 
-@@ -204,11 +204,7 @@ if (LEGACY_GLOG)
+@@ -263,11 +248,7 @@ if (LEGACY_GLOG)
  
    FetchContent_Declare(
      glog
@@ -42,36 +59,16 @@ index 810a8fa..8b11922 100644
    )
  
    FetchContent_GetProperties(glog)
-@@ -278,7 +274,7 @@ if (WITH_GPERF)
+@@ -337,7 +318,7 @@ if (WITH_GPERF)
  
    add_third_party(
      gperf
--    URL https://github.com/gperftools/gperftools/archive/gperftools-2.16.tar.gz
+-    URL https://github.com/gperftools/gperftools/archive/gperftools-2.18.1.tar.gz
 +    DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/gperf/. <SOURCE_DIR>
  
      # GIT_SHALLOW TRUE
      # Remove building the unneeded programs (they fail on macos)
-@@ -312,9 +308,7 @@ set(MIMALLOC_INCLUDE_DIR ${THIRD_PARTY_LIB_DIR}/mimalloc/include)
- set (MIMALLOC_PATCH_COMMAND patch -p1 -d ${THIRD_PARTY_DIR}/mimalloc/ -i ${CMAKE_CURRENT_LIST_DIR}/../patches/mimalloc-v2.1.6.patch)
- 
- add_third_party(mimalloc
--   #GIT_REPOSITORY https://github.com/microsoft/mimalloc.git
--   #GIT_TAG 0f6d8293c74796fa913e4b5eb4361f1e4734f7c6
--   URL https://github.com/microsoft/mimalloc/archive/refs/tags/v2.1.6.tar.gz
-+   DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/mimalloc216/. <SOURCE_DIR>
-    PATCH_COMMAND "${MIMALLOC_PATCH_COMMAND}"
-    # -DCMAKE_BUILD_TYPE=Release
-    # Add -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=-O0 to debug
-@@ -328,7 +322,7 @@ add_third_party(mimalloc
- )
- 
- add_third_party(jemalloc
--  URL https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2
-+  DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/jemalloc/. <SOURCE_DIR>
-   PATCH_COMMAND ./autogen.sh
-   CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${THIRD_PARTY_LIB_DIR}/jemalloc --with-jemalloc-prefix=je_ --disable-libdl
- )
-@@ -336,7 +330,7 @@ add_third_party(jemalloc
+@@ -367,7 +348,7 @@ endif()
  
  add_third_party(
    xxhash
@@ -80,16 +77,16 @@ index 810a8fa..8b11922 100644
  
    # A bug in xxhash 0.8.1 that searches for a file that doesn't exist
    PATCH_COMMAND touch <SOURCE_DIR>/xxhsum.1
-@@ -347,7 +341,7 @@ add_third_party(
+@@ -378,7 +359,7 @@ add_third_party(
  
  add_third_party(
    uring
--  URL https://github.com/axboe/liburing/archive/refs/tags/liburing-2.8.tar.gz
+-  URL https://github.com/axboe/liburing/archive/refs/tags/liburing-2.13.tar.gz
 +  DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/uring/. <SOURCE_DIR>
  
    CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${THIRD_PARTY_LIB_DIR}/uring
    BUILD_COMMAND make -C src
-@@ -356,7 +350,7 @@ add_third_party(
+@@ -387,12 +368,12 @@ add_third_party(
  
  add_third_party(
    pugixml
@@ -98,28 +95,35 @@ index 810a8fa..8b11922 100644
  )
  
  if (WITH_AWS)
-@@ -364,9 +358,7 @@ if (WITH_AWS)
+   set (AWS_PATCH_COMMAND patch -p1 -d ${THIRD_PARTY_DIR}/aws/ -i ${CMAKE_CURRENT_LIST_DIR}/../patches/aws-sdk-cpp-1.11.717.patch)
+-  set(AWS_CMAKE_PASS_FLAGS "-DBUILD_ONLY=s3 -DNO_HTTP_CLIENT=ON -DENABLE_TESTING=OFF  -DENABLE_CURL_LOGGING=OFF -DAUTORUN_UNIT_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DAWS_SDK_WARNINGS_ARE_ERRORS=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_POLICY_VERSION_MINIMUM=3.5")
++  set(AWS_CMAKE_PASS_FLAGS "-DBUILD_ONLY=s3 -DNO_HTTP_CLIENT=ON -DENABLE_TESTING=OFF  -DENABLE_CURL_LOGGING=OFF -DAUTORUN_UNIT_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DAWS_SDK_WARNINGS_ARE_ERRORS=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DENFORCE_SUBMODULE_VERSIONS=OFF")
+ 
+   if (OPENSSL_CRYPTO_LIBRARY AND OPENSSL_INCLUDE_DIR)
+     string(APPEND AWS_CMAKE_PASS_FLAGS " -Dcrypto_LIBRARY=${OPENSSL_CRYPTO_LIBRARY} -Dcrypto_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR}")
+@@ -410,10 +391,7 @@ if (WITH_AWS)
  
    add_third_party(
      aws
 -    GIT_REPOSITORY https://github.com/aws/aws-sdk-cpp.git
--    GIT_TAG 3e51fa016655eeb6b6610bdf8fe7cf33ebbf3e00
+-    GIT_TAG 1.11.717
 -    GIT_SHALLOW TRUE
+-    GIT_CONFIG      submodule.recurse=1 submodule.fetchJobs=10
 +    DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/aws-sdk-cpp/. <SOURCE_DIR>
      PATCH_COMMAND "${AWS_PATCH_COMMAND}"
-     CMAKE_PASS_FLAGS "-DBUILD_ONLY=s3 -DNO_HTTP_CLIENT=ON -DENABLE_TESTING=OFF  -DAUTORUN_UNIT_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_POLICY_VERSION_MINIMUM=3.5"
+     CMAKE_PASS_FLAGS "${AWS_CMAKE_PASS_FLAGS}"
      LIB libaws-cpp-sdk-s3.a libaws-cpp-sdk-core.a libaws-crt-cpp.a libaws-c-mqtt.a libaws-c-event-stream.a libaws-c-s3.a libaws-c-auth.a  libaws-c-http.a libaws-c-io.a libs2n.a libaws-c-compression.a libaws-c-cal.a libaws-c-sdkutils.a libaws-checksums.a libaws-c-common.a
-@@ -376,8 +368,7 @@ endif()
- if (WITH_GCP)
-   add_third_party(
-     rapidjson
--    GIT_REPOSITORY https://github.com/Tencent/rapidjson.git
--    GIT_TAG ab1842a
-+    DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/rapidjson/. <SOURCE_DIR>
-     CMAKE_PASS_FLAGS "-DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF \
-                       -DRAPIDJSON_BUILD_DOC=OFF -DCMAKE_POLICY_VERSION_MINIMUM=3.5"
-     LIB "none"
-@@ -386,24 +377,23 @@ endif()
+@@ -422,8 +400,7 @@ endif()
+ 
+ add_third_party(
+   rapidjson
+-  GIT_REPOSITORY https://github.com/Tencent/rapidjson.git
+-  GIT_TAG ab1842a
++  DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/rapidjson/. <SOURCE_DIR>
+   CMAKE_PASS_FLAGS "-DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF \
+                     -DRAPIDJSON_BUILD_DOC=OFF -DCMAKE_POLICY_VERSION_MINIMUM=3.5"
+   LIB "none"
+@@ -431,14 +408,14 @@ add_third_party(
  
  add_third_party(
    cares
@@ -134,11 +138,9 @@ index 810a8fa..8b11922 100644
 -  URL https://github.com/facebook/zstd/releases/download/v1.5.7/zstd-1.5.7.tar.zst
 +  DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/zstd/. <SOURCE_DIR>
    SOURCE_SUBDIR "build/cmake"
--  
-+
+ 
    # for debug pass : "CFLAGS=-fPIC -O0 -ggdb"
-   CMAKE_PASS_FLAGS "-DZSTD_BUILD_SHARED=OFF -DZSTD_BUILD_PROGRAMS=OFF -DZSTD_BUILD_TESTS=OFF"
- )
+@@ -447,8 +424,7 @@ add_third_party(
  
  add_third_party(
    expected
diff --git a/pkgs/by-name/dr/dragonflydb/package.nix b/pkgs/by-name/dr/dragonflydb/package.nix
index cbd5fe185d33..4d9f71ac3f4e 100644
--- a/pkgs/by-name/dr/dragonflydb/package.nix
+++ b/pkgs/by-name/dr/dragonflydb/package.nix
@@ -4,7 +4,6 @@
   stdenv,
 
   # Dependencies
-  abseil-cpp,
   c-ares,
   croncpp,
   double-conversion,
@@ -15,8 +14,6 @@
   gperftools,
   gtest,
   hdrhistogram_c,
-  hnswlib,
-  jemalloc,
   liburing,
   lz4,
   pcre2,
@@ -36,6 +33,7 @@
   cmake,
   gcc-unwrapped,
   ninja,
+  perl,
 
   # Runtime dependencies
   boost,
@@ -57,21 +55,31 @@
 
 let
   pname = "dragonflydb";
-  version = "1.34.2";
+  version = "1.39.0";
 
   src = fetchFromGitHub {
     owner = "dragonflydb";
     repo = "dragonfly";
     tag = "v${version}";
-    hash = "sha256-n70IB32tZDe665hVLrKC0BSSJutmYhtPJvfNa48xaqA=";
+    hash = "sha256-vLuuf3fVdVzcd06bafGiLtION6IwTnspiIJmZF9tUGg=";
     fetchSubmodules = true;
   };
 
-  aws-sdk-cpp-1-11-162 = fetchFromGitHub {
+  # dragonfly's helio applies patches written against this exact abseil
+  # release (see helio/patches/abseil-20250512.1.patch), so it's pinned here
+  # rather than taken from nixpkgs' abseil-cpp, which tracks a newer version.
+  abseil-cpp-20250512 = fetchFromGitHub {
+    owner = "abseil";
+    repo = "abseil-cpp";
+    tag = "20250512.1";
+    hash = "sha256-eB7OqTO9Vwts9nYQ/Mdq0Ds4T1KgmmpYdzU09VPWOhk=";
+  };
+
+  aws-sdk-cpp-1-11-717 = fetchFromGitHub {
     owner = "aws";
     repo = "aws-sdk-cpp";
-    tag = "1.11.162";
-    hash = "sha256-NxVE7H8BOetpbBkB2PTVBoHSXYm6cTp41F1LJmhtBbs=";
+    tag = "1.11.717";
+    hash = "sha256-stDZg9dvKljnbZZUHEn1KmlgDdvW6BK7H7RtGk/nyEI=";
     fetchSubmodules = true;
   };
 
@@ -85,8 +93,17 @@ let
   jsoncons-dragonfly = fetchFromGitHub {
     owner = "dragonflydb";
     repo = "jsoncons";
-    rev = "Dragonfly.178";
-    hash = "sha256-cxM95DFFo5z+eImgZzJw+ykaeSDtBF+hw5qo6gnL53s=";
+    rev = "Dragonfly1.5.0";
+    hash = "sha256-9W9GJpzKuqolXoz5iYiE1EbVWr7HiFqpMgZO1BQdi0s=";
+  };
+
+  # dragonfly's search module uses a fork of hnswlib with custom changes, so
+  # this can't come from nixpkgs' hnswlib (nmslib upstream).
+  hnswlib-dragonfly = fetchFromGitHub {
+    owner = "dragonflydb";
+    repo = "hnswlib";
+    rev = "d07dd1da2bf48b85d2f03b8396193ad7120f75c2";
+    hash = "sha256-GFBjKzDauznGGfkXZqSFgbvBKxDXbx2rETqY5BnCIiw=";
   };
 
   lua-dragonfly = fetchFromGitHub {
@@ -96,13 +113,6 @@ let
     hash = "sha256-uLNe+hLihu4wMW/wstGnYdPa2bGPC5UiNE+VyNIYY2c=";
   };
 
-  mimalloc216 = fetchFromGitHub {
-    owner = "microsoft";
-    repo = "mimalloc";
-    tag = "v2.1.6";
-    hash = "sha256-Ff3+RP+lAXCOeHJ87oG3c02rPP4WQIbg5L/CVe6gA3M=";
-  };
-
   mimalloc224 = fetchFromGitHub {
     owner = "microsoft";
     repo = "mimalloc";
@@ -110,6 +120,15 @@ let
     hash = "sha256-+8xZT+mVEqlqabQc+1buVH/X6FZxvCd0rWMyjPu9i4o=";
   };
 
+  # nixpkgs' libstemmer is older than the snowball release dragonfly's search
+  # module builds against, so the source is pinned and built in-tree here.
+  snowball-stemmer = fetchFromGitHub {
+    owner = "snowballstem";
+    repo = "snowball";
+    tag = "v3.0.1";
+    hash = "sha256-QPIPePddUqwpa0YMn0E7H9GZj3s2bEkJzZdXlrHeZbo=";
+  };
+
   withUnwind = !stdenv.targetPlatform.isAarch64;
 in
 stdenv.mkDerivation {
@@ -130,7 +149,7 @@ stdenv.mkDerivation {
 
     # Copy FetchContent dependencies (in helio/cmake/third_party.cmake)
     # These go to build/_deps/ where FetchContent expects them
-    cp -r --no-preserve=mode,ownership ${abseil-cpp.src} build/_deps/abseil_cpp-src
+    cp -r --no-preserve=mode,ownership ${abseil-cpp-20250512} build/_deps/abseil_cpp-src
     cp -r --no-preserve=mode,ownership ${gbenchmark.src} build/_deps/benchmark-src
     cp -r --no-preserve=mode,ownership ${glog-absl} build/_deps/glog-src
     cp -r --no-preserve=mode,ownership ${gtest.src} build/_deps/gtest-src
@@ -142,13 +161,12 @@ stdenv.mkDerivation {
     cp -r --no-preserve=mode,ownership ${fast-float.src} build/deps-nixpkgs/fast_float
     cp -r --no-preserve=mode,ownership ${flatbuffers_23.src} build/deps-nixpkgs/flatbuffers
     cp -r --no-preserve=mode,ownership ${hdrhistogram_c.src} build/deps-nixpkgs/hdr_histogram
-    cp -r --no-preserve=mode,ownership ${jemalloc.src} build/deps-nixpkgs/jemalloc
     cp -r --no-preserve=mode,ownership ${jsoncons-dragonfly} build/deps-nixpkgs/jsoncons
     cp -r --no-preserve=mode,ownership ${liburing.src} build/deps-nixpkgs/uring
     cp -r --no-preserve=mode,ownership ${lua-dragonfly} build/deps-nixpkgs/lua
     cp -r --no-preserve=mode,ownership ${lz4.src} build/deps-nixpkgs/lz4
-    cp -r --no-preserve=mode,ownership ${mimalloc216} build/deps-nixpkgs/mimalloc216
     cp -r --no-preserve=mode,ownership ${mimalloc224} build/deps-nixpkgs/mimalloc224
+    cp -r --no-preserve=mode,ownership ${rapidjson.src} build/deps-nixpkgs/rapidjson
     cp -r --no-preserve=mode,ownership ${pugixml.src} build/deps-nixpkgs/pugixml
     cp -r --no-preserve=mode,ownership ${re-flex.src} build/deps-nixpkgs/reflex
     cp -r --no-preserve=mode,ownership ${xxhash.src} build/deps-nixpkgs/xxhash
@@ -161,16 +179,7 @@ stdenv.mkDerivation {
     ${
       if withAws then
         ''
-          cp -r --no-preserve=mode,ownership ${aws-sdk-cpp-1-11-162} build/deps-nixpkgs/aws-sdk-cpp
-        ''
-      else
-        ""
-    }
-
-    ${
-      if withGcp then
-        ''
-          cp -r --no-preserve=mode,ownership ${rapidjson.src} build/deps-nixpkgs/rapidjson
+          cp -r --no-preserve=mode,ownership ${aws-sdk-cpp-1-11-717} build/deps-nixpkgs/aws-sdk-cpp
         ''
       else
         ""
@@ -188,7 +197,8 @@ stdenv.mkDerivation {
     ${
       if withSearch then
         ''
-          cp -r --no-preserve=mode,ownership ${hnswlib.src} build/deps-nixpkgs/hnswlib
+          cp -r --no-preserve=mode,ownership ${hnswlib-dragonfly} build/deps-nixpkgs/hnswlib
+          cp -r --no-preserve=mode,ownership ${snowball-stemmer} build/deps-nixpkgs/stemmer
           cp -r --no-preserve=mode,ownership ${uni-algo.src} build/deps-nixpkgs/uni-algo
         ''
       else
@@ -200,6 +210,14 @@ stdenv.mkDerivation {
     chmod u+x build/deps-nixpkgs/reflex/configure
     chmod u+x build/deps-nixpkgs/uring/configure
     touch build/deps-nixpkgs/xxhash/xxhsum.1
+
+    # snowball generates its C sources with perl scripts run via their shebang;
+    # the source copy drops their execute bit, so restore it and fix the
+    # /usr/bin/env shebang for the sandbox.
+    if [ -d build/deps-nixpkgs/stemmer ]; then
+      find build/deps-nixpkgs/stemmer -name '*.pl' -exec chmod +x {} +
+      patchShebangs build/deps-nixpkgs/stemmer
+    fi
   '';
 
   nativeBuildInputs = [
@@ -209,6 +227,7 @@ stdenv.mkDerivation {
     bison
     cmake
     ninja
+    perl
   ];
 
   buildInputs = [

From d8ecb2b6cae3fd6b30cb8f489e53d1df5f4e107d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 00:29:36 +0000
Subject: [PATCH 074/197] mpop: 1.4.21 -> 1.4.22

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

diff --git a/pkgs/by-name/mp/mpop/package.nix b/pkgs/by-name/mp/mpop/package.nix
index 2109293a91ea..569f2440b61e 100644
--- a/pkgs/by-name/mp/mpop/package.nix
+++ b/pkgs/by-name/mp/mpop/package.nix
@@ -20,11 +20,11 @@ assert lib.assertOneOf "sslLibrary" sslLibrary [
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mpop";
-  version = "1.4.21";
+  version = "1.4.22";
 
   src = fetchurl {
     url = "https://marlam.de/mpop/releases/mpop-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-TKDR4NATZv4+DPSQ2I0VTfURJ4+1lWOHE748pnVmWFU=";
+    sha256 = "sha256-LNZKnCmlreNCkjDHBhDKS26jBfvCZPaWG12Fp6jOzUs=";
   };
 
   nativeBuildInputs = [

From 7ca61e88ac477416efe9ccdaf511a1e2e08fa896 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sat, 27 Jun 2026 04:56:50 -0400
Subject: [PATCH 075/197] umpire: remove cudatoolkit, enable strictDeps,
 __structuredAttrs

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/um/umpire/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/um/umpire/package.nix b/pkgs/by-name/um/umpire/package.nix
index bb36d87cc71c..dad5b5493085 100644
--- a/pkgs/by-name/um/umpire/package.nix
+++ b/pkgs/by-name/um/umpire/package.nix
@@ -16,6 +16,9 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "umpire";
   version = "2025.12.0";
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "LLNL";
     repo = "umpire";
@@ -37,14 +40,13 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = lib.optionals cudaSupport (
     with cudaPackages;
     [
-      cudatoolkit
+      cuda_nvcc # crt/host_config.h; even though we include this in nativeBuildInputs, it's needed here too
       cuda_cudart
     ]
   );
 
   cmakeFlags =
     lib.optionals cudaSupport [
-      "-DCUDA_TOOLKIT_ROOT_DIR=${cudaPackages.cudatoolkit}"
       "-DENABLE_CUDA=ON"
       (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString)
     ]

From 1de497842773ba6d9665a7c2ef014ab01429f270 Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss@proton.me>
Date: Sun, 28 Jun 2026 10:00:12 +0300
Subject: [PATCH 076/197] sampo: 0.18.0 -> 0.18.1

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

diff --git a/pkgs/by-name/sa/sampo/package.nix b/pkgs/by-name/sa/sampo/package.nix
index d88d26101e3e..373b87c69baa 100644
--- a/pkgs/by-name/sa/sampo/package.nix
+++ b/pkgs/by-name/sa/sampo/package.nix
@@ -9,22 +9,25 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sampo";
-  version = "0.18.0";
+  version = "0.18.1";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "bruits";
     repo = "sampo";
     tag = "cargo-sampo-v${finalAttrs.version}";
-    hash = "sha256-LPgY/UA2AF871bid8wqxzIhTDnsHsQ7IhY/eNYE6Npk=";
+    hash = "sha256-F1x/GKTrNHbXFvjdqkLtdt0jXx3+pBBZzYcQEaTj9rQ=";
   };
 
-  cargoHash = "sha256-U52xGXJlz7cM1fJWZMp51iNgYQRA8AKJ0OkbxlAB5C8=";
+  cargoHash = "sha256-SGCkuL/34eOpI4HpJPW4Z2P95WLHv2R/BEB0EAxbZoA=";
 
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ openssl ];
 
+  # Disable self-update
+  buildNoDefaultFeatures = true;
+
   cargoBuildFlags = [
     "-p"
     "sampo"

From 8476f1965968ee1b2d37194759eecedb10d62a61 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 10:35:46 +0000
Subject: [PATCH 077/197] namespace-cli: 0.0.525 -> 0.0.530

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

diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix
index 9f5b39b44c95..b28209fc08ab 100644
--- a/pkgs/by-name/na/namespace-cli/package.nix
+++ b/pkgs/by-name/na/namespace-cli/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "namespace-cli";
-  version = "0.0.525";
+  version = "0.0.530";
 
   src = fetchFromGitHub {
     owner = "namespacelabs";
     repo = "foundation";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-jGb1PKFxh1f542Gzb0CImmhVYNdrFwRiYAo862h8qoU=";
+    hash = "sha256-pfa/337lqSXVu6nGhv4deXXiqSo5eojWXESk6+Y/DN8=";
   };
 
-  vendorHash = "sha256-3bbXWIiAqGn2twfCSTcYrpbwTOXJC0r8UgDs6iAkX1U=";
+  vendorHash = "sha256-joxaA0x1Ldn82O5k+H9A1rsirBkfpOw+83E4GHCwKb8=";
 
   subPackages = [
     "cmd/nsc"

From b2a34799b3bf0a33564bfe26d54fee596ddd42d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 12:00:50 +0000
Subject: [PATCH 078/197] metapac: 0.9.4 -> 0.10.0

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

diff --git a/pkgs/by-name/me/metapac/package.nix b/pkgs/by-name/me/metapac/package.nix
index dc9c7de6eade..3d59bf23ceca 100644
--- a/pkgs/by-name/me/metapac/package.nix
+++ b/pkgs/by-name/me/metapac/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "metapac";
-  version = "0.9.4";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "ripytide";
     repo = "metapac";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Cr9Ui1nnCrjWZkXiFc1tDRWToJYVuUSVK4VPwFzXW2E=";
+    hash = "sha256-zp45oaLRHv6NdBQEpTEtG93gF04V8YayluXO2IV8LkI=";
   };
 
-  cargoHash = "sha256-ByaCeWfcGmTiQKz3DdSQMAaCGwJTjNOLxDljfM46LRk=";
+  cargoHash = "sha256-sw9MPnhbQPifkDJoO33RbMBtTsSyRmuiNVyjlteAAcM=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;

From 5d4a756810a95e7362cca788030b5978d1e4685c Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 28 Jun 2026 11:19:22 -0300
Subject: [PATCH 079/197] grafanaPlugins.yesoreyeram-infinity-datasource: 3.7.4
 -> 3.10.1

---
 .../plugins/yesoreyeram-infinity-datasource/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/yesoreyeram-infinity-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/yesoreyeram-infinity-datasource/default.nix
index dcf2f6ddd3de..ef5a27e66d7e 100644
--- a/pkgs/servers/monitoring/grafana/plugins/yesoreyeram-infinity-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/yesoreyeram-infinity-datasource/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "yesoreyeram-infinity-datasource";
-  version = "3.7.4";
-  zipHash = "sha256-XRMbMRzTYGnoIN6rXefhiigZ6FX6MkF2yjlwB3bMqDQ=";
+  version = "3.10.1";
+  zipHash = "sha256-9qM1iJXwm/tChI02C+rK7FkN2k8bQVEZJtdn9sHjVxg=";
   meta = {
     description = "Visualize data from JSON, CSV, XML, GraphQL and HTML endpoints in Grafana";
     license = lib.licenses.asl20;

From 7f2d6802efa7c25333b445bef9000fa9044a492b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 16:58:46 +0000
Subject: [PATCH 080/197] libretro-shaders-slang: 0-unstable-2026-06-19 ->
 0-unstable-2026-06-28

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

diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix
index 7536aa81085b..9894a9927121 100644
--- a/pkgs/by-name/li/libretro-shaders-slang/package.nix
+++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "libretro-shaders-slang";
-  version = "0-unstable-2026-06-19";
+  version = "0-unstable-2026-06-28";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "slang-shaders";
-    rev = "8ec4c82cf61a6ce3faae1e6111457d0d31920b60";
-    hash = "sha256-nPmDmuaa64I0QMHoUTr1nD6g3STyx0+cW3tY/q26M4A=";
+    rev = "b5108ca29a50796011fedf1435025673a17dba98";
+    hash = "sha256-jJQnp3oWlaariLCAZ9tcn19xX8eCIGck7xwC3vMYqIg=";
   };
 
   dontConfigure = true;

From 6f012d36911723a368e7ce55ddf7b56661b2427b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 17:28:25 +0000
Subject: [PATCH 081/197] vscode-extensions.danielsanmedium.dscodegpt: 3.23.0
 -> 3.23.1

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index bbaef26e8f88..07c796fffc5d 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1174,8 +1174,8 @@ let
         mktplcRef = {
           publisher = "DanielSanMedium";
           name = "dscodegpt";
-          version = "3.23.0";
-          hash = "sha256-bbyFdb/hGPV93RJecdx6uozJIOaKitBBhwlI04s50NU=";
+          version = "3.23.1";
+          hash = "sha256-B97cImVKnholhZV0ZBru/gpeVSaTHOFfQywwmjk+kq8=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog";

From fc9bf8ff7d84e6d97d3aa8803c2202cd43a9f25c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 19:22:55 +0000
Subject: [PATCH 082/197] longcat: 0.0.17 -> 0.0.18

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

diff --git a/pkgs/by-name/lo/longcat/package.nix b/pkgs/by-name/lo/longcat/package.nix
index 08d88538db00..24d9e109fa55 100644
--- a/pkgs/by-name/lo/longcat/package.nix
+++ b/pkgs/by-name/lo/longcat/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "0.0.17";
+  version = "0.0.18";
 in
 buildGoModule {
   pname = "longcat";
@@ -16,7 +16,7 @@ buildGoModule {
     owner = "mattn";
     repo = "longcat";
     tag = "v${version}";
-    hash = "sha256-77pYs1IZiUlUGricE4K/zA/vKiihUZnrpyNPEhZjMas=";
+    hash = "sha256-5D+hGWwpjRLDNw1zwM+tkVPHRebERU83Gye6WQZUuhg=";
   };
 
   vendorHash = "sha256-VcNhzQyhd7gDvlrz7Lh2QRUkMjZj40s2hanNP6gsnMs=";

From 320e2ff2e91db1a636131b40c24af705fb265d43 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 21:05:14 +0000
Subject: [PATCH 083/197] cgreen: 1.6.4 -> 1.6.5

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

diff --git a/pkgs/by-name/cg/cgreen/package.nix b/pkgs/by-name/cg/cgreen/package.nix
index e3c557fc9ce7..e084f4ad15fb 100644
--- a/pkgs/by-name/cg/cgreen/package.nix
+++ b/pkgs/by-name/cg/cgreen/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cgreen";
-  version = "1.6.4";
+  version = "1.6.5";
 
   src = fetchFromGitHub {
     owner = "cgreen-devs";
     repo = "cgreen";
     rev = finalAttrs.version;
-    sha256 = "sha256-W4MdB3acZcxavjRupJa4eXAv9g4QgYXFAQWOLoHrQZ8=";
+    sha256 = "sha256-/D06k4c6xu9bL8z/DGnOLvgzOstTeR9PxW/J6a42rZs=";
   };
 
   postPatch = ''

From fbf07081a2925eacbb6f7545adcda6c3c6dbdad4 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Tue, 23 Jun 2026 23:56:55 +0300
Subject: [PATCH 084/197] okolors: meta: more precise license

---
 pkgs/by-name/ok/okolors/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ok/okolors/package.nix b/pkgs/by-name/ok/okolors/package.nix
index a7021e50cea0..a6b12fe1e817 100644
--- a/pkgs/by-name/ok/okolors/package.nix
+++ b/pkgs/by-name/ok/okolors/package.nix
@@ -27,7 +27,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Generate a color palette from an image using k-means clustering in the Oklab color space";
     homepage = "https://github.com/IanManske/Okolors";
-    license = lib.licenses.mit;
+    license =
+      with lib.licenses;
+      OR [
+        asl20
+        mit
+      ];
     maintainers = with lib.maintainers; [
       sandarukasa
     ];

From 4dbaa3b666e856df5c3e75eff8297c2dd1210a6e Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Mon, 29 Jun 2026 00:14:32 +0300
Subject: [PATCH 085/197] cargo-bisect-rustc: meta: more precise license

---
 pkgs/by-name/ca/cargo-bisect-rustc/package.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-bisect-rustc/package.nix b/pkgs/by-name/ca/cargo-bisect-rustc/package.nix
index b0af91dd96d8..01e38d1d5c27 100644
--- a/pkgs/by-name/ca/cargo-bisect-rustc/package.nix
+++ b/pkgs/by-name/ca/cargo-bisect-rustc/package.nix
@@ -62,10 +62,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Bisects rustc, either nightlies or CI artifacts";
     mainProgram = "cargo-bisect-rustc";
     homepage = "https://github.com/rust-lang/cargo-bisect-rustc";
-    license = with lib.licenses; [
-      asl20
-      mit
-    ];
+    license =
+      with lib.licenses;
+      OR [
+        asl20
+        mit
+      ];
     maintainers = with lib.maintainers; [ sandarukasa ];
   };
 })

From ecfa0cc4f75b00d0f63e66460241f18f24acb929 Mon Sep 17 00:00:00 2001
From: Quinn Edenfield <quinn@qeden.dev>
Date: Sun, 28 Jun 2026 15:08:16 -0700
Subject: [PATCH 086/197] libkrun-efi: 1.19.0 -> 1.19.3

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

diff --git a/pkgs/by-name/li/libkrun-efi/package.nix b/pkgs/by-name/li/libkrun-efi/package.nix
index f16399560009..7f601db24457 100644
--- a/pkgs/by-name/li/libkrun-efi/package.nix
+++ b/pkgs/by-name/li/libkrun-efi/package.nix
@@ -20,13 +20,13 @@
   withGpu ? true,
 }:
 let
-  version = "1.19.0";
+  version = "1.19.3";
 
   src = fetchFromGitHub {
-    owner = "containers";
+    owner = "libkrun";
     repo = "libkrun";
     tag = "v${version}";
-    hash = "sha256-g4u34sGdgv6mRRry9b5TAXSx+pmVwCNSD3YNtr6qRxo=";
+    hash = "sha256-mDko5fRcjnb3BI6cINr4gm6DiCghUlkIn1ZiQeHxyaE=";
   };
 
   virglrenderer = stdenv.mkDerivation (finalAttrs: {
@@ -77,7 +77,7 @@ let
 
     buildPhase = ''
       runHook preBuild
-      cd init
+      cd src/init_blob/init
       $CC -O2 -static -Wall -o init init.c dhcp.c
       runHook postBuild
     '';
@@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
-    hash = "sha256-rxdaqEKDDMxFwRuX6kLhqGyFXJTz+Bx4mJJhYL5nPgU=";
+    hash = "sha256-PE8xO8T5TFuGnL+95Y1BAz9EdJVUrxgVtVssAgStW+8=";
   };
 
   nativeBuildInputs = [

From ee15a3bf6a167c83edfbbad4286b6d0c2ebb983d Mon Sep 17 00:00:00 2001
From: Quinn Edenfield <quinn@qeden.dev>
Date: Sun, 28 Jun 2026 15:22:15 -0700
Subject: [PATCH 087/197] krunkit: 1.2.1 -> 1.2.2

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

diff --git a/pkgs/by-name/kr/krunkit/package.nix b/pkgs/by-name/kr/krunkit/package.nix
index 894231cb3ea1..2ea95a185075 100644
--- a/pkgs/by-name/kr/krunkit/package.nix
+++ b/pkgs/by-name/kr/krunkit/package.nix
@@ -13,13 +13,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "krunkit";
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchFromGitHub {
-    owner = "containers";
+    owner = "libkrun";
     repo = "krunkit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-T3PbSDaMqR/DLaTe1/tyMx/KseU5ENFzz1Gxd5/hRao=";
+    hash = "sha256-43XqNofzKi310nhxTNo/Gj5didVa/u/gV05hglecLtk=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {

From cdc00d041e31b32db8be3107f270404604f2e5ba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jun 2026 22:24:34 +0000
Subject: [PATCH 088/197] vscode-extensions.svelte.svelte-vscode: 110.2.0 ->
 110.2.1

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index bbaef26e8f88..70643076b833 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4556,8 +4556,8 @@ let
         mktplcRef = {
           name = "svelte-vscode";
           publisher = "svelte";
-          version = "110.2.0";
-          hash = "sha256-5WCaYhWA6soB2AALFY/5Z7Y8IBAj5/4XSR/I4jHhth8=";
+          version = "110.2.1";
+          hash = "sha256-NcidslqM4AVrobOaxW1EBpMoBCTn2Bej86phIVU2psc=";
         };
         meta = {
           changelog = "https://github.com/sveltejs/language-tools/releases";

From a39c33ca8b14467f636df8edb2e2ef7234b428d3 Mon Sep 17 00:00:00 2001
From: whispers <whispersofthedawn@duck.com>
Date: Sun, 28 Jun 2026 19:03:42 -0400
Subject: [PATCH 089/197] tor-browser: 15.0.16 -> 15.0.17

changelog: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/raw/tbb-15.0.17-build1/projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt
tor changelog: https://gitlab.torproject.org/tpo/core/tor/-/raw/tor-0.4.9.11/ReleaseNotes

this is an unscheduled release to update little t-tor from 0.4.9.9 to
0.4.9.11.

Fixes: TROVE-2026-025, TROVE-2026-026
---
 pkgs/by-name/to/tor-browser/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix
index d8bd48451029..219bfebbb427 100644
--- a/pkgs/by-name/to/tor-browser/package.nix
+++ b/pkgs/by-name/to/tor-browser/package.nix
@@ -102,7 +102,7 @@ let
     ++ lib.optionals mediaSupport [ ffmpeg_7 ]
   );
 
-  version = "15.0.16";
+  version = "15.0.17";
 
   sources = {
     x86_64-linux = fetchurl {
@@ -112,7 +112,7 @@ let
         "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
         "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
       ];
-      hash = "sha256-EVQMUSBKVErtMoXzjxWd+ga6tptS7GsnJvdw0e2s5Qc=";
+      hash = "sha256-WJFDd+DVj4oKHjv7py3yVrttrrCHFcHJbyvLNOwCjhs=";
     };
 
     i686-linux = fetchurl {
@@ -122,7 +122,7 @@ let
         "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
         "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
       ];
-      hash = "sha256-c4sA3uKZZdPSdSmIOs536s5fHUw39+y/l4vS6H4cYrI=";
+      hash = "sha256-pKmAKDWutSp7ptJ66PMiS59aV+pRs3Oz9pV64kRuebI=";
     };
   };
 

From 03e36a44789195a1d5917db2ca6678eabeefe273 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sun, 28 Jun 2026 17:46:06 -0600
Subject: [PATCH 090/197] picocrypt-ng: 2.17 -> 2.18

https://github.com/Picocrypt-NG/Picocrypt-NG/releases/tag/2.18
Diff: https://github.com/Picocrypt-NG/Picocrypt-NG/compare/2.17...2.18
---
 pkgs/by-name/pi/picocrypt-ng/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pi/picocrypt-ng/package.nix b/pkgs/by-name/pi/picocrypt-ng/package.nix
index 15476f24b768..026dbbad8989 100644
--- a/pkgs/by-name/pi/picocrypt-ng/package.nix
+++ b/pkgs/by-name/pi/picocrypt-ng/package.nix
@@ -16,19 +16,19 @@
 
 buildGoModule (finalAttrs: {
   pname = "picocrypt-ng";
-  version = "2.17";
+  version = "2.18";
 
   src = fetchFromGitHub {
     owner = "Picocrypt-NG";
     repo = "Picocrypt-NG";
     # Rewritten git history many times
-    rev = "424db6105588e9fe6b929b6731ace4556a12f172";
-    hash = "sha256-Bj0LK6si1ocGriRJf5GHZ/Z2xVhtyCIiv7H5+h8Dong=";
+    rev = "3261587f8b10471a6ed3c5ad132ada0f7c06e4cf";
+    hash = "sha256-wjoYh6XWV4lJpSr9GQwPnlKGkbFH0YJOp1xVZJb5uOY=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src";
 
-  vendorHash = "sha256-KaTatNjSUnQC44UsV3LFOlkad8WqLfTPFFff8Dn13DA=";
+  vendorHash = "sha256-pbldRarOQ44bE4FPUSHvk2Qk4WQ0zKU0Hd75E717mLI=";
 
   ldflags = [
     "-s"

From fa6c35ffa8de012b5759b880ca83cc5f36aedb68 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Jun 2026 00:57:49 +0000
Subject: [PATCH 091/197] slacky: 0.0.9 -> 0.0.10

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

diff --git a/pkgs/by-name/sl/slacky/package.nix b/pkgs/by-name/sl/slacky/package.nix
index 827a079f5e2b..f29cce269790 100644
--- a/pkgs/by-name/sl/slacky/package.nix
+++ b/pkgs/by-name/sl/slacky/package.nix
@@ -9,16 +9,16 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "slacky";
-  version = "0.0.9";
+  version = "0.0.10";
 
   src = fetchFromGitHub {
     owner = "andirsun";
     repo = "Slacky";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DnbB11hCWUa5RL30taFvOIG6EmKMaNSH6KnJc7XrrW4=";
+    hash = "sha256-irZC09Nm/yrd7Z5av5HJo64gb1TEFzeJqe004GtmEpY=";
   };
 
-  npmDepsHash = "sha256-GD7yni+AgpCaNCohHCa/I2fis1867mgGrdIuyEzi4wU=";
+  npmDepsHash = "sha256-OtspJ1/QaUfXyBHt9hvx+d4JEfKe1X9w+IlMVtdoTiY=";
 
   npmPackFlags = [
     "--ignore-scripts"

From 3131246006c22167953b7ede5bc7ca7ac7a7d320 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Jun 2026 01:01:02 +0000
Subject: [PATCH 092/197] aliyun-cli: 3.3.23 -> 3.4.2

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

diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix
index 63db6cc78bab..3654ccc89a56 100644
--- a/pkgs/by-name/al/aliyun-cli/package.nix
+++ b/pkgs/by-name/al/aliyun-cli/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "aliyun-cli";
-  version = "3.3.23";
+  version = "3.4.2";
 
   src = fetchFromGitHub {
     owner = "aliyun";
     repo = "aliyun-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0AsrdD9ans1CmyJVK9tcAKGLeptpxdNAtOUuSv4i4zU=";
+    hash = "sha256-x43yePNf1HVw9R7PqpAb7J2XYCEn90W81nx/zgfNQBg=";
     fetchSubmodules = true;
   };
 

From a25f5b6fa00facea1bdd2a35eb6aeba406d0f4ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Jun 2026 01:36:24 +0000
Subject: [PATCH 093/197] dapr-cli: 1.17.1 -> 1.18.0

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

diff --git a/pkgs/by-name/da/dapr-cli/package.nix b/pkgs/by-name/da/dapr-cli/package.nix
index d4fc87222a5a..a8a8a457ff08 100644
--- a/pkgs/by-name/da/dapr-cli/package.nix
+++ b/pkgs/by-name/da/dapr-cli/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "dapr-cli";
-  version = "1.17.1";
+  version = "1.18.0";
 
   src = fetchFromGitHub {
     owner = "dapr";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-XsRMVuXkHRARQ2UhG317QH0Ub4SOG8mesa7PnesXpvc=";
+    hash = "sha256-2zi8r4LIguWPrsvpvz+sYF4sXqBVmWJtzHLm5nRHFCU=";
   };
 
-  vendorHash = "sha256-WwYpoKyiNbeoXnOaRy94vSoG4Ya1a7DYNriZoZuBRF8=";
+  vendorHash = "sha256-P7zrfUcb/Hxo7QbIQfq9JSf2d7meZShQ++GG8HkEoLE=";
 
   proxyVendor = true;
 

From aaf0651897db3bb6b38cc5e8d61051e50613abe7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Jun 2026 01:42:45 +0000
Subject: [PATCH 094/197] usacloud: 1.22.3 -> 1.22.4

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

diff --git a/pkgs/by-name/us/usacloud/package.nix b/pkgs/by-name/us/usacloud/package.nix
index e1353bb23f2c..b4a8782e4802 100644
--- a/pkgs/by-name/us/usacloud/package.nix
+++ b/pkgs/by-name/us/usacloud/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "usacloud";
-  version = "1.22.3";
+  version = "1.22.4";
 
   src = fetchFromGitHub {
     owner = "sacloud";
     repo = "usacloud";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vFaJBPw13YmjIzzYeAJZxnOc+nzO1Rs81xGWJqXMrL0=";
+    hash = "sha256-w42+51Pfveclrp8eOfa5XuuDbH8Bx68blOU1dmyJPIw=";
   };
 
-  vendorHash = "sha256-5UE0JAKEcKCyQg0ksnQt8WFHZlQZRVnM0LKwwnAgfqA=";
+  vendorHash = "sha256-5hMDkGvbm6x34HrhyNs2ycgNm9nW6nOIKJtKLMura0g=";
 
   ldflags = [
     "-s"

From 2a21a4af32d4105a7746fc6166ea237aa2d36ce2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Jun 2026 02:29:33 +0000
Subject: [PATCH 095/197] reaper: 7.74 -> 7.75

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

diff --git a/pkgs/by-name/re/reaper/package.nix b/pkgs/by-name/re/reaper/package.nix
index 0bd430aeca77..22242c868d2d 100644
--- a/pkgs/by-name/re/reaper/package.nix
+++ b/pkgs/by-name/re/reaper/package.nix
@@ -40,17 +40,17 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "reaper";
-  version = "7.74";
+  version = "7.75";
 
   src = fetchurl {
     url = url_for_platform finalAttrs.version stdenv.hostPlatform.qemuArch;
     hash =
       if stdenv.hostPlatform.isDarwin then
-        "sha256-QxmAag1tPB3bjz68lFsxSlMim06IfjWUTa++rE4fudE="
+        "sha256-rUm/Nyq1QzkxwdEGqc6RGXtpXUcxy1Y4x9YmRL0KElU="
       else
         {
-          x86_64-linux = "sha256-4Mf2q/eJz8djJv5JlrGGAWjivjEriRrkbrfKXd/iS6w=";
-          aarch64-linux = "sha256-zQ4XmFrACfUD04UWs0fYWW+m4L4B1xxe4Rg18xCUemc=";
+          x86_64-linux = "sha256-BC8W/e1thX1uEKLuPAZ4ALPaCuGfmRVhKmmDvrHEkl4=";
+          aarch64-linux = "sha256-+93eBKvQYXyvdnWtbVx7eL6QtvuXKKpXtFPJxxdkVYk=";
         }
         .${stdenv.hostPlatform.system};
   };

From c618592aa49bacee0a12f132ec1d8d4aa6af4d15 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Jun 2026 04:15:29 +0000
Subject: [PATCH 096/197] scaleway-cli: 2.57.0 -> 2.58.3

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

diff --git a/pkgs/by-name/sc/scaleway-cli/package.nix b/pkgs/by-name/sc/scaleway-cli/package.nix
index db5800e0df2e..e0c4d86230e0 100644
--- a/pkgs/by-name/sc/scaleway-cli/package.nix
+++ b/pkgs/by-name/sc/scaleway-cli/package.nix
@@ -10,16 +10,16 @@
 
 buildGo126Module (finalAttrs: {
   pname = "scaleway-cli";
-  version = "2.57.0";
+  version = "2.58.3";
 
   src = fetchFromGitHub {
     owner = "scaleway";
     repo = "scaleway-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5inoRcHXw6xOAkm2O0k9q3fO2KtFJtac1odSEvsq8Nc=";
+    hash = "sha256-CKsEPVzAYYQE+g3PTqiWKh+I7c2LOU9logpPIabUp2E=";
   };
 
-  vendorHash = "sha256-b5Zn4Jz251oTy92BunBK/5pbP5Mw/45qZn6bKH451t8=";
+  vendorHash = "sha256-tQcl40u8otGohEguPJCTk6JuuWlLB4hrdSsNPQ1ygIw=";
 
   env.CGO_ENABLED = 0;
 

From 50dffe92b72613eaac6f1576c6cdad3bba3eb253 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Jun 2026 05:05:17 +0000
Subject: [PATCH 097/197] cog: 0.1.13 -> 0.1.22

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

diff --git a/pkgs/by-name/co/cog/package.nix b/pkgs/by-name/co/cog/package.nix
index 9da532e6d414..7cfc53f6f6b7 100644
--- a/pkgs/by-name/co/cog/package.nix
+++ b/pkgs/by-name/co/cog/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "cog";
-  version = "0.1.13";
+  version = "0.1.22";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "cog";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-e8PxH09d3n4nDhJzJ/y4KwTZ5UhKgwNupy31Z9VGi7A=";
+    hash = "sha256-hYXTZlV8128cKchF2vMkr4QJxYI+yJA75LtuTmMpR5U=";
   };
 
-  vendorHash = "sha256-0ywSn4JghAfg9KZptpLYp+h1hZju2SmLeOXG5DKPa98=";
+  vendorHash = "sha256-5y6spoRzl4yJ5GpiHHvGHJIdEFnsUdpIiuoWmym5GJY=";
 
   subPackages = [ "cmd/cli" ];
 

From 2797767af8c3dbd2eca4c6fe6580e8dbac45dd38 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Jun 2026 05:16:49 +0000
Subject: [PATCH 098/197] netfoil: 0.5.0 -> 0.6.1

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

diff --git a/pkgs/by-name/ne/netfoil/package.nix b/pkgs/by-name/ne/netfoil/package.nix
index 1aaa0137c7fb..f74baf8464d4 100644
--- a/pkgs/by-name/ne/netfoil/package.nix
+++ b/pkgs/by-name/ne/netfoil/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "netfoil";
-  version = "0.5.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "tinfoil-factory";
     repo = "netfoil";
     tag = "v${version}";
-    hash = "sha256-iea76gzkbLKguqkFh1QzTiYu2aKkdW6FAOkMcp34P1M=";
+    hash = "sha256-WKtyNdb3hwveLpg3vkKFTXceE6b4AjVrzZoj9eEkdx4=";
   };
 
   __structuredAttrs = true;

From b8b623ae1d30ea6e1243f9693a29e2070652e236 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Jun 2026 06:16:39 +0000
Subject: [PATCH 099/197] turn-rs: 4.1.3 -> 4.1.4

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

diff --git a/pkgs/by-name/tu/turn-rs/package.nix b/pkgs/by-name/tu/turn-rs/package.nix
index 515c0237e30c..c7c16c5236ff 100644
--- a/pkgs/by-name/tu/turn-rs/package.nix
+++ b/pkgs/by-name/tu/turn-rs/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "turn-rs";
-  version = "4.1.3";
+  version = "4.1.4";
 
   src = fetchFromGitHub {
     owner = "mycrl";
     repo = "turn-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5ukXh0y5EhQpCEL6T5NcZRGx79RDwqrGXnP1zAF6kuc=";
+    hash = "sha256-tvZWLyWxdSxAKVm92Zll0jpY+9x7YA9h9uBhmfVZfvA=";
   };
 
-  cargoHash = "sha256-vvhj0B/KYdOeddALh38MvAwrg8sIAIlEzTj0yFNEjFk=";
+  cargoHash = "sha256-BPqAX1ZbUygF+luLuPlV0eNf6KRdmm/YNJMCtnuqOPo=";
 
   # By default, no features are enabled
   # https://github.com/mycrl/turn-rs?tab=readme-ov-file#features-1

From 16fed5f75c54dc8fcb94c14dcff015d34aadd94f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Jun 2026 07:08:00 +0000
Subject: [PATCH 100/197] cosmic-ext-applet-sysinfo: 0-unstable-2026-06-05 ->
 0-unstable-2026-06-25

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

diff --git a/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix b/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix
index 52ce2ebdadf4..0e61da227562 100644
--- a/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix
+++ b/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix
@@ -9,13 +9,13 @@
 }:
 rustPlatform.buildRustPackage {
   pname = "cosmic-ext-applet-sysinfo";
-  version = "0-unstable-2026-06-05";
+  version = "0-unstable-2026-06-25";
 
   src = fetchFromGitHub {
     owner = "cosmic-utils";
     repo = "cosmic-ext-applet-sysinfo";
-    rev = "681dfcf86009a84ae76573726d227f949930225b";
-    hash = "sha256-HZZxyAzAwEgGWjPUU6MUhO/yShx423FTpvpImhdjGpk=";
+    rev = "34ed2a114ec327431e576dc8060e767d15d3571f";
+    hash = "sha256-9BF51WrASOSyBTmAenk02cR0fab2S7qU8KMfkgZGZDE=";
   };
 
   cargoHash = "sha256-KVnvyiF2rXb9gio3o+dE9w/zZ5gcad1uEbWHMBC3yDc=";

From 6109e565e2ce3ba87d5145719e1763b46b7452bd Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 29 Jun 2026 10:24:05 +0300
Subject: [PATCH 101/197] python3Packages.pwlf: remove unneeded wheel native
 input

---
 pkgs/development/python-modules/pwlf/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/pwlf/default.nix b/pkgs/development/python-modules/pwlf/default.nix
index 43d1c65594b4..71f7648401f3 100644
--- a/pkgs/development/python-modules/pwlf/default.nix
+++ b/pkgs/development/python-modules/pwlf/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
-  wheel,
   scipy,
   numpy,
   pydoe,
@@ -24,7 +23,6 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [
     setuptools
-    wheel
   ];
 
   propagatedBuildInputs = [

From 2bee88c4fb362e88cfb61048b9c54014250c9534 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 29 Jun 2026 10:24:24 +0300
Subject: [PATCH 102/197] python3Packages.pwlf: use finalAttrs pattern

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

diff --git a/pkgs/development/python-modules/pwlf/default.nix b/pkgs/development/python-modules/pwlf/default.nix
index 71f7648401f3..af32fa29c70b 100644
--- a/pkgs/development/python-modules/pwlf/default.nix
+++ b/pkgs/development/python-modules/pwlf/default.nix
@@ -9,7 +9,7 @@
   unittestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pwlf";
   version = "2.5.2";
   pyproject = true;
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "cjekel";
     repo = "piecewise_linear_fit_py";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-gN4AOmtezJ1310TVcKLsJ6rOtv0rGkQ6LjVluIeYEGQ=";
   };
 
@@ -38,8 +38,8 @@ buildPythonPackage rec {
   meta = {
     description = "Fit piecewise linear data for a specified number of line segments";
     homepage = "https://jekel.me/piecewise_linear_fit_py/";
-    changelog = "https://github.com/cjekel/piecewise_linear_fit_py/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/cjekel/piecewise_linear_fit_py/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ doronbehar ];
   };
-}
+})

From 9196e24949eb0cb3b7df5f9f2324aab0de07e0ca Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 29 Jun 2026 10:25:30 +0300
Subject: [PATCH 103/197] python3Packages.pwlf: modernize buildPythonPackage
 arguments

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

diff --git a/pkgs/development/python-modules/pwlf/default.nix b/pkgs/development/python-modules/pwlf/default.nix
index af32fa29c70b..36c4e5c86336 100644
--- a/pkgs/development/python-modules/pwlf/default.nix
+++ b/pkgs/development/python-modules/pwlf/default.nix
@@ -2,10 +2,16 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
   setuptools,
+
+  # dependencies
   scipy,
   numpy,
   pydoe,
+
+  # tests
   unittestCheckHook,
 }:
 
@@ -21,11 +27,11 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-gN4AOmtezJ1310TVcKLsJ6rOtv0rGkQ6LjVluIeYEGQ=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     scipy
     numpy
     pydoe

From dc11e8667622c68d7119da226d437f51df8e8ba6 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 29 Jun 2026 10:25:59 +0300
Subject: [PATCH 104/197] python3Packages.pwlf: 2.5.2 -> 2.5.3

Diff: https://github.com/cjekel/piecewise_linear_fit_py/compare/v2.5.2...v2.5.3

Changelog: https://github.com/cjekel/piecewise_linear_fit_py/blob/v2.5.3/CHANGELOG.md
---
 pkgs/development/python-modules/pwlf/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pwlf/default.nix b/pkgs/development/python-modules/pwlf/default.nix
index 36c4e5c86336..133679bc945f 100644
--- a/pkgs/development/python-modules/pwlf/default.nix
+++ b/pkgs/development/python-modules/pwlf/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pwlf";
-  version = "2.5.2";
+  version = "2.5.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cjekel";
     repo = "piecewise_linear_fit_py";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gN4AOmtezJ1310TVcKLsJ6rOtv0rGkQ6LjVluIeYEGQ=";
+    hash = "sha256-En8zgImub4hMVphl7c0OkdQJ1LRTEBw0kI8dSs4V+N8=";
   };
 
   build-system = [
@@ -47,5 +47,7 @@ buildPythonPackage (finalAttrs: {
     changelog = "https://github.com/cjekel/piecewise_linear_fit_py/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ doronbehar ];
+    # See https://github.com/cjekel/piecewise_linear_fit_py/issues/134
+    broken = lib.versionAtLeast scipy.version "1.18";
   };
 })

From a606acae5aebb1f236a9becb48bd1ed535ccacbc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Jun 2026 07:49:47 +0000
Subject: [PATCH 105/197] linuxPackages.nullfsvfs: 0.26 -> 0.27

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

diff --git a/pkgs/os-specific/linux/nullfsvfs/default.nix b/pkgs/os-specific/linux/nullfsvfs/default.nix
index ee9b4ab0ab0e..88306fb55356 100644
--- a/pkgs/os-specific/linux/nullfsvfs/default.nix
+++ b/pkgs/os-specific/linux/nullfsvfs/default.nix
@@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "nullfsvfs";
-  version = "0.26";
+  version = "0.27";
 
   src = fetchFromGitHub {
     owner = "abbbi";
     repo = "nullfsvfs";
     rev = "v${version}";
-    sha256 = "sha256-gEvkl8IKekuiQjY+TVaC72vJ310k2A/kXfR5mxdvPpc=";
+    sha256 = "sha256-BvixSZN9GqFS4llaiKHfkLb21+qG74YtyNb8bUP0jdU=";
   };
 
   hardeningDisable = [ "pic" ];

From 1dcce670cf951faf22e080b1a5db8d4b4b827db3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Jun 2026 08:07:19 +0000
Subject: [PATCH 106/197] markdown-oxide: 0.25.11 -> 0.25.12

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

diff --git a/pkgs/by-name/ma/markdown-oxide/package.nix b/pkgs/by-name/ma/markdown-oxide/package.nix
index bf7095357e1f..d1d35e143b6b 100644
--- a/pkgs/by-name/ma/markdown-oxide/package.nix
+++ b/pkgs/by-name/ma/markdown-oxide/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "markdown-oxide";
-  version = "0.25.11";
+  version = "0.25.12";
 
   src = fetchFromGitHub {
     owner = "Feel-ix-343";
     repo = "markdown-oxide";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7hiZqdA9KfSv/IPwykRJB1qmyQThvie4QlCoQw7nFGo=";
+    hash = "sha256-Nxsch5lLXNCnwG1hToel4xZIMnxlr40wskH+nMnFP9E=";
   };
 
-  cargoHash = "sha256-Q0hY5YxV/se7vXf00nKTVkVcLCPzLSitEWtQENRskjc=";
+  cargoHash = "sha256-wJr30uwSRvXxBxPoLltaO5sTSAIvQk/2cDitusFL8f8=";
 
   meta = {
     description = "Markdown LSP server inspired by Obsidian";

From 9b7c7978e8bea73b92794974519860f4c6ffcdb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sun, 28 Jun 2026 15:34:46 +0200
Subject: [PATCH 107/197] legcord: pnpm_10_29_2 -> pnpm_10

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

diff --git a/pkgs/by-name/le/legcord/package.nix b/pkgs/by-name/le/legcord/package.nix
index 7cb1c674808d..eca152547928 100644
--- a/pkgs/by-name/le/legcord/package.nix
+++ b/pkgs/by-name/le/legcord/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm_10_29_2,
+  pnpm_10,
   nodejs,
   electron,
   makeWrapper,
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     pnpmConfigHook
-    pnpm_10_29_2
+    pnpm_10
     nodejs
     # we use a script wrapper here for environment variable expansion at runtime
     # https://github.com/NixOS/nixpkgs/issues/172583
@@ -47,9 +47,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
-    pnpm = pnpm_10_29_2;
-    fetcherVersion = 3;
-    hash = "sha256-ME74yxVwH4W9gE0XbtwDhR8g9QulN2eeOB1eekaHmG8=";
+    pnpm = pnpm_10;
+    fetcherVersion = 4;
+    hash = "sha256-a0FvNwEAEAltQltgUf4tX0IGSdcYHkSodx4b9v5QQcg=";
   };
 
   buildPhase = ''

From 390def420d2f2c1c46f62a873623ba31260136e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Jun 2026 09:19:51 +0000
Subject: [PATCH 108/197] python3Packages.django-lasuite: 0.0.26 -> 0.0.27

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

diff --git a/pkgs/development/python-modules/django-lasuite/default.nix b/pkgs/development/python-modules/django-lasuite/default.nix
index 87cac29392f6..34809516080d 100644
--- a/pkgs/development/python-modules/django-lasuite/default.nix
+++ b/pkgs/development/python-modules/django-lasuite/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "django-lasuite";
-  version = "0.0.26";
+  version = "0.0.27";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "django-lasuite";
     tag = "v${version}";
-    hash = "sha256-wTxM4dVCqfDjMouk/bdLjD/Yv0WuTSOJYFhYMsD4JjQ=";
+    hash = "sha256-bYV5/cPvmSU43oL7+9rCcISl0JqFPeK/xd22Kcg92II=";
   };
 
   build-system = [ hatchling ];

From ae9e893ee8d1c1e0ada057cb313ddf7bb3a92f5f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Jun 2026 10:04:02 +0000
Subject: [PATCH 109/197] python3Packages.gluonts: 0.16.2 -> 0.16.3

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

diff --git a/pkgs/development/python-modules/gluonts/default.nix b/pkgs/development/python-modules/gluonts/default.nix
index 66ddba75f804..b41ccd865755 100644
--- a/pkgs/development/python-modules/gluonts/default.nix
+++ b/pkgs/development/python-modules/gluonts/default.nix
@@ -33,14 +33,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "gluonts";
-  version = "0.16.2";
+  version = "0.16.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "gluonts";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-h0+RYgGMz0gPchiKGIu0/NGcWBky5AWNTJKzoupn/iQ=";
+    hash = "sha256-WQu9QahzbCofC+deso8T93ABJROVLdAegiKtOTxfhT4=";
   };
 
   # pydantic.v1.errors.ConfigError: unable to infer type for attribute "target"

From 50137934ed60329357dda49239a5c1681278f040 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Jun 2026 10:56:03 +0000
Subject: [PATCH 110/197] python3Packages.py-synologydsm-api: 2.10.0 -> 2.10.1

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

diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix
index a30151922b47..2129c2f1e523 100644
--- a/pkgs/development/python-modules/py-synologydsm-api/default.nix
+++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "py-synologydsm-api";
-  version = "2.10.0";
+  version = "2.10.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mib1185";
     repo = "py-synologydsm-api";
     tag = "v${version}";
-    hash = "sha256-zcyeLiy52E8vMVmF5hVJ4rX98RAyI9ZC6WQWJZ2HRIU=";
+    hash = "sha256-3NfI+wth0UTBbByFIsUgyyu7SCmbpNu8necNl7KOAxY=";
   };
 
   build-system = [ setuptools ];

From 3b434df0816c79d3a3c6b71ada3885f041ef352b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Jun 2026 11:14:27 +0000
Subject: [PATCH 111/197] livekit: 1.13.1 -> 1.13.2

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

diff --git a/pkgs/by-name/li/livekit/package.nix b/pkgs/by-name/li/livekit/package.nix
index 746443a124dd..142c4d1b8cf5 100644
--- a/pkgs/by-name/li/livekit/package.nix
+++ b/pkgs/by-name/li/livekit/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "livekit";
-  version = "1.13.1";
+  version = "1.13.2";
 
   src = fetchFromGitHub {
     owner = "livekit";
     repo = "livekit";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-gEdO3f1KZHXHip17u+H2m2O6eFC2XmUtl8vGgTkV3TM=";
+    hash = "sha256-YX3ujJ81sjNw2PsUi8AM/iDG2cbP3mZ1U/AjHwp0LAw=";
   };
 
-  vendorHash = "sha256-XPvjD2RcdvmTD5g9q746rl5MVZrf2CposCaBKnm7fZ8=";
+  vendorHash = "sha256-9LBGMpSs7dGQmcHlCS8ymc79S+LwwHVWcNvlghg1L04=";
 
   subPackages = [ "cmd/server" ];
 

From 3a36654ef241e91dc4998e33367a25e59e67519d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Jun 2026 12:46:29 +0000
Subject: [PATCH 112/197] hydralauncher: 4.0.2 -> 4.0.3

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

diff --git a/pkgs/by-name/hy/hydralauncher/package.nix b/pkgs/by-name/hy/hydralauncher/package.nix
index de34f1a9289b..2d95079140bd 100644
--- a/pkgs/by-name/hy/hydralauncher/package.nix
+++ b/pkgs/by-name/hy/hydralauncher/package.nix
@@ -6,10 +6,10 @@
 }:
 let
   pname = "hydralauncher";
-  version = "4.0.2";
+  version = "4.0.3";
   src = fetchurl {
     url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage";
-    hash = "sha256-kb6tIP0xfbF23yg7aa9jmBFiApEPeKks2ZuWuEM4hGQ=";
+    hash = "sha256-6wWfliSMHq1ncqMpfb/NblXFI7NEuh60GsxmqIW9k14=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit pname src version; };

From e3dd45472389497db209ad8462dd6393ae604a24 Mon Sep 17 00:00:00 2001
From: teto <886074+teto@users.noreply.github.com>
Date: Mon, 29 Jun 2026 03:55:32 +0200
Subject: [PATCH 113/197] memento: 2.0.0 -> 2.0.1

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

diff --git a/pkgs/by-name/me/memento/package.nix b/pkgs/by-name/me/memento/package.nix
index 04f409ab7555..f8bc216c135a 100644
--- a/pkgs/by-name/me/memento/package.nix
+++ b/pkgs/by-name/me/memento/package.nix
@@ -42,13 +42,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "memento";
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "ripose-jp";
     repo = "Memento";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Mg6Gxy8FwqNjE9m4uOQnEY95PZJSQllDBU2KnS8UOHE=";
+    hash = "sha256-A3moOjXubXSggaWaSpuYzp9mKIZYcgMehMG/qkUAtas=";
   };
 
   postPatch = ''

From 5dd89aedefb909a5602d383c7fc1d3e94c975c23 Mon Sep 17 00:00:00 2001
From: Diego Strebel <diego@strebel.com>
Date: Fri, 26 Jun 2026 19:01:31 +0200
Subject: [PATCH 114/197] oscar: 1.7.1 -> 2.0.1

---
 pkgs/by-name/os/oscar/package.nix | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/os/oscar/package.nix b/pkgs/by-name/os/oscar/package.nix
index 1df3c3fb8f06..185f845776c9 100644
--- a/pkgs/by-name/os/oscar/package.nix
+++ b/pkgs/by-name/os/oscar/package.nix
@@ -1,41 +1,47 @@
 {
   lib,
   stdenv,
-  qt5,
+  qt6,
   fetchFromGitLab,
   libGLU,
   nix-update-script,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "oscar";
-  version = "1.7.1";
+  version = "2.0.1";
 
   src = fetchFromGitLab {
     owner = "CrimsonNape";
-    repo = "OSCAR-code";
+    repo = "oscar-sql";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-cOhbWihTHGkBxiMGZhBZ3ejo8kOxlWDctun3Mz5h7AQ=";
+    hash = "sha256-ivOEAP7/pc5yS6mhc/6ButbSjfFmOP4PM7c/S23oyYw=";
   };
 
   buildInputs = [
-    qt5.qtbase
-    qt5.qttools
-    qt5.qtserialport
+    qt6.qtbase
+    qt6.qttools
     libGLU
   ];
   nativeBuildInputs = [
-    qt5.wrapQtAppsHook
-    qt5.qmake
+    qt6.wrapQtAppsHook
+    qt6.qmake
+    qt6.qtserialport
   ];
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
   postPatch = ''
-    substituteInPlace oscar/oscar.pro --replace "/bin/bash" "${stdenv.shell}"
+    substituteInPlace oscar/oscar.pro \
+      --replace-fail "/bin/bash" "${stdenv.shell}" \
+      --replace-fail "\$\$[QT_INSTALL_BINS]/lrelease" "${qt6.qttools}/bin/lrelease"
   '';
 
   qmakeFlags = [ "OSCAR_QT.pro" ];
 
   installPhase = ''
     runHook preInstall
-    install -D oscar/OSCAR -t $out/bin
+    install -D oscar/OSCAR20 -t $out/bin
     # help browser was removed 'temporarily' in https://gitlab.com/pholy/OSCAR-code/-/commit/57c3e4c33ccdd2d0eddedbc24c0e4f2969da3841
     # install -D oscar/Help/* -t $out/share/OSCAR/Help
     install -D oscar/Html/* -t $out/share/OSCAR/Html

From aade3eba23a78324c162f395a169c5e99d93cf87 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Mon, 29 Jun 2026 07:10:56 -0700
Subject: [PATCH 115/197] python3Packages.afdko: fix otfautohint variable-font
 hinting regression

afdko 5.0.1 regressed variable-font hinting: otfautohint aborts with an
AssertionError in calcInstanceStems() when a high ghost stem is a glyph's
first stem (e.g. small diagonal accents), which broke cantarell-fonts.

Backport the upstream fix as a patch to afdko.
https://github.com/adobe-type-tools/afdko/pull/1844

Closes #535887

Assisted-by: Claude Code (claude-opus-4-8)
---
 ...-fix-assertion-high-ghost-first-stem.patch | 38 +++++++++++++++++++
 .../python-modules/afdko/default.nix          |  5 +++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/python-modules/afdko/0002-otfautohint-fix-assertion-high-ghost-first-stem.patch

diff --git a/pkgs/development/python-modules/afdko/0002-otfautohint-fix-assertion-high-ghost-first-stem.patch b/pkgs/development/python-modules/afdko/0002-otfautohint-fix-assertion-high-ghost-first-stem.patch
new file mode 100644
index 000000000000..e35f2865833c
--- /dev/null
+++ b/pkgs/development/python-modules/afdko/0002-otfautohint-fix-assertion-high-ghost-first-stem.patch
@@ -0,0 +1,38 @@
+From dc35a26c5b38bad40dd44d67609b6a89ee0d7774 Mon Sep 17 00:00:00 2001
+From: Philip Taron <philip.taron@gmail.com>
+Date: Mon, 29 Jun 2026 13:48:41 +0000
+Subject: [PATCH] Fix spurious assertion when a high ghost stem is a glyph's
+ first stem
+
+In calcInstanceStems() the per-stem loop initializes lo = None and
+hi = None, then computes one or both locations per stem. For a 'high'
+ghost stem (a hint anchored only at the top edge) only hi is computed;
+lo is then unconditionally overwritten by hi on the next line, so its
+incoming value is dead.
+
+The 'high' branch nonetheless asserted lo is not None. When a high ghost
+is the glyph's first stem -- exactly the case for small diagonal accents
+-- lo is still None from its initialization, so the assertion fired and
+aborted hinting of the whole font.
+
+Drop the dead lo operand from the assertion, because hi is the only
+value actually read.
+---
+ python/afdko/otfautohint/hinter.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/python/afdko/otfautohint/hinter.py b/python/afdko/otfautohint/hinter.py
+index 354d92f2f..1cea13a88 100644
+--- a/python/afdko/otfautohint/hinter.py
++++ b/python/afdko/otfautohint/hinter.py
+@@ -2007,7 +2007,7 @@ def calcInstanceStems(self, glidx) -> None:
+                 lo = lo + 21
+                 hi = lo - 21
+             elif isG == 'high':
+-                assert lo is not None and hi is not None
++                assert hi is not None
+                 lo = hi
+                 hi = lo - 20
+             else:
+--
+2.49.0
diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix
index 70eb28a87de0..1ba4f92f864e 100644
--- a/pkgs/development/python-modules/afdko/default.nix
+++ b/pkgs/development/python-modules/afdko/default.nix
@@ -73,6 +73,11 @@ buildPythonPackage (finalAttrs: {
     # integer underflow causes incorrect behavior
     # patch submitted upstream as https://github.com/adobe-type-tools/afdko/pull/1843
     ./0001-addfeatures-hmtx-avoid-unsigned-integer-underflow.patch
+
+    # spurious assertion when a high ghost stem is a glyph's first stem aborts
+    # variable-font hinting (e.g. cantarell-fonts, NixOS/nixpkgs#535887)
+    # patch submitted upstream as https://github.com/adobe-type-tools/afdko/pull/1844
+    ./0002-otfautohint-fix-assertion-high-ghost-first-stem.patch
   ];
 
   env = {

From 73a91d0aecfab561dd9db574be33857b4c9f93bd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Jun 2026 17:36:50 +0000
Subject: [PATCH 116/197] wpprobe: 0.12.1 -> 0.12.3

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

diff --git a/pkgs/by-name/wp/wpprobe/package.nix b/pkgs/by-name/wp/wpprobe/package.nix
index bcfe25faea9e..3998f4504699 100644
--- a/pkgs/by-name/wp/wpprobe/package.nix
+++ b/pkgs/by-name/wp/wpprobe/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "wpprobe";
-  version = "0.12.1";
+  version = "0.12.3";
 
   src = fetchFromGitHub {
     owner = "Chocapikk";
     repo = "wpprobe";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gvEb1l1efBlOmRYL4UrzSJqSHVx6h4P1+u85vI33dK0=";
+    hash = "sha256-V/g7yPiW41Q8iGWQQ3l4QJrNslJNa/iq/8JxCPigFms=";
   };
 
   vendorHash = "sha256-pAKFrdja+rH0kiJH6hToZwLjE8lLBHFAUCjnCLbgxVo=";

From e50159e0ff63a149ed2407aa7579127277246b0e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 29 Jun 2026 20:00:05 +0200
Subject: [PATCH 117/197] postgresqlPackages.pg_safeupdate: 1.6 ->
 1.6-unstable-2026-06-29

Fixes build with PG19.
---
 pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix
index 81de98b98bbc..a517e7a62c45 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix
@@ -7,13 +7,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg-safeupdate";
-  version = "1.6";
+  version = "1.6-unstable-2026-06-29";
 
   src = fetchFromGitHub {
     owner = "eradman";
     repo = "pg-safeupdate";
-    tag = finalAttrs.version;
-    hash = "sha256-xky2tlb0EoKzyIYftVr7/2BYLdinhxHjXiVO3lR57MM=";
+    rev = "404fcd265f3242b432a16756bfdd078e3a4b6e0f";
+    hash = "sha256-8Y27TfcY6+QO2Fb9wi6zlKzHlDdlIB38/RffMV7MPF0=";
   };
 
   meta = {

From b6ecd37575c6dd6effaf4acc043ea88a0e01d0c1 Mon Sep 17 00:00:00 2001
From: Romain Delhommais <romain@delhommais.com>
Date: Mon, 29 Jun 2026 20:59:55 +0200
Subject: [PATCH 118/197] wealthfolio-server: 3.5.2 -> 3.5.3

https://github.com/wealthfolio/wealthfolio/releases/tag/v3.5.3
---
 pkgs/by-name/we/wealthfolio-server/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/we/wealthfolio-server/package.nix b/pkgs/by-name/we/wealthfolio-server/package.nix
index e274bed4af0a..8211d696ea73 100644
--- a/pkgs/by-name/we/wealthfolio-server/package.nix
+++ b/pkgs/by-name/we/wealthfolio-server/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (
 
         pnpm = pnpm_10;
         fetcherVersion = 3;
-        hash = "sha256-Pt8eDb7tCTM1YD/7I8Ot9+fNzsvpcPfhWsniRD5OjcU=";
+        hash = "sha256-9pINtZToPqAA5VRTO8lRIBzNxO9481WvMkE2kk/iyUM=";
       };
 
       nativeBuildInputs = [
@@ -54,18 +54,18 @@ rustPlatform.buildRustPackage (
     __structuredAttrs = true;
 
     pname = "wealthfolio-server";
-    version = "3.5.2";
+    version = "3.5.3";
 
     src = fetchFromGitHub {
       owner = "wealthfolio";
       repo = "wealthfolio";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-WU87VmnbzUno1CmIVwBLYjmTZybM4qSuRmBH/2n/Tfo=";
+      hash = "sha256-9dE0IQtDUcveZk2eWu9+UDpAYPgk/LbY+jsTNH3N9hg=";
     };
 
     cargoRoot = ".";
     buildAndTestSubdir = "apps/server";
-    cargoHash = "sha256-KoS2EouZ0Uf3cijUUOpwYBYEjEB5VxIArU1CuCji2+I=";
+    cargoHash = "sha256-P93AAivBXWBLik8M/DNUWyKXVsq7ttvX3DpiXwaDL2I=";
 
     nativeBuildInputs = [ makeWrapper ];
 

From 1087827a1086a18f4e477159f4788ddc07918060 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 29 Jun 2026 22:03:49 +0200
Subject: [PATCH 119/197] nextcloud-client: 33.0.6 -> 33.0.7

Diff: https://github.com/nextcloud-releases/desktop/compare/v33.0.6...v33.0.7

Changelog: https://github.com/nextcloud/desktop/releases/tag/v33.0.7
---
 pkgs/by-name/ne/nextcloud-client/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/nextcloud-client/package.nix b/pkgs/by-name/ne/nextcloud-client/package.nix
index b161bde0f33e..9ee951d8fa05 100644
--- a/pkgs/by-name/ne/nextcloud-client/package.nix
+++ b/pkgs/by-name/ne/nextcloud-client/package.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nextcloud-client";
-  version = "33.0.6";
+  version = "33.0.7";
 
   outputs = [
     "out"
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "nextcloud-releases";
     repo = "desktop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jIK8LszlX19KrhP0u1BNwBxujMg2/lEuYqWWNRMkoiE=";
+    hash = "sha256-hfATh24U9o2ZifB1UlLu893aENILb9a/j/IvIytIR5s=";
   };
 
   patches = [

From f1abb347c9ccf83ebb26f110946374b92e4f1bf5 Mon Sep 17 00:00:00 2001
From: Zhaith Izaliel <zhaith.izaliel@ethereal-edelweiss.cloud>
Date: Mon, 29 Jun 2026 14:51:51 +0200
Subject: [PATCH 120/197] iio-niri: 2.2.0 -> 2.3.1

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

diff --git a/pkgs/by-name/ii/iio-niri/package.nix b/pkgs/by-name/ii/iio-niri/package.nix
index 46f7f26c112d..e06602a378fa 100644
--- a/pkgs/by-name/ii/iio-niri/package.nix
+++ b/pkgs/by-name/ii/iio-niri/package.nix
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "iio-niri";
-  version = "2.2.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "Zhaith-Izaliel";
     repo = "iio-niri";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2DWNq6qZmC4hNjgu1W6LBHkcDOSwRT0/8MnbJjyPHQM=";
+    hash = "sha256-6kIHZuHZYDsjY0q8V99jdDkNHwNtvrq77sxGI5SLzSs=";
   };
 
-  cargoHash = "sha256-f/pFWlLxQebzawDdHj3UtpT5Kq9a6fm+tAssqg8ibdo=";
+  cargoHash = "sha256-gXqAUvZ0FjU7SrCmw0CpNtELPwmI0fFpJpe3wrBuqsY=";
 
   nativeBuildInputs = [
     pkg-config

From 7f9f51b33e9b2aed7dfbc3e7d6d41b501246d9c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 29 Jun 2026 22:15:45 +0200
Subject: [PATCH 121/197] openrgb: 1.0rc2 -> 1.0rc3

Diff: https://codeberg.org/OpenRGB/OpenRGB/compare/release_candidate_1.0rc2...release_candidate_1.0rc3
---
 pkgs/by-name/op/openrgb/package.nix | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/op/openrgb/package.nix b/pkgs/by-name/op/openrgb/package.nix
index d4f91908405a..4e0fe4002e6a 100644
--- a/pkgs/by-name/op/openrgb/package.nix
+++ b/pkgs/by-name/op/openrgb/package.nix
@@ -1,8 +1,7 @@
 {
   lib,
   stdenv,
-  fetchFromGitLab,
-  fetchpatch,
+  fetchFromCodeberg,
   libusb1,
   hidapi,
   pkg-config,
@@ -16,22 +15,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "openrgb";
-  version = "1.0rc2";
+  version = "1.0rc3";
 
-  src = fetchFromGitLab {
-    owner = "CalcProgrammer1";
+  src = fetchFromCodeberg {
+    owner = "OpenRGB";
     repo = "OpenRGB";
     tag = "release_candidate_${finalAttrs.version}";
-    hash = "sha256-vdIA9i1ewcrfX5U7FkcRR+ISdH5uRi9fz9YU5IkPKJQ=";
+    hash = "sha256-x7B3Ht9+JM+w/3qL5Ku08r05BBLrbuO5JBqP4fnJ0nc=";
   };
 
   patches = [
     ./system-plugins-env.patch
-    (fetchpatch {
-      name = "Install-systemd-service-under-PREFIX.patch";
-      url = "https://gitlab.com/CalcProgrammer1/OpenRGB/-/commit/b58b3c0402131918b3b988631f42617020df9346.patch";
-      hash = "sha256-q5i5BNjaLbsXSYEXKQOR/cMm5ExckmW1n2r9H0j09T0=";
-    })
   ];
 
   nativeBuildInputs = [
@@ -116,7 +110,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Open source RGB lighting control";
-    homepage = "https://gitlab.com/CalcProgrammer1/OpenRGB";
+    changelog = "https://codeberg.org/OpenRGB/OpenRGB/releases/tag/${finalAttrs.src.tag}";
+    homepage = "https://openrgb.org";
     maintainers = with lib.maintainers; [ johnrtitor ];
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;

From 17a6a2f6a0f9b3f0b0df35d805aa32e5f07b5d81 Mon Sep 17 00:00:00 2001
From: Carl Zulauf <carl@unabridgedsoftware.com>
Date: Mon, 29 Jun 2026 15:03:30 -0500
Subject: [PATCH 122/197] omnissa-horizon-client: fix blank desktop tile labels

Prior to this change, the omnissa-horizon-client renders server labels as empty
boxes, while the rest of the UI renders fine (using GTK theme font).

With this change the server labels render correctly.

Horizon renders its server labels with "DejaVu Sans" but fails to load the font
when fontconfig resolves it to a symlinked file, which is what it finds if
dejavu-fonts-minimal is installed on the host.

This fix points the client at a fontconfig which maps DejaVu Sans to a font
bundled in the FHS sandbox (Liberation Sans).

Assisted-by: Claude Code (Claude Opus 4.8)
---
 .../om/omnissa-horizon-client/package.nix     | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/pkgs/by-name/om/omnissa-horizon-client/package.nix b/pkgs/by-name/om/omnissa-horizon-client/package.nix
index bcc6acb420eb..a29d00151f07 100644
--- a/pkgs/by-name/om/omnissa-horizon-client/package.nix
+++ b/pkgs/by-name/om/omnissa-horizon-client/package.nix
@@ -8,6 +8,8 @@
   makeDesktopItem,
   makeWrapper,
   opensc,
+  liberation_ttf,
+  writeText,
   writeTextDir,
   configText ? "",
 }:
@@ -26,11 +28,42 @@ let
 
   mainProgram = "horizon-client";
 
+  # Horizon renders its broker/desktop launch-item (tile) labels with
+  # "DejaVu Sans", but fails to instantiate the font when fontconfig resolves it
+  # to a symlinked file -- which is exactly what nixpkgs' dejavu_fonts provides
+  # (it is a symlink tree into dejavu-fonts-minimal). The labels then render as
+  # blank boxes; the rest of the UI uses the GTK theme font and is unaffected.
+  # Other toolkits load the same symlinked font without issue, so this is
+  # specific to the client's font handling.
+  #
+  # The FHS sandbox bind-mounts the host's /etc/fonts, so the FHS environment's
+  # own fontconfig does not apply. Point the client at a config that keeps the
+  # host's fonts but maps "DejaVu Sans" onto a bundled, regular-file font
+  # (Liberation Sans). This is deterministic and independent of the host's
+  # font configuration.
+  fontconfigFile = writeText "omnissa-horizon-fontconfig.conf" ''
+    <?xml version="1.0"?>
+    <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
+    <fontconfig>
+      <include ignore_missing="yes">/etc/fonts/fonts.conf</include>
+      <dir>${liberation_ttf}/share/fonts</dir>
+      <match target="pattern">
+        <test name="family" qual="any">
+          <string>DejaVu Sans</string>
+        </test>
+        <edit name="family" mode="assign" binding="same">
+          <string>Liberation Sans</string>
+        </edit>
+      </match>
+    </fontconfig>
+  '';
+
   # This forces the default GTK theme (Adwaita) because Horizon is prone to
   # UI usability issues when using non-default themes, such as Adwaita-dark.
   wrapBinCommands = path: name: ''
     makeWrapper "$out/${path}/${name}" "$out/bin/${name}_wrapper" \
     --set GTK_THEME Adwaita \
+    --set FONTCONFIG_FILE "${fontconfigFile}" \
     --suffix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \
     --suffix LD_LIBRARY_PATH : "$out/lib/omnissa/horizon/crtbora:$out/lib/omnissa"
   '';

From 32164944c8ba41209b6ff39c63071802be594e0e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Jun 2026 23:00:00 +0000
Subject: [PATCH 123/197] python3Packages.mistral-common: 1.11.3 -> 1.11.5

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

diff --git a/pkgs/development/python-modules/mistral-common/default.nix b/pkgs/development/python-modules/mistral-common/default.nix
index 8a9b481a9268..9a2aa5beae2b 100644
--- a/pkgs/development/python-modules/mistral-common/default.nix
+++ b/pkgs/development/python-modules/mistral-common/default.nix
@@ -38,14 +38,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "mistral-common";
-  version = "1.11.3";
+  version = "1.11.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mistralai";
     repo = "mistral-common";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9NeJqv7m7vT/lI6mV9QbAsrLUcxO4Wr+QgKfz6RWtsM=";
+    hash = "sha256-vm7u+EWuqjguccezlN+fKdTl8CL081ah3OccpenbpT0=";
   };
 
   build-system = [

From af8bfc21faaee8a49baaa95daf8fcf65b25adac5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Jun 2026 23:08:15 +0000
Subject: [PATCH 124/197] mark: 16.4.0 -> 16.5.0

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

diff --git a/pkgs/by-name/ma/mark/package.nix b/pkgs/by-name/ma/mark/package.nix
index 5882cdc3e01e..9c0c9feb446d 100644
--- a/pkgs/by-name/ma/mark/package.nix
+++ b/pkgs/by-name/ma/mark/package.nix
@@ -8,16 +8,16 @@
 # https://github.com/kovetskiy/mark/pull/581#issuecomment-2797872996
 buildGoModule (finalAttrs: {
   pname = "mark";
-  version = "16.4.0";
+  version = "16.5.0";
 
   src = fetchFromGitHub {
     owner = "kovetskiy";
     repo = "mark";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-eru4EwF5LASyR2Xc1+t2fpvRd3PsZFomi83xxMDHzeE=";
+    sha256 = "sha256-lgqS9SDI8UIkcucVdKyrPxIn7DIpQyRUknuy1nmoKM0=";
   };
 
-  vendorHash = "sha256-eXUw4FnXoDxoWphwA+7inC4Fd8iuI8q5HtobnewHP44=";
+  vendorHash = "sha256-Tw6tk7ZF4H+5/AJCFfMFy2zB4OCQB9S3mFA4Ky49pz4=";
 
   ldflags = [
     "-s"

From 70f9698033525f1d2a210bae7c9c89bd802f8c40 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Jun 2026 23:21:58 +0000
Subject: [PATCH 125/197] lazysql: 0.5.4 -> 0.5.5

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

diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix
index 7ccbcaf947dd..9f44b33dbb8d 100644
--- a/pkgs/by-name/la/lazysql/package.nix
+++ b/pkgs/by-name/la/lazysql/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "lazysql";
-  version = "0.5.4";
+  version = "0.5.5";
 
   src = fetchFromGitHub {
     owner = "jorgerojas26";
     repo = "lazysql";
     rev = "v${version}";
-    hash = "sha256-srQyUQM7lvJD5SLLX9tr3x8U2/sv/fIrspUgSPbnsac=";
+    hash = "sha256-Grr1R88XguW/jT5Vj/m11Cr+Im2+mnVZw23QrO1ZzMk=";
   };
 
   vendorHash = "sha256-FbAt/HsjoxqAKWQqqWN2xuyyTG2Ic4DcyEU4O0rjpQE=";

From 6ebfec9d50fa4bbfc6b66f930db8294a05c4d110 Mon Sep 17 00:00:00 2001
From: thomasjm <tom@codedown.io>
Date: Mon, 29 Jun 2026 16:37:04 -0700
Subject: [PATCH 126/197] cling: 1.2 -> 1.3

---
 .../cling/always-build-user-interface.patch   | 18 +++++++
 pkgs/by-name/cl/cling/fix-new-parser.patch    | 54 -------------------
 pkgs/by-name/cl/cling/package.nix             | 41 +++++++-------
 3 files changed, 37 insertions(+), 76 deletions(-)
 create mode 100644 pkgs/by-name/cl/cling/always-build-user-interface.patch
 delete mode 100644 pkgs/by-name/cl/cling/fix-new-parser.patch

diff --git a/pkgs/by-name/cl/cling/always-build-user-interface.patch b/pkgs/by-name/cl/cling/always-build-user-interface.patch
new file mode 100644
index 000000000000..c15e31471415
--- /dev/null
+++ b/pkgs/by-name/cl/cling/always-build-user-interface.patch
@@ -0,0 +1,18 @@
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index eb29252..a62c0de 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -8,7 +8,10 @@
+ 
+ add_subdirectory(Interpreter)
+ add_subdirectory(MetaProcessor)
+-if(CLING_INCLUDE_TESTS)
+-   add_subdirectory(UserInterface)
+-endif()
++# The UserInterface library (clingUserInterface) is linked unconditionally by the
++# cling driver, so it must always be built. Upstream cling 1.3 mistakenly gates it
++# behind CLING_INCLUDE_TESTS: the previous EXISTS check on the bundled textinput
++# sources was dropped when those were removed in favor of LLVM's LineEditor, but the
++# subdirectory must still be added. See lib/UserInterface and tools/driver.
++add_subdirectory(UserInterface)
+ add_subdirectory(Utils)
diff --git a/pkgs/by-name/cl/cling/fix-new-parser.patch b/pkgs/by-name/cl/cling/fix-new-parser.patch
deleted file mode 100644
index 9869686e6dda..000000000000
--- a/pkgs/by-name/cl/cling/fix-new-parser.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From cd4d1d8c4963620a6a84834948845df81fbbd70b Mon Sep 17 00:00:00 2001
-From: Jonas Hahnfeld <jonas.hahnfeld@cern.ch>
-Date: Tue, 17 Dec 2024 14:54:18 +0100
-Subject: [PATCH] Use single Parser for LookupHelper
-
-It is the only construction of a temporary parser, and it seems not
-necessary (anymore).
----
- include/cling/Interpreter/LookupHelper.h |  2 +-
- lib/Interpreter/Interpreter.cpp          | 11 ++++-------
- 2 files changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/include/cling/Interpreter/LookupHelper.h b/include/cling/Interpreter/LookupHelper.h
-index 6e6e281470..cd79b2a65c 100644
---- a/include/cling/Interpreter/LookupHelper.h
-+++ b/include/cling/Interpreter/LookupHelper.h
-@@ -56,7 +56,7 @@ namespace cling {
-       WithDiagnostics
-     };
-   private:
--    std::unique_ptr<clang::Parser> m_Parser;
-+    clang::Parser* m_Parser;
-     Interpreter* m_Interpreter; // we do not own.
-     std::array<const clang::Type*, kNumCachedStrings> m_StringTy = {{}};
-     /// A map containing the hash of the lookup buffer. This allows us to avoid
-diff --git a/lib/Interpreter/Interpreter.cpp b/lib/Interpreter/Interpreter.cpp
-index 13c8409cc5..f04695439b 100644
---- a/lib/Interpreter/Interpreter.cpp
-+++ b/lib/Interpreter/Interpreter.cpp
-@@ -265,13 +265,6 @@ namespace cling {
-     }
- 
-     Sema& SemaRef = getSema();
--    Preprocessor& PP = SemaRef.getPreprocessor();
--
--    m_LookupHelper.reset(new LookupHelper(new Parser(PP, SemaRef,
--                                                     /*SkipFunctionBodies*/false,
--                                                     /*isTemp*/true), this));
--    if (!m_LookupHelper)
--      return;
- 
-     if (!isInSyntaxOnlyMode() && !m_Opts.CompilerOpts.CUDADevice) {
-       m_Executor.reset(new IncrementalExecutor(SemaRef.Diags, *getCI(),
-@@ -317,6 +310,10 @@ namespace cling {
-       return;
-     }
- 
-+    m_LookupHelper.reset(new LookupHelper(m_IncrParser->getParser(), this));
-+    if (!m_LookupHelper)
-+      return;
-+
-     // When not using C++ modules, we now have a PCH and we can safely setup
-     // our callbacks without fearing that they get overwritten by clang code.
-     // The modules setup is handled above.
diff --git a/pkgs/by-name/cl/cling/package.nix b/pkgs/by-name/cl/cling/package.nix
index c22c4c87a2c2..8615f6be6a0d 100644
--- a/pkgs/by-name/cl/cling/package.nix
+++ b/pkgs/by-name/cl/cling/package.nix
@@ -5,19 +5,18 @@
   git,
   lib,
   libffi,
-  llvmPackages_18,
+  llvmPackages_20,
   makeWrapper,
   ncurses,
   python3,
   zlib,
 
-  # *NOT* from LLVM 18!
-  # The compiler used to compile Cling may affect the runtime include and lib
-  # directories it expects to be run with. Cling builds against (a fork of) Clang,
-  # so we prefer to use Clang as the compiler as well for consistency.
-  # It would be cleanest to use LLVM 9's clang, but it errors. So, we use a later
-  # version of Clang to compile, but we check out the Cling fork of Clang 9 to
-  # build Cling against.
+  # The compiler used to *compile* Cling, independent of the LLVM/Clang that
+  # Cling is built against (the root-project/llvm-project fork checked out below)
+  # and of llvmPackages_20 (used only for the runtime wrapper flags). The compiler
+  # can affect the runtime include and lib directories Cling expects, and since
+  # Cling builds against a fork of Clang we use Clang as the compiler too for
+  # consistency.
   clangStdenv,
 
   # For runtime C++ standard library
@@ -34,13 +33,13 @@
 let
   stdenv = clangStdenv;
 
-  version = "1.2";
+  version = "1.3";
 
   clingSrc = fetchFromGitHub {
     owner = "root-project";
     repo = "cling";
     rev = "v${version}";
-    sha256 = "sha256-ay9FXANJmB/+AdnCR4WOKHuPm6P88wLqoOgiKJwJ8JM=";
+    sha256 = "sha256-/qCHd9KfPW4dMjktaSdnJG+VDD1lLSI4ZFllTcxWsmc=";
   };
 
   unwrapped = stdenv.mkDerivation {
@@ -50,18 +49,18 @@ let
     src = fetchFromGitHub {
       owner = "root-project";
       repo = "llvm-project";
-      rev = "cling-llvm18-20250721-01";
-      sha256 = "sha256-JGteapyujU5w81DsfPQfTq76cYHgk5PbAFbdYfYIDo4=";
+      rev = "cling-llvm20-20260119-01";
+      sha256 = "sha256-fv7nrpZ5Dhbf+nW0ED0pkc8NDBXeaBs9MV2TW6o7FGU=";
     };
 
     preConfigure = ''
       cp -r ${clingSrc} cling-source
 
-      # Patch a bug in version 1.2 by backporting a fix. See
-      # https://github.com/root-project/cling/issues/556
+      # cling 1.3 only builds the clingUserInterface library (which the cling
+      # driver always links) when CLING_INCLUDE_TESTS is on. Always build it.
       chmod -R u+w cling-source
       pushd cling-source
-      patch -p1 < ${./fix-new-parser.patch}
+      patch -p1 < ${./always-build-user-interface.patch}
       popd
 
       cd llvm
@@ -106,8 +105,6 @@ let
       cp -r ../../cling-source/tools/Jupyter/kernel $out/share/Jupyter
     '';
 
-    buildTargets = [ "cling" ];
-
     dontStrip = debug;
 
     meta = {
@@ -139,18 +136,18 @@ let
     "-nostdinc++"
 
     "-resource-dir"
-    "${llvmPackages_18.llvm.lib}/lib"
+    "${llvmPackages_20.llvm.lib}/lib"
 
     "-isystem"
-    "${lib.getLib unwrapped}/lib/clang/18/include"
+    "${lib.getLib unwrapped}/lib/clang/20/include"
   ]
   ++ lib.optionals useLLVMLibcxx [
     "-I"
-    "${lib.getDev llvmPackages_18.libcxx}/include/c++/v1"
+    "${lib.getDev llvmPackages_20.libcxx}/include/c++/v1"
     "-L"
-    "${llvmPackages_18.libcxx}/lib"
+    "${llvmPackages_20.libcxx}/lib"
     "-l"
-    "${llvmPackages_18.libcxx}/lib/libc++${stdenv.hostPlatform.extensions.sharedLibrary}"
+    "${llvmPackages_20.libcxx}/lib/libc++${stdenv.hostPlatform.extensions.sharedLibrary}"
   ]
   ++ lib.optionals (!useLLVMLibcxx) [
     "-I"

From 4c947a1b5c129f960296bb41aa039ceb5efa56c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Jun 2026 23:53:20 +0000
Subject: [PATCH 127/197] vscode-extensions.zaaack.markdown-editor: 0.1.15 ->
 0.1.16

---
 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 3d39aa388834..870dd18ad462 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5498,8 +5498,8 @@ let
         mktplcRef = {
           name = "markdown-editor";
           publisher = "zaaack";
-          version = "0.1.15";
-          hash = "sha256-wNGIps0Y/p5X/lutOh1gTPWXh0zpdTm5fFiccba6Pww=";
+          version = "0.1.16";
+          hash = "sha256-rBpC3YIG4M4QDPg/zViinDGXk3U6GvJfiwVUe5NW2vU=";
         };
         meta = {
           description = "Visual Studio Code extension for WYSIWYG markdown editing";

From 8443934b24ee167077c6d1214f723e583b85c866 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 00:40:57 +0000
Subject: [PATCH 128/197] python3Packages.meshtastic: 2.7.9 -> 2.7.10

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

diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index 512bd74686af..d7465454b312 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -33,14 +33,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "meshtastic";
-  version = "2.7.9";
+  version = "2.7.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "meshtastic";
     repo = "python";
     tag = finalAttrs.version;
-    hash = "sha256-u3lU48VyFsfwHVXz/mSmJUW7c+mQ5BR2SclwCKym27k=";
+    hash = "sha256-bzDGiwaq58zmp93HXK9dpMVQiVZJA8MRO63bm3SPDzU=";
   };
 
   pythonRelaxDeps = [

From 0935161be65e6d15d1afe7007952671891f8c101 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 01:10:23 +0000
Subject: [PATCH 129/197] python3Packages.wsgidav: 4.3.4 -> 4.3.5

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

diff --git a/pkgs/development/python-modules/wsgidav/default.nix b/pkgs/development/python-modules/wsgidav/default.nix
index 0880c9ed4013..84ae39fcd8e6 100644
--- a/pkgs/development/python-modules/wsgidav/default.nix
+++ b/pkgs/development/python-modules/wsgidav/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "wsgidav";
-  version = "4.3.4";
+  version = "4.3.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mar10";
     repo = "wsgidav";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2Pn5kMioMr4COpcIDEhlfolG0/5hpv8zMO0X7l6fSwY=";
+    hash = "sha256-LsHVCGXgeXjHJt6VfB+uKsYjqCybBRcweTGvoR8tJ1E=";
   };
 
   pythonRelaxDeps = [ "bcrypt" ];

From 86c075b744aba9dec6e8ae230a41be94992b6952 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Tue, 30 Jun 2026 09:12:12 +0800
Subject: [PATCH 130/197] crush: 0.80.0 -> 0.81.0

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

diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix
index 5ae09f724c6b..0114ecec0732 100644
--- a/pkgs/by-name/cr/crush/package.nix
+++ b/pkgs/by-name/cr/crush/package.nix
@@ -11,16 +11,16 @@
 
 buildGo126Module (finalAttrs: {
   pname = "crush";
-  version = "0.80.0";
+  version = "0.81.0";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "crush";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-joSzU5+gufb9cEsIOVVSnEO9+Xoy1g+gqzvmpbkIky8=";
+    hash = "sha256-FOvkCQxDW1dipzIzgQz2uvHIv6bm/TVV1WwhrvmBDWg=";
   };
 
-  vendorHash = "sha256-cA39djwy7NOBeJELvrPSW2mRcyDEhsghPOzzQ9O180c=";
+  vendorHash = "sha256-4gHvyEqiFhEvZ90lJbXeI/1fMMo6L19P/PD5Eu5YUmI=";
 
   ldflags = [
     "-s"

From 2ae034a13d3cef86adf33c2725ae368d71e98366 Mon Sep 17 00:00:00 2001
From: Angel J <78835633+Iamanaws@users.noreply.github.com>
Date: Mon, 29 Jun 2026 17:43:50 -0700
Subject: [PATCH 131/197] t3code: 0.0.27 -> 0.0.28

---
 pkgs/by-name/t3/t3code/package.nix | 32 ++++++++++++++----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/t3/t3code/package.nix b/pkgs/by-name/t3/t3code/package.nix
index ce49b88959fd..835c397f59ca 100644
--- a/pkgs/by-name/t3/t3code/package.nix
+++ b/pkgs/by-name/t3/t3code/package.nix
@@ -1,7 +1,7 @@
 {
   cctools,
   copyDesktopItems,
-  electron_40,
+  electron_41,
   fetchFromGitHub,
   installShellFiles,
   lib,
@@ -49,7 +49,7 @@ stdenv.mkDerivation (
   finalAttrs:
   let
     appName = "T3 Code (Alpha)";
-    electron = electron_40;
+    electron = electron_41;
     pnpm = pnpm_10;
     desktopIcon =
       if stdenv.hostPlatform.isDarwin then
@@ -80,7 +80,7 @@ stdenv.mkDerivation (
   in
   {
     pname = "t3code";
-    version = "0.0.27";
+    version = "0.0.28";
     strictDeps = true;
     __structuredAttrs = true;
 
@@ -88,7 +88,7 @@ stdenv.mkDerivation (
       owner = "pingdotgg";
       repo = "t3code";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-KwiF6A7pTlkzr43FJ9XM+oEXBOEtw3vrazVOjBaD5lU=";
+      hash = "sha256-InVrw9L281QSSPrHSiZuivmb+FkYEd6FkHwHIAAxmGk=";
     };
 
     postPatch = ''
@@ -136,19 +136,9 @@ stdenv.mkDerivation (
         ;
 
       fetcherVersion = 4;
-      hash = "sha256-vpL0kjDAtxnBpm+izcJ06KXuzX888yxmzrcEc9yKtm0=";
+      hash = "sha256-+JqW/iI0wdRPxyL7y6ggD/+AvwwZXs9+fSUtG/SgW9s=";
     };
 
-    # This workaround turns the `pnpmWorkspaces` array into a space-separated
-    # string. This format is supported by both `pnpmConfigHook` and `pnpmBuildHook`.
-    # TODO: remove this when`pnpmConfigHook` supports `___structuredAttrs = true;`
-    # https://github.com/NixOS/nixpkgs/issues/528547
-    preConfigure = ''
-      __pnpmWorkspaces="''${pnpmWorkspaces[@]}"
-      unset pnpmWorkspaces
-      declare -g pnpmWorkspaces="$__pnpmWorkspaces"
-    '';
-
     preBuild = ''
       node scripts/update-release-package-versions.ts ${finalAttrs.version}
 
@@ -181,7 +171,9 @@ stdenv.mkDerivation (
       mkdir --parents "$out"/libexec/t3code/apps/desktop "$out"/libexec/t3code/apps/server
       cp --recursive --no-preserve=mode node_modules "$out"/libexec/t3code
       cp --recursive --no-preserve=mode apps/server/{node_modules,dist} "$out"/libexec/t3code/apps/server
-      cp --recursive --no-preserve=mode apps/desktop/{node_modules,dist-electron} "$out"/libexec/t3code/apps/desktop
+      cp --recursive --no-preserve=mode \
+        apps/desktop/{package.json,node_modules,dist-electron} \
+        "$out"/libexec/t3code/apps/desktop
 
       mkdir --parents "$out"/libexec/t3code/apps/desktop/prod-resources
       install --mode=444 ${desktopIcon} \
@@ -193,10 +185,16 @@ stdenv.mkDerivation (
         --add-flags "$out"/libexec/t3code/apps/server/dist/bin.mjs ${runtimePathWrapperArgs}
 
       makeWrapper ${lib.getExe electron} "$out"/bin/t3code-desktop \
-        --add-flags "$out"/libexec/t3code/apps/desktop/dist-electron/main.cjs \
+        --add-flags "$out"/libexec/t3code/apps/desktop \
         --inherit-argv0 ${runtimePathWrapperArgs}
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      # node-pty tries to chmod this helper at runtime, but the Nix store is
+      # immutable by then.
+      find "$out"/libexec/t3code \
+        -path '*/node-pty/prebuilds/darwin-*/spawn-helper' \
+        -exec chmod 755 {} +
+
       mkdir --parents "$out/Applications/${appName}.app/Contents/"{MacOS,Resources}
       png2icns \
         "$out/Applications/${appName}.app/Contents/Resources/t3code.icns" \

From fd6f1d44b51f672d375aa2adc7e501468e740d59 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 02:11:48 +0000
Subject: [PATCH 132/197] ast-grep: 0.43.0 -> 0.44.0

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

diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix
index 9b7f2886b605..0f078898f2b0 100644
--- a/pkgs/by-name/as/ast-grep/package.nix
+++ b/pkgs/by-name/as/ast-grep/package.nix
@@ -11,13 +11,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ast-grep";
-  version = "0.43.0";
+  version = "0.44.0";
 
   src = fetchFromGitHub {
     owner = "ast-grep";
     repo = "ast-grep";
     tag = finalAttrs.version;
-    hash = "sha256-qQkG04aGaw3U/FFP1omlsoAKfNsVKafgJlVzAxvHkcA=";
+    hash = "sha256-KTVyG2z2Vx4mLmkiwou4X04Z6qzpQxmwRCtcmG4euVA=";
   };
 
   # error: linker `aarch64-linux-gnu-gcc` not found
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rm .cargo/config.toml
   '';
 
-  cargoHash = "sha256-YL76pCvCco9u8nAGIuiEciQrgUgaPx1s8hHyu2x3KmI=";
+  cargoHash = "sha256-slFovLzLaK6DlTF/LKI74PUWXi9xkpy9hC9WWGmypcM=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From e295d0ab7eca6cfe2400d7c015d8fc823d0f6b29 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 02:44:14 +0000
Subject: [PATCH 133/197] files-cli: 2.15.354 -> 2.15.371

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

diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix
index bab5a30aa4d8..34d845627381 100644
--- a/pkgs/by-name/fi/files-cli/package.nix
+++ b/pkgs/by-name/fi/files-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "files-cli";
-  version = "2.15.354";
+  version = "2.15.371";
 
   src = fetchFromGitHub {
     repo = "files-cli";
     owner = "files-com";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-L1oF3KBB6q7YQvqfDq9jqY+onZrnIXECdD7RrdcYQtw=";
+    hash = "sha256-buIG/U51GembJuFJF5ngzSlYzMiej0e44eg7KCQrx/0=";
   };
 
-  vendorHash = "sha256-RpihAKjYC6+TMrCZ4+ex6YBrXJwDrYeWp/a99NKCFQo=";
+  vendorHash = "sha256-qNm/3FWhzH5BfKO1oqlB0g7Ecv6tteMROWyZCis1Ngk=";
 
   ldflags = [
     "-s"

From f66aec789d913c8b890572009ccf9972cada2ca3 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 30 Jun 2026 04:13:05 +0100
Subject: [PATCH 134/197] openttd-nml: adopt orphaned package

---
 pkgs/by-name/op/openttd-nml/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/op/openttd-nml/package.nix b/pkgs/by-name/op/openttd-nml/package.nix
index abf907009c80..7e30266d77a1 100644
--- a/pkgs/by-name/op/openttd-nml/package.nix
+++ b/pkgs/by-name/op/openttd-nml/package.nix
@@ -34,6 +34,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     description = "Compiler for OpenTTD NML files";
     mainProgram = "nmlc";
     license = lib.licenses.gpl2Plus;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.magicquark ];
   };
 })

From efa1d062ab9f1cf09da31be777dc5af7cba82201 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 30 Jun 2026 04:15:34 +0100
Subject: [PATCH 135/197] openttd-nml: update homepage and add changelog

---
 pkgs/by-name/op/openttd-nml/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/op/openttd-nml/package.nix b/pkgs/by-name/op/openttd-nml/package.nix
index 7e30266d77a1..f19a1eda6a8c 100644
--- a/pkgs/by-name/op/openttd-nml/package.nix
+++ b/pkgs/by-name/op/openttd-nml/package.nix
@@ -30,7 +30,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   doInstallCheck = true;
 
   meta = {
-    homepage = "http://openttdcoop.org/";
+    changelog = "https://github.com/OpenTTD/nml/releases/tag/${finalAttrs.version}";
+    homepage = "https://github.com/OpenTTD/nml";
     description = "Compiler for OpenTTD NML files";
     mainProgram = "nmlc";
     license = lib.licenses.gpl2Plus;

From ee5cd34aeb3916a4129d00d369963f6240000b78 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 30 Jun 2026 04:19:53 +0100
Subject: [PATCH 136/197] openttd-nml: 0.8.1 -> 0.9.0

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

diff --git a/pkgs/by-name/op/openttd-nml/package.nix b/pkgs/by-name/op/openttd-nml/package.nix
index f19a1eda6a8c..fb0dfa20d057 100644
--- a/pkgs/by-name/op/openttd-nml/package.nix
+++ b/pkgs/by-name/op/openttd-nml/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "openttd-nml";
-  version = "0.8.1";
+  version = "0.9.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "OpenTTD";
     repo = "nml";
     tag = finalAttrs.version;
-    hash = "sha256-swAkUhduIhcfbAvKsPaJNBXcv8T6GDaxk3KKLLa9GQ8=";
+    hash = "sha256-FVGjXh04uHZM9vZNzjdYEk4ClMR9t0kl44JePrUGx84=";
   };
 
   postPatch = ''

From 54c1ba4236827dae9acb40c953637bcec8630e6d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 03:30:29 +0000
Subject: [PATCH 137/197] wamrc: 2.4.4 -> 2.4.5

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

diff --git a/pkgs/by-name/wa/wamrc/package.nix b/pkgs/by-name/wa/wamrc/package.nix
index e945de824167..8207b35ea391 100644
--- a/pkgs/by-name/wa/wamrc/package.nix
+++ b/pkgs/by-name/wa/wamrc/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wamrc";
-  version = "2.4.4";
+  version = "2.4.5";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wasm-micro-runtime";
     tag = "WAMR-${finalAttrs.version}";
-    hash = "sha256-pNudBKnhdR/Ye0m2tVZB/wSfJZYK8+gdCpCp0rDp0o4=";
+    hash = "sha256-HBew8kbi7AaKrAEZbPIlXqiO+1wDljSzEsE9+FWzxHE=";
   };
 
   nativeBuildInputs = [

From 5c2cfebdb678d83e6516e74311a68cd669712aaa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 03:56:51 +0000
Subject: [PATCH 138/197] cnspec: 13.24.2 -> 13.25.0

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

diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix
index 799cfefa247d..fed41ef87222 100644
--- a/pkgs/by-name/cn/cnspec/package.nix
+++ b/pkgs/by-name/cn/cnspec/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "cnspec";
-  version = "13.24.2";
+  version = "13.25.0";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnspec";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+po6fgqtNRKozQ/nampYOpLdzU+0Cz5b93kDzofLnHw=";
+    hash = "sha256-6DyF9gOXZfN5wUpUtTO/Pj8wOcHbTRbZbTCYF3t9clE=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-AIhjFjXBEtukTaOnIATEzT3HrXTio3ayc/YovoRU7j8=";
+  vendorHash = "sha256-q9ur5wbiJGZ8K0dI3xjpB4RsnEkoQetZu6Kj7IB7kEc=";
 
   subPackages = [ "apps/cnspec" ];
 

From 05ad9431d50080eff50fa02af9d012424881a28c Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 30 Jun 2026 14:02:16 +1000
Subject: [PATCH 139/197] openwith: remove x86_64-darwin platform

nixpkgs removed support for x86_64-darwin in https://github.com/NixOS/nixpkgs/commit/90796a20f3161359ee63f4bd17b9d0b2f95285b7
---
 pkgs/by-name/op/openwith/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/op/openwith/package.nix b/pkgs/by-name/op/openwith/package.nix
index 527fcd2f438f..7ff5bc4c8d82 100644
--- a/pkgs/by-name/op/openwith/package.nix
+++ b/pkgs/by-name/op/openwith/package.nix
@@ -36,7 +36,6 @@ stdenv.mkDerivation {
     maintainers = with lib.maintainers; [ zowoq ];
     platforms = [
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
   };
 }

From fede1fc3ca3e9f2d5dee6d0118c780eaa98948ad Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 30 Jun 2026 05:10:26 +0100
Subject: [PATCH 140/197] openttd-nml: modernise

---
 pkgs/by-name/op/openttd-nml/package.nix | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/op/openttd-nml/package.nix b/pkgs/by-name/op/openttd-nml/package.nix
index fb0dfa20d057..b8a62b4f8c02 100644
--- a/pkgs/by-name/op/openttd-nml/package.nix
+++ b/pkgs/by-name/op/openttd-nml/package.nix
@@ -1,14 +1,16 @@
 {
   lib,
   fetchFromGitHub,
-  python3,
+  python3Packages,
   versionCheckHook,
 }:
 
-python3.pkgs.buildPythonApplication (finalAttrs: {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "openttd-nml";
   version = "0.9.0";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "OpenTTD";
@@ -17,18 +19,24 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     hash = "sha256-FVGjXh04uHZM9vZNzjdYEk4ClMR9t0kl44JePrUGx84=";
   };
 
+  build-system = [
+    python3Packages.setuptools
+  ];
+
   postPatch = ''
     echo 'version = "${finalAttrs.version}"' > nml/__version__.py
+
+    # Ply's source code is vendored.
+    substituteInPlace pyproject.toml \
+      --replace-fail '"setuptools", "ply"' '"setuptools"'
   '';
 
-  propagatedBuildInputs = with python3.pkgs; [
-    pillow
+  dependencies = [
+    python3Packages.pillow
   ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
-  doInstallCheck = true;
-
   meta = {
     changelog = "https://github.com/OpenTTD/nml/releases/tag/${finalAttrs.version}";
     homepage = "https://github.com/OpenTTD/nml";

From d235083af00e9831ec8b41d98d937568c5b4e27f Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 30 Jun 2026 06:28:17 +0100
Subject: [PATCH 141/197] openttd-nml: enable upstream test suite

---
 pkgs/by-name/op/openttd-nml/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/op/openttd-nml/package.nix b/pkgs/by-name/op/openttd-nml/package.nix
index b8a62b4f8c02..6d8d61d8f7cc 100644
--- a/pkgs/by-name/op/openttd-nml/package.nix
+++ b/pkgs/by-name/op/openttd-nml/package.nix
@@ -37,6 +37,17 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    export PYTHON=${python3Packages.python}/bin/python
+    export NMLC=$out/bin/nmlc
+
+    make regression
+
+    runHook postInstallCheck
+  '';
+
   meta = {
     changelog = "https://github.com/OpenTTD/nml/releases/tag/${finalAttrs.version}";
     homepage = "https://github.com/OpenTTD/nml";

From f6baf3bc9a5c881def3d472b3449d3a656202356 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 30 Jun 2026 06:33:15 +0100
Subject: [PATCH 142/197] openttd-nml: set strictDeps=true

---
 pkgs/by-name/op/openttd-nml/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/op/openttd-nml/package.nix b/pkgs/by-name/op/openttd-nml/package.nix
index 6d8d61d8f7cc..e1113bbec3ef 100644
--- a/pkgs/by-name/op/openttd-nml/package.nix
+++ b/pkgs/by-name/op/openttd-nml/package.nix
@@ -11,6 +11,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   pyproject = true;
 
   __structuredAttrs = true;
+  strictDeps = true;
 
   src = fetchFromGitHub {
     owner = "OpenTTD";

From c75fa2e381bf095cd17f40e8e04fd42d7a4569b9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 05:42:31 +0000
Subject: [PATCH 143/197] python3Packages.google-cloud-os-config: 1.24.0 ->
 1.25.0

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

diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix
index 1981e59db386..fa5d7857a313 100644
--- a/pkgs/development/python-modules/google-cloud-os-config/default.nix
+++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-os-config";
-  version = "1.24.0";
+  version = "1.25.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "google_cloud_os_config";
     inherit version;
-    hash = "sha256-3fZOrEfA2pSD1XO33pq+1IpabL4nkxrpQ5aJn1mOAZI=";
+    hash = "sha256-LgJxfWoNq+j26/e5s36yi19w4zWL18rwzdvPhDswPaE=";
   };
 
   build-system = [ setuptools ];

From 174349877714ed964d939ba956eccbde0828f16f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 06:00:37 +0000
Subject: [PATCH 144/197] python3Packages.python-otcextensions: 0.34.1 ->
 0.34.2

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

diff --git a/pkgs/development/python-modules/python-otcextensions/default.nix b/pkgs/development/python-modules/python-otcextensions/default.nix
index 851dfa1d5722..2eeecc6aa68a 100644
--- a/pkgs/development/python-modules/python-otcextensions/default.nix
+++ b/pkgs/development/python-modules/python-otcextensions/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "python-otcextensions";
-  version = "0.34.1";
+  version = "0.34.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "opentelekomcloud";
     repo = "python-otcextensions";
     tag = version;
-    hash = "sha256-zD7kvm1/GrhwokXK1I35g2HMD6kUU87MnmQ37GtSO2Q=";
+    hash = "sha256-XfHkKv8KCyUFEw93S7S2LsEDekkMh0kllY/GFB/ta8Y=";
   };
 
   env.PBR_VERSION = version;

From 7f10e1761e13c062b4e9658ef54536c4e659cb05 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 06:10:11 +0000
Subject: [PATCH 145/197] grafanaPlugins.marcusolsson-dynamictext-panel: 6.2.3
 -> 6.3.0

---
 .../plugins/marcusolsson-dynamictext-panel/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix
index cc50b6028da4..0af32211f723 100644
--- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "marcusolsson-dynamictext-panel";
-  version = "6.2.3";
-  zipHash = "sha256-Z2R/kl6y4OaN8JRqPaKOuVLRZvPy2M43wVE+al4YquI=";
+  version = "6.3.0";
+  zipHash = "sha256-nobTHc/GucfwyDGMsxPpDim9txzfygi1UFjd6XR+nLc=";
   meta = {
     description = "Dynamic, data-driven text panel for Grafana";
     license = lib.licenses.asl20;

From 076581a3c6bfba3338c8df0c0a2ee9bada7ac675 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Tue, 30 Jun 2026 08:36:18 +0200
Subject: [PATCH 146/197] =?UTF-8?q?veloren:=20fix=20build=20with=20rust=20?=
 =?UTF-8?q?=E2=89=A5=201.95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/ve/veloren/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/ve/veloren/package.nix b/pkgs/by-name/ve/veloren/package.nix
index 43b515447dd7..209cd7ff9ab2 100644
--- a/pkgs/by-name/ve/veloren/package.nix
+++ b/pkgs/by-name/ve/veloren/package.nix
@@ -50,6 +50,13 @@ rustPlatform.buildRustPackage {
   cargoHash = "sha256-1qLE1UeP2i0xaOGLniZzdjIkBbme6rctGfcO9Kfoh5E=";
 
   postPatch = ''
+    # Fix hashbrown on rust ≥1.95
+    # (https://github.com/rust-lang/hashbrown/pull/662)
+    substituteInPlace "$cargoDepsCopy"/*/hashbrown-0.16.0/src/lib.rs \
+      --replace-fail 'strict_provenance_lints' 'strict_provenance_lints,trivial_clone'
+    substituteInPlace "$cargoDepsCopy"/*/hashbrown-0.16.0/src/raw/mod.rs \
+      --replace-fail 'T: Copy,' 'T: core::clone::TrivialClone,'
+
     # Force vek to build in unstable mode
     tee "$cargoDepsCopy"/*/vek-*/build.rs > /dev/null <<'EOF'
     fn main() {

From cf7c4768639e244414d07f493c87da379f6dacce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 06:53:46 +0000
Subject: [PATCH 147/197] librashader: 0.11.1 -> 0.11.2

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

diff --git a/pkgs/by-name/li/librashader/package.nix b/pkgs/by-name/li/librashader/package.nix
index 0b16b54579c4..f5503ab2d078 100644
--- a/pkgs/by-name/li/librashader/package.nix
+++ b/pkgs/by-name/li/librashader/package.nix
@@ -8,20 +8,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "librashader";
-  version = "0.11.1";
+  version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "SnowflakePowered";
     repo = "librashader";
     tag = "librashader-v${finalAttrs.version}";
-    hash = "sha256-oo4XbDjnrDR5vYYiOa/wjvKGm4a1KPzGsCQeNy9V07E=";
+    hash = "sha256-MdValg4bCyvrZJ4527N1eMeTE7Qo8EsxI/mMjZcVj7c=";
   };
 
   patches = [
     ./patches/fix-optional-dep-syntax.patch
   ];
 
-  cargoHash = "sha256-9u/5Mv/Hng5iZzdCvl7oMWnxzKvDpvLeP34CdhHnQHU=";
+  cargoHash = "sha256-cc9C8IzCLkepJNvL1UNAfuHUUBeXkgrATQBOX9DPijM=";
 
   buildPhase = ''
     runHook preBuild

From 83bc302fde1e3c3bb7f31b5f1aa3c2af2dcbba9f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 07:15:55 +0000
Subject: [PATCH 148/197] vals: 0.44.1 -> 0.44.3

---
 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 ec2539100613..b023d755681d 100644
--- a/pkgs/by-name/va/vals/package.nix
+++ b/pkgs/by-name/va/vals/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "vals";
-  version = "0.44.1";
+  version = "0.44.3";
 
   src = fetchFromGitHub {
     rev = "v${finalAttrs.version}";
     owner = "helmfile";
     repo = "vals";
-    sha256 = "sha256-KSY2kEJf7K6y/jjPGUShvdRjP4Y1t1zCVWPJMBKDQTE=";
+    sha256 = "sha256-Ll15CcLxlq72pfZdkC1TH8ajmIWh93oJ+wxUnf+smkk=";
   };
 
-  vendorHash = "sha256-DX0ssLNkW5IizWewAWg4bkSwhvG3tETkq8h1leB+/8Q=";
+  vendorHash = "sha256-NiNPD0OISlxb3cJEmtYHejSYNIrPrIfWKAHoFhz576c=";
 
   proxyVendor = true;
 

From f6c0434770226b5dc58092068c483e9751e0d0c8 Mon Sep 17 00:00:00 2001
From: Alexander Sieg <alex@xanderio.de>
Date: Wed, 24 Jun 2026 16:47:31 +0200
Subject: [PATCH 149/197] mealie: 3.19.2 -> 3.20.1

Changelog: https://github.com/mealie-recipes/mealie/releases/tag/v3.20.1
---
 pkgs/by-name/me/mealie/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix
index ffcf70e2763f..73876dc5f337 100644
--- a/pkgs/by-name/me/mealie/package.nix
+++ b/pkgs/by-name/me/mealie/package.nix
@@ -19,12 +19,12 @@
 }:
 
 let
-  version = "3.19.2";
+  version = "3.20.1";
   src = fetchFromGitHub {
     owner = "mealie-recipes";
     repo = "mealie";
     tag = "v${version}";
-    hash = "sha256-OH48XiOoaIdVCl5tm22OaI5UKKlhj8b0uVsGlgsjx6I=";
+    hash = "sha256-SkPbu0DUNyjo1ARjZX+BXq+3ehZqnrku9kPjwsTJfuM=";
   };
 
   frontend = stdenv.mkDerivation {
@@ -36,7 +36,7 @@ let
 
     yarnOfflineCache = fetchYarnDeps {
       yarnLock = "${src}/frontend/yarn.lock";
-      hash = "sha256-q3dqJrzqEx0G3Q/EGhjVzBd6XTAn6cELfaqLJCD5kFs=";
+      hash = "sha256-nhV93uRfKUa/G7ikJkd6l9IudgMk7PZ7ujZNnwIZ71k=";
     };
 
     nativeBuildInputs = [

From 3545da6278fc1f465a8be96e7131165543c17a9b Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Mon, 22 Jun 2026 18:15:44 +0200
Subject: [PATCH 150/197] readest: increase pnpm fetch retries

to work around timeout issues and switch to `fetcherVersion` 4.
---
 pkgs/by-name/re/readest/package.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix
index 84fd224871ca..0e3e461d9f79 100644
--- a/pkgs/by-name/re/readest/package.nix
+++ b/pkgs/by-name/re/readest/package.nix
@@ -45,8 +45,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_11;
-    fetcherVersion = 3;
-    hash = "sha256-Kw3GLCPM/WeY9tQ7oAzj9PZIrX4DfudrAnYh92+5hbs=";
+    fetcherVersion = 4;
+    hash = "sha256-wtWYdIfqytwn8PNahbQ/WxJuhhH1lbgNshQy6V0vvcA=";
+    pnpmInstallFlags = [
+      # Increase number of fetch attempts to work around timeout issues on slow
+      # networks: "TimeoutError: The operation was aborted due to timeout".
+      #
+      # If this still happens on your network, consider changing some of the
+      # fetch setting and opening a pull request:
+      # https://pnpm.io/settings#request-settings
+      "--fetch-retries=5"
+    ];
   };
 
   cargoRoot = "../..";
@@ -118,8 +127,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     version = finalAttrs.version;
     src = "${finalAttrs.src}/apps/readest-app/src-tauri/plugins/tauri-plugin-turso";
     pnpm = pnpm_11;
-    fetcherVersion = 3;
-    hash = "sha256-RIoTkX0ivaM9EJt3fsLpZhHd2lE4ZtDnAi9syONXUus=";
+    fetcherVersion = 4;
+    hash = "sha256-quVUYsT3u4UBhuJ75QQ4SEuW8MhGQ0vGhtwtUj/eKHs=";
   };
 
   passthru.tursoPlugin = stdenv.mkDerivation {

From 2bf5db368da9ece8d58fe60c8d8b2a5feb5c3374 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 09:10:07 +0000
Subject: [PATCH 151/197] kubescape: 4.0.9 -> 4.0.10

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

diff --git a/pkgs/by-name/ku/kubescape/package.nix b/pkgs/by-name/ku/kubescape/package.nix
index b789c8b1a8c2..ab9685653e73 100644
--- a/pkgs/by-name/ku/kubescape/package.nix
+++ b/pkgs/by-name/ku/kubescape/package.nix
@@ -9,18 +9,18 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "kubescape";
-  version = "4.0.9";
+  version = "4.0.10";
 
   src = fetchFromGitHub {
     owner = "kubescape";
     repo = "kubescape";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BkBRRrYs551bGnT00EvVSzaNQM8GfcltEl8xLb/AKd8=";
+    hash = "sha256-RbTGgSnaRUZdj2RdyTHgPy/+AbvAecTmdUeaDubyCSg=";
     fetchSubmodules = true;
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-GQTk12dHSNLWdLcb0VedK1Ex1uJOZtL3+XOnh527p/8=";
+  vendorHash = "sha256-y17ZrVzeRVzODGuIFKV8nsMu2720d/I4HUfwdinwOg4=";
 
   subPackages = [ "." ];
 

From 3109c87edc27fd96ac0fb15e0c4cc45f2c64b3e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 09:42:16 +0000
Subject: [PATCH 152/197] smug: 0.3.18 -> 0.3.19

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

diff --git a/pkgs/by-name/sm/smug/package.nix b/pkgs/by-name/sm/smug/package.nix
index 7b6ba67ff957..164ba2e273da 100644
--- a/pkgs/by-name/sm/smug/package.nix
+++ b/pkgs/by-name/sm/smug/package.nix
@@ -7,7 +7,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "smug";
-  version = "0.3.18";
+  version = "0.3.19";
 
   subPackages = [ "." ];
 
@@ -15,7 +15,7 @@ buildGoModule (finalAttrs: {
     owner = "ivaaaan";
     repo = "smug";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+A+FKHmJcStoumw/aDeSHG8nZ8hJbiizViC1MpbzT7g=";
+    hash = "sha256-xJMJgXQcriAgeCVkG/QJqxav1Aiu9XjM/hMPrY4jsHw=";
   };
 
   vendorHash = "sha256-0PWAY2CeBtaRqkN93ZWeVSynaMW8E9zJwUxI5CzC1mE=";

From 7c7e2e7a804574ca3e492d4941a7ab2b051adfbc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 09:44:26 +0000
Subject: [PATCH 153/197] okms-cli: 0.4.3 -> 0.4.4

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

diff --git a/pkgs/by-name/ok/okms-cli/package.nix b/pkgs/by-name/ok/okms-cli/package.nix
index 1f01975d62e9..cf12c1008ebd 100644
--- a/pkgs/by-name/ok/okms-cli/package.nix
+++ b/pkgs/by-name/ok/okms-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "okms-cli";
-  version = "0.4.3";
+  version = "0.4.4";
 
   src = fetchFromGitHub {
     owner = "ovh";
     repo = "okms-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OoY4Ryl4SI8irJlcCIMDq77yZm8EyoDnIUlbChe2I9E=";
+    hash = "sha256-S3A3X1Inrnqf4+Sz7e6mqL+vzrz2huIfvNSV6cV5NIU=";
   };
 
-  vendorHash = "sha256-4eTsWxSfSrpaOUn2EkPT1T3J8qQxOC+RIqbe2uk2j/Y=";
+  vendorHash = "sha256-GJG6cZ1FIWUNjDvcuOav7gPrgaKsfEI7U9lkPq+2H7E=";
 
   ldflags = [
     "-s"

From e57bb0e3afb34ef610a29f43cea58826aeaa9671 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 10:03:24 +0000
Subject: [PATCH 154/197] python3Packages.fickling: 0.1.11 -> 0.1.12

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

diff --git a/pkgs/development/python-modules/fickling/default.nix b/pkgs/development/python-modules/fickling/default.nix
index 01a636295843..77f14dd10f76 100644
--- a/pkgs/development/python-modules/fickling/default.nix
+++ b/pkgs/development/python-modules/fickling/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "fickling";
-  version = "0.1.11";
+  version = "0.1.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "trailofbits";
     repo = "fickling";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0tY7zmMW5zt1Cl+Id5BejcLCQmjeqwCJS/CbKijqXNQ=";
+    hash = "sha256-7wbQdInnKFnI76UNmF1/qwFO+2pFt9BXGPnrzHK8rYI=";
   };
 
   build-system = [

From 7de49dea15ed7b902e929f139d83f5b034907fa0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 10:07:05 +0000
Subject: [PATCH 155/197] libretro.smsplus-gx: 0-unstable-2026-04-20 ->
 0-unstable-2026-06-25

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

diff --git a/pkgs/applications/emulators/libretro/cores/smsplus-gx.nix b/pkgs/applications/emulators/libretro/cores/smsplus-gx.nix
index 7a360436d3f2..feee8c55bccc 100644
--- a/pkgs/applications/emulators/libretro/cores/smsplus-gx.nix
+++ b/pkgs/applications/emulators/libretro/cores/smsplus-gx.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "smsplus";
-  version = "0-unstable-2026-04-20";
+  version = "0-unstable-2026-06-25";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "smsplus-gx";
-    rev = "6dc7119f6f8d7f6437320405ee3b0de5f227913f";
-    hash = "sha256-kWq4yzYl0ZTnnhLfhtgPyf2CRequ6yn2DLp3Yc7EBbA=";
+    rev = "8a63f82d3c3bbf7215a31f86a4aaa13fb68a579f";
+    hash = "sha256-yNaNkvRzpli4NMqFvlQ/6US7zw8xXiYWw6R0ev6ubLA=";
   };
 
   meta = {

From 4e3b9ed8ccbaffd23db2d72cf7642a82b452ce0d Mon Sep 17 00:00:00 2001
From: Pavel Borzenkov <pavel@borzenkov.net>
Date: Tue, 30 Jun 2026 14:20:36 +0200
Subject: [PATCH 156/197] qman: do version check

---
 pkgs/by-name/qm/qman/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/qm/qman/package.nix b/pkgs/by-name/qm/qman/package.nix
index dc3c90618df1..f686f7168a1b 100644
--- a/pkgs/by-name/qm/qman/package.nix
+++ b/pkgs/by-name/qm/qman/package.nix
@@ -17,6 +17,7 @@
   xz,
   cunit,
   nix-update-script,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -64,6 +65,15 @@ stdenv.mkDerivation (finalAttrs: {
     "-Dconfigdir=${placeholder "out"}/etc/xdg/qman"
   ];
 
+  doInstallCheck = true;
+  versionCheckKeepEnvironment = [
+    "TERM"
+  ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
   passthru.updateScript = nix-update-script { };
 
   meta = {

From 82bd6b023698863e489c7fe1f7897ec1037abe20 Mon Sep 17 00:00:00 2001
From: Pavel Borzenkov <pavel@borzenkov.net>
Date: Tue, 30 Jun 2026 14:22:53 +0200
Subject: [PATCH 157/197] qman: use patchShebangs

---
 pkgs/by-name/qm/qman/package.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/by-name/qm/qman/package.nix b/pkgs/by-name/qm/qman/package.nix
index f686f7168a1b..e2dd7e386912 100644
--- a/pkgs/by-name/qm/qman/package.nix
+++ b/pkgs/by-name/qm/qman/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  runtimeShell,
   man-db,
   groff,
   xdg-utils,
@@ -34,8 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   postPatch = ''
-    substituteInPlace src/qman_tests_list.sh \
-      --replace-fail "/usr/bin/env bash" ${runtimeShell}
+    patchShebangs --build src/qman_tests_list.sh
     substituteInPlace src/config_def.py \
       --replace-fail "/usr/bin/man" ${man-db}/bin/man \
       --replace-fail "/usr/bin/groff" ${groff}/bin/groff \

From ebb6df49c46e5efeb3fa9d3b5017a3ef786697df Mon Sep 17 00:00:00 2001
From: Pavel Borzenkov <pavel@borzenkov.net>
Date: Tue, 30 Jun 2026 14:27:13 +0200
Subject: [PATCH 158/197] mdterm: add passthru.updateScript

---
 pkgs/by-name/md/mdterm/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/md/mdterm/package.nix b/pkgs/by-name/md/mdterm/package.nix
index 69496609ce8b..e4cbcc7a6428 100644
--- a/pkgs/by-name/md/mdterm/package.nix
+++ b/pkgs/by-name/md/mdterm/package.nix
@@ -2,6 +2,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -19,6 +20,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-YUPKUFfbzL/1peXEAX5EDehWq4hFwxJLkP2DBDkY23E=";
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "A terminal-based Markdown browser";
     homepage = "https://github.com/bahdotsh/mdterm";

From 9beb65dbfa6adf87a204ef482f0ce09a4ff1755d Mon Sep 17 00:00:00 2001
From: Pavel Borzenkov <pavel@borzenkov.net>
Date: Tue, 30 Jun 2026 14:30:27 +0200
Subject: [PATCH 159/197] mdterm: do version check

---
 pkgs/by-name/md/mdterm/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/md/mdterm/package.nix b/pkgs/by-name/md/mdterm/package.nix
index e4cbcc7a6428..2711df296540 100644
--- a/pkgs/by-name/md/mdterm/package.nix
+++ b/pkgs/by-name/md/mdterm/package.nix
@@ -3,6 +3,7 @@
   rustPlatform,
   fetchFromGitHub,
   nix-update-script,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -22,6 +23,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   passthru.updateScript = nix-update-script { };
 
+  doInstallCheck = true;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
   meta = {
     description = "A terminal-based Markdown browser";
     homepage = "https://github.com/bahdotsh/mdterm";

From 8d4b4019a3164974f8001f5fec37d0c1f3ee31c7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 12:30:47 +0000
Subject: [PATCH 160/197] xarchiver: 0.5.4.26 -> 0.5.4.27

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

diff --git a/pkgs/by-name/xa/xarchiver/package.nix b/pkgs/by-name/xa/xarchiver/package.nix
index f7807e4c0ac2..eaf7a51bc2dc 100644
--- a/pkgs/by-name/xa/xarchiver/package.nix
+++ b/pkgs/by-name/xa/xarchiver/package.nix
@@ -24,14 +24,14 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "0.5.4.26";
+  version = "0.5.4.27";
   pname = "xarchiver";
 
   src = fetchFromGitHub {
     owner = "ib";
     repo = "xarchiver";
     rev = finalAttrs.version;
-    hash = "sha256-s6lVKtWJRAFrkUYUwKGH+XNTGi/L+Zt0kSWIekBUWYs=";
+    hash = "sha256-s4RM9loFlKVcOtxNolt6+wZTp3ITdGaHTNUtDnAmqfs=";
   };
 
   nativeBuildInputs = [

From a8b9f4802b0d20842612f48614bb074fdc7c66b6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 12:34:42 +0000
Subject: [PATCH 161/197] clever-tools: 4.10.0 -> 4.11.0

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

diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix
index 381a9baa1434..44701880bf30 100644
--- a/pkgs/by-name/cl/clever-tools/package.nix
+++ b/pkgs/by-name/cl/clever-tools/package.nix
@@ -11,7 +11,7 @@
 buildNpmPackage rec {
   pname = "clever-tools";
 
-  version = "4.10.0";
+  version = "4.11.0";
 
   nodejs = nodejs_22;
 
@@ -19,10 +19,10 @@ buildNpmPackage rec {
     owner = "CleverCloud";
     repo = "clever-tools";
     rev = version;
-    hash = "sha256-EgGjlZ6Awg7SEC3ljPqii3wpq2SlXN/gARUJBSFcX0k=";
+    hash = "sha256-ma1EZL5xuUw8BrECFamSR1I8XJk8PERW7YJSj8JTp4w=";
   };
 
-  npmDepsHash = "sha256-1v9c1525J7aS89PDdl6hWbYdn/DIM3G1BxFbpxu/F7E=";
+  npmDepsHash = "sha256-9TPH+jRcM161MhabA9m0GcgAzc+yO1a1zh8vQHjZt7g=";
 
   nativeBuildInputs = [
     installShellFiles

From 83bad8ec410a188d6f1d4ad849cc58dc3ce770ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 12:45:38 +0000
Subject: [PATCH 162/197] croc: 10.4.4 -> 10.4.5

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

diff --git a/pkgs/by-name/cr/croc/package.nix b/pkgs/by-name/cr/croc/package.nix
index 3e6154a19da9..e59ae45261e8 100644
--- a/pkgs/by-name/cr/croc/package.nix
+++ b/pkgs/by-name/cr/croc/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "croc";
-  version = "10.4.4";
+  version = "10.4.5";
 
   src = fetchFromGitHub {
     owner = "schollz";
     repo = "croc";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Kwli0wgicebRlJE+c4McH6a7I2udRppJtKBopJ/eiFc=";
+    hash = "sha256-EbOjLR9xQMY2D+roK/Fv1so5FZwZ2RmNetLxq0WIw2g=";
   };
 
-  vendorHash = "sha256-jXv8M4MnaTVitLmQ4X+pyIihxcVGlEP4IEwZT1LPKIA=";
+  vendorHash = "sha256-SVljsV7xxVVQsn1ii4ShnFVFQDAFSZJe14HJ/6TQi7c=";
 
   subPackages = [ "." ];
 

From f15a2c0d65bf3760390ca07ebe0e3a9e1fa09a2e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 12:50:19 +0000
Subject: [PATCH 163/197] pict-rs: 0.5.23 -> 0.5.24

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

diff --git a/pkgs/by-name/pi/pict-rs/package.nix b/pkgs/by-name/pi/pict-rs/package.nix
index a1f2b25aad44..f7525ec4500f 100644
--- a/pkgs/by-name/pi/pict-rs/package.nix
+++ b/pkgs/by-name/pi/pict-rs/package.nix
@@ -13,17 +13,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pict-rs";
-  version = "0.5.23";
+  version = "0.5.24";
 
   src = fetchFromGitea {
     domain = "git.asonix.dog";
     owner = "asonix";
     repo = "pict-rs";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-9FEVqN/j+VCK0CihpfNXSp1JZ3G7/mB5R+NJKQQtwc0=";
+    sha256 = "sha256-jKUDrYBGaWyumnlzMyj+oC41rx8kVnkkUxixSCwFp3Y=";
   };
 
-  cargoHash = "sha256-LYCLGu569sJkEIm6oHWebIH4+AX7cGnRzPn7U29LNuQ=";
+  cargoHash = "sha256-W4Bj+juON8mPyXDHgFpTBBFOvQlmYIKihXHBHwelah4=";
 
   env = {
     # needed for internal protobuf c wrapper library

From 4e7b8cb589e2780802e36a0613b0b1ce0cd75f38 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 12:55:11 +0000
Subject: [PATCH 164/197] matrix-alertmanager-receiver: 2026.6.17 -> 2026.6.24

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

diff --git a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
index ee4b554fd3a2..2bc1c360516e 100644
--- a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
+++ b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
@@ -8,17 +8,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "matrix-alertmanager-receiver";
-  version = "2026.6.17";
+  version = "2026.6.24";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "metio";
     repo = "matrix-alertmanager-receiver";
     tag = finalAttrs.version;
-    hash = "sha256-vwmLSl09tzpn4hc8+d5l00D93QBsX/y0/403kuNg/SQ=";
+    hash = "sha256-NEe75EptmzDqoWlrDmW6lNioFse3cZGsza1VcDJBr80=";
   };
 
-  vendorHash = "sha256-Umn+V+yqAUf0dmUW8p1Luh+hcVTqOTA0rmQyE0KmBZA=";
+  vendorHash = "sha256-6CDR3V44EQRCgsGBE/SvNbh4dYVAW/dg/HZntiCoxWI=";
 
   env.CGO_ENABLED = "0";
 

From 4694d1c24a6561c40175dabd68f990ce1f5dcfa5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 13:42:46 +0000
Subject: [PATCH 165/197] nuclei: 3.9.0 -> 3.10.0

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

diff --git a/pkgs/by-name/nu/nuclei/package.nix b/pkgs/by-name/nu/nuclei/package.nix
index e1fd21bc2229..30720ee27663 100644
--- a/pkgs/by-name/nu/nuclei/package.nix
+++ b/pkgs/by-name/nu/nuclei/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "nuclei";
-  version = "3.9.0";
+  version = "3.10.0";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "nuclei";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xu9CFZR3hv6oIZvmyKELpYUVbE/Yu3ApnTwi0LMTQWg=";
+    hash = "sha256-AS+LL8EUGEH1KDB76IGRV7WYSdHG2Gs8iB2nW/oxPlI=";
   };
 
-  vendorHash = "sha256-bJYN2hsNI99AUGRjLFzzd6ZIIXUW2oDxmAsIniRM868=";
+  vendorHash = "sha256-SIt+OgxHYjK3X6rJbyaMwZVkNJPRKVkmvMzzCKHFx28=";
 
   proxyVendor = true; # hash mismatch between Linux and Darwin
 

From 5bef5d0b1d459f1ea0f4d14bd9e210c8d0642f78 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 13:48:50 +0000
Subject: [PATCH 166/197] terraform-providers.hashicorp_awscc: 1.89.0 -> 1.90.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 07e41b87de12..9c98143efe1f 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -517,11 +517,11 @@
     "vendorHash": "sha256-COWHnLR6aRwcGJVo6IFvqQLwAYxFpqUGQbZVvEo/b/I="
   },
   "hashicorp_awscc": {
-    "hash": "sha256-ZQaBYZTsF68IjbRYa3Z7VRqKfaHCvOtMkJHsybJn+ec=",
+    "hash": "sha256-IRDNbQh3OouVUKranI962+3f5REeIC5Vtv8dw06z9UE=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/awscc",
     "owner": "hashicorp",
     "repo": "terraform-provider-awscc",
-    "rev": "v1.89.0",
+    "rev": "v1.90.0",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-9FzpBgb3BzIVhx8kqhyDJw/liH6X8jUhFmwtbic4uVw="
   },

From 7e4bea4e72b10f4e6e024985310a3da6c1f59fee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 14:19:51 +0000
Subject: [PATCH 167/197] terraform-providers.ciscodevnet_aci: 2.19.0 -> 2.20.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 07e41b87de12..70537d75fe06 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -164,11 +164,11 @@
     "vendorHash": "sha256-7XgTkzYBfkpF8Dd4YsgpB+YIfkANsg/60b3AyO8Y8FA="
   },
   "ciscodevnet_aci": {
-    "hash": "sha256-Z3qat3S7dv5kGpc82RxAwlgp3hfscFbkokVsgGnBRHY=",
+    "hash": "sha256-8QnmISiZGRbW60mN9I6UYWDo6f2HUIFersVs/pDUD3o=",
     "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci",
     "owner": "CiscoDevNet",
     "repo": "terraform-provider-aci",
-    "rev": "v2.19.0",
+    "rev": "v2.20.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From a16604caff590a0cfabce4e385142e3cfbed6d63 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 14:25:12 +0000
Subject: [PATCH 168/197] highlight-pointer: 1.2 -> 1.3

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

diff --git a/pkgs/by-name/hi/highlight-pointer/package.nix b/pkgs/by-name/hi/highlight-pointer/package.nix
index 8a6bcb591d60..a828a2becd38 100644
--- a/pkgs/by-name/hi/highlight-pointer/package.nix
+++ b/pkgs/by-name/hi/highlight-pointer/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "highlight-pointer";
-  version = "1.2";
+  version = "1.3";
 
   src = fetchFromGitHub {
     owner = "swillner";
     repo = "highlight-pointer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Og09/RmLWtzVAMs79Z4eDuXWg4w2kZfXyX8K7CowFaU=";
+    hash = "sha256-yCm5YpOTPWRYAzX2TRhwUnSc3LbdxjwR5Z0glUm95Cg=";
   };
 
   buildInputs = [

From 8618042eafd9aa7bce51d6c80eec3c7fc6aed10d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 14:31:40 +0000
Subject: [PATCH 169/197] goose: 3.27.1 -> 3.27.2

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

diff --git a/pkgs/by-name/go/goose/package.nix b/pkgs/by-name/go/goose/package.nix
index d90533967545..da3368f8b8db 100644
--- a/pkgs/by-name/go/goose/package.nix
+++ b/pkgs/by-name/go/goose/package.nix
@@ -7,17 +7,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "goose";
-  version = "3.27.1";
+  version = "3.27.2";
 
   src = fetchFromGitHub {
     owner = "pressly";
     repo = "goose";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-dzeB5QXjQAyJlaM6I82C4gNoj7ELA4sgkfHkXADN9+Y=";
+    hash = "sha256-4m/YYyQtz/Nj94vIUxChgmDsJVZqtzmp7qsSiuZVB38=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-JsLpcV5SSBin6U7Kj5O0mhXNdIwyV+xdteEJBxW8zuY=";
+  vendorHash = "sha256-8riGHomL3wKqBOPOzgE13jWYjJT03tqz1UMWR/01pcE=";
 
   # skipping: end-to-end tests require a docker daemon
   postPatch = ''

From e17e0879e1a2b59179a5296498b5311b594ac09a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 14:32:03 +0000
Subject: [PATCH 170/197] harbor-cli: 0.0.22 -> 0.0.23

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

diff --git a/pkgs/by-name/ha/harbor-cli/package.nix b/pkgs/by-name/ha/harbor-cli/package.nix
index ca02e4fae725..77079d474920 100644
--- a/pkgs/by-name/ha/harbor-cli/package.nix
+++ b/pkgs/by-name/ha/harbor-cli/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "harbor-cli";
-  version = "0.0.22";
+  version = "0.0.23";
 
   src = fetchFromGitHub {
     owner = "goharbor";
     repo = "harbor-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QgI5ET5mS/vZb6a4kuTZzllUWKjbawgzknWkDgGNEi0=";
+    hash = "sha256-lh0ZMrjzCiQvpzRddms4uEKlUdxcDdHTfkYdmQ5hc9k=";
   };
 
   vendorHash = "sha256-Iy+Kf0Kf1yuFk+shbomT0Z1zMvAbdWT4vLshAjlqvck=";

From fe0e023943cb02a94e4a0aa887e484fbe464608a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 14:37:43 +0000
Subject: [PATCH 171/197] fotowall: 1.1.0 -> 1.1.1

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

diff --git a/pkgs/by-name/fo/fotowall/package.nix b/pkgs/by-name/fo/fotowall/package.nix
index bcaa5c0235a0..c317504a3365 100644
--- a/pkgs/by-name/fo/fotowall/package.nix
+++ b/pkgs/by-name/fo/fotowall/package.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   pname = "fotowall";
-  version = "1.1.0";
+  version = "1.1.1";
   strictDeps = true;
   __structuredAttrs = true;
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     owner = "fotowall";
     repo = "fotowall";
     rev = "v${version}";
-    hash = "sha256-3zgZ9yuS7N/pqWF9CczMSjWb1afMFaNYPRgwEo/AZp8=";
+    hash = "sha256-0iW3S3E7g/osnwBTSh0ruBThVyI422EhlMjuA9kQWnY=";
   };
 
   nativeBuildInputs = [

From 739447ed421a02ad6ad12d6ff6cd7b4f0a36e76f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 14:43:03 +0000
Subject: [PATCH 172/197] python3Packages.aioghost: 0.4.17 -> 0.4.18

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

diff --git a/pkgs/development/python-modules/aioghost/default.nix b/pkgs/development/python-modules/aioghost/default.nix
index f1854faf7d44..08908a05b18f 100644
--- a/pkgs/development/python-modules/aioghost/default.nix
+++ b/pkgs/development/python-modules/aioghost/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "aioghost";
-  version = "0.4.17";
+  version = "0.4.18";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TryGhost";
     repo = "aioghost";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4yywuZOfKwTTHpZdSSyE0d8t+LlJL5+AW48Xb85od+k=";
+    hash = "sha256-4YmIsXegv23ZVpvewixJVR6IY8YqQzeLKDAjHTp937k=";
   };
 
   build-system = [ hatchling ];

From 1c188b986c2ecb96348fdc541805e86de1def6ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 15:27:15 +0000
Subject: [PATCH 173/197] terraform-providers.grafana_grafana: 4.38.0 -> 4.39.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 07e41b87de12..ee40ec7fe9f8 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -481,13 +481,13 @@
     "vendorHash": "sha256-v1r/hTVHJeaTsxHU/oDhRQeaWtfND7NplMAj+wFPe6A="
   },
   "grafana_grafana": {
-    "hash": "sha256-TyO5Owo8LFQVQmsAD40/L0VaAY1+X3h4pSPbJIE97mY=",
+    "hash": "sha256-O7q3zkBbugikTgP9c4yMvcoxs/0NjuZmv+RmqeoKa0k=",
     "homepage": "https://registry.terraform.io/providers/grafana/grafana",
     "owner": "grafana",
     "repo": "terraform-provider-grafana",
-    "rev": "v4.38.0",
+    "rev": "v4.39.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-Fnn5/UiSQtvv/XykeXhbR4GuSrGBy/j03vzyBI2LnGg="
+    "vendorHash": "sha256-qwb8mLQBXS7MYbWAhZAmAKI2Zwnd5BzYheDX9k/Y0gY="
   },
   "gridscale_gridscale": {
     "hash": "sha256-FAKvQ/MEod5Ck0PG4ffQ+gQp6zZ0JDRXPOrOiDpWMls=",

From 3a40b52cc7bf2a32e3523e09731bca8055477a82 Mon Sep 17 00:00:00 2001
From: Alexandru Nechita <alexandru.italia32@gmail.com>
Date: Tue, 30 Jun 2026 17:39:13 +0200
Subject: [PATCH 174/197] aerospace: 0.20.3-Beta -> 0.21.0-Beta

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

diff --git a/pkgs/by-name/ae/aerospace/package.nix b/pkgs/by-name/ae/aerospace/package.nix
index ee4fb336823e..1584bd32feb6 100644
--- a/pkgs/by-name/ae/aerospace/package.nix
+++ b/pkgs/by-name/ae/aerospace/package.nix
@@ -9,7 +9,7 @@
 
 let
   appName = "AeroSpace.app";
-  version = "0.20.3-Beta";
+  version = "0.21.0-Beta";
 in
 stdenv.mkDerivation {
   pname = "aerospace";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   src = fetchzip {
     url = "https://github.com/nikitabobko/AeroSpace/releases/download/v${version}/AeroSpace-v${version}.zip";
-    sha256 = "sha256-wrBcslp1W/lOmudMcW+SREL9LZY+wTwidh6Hot5ShGE=";
+    sha256 = "sha256-z55eInxpFr+ZjyG2lottTZE9VyD0YVEZfZnjZ32w/c8=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From dd37af7c57d5fc72c3b242c2ccbb4582369dbc46 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 15:45:19 +0000
Subject: [PATCH 175/197] python3Packages.nexia: 2.12.0 -> 2.13.0

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

diff --git a/pkgs/development/python-modules/nexia/default.nix b/pkgs/development/python-modules/nexia/default.nix
index c5065c62e16b..1417f7a378ee 100644
--- a/pkgs/development/python-modules/nexia/default.nix
+++ b/pkgs/development/python-modules/nexia/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "nexia";
-  version = "2.12.0";
+  version = "2.13.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "nexia";
     tag = finalAttrs.version;
-    hash = "sha256-d3mV7kzUoM6JvZ82FLNxapkRZDjFH7V/rf4qjIyf2is=";
+    hash = "sha256-jkyosr829jyR/aSDL9L+8xYZwwja0/TRETYFFBbwiFg=";
   };
 
   build-system = [ poetry-core ];

From 1948ddd6be8be8cfed7c63af66fe5c9b93cd8659 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 15:53:26 +0000
Subject: [PATCH 176/197] vacuum-go: 0.29.4 -> 0.29.7

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

diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix
index 0039b04a60a0..4c88f99fb90c 100644
--- a/pkgs/by-name/va/vacuum-go/package.nix
+++ b/pkgs/by-name/va/vacuum-go/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "vacuum-go";
-  version = "0.29.4";
+  version = "0.29.7";
 
   src = fetchFromGitHub {
     owner = "daveshanley";
     repo = "vacuum";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-w5NqLtKxrX0xll7k5Fdm2r1zdy9hgYWz1BOHPdf++s4=";
+    hash = "sha256-pRTR+6L0C5GQwT6ce11Bq0Pgxvh1zS/NKY/NSmUGhdU=";
   };
 
-  vendorHash = "sha256-JOvLXNjqe3u2h/+7aObUAR7Lhq92m7rctI3qBHRfYPw=";
+  vendorHash = "sha256-NSSXFBOAFfavdSblrs3hTHiCTvOD09bIxc+jV4awTqs=";
 
   env.CGO_ENABLED = 0;
   ldflags = [

From 0fa8a1100a659e873e87420663bc257357540fef Mon Sep 17 00:00:00 2001
From: rcarter <rcarter@anduril.com>
Date: Thu, 19 Mar 2026 16:33:52 -0400
Subject: [PATCH 177/197] iperf2: fix cross compilation

---
 pkgs/by-name/ip/iperf2/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/ip/iperf2/package.nix b/pkgs/by-name/ip/iperf2/package.nix
index 15e393afa8b2..c82b1c3d3b20 100644
--- a/pkgs/by-name/ip/iperf2/package.nix
+++ b/pkgs/by-name/ip/iperf2/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  pkgsCross,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -18,16 +19,23 @@ stdenv.mkDerivation (finalAttrs: {
 
   configureFlags = [ "--enable-fastsampling" ];
 
+  makeFlags = [ "AR:=$(AR)" ];
+
   postInstall = ''
     mv $out/bin/iperf $out/bin/iperf2
     ln -s $out/bin/iperf2 $out/bin/iperf
   '';
 
+  passthru.tests = {
+    cross-aarch64 = pkgsCross.aarch64-multiplatform.iperf2;
+  };
+
   meta = {
     homepage = "https://sourceforge.net/projects/iperf/";
     description = "Tool to measure IP bandwidth using UDP or TCP";
     platforms = lib.platforms.unix;
     license = lib.licenses.mit;
+    mainProgram = "iperf2";
     maintainers = with lib.maintainers; [ randomizedcoder ];
 
     # prioritize iperf3

From a2903322cce6fe51f3cd1640b3fc539cbcfbc4ef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 16:09:14 +0000
Subject: [PATCH 178/197] dashy-ui: 4.3.3 -> 4.3.11

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

diff --git a/pkgs/by-name/da/dashy-ui/package.nix b/pkgs/by-name/da/dashy-ui/package.nix
index 5ec288bb0bec..d56135c080d5 100644
--- a/pkgs/by-name/da/dashy-ui/package.nix
+++ b/pkgs/by-name/da/dashy-ui/package.nix
@@ -17,16 +17,16 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "dashy-ui";
-  version = "4.3.3";
+  version = "4.3.11";
   src = fetchFromGitHub {
     owner = "lissy93";
     repo = "dashy";
     tag = finalAttrs.version;
-    hash = "sha256-3uzitxmaFKWrB8NOEFs2eEOqqYDW9R8pH1VAMEutBKU=";
+    hash = "sha256-BAzeS484udZ4Llgyx1pruKsgPOpI3i3XMTWy5cf2I1Q=";
   };
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/yarn.lock";
-    hash = "sha256-5yYaOZk/SiR5vvM860JQkH3/TjVOFMnqwRlxxziKMr8=";
+    hash = "sha256-PCJxn3qXOZBHVJifa6xTYu1quW6zelt162fIgyH9g8g=";
   };
 
   passthru = {

From f1a714efde086cc7f9ab07dd7e648442831a54e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 16:37:36 +0000
Subject: [PATCH 179/197] firebase-tools: 15.22.0 -> 15.22.3

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

diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix
index 659a157f9321..2c2c5d13893a 100644
--- a/pkgs/by-name/fi/firebase-tools/package.nix
+++ b/pkgs/by-name/fi/firebase-tools/package.nix
@@ -11,17 +11,17 @@
 
 buildNpmPackage rec {
   pname = "firebase-tools";
-  version = "15.22.0";
+  version = "15.22.3";
   nodejs = nodejs_22;
 
   src = fetchFromGitHub {
     owner = "firebase";
     repo = "firebase-tools";
     tag = "v${version}";
-    hash = "sha256-5T6JTuKS/SvFUTabMGoH7okIkxwZOcxlDAEBGWZ4VyU=";
+    hash = "sha256-jj1cbJ/AlBDTDhIK/5J0XMn+8opZJ72o3O9JmB35RpE=";
   };
 
-  npmDepsHash = "sha256-hNe46VmfSQx7XwxYWaox+FF15AagRTJk7OjP8y8j8Jo=";
+  npmDepsHash = "sha256-31d0VqbM7vnKyKF7GxNr4V4Z3EqfsgdeKzWbXOOIHYU=";
 
   # No more package-lock.json in upstream src
   postPatch = ''

From eaabaa04db0b5030fc343a27aaa27fc2dadc3114 Mon Sep 17 00:00:00 2001
From: sorooris <10185314+sorooris@users.noreply.github.com>
Date: Tue, 30 Jun 2026 19:06:23 +0200
Subject: [PATCH 180/197] maintainers: add sorooris

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 01c391bc4dc7..516d4817bedf 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -26232,6 +26232,12 @@
     githubId = 115308;
     name = "Richard Marko";
   };
+  sorooris = {
+    email = "nixpkgs@pm.me";
+    github = "sorooris";
+    githubId = 10185314;
+    name = "Seb Soroori";
+  };
   sorpaas = {
     email = "hi@that.world";
     github = "sorpaas";

From ef0eaf6c3f9b8bfc68a8ea626153534122e82f69 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 18:23:12 +0000
Subject: [PATCH 181/197] python3Packages.datadog: 0.52.1 -> 0.52.2

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

diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix
index 5b2d43fc3bcd..003ff707af55 100644
--- a/pkgs/development/python-modules/datadog/default.nix
+++ b/pkgs/development/python-modules/datadog/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "datadog";
-  version = "0.52.1";
+  version = "0.52.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "DataDog";
     repo = "datadogpy";
     tag = "v${version}";
-    hash = "sha256-WhfCREEuFT4b75C62KWnAyYGt4/j5tuuP8hZOHGNo10=";
+    hash = "sha256-ykZb6wm/hwYyQu6+cdtA33J82SLle5iJlmV5mNHTkv0=";
   };
 
   build-system = [ hatchling ];

From e935bea81aadc598d97a6f74010288181b3edbcf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 18:31:37 +0000
Subject: [PATCH 182/197] terraform-providers.auth0_auth0: 1.50.0 -> 1.51.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 07e41b87de12..456dc5757fce 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -73,13 +73,13 @@
     "vendorHash": "sha256-FHBpTYSmVivoqz+Eaa/r5y1f/saIx4l6mjOtZhxZVRw="
   },
   "auth0_auth0": {
-    "hash": "sha256-QNVACeebepZMCYMn284KUulqnYMU5Mt/e65o+dSRTxg=",
+    "hash": "sha256-nMaiXsPAavHVi4xq+jPWdF9GVW+b0HoXiEc2QUNPQTE=",
     "homepage": "https://registry.terraform.io/providers/auth0/auth0",
     "owner": "auth0",
     "repo": "terraform-provider-auth0",
-    "rev": "v1.50.0",
+    "rev": "v1.51.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-wW3dAmDl1qhWlCcTlujdEGB0GFQsgD0YmrGENYhg/qY="
+    "vendorHash": "sha256-MRtERveRjEZfaVyUz527NUKoFDM4dINJZ71U9MFEmIM="
   },
   "aviatrixsystems_aviatrix": {
     "hash": "sha256-46djOfAj/5kfeoKLQHbeKefzdGbmlBATR+uN/IaAn8I=",

From 4efde464e76bf62686bc88d7a1a76667ef3eff3d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 19:11:58 +0000
Subject: [PATCH 183/197] libretro.snes9x2002: 0-unstable-2026-04-20 ->
 0-unstable-2026-06-25

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

diff --git a/pkgs/applications/emulators/libretro/cores/snes9x2002.nix b/pkgs/applications/emulators/libretro/cores/snes9x2002.nix
index 56c57527c59b..cd9e77f643a5 100644
--- a/pkgs/applications/emulators/libretro/cores/snes9x2002.nix
+++ b/pkgs/applications/emulators/libretro/cores/snes9x2002.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "snes9x2002";
-  version = "0-unstable-2026-04-20";
+  version = "0-unstable-2026-06-25";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "snes9x2002";
-    rev = "39e0d8c6daf4b1b1302eeecfee8309570aeb6a82";
-    hash = "sha256-mOtCZEuXKWQEupWfFfr3Ji6m15zZuOIJ/ieKtrFGsWI=";
+    rev = "5bd8bd6d449be8a2ef7909e1aeb2bd8c9c0da8cb";
+    hash = "sha256-iqhmSJzWqr5HgtY9q+kBb/xB6njvG3M2SePXdRszqqc=";
   };
 
   makefile = "Makefile";

From 1cafcf671b2deea52bfe7aa61843c86cf6dbf8b3 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 30 Jun 2026 21:13:11 +0200
Subject: [PATCH 184/197] postgrest: 14.13 -> 14.14

Release Notes:
https://github.com/PostgREST/postgrest/releases/tag/v14.14
---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 794aebf34ed9..bb3c87bf42ef 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -2534,12 +2534,12 @@ with haskellLib;
         doJailbreak
         # 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275
         (overrideSrc rec {
-          version = "14.13";
+          version = "14.14";
           src = pkgs.fetchFromGitHub {
             owner = "PostgREST";
             repo = "postgrest";
             rev = "v${version}";
-            hash = "sha256-F34fAoNBcww9n6MsxYTjuBorOMcFzmo8nEj8rRomcrs=";
+            hash = "sha256-iAyGu0yKXpSg0uFgGvD1UGc35yDMLYQ/fHoRERiKJMU=";
           };
         })
       ];

From 801431c6deea492dd608d5b28522add2d13fe14f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 19:26:12 +0000
Subject: [PATCH 185/197] protozero: 1.8.1 -> 1.8.2

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

diff --git a/pkgs/by-name/pr/protozero/package.nix b/pkgs/by-name/pr/protozero/package.nix
index 9fa59741a663..ce4d0a0af84a 100644
--- a/pkgs/by-name/pr/protozero/package.nix
+++ b/pkgs/by-name/pr/protozero/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "protozero";
-  version = "1.8.1";
+  version = "1.8.2";
 
   src = fetchFromGitHub {
     owner = "mapbox";
     repo = "protozero";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-69GEAz6wSGMGozsWS9xmoTgyH8mTuDM9mUTCXfVI6f8=";
+    hash = "sha256-pqRlSrCPBybKzKfXClGEIa8Pd1vS5vTpjIDhmz5UhYE=";
   };
 
   nativeBuildInputs = [ cmake ];

From b42b7c89d063b3932e29e6e5ed71a22d25917a2e Mon Sep 17 00:00:00 2001
From: sorooris <10185314+sorooris@users.noreply.github.com>
Date: Tue, 30 Jun 2026 21:39:56 +0200
Subject: [PATCH 186/197] hyper8: init at 1.0.1

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

diff --git a/pkgs/by-name/hy/hyper8/package.nix b/pkgs/by-name/hy/hyper8/package.nix
new file mode 100644
index 000000000000..f957d25de8b8
--- /dev/null
+++ b/pkgs/by-name/hy/hyper8/package.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromCodeberg,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "hyper8";
+  version = "1.0.1";
+
+  src = fetchFromCodeberg {
+    owner = "simonrepp";
+    repo = "hyper8";
+    tag = finalAttrs.version;
+    hash = "sha256-pvtQPL/hPgoKDLYWC/IL04db7Q/FUlgiExthu4xBQEw=";
+  };
+
+  __structuredAttrs = true;
+
+  cargoHash = "sha256-AQAWGmzixDFfL7wqJJXCvNSYojVtYHRP0zqdj0C8JRE=";
+
+  meta = {
+    homepage = "https://hyper8.org";
+    description = "Static site generator for video publishing.";
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.all;
+    mainProgram = "hyper8";
+  };
+})

From 1574c73498b2de56a96d729d53dedec883361ded Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 19:45:09 +0000
Subject: [PATCH 187/197] nextvi: 5.3 -> 6.0

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

diff --git a/pkgs/by-name/ne/nextvi/package.nix b/pkgs/by-name/ne/nextvi/package.nix
index 85e24e8ba24e..5781d5f27504 100644
--- a/pkgs/by-name/ne/nextvi/package.nix
+++ b/pkgs/by-name/ne/nextvi/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nextvi";
-  version = "5.3";
+  version = "6.0";
 
   src = fetchFromGitHub {
     owner = "kyx0r";
     repo = "nextvi";
     tag = finalAttrs.version;
-    hash = "sha256-06z7zAJ8pRYhGQsNYgfSBDn8UgyGkeqXz6MHY+IaKYU=";
+    hash = "sha256-xxkV2y3+TErR9GfI1ui9CmFgKCmNm/Sdc7BE881mRx8=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From 83891d702c23085f35b15c93de8bb36453c12a17 Mon Sep 17 00:00:00 2001
From: dfjay <mail@dfjay.com>
Date: Wed, 1 Jul 2026 00:46:02 +0500
Subject: [PATCH 188/197] jan: add update script

Assisted-by: Claude Code (Claude Opus 4.8)
---
 pkgs/by-name/ja/jan/package.nix |  5 ++++-
 pkgs/by-name/ja/jan/update.sh   | 24 ++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100755 pkgs/by-name/ja/jan/update.sh

diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix
index 80c0c89f5688..932c973d6547 100644
--- a/pkgs/by-name/ja/jan/package.nix
+++ b/pkgs/by-name/ja/jan/package.nix
@@ -29,6 +29,8 @@ let
     src = linux-src;
   };
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
     changelog = "https://github.com/janhq/jan/releases/tag/v${version}";
     description = "Jan is an open source alternative to ChatGPT that runs 100% offline on your computer";
@@ -56,13 +58,14 @@ let
         cudaPackages.cudatoolkit
       ];
 
-    inherit meta;
+    inherit passthru meta;
   };
 
   darwin = stdenv.mkDerivation {
     inherit
       pname
       version
+      passthru
       meta
       ;
 
diff --git a/pkgs/by-name/ja/jan/update.sh b/pkgs/by-name/ja/jan/update.sh
new file mode 100755
index 000000000000..453ad670202c
--- /dev/null
+++ b/pkgs/by-name/ja/jan/update.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bash nixVersions.latest curl coreutils jq common-updater-scripts
+
+set -euo pipefail
+
+latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/janhq/jan/releases/latest | jq -r ".tag_name")
+latestVersion="${latestTag#v}"
+currentVersion=$(nix-instantiate --eval -E "with import ./. {}; jan.version" | tr -d '"')
+
+echo "latest  version: $latestVersion"
+echo "current version: $currentVersion"
+
+if [[ "$latestVersion" == "$currentVersion" ]]; then
+    echo "package is up-to-date"
+    exit 0
+fi
+
+linuxUrl="https://github.com/janhq/jan/releases/download/v$latestVersion/Jan_${latestVersion}_amd64.AppImage"
+linuxHash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$(nix-prefetch-url "$linuxUrl")")
+update-source-version jan "$latestVersion" "$linuxHash" --system=x86_64-linux --ignore-same-version
+
+darwinUrl="https://github.com/janhq/jan/releases/download/v$latestVersion/jan-mac-universal-${latestVersion}.zip"
+darwinHash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$(nix-prefetch-url --unpack "$darwinUrl")")
+update-source-version jan "$latestVersion" "$darwinHash" --system=aarch64-darwin --ignore-same-version

From a8b1a80a6af6a775db6e00423749b510904040d1 Mon Sep 17 00:00:00 2001
From: dfjay <mail@dfjay.com>
Date: Wed, 1 Jul 2026 00:46:04 +0500
Subject: [PATCH 189/197] jan: refactor

Assisted-by: Claude Code (Claude Opus 4.8)
---
 pkgs/by-name/ja/jan/package.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix
index 932c973d6547..ac966ff0ab6c 100644
--- a/pkgs/by-name/ja/jan/package.nix
+++ b/pkgs/by-name/ja/jan/package.nix
@@ -33,9 +33,10 @@ let
 
   meta = {
     changelog = "https://github.com/janhq/jan/releases/tag/v${version}";
-    description = "Jan is an open source alternative to ChatGPT that runs 100% offline on your computer";
+    description = "Open source alternative to ChatGPT that runs 100% offline on your computer";
     homepage = "https://github.com/janhq/jan";
     license = lib.licenses.asl20;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     mainProgram = "Jan";
     maintainers = with lib.maintainers; [ dfjay ];
     platforms =
@@ -62,22 +63,16 @@ let
   };
 
   darwin = stdenv.mkDerivation {
-    inherit
-      pname
-      version
-      passthru
-      meta
-      ;
+    inherit pname version;
 
     src = darwin-src;
 
-    dontUnpack = true;
-
-    sourceRoot = "${pname}.app";
     nativeBuildInputs = [
       makeWrapper
     ];
 
+    dontUnpack = true;
+
     installPhase = ''
       runHook preInstall
 
@@ -90,6 +85,8 @@ let
 
       runHook postInstall
     '';
+
+    inherit passthru meta;
   };
 in
 if stdenv.hostPlatform.isDarwin then darwin else linux

From 823c46ee6fd319b71d953d8d466bf19cfdc34fbf Mon Sep 17 00:00:00 2001
From: dfjay <mail@dfjay.com>
Date: Wed, 1 Jul 2026 00:46:06 +0500
Subject: [PATCH 190/197] jan: 0.8.2 -> 0.8.3

Assisted-by: Claude Code (Claude Opus 4.8)
---
 pkgs/by-name/ja/jan/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix
index ac966ff0ab6c..9babfa1c0049 100644
--- a/pkgs/by-name/ja/jan/package.nix
+++ b/pkgs/by-name/ja/jan/package.nix
@@ -12,16 +12,16 @@
 
 let
   pname = "Jan";
-  version = "0.8.2";
+  version = "0.8.3";
 
   darwin-src = fetchzip {
     url = "https://github.com/janhq/jan/releases/download/v${version}/jan-mac-universal-${version}.zip";
-    hash = "sha256-DUyPMsy9POcxY5OyQu1IBAijTbUZACQB87j0CQDrw8A=";
+    hash = "sha256-h2v71DzXez/+wlEp8IMVBk33LlXPhNPJ1UPNLYPShoE=";
   };
 
   linux-src = fetchurl {
-    url = "https://github.com/janhq/jan/releases/download/v${version}/jan_${version}_amd64.AppImage";
-    hash = "sha256-OWg8P4g2g+LVJU+SnjajG2cqWnzl5X2fjqTGkIC3kAY=";
+    url = "https://github.com/janhq/jan/releases/download/v${version}/Jan_${version}_amd64.AppImage";
+    hash = "sha256-vEmioWQ4ic/FrtNFMKaLOcEy2BTRdouPc4PYWk90ZBI=";
   };
 
   appimageContents = appimageTools.extractType2 {

From 7e6427f6ad1efa145d9c50ecaca44a2e0a768c46 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 19:52:45 +0000
Subject: [PATCH 191/197] rar: 7.21 -> 7.23

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

diff --git a/pkgs/by-name/ra/rar/package.nix b/pkgs/by-name/ra/rar/package.nix
index 26358d8c11f5..cf563ccd3586 100644
--- a/pkgs/by-name/ra/rar/package.nix
+++ b/pkgs/by-name/ra/rar/package.nix
@@ -8,21 +8,21 @@
 }:
 
 let
-  version = "7.21";
+  version = "7.23";
   downloadVersion = lib.replaceStrings [ "." ] [ "" ] version;
   # Use `./update.sh` to generate the entries below
   srcs = {
     x86_64-linux = {
       url = "https://www.rarlab.com/rar/rarlinux-x64-${downloadVersion}.tar.gz";
-      hash = "sha256-wrY7+1E3SNpBu4PsNGX+yoWjlR0Clr5e40xgLZmbEkc=";
+      hash = "sha256-dZtLaqDZ93ExiCFilRGT86DlS/YOHY3EJVqjCKzKtYg=";
     };
     aarch64-darwin = {
       url = "https://www.rarlab.com/rar/rarmacos-arm-${downloadVersion}.tar.gz";
-      hash = "sha256-jYw6ihHRvmnM0/T2L7AbuNRc3YVkReGoMJH1ebPIWec=";
+      hash = "sha256-aLOTwAB1jUd/3kPJVf91QvEvdvP16HzdqSMVL8eRvU0=";
     };
     x86_64-darwin = {
       url = "https://www.rarlab.com/rar/rarmacos-x64-${downloadVersion}.tar.gz";
-      hash = "sha256-gUeNcFyXjEIkcN0NqLd3ByNyoB/hW/4HrvWmYs+Bpy8=";
+      hash = "sha256-2h+zw9d0gTbJs2m2g9V0s3LLHtBJpjSoH4XZORg0bY8=";
     };
   };
 in

From 2344c1760ce4c1c6975e3ba0c1fa1146142a798f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.dev>
Date: Fri, 19 Jun 2026 10:55:10 +0200
Subject: [PATCH 192/197] python3Packages.muon-optimizer: init at 0.1.0

---
 .../python-modules/muon-optimizer/default.nix | 42 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/python-modules/muon-optimizer/default.nix

diff --git a/pkgs/development/python-modules/muon-optimizer/default.nix b/pkgs/development/python-modules/muon-optimizer/default.nix
new file mode 100644
index 000000000000..5855c5feb4d2
--- /dev/null
+++ b/pkgs/development/python-modules/muon-optimizer/default.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  nix-update-script,
+  torch,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "muon-optimizer";
+  version = "0.1.0";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchPypi {
+    pname = "muon_optimizer";
+    inherit (finalAttrs) version;
+    hash = "sha256-ZcUEQfKbckjlhjg9NxJi65BiZT6CCxEUPIGnoQukjac=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  pythonImportsCheck = [
+    "muon"
+  ];
+
+  dependencies = [
+    torch
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Optimizer for the hidden layers of neural networks";
+    homepage = "https://pypi.org/project/muon-optimizer";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jlesquembre ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d541bce8d91e..1f10c03f2a18 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10563,6 +10563,8 @@ self: super: with self; {
 
   munkres = callPackage ../development/python-modules/munkres { };
 
+  muon-optimizer = callPackage ../development/python-modules/muon-optimizer { };
+
   murmurhash = callPackage ../development/python-modules/murmurhash { };
 
   muscima = callPackage ../development/python-modules/muscima { };

From fb0d1a7cd306c43ab7edb0b9cd51e5fbcce412ed Mon Sep 17 00:00:00 2001
From: 2kybe3 <kybe@kybe.xyz>
Date: Sat, 30 May 2026 16:46:51 +0200
Subject: [PATCH 193/197] treewide: follow some GitHub redirects for
 `fetchFromGitHub`

---
 pkgs/applications/office/beancount/beancount-ing-diba.nix | 4 ++--
 pkgs/by-name/_4/_4d-minesweeper/package.nix               | 6 +++---
 pkgs/by-name/aa/aaa/package.nix                           | 4 ++--
 pkgs/by-name/ac/aces-container/package.nix                | 4 ++--
 pkgs/by-name/ae/aeron-cpp/package.nix                     | 2 +-
 pkgs/by-name/ai/airwave/package.nix                       | 6 +++---
 pkgs/by-name/am/amass/package.nix                         | 6 +++---
 pkgs/by-name/an/anchor/package.nix                        | 6 +++---
 pkgs/by-name/an/anup/package.nix                          | 4 ++--
 pkgs/by-name/ap/apftool-rs/package.nix                    | 4 ++--
 pkgs/by-name/ap/appindicator-sharp/package.nix            | 4 ++--
 pkgs/by-name/ap/apriltag/package.nix                      | 2 +-
 pkgs/by-name/ar/art/package.nix                           | 2 +-
 pkgs/by-name/as/assh/package.nix                          | 2 +-
 pkgs/by-name/as/async-profiler/package.nix                | 4 ++--
 pkgs/by-name/au/audiness/package.nix                      | 2 +-
 pkgs/by-name/au/ausweisapp/package.nix                    | 4 ++--
 pkgs/by-name/av/avizo/package.nix                         | 4 ++--
 pkgs/by-name/aw/aws-rotate-key/package.nix                | 4 ++--
 pkgs/by-name/ba/bash-my-aws/package.nix                   | 2 +-
 pkgs/by-name/ba/batticonplus/package.nix                  | 4 ++--
 pkgs/by-name/bi/bibata-cursors-translucent/package.nix    | 4 ++--
 pkgs/by-name/bi/biscuit-cli/package.nix                   | 2 +-
 pkgs/by-name/bp/bpftop/package.nix                        | 4 ++--
 pkgs/by-name/bt/btor2tools/package.nix                    | 4 ++--
 pkgs/by-name/bu/buildah-unwrapped/package.nix             | 4 ++--
 pkgs/by-name/bw/bws/package.nix                           | 2 +-
 pkgs/by-name/c2/c2fmzq/package.nix                        | 4 ++--
 pkgs/by-name/ca/cagent/package.nix                        | 8 ++++----
 pkgs/by-name/ca/cano/package.nix                          | 4 ++--
 pkgs/by-name/ca/cargo-limit/package.nix                   | 4 ++--
 pkgs/by-name/ca/cargo-rr/package.nix                      | 4 ++--
 pkgs/by-name/ca/cassandra-cpp-driver/package.nix          | 4 ++--
 pkgs/by-name/cd/cdxgen/package.nix                        | 4 ++--
 pkgs/by-name/cf/cfm/package.nix                           | 4 ++--
 pkgs/by-name/ch/chars/package.nix                         | 4 ++--
 36 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/pkgs/applications/office/beancount/beancount-ing-diba.nix b/pkgs/applications/office/beancount/beancount-ing-diba.nix
index e734600ae8a5..c5abcf483e4f 100644
--- a/pkgs/applications/office/beancount/beancount-ing-diba.nix
+++ b/pkgs/applications/office/beancount/beancount-ing-diba.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
 
   src = fetchFromGitHub {
     owner = "siddhantgoel";
-    repo = "beancount-ing-diba";
+    repo = "beancount-ing";
     rev = "v${version}";
     sha256 = "sha256-zjwajl+0ix4wnW0bf4MAuO9Lr9F8sBv87TIL5Ghmlxg=";
   };
@@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   meta = {
-    homepage = "https://github.com/siddhantgoel/beancount-ing-diba";
+    homepage = "https://github.com/siddhantgoel/beancount-ing";
     description = "Beancount Importers for ING-DiBa (Germany) CSV Exports";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ matthiasbeyer ];
diff --git a/pkgs/by-name/_4/_4d-minesweeper/package.nix b/pkgs/by-name/_4/_4d-minesweeper/package.nix
index 27b16a398887..ad9e71aae8b0 100644
--- a/pkgs/by-name/_4/_4d-minesweeper/package.nix
+++ b/pkgs/by-name/_4/_4d-minesweeper/package.nix
@@ -27,8 +27,8 @@ stdenv.mkDerivation {
   version = "2.0";
 
   src = fetchFromGitHub {
-    owner = "gapophustu";
-    repo = "4D-Minesweeper";
+    owner = "Alzager";
+    repo = "4D-Minesweeper-Archived";
     rev = "db176d8aa5981a597bbae6a1a74aeebf0f376df4";
     hash = "sha256-A5QKqCo9TTdzmK13WRSAfkrkeUqHc4yQCzy4ZZ9uX2M=";
   };
@@ -80,7 +80,7 @@ stdenv.mkDerivation {
   dontStrip = true;
 
   meta = {
-    homepage = "https://github.com/gapophustu/4D-Minesweeper";
+    homepage = "https://github.com/Alzager/4D-Minesweeper-Archived";
     description = "4D Minesweeper game written in Godot";
     license = lib.licenses.mpl20;
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/aa/aaa/package.nix b/pkgs/by-name/aa/aaa/package.nix
index 6eba8543a067..b9c5e18dc0d7 100644
--- a/pkgs/by-name/aa/aaa/package.nix
+++ b/pkgs/by-name/aa/aaa/package.nix
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "1.1.1";
 
   src = fetchFromGitHub {
-    owner = "DomesticMoth";
+    owner = "asciimoth";
     repo = "aaa";
     tag = "v${finalAttrs.version}";
     sha256 = "sha256-gIOlPjZOcmVLi9oOn4gBv6F+3Eq6t5b/3fKzoFqxclw=";
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "Terminal viewer for 3a format";
-    homepage = "https://github.com/DomesticMoth/aaa";
+    homepage = "https://github.com/asciimoth/aaa";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ asciimoth ];
     mainProgram = "aaa";
diff --git a/pkgs/by-name/ac/aces-container/package.nix b/pkgs/by-name/ac/aces-container/package.nix
index 121b7a17bbdf..426c38d87c91 100644
--- a/pkgs/by-name/ac/aces-container/package.nix
+++ b/pkgs/by-name/ac/aces-container/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "1.0.2";
 
   src = fetchFromGitHub {
-    owner = "ampas";
+    owner = "aces-aswf";
     repo = "aces_container";
     tag = "v${finalAttrs.version}";
     hash = "sha256-luMqXqlJ6UzoawEDmbK38lm3GHosaZm/mFJntBF54Y4=";
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Reference Implementation of SMPTE ST2065-4";
-    homepage = "https://github.com/ampas/aces_container";
+    homepage = "https://github.com/aces-aswf/aces_container";
     license = lib.licenses.ampas;
     maintainers = with lib.maintainers; [ paperdigits ];
     mainProgram = "aces-container";
diff --git a/pkgs/by-name/ae/aeron-cpp/package.nix b/pkgs/by-name/ae/aeron-cpp/package.nix
index e5bb023800d3..9ba047aae9f3 100644
--- a/pkgs/by-name/ae/aeron-cpp/package.nix
+++ b/pkgs/by-name/ae/aeron-cpp/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
   inherit version;
 
   src = fetchFromGitHub {
-    owner = "real-logic";
+    owner = "aeron-io";
     repo = "aeron";
     tag = version;
     hash = "sha256-sROEZVOfScrlqMLbfrPtw3LQCQ5TfMcrLiP6j/Z9rSM=";
diff --git a/pkgs/by-name/ai/airwave/package.nix b/pkgs/by-name/ai/airwave/package.nix
index e356bc9198de..3c53d3f8f9b9 100644
--- a/pkgs/by-name/ai/airwave/package.nix
+++ b/pkgs/by-name/ai/airwave/package.nix
@@ -19,7 +19,7 @@ multiStdenv.mkDerivation (finalAttrs: {
   version = "1.3.3";
 
   src = fetchFromGitHub {
-    owner = "phantom-code";
+    owner = "psycha0s";
     repo = "airwave";
     tag = finalAttrs.version;
     hash = "sha256-mvT0b0auKiu1T8cbR9RoBT94hKSnXDamqkIQPnUqVq0=";
@@ -55,7 +55,7 @@ multiStdenv.mkDerivation (finalAttrs: {
   # shrinking.
   dontPatchELF = true;
 
-  # Cf. https://github.com/phantom-code/airwave/issues/57
+  # Cf. https://github.com/psycha0s/airwave/issues/57
   hardeningDisable = [ "format" ];
 
   cmakeFlags = [ "-DVSTSDK_PATH=${vst2-sdk}" ];
@@ -78,7 +78,7 @@ multiStdenv.mkDerivation (finalAttrs: {
       protocol to correctly embed the plugin editor into the host
       window.
     '';
-    homepage = "https://github.com/phantom-code/airwave";
+    homepage = "https://github.com/psycha0s/airwave";
     license = lib.licenses.mit;
     platforms = [ "x86_64-linux" ];
     maintainers = with lib.maintainers; [ michalrus ];
diff --git a/pkgs/by-name/am/amass/package.nix b/pkgs/by-name/am/amass/package.nix
index 00893b5cb316..e6bd8dc65538 100644
--- a/pkgs/by-name/am/amass/package.nix
+++ b/pkgs/by-name/am/amass/package.nix
@@ -13,7 +13,7 @@ buildGoModule (finalAttrs: {
   buildInputs = [ libpostalWithData ];
 
   src = fetchFromGitHub {
-    owner = "OWASP";
+    owner = "owasp-amass";
     repo = "Amass";
     tag = "v${finalAttrs.version}";
     hash = "sha256-d4zy64W5cIseOVAaekN5Q4I5WuLz+M/cP7FXQ3CQ+mk=";
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
 
   vendorHash = "sha256-3MpE61ixMps4IRIZkqjzG225zk4fsERkssoNoItUXbQ=";
 
-  # https://github.com/OWASP/Amass/issues/640
+  # https://github.com/owasp-amass/amass/issues/640
   doCheck = false;
 
   meta = {
@@ -35,7 +35,7 @@ buildGoModule (finalAttrs: {
       target networks.
     '';
     homepage = "https://owasp.org/www-project-amass/";
-    changelog = "https://github.com/OWASP/Amass/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/owasp-amass/amass/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       kalbasit
diff --git a/pkgs/by-name/an/anchor/package.nix b/pkgs/by-name/an/anchor/package.nix
index d954b6a130b8..97232abf87d6 100644
--- a/pkgs/by-name/an/anchor/package.nix
+++ b/pkgs/by-name/an/anchor/package.nix
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "1.0.2";
 
   src = fetchFromGitHub {
-    owner = "solana-foundation";
+    owner = "otter-sec";
     repo = "anchor";
     tag = "v${finalAttrs.version}";
     hash = "sha256-J8q+oNT6x36LlTO/szlkxIcT5oFJ3y8b3YyqwBjDYX8=";
@@ -32,8 +32,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "Solana Sealevel Framework";
-    homepage = "https://github.com/solana-foundation/anchor";
-    changelog = "https://github.com/solana-foundation/anchor/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    homepage = "https://github.com/otter-sec/anchor";
+    changelog = "https://github.com/otter-sec/anchor/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       Denommus
diff --git a/pkgs/by-name/an/anup/package.nix b/pkgs/by-name/an/anup/package.nix
index 85128dfc78b2..011e879aa765 100644
--- a/pkgs/by-name/an/anup/package.nix
+++ b/pkgs/by-name/an/anup/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
   version = "0.4.0";
 
   src = fetchFromGitHub {
-    owner = "Acizza";
+    owner = "jonathanlmc";
     repo = "anup";
     tag = version;
     hash = "sha256-4pXF4p4K8+YihVB9NdgT6bOidmQEgWXUbcbvgXJ0IDA=";
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
   ];
 
   meta = {
-    homepage = "https://github.com/Acizza/anup";
+    homepage = "https://github.com/jonathanlmc/anup";
     description = "Anime tracker for AniList featuring a TUI";
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [ natto1784 ];
diff --git a/pkgs/by-name/ap/apftool-rs/package.nix b/pkgs/by-name/ap/apftool-rs/package.nix
index e081bd0ade2c..5524b8dcf583 100644
--- a/pkgs/by-name/ap/apftool-rs/package.nix
+++ b/pkgs/by-name/ap/apftool-rs/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   src = fetchFromGitHub {
     owner = "suyulin";
-    repo = "apftool-rs";
+    repo = "afptool-rs";
     tag = "v${finalAttrs.version}";
     hash = "sha256-bcXZIY0CDyWE3vh04IU3kXRxi/uUm5TD8ifA0jq47rc=";
   };
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "About Tools for Rockchip image unpack tool";
     mainProgram = "apftool-rs";
-    homepage = "https://github.com/suyulin/apftool-rs";
+    homepage = "https://github.com/suyulin/afptool-rs";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ colemickens ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/ap/appindicator-sharp/package.nix b/pkgs/by-name/ap/appindicator-sharp/package.nix
index f5f512103ecc..b61efe3c3176 100644
--- a/pkgs/by-name/ap/appindicator-sharp/package.nix
+++ b/pkgs/by-name/ap/appindicator-sharp/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   version = "0-unstable-2016-01-18";
 
   src = fetchFromGitHub {
-    owner = "stsundermann";
+    owner = "sundermann";
     repo = "appindicator-sharp";
     rev = "5a79cde93da6d68a4b1373f1ce5796c3c5fe1b37";
     sha256 = "sha256:1i0vqbp05l29f5v9ygp7flm4s05pcnn5ivl578mxmhb51s7ncw6l";
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Bindings for appindicator using gobject-introspection";
-    homepage = "https://github.com/stsundermann/appindicator-sharp";
+    homepage = "https://github.com/sundermann/appindicator-sharp";
     license = lib.licenses.lgpl3Only;
     maintainers = with lib.maintainers; [ kevincox ];
   };
diff --git a/pkgs/by-name/ap/apriltag/package.nix b/pkgs/by-name/ap/apriltag/package.nix
index 8eddce4d34db..6438f8e3bac8 100644
--- a/pkgs/by-name/ap/apriltag/package.nix
+++ b/pkgs/by-name/ap/apriltag/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchFromGitHub {
     owner = "AprilRobotics";
-    repo = "AprilTags";
+    repo = "apriltag";
     tag = "v${finalAttrs.version}";
     hash = "sha256-pBUjRKfP884+bNgV5B4b8TiuhyZ9p/jIluxs+idv/28=";
   };
diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix
index 1ddfd45d7f69..021c964b493e 100644
--- a/pkgs/by-name/ar/art/package.nix
+++ b/pkgs/by-name/ar/art/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "1.26.6";
 
   src = fetchFromGitHub {
-    owner = "artpixls";
+    owner = "artraweditor";
     repo = "ART";
     tag = finalAttrs.version;
     hash = "sha256-m5KQUY7loLKH7X2cDw5n7biH1GJTVONTbguILdjNWrI=";
diff --git a/pkgs/by-name/as/assh/package.nix b/pkgs/by-name/as/assh/package.nix
index c7e988f70bd5..fcc73d99955a 100644
--- a/pkgs/by-name/as/assh/package.nix
+++ b/pkgs/by-name/as/assh/package.nix
@@ -13,7 +13,7 @@ buildGoModule (finalAttrs: {
   version = "2.17.2";
 
   src = fetchFromGitHub {
-    repo = "advanced-ssh-config";
+    repo = "assh";
     owner = "moul";
     tag = "v${finalAttrs.version}";
     hash = "sha256-/w4RluA7py6d75S04czNsgHpmR5rmAUZx8OnZfu9oNg=";
diff --git a/pkgs/by-name/as/async-profiler/package.nix b/pkgs/by-name/as/async-profiler/package.nix
index dbe0d483fa63..853007379864 100644
--- a/pkgs/by-name/as/async-profiler/package.nix
+++ b/pkgs/by-name/as/async-profiler/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "4.3";
 
   src = fetchFromGitHub {
-    owner = "jvm-profiling-tools";
+    owner = "async-profiler";
     repo = "async-profiler";
     tag = "v${finalAttrs.version}";
     hash = "sha256-wysOjirCfxm0SmwDW7GS+S73lAT8/0g4avu7T5+qy2Q=";
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Low overhead sampling profiler for Java that does not suffer from Safepoint bias problem";
-    homepage = "https://github.com/jvm-profiling-tools/async-profiler";
+    homepage = "https://github.com/async-profiler/async-profiler";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ mschuwalow ];
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/au/audiness/package.nix b/pkgs/by-name/au/audiness/package.nix
index 1db6cc238282..ad2e62c31d3d 100644
--- a/pkgs/by-name/au/audiness/package.nix
+++ b/pkgs/by-name/au/audiness/package.nix
@@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "audiusGmbH";
+    owner = "audius";
     repo = "audiness";
     tag = finalAttrs.version;
     hash = "sha256-zru37eNQyY9AcbALge1qlINuxzVKq3RTNypm5Pyhkz8=";
diff --git a/pkgs/by-name/au/ausweisapp/package.nix b/pkgs/by-name/au/ausweisapp/package.nix
index b2c982e2e148..02c0b05123f4 100644
--- a/pkgs/by-name/au/ausweisapp/package.nix
+++ b/pkgs/by-name/au/ausweisapp/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchFromGitHub {
     owner = "Governikus";
-    repo = "AusweisApp2";
+    repo = "AusweisApp";
     rev = finalAttrs.version;
     hash = "sha256-pr41KbejZCOvfXH2uHO5MA/VklSNU38EL6AgznvGqeY=";
   };
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Official authentication app for German ID card and residence permit";
-    downloadPage = "https://github.com/Governikus/AusweisApp2/releases";
+    downloadPage = "https://github.com/Governikus/AusweisApp/releases";
     homepage = "https://www.ausweisapp.bund.de/open-source-software";
     license = lib.licenses.eupl12;
     mainProgram = "AusweisApp";
diff --git a/pkgs/by-name/av/avizo/package.nix b/pkgs/by-name/av/avizo/package.nix
index b7e53f49079c..cbf8dde57f9f 100644
--- a/pkgs/by-name/av/avizo/package.nix
+++ b/pkgs/by-name/av/avizo/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   version = "1.3-unstable-2024-11-03";
 
   src = fetchFromGitHub {
-    owner = "misterdanb";
+    owner = "heyjuvi";
     repo = "avizo";
     rev = "5efaa22968b2cc1a3c15a304cac3f22ec2727b17";
     sha256 = "sha256-KYQPHVxjvqKt4d7BabplnrXP30FuBQ6jQ1NxzR5U7qI=";
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Neat notification daemon for Wayland";
-    homepage = "https://github.com/misterdanb/avizo";
+    homepage = "https://github.com/heyjuvi/avizo";
     license = lib.licenses.gpl3;
     platforms = lib.platforms.linux;
     maintainers = [
diff --git a/pkgs/by-name/aw/aws-rotate-key/package.nix b/pkgs/by-name/aw/aws-rotate-key/package.nix
index 86ecc79b1e7b..aad03a7e5992 100644
--- a/pkgs/by-name/aw/aws-rotate-key/package.nix
+++ b/pkgs/by-name/aw/aws-rotate-key/package.nix
@@ -11,7 +11,7 @@ buildGoModule (finalAttrs: {
   version = "1.2.0";
 
   src = fetchFromGitHub {
-    owner = "Fullscreen";
+    owner = "stefansundin";
     repo = "aws-rotate-key";
     rev = "v${finalAttrs.version}";
     sha256 = "sha256-fYpgHHOw0k/8WLGhq+uVOvoF4Wff6wzTXuN8r4D+TmU=";
@@ -31,7 +31,7 @@ buildGoModule (finalAttrs: {
 
   meta = {
     description = "Easily rotate your AWS key";
-    homepage = "https://github.com/Fullscreen/aws-rotate-key";
+    homepage = "https://github.com/stefansundin/aws-rotate-key";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.mbode ];
     mainProgram = "aws-rotate-key";
diff --git a/pkgs/by-name/ba/bash-my-aws/package.nix b/pkgs/by-name/ba/bash-my-aws/package.nix
index fe9655631632..31dab3aea160 100644
--- a/pkgs/by-name/ba/bash-my-aws/package.nix
+++ b/pkgs/by-name/ba/bash-my-aws/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   version = "0-unstable-2025-01-22";
 
   src = fetchFromGitHub {
-    owner = "bash-my-aws";
+    owner = "mbailey";
     repo = "bash-my-aws";
     rev = "d338b43cc215719c1853ec500c946db6b9caaa11";
     sha256 = "sha256-PR52T6XCrakQsBOJXf0PaYpYE5oMcIz5UDA4I9B7C38=";
diff --git a/pkgs/by-name/ba/batticonplus/package.nix b/pkgs/by-name/ba/batticonplus/package.nix
index 6794b2346788..b54560eb354b 100644
--- a/pkgs/by-name/ba/batticonplus/package.nix
+++ b/pkgs/by-name/ba/batticonplus/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "2.0.1";
 
   src = fetchFromGitHub {
-    owner = "artist4xlibre";
+    owner = "artist4artixlinux";
     repo = "batticonplus";
     tag = "v${finalAttrs.version}";
     hash = "sha256-H9ZoiQ5zWMIoWWol2a6f9Z8g4o9DIHYdF+/nEsBfuzc=";
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Lightweight battery status icon for the system tray and notifier (based on cbatticon)";
     mainProgram = "batticonplus";
-    homepage = "https://github.com/artist4xlibre/batticonplus";
+    homepage = "https://github.com/artist4artixlinux/batticonplus";
     license = lib.licenses.gpl2;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ yechielw ];
diff --git a/pkgs/by-name/bi/bibata-cursors-translucent/package.nix b/pkgs/by-name/bi/bibata-cursors-translucent/package.nix
index 97798aeeaea9..ed1f4b8457a3 100644
--- a/pkgs/by-name/bi/bibata-cursors-translucent/package.nix
+++ b/pkgs/by-name/bi/bibata-cursors-translucent/package.nix
@@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation rec {
   version = "1.1.2";
 
   src = fetchFromGitHub {
-    owner = "Silicasandwhich";
+    owner = "silica-dev";
     repo = "Bibata_Cursor_Translucent";
     rev = "v${version}";
     sha256 = "sha256-RroynJfdFpu+Wl9iw9NrAc9wNZsSxWI+heJXUTwEe7s=";
@@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = {
     description = "Translucent Varient of the Material Based Cursor";
-    homepage = "https://github.com/Silicasandwhich/Bibata_Cursor_Translucent";
+    homepage = "https://github.com/silica-dev/Bibata_Cursor_Translucent";
     license = lib.licenses.gpl3;
     platforms = lib.platforms.linux;
     maintainers = [ ];
diff --git a/pkgs/by-name/bi/biscuit-cli/package.nix b/pkgs/by-name/bi/biscuit-cli/package.nix
index e3d4d3e5bba4..f348b027fff4 100644
--- a/pkgs/by-name/bi/biscuit-cli/package.nix
+++ b/pkgs/by-name/bi/biscuit-cli/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "0.6.0";
 
   src = fetchFromGitHub {
-    owner = "biscuit-auth";
+    owner = "eclipse-biscuit";
     repo = "biscuit-cli";
     tag = finalAttrs.version;
     sha256 = "sha256-s4Y4MhM79Z+4VxB03+56OqRQJaSHj2VQEJcL6CsT+2k=";
diff --git a/pkgs/by-name/bp/bpftop/package.nix b/pkgs/by-name/bp/bpftop/package.nix
index a14cf703bc75..2f0fdc1f1417 100644
--- a/pkgs/by-name/bp/bpftop/package.nix
+++ b/pkgs/by-name/bp/bpftop/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: {
   version = "0.9.0";
 
   src = fetchFromGitHub {
-    owner = "Netflix";
+    owner = "jfernandez";
     repo = "bpftop";
     tag = "v${finalAttrs.version}";
     hash = "sha256-QukcBq80tASPSHRg1yRouYiZqvca+ipp6RGzXqP2CwA=";
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: {
 
   meta = {
     description = "Dynamic real-time view of running eBPF programs";
-    homepage = "https://github.com/Netflix/bpftop";
+    homepage = "https://github.com/jfernandez/bpftop";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       _0x4A6F
diff --git a/pkgs/by-name/bt/btor2tools/package.nix b/pkgs/by-name/bt/btor2tools/package.nix
index 1ca0da27c480..df035412163a 100644
--- a/pkgs/by-name/bt/btor2tools/package.nix
+++ b/pkgs/by-name/bt/btor2tools/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   version = "0-unstable-2025-09-18";
 
   src = fetchFromGitHub {
-    owner = "boolector";
+    owner = "hwmcc";
     repo = "btor2tools";
     rev = "d33c73ff1d173f1bfac8ba6b1c6d68ba62c55f8e";
     sha256 = "sha256-RVjZ5HM2yQ3eAICFuzwvNeQDXzWzzSiCCslIWMJi6U8=";
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Generic parser and tool package for the BTOR2 format";
-    homepage = "https://github.com/Boolector/btor2tools";
+    homepage = "https://github.com/hwmcc/btor2tools";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ thoughtpolice ];
diff --git a/pkgs/by-name/bu/buildah-unwrapped/package.nix b/pkgs/by-name/bu/buildah-unwrapped/package.nix
index 079a9ed5233a..fd809eab061b 100644
--- a/pkgs/by-name/bu/buildah-unwrapped/package.nix
+++ b/pkgs/by-name/bu/buildah-unwrapped/package.nix
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
   version = "1.44.0";
 
   src = fetchFromGitHub {
-    owner = "containers";
+    owner = "podman-container-tools";
     repo = "buildah";
     tag = "v${finalAttrs.version}";
     hash = "sha256-/Rv5la54ikmP4qVT19tg0sv0kM+xpQO6w9XU1PpGFk4=";
@@ -80,7 +80,7 @@ buildGoModule (finalAttrs: {
     description = "Tool which facilitates building OCI images";
     mainProgram = "buildah";
     homepage = "https://buildah.io/";
-    changelog = "https://github.com/containers/buildah/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/podman-container-tools/buildah/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
     teams = [ lib.teams.podman ];
   };
diff --git a/pkgs/by-name/bw/bws/package.nix b/pkgs/by-name/bw/bws/package.nix
index 51a2efbf458c..2af6f2f6a3bb 100644
--- a/pkgs/by-name/bw/bws/package.nix
+++ b/pkgs/by-name/bw/bws/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   src = fetchFromGitHub {
     owner = "bitwarden";
-    repo = "sdk";
+    repo = "sdk-sm";
     tag = "bws-v${finalAttrs.version}";
     hash = "sha256-cdiTdgNvUDN0/KzMDEiHo+GIYkUaWEZTAnWahBrMZ4I=";
   };
diff --git a/pkgs/by-name/c2/c2fmzq/package.nix b/pkgs/by-name/c2/c2fmzq/package.nix
index f281bf221466..c3dd1ea6ff50 100644
--- a/pkgs/by-name/c2/c2fmzq/package.nix
+++ b/pkgs/by-name/c2/c2fmzq/package.nix
@@ -11,7 +11,7 @@ buildGoModule (finalAttrs: {
 
   src = fetchFromGitHub {
     owner = "c2FmZQ";
-    repo = "c2FmZQ";
+    repo = "photos";
     rev = "v${finalAttrs.version}";
     hash = "sha256-qIJnrMqsaa7GcsJpyWHhi6nea72XCQy5BaGWBtQKzFo=";
   };
@@ -34,7 +34,7 @@ buildGoModule (finalAttrs: {
 
   meta = {
     description = "Securely encrypt, store, and share files, including but not limited to pictures and videos";
-    homepage = "https://github.com/c2FmZQ/c2FmZQ";
+    homepage = "https://github.com/c2FmZQ/photos";
     license = lib.licenses.gpl3Only;
     mainProgram = "c2FmZQ-server";
     maintainers = with lib.maintainers; [ hmenke ];
diff --git a/pkgs/by-name/ca/cagent/package.nix b/pkgs/by-name/ca/cagent/package.nix
index 2dc3bc531adf..9d78f5b954e0 100644
--- a/pkgs/by-name/ca/cagent/package.nix
+++ b/pkgs/by-name/ca/cagent/package.nix
@@ -12,7 +12,7 @@ buildGoModule (finalAttrs: {
 
   src = fetchFromGitHub {
     owner = "docker";
-    repo = "cagent";
+    repo = "docker-agent";
     tag = "v${finalAttrs.version}";
     hash = "sha256-jcJxzdtU0Zzov7EKvJCxgbrfwMcI4k7OgHVrb5S4fs8=";
   };
@@ -44,9 +44,9 @@ buildGoModule (finalAttrs: {
       orchestrates AI agents with specialized capabilities and tools,
       and the interactions between agents.
     '';
-    homepage = "https://github.com/docker/cagent";
-    changelog = "https://github.com/docker/cagent/releases/tag/v${finalAttrs.version}";
-    downloadPage = "https://github.com/docker/cagent/releases";
+    homepage = "https://github.com/docker/docker-agent";
+    changelog = "https://github.com/docker/docker-agent/releases/tag/v${finalAttrs.version}";
+    downloadPage = "https://github.com/docker/docker-agent/releases";
     license = lib.licenses.asl20;
     mainProgram = "cagent";
     maintainers = with lib.maintainers; [ MH0386 ];
diff --git a/pkgs/by-name/ca/cano/package.nix b/pkgs/by-name/ca/cano/package.nix
index a72f49c789d1..05c97651f73f 100644
--- a/pkgs/by-name/ca/cano/package.nix
+++ b/pkgs/by-name/ca/cano/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "0.2.0-alpha";
 
   src = fetchFromGitHub {
-    owner = "CobbCoding1";
+    owner = "Cano-Projects";
     repo = "Cano";
     tag = "v${finalAttrs.version}";
     hash = "sha256-OaWj0AKw3+sEhcAbIjgOLfxwCKRG6O1k+zSp0GnnFn8=";
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Text Editor Written In C Using ncurses";
-    homepage = "https://github.com/CobbCoding1/Cano";
+    homepage = "https://github.com/Cano-Projects/Cano";
     license = lib.licenses.asl20;
     mainProgram = "Cano";
     maintainers = with lib.maintainers; [ sigmanificient ];
diff --git a/pkgs/by-name/ca/cargo-limit/package.nix b/pkgs/by-name/ca/cargo-limit/package.nix
index 67423af6955c..e0121e37ba44 100644
--- a/pkgs/by-name/ca/cargo-limit/package.nix
+++ b/pkgs/by-name/ca/cargo-limit/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "0.0.10";
 
   src = fetchFromGitHub {
-    owner = "alopatindev";
+    owner = "cargo-limit";
     repo = "cargo-limit";
     tag = finalAttrs.version;
     sha256 = "sha256-joWDB9fhCsYVZFZdr+Gfm4JaRlm5kj+CHp34Sx5iQYk=";
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "Cargo subcommand \"limit\": reduces the noise of compiler messages";
-    homepage = "https://github.com/alopatindev/cargo-limit";
+    homepage = "https://github.com/cargo-limit/cargo-limit";
     license = with lib.licenses; [
       asl20 # or
       mit
diff --git a/pkgs/by-name/ca/cargo-rr/package.nix b/pkgs/by-name/ca/cargo-rr/package.nix
index f5bed75d5018..f7bd9d935d2b 100644
--- a/pkgs/by-name/ca/cargo-rr/package.nix
+++ b/pkgs/by-name/ca/cargo-rr/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "0.3.0";
 
   src = fetchFromGitHub {
-    owner = "danielzfranklin";
+    owner = "dzfranklin";
     repo = "cargo-rr";
     rev = "v${finalAttrs.version}";
     sha256 = "sha256-t8pRqeOdaRVG0titQhxezT2aDjljSs//MnRTTsJ73Yo=";
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Cargo subcommand \"rr\": a light wrapper around rr, the time-travelling debugger";
     mainProgram = "cargo-rr";
-    homepage = "https://github.com/danielzfranklin/cargo-rr";
+    homepage = "https://github.com/dzfranklin/cargo-rr";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [
       otavio
diff --git a/pkgs/by-name/ca/cassandra-cpp-driver/package.nix b/pkgs/by-name/ca/cassandra-cpp-driver/package.nix
index c74f13db2708..0e7b52c9a7de 100644
--- a/pkgs/by-name/ca/cassandra-cpp-driver/package.nix
+++ b/pkgs/by-name/ca/cassandra-cpp-driver/package.nix
@@ -15,8 +15,8 @@ stdenv.mkDerivation (finalAttrs: {
   version = "2.17.1";
 
   src = fetchFromGitHub {
-    owner = "datastax";
-    repo = "cpp-driver";
+    owner = "apache";
+    repo = "cassandra-cpp-driver";
     tag = finalAttrs.version;
     sha256 = "sha256-GuvmKHJknudyn7ahrn/8+kKUA4NW5UjCfkYoX3aTE+Q=";
   };
diff --git a/pkgs/by-name/cd/cdxgen/package.nix b/pkgs/by-name/cd/cdxgen/package.nix
index 2f5f1e410631..28229632c32b 100644
--- a/pkgs/by-name/cd/cdxgen/package.nix
+++ b/pkgs/by-name/cd/cdxgen/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "11.10.0";
 
   src = fetchFromGitHub {
-    owner = "CycloneDX";
+    owner = "cdxgen";
     repo = "cdxgen";
     tag = "v${finalAttrs.version}";
     hash = "sha256-RmgR6OfNrZUYFyn36zTHERIHlzszaFqTX8b4Rf2TF/U=";
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Creates CycloneDX Software Bill-of-Materials (SBOM) for your projects from source and container images";
     mainProgram = "cdxgen";
-    homepage = "https://github.com/CycloneDX/cdxgen";
+    homepage = "https://github.com/cdxgen/cdxgen";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       quincepie
diff --git a/pkgs/by-name/cf/cfm/package.nix b/pkgs/by-name/cf/cfm/package.nix
index 5a7cd9d625d9..753d24f3bb40 100644
--- a/pkgs/by-name/cf/cfm/package.nix
+++ b/pkgs/by-name/cf/cfm/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "0.6.6";
 
   src = fetchFromGitHub {
-    owner = "willeccles";
+    owner = "sophec";
     repo = "cfm";
     rev = "v${finalAttrs.version}";
     sha256 = "sha256-uXL0RO9P+NYSZ0xCv91KzjHOJJI500YUT8IJkFS86pE=";
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   meta = {
-    homepage = "https://github.com/willeccles/cfm";
+    homepage = "https://github.com/sophec/cfm";
     description = "Simple and fast TUI file manager with no dependencies";
     license = lib.licenses.mpl20;
     maintainers = [ ];
diff --git a/pkgs/by-name/ch/chars/package.nix b/pkgs/by-name/ch/chars/package.nix
index 4f4c7f552380..f5ee6393b10a 100644
--- a/pkgs/by-name/ch/chars/package.nix
+++ b/pkgs/by-name/ch/chars/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "0.7.0";
 
   src = fetchFromGitHub {
-    owner = "antifuchs";
+    owner = "boinkor-net";
     repo = "chars";
     rev = "v${finalAttrs.version}";
     sha256 = "sha256-mBtwdPzIc6RgEFTyReStFlhS4UhhRWjBTKT6gD3tzpQ=";
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Commandline tool to display information about unicode characters";
     mainProgram = "chars";
-    homepage = "https://github.com/antifuchs/chars";
+    homepage = "https://github.com/boinkor-net/chars";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ bbigras ];
   };

From d361ab53b7af4c95d52ed7ad858dbdf450080872 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jun 2026 22:01:13 +0000
Subject: [PATCH 194/197] libretro.snes9x2010: 0-unstable-2026-06-15 ->
 0-unstable-2026-06-29

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

diff --git a/pkgs/applications/emulators/libretro/cores/snes9x2010.nix b/pkgs/applications/emulators/libretro/cores/snes9x2010.nix
index 5ff0ec0c70e8..c332930e84f4 100644
--- a/pkgs/applications/emulators/libretro/cores/snes9x2010.nix
+++ b/pkgs/applications/emulators/libretro/cores/snes9x2010.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore rec {
   core = "snes9x2010";
-  version = "0-unstable-2026-06-15";
+  version = "0-unstable-2026-06-29";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "snes9x2010";
-    rev = "2f6beca3ada61bdb4dabf7afe8cb9293a699224a";
-    hash = "sha256-iM1xR4g3Bhv2XTj+CNA/KY3grjacrPfjpf/jfJkwYbs=";
+    rev = "8b34285807d4825a5ab34b67f0c9d0a780a955c8";
+    hash = "sha256-VF9ScwineHNAd7Poj6/U5KEL6uUMhXLmR8nJS9vDSXk=";
   };
 
   makeFlags = [ "GIT_VERSION=${builtins.substring 0 7 src.rev}" ];

From a4b490dcf52b7087feb8cddb5815d2b597ddac8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 1 Jul 2026 00:14:06 +0200
Subject: [PATCH 195/197] 
 home-assistant-custom-lovelace-modules.weather-radar-card: 3.7.0 -> 3.7.1

Diff: https://github.com/jpettitt/weather-radar-card/compare/v3.7.0...v3.7.1

Changelog: https://github.com/jpettitt/weather-radar-card/blob/refs/tags/v3.7.1/CHANGELOG.md
---
 .../custom-lovelace-modules/weather-radar-card/package.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/weather-radar-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/weather-radar-card/package.nix
index 3cbdb19ab8f9..378aabf760f8 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/weather-radar-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/weather-radar-card/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "weather-radar-card";
-  version = "3.7.0";
+  version = "3.7.1";
 
   src = fetchFromGitHub {
     owner = "jpettitt";
     repo = "weather-radar-card";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZEd27lt5S7pnGGzTnxLV6voEpzXjvRjubjmusLuISZg=";
+    hash = "sha256-FdLphMRZAAFBg0jD2oQT0AQgBaUryX4Deaw3LmywPMs=";
   };
 
   postPatch = ''
@@ -23,7 +23,7 @@ buildNpmPackage (finalAttrs: {
 
   npmDepsFetcherVersion = 2;
   npmFlags = [ "--legacy-peer-deps" ];
-  npmDepsHash = "sha256-S3PZOcKBseohCKOUSRFCQj6fAJTrZLRD5916iB35rrc=";
+  npmDepsHash = "sha256-SWb9LYbGXu/ga8Q0+g2s7I3gTCsEgAvDwWoB7EMdiko=";
 
   installPhase = ''
     runHook preInstall

From 78c7213fe44b1db49ea2d772b80b3f8cddf42edf Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 30 Jun 2026 22:18:29 +0000
Subject: [PATCH 196/197] radicle-ci-broker: 0.28.1 -> 0.29.0

Changelog: https://radicle.network/nodes/seed.radicle.dev/rad:zwTxygwuz5LDGBq255RA2CbNGrz8/tree/NEWS.md
---
 pkgs/by-name/ra/radicle-ci-broker/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ra/radicle-ci-broker/package.nix b/pkgs/by-name/ra/radicle-ci-broker/package.nix
index 432601db7dc9..daf521221751 100644
--- a/pkgs/by-name/ra/radicle-ci-broker/package.nix
+++ b/pkgs/by-name/ra/radicle-ci-broker/package.nix
@@ -14,14 +14,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "radicle-ci-broker";
-  version = "0.28.1";
+  version = "0.29.0";
 
   src = fetchFromRadicle {
     seed = "seed.radicle.dev";
     repo = "zwTxygwuz5LDGBq255RA2CbNGrz8";
     node = "z6MkgEMYod7Hxfy9qCvDv5hYHkZ4ciWmLFgfvm3Wn1b2w2FV";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6jCMphwVhRgtLpUWBLwsODgR41wl27hyzbMdDjMISfM=";
+    hash = "sha256-QivsYWg88dyS3dxeMvXojRbxFyDAEpKkHZzcY85Lwjo=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse --short HEAD > $out/.git_head
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
   };
 
-  cargoHash = "sha256-fZwvjpTWWbHDSSI1tXF1JhyvZnIfP4p601GoVBJwR8k=";
+  cargoHash = "sha256-o2h+XDKt7611j8PtTIyio7lJyc2VioFINb69mW/sxEk=";
 
   postPatch = ''
     substituteInPlace build.rs \

From af1ab66a5b69e6cf7ae76b989936ff85ed8b3f9d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jul 2026 00:15:56 +0000
Subject: [PATCH 197/197] 
 terraform-providers.opentelekomcloud_opentelekomcloud: 1.36.69 -> 1.36.70

---
 .../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 07e41b87de12..bb0eba69df11 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1040,13 +1040,13 @@
     "vendorHash": "sha256-ofzbDmivXgH1i1Gjhpyp0bk3FDs5SnxwoRuNAWyMqyI="
   },
   "opentelekomcloud_opentelekomcloud": {
-    "hash": "sha256-HrqJQso8wWF7+WiQUNtR522lCpz5pYZIq2Q3RZkakU0=",
+    "hash": "sha256-aXFdUlaraWRgII24Xw4YvutXOzwLRJWeBw86KqvpDl8=",
     "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
     "owner": "opentelekomcloud",
     "repo": "terraform-provider-opentelekomcloud",
-    "rev": "v1.36.69",
+    "rev": "v1.36.70",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-4Kndye/lGV0IjSyaOpJsj6pP0Hznf20LFQvEwY3+ajE="
+    "vendorHash": "sha256-deBcSjCP+MGgM9Imf+C4Kh/emlUohmmjb3D6sYjCxeA="
   },
   "opsgenie_opsgenie": {
     "hash": "sha256-Y67kcg/ovvZc22l1CBz0Mqu7DAIit5F0jQNfQrl2EGI=",