From 30bf82ff5abf0563e48b27431cc9a1eab49eedba Mon Sep 17 00:00:00 2001
From: Alexander Wauck <awauck@sensonix.com>
Date: Thu, 9 Apr 2026 10:02:01 -0500
Subject: [PATCH 001/151] surf: fix build and force use of X11

The latest version of surf from upstream git has support for webkitgtk-4.1,
but it will crash on startup if allowed to run as a Wayland application
(which any gtk3 app will happily do).  So, I forced GDK_BACKEND=x11 in the
wrapper as an interim solution until surf fully supports Wayland.
---
 pkgs/by-name/su/surf/package.nix | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/su/surf/package.nix b/pkgs/by-name/su/surf/package.nix
index d7e31c56d772..83e8f47c450e 100644
--- a/pkgs/by-name/su/surf/package.nix
+++ b/pkgs/by-name/su/surf/package.nix
@@ -8,9 +8,8 @@
   gcr,
   glib-networking,
   gsettings-desktop-schemas,
-  gtk2,
-  libsoup_2_4,
-  # webkitgtk_4_0,
+  gtk3,
+  libsoup_3,
   webkitgtk_4_1,
   xprop,
   dmenu,
@@ -20,16 +19,15 @@
   gst_all_1,
   patches ? null,
 }:
-
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "surf";
-  version = "2.1";
+  version = "2.1-unstable-2025-04-19";
 
   # tarball is missing file common.h
   src = fetchgit {
     url = "git://git.suckless.org/surf";
-    rev = version;
-    sha256 = "1v926hiayddylq79n8l7dy51bm0dsa9n18nx9bkhg666cx973x4z";
+    rev = "48517e586cdc98bc1af7115674b554cc70c8bc2e";
+    hash = "sha256-+qg1mF5X/hYxCy7N3CxIEM2yHi1jmUGiK/vaQBjKy1I=";
   };
 
   nativeBuildInputs = [
@@ -41,9 +39,9 @@ stdenv.mkDerivation rec {
     gcr
     glib-networking
     gsettings-desktop-schemas
-    gtk2
-    libsoup_2_4
-    # webkitgtk_4_0
+    libsoup_3
+    gtk3
+    webkitgtk_4_1
   ]
   ++ (with gst_all_1; [
     # Audio & video support for webkitgtk WebView
@@ -72,13 +70,11 @@ stdenv.mkDerivation rec {
     ''
       gappsWrapperArgs+=(
         --suffix PATH : ${depsPath}
+        --set GDK_BACKEND x11
       )
     '';
 
   meta = {
-    # webkitgtk_4_0 was removed. master is supposed to support 4.1
-    # but it crashes with BadWindow X Error
-    broken = true;
     description = "Simple web browser based on WebKitGTK";
     mainProgram = "surf";
     longDescription = ''

From e7d8ed1a7851591e48566c63c3b6d6b1dc60df81 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Apr 2026 16:20:56 +0000
Subject: [PATCH 002/151] python3Packages.rigour: 1.7.5 -> 1.8.2

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

diff --git a/pkgs/development/python-modules/rigour/default.nix b/pkgs/development/python-modules/rigour/default.nix
index 8d11aa9d9b2f..969e0cf5d256 100644
--- a/pkgs/development/python-modules/rigour/default.nix
+++ b/pkgs/development/python-modules/rigour/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "rigour";
-  version = "1.7.5";
+  version = "1.8.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "opensanctions";
     repo = "rigour";
     tag = "v${version}";
-    hash = "sha256-n7GlxBU3aOTfy/vXPEXRv106W6Es7S07Da1589IlwBA=";
+    hash = "sha256-Rh1JCLj1lSwsSrhXaBlQBdBTnG33LVJd1nAOx4mReyo=";
   };
 
   build-system = [

From 5bfa313fb72d132501807b1330bbd035fc63a8ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=B1=E4=B8=8B?= <git@yamashit.ax>
Date: Sat, 2 May 2026 09:07:48 +0900
Subject: [PATCH 003/151] tableplus: 538 -> 662

---
 pkgs/by-name/ta/tableplus/darwin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ta/tableplus/darwin.nix b/pkgs/by-name/ta/tableplus/darwin.nix
index 3326898505e0..ac8d30926499 100644
--- a/pkgs/by-name/ta/tableplus/darwin.nix
+++ b/pkgs/by-name/ta/tableplus/darwin.nix
@@ -7,10 +7,10 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tableplus";
-  version = "538";
+  version = "662";
   src = fetchurl {
-    url = "https://download.tableplus.com/macos/${finalAttrs.version}/TablePlus.dmg";
-    hash = "sha256-db3dvjEzkqWrEO+lXyImk0cVBkh8MnCwHOYKIg+kRC4=";
+    url = "https://files.tableplus.com/macos/${finalAttrs.version}/TablePlus.dmg";
+    hash = "sha256-VR0sSTZfRjjv+p4DcYciKBJG5DHIwj4KLhTHPGRsSX0=";
   };
 
   sourceRoot = "TablePlus.app";

From d0d9909d8b691bec16f3e38b1bc03872109e1902 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 May 2026 17:41:41 +0000
Subject: [PATCH 004/151] konbucase: 4.4.0 -> 4.5.1

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

diff --git a/pkgs/by-name/ko/konbucase/package.nix b/pkgs/by-name/ko/konbucase/package.nix
index 128c00ba78bf..9097e6a19543 100644
--- a/pkgs/by-name/ko/konbucase/package.nix
+++ b/pkgs/by-name/ko/konbucase/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "konbucase";
-  version = "4.4.0";
+  version = "4.5.1";
 
   src = fetchFromGitHub {
     owner = "ryonakano";
     repo = "konbucase";
     tag = finalAttrs.version;
-    hash = "sha256-56P2RueZSsuQth8IB73r3WYXCQ+rEyfQpGXhLAAeFlY=";
+    hash = "sha256-MD+hWZ2+gDuaXdqPUMwbROEzvUgq/YcxGjbz+1fkI9M=";
     fetchSubmodules = true;
   };
 

From d8ce396858320ad3241638a15c826126639f5dc6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 May 2026 12:35:48 +0000
Subject: [PATCH 005/151] libminc: 2.4.07 -> 2.5.0

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

diff --git a/pkgs/by-name/li/libminc/package.nix b/pkgs/by-name/li/libminc/package.nix
index ba6f273c3e70..1d6cc99e9f5c 100644
--- a/pkgs/by-name/li/libminc/package.nix
+++ b/pkgs/by-name/li/libminc/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libminc";
-  version = "2.4.07";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "BIC-MNI";
     repo = "libminc";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-F5c0S4fybkrdpDJQ0nz6MvTdjq1qM1nJVxXuxXbCeSI=";
+    hash = "sha256-IQS8JDkZwLR73I5GpWKRT07zj7Ek2tdZ2TOjy02OjaQ=";
   };
 
   postPatch = ''

From 255aa6d6620f54b7e807ba0925e4d24419313eb6 Mon Sep 17 00:00:00 2001
From: George Shammas <george@shamm.as>
Date: Thu, 21 May 2026 07:34:46 -0400
Subject: [PATCH 006/151] yarn-berry-fetchers: Allow impure env vars

---
 pkgs/by-name/ya/yarn-berry/fetcher/fetch-yarn-berry-deps.nix | 2 ++
 pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-fetcher.nix    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/by-name/ya/yarn-berry/fetcher/fetch-yarn-berry-deps.nix b/pkgs/by-name/ya/yarn-berry/fetcher/fetch-yarn-berry-deps.nix
index f54ba6291c82..66cc92ab8bec 100644
--- a/pkgs/by-name/ya/yarn-berry/fetcher/fetch-yarn-berry-deps.nix
+++ b/pkgs/by-name/ya/yarn-berry/fetcher/fetch-yarn-berry-deps.nix
@@ -47,6 +47,8 @@ stdenv.mkDerivation (
       cacert
     ];
 
+    impureEnvVars = lib.fetchers.proxyImpureEnvVars;
+
     buildPhase = ''
       runHook preBuild
 
diff --git a/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-fetcher.nix b/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-fetcher.nix
index 2ab308b5901c..6f11739cfc1d 100644
--- a/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-fetcher.nix
+++ b/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-fetcher.nix
@@ -28,6 +28,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   env.YARN_ZIP_SUPPORTED_CACHE_VERSION = berryCacheVersion;
   env.LIBZIP_SYS_USE_PKG_CONFIG = 1;
 
+  impureEnvVars = lib.fetchers.proxyImpureEnvVars;
+
   nativeBuildInputs = [
     rustPlatform.bindgenHook
     pkg-config

From 25f9394b8a6cb5273d8650bfea949e8f690dc12d Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Mon, 25 May 2026 11:04:25 +0300
Subject: [PATCH 007/151] ci/eval/compare: show performance comparison even
 when package sets differ

Previously the eval comparison was skipped entirely when packages were
added or removed between revisions, leaving only a "stats were skipped"
message. cmp-stats already joins on the stats chunks present in both
revisions, so a comparison can still be produced. Always run it and add
a GitHub note caveating that the figures are approximate when the
package sets differ.

Assisted-by: claude-code with claude-opus-4-7[1m]-xhigh
---
 ci/eval/compare/default.nix | 43 ++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index e596b6d1994f..856969ee8695 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -238,34 +238,33 @@ runCommand "compare"
       jq -r -f ${./generate-step-summary.jq} < ${changed-paths}
     } >> $out/step-summary.md
 
-    if jq -e '(.attrdiff.added | length == 0) and (.attrdiff.removed | length == 0)' "${changed-paths}" > /dev/null; then
-      # Chunks have changed between revisions
-      # We cannot generate a performance comparison
-      {
-        echo
-        echo "# Performance comparison"
-        echo
-        echo "This compares the performance of this branch against its pull request base branch (e.g., 'master')"
-        echo
-        echo "For further help please refer to: [ci/README.md](https://github.com/NixOS/nixpkgs/blob/master/ci/README.md)"
-        echo
-      } >> $out/step-summary.md
+    {
+      echo
+      echo "# Performance comparison"
+      echo
+      echo "This compares the performance of this branch against its pull request base branch (e.g., 'master')"
+      echo
+    } >> $out/step-summary.md
 
-      cmp-stats --explain ${combined}/before/stats ${combined}/after/stats >> $out/step-summary.md
-
-    else
-      # Package chunks are the same in both revisions
-      # We can use the to generate a performance comparison
+    # cmp-stats only compares the stats chunks present in both revisions, so the
+    # comparison is still produced when packages were added/removed. The paired
+    # chunks may cover different attrs in that case, so caveat the figures.
+    if ! jq -e '(.attrdiff.added | length == 0) and (.attrdiff.removed | length == 0)' "${changed-paths}" > /dev/null; then
       {
+        echo "> [!NOTE]"
+        echo "> The package sets differ between the two revisions. This comparison only"
+        echo "> covers packages evaluated in both, so treat the figures as approximate."
         echo
-        echo "# Performance Comparison"
-        echo
-        echo "Performance stats were skipped because the package sets differ between the two revisions."
-        echo
-        echo "For further help please refer to: [ci/README.md](https://github.com/NixOS/nixpkgs/blob/master/ci/README.md)"
       } >> $out/step-summary.md
     fi
 
+    {
+      echo "For further help please refer to: [ci/README.md](https://github.com/NixOS/nixpkgs/blob/master/ci/README.md)"
+      echo
+    } >> $out/step-summary.md
+
+    cmp-stats --explain ${combined}/before/stats ${combined}/after/stats >> $out/step-summary.md
+
     jq -r '.[]' "${touchedFilesJson}" > ./touched-files
     readarray -t touchedFiles < ./touched-files
     echo "This PR touches ''${#touchedFiles[@]} files"

From abc18cbdcbe9102a86c4c4a84e4baaf1fb9e1d3b Mon Sep 17 00:00:00 2001
From: Michael Reilly <OmnipotentEntity@gmail.com>
Date: Thu, 28 May 2026 15:31:03 -0500
Subject: [PATCH 008/151] katago: 1.15.3 -> 1.16.4

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

diff --git a/pkgs/by-name/ka/katago/package.nix b/pkgs/by-name/ka/katago/package.nix
index b2536ee3e8a1..30b113517c8d 100644
--- a/pkgs/by-name/ka/katago/package.nix
+++ b/pkgs/by-name/ka/katago/package.nix
@@ -29,10 +29,8 @@ assert lib.assertOneOf "backend" backend [
   "eigen"
 ];
 
-# N.b. older versions of cuda toolkit (e.g. 10) do not support newer versions
-# of gcc.  If you need to use cuda10, please override stdenv with gcc8Stdenv
 let
-  githash = "cd0ed6c0712088ddb901be68189ba7fa1439a9e7";
+  githash = "ba938676d7f42d70950b3a535af2466fb642008c";
   fakegit = writeShellScriptBin "git" "echo ${githash}";
   stdenv' =
     if
@@ -47,13 +45,13 @@ let
 in
 stdenv'.mkDerivation rec {
   pname = "katago";
-  version = "1.15.3";
+  version = "1.16.5";
 
   src = fetchFromGitHub {
     owner = "lightvector";
     repo = "katago";
     rev = "v${version}";
-    sha256 = "sha256-hZc8LlOxnVqJqyqOSIWKv3550QOaGr79xgqsAQ8B8SM=";
+    sha256 = "sha256-+s4JO6+UMyeSHUqyRFEhJD2kmsdhcydanFWjTqxC1Tc=";
   };
 
   nativeBuildInputs = [

From 2e66047cf731ea46cb62c16d567f6c868eff760d Mon Sep 17 00:00:00 2001
From: nikolaizombie1 <fabio.matos999@gmail.com>
Date: Fri, 29 May 2026 10:27:47 -0400
Subject: [PATCH 009/151] waytrogen: 0.9.5 -> 0.9.8

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

diff --git a/pkgs/by-name/wa/waytrogen/package.nix b/pkgs/by-name/wa/waytrogen/package.nix
index d6962c45425c..6fe2a8531346 100644
--- a/pkgs/by-name/wa/waytrogen/package.nix
+++ b/pkgs/by-name/wa/waytrogen/package.nix
@@ -4,7 +4,6 @@
   rustPlatform,
   pkg-config,
   wrapGAppsHook4,
-  glib,
   nix-update-script,
   stdenv,
   meson,
@@ -14,22 +13,37 @@
   sqlite,
   openssl,
   desktop-file-utils,
+  bash,
+  dbus,
+  gtk4,
+  ffmpeg,
+  libx11,
+  libxcursor,
+  libxrandr,
+  libxi,
+  libxcb,
+  libxkbcommon,
+  vulkan-loader,
+  wayland,
+  xdg-utils,
+  xdg-desktop-portal,
+  libGL,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "waytrogen";
-  version = "0.9.5";
+  version = "0.9.8";
 
   src = fetchFromGitHub {
     owner = "nikolaizombie1";
     repo = "waytrogen";
     tag = finalAttrs.version;
-    hash = "sha256-+1HiTmJAkhd+zbLAyRRk9tHDbR7qcslkfJ2HyGipZCo=";
+    hash = "sha256-Nf1qPIFlhQl5T3RYVK4GMinO2vOJDNoYBrrVY93VF0Q=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-UKd/h/O9EE7gZ8B+QtFVGJEit0BIQ0OC0CG/GLYzMEo=";
+    hash = "sha256-EXP6Mt04Z+2ag2BhihzAtjwPGE82Ig6GoD1Vgor7oHc=";
   };
 
   nativeBuildInputs = [
@@ -41,30 +55,62 @@ stdenv.mkDerivation (finalAttrs: {
     cargo
     rustc
     desktop-file-utils
+    bash
+    dbus
+    sqlite
+    gtk4
+    dbus
+    xdg-utils
+    xdg-desktop-portal
   ];
 
   buildInputs = [
-    glib
     sqlite
     openssl
+    gtk4
+    ffmpeg
+    libx11
+    libxcursor
+    libxrandr
+    libxi
+    libxcb
+    libxkbcommon
+    vulkan-loader
+    wayland
+    dbus
+    xdg-utils
+    xdg-desktop-portal
   ];
 
-  preBuild = "export OUT_PATH=$out";
-
   env = {
     OPENSSL_NO_VENDOR = 1;
   };
 
-  mesonFlags = [ "-Dcargo_features=nixos" ];
+  passthru = {
+    updateScript = nix-update-script { };
+    tests = { };
+  };
 
-  passthru.updateScript = nix-update-script { };
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --suffix LD_LIBRARY_PATH : ${
+        lib.makeLibraryPath [
+          wayland
+          libxkbcommon
+          vulkan-loader
+          libGL
+          dbus
+        ]
+      }
+    )
+  '';
 
   meta = {
     description = "Lightning fast wallpaper setter for Wayland";
     longDescription = ''
       A GUI wallpaper setter for Wayland that is a spiritual successor
       for the minimalistic wallpaper changer for X11 nitrogen. Written purely
-      in the Rust 🦀 programming language. Supports hyprpaper, swaybg, mpvpaper and swww wallpaper changers.
+      in the Rust 🦀 programming language. Supports hyprpaper, swaybg, mpvpaper, swww  and gSlapper wallpaper changers.
     '';
     homepage = "https://github.com/nikolaizombie1/waytrogen";
     changelog = "https://github.com/nikolaizombie1/waytrogen/releases/tag/${finalAttrs.version}";
@@ -75,5 +121,6 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     mainProgram = "waytrogen";
     platforms = lib.platforms.linux;
+    badPlatforms = lib.platforms.darwin;
   };
 })

From d11cc3b3ff876d41fdea0fce5c0cda5e499d6f99 Mon Sep 17 00:00:00 2001
From: alfarel <alfarelcynthesis@proton.me>
Date: Mon, 18 May 2026 13:04:54 -0400
Subject: [PATCH 010/151] tauon: add myself as maintainer

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

diff --git a/pkgs/by-name/ta/tauon/package.nix b/pkgs/by-name/ta/tauon/package.nix
index ac3e0bed7c5f..52a5c551496e 100644
--- a/pkgs/by-name/ta/tauon/package.nix
+++ b/pkgs/by-name/ta/tauon/package.nix
@@ -164,7 +164,10 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://tauonmusicbox.rocks/";
     changelog = "https://github.com/Taiko2k/Tauon/releases/tag/v${version}";
     license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ jansol ];
+    maintainers = with lib.maintainers; [
+      jansol
+      alfarel
+    ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }

From cd8a4c871d9ff10094aef441518f6f25d31f9882 Mon Sep 17 00:00:00 2001
From: alfarel <alfarelcynthesis@proton.me>
Date: Mon, 18 May 2026 13:06:42 -0400
Subject: [PATCH 011/151] tauon: 9.1.3 -> 10.0.1

---
 pkgs/by-name/ta/tauon/package.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ta/tauon/package.nix b/pkgs/by-name/ta/tauon/package.nix
index 52a5c551496e..5d2f85a2def9 100644
--- a/pkgs/by-name/ta/tauon/package.nix
+++ b/pkgs/by-name/ta/tauon/package.nix
@@ -27,7 +27,6 @@
   pulseaudio,
   withDiscordRPC ? true,
 }:
-
 let
   # fork of pypresence, to be reverted if/when there's an upstream release
   lynxpresence = python3Packages.buildPythonPackage rec {
@@ -48,14 +47,14 @@ let
 in
 python3Packages.buildPythonApplication rec {
   pname = "tauon";
-  version = "9.1.3";
+  version = "10.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Taiko2k";
     repo = "Tauon";
     tag = "v${version}";
-    hash = "sha256-Z/+8UCtwvY9000b1Y+HaTIehK8axzyR+eeeBPhllS4U=";
+    hash = "sha256-atLyNePy3pc3xJFliy5hITC5R0VU6jfHYqfq8RxqGoM=";
   };
 
   postUnpack = ''

From fd0e507b58d23259b5614fde1106ef1cc0b253e1 Mon Sep 17 00:00:00 2001
From: alfarel <alfarelcynthesis@proton.me>
Date: Tue, 26 May 2026 12:17:01 -0400
Subject: [PATCH 012/151] tauon: use upstream pypresence again

---
 pkgs/by-name/ta/tauon/package.nix | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/ta/tauon/package.nix b/pkgs/by-name/ta/tauon/package.nix
index 5d2f85a2def9..a6629e1e6947 100644
--- a/pkgs/by-name/ta/tauon/package.nix
+++ b/pkgs/by-name/ta/tauon/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchPypi,
   kissfft,
   miniaudio,
   pkg-config,
@@ -27,24 +26,6 @@
   pulseaudio,
   withDiscordRPC ? true,
 }:
-let
-  # fork of pypresence, to be reverted if/when there's an upstream release
-  lynxpresence = python3Packages.buildPythonPackage rec {
-    pname = "lynxpresence";
-    version = "4.6.2";
-    pyproject = true;
-
-    src = fetchPypi {
-      inherit pname version;
-      hash = "sha256-w4WShLTTSf4JGQVL4lTkbOLL8C7cjnf8WwHyfwKK2zA=";
-    };
-
-    build-system = with python3Packages; [ setuptools ];
-
-    doCheck = false; # tests require internet connection
-    pythonImportsCheck = [ "lynxpresence" ];
-  };
-in
 python3Packages.buildPythonApplication rec {
   pname = "tauon";
   version = "10.0.1";
@@ -73,7 +54,7 @@ python3Packages.buildPythonApplication rec {
   pythonRemoveDeps = [
     "opencc"
     "tekore"
-    # Whether or not it is enabled (withDiscordRPC), it isn't present during build.
+    # Not present when withDiscordRPC is disabled.
     "pypresence"
   ];
 
@@ -130,7 +111,7 @@ python3Packages.buildPythonApplication rec {
       setproctitle
       tidalapi
     ]
-    ++ lib.optional withDiscordRPC lynxpresence
+    ++ lib.optional withDiscordRPC pypresence
     ++ lib.optional stdenv.hostPlatform.isLinux pulsectl;
 
   makeWrapperArgs = [

From 480c99a0d5a1884d599cc99e9a85c3783d976f07 Mon Sep 17 00:00:00 2001
From: poz <poz@poz.pet>
Date: Sat, 30 May 2026 19:46:34 +0200
Subject: [PATCH 013/151] ratty: 0.3.0 -> 0.4.1

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

diff --git a/pkgs/by-name/ra/ratty/package.nix b/pkgs/by-name/ra/ratty/package.nix
index b74268075ee8..8d0ad727aa03 100644
--- a/pkgs/by-name/ra/ratty/package.nix
+++ b/pkgs/by-name/ra/ratty/package.nix
@@ -14,16 +14,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ratty";
-  version = "0.3.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "ratty";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Vxqd5peP4dcUyhM3JYzMUohYjlnsgZXRTnerKDC5VPg=";
+    hash = "sha256-P9cHNK6yYa4JjoxW8I06nuS4e/qitNVXPDIBSGWa+AA=";
   };
 
-  cargoHash = "sha256-/9ekk3B96OanoEXxRDd8eN0gx4IK0qfysOd6DkIZg+k=";
+  cargoHash = "sha256-ICNkUmRLtx6ay1ay/TtnLLkzv5KN+C9F8NNHwxmC/6M=";
 
   nativeBuildInputs = [
     pkg-config

From 68d772a38f6a588dd0c1f369a46ae74677eb46ac Mon Sep 17 00:00:00 2001
From: Karl Hallsby <karl@hallsby.com>
Date: Sun, 31 May 2026 14:02:58 -0500
Subject: [PATCH 014/151] octavePackages.netcdf: Bootstrap sources ourselves

---
 .../octave-modules/netcdf/default.nix         | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/pkgs/development/octave-modules/netcdf/default.nix b/pkgs/development/octave-modules/netcdf/default.nix
index 5a93cf59a72d..07f29825d19f 100644
--- a/pkgs/development/octave-modules/netcdf/default.nix
+++ b/pkgs/development/octave-modules/netcdf/default.nix
@@ -4,6 +4,8 @@
   fetchFromGitHub,
   netcdf,
   nix-update-script,
+  pkg-config,
+  autoreconfHook,
 }:
 
 buildOctavePackage rec {
@@ -17,10 +19,30 @@ buildOctavePackage rec {
     sha256 = "sha256-yt39bd6EBLj7mr6EYngPfPXEMusncc9tx5So1Cp1zkM=";
   };
 
+  nativeBuildInputs = [
+    pkg-config
+    autoreconfHook
+  ];
+
   propagatedBuildInputs = [
     netcdf
   ];
 
+  # autoreconfHook provides an autoreconfPhase that is run as a
+  # preconfigurePhase, which means it runs AFTER the source is un-tarred, and
+  # before buildOctavePackage's buildPhase re-tars it up into a format for later
+  # consumption by Octave's "pkg build" command.
+  preAutoreconf = ''
+    pushd src
+    # Upstream's bootstrap script uses wget to fetch config.guess & config.sub
+    # and has them committed to the repository. We must remove them so autoreconf
+    # actually fires for our environment.
+    rm config.*
+  '';
+  postAutoreconf = ''
+    popd
+  '';
+
   meta = {
     homepage = "https://gnu-octave.github.io/packages/netcdf/";
     license = lib.licenses.gpl2Plus;

From e0630ede07535a463085ca22ee76e27b28326660 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 May 2026 15:38:57 +0000
Subject: [PATCH 015/151] octavePackages.netcdf: 1.0.19 -> 1.0.20

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

diff --git a/pkgs/development/octave-modules/netcdf/default.nix b/pkgs/development/octave-modules/netcdf/default.nix
index 07f29825d19f..ddb76e411052 100644
--- a/pkgs/development/octave-modules/netcdf/default.nix
+++ b/pkgs/development/octave-modules/netcdf/default.nix
@@ -10,13 +10,13 @@
 
 buildOctavePackage rec {
   pname = "netcdf";
-  version = "1.0.19";
+  version = "1.0.20";
 
   src = fetchFromGitHub {
     owner = "gnu-octave";
     repo = "octave-netcdf";
     tag = "v${version}";
-    sha256 = "sha256-yt39bd6EBLj7mr6EYngPfPXEMusncc9tx5So1Cp1zkM=";
+    sha256 = "sha256-47+8daOrPjjsVWi6Sz2V/GNK4vQ5nbGCrQmgnZRap+k=";
   };
 
   nativeBuildInputs = [

From 98715467d2a2c7c18ea55683da60dc2eed4dd62d Mon Sep 17 00:00:00 2001
From: Brian Melton-Grace <brianmg@Brians-MacBook-Pro.local>
Date: Tue, 3 Feb 2026 16:44:27 -0800
Subject: [PATCH 016/151] ngrok: Update download refs for ngrok, no longer use
 equinox.io and instead use ngrok.com

---
 pkgs/by-name/ng/ngrok/update.sh     |  2 +-
 pkgs/by-name/ng/ngrok/versions.json | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ng/ngrok/update.sh b/pkgs/by-name/ng/ngrok/update.sh
index 60649faf05cb..c1042114ba2b 100755
--- a/pkgs/by-name/ng/ngrok/update.sh
+++ b/pkgs/by-name/ng/ngrok/update.sh
@@ -7,7 +7,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
 
 get_download_info() {
     xh --json \
-        https://update.equinox.io/check \
+        https://update.ngrok-agent.com/check \
         'Accept:application/json; q=1; version=1; charset=utf-8' \
         'Content-Type:application/json; charset=utf-8' \
         app_id=app_c3U4eZcDbjV \
diff --git a/pkgs/by-name/ng/ngrok/versions.json b/pkgs/by-name/ng/ngrok/versions.json
index a481d4be6d99..80c0a8616c19 100644
--- a/pkgs/by-name/ng/ngrok/versions.json
+++ b/pkgs/by-name/ng/ngrok/versions.json
@@ -1,37 +1,37 @@
 {
   "linux-386": {
     "sys": "linux-386",
-    "url": "https://bin.equinox.io/a/nNTqdX4Ydi/ngrok-v3-3.31.0-linux-386",
+    "url": "https://bin.ngrok.com/a/nNTqdX4Ydi/ngrok-v3-3.31.0-linux-386",
     "sha256": "df57220616e209b18fad5db27ebab459b79d79431845a9f35e39f5f7b482646d",
     "version": "3.31.0"
   },
   "linux-amd64": {
     "sys": "linux-amd64",
-    "url": "https://bin.equinox.io/a/mWtsD5CQpnc/ngrok-v3-3.31.0-linux-amd64",
+    "url": "https://bin.ngrok.com/a/mWtsD5CQpnc/ngrok-v3-3.31.0-linux-amd64",
     "sha256": "1dab42535428db2a55f44abb0d14f6d9fec7f930f9346c9bd69f0cf5b6529dca",
     "version": "3.31.0"
   },
   "linux-arm": {
     "sys": "linux-arm",
-    "url": "https://bin.equinox.io/a/dDdHR6qWaFy/ngrok-v3-3.31.0-linux-arm",
+    "url": "https://bin.ngrok.com/a/dDdHR6qWaFy/ngrok-v3-3.31.0-linux-arm",
     "sha256": "e713bfc77f2fe0a1225215ce5651a3beefb27773b01f1cce442a271512ee60bd",
     "version": "3.31.0"
   },
   "linux-arm64": {
     "sys": "linux-arm64",
-    "url": "https://bin.equinox.io/a/2SEt27vYGV3/ngrok-v3-3.31.0-linux-arm64",
+    "url": "https://bin.ngrok.com/a/2SEt27vYGV3/ngrok-v3-3.31.0-linux-arm64",
     "sha256": "4bd600d663bcdec42a7d1a6f0c5a042042fecd529b9867b532bd794e62fdb9b4",
     "version": "3.31.0"
   },
   "darwin-amd64": {
     "sys": "darwin-amd64",
-    "url": "https://bin.equinox.io/a/8YrgUfMJ8FH/ngrok-v3-3.31.0-darwin-amd64",
+    "url": "https://bin.ngrok.com/a/8YrgUfMJ8FH/ngrok-v3-3.31.0-darwin-amd64",
     "sha256": "b4855f6d9b170ffe9a77393e43d1e40a4a5ce66a6906fa2cfcddaf5e05938b98",
     "version": "3.31.0"
   },
   "darwin-arm64": {
     "sys": "darwin-arm64",
-    "url": "https://bin.equinox.io/a/9XVR1UCtCce/ngrok-v3-3.31.0-darwin-arm64",
+    "url": "https://bin.ngrok.com/a/9XVR1UCtCce/ngrok-v3-3.31.0-darwin-arm64",
     "sha256": "407f7e88a57f93536d0981544d4132cdf100aa2799a5b56640ec13726febc970",
     "version": "3.31.0"
   }

From 5d813cf4018e0e2622f9b3bfb31f6e174d349917 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Sun, 31 May 2026 22:41:59 +0200
Subject: [PATCH 017/151] ngrok: 3.31.0 -> 3.39.5

---
 pkgs/by-name/ng/ngrok/versions.json | 36 ++++++++++++++---------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/ng/ngrok/versions.json b/pkgs/by-name/ng/ngrok/versions.json
index 80c0a8616c19..d0652abc5fee 100644
--- a/pkgs/by-name/ng/ngrok/versions.json
+++ b/pkgs/by-name/ng/ngrok/versions.json
@@ -1,38 +1,38 @@
 {
   "linux-386": {
     "sys": "linux-386",
-    "url": "https://bin.ngrok.com/a/nNTqdX4Ydi/ngrok-v3-3.31.0-linux-386",
-    "sha256": "df57220616e209b18fad5db27ebab459b79d79431845a9f35e39f5f7b482646d",
-    "version": "3.31.0"
+    "url": "https://bin.ngrok.com/a/5AtU98awTaa/ngrok-v3-3.39.5-linux-386",
+    "sha256": "6aa61bedebbe653013856ce21d0548fbc3448ed1c5832a934e650a9163f23ad5",
+    "version": "3.39.5"
   },
   "linux-amd64": {
     "sys": "linux-amd64",
-    "url": "https://bin.ngrok.com/a/mWtsD5CQpnc/ngrok-v3-3.31.0-linux-amd64",
-    "sha256": "1dab42535428db2a55f44abb0d14f6d9fec7f930f9346c9bd69f0cf5b6529dca",
-    "version": "3.31.0"
+    "url": "https://bin.ngrok.com/a/cB2psTgibNx/ngrok-v3-3.39.5-linux-amd64",
+    "sha256": "1488d85d044c0d0b89105881c75ab3f918c58f6b398645835213505f279218e5",
+    "version": "3.39.5"
   },
   "linux-arm": {
     "sys": "linux-arm",
-    "url": "https://bin.ngrok.com/a/dDdHR6qWaFy/ngrok-v3-3.31.0-linux-arm",
-    "sha256": "e713bfc77f2fe0a1225215ce5651a3beefb27773b01f1cce442a271512ee60bd",
-    "version": "3.31.0"
+    "url": "https://bin.ngrok.com/a/hwheiurqdR4/ngrok-v3-3.39.5-linux-arm",
+    "sha256": "075983ff3a5663483f3ed52e4fb6c6642d3be4f829bd24b54f07b3493ca5a84a",
+    "version": "3.39.5"
   },
   "linux-arm64": {
     "sys": "linux-arm64",
-    "url": "https://bin.ngrok.com/a/2SEt27vYGV3/ngrok-v3-3.31.0-linux-arm64",
-    "sha256": "4bd600d663bcdec42a7d1a6f0c5a042042fecd529b9867b532bd794e62fdb9b4",
-    "version": "3.31.0"
+    "url": "https://bin.ngrok.com/a/mVUZcKSXYG5/ngrok-v3-3.39.5-linux-arm64",
+    "sha256": "5ce6dc3b2fd96f0de3ee481a46da0d8f4b2304a57d922a3cc0ed2eaa303d3d83",
+    "version": "3.39.5"
   },
   "darwin-amd64": {
     "sys": "darwin-amd64",
-    "url": "https://bin.ngrok.com/a/8YrgUfMJ8FH/ngrok-v3-3.31.0-darwin-amd64",
-    "sha256": "b4855f6d9b170ffe9a77393e43d1e40a4a5ce66a6906fa2cfcddaf5e05938b98",
-    "version": "3.31.0"
+    "url": "https://bin.ngrok.com/a/dk3BUFutK45/ngrok-v3-3.39.5-darwin-amd64",
+    "sha256": "f0eabc3ac471d82761757c9a32c2482e020e89360f0dd0fafa03c65a3dd8240f",
+    "version": "3.39.5"
   },
   "darwin-arm64": {
     "sys": "darwin-arm64",
-    "url": "https://bin.ngrok.com/a/9XVR1UCtCce/ngrok-v3-3.31.0-darwin-arm64",
-    "sha256": "407f7e88a57f93536d0981544d4132cdf100aa2799a5b56640ec13726febc970",
-    "version": "3.31.0"
+    "url": "https://bin.ngrok.com/a/hem5SxTwypP/ngrok-v3-3.39.5-darwin-arm64",
+    "sha256": "e05361eb605cbb794aa3a0805d3e345c674266117ae72d300442c4d8b0166ef2",
+    "version": "3.39.5"
   }
 }

From b4b37fc72f2dd75855c513a5fc2a1d3ec80d5c7b Mon Sep 17 00:00:00 2001
From: IogaMaster <iogamastercode@gmail.com>
Date: Sun, 31 May 2026 14:46:14 -0600
Subject: [PATCH 018/151] manix: 0.8.0 -> 0.9.0

Diff: https://github.com/nix-community/manix/compare/v0.8.0...v0.9.0
---
 pkgs/by-name/ma/manix/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/manix/package.nix b/pkgs/by-name/ma/manix/package.nix
index 63bf47b0d4d6..c74f084fa324 100644
--- a/pkgs/by-name/ma/manix/package.nix
+++ b/pkgs/by-name/ma/manix/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "manix";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "manix";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-b/3NvY+puffiQFCQuhRMe81x2wm3vR01MR3iwe/gJkw=";
+    hash = "sha256-hniN0mc7Ud+5zDlOuf2F+/DKrtQ6grZF74ej0L6gMso=";
   };
 
-  cargoHash = "sha256-6KkZg8MXQIewhwdLE8NiqllJifa0uvebU1/MqeE/bdI=";
+  cargoHash = "sha256-FTrKdOuXTOqr7on4RzYl/UxgUJqh+Rk3KJXqsW0fuo0=";
 
   meta = {
     description = "Fast CLI documentation searcher for Nix";

From acdf6c0206258343dacf7ad9188d6ee6f86f20f8 Mon Sep 17 00:00:00 2001
From: Georg Haas <hax404foogit@hax404.de>
Date: Sun, 31 May 2026 23:54:24 +0200
Subject: [PATCH 019/151] mumble, murmur: add hax404 as maintainer

---
 pkgs/applications/networking/mumble/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 50759da2fd1a..20e8c0786b19 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -93,6 +93,7 @@ let
           license = lib.licenses.bsd3;
           maintainers = with lib.maintainers; [
             felixsinger
+            hax404
             lilacious
           ];
           platforms = lib.platforms.linux ++ (overrides.platforms or [ ]);

From 61a8b26a0fd841f4529c6dd58e2325f829cb9da5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 31 May 2026 14:53:28 -0700
Subject: [PATCH 020/151] glm: 1.0.2 -> 1.0.3

Diff: https://github.com/g-truc/glm/compare/1.0.2...1.0.3

Changelog: https://github.com/g-truc/glm/releases/tag/1.0.3
---
 pkgs/by-name/gl/glm/generic.nix | 1 +
 pkgs/by-name/gl/glm/package.nix | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gl/glm/generic.nix b/pkgs/by-name/gl/glm/generic.nix
index 376706d0028b..5f7cccee6697 100644
--- a/pkgs/by-name/gl/glm/generic.nix
+++ b/pkgs/by-name/gl/glm/generic.nix
@@ -55,6 +55,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
+    changelog = "https://github.com/g-truc/glm/releases/tag/${src.tag}";
     description = "OpenGL Mathematics library for C++";
     longDescription = ''
       OpenGL Mathematics (GLM) is a header only C++ mathematics library for
diff --git a/pkgs/by-name/gl/glm/package.nix b/pkgs/by-name/gl/glm/package.nix
index 298ad577aa2e..dd8d9779f7e3 100644
--- a/pkgs/by-name/gl/glm/package.nix
+++ b/pkgs/by-name/gl/glm/package.nix
@@ -9,7 +9,7 @@ callPackage ./generic.nix rec {
   src = fetchFromGitHub {
     owner = "g-truc";
     repo = "glm";
-    rev = version;
-    sha256 = "sha256-2xKv1nO+OdwA0r+I9OZ+OCL9dJFg/LJsQfIvIF76vc0=";
+    tag = version;
+    hash = "sha256-6WnVvFiTe1/OYj/oTGpCjZKNFurR9MxJ4zf0nDg0Alk=";
   };
 }

From 1e68316353c5a8a46fd17ac33f2e1cd1e61f59ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 31 May 2026 14:59:18 -0700
Subject: [PATCH 021/151] glm_1_0_1: use tag and hash

---
 pkgs/by-name/gl/glm/1_0_1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gl/glm/1_0_1.nix b/pkgs/by-name/gl/glm/1_0_1.nix
index 68ecba82fa53..a982e1a626e6 100644
--- a/pkgs/by-name/gl/glm/1_0_1.nix
+++ b/pkgs/by-name/gl/glm/1_0_1.nix
@@ -9,7 +9,7 @@ callPackage ./generic.nix rec {
   src = fetchFromGitHub {
     owner = "g-truc";
     repo = "glm";
-    rev = version;
-    sha256 = "sha256-GnGyzNRpzuguc3yYbEFtYLvG+KiCtRAktiN+NvbOICE=";
+    tag = version;
+    hash = "sha256-GnGyzNRpzuguc3yYbEFtYLvG+KiCtRAktiN+NvbOICE=";
   };
 }

From 9460594d8d9493c001ad63f39089eb53b5a7b4f7 Mon Sep 17 00:00:00 2001
From: wrvsrx <wrvsrx@outlook.com>
Date: Mon, 1 Jun 2026 19:04:12 +0800
Subject: [PATCH 022/151] dufs: fix build by adding cacert to preCheck

After the 0.46.0 bump introduced in #524651, `nix build .#dufs` fails
because the new test suite uses reqwest's blocking client, which
requires trusted CA certificates that are not available in the build
sandbox. Set `SSL_CERT_FILE` in `preCheck` to point at the `cacert`
bundle so the tests can construct TLS clients.
---
 pkgs/by-name/du/dufs/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/du/dufs/package.nix b/pkgs/by-name/du/dufs/package.nix
index 3feeb18d54e3..bec0a0a62b08 100644
--- a/pkgs/by-name/du/dufs/package.nix
+++ b/pkgs/by-name/du/dufs/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   installShellFiles,
   stdenv,
+  cacert,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -23,6 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   __darwinAllowLocalNetworking = true;
 
+  preCheck = ''
+    export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
+  '';
+
   checkFlags = [
     # tests depend on network interface, may fail with virtual IPs.
     "--skip=validate_printed_urls"

From 8bc5acd2a035600acae7d833f0aeb7531f2adb00 Mon Sep 17 00:00:00 2001
From: Eric Helgeson <erichelgeson@gmail.com>
Date: Mon, 1 Jun 2026 07:54:51 -0500
Subject: [PATCH 023/151] netatalk: enable Spotlight search

netatalk 4.5.0 can now build with Spotlight support, but was not
enabled because the cnid default lightweight backend requires `talloc`.

Add `talloc` so the cnid Spotlight backend is built out of the box.

Also add opt-in flags for the heavier backends, both default off:

  - xapianSupport
  - localsearchSupport
---
 pkgs/by-name/ne/netatalk/package.nix | 41 ++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/pkgs/by-name/ne/netatalk/package.nix b/pkgs/by-name/ne/netatalk/package.nix
index f7e1e66f5661..fcb58042bb8b 100644
--- a/pkgs/by-name/ne/netatalk/package.nix
+++ b/pkgs/by-name/ne/netatalk/package.nix
@@ -26,6 +26,15 @@
   iniparser,
   pandoc,
   sqlite,
+  talloc,
+  xapian,
+  flex,
+  bison,
+  dconf,
+  localsearch,
+  tinysparql,
+  xapianSupport ? false,
+  localsearchSupport ? false,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -42,6 +51,10 @@ stdenv.mkDerivation (finalAttrs: {
     meson
     ninja
     file
+  ]
+  ++ lib.optionals localsearchSupport [
+    flex
+    bison
   ];
 
   buildInputs = [
@@ -64,6 +77,16 @@ stdenv.mkDerivation (finalAttrs: {
     iniparser
     pandoc
     sqlite
+    talloc
+  ]
+  ++ lib.optionals xapianSupport [
+    xapian
+    file
+  ]
+  ++ lib.optionals localsearchSupport [
+    tinysparql
+    dconf
+    localsearch
   ];
 
   mesonFlags = [
@@ -77,8 +100,26 @@ stdenv.mkDerivation (finalAttrs: {
     "-Dwith-cracklib=true"
     "-Dwith-cracklib-path=${cracklib.out}"
     "-Dwith-statedir-creation=false"
+    "-Dwith-spotlight-backends=${
+      lib.concatStringsSep "," (
+        [ "cnid" ] ++ lib.optional xapianSupport "xapian" ++ lib.optional localsearchSupport "localsearch"
+      )
+    }"
   ];
 
+  # TODO: drop once upstream makes this path configurable.
+  postPatch = lib.optionalString localsearchSupport ''
+    substituteInPlace meson.build \
+      --replace-fail "install_emptydir('/etc/dconf/db')" "install_emptydir('etc/dconf/db')"
+    substituteInPlace config/dconf/meson.build \
+      --replace-fail "install_dir: '/etc/dconf/profile'" "install_dir: 'etc/dconf/profile'"
+  '';
+
+  # netatalk probes for the LocalSearch schema at configure time.
+  preConfigure = lib.optionalString localsearchSupport ''
+    export XDG_DATA_DIRS="''${XDG_DATA_DIRS:+$XDG_DATA_DIRS:}${localsearch}/share/gsettings-schemas/localsearch-${localsearch.version}"
+  '';
+
   enableParallelBuilding = true;
 
   meta = {

From 94faa3fad4e985c0cb70d53de6c2ae06c6334f39 Mon Sep 17 00:00:00 2001
From: "Jan T. Sott" <git@idleberg.com>
Date: Sat, 30 May 2026 20:22:36 +0200
Subject: [PATCH 024/151] nsis: 3.11 -> 3.12

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

diff --git a/pkgs/by-name/ns/nsis/package.nix b/pkgs/by-name/ns/nsis/package.nix
index 0538abab156b..b6ca7eef8205 100644
--- a/pkgs/by-name/ns/nsis/package.nix
+++ b/pkgs/by-name/ns/nsis/package.nix
@@ -13,15 +13,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nsis";
-  version = "3.11";
+  version = "3.12";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/nsis/NSIS%203/${finalAttrs.version}/nsis-${finalAttrs.version}-src.tar.bz2";
-    sha256 = "19e72062676ebdc67c11dc032ba80b979cdbffd3886c60b04bb442cdd401ff4b";
+    sha256 = "11miw8jbhqcn5wmndcjdjfs0r7jm08x5cfvxyj64xkx29a77mvgk";
   };
   srcWinDistributable = fetchzip {
     url = "mirror://sourceforge/project/nsis/NSIS%203/${finalAttrs.version}/nsis-${finalAttrs.version}.zip";
-    sha256 = "e574f335ab9d3ad73118f46615e5c9f2a52f3e4622ecbb7e5886badbc8601348";
+    sha256 = "0rp9bycykjgx2aq656sdba1h4v14nfyiic2lgp1xm93l2czx9k9q";
   };
 
   postUnpack = ''

From 72e80ed34d0316e22bbe25d8b0d053fe8b725c64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 1 Jun 2026 10:42:20 -0700
Subject: [PATCH 025/151] icewm: 3.8.2 -> 4.0.0

Diff: https://github.com/ice-wm/icewm/compare/3.8.2...4.0.0

Changelog: https://github.com/ice-wm/icewm/releases/tag/4.0.0
---
 pkgs/by-name/ic/icewm/package.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix
index 99793c5c76c7..c1a5b300893d 100644
--- a/pkgs/by-name/ic/icewm/package.nix
+++ b/pkgs/by-name/ic/icewm/package.nix
@@ -33,6 +33,7 @@
   libsndfile,
   libtiff,
   libxcb,
+  libxcursor,
   mkfontdir,
   pcre2,
   perl,
@@ -41,13 +42,13 @@
 
 gccStdenv.mkDerivation (finalAttrs: {
   pname = "icewm";
-  version = "3.8.2";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "ice-wm";
     repo = "icewm";
     tag = finalAttrs.version;
-    hash = "sha256-CbIQICov0h3lBDT54dEODkINNXou6CUEhRQAPZwfYK0=";
+    hash = "sha256-4+nW8JJ3CDEPOZZ4p0EZM86h+rAifTuGDZxoFMUI7K0=";
   };
 
   strictDeps = true;
@@ -90,6 +91,7 @@ gccStdenv.mkDerivation (finalAttrs: {
     libsndfile
     libtiff
     libxcb
+    libxcursor
     mkfontdir
     pcre2
   ];
@@ -109,6 +111,7 @@ gccStdenv.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "https://ice-wm.org/";
+    changelog = "https://github.com/ice-wm/icewm/releases/tag/${finalAttrs.src.tag}";
     description = "Simple, lightweight X window manager";
     longDescription = ''
       IceWM is a window manager for the X Window System. The goal of IceWM is

From 0bea21a448d960a07b86da4a41714f2fbb931b43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 1 Jun 2026 10:50:46 -0700
Subject: [PATCH 026/151] intel-vaapi-driver: 2.4.1-unstable-2024-10-29 ->
 2.4.5

Diff: https://github.com/irql-notlessorequal/intel-vaapi-driver/compare/fd727a4e9cb8b2878a1e93d4dddc8dd1c1a4e0ea...2.4.5

Changelog: https://github.com/irql-notlessorequal/intel-vaapi-driver/blob/2.4.5/NEWS
---
 pkgs/by-name/in/intel-vaapi-driver/package.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/in/intel-vaapi-driver/package.nix b/pkgs/by-name/in/intel-vaapi-driver/package.nix
index 33f06004ae1b..ab09fdabff43 100644
--- a/pkgs/by-name/in/intel-vaapi-driver/package.nix
+++ b/pkgs/by-name/in/intel-vaapi-driver/package.nix
@@ -20,15 +20,15 @@
   nix-update-script,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "intel-vaapi-driver";
-  version = "2.4.1-unstable-2024-10-29";
+  version = "2.4.5";
 
   src = fetchFromGitHub {
-    owner = "intel";
+    owner = "irql-notlessorequal";
     repo = "intel-vaapi-driver";
-    rev = "fd727a4e9cb8b2878a1e93d4dddc8dd1c1a4e0ea";
-    hash = "sha256-OMFdRjzpUKdxB9eK/1OLYLaOC3NHnzZVxmh6yKrbYoE=";
+    tag = finalAttrs.version;
+    hash = "sha256-exQBA42jCmwybE7WIfF83cjmzBdtluDzUtOdqt49HSg=";
   };
 
   # Set the correct install path:
@@ -67,10 +67,11 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
-    homepage = "https://01.org/linuxmedia";
+    homepage = "https://github.com/irql-notlessorequal/intel-vaapi-driver";
+    changelog = "https://github.com/irql-notlessorequal/intel-vaapi-driver/blob/${finalAttrs.src.tag}/NEWS";
     license = lib.licenses.mit;
     description = "VA-API user mode driver for Intel GEN Graphics family";
     longDescription = ''
@@ -89,4 +90,4 @@ stdenv.mkDerivation {
     ];
     maintainers = with lib.maintainers; [ SuperSandro2000 ];
   };
-}
+})

From 583becdb797f962f5a83d8412900022787471ba8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jun 2026 20:53:06 +0000
Subject: [PATCH 027/151] xev: 1.2.6 -> 1.2.7

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

diff --git a/pkgs/by-name/xe/xev/package.nix b/pkgs/by-name/xe/xev/package.nix
index 06c7bd4b6d15..8059c0d1bcd6 100644
--- a/pkgs/by-name/xe/xev/package.nix
+++ b/pkgs/by-name/xe/xev/package.nix
@@ -10,11 +10,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "xev";
-  version = "1.2.6";
+  version = "1.2.7";
 
   src = fetchurl {
     url = "mirror://xorg/individual/app/xev-${finalAttrs.version}.tar.xz";
-    hash = "sha256-YeHF4AismXOsp83d826d90EOdwg7Aw6wT03HN8UYB9c=";
+    hash = "sha256-lRZ4lZJN5Y40sQE7KwyEdukNCIjGw5566bw146GdugQ=";
   };
 
   strictDeps = true;

From 0556177ed5a1aabc13f640111714f66a1a0575b2 Mon Sep 17 00:00:00 2001
From: Nick Lewis <nick@floxdev.com>
Date: Mon, 1 Jun 2026 14:19:19 -0700
Subject: [PATCH 028/151] python3Packages.openfga-sdk: Fix tests on Python 3.12

---
 pkgs/development/python-modules/openfga-sdk/default.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/openfga-sdk/default.nix b/pkgs/development/python-modules/openfga-sdk/default.nix
index 5fe2308eb536..03470cbc19b5 100644
--- a/pkgs/development/python-modules/openfga-sdk/default.nix
+++ b/pkgs/development/python-modules/openfga-sdk/default.nix
@@ -41,15 +41,9 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     mock
+    pytest-asyncio
     pytest-cov-stub
     pytestCheckHook
-  ]
-  ++ lib.optionals (pythonAtLeast "3.13") [ pytest-asyncio ];
-
-  disabledTests = lib.optionals (pythonAtLeast "3.13") [
-    # These fail due to a race condition in the test mocks
-    "test_client_batch_check_multiple_request"
-    "test_client_batch_check_multiple_request_fail"
   ];
 
   meta = {

From 3ae002d94705ff4b63d053df681e82ca6c11c442 Mon Sep 17 00:00:00 2001
From: fmbearmf <77757734+fmbearmf@users.noreply.github.com>
Date: Mon, 1 Jun 2026 15:03:30 -0700
Subject: [PATCH 029/151] plasticity: 25.3.9 -> 26.1.3

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

diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix
index a76360c6bf8e..7a29cb1f65ab 100644
--- a/pkgs/by-name/pl/plasticity/package.nix
+++ b/pkgs/by-name/pl/plasticity/package.nix
@@ -40,11 +40,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "plasticity";
-  version = "25.3.9";
+  version = "26.1.3";
 
   src = fetchurl {
     url = "https://github.com/nkallen/plasticity/releases/download/v${version}/Plasticity-${version}-1.x86_64.rpm";
-    hash = "sha256-92DokpVmywh7EZZMKAoXf0RzkEuG/4Ngd5l0l/o6Klk=";
+    hash = "sha256-gHoih3CldhrHPLBpu3slRUxJSBIbYYhQ9WhEbhjHzyM=";
   };
 
   passthru.updateScript = ./update.sh;

From 49f947504d5ebd4bde3a4b909fafb8cdbfd34b5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 1 Jun 2026 20:32:07 -0700
Subject: [PATCH 030/151] python3Packages.qh3: 1.8.1 -> 1.9.1

Diff: https://github.com/jawah/qh3/compare/v1.8.1...v1.9.1

Changelog: https://github.com/jawah/qh3/blob/v1.9.1/CHANGELOG.rst
---
 pkgs/development/python-modules/qh3/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/qh3/default.nix b/pkgs/development/python-modules/qh3/default.nix
index bc299a4b42a9..a9dd473d49e6 100644
--- a/pkgs/development/python-modules/qh3/default.nix
+++ b/pkgs/development/python-modules/qh3/default.nix
@@ -14,19 +14,19 @@
 
 buildPythonPackage rec {
   pname = "qh3";
-  version = "1.8.1";
+  version = "1.9.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "qh3";
     tag = "v${version}";
-    hash = "sha256-/N0cVm5IHijShv0/q83useJRP5/N3+9L1vtrm7Y9vp8=";
+    hash = "sha256-8eH/aHEVFNKxgjHYycmzs0EiZFQXeL6uJ4NY7S1BU5w=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-7SbN8uj+TPoAhIwXqhqCGqWGpg9sYob95TYAHixIVkM=";
+    hash = "sha256-/YEci4OvRg6RR0HG+vvz4S+KBXwpLiH0gbiLaY989+4=";
   };
 
   nativeBuildInputs = [

From 49f594144d71b40546db04d2eb324340d934078e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 1 Jun 2026 20:32:11 -0700
Subject: [PATCH 031/151] python3Packages.urllib3-future: 2.21.900 -> 2.21.902

Diff: https://github.com/jawah/urllib3.future/compare/2.21.900...2.21.902

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

diff --git a/pkgs/development/python-modules/urllib3-future/default.nix b/pkgs/development/python-modules/urllib3-future/default.nix
index 311b0f7db021..0b838f5c9290 100644
--- a/pkgs/development/python-modules/urllib3-future/default.nix
+++ b/pkgs/development/python-modules/urllib3-future/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "urllib3-future";
-  version = "2.21.900";
+  version = "2.21.902";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "urllib3.future";
     tag = version;
-    hash = "sha256-7GfUKhJ8hjO93IRhzmt2WbUckh4W2RCblPCMuV3JWzs=";
+    hash = "sha256-0D4B/3YpaGfegt/2vxiVkt14PhEna5pKFfDeKD5yT8c=";
   };
 
   postPatch = ''

From a613696825856b7a002d022a6a81ec59ae4b1888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 1 Jun 2026 20:31:32 -0700
Subject: [PATCH 032/151] python3Packages.niquests: 3.18.8 -> 3.19.0

Diff: https://github.com/jawah/niquests/compare/v3.18.8...v3.19.0

Changelog: https://github.com/jawah/niquests/blob/v3.19.0/HISTORY.md
---
 pkgs/development/python-modules/niquests/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/niquests/default.nix b/pkgs/development/python-modules/niquests/default.nix
index 63f672046f6b..aa35897ace86 100644
--- a/pkgs/development/python-modules/niquests/default.nix
+++ b/pkgs/development/python-modules/niquests/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "niquests";
-  version = "3.18.8";
+  version = "3.19.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "niquests";
     tag = "v${version}";
-    hash = "sha256-yr0N+wkGyscCz34xtAU7qMQT+kN341AL/7PZwGwzhpo=";
+    hash = "sha256-rdF+/AGZgfqdiQKlcwa4GDlYWdplAktpkYK9FAN10xk=";
   };
 
   build-system = [ hatchling ];

From 1f835d061cea659acd7886b1b9758abf9330f3d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 1 Jun 2026 21:21:08 -0700
Subject: [PATCH 033/151] libcmis: 0.6.2 -> 0.6.3

Diff: https://github.com/tdf/libcmis/compare/v0.6.2...v0.6.3

Changelog: https://github.com/tdf/libcmis/blob/v0.6.3/NEWS
---
 pkgs/by-name/li/libcmis/package.nix | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/li/libcmis/package.nix b/pkgs/by-name/li/libcmis/package.nix
index cf1408c4e1a5..7a93bb03fc7c 100644
--- a/pkgs/by-name/li/libcmis/package.nix
+++ b/pkgs/by-name/li/libcmis/package.nix
@@ -2,39 +2,37 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   boost,
   libxml2,
   pkg-config,
-  docbook2x,
+  docbook_xml_dtd_43,
   curl,
   autoreconfHook,
   cppunit,
+  xmlto,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libcmis";
-  version = "0.6.2";
+  version = "0.6.3";
 
   src = fetchFromGitHub {
     owner = "tdf";
     repo = "libcmis";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-HXiyQKjOlQXWABY10XrOiYxPqfpmUJC3a6xD98LIHDw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-chLY9tbhVPIiP+twsNM2SM7Bqyau/evQGKHfjlac6ys=";
   };
 
-  patches = [
-    # Backport to fix build with boost 1.86
-    (fetchpatch {
-      url = "https://github.com/tdf/libcmis/commit/3659d32999ff7593662dcf5136bcb7ac15c13f61.patch";
-      hash = "sha256-EXmQcXCHaVnF/dwU3Z4WLtaiHjYHeeonlKdyK27UkiY=";
-    })
-  ];
+  postPatch = ''
+    substituteInPlace doc/cmis-client.xml.in \
+      --replace-fail "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \
+                     "${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd"
+  '';
 
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
-    docbook2x
+    xmlto
   ];
   buildInputs = [
     boost
@@ -45,7 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   configureFlags = [
     "--disable-werror"
-    "DOCBOOK2MAN=${docbook2x}/bin/docbook2man"
     "--with-boost=${boost.dev}"
   ];
 
@@ -54,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
   enableParallelBuilding = true;
 
   meta = {
+    changelog = "https://github.com/tdf/libcmis/blob/${finalAttrs.src.tag}/NEWS";
     description = "C++ client library for the CMIS interface";
     homepage = "https://github.com/tdf/libcmis";
     license = lib.licenses.gpl2;

From 6d3bd7aa7ecde089f0f117e58af78c4499802cb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 2 Jun 2026 10:16:04 -0700
Subject: [PATCH 034/151] libfreehand: 0.1.2 -> 0.1.3

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

diff --git a/pkgs/by-name/li/libfreehand/package.nix b/pkgs/by-name/li/libfreehand/package.nix
index b926e22d18c4..056f52cbfe49 100644
--- a/pkgs/by-name/li/libfreehand/package.nix
+++ b/pkgs/by-name/li/libfreehand/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchzip,
-  fetchpatch,
   perl,
   pkg-config,
   boost,
@@ -16,11 +15,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "libfreehand";
-  version = "0.1.2";
+  version = "0.1.3";
 
   src = fetchzip {
     url = "https://dev-www.libreoffice.org/src/libfreehand/libfreehand-${finalAttrs.version}.tar.xz";
-    hash = "sha256-0icEGnTtYveP24FbYjRB7tFW/TquSOszbqZspHAhQ7I=";
+    hash = "sha256-ZcvG00JP3BoFv1PIeAhZyr7t1zANhTVluBZQqEbWCvY=";
   };
 
   nativeBuildInputs = [
@@ -41,13 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   configureFlags = [ "--disable-werror" ];
 
-  patches = [
-    (fetchpatch {
-      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libfreehand/-/raw/main/libfreehand-0.1.2-icu-fix.patch?ref_type=heads";
-      hash = "sha256-SRkcF+FRkFdueLSTOMYWo6+CCl05f0OBP6G5VrXRyCw=";
-    })
-  ];
-
   meta = {
     description = "Adobe Freehand import library";
     homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libfreehand";

From 2466aeb073bea92ef868822389247bd8fad4cf9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 2 Jun 2026 09:29:49 -0700
Subject: [PATCH 035/151] libetpan: 1.9.4 -> 1.10

Diff: https://github.com/dinhviethoa/libetpan/compare/1.9.4...1.10

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

diff --git a/pkgs/by-name/li/libetpan/package.nix b/pkgs/by-name/li/libetpan/package.nix
index bc1f6c6e9bd9..d266c7600ca8 100644
--- a/pkgs/by-name/li/libetpan/package.nix
+++ b/pkgs/by-name/li/libetpan/package.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  fetchpatch,
   autoconf,
   automake,
   libtool,
@@ -12,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libetpan";
-  version = "1.9.4";
+  version = "1.10";
 
   src = fetchFromGitHub {
     owner = "dinhviethoa";
     repo = "libetpan";
-    rev = finalAttrs.version;
-    hash = "sha256-lukeWURNsRPTuFk2q2XVnwkKz5Y+PRiPba5GPQCw6jw=";
+    tag = finalAttrs.version;
+    hash = "sha256-dG1qsYv9W0l6LLMW+XnKtUunga3IGVxEy34Tnp+K99o=";
   };
 
   outputs = [
@@ -26,75 +25,6 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
   ];
 
-  patches = [
-    # The following patches are security and/or reliability fixes.
-    # They all must be removed for the next version bump.
-
-    # Fix potential null pointer deference
-    # https://github.com/dinhvh/libetpan/pull/348
-    (fetchpatch {
-      name = "pr-348-null-pointer-deference.patch";
-      url = "https://github.com/dinhvh/libetpan/commit/720e92e5752e562723a9730f8e604cb78f3a9163.patch";
-      hash = "sha256-/bA/ekeMhLE3OyREHIanlrb+uuSxwur+ZloeaX9AyyM=";
-    })
-
-    # Fix potential null pointer deference
-    # https://github.com/dinhvh/libetpan/pull/361
-    (fetchpatch {
-      name = "pr-361-null-pointer-deference.patch";
-      url = "https://github.com/dinhvh/libetpan/commit/0cdefb017fcfd0fae56a151dc14c8439a38ecc44.patch";
-      hash = "sha256-qbWisOCPI91AIXzg3n7mceSVbBKHZXd8Z0z1u/SrIG8=";
-    })
-
-    # Fix potential null pointer deference
-    # https://github.com/dinhvh/libetpan/pull/363
-    (fetchpatch {
-      name = "pr-363-null-pointer-deference.patch";
-      url = "https://github.com/dinhvh/libetpan/commit/68bde8b12b40a680c29d228f0b8fe4dfbf2d8d0b.patch";
-      hash = "sha256-dUbnh2RoeELk/usHeFsdGC+J198jcudx3rb6/3sUAX0=";
-    })
-
-    # Missing boundary fix
-    # https://github.com/dinhvh/libetpan/pull/384
-    (fetchpatch {
-      name = "pr-384-missing-boundary-fix.patch";
-      url = "https://github.com/dinhvh/libetpan/commit/24c485495216c00076b29391591f46b61fcb3dac.patch";
-      hash = "sha256-6ry8EfiYgbMtQYtT7L662I1A7N7N6OOy9T2ECgR7+cI=";
-    })
-
-    # CVE-2020-15953: Detect extra data after STARTTLS response and exit
-    # https://github.com/dinhvh/libetpan/pull/387
-    (fetchpatch {
-      name = "cve-2020-15953-imap.patch";
-      url = "https://github.com/dinhvh/libetpan/commit/1002a0121a8f5a9aee25357769807f2c519fa50b.patch";
-      hash = "sha256-dqnHZAzX6ym8uF23iKVotdHQv9XQ/BGBAiRGSb7QLcE=";
-    })
-
-    # CVE-2020-15953: Detect extra data after STARTTLS responses in SMTP and POP3 and exit
-    # https://github.com/dinhvh/libetpan/pull/388
-    (fetchpatch {
-      name = "cve-2020-15953-pop3-smtp.patch";
-      url = "https://github.com/dinhvh/libetpan/commit/298460a2adaabd2f28f417a0f106cb3b68d27df9.patch";
-      hash = "sha256-QI0gvLGUik4TQAz/pxwVfOhZc/xtj6jcWPZkJVsSCFM=";
-    })
-
-    # Fix buffer overwrite for empty string in remove_trailing_eol
-    # https://github.com/dinhvh/libetpan/pull/408
-    (fetchpatch {
-      name = "pr-408-fix-buffer-overwrite.patch";
-      url = "https://github.com/dinhvh/libetpan/commit/078b924c7f49ac435b10b0f53a73f1bbc4717064.patch";
-      hash = "sha256-lBRS+bv/7IK7yat2p3mc0SRYn/wRB/spjE7ungj6DT0=";
-    })
-
-    # CVE-2022-4121: Fixed crash when st_info_list is NULL.
-    # https://github.com/dinhvh/libetpan/issues/420
-    (fetchpatch {
-      name = "cve-2022-4121.patch";
-      url = "https://github.com/dinhvh/libetpan/commit/5c9eb6b6ba64c4eb927d7a902317410181aacbba.patch";
-      hash = "sha256-O+LUkI91oej7MFg4Pg6/xq1uhSanweH81VzPXBdiPh4=";
-    })
-  ];
-
   nativeBuildInputs = [
     autoconf
     automake
@@ -109,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   configureScript = "./autogen.sh";
 
   meta = {
+    changelog = "https://github.com/dinhvh/libetpan/releases/tag/${finalAttrs.src.tag}";
     description = "Mail Framework for the C Language";
     homepage = "https://www.etpan.org/libetpan.html";
     license = lib.licenses.bsd3;

From b0e5fd9ee5dab232ea48a5c9af6c28377338d3ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 2 Jun 2026 16:16:28 -0700
Subject: [PATCH 036/151] python3Packages.datastar-py: 1.0.0 -> 1.0.2

Diff: https://github.com/starfederation/datastar-python/compare/v1.0.0...v1.0.2

Changelog: https://github.com/starfederation/datastar-python/releases/tag/v1.0.2
---
 .../python-modules/datastar-py/default.nix    | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/datastar-py/default.nix b/pkgs/development/python-modules/datastar-py/default.nix
index 64e1d6648e37..689dcc53e1bd 100644
--- a/pkgs/development/python-modules/datastar-py/default.nix
+++ b/pkgs/development/python-modules/datastar-py/default.nix
@@ -1,21 +1,28 @@
 {
+  anyio,
   buildPythonPackage,
+  django,
+  fastapi,
   fetchFromGitHub,
   hatchling,
+  httpx,
   lib,
+  litestar,
   pytestCheckHook,
+  starlette,
+  uvicorn,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "datastar-py";
-  version = "1.0.0";
+  version = "1.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "starfederation";
     repo = "datastar-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-79pdSzHwkF8JX3rF5PIEvx//rKRvX3H1B2382Wfbm9U=";
+    hash = "sha256-epshwHwpRnrgOQ6/jiy6Iyv4y1fa5ZipgiFShKEOxtA=";
   };
 
   build-system = [ hatchling ];
@@ -23,13 +30,16 @@ buildPythonPackage (finalAttrs: {
   pythonImportsCheck = [ "datastar_py" ];
 
   nativeCheckInputs = [
+    anyio
+    django
+    fastapi
+    httpx
+    litestar
     pytestCheckHook
+    starlette
+    uvicorn
   ];
 
-  # tests were only added after 1.0.0
-  # TODO enable after update
-  doCheck = false;
-
   meta = {
     changelog = "https://github.com/starfederation/datastar-python/releases/tag/${finalAttrs.src.tag}";
     description = "Helper functions and classes for the Datastar library";

From e4cf177fa4607a36db5165f81ef70168d88a5bf5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 3 Jun 2026 00:32:08 +0000
Subject: [PATCH 037/151] freeipmi: 1.6.17 -> 1.6.18

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

diff --git a/pkgs/by-name/fr/freeipmi/package.nix b/pkgs/by-name/fr/freeipmi/package.nix
index f8dccc9f2844..90131d86d1ca 100644
--- a/pkgs/by-name/fr/freeipmi/package.nix
+++ b/pkgs/by-name/fr/freeipmi/package.nix
@@ -10,12 +10,12 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "1.6.17";
+  version = "1.6.18";
   pname = "freeipmi";
 
   src = fetchurl {
     url = "mirror://gnu/freeipmi/freeipmi-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-Fng9EPqiiEenlczgv4be6qcrj75x0fDcEQHROmtQHsE=";
+    sha256 = "sha256-gJiyOCADitCqOavw+aAS4kaD04TZ+R52CssqaLRl4P4=";
   };
 
   postPatch = lib.optionalString stdenv.cc.isClang ''

From 332fa655d0077cafb16f149901489c18dfe2132d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 2 Jun 2026 18:16:01 -0700
Subject: [PATCH 038/151] spectre-meltdown-checker: 26.33.0420460 ->
 26.36.0602723

Diff: https://github.com/speed47/spectre-meltdown-checker/compare/v26.33.0420460...v26.36.0602723

Changelog: https://github.com/speed47/spectre-meltdown-checker/releases/tag/v26.36.0602723
---
 pkgs/by-name/sp/spectre-meltdown-checker/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sp/spectre-meltdown-checker/package.nix b/pkgs/by-name/sp/spectre-meltdown-checker/package.nix
index 7eaabdcf90e1..599a945f220b 100644
--- a/pkgs/by-name/sp/spectre-meltdown-checker/package.nix
+++ b/pkgs/by-name/sp/spectre-meltdown-checker/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "spectre-meltdown-checker";
-  version = "26.33.0420460";
+  version = "26.36.0602723";
 
   src = fetchFromGitHub {
     owner = "speed47";
     repo = "spectre-meltdown-checker";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lydZqvX20QmulwTrsGnInTF1j6CmJw8DUFfAaq0R5l4=";
+    hash = "sha256-UPpArgFbz2nce63fS6AScitHeL8/XlA0aInyeRxN9ZM=";
   };
 
   passthru.updateScript = gitUpdater { };

From 24a269500a2311288ce708aaad9ebd42f794d691 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Wed, 3 Jun 2026 11:54:09 +0800
Subject: [PATCH 039/151] qq: 2026-04-01 -> 2026-05-28

Stop removing bundled sharp-lib: QQ 3.2.29's sharp native module
requires vips_g_once, a symbol not present in nixpkgs vips 8.18.2.

Ref: https://aur.archlinux.org/cgit/aur.git/commit/?h=linuxqq&id=09687efd16879e1cecc532b06e2f4602722d3c69
---
 pkgs/by-name/qq/qq/package.nix |  5 -----
 pkgs/by-name/qq/qq/sources.nix | 20 ++++++++++----------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/qq/qq/package.nix b/pkgs/by-name/qq/qq/package.nix
index 8f8e29ad5ae4..71e592b1d694 100644
--- a/pkgs/by-name/qq/qq/package.nix
+++ b/pkgs/by-name/qq/qq/package.nix
@@ -21,7 +21,6 @@
   systemd,
   stdenv,
   undmg,
-  vips,
   at-spi2-core,
   autoPatchelfHook,
   writeShellScript,
@@ -112,7 +111,6 @@ else
       libkrb5
       libgbm
       nss
-      vips
       libxdamage
     ];
 
@@ -201,9 +199,6 @@ else
             --run '${versionConfigScript} || true'
           ''}
 
-        # Remove bundled libraries
-        rm -r $out/opt/QQ/resources/app/sharp-lib
-
         # https://aur.archlinux.org/cgit/aur.git/commit/?h=linuxqq&id=f7644776ee62fa20e5eb30d0b1ba832513c77793
         rm -r $out/opt/QQ/resources/app/libssh2.so.1
 
diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix
index a7d2b8b1bc63..069b9861e72e 100644
--- a/pkgs/by-name/qq/qq/sources.nix
+++ b/pkgs/by-name/qq/qq/sources.nix
@@ -1,12 +1,12 @@
 # Generated by ./update.sh - do not update manually!
-# Last updated: 2026-04-15
+# Last updated: 2026-06-03
 { fetchurl }:
 let
   any-darwin = {
-    version = "6.9.93-2026-04-01";
+    version = "6.9.96-2026-05-28";
     src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.93_260401_01.dmg";
-      hash = "sha256-xCyvVAxYKma92SkL1fLraXKeDcKlRLLybtwKPWUKlis=";
+      url = "https://qqdl.gtimg.cn/qqfile/QQNT/9.9.31/release/045f4292/QQ_6.9.96_260528_01.dmg";
+      hash = "sha256-cMgWMXfKtL4ZLBrjGhROpCMNAHtFIdnZRfyi9XtsIjI=";
     };
   };
 in
@@ -14,17 +14,17 @@ in
   aarch64-darwin = any-darwin;
   x86_64-darwin = any-darwin;
   aarch64-linux = {
-    version = "3.2.27-2026-04-01";
+    version = "3.2.29-2026-05-28";
     src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.27_260401_arm64_01.deb";
-      hash = "sha256-sGLYPAdZmcxGy+3Lo7MEeEXysqP24XTWaQY/iM9bRLU=";
+      url = "https://qqdl.gtimg.cn/qqfile/QQNT/9.9.31/release/00e6a3e7/QQ_3.2.29_260528_arm64_01.deb";
+      hash = "sha256-W82MzaQB+/oYIafDx1j4SiU8MXVo8LnC10QmokdJ6aY=";
     };
   };
   x86_64-linux = {
-    version = "3.2.27-2026-04-01";
+    version = "3.2.29-2026-05-28";
     src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.27_260401_amd64_01.deb";
-      hash = "sha256-iI5gc0VSZAzab2B+w1I/6idSD/zx45Ou+uyqSJzCC+c=";
+      url = "https://qqdl.gtimg.cn/qqfile/QQNT/9.9.31/release/00e6a3e7/QQ_3.2.29_260528_amd64_01.deb";
+      hash = "sha256-HjgoB5ZzyUmUvA9HgNXYUoZHY5kgZZhi1J0cLyoZjiU=";
     };
   };
 }

From 9005a984223e73b9a0ba6924d5c8fa5fed682af2 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 3 Jun 2026 14:52:37 +0200
Subject: [PATCH 040/151] corrscope: Add explicit passthru.updateScript

Whatever updateScript this was inheriting from being a Python package produced changes that were nonsense.
(attempts to bump from 0.11.0 (2025) to python5-macos (2023))
---
 pkgs/by-name/co/corrscope/package.nix | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/co/corrscope/package.nix b/pkgs/by-name/co/corrscope/package.nix
index 4dd648b3fecf..70cfdedd6482 100644
--- a/pkgs/by-name/co/corrscope/package.nix
+++ b/pkgs/by-name/co/corrscope/package.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  gitUpdater,
   ffmpeg,
   python3Packages,
   qt6Packages,
@@ -74,12 +75,18 @@ python3Packages.buildPythonApplication (finalAttrs: {
     )
   '';
 
-  passthru.tests.version = testers.testVersion {
-    package = corrscope;
-    # Tries writing to
-    # - $HOME/.local/share/corrscope on Linux
-    # - $HOME/Library/Application Support/corrscope on Darwin
-    command = "env HOME=$TMPDIR ${lib.getExe corrscope} --version";
+  passthru = {
+    tests.version = testers.testVersion {
+      package = corrscope;
+      # Tries writing to
+      # - $HOME/.local/share/corrscope on Linux
+      # - $HOME/Library/Application Support/corrscope on Darwin
+      command = "env HOME=$TMPDIR ${lib.getExe corrscope} --version";
+    };
+
+    updateScript = gitUpdater {
+      allowedVersions = "^[0-9.]+$";
+    };
   };
 
   meta = {

From bec5b60ae1dbcb0c22ac77c826da2d16d758ea08 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 3 Jun 2026 21:18:06 +0700
Subject: [PATCH 041/151] python3Packages.asyncio-rlock: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/asyncio-rlock/default.nix b/pkgs/development/python-modules/asyncio-rlock/default.nix
index 84643380f9f1..845e13f6f27d 100644
--- a/pkgs/development/python-modules/asyncio-rlock/default.nix
+++ b/pkgs/development/python-modules/asyncio-rlock/default.nix
@@ -2,12 +2,13 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "asyncio-rlock";
   version = "0.1.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "asyncio_rlock";
@@ -15,6 +16,8 @@ buildPythonPackage rec {
     sha256 = "7e29824331619873e10d5d99dcc46d7b8f196c4a11b203f4eeccc0c091039d43";
   };
 
+  build-system = [ setuptools ];
+
   # no tests on PyPI, no tags on GitLab
   doCheck = false;
 

From 49f2b321aeac34edc0171d8018897e764bf5fef1 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 3 Jun 2026 21:20:35 +0700
Subject: [PATCH 042/151] python3Packages.asyncio-rlock: convert to finalAttrs

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

diff --git a/pkgs/development/python-modules/asyncio-rlock/default.nix b/pkgs/development/python-modules/asyncio-rlock/default.nix
index 845e13f6f27d..302e4a4d91c0 100644
--- a/pkgs/development/python-modules/asyncio-rlock/default.nix
+++ b/pkgs/development/python-modules/asyncio-rlock/default.nix
@@ -5,14 +5,14 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "asyncio-rlock";
   version = "0.1.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "asyncio_rlock";
-    inherit version;
+    inherit (finalAttrs) version;
     sha256 = "7e29824331619873e10d5d99dcc46d7b8f196c4a11b203f4eeccc0c091039d43";
   };
 
@@ -29,4 +29,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ dotlambda ];
   };
-}
+})

From 836d619e6c0aaf32536f89517afed1f1c5458cdf Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 3 Jun 2026 21:22:43 +0700
Subject: [PATCH 043/151] python3Packages.asyncio-rlock: use SRI hash format

---
 pkgs/development/python-modules/asyncio-rlock/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/asyncio-rlock/default.nix b/pkgs/development/python-modules/asyncio-rlock/default.nix
index 302e4a4d91c0..f6631ac56873 100644
--- a/pkgs/development/python-modules/asyncio-rlock/default.nix
+++ b/pkgs/development/python-modules/asyncio-rlock/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage (finalAttrs: {
   src = fetchPypi {
     pname = "asyncio_rlock";
     inherit (finalAttrs) version;
-    sha256 = "7e29824331619873e10d5d99dcc46d7b8f196c4a11b203f4eeccc0c091039d43";
+    hash = "sha256-fimCQzFhmHPhDV2Z3MRte48ZbEoRsgP07szAwJEDnUM=";
   };
 
   build-system = [ setuptools ];

From 8f46736a5f665ecda9b498ab327f9bac6b3a5e81 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 3 Jun 2026 21:30:48 +0700
Subject: [PATCH 044/151] python3Packages.avro-python3: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/avro-python3/default.nix b/pkgs/development/python-modules/avro-python3/default.nix
index 76e66516ce24..455693f55be5 100644
--- a/pkgs/development/python-modules/avro-python3/default.nix
+++ b/pkgs/development/python-modules/avro-python3/default.nix
@@ -5,12 +5,13 @@
   isPy3k,
   pycodestyle,
   isort,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "avro-python3";
   version = "1.10.2";
-  format = "setuptools";
+  pyproject = true;
   disabled = !isPy3k;
 
   src = fetchPypi {
@@ -18,6 +19,8 @@ buildPythonPackage rec {
     sha256 = "3b63f24e6b04368c3e4a6f923f484be0230d821aad65ac36108edbff29e9aaab";
   };
 
+  build-system = [ setuptools ];
+
   buildInputs = [
     pycodestyle
     isort

From 984b9014793a99055aba3abd2610b5065de65d85 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 3 Jun 2026 21:33:42 +0700
Subject: [PATCH 045/151] python3Packages.avro-python3: convert to finalAttrs

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

diff --git a/pkgs/development/python-modules/avro-python3/default.nix b/pkgs/development/python-modules/avro-python3/default.nix
index 455693f55be5..a727b6b33cb7 100644
--- a/pkgs/development/python-modules/avro-python3/default.nix
+++ b/pkgs/development/python-modules/avro-python3/default.nix
@@ -8,14 +8,14 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "avro-python3";
   version = "1.10.2";
   pyproject = true;
   disabled = !isPy3k;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     sha256 = "3b63f24e6b04368c3e4a6f923f484be0230d821aad65ac36108edbff29e9aaab";
   };
 
@@ -38,4 +38,4 @@ buildPythonPackage rec {
       lib.maintainers.timma
     ];
   };
-}
+})

From 4586e5741305daad8d2a84c921f50c4f1f0b9d43 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 3 Jun 2026 21:33:49 +0700
Subject: [PATCH 046/151] python3Packages.azure-applicationinsights: migrate to
 pyproject

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

diff --git a/pkgs/development/python-modules/azure-applicationinsights/default.nix b/pkgs/development/python-modules/azure-applicationinsights/default.nix
index 255a4d51f57b..4ca601cacb73 100644
--- a/pkgs/development/python-modules/azure-applicationinsights/default.nix
+++ b/pkgs/development/python-modules/azure-applicationinsights/default.nix
@@ -4,12 +4,13 @@
   fetchPypi,
   azure-common,
   msrest,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "azure-applicationinsights";
   version = "0.1.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
@@ -17,7 +18,9 @@ buildPythonPackage rec {
     hash = "sha256-qIRbgDZbfyALrR9xqA0NMfO+wB7f1GfftsE+or1xupY=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     azure-common
     msrest
   ];

From bf3176a89afad73058be3aad4a88ceff314561e4 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 3 Jun 2026 21:36:27 +0700
Subject: [PATCH 047/151] python3Packages.avro-python3: use SRI hash format

---
 pkgs/development/python-modules/avro-python3/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/avro-python3/default.nix b/pkgs/development/python-modules/avro-python3/default.nix
index a727b6b33cb7..63aec09a8efb 100644
--- a/pkgs/development/python-modules/avro-python3/default.nix
+++ b/pkgs/development/python-modules/avro-python3/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: {
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "3b63f24e6b04368c3e4a6f923f484be0230d821aad65ac36108edbff29e9aaab";
+    hash = "sha256-O2PyTmsENow+Sm+SP0hL4CMNghqtZaw2EI7b/ynpqqs=";
   };
 
   build-system = [ setuptools ];

From bce9800bed8e1a5a71a7d237c3621300882e9596 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 3 Jun 2026 21:36:54 +0700
Subject: [PATCH 048/151] python3Packages.azure-applicationinsights: convert to
 finalAttrs

---
 .../python-modules/azure-applicationinsights/default.nix    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/azure-applicationinsights/default.nix b/pkgs/development/python-modules/azure-applicationinsights/default.nix
index 4ca601cacb73..d126eba4db56 100644
--- a/pkgs/development/python-modules/azure-applicationinsights/default.nix
+++ b/pkgs/development/python-modules/azure-applicationinsights/default.nix
@@ -7,13 +7,13 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "azure-applicationinsights";
   version = "0.1.1";
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     extension = "zip";
     hash = "sha256-qIRbgDZbfyALrR9xqA0NMfO+wB7f1GfftsE+or1xupY=";
   };
@@ -34,4 +34,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ maxwilson ];
   };
-}
+})

From 590672d307dd402b07a52272499bcfa50bbb8eed Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 3 Jun 2026 21:38:12 +0700
Subject: [PATCH 049/151] python3Packages.azure-cosmosdb-nspkg: migrate to
 pyproject

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

diff --git a/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix b/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix
index 61dd20fe6909..4c5621fe6b80 100644
--- a/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix
+++ b/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix
@@ -3,19 +3,22 @@
   buildPythonPackage,
   fetchPypi,
   azure-nspkg,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "azure-cosmosdb-nspkg";
   version = "2.0.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "acf691e692818d9a65c653c7a3485eb8e35c0bdc496bba652e5ea3905ba09cd8";
   };
 
-  propagatedBuildInputs = [ azure-nspkg ];
+  build-system = [ setuptools ];
+
+  dependencies = [ azure-nspkg ];
 
   # has no tests
   doCheck = false;

From cbce6f20bd83834ccd556b20f94ff0e21c9a903b Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 3 Jun 2026 21:40:56 +0700
Subject: [PATCH 050/151] python3Packages.azure-cosmosdb-nspkg: convert to
 finalAttrs

---
 .../python-modules/azure-cosmosdb-nspkg/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix b/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix
index 4c5621fe6b80..4ddb6ba1b634 100644
--- a/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix
+++ b/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix
@@ -6,13 +6,13 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "azure-cosmosdb-nspkg";
   version = "2.0.2";
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     sha256 = "acf691e692818d9a65c653c7a3485eb8e35c0bdc496bba652e5ea3905ba09cd8";
   };
 
@@ -29,4 +29,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ maxwilson ];
   };
-}
+})

From 077da835f04a51fd6a4e01eb4b16d9cdf18eb3ec Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 3 Jun 2026 21:41:38 +0700
Subject: [PATCH 051/151] python3Packages.azure-datalake-store: migrate to
 pyproject

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

diff --git a/pkgs/development/python-modules/azure-datalake-store/default.nix b/pkgs/development/python-modules/azure-datalake-store/default.nix
index daba72dea70d..0f8c88b1828f 100644
--- a/pkgs/development/python-modules/azure-datalake-store/default.nix
+++ b/pkgs/development/python-modules/azure-datalake-store/default.nix
@@ -6,12 +6,13 @@
   fetchPypi,
   msal,
   requests,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "azure-datalake-store";
   version = "1.0.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "azure_datalake_store";
@@ -19,7 +20,9 @@ buildPythonPackage rec {
     hash = "sha256-U2TURFqrFUocfLECFWKcPORs5ceqrxYHGJDAP65ToDU=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     adal
     azure-common
     msal

From d387e15483ef01860dec55438a7d6adb772441f5 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 3 Jun 2026 21:44:03 +0700
Subject: [PATCH 052/151] python3Packages.azure-cosmosdb-nspkg: use SRI hash
 format

---
 .../development/python-modules/azure-cosmosdb-nspkg/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix b/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix
index 4ddb6ba1b634..2a82b9b7e971 100644
--- a/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix
+++ b/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage (finalAttrs: {
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "acf691e692818d9a65c653c7a3485eb8e35c0bdc496bba652e5ea3905ba09cd8";
+    hash = "sha256-rPaR5pKBjZplxlPHo0heuONcC9xJa7plLl6jkFugnNg=";
   };
 
   build-system = [ setuptools ];

From dfef183f17481ba2f9e3fc9aed0515925d1c6589 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 3 Jun 2026 21:44:08 +0700
Subject: [PATCH 053/151] python3Packages.azure-datalake-store: convert to
 finalAttrs

---
 .../python-modules/azure-datalake-store/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/azure-datalake-store/default.nix b/pkgs/development/python-modules/azure-datalake-store/default.nix
index 0f8c88b1828f..fe659949a4d2 100644
--- a/pkgs/development/python-modules/azure-datalake-store/default.nix
+++ b/pkgs/development/python-modules/azure-datalake-store/default.nix
@@ -9,14 +9,14 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "azure-datalake-store";
   version = "1.0.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "azure_datalake_store";
-    inherit version;
+    inherit (finalAttrs) version;
     hash = "sha256-U2TURFqrFUocfLECFWKcPORs5ceqrxYHGJDAP65ToDU=";
   };
 
@@ -38,4 +38,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ maxwilson ];
   };
-}
+})

From d4b9693e0fe7e4f5cf9b6a0c9dd98eddc390b04f Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Wed, 3 Jun 2026 17:15:21 +0200
Subject: [PATCH 054/151] python3Packages.hiredis: 3.3.1 -> 3.4.0

changelog: https://github.com/redis/hiredis-py/releases/tag/v3.4.0

diff: https://github.com/redis/hiredis-py/compare/v3.3.1...v3.4.0
---
 pkgs/development/python-modules/hiredis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hiredis/default.nix b/pkgs/development/python-modules/hiredis/default.nix
index 9ce30aaeb48c..32f16418edd8 100644
--- a/pkgs/development/python-modules/hiredis/default.nix
+++ b/pkgs/development/python-modules/hiredis/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "hiredis";
-  version = "3.3.1";
+  version = "3.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     repo = "hiredis-py";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-HqQICYjHpUX7/OsaWXJRFeeZDxKKuGJ1x5JiJ9eLmdw=";
+    hash = "sha256-TXhl9ny6hdd4n/hHfTAL0ewGcnjZ1vvNwovklSgzkKk=";
   };
 
   build-system = [ setuptools ];

From c8fe7b0ad9e30f4a3b9bcaf8ec57f19a204712be Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Wed, 3 Jun 2026 17:16:10 +0200
Subject: [PATCH 055/151] python3Packages.hiredis: modernize

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

diff --git a/pkgs/development/python-modules/hiredis/default.nix b/pkgs/development/python-modules/hiredis/default.nix
index 32f16418edd8..55c2725e9edb 100644
--- a/pkgs/development/python-modules/hiredis/default.nix
+++ b/pkgs/development/python-modules/hiredis/default.nix
@@ -10,7 +10,7 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "hiredis";
   version = "3.4.0";
   pyproject = true;
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "redis";
     repo = "hiredis-py";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-TXhl9ny6hdd4n/hHfTAL0ewGcnjZ1vvNwovklSgzkKk=";
   };
@@ -36,8 +36,8 @@ buildPythonPackage rec {
   meta = {
     description = "Wraps protocol parsing code in hiredis, speeds up parsing of multi bulk replies";
     homepage = "https://github.com/redis/hiredis-py";
-    changelog = "https://github.com/redis/hiredis-py/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/redis/hiredis-py/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.bsd3;
     maintainers = [ ];
   };
-}
+})

From 7b8e4fa0b10b95f8e0adcbf5b1bba1d55e6b97b9 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Wed, 3 Jun 2026 17:16:33 +0200
Subject: [PATCH 056/151] python3Packages.hiredis: add hythera as maintainer

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

diff --git a/pkgs/development/python-modules/hiredis/default.nix b/pkgs/development/python-modules/hiredis/default.nix
index 55c2725e9edb..b83ac28068a4 100644
--- a/pkgs/development/python-modules/hiredis/default.nix
+++ b/pkgs/development/python-modules/hiredis/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage (finalAttrs: {
     homepage = "https://github.com/redis/hiredis-py";
     changelog = "https://github.com/redis/hiredis-py/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.bsd3;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ hythera ];
   };
 })

From f9c51806df3cd96665240db3e257c26af7dc3cad Mon Sep 17 00:00:00 2001
From: whispers <whispersofthedawn@duck.com>
Date: Wed, 3 Jun 2026 12:13:12 -0400
Subject: [PATCH 057/151] arti: 2.3.0 -> 2.4.0

announcement: https://blog.torproject.org/arti_2_4_0_released/
changelog: https://gitlab.torproject.org/tpo/core/arti/-/blob/arti-v2.4.0/CHANGELOG.md
diff: https://gitlab.torproject.org/tpo/core/arti/-/compare/arti-v2.3.0...arti-v2.4.0
---
 pkgs/by-name/ar/arti/package.nix | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/ar/arti/package.nix b/pkgs/by-name/ar/arti/package.nix
index 71b8f3225149..f4d55df325cc 100644
--- a/pkgs/by-name/ar/arti/package.nix
+++ b/pkgs/by-name/ar/arti/package.nix
@@ -13,7 +13,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "arti";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.torproject.org";
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "core";
     repo = "arti";
     tag = "arti-v${finalAttrs.version}";
-    hash = "sha256-OEGKjYJ3p4g0ZfeK6k8IJJPjgSBMrSlKlxsCw1OwyaI=";
+    hash = "sha256-YLOdrHstmN2pLl75uclkbpN5h3iBs3xpraZ8XN6R/+Q=";
   };
 
   # Working around a bug in cargo that appears with cargo-auditable, see
@@ -31,22 +31,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '"tor-rpcbase"' '"dep:tor-rpcbase"'
   '';
 
-  cargoHash = "sha256-OJgrIXL185W9rcQd7XZsgiqN4in74Oc2jDT1ZmcCC6E=";
+  buildAndTestSubdir = "crates/arti";
+  cargoHash = "sha256-7X3JJbt0/jxaMvBR3XQvguR7tqd96kiqX66G2byvPjM=";
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
 
   buildInputs = [ sqlite ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl ];
-
-  cargoBuildFlags = [
-    "--package"
-    "arti"
-  ];
-
-  cargoTestFlags = [
-    "--package"
-    "arti"
-  ];
-
   # `full` includes all stable and non-conflicting feature flags. the primary
   # downsides are increased binary size and memory usage for building, but
   # those are acceptable for nixpkgs
@@ -69,9 +59,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # sandbox. this does NOT affect downstream users of Arti.
   env.ARTI_FS_DISABLE_PERMISSION_CHECKS = 1;
 
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
+  nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
 
   passthru = {
@@ -84,10 +72,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "arti";
     homepage = "https://arti.torproject.org/";
     changelog = "https://gitlab.torproject.org/tpo/core/arti/-/blob/arti-v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [
-      asl20
-      mit
-    ];
+    license =
+      with lib.licenses;
+      OR [
+        asl20
+        mit
+      ];
     maintainers = with lib.maintainers; [
       rapiteanu
       whispersofthedawn

From c8d2c2cc134ac499013f598f05dd23ad2c8676ab Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 3 Jun 2026 20:35:50 +0200
Subject: [PATCH 058/151] {libsForQt5,qt6Packages}.qzxing: Fix
 passthru.updateScript

Otherwise it tries to bump back to a tag from 2016.
---
 pkgs/development/libraries/qzxing/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qzxing/default.nix b/pkgs/development/libraries/qzxing/default.nix
index 1159a6c9819c..980047a5a6dd 100644
--- a/pkgs/development/libraries/qzxing/default.nix
+++ b/pkgs/development/libraries/qzxing/default.nix
@@ -2,7 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  nix-update-script,
+  gitUpdater,
   testers,
   qmake,
   qtmultimedia,
@@ -52,7 +52,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-    updateScript = nix-update-script { };
+    updateScript = gitUpdater {
+      rev-prefix = "v";
+    };
   };
 
   meta = {

From d355b592b89e3d2fc4ba8b50e98322cc777395da Mon Sep 17 00:00:00 2001
From: whispers <whispersofthedawn@duck.com>
Date: Wed, 3 Jun 2026 14:47:45 -0400
Subject: [PATCH 059/151] arti: add patch for TROVE-2026-024

TROVE: https://gitlab.torproject.org/tpo/core/team/-/wikis/NetworkTeam/TROVE

an invalid assumption of ASCII in port policies could allow a malicious
directory cache to crash arti clients. this issue was originally
publicly reported at
https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/4049
and the final fix was merged as
https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/4062. this
allows for DoSing clients, and has been allocated the the TROVE-2026-024
id with medium severity. we fetch the patch for it here, and may upgrade
to 2.4.1 or similar if upstream releases one.
---
 pkgs/by-name/ar/arti/package.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/by-name/ar/arti/package.nix b/pkgs/by-name/ar/arti/package.nix
index f4d55df325cc..e01cc45f7814 100644
--- a/pkgs/by-name/ar/arti/package.nix
+++ b/pkgs/by-name/ar/arti/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   rustPlatform,
   fetchFromGitLab,
+  fetchpatch,
   pkg-config,
   sqlite,
   openssl,
@@ -24,6 +25,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-YLOdrHstmN2pLl75uclkbpN5h3iBs3xpraZ8XN6R/+Q=";
   };
 
+  patches = [
+    # Fixes a panic that could allow malicious directory caches to crash
+    # clients.
+    # https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/4062
+    (fetchpatch {
+      name = "TROVE-2026-024.patch";
+      url = "https://gitlab.torproject.org/tpo/core/arti/-/commit/f69be8c70561629e63004788f0aa4bf898025f93.patch";
+      hash = "sha256-P0sXTKOBW7ulqQZwmTVJfrpLksLyaonuDpxGF2keDqE=";
+    })
+  ];
+
   # Working around a bug in cargo that appears with cargo-auditable, see
   # https://github.com/rust-secure-code/cargo-auditable/issues/124.
   postPatch = ''

From 361e93dd22459110c163724b482a8f35db27a1f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 3 Jun 2026 12:09:30 -0700
Subject: [PATCH 060/151] liblangtag: 0.6.7 -> 0.6.8

Changelog: https://gitlab.com/tagoh/liblangtag/-/blob/0.6.8/NEWS
---
 pkgs/by-name/li/liblangtag/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/li/liblangtag/package.nix b/pkgs/by-name/li/liblangtag/package.nix
index c1139daa7bd6..86243172cf54 100644
--- a/pkgs/by-name/li/liblangtag/package.nix
+++ b/pkgs/by-name/li/liblangtag/package.nix
@@ -16,18 +16,18 @@
 
 stdenv.mkDerivation rec {
   pname = "liblangtag";
-  version = "0.6.7";
+  version = "0.6.8";
 
   # Artifact tarball contains lt-localealias.h needed for darwin
   src = fetchurl {
-    url = "https://bitbucket.org/tagoh/liblangtag/downloads/liblangtag-${version}.tar.bz2";
-    hash = "sha256-Xta81K4/PAXJEuYvIWzRpEEjhGFH9ymkn7VmjaUeAw4=";
+    url = "https://gitlab.com/tagoh/liblangtag/-/releases/${version}/downloads/liblangtag-${version}.tar.bz2";
+    hash = "sha256-qWl1t53dj+9tkpXAg/4/GvoaiJilcjXUBpJVreROXPI=";
   };
 
   core_zip = fetchurl {
     # please update if an update is available
-    url = "http://www.unicode.org/Public/cldr/46/core.zip";
-    hash = "sha256-+86cInWGKtJmaPs0eD/mwznz2S3f61oQoXdftYGBoV0=";
+    url = "http://www.unicode.org/Public/cldr/48/core.zip";
+    hash = "sha256-BsfGmNb9jWfO+sFaAgawEJsA4O8WNvhvhESfqVlWH3Q=";
   };
 
   language_subtag_registry = fetchurl {
@@ -66,11 +66,11 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
+    changelog = "https://gitlab.com/tagoh/liblangtag/-/blob/${version}/NEWS";
     description = "Interface library to access tags for identifying languages";
     license = lib.licenses.mpl20;
     maintainers = [ lib.maintainers.raskin ];
     platforms = lib.platforms.unix;
-    # There are links to a homepage that are broken by a BitBucket change
-    homepage = "https://bitbucket.org/tagoh/liblangtag/overview";
+    homepage = "https://gitlab.com/tagoh/liblangtag";
   };
 }

From 3e799787979ebb07cd81e38539951d201b4a380c Mon Sep 17 00:00:00 2001
From: Anton Mosich <anton@mosich.at>
Date: Thu, 4 Jun 2026 01:47:36 +0200
Subject: [PATCH 061/151] python3Packages.ingredient-parser-nlp: 2.6.0 -> 2.7.0

python-crfsuite is no longer a runtime dependency
---
 .../python-modules/ingredient-parser-nlp/default.nix        | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/ingredient-parser-nlp/default.nix b/pkgs/development/python-modules/ingredient-parser-nlp/default.nix
index 67ab95c9a912..760b79ad46d3 100644
--- a/pkgs/development/python-modules/ingredient-parser-nlp/default.nix
+++ b/pkgs/development/python-modules/ingredient-parser-nlp/default.nix
@@ -8,21 +8,20 @@
   nltk,
   numpy,
   pint,
-  python-crfsuite,
 
   pytestCheckHook,
   nltk-data,
 }:
 buildPythonPackage rec {
   pname = "ingredient-parser-nlp";
-  version = "2.6.0";
+  version = "2.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "strangetom";
     repo = "ingredient-parser";
     tag = version;
-    hash = "sha256-jssQSzLcIZ6ss9+FksUE9Q9IwkNvQqq57zRUg+KHAhM=";
+    hash = "sha256-WodKuK4CaBipKxLQyOgQ0sFfTDzS/F0URgkoQaFNoNc=";
   };
 
   build-system = [ setuptools ];
@@ -31,7 +30,6 @@ buildPythonPackage rec {
     nltk
     numpy
     pint
-    python-crfsuite
   ];
 
   nativeCheckInputs = [

From ba64ff9604600267e4896ec77c5a135185ae2314 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Wed, 3 Jun 2026 17:14:50 -0700
Subject: [PATCH 062/151] style50: 2.11.0 -> 3.0.0

Changelog: https://github.com/cs50/style50/releases/tag/v3.0.0

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/st/style50/package.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/st/style50/package.nix b/pkgs/by-name/st/style50/package.nix
index f9397b5b806b..f6e55ca2f248 100644
--- a/pkgs/by-name/st/style50/package.nix
+++ b/pkgs/by-name/st/style50/package.nix
@@ -2,20 +2,21 @@
   lib,
   python3Packages,
   fetchFromGitHub,
+  djhtml,
   libclang,
   versionCheckHook,
 }:
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "style50";
-  version = "2.11.0";
+  version = "3.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cs50";
     repo = "style50";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-THmxq69peJwT3XQKEpT+ooBYaDDkn1HHGVH5rvM/FF8=";
+    hash = "sha256-D2ucfVVGZFzmcAUyOfu97QJ8x9pzRo1hYrwZlV8MRN8=";
   };
 
   build-system = [
@@ -24,11 +25,14 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   dependencies = with python3Packages; [
     autopep8
+    cssbeautifier
+    djhtml
     icdiff
     jinja2
     jsbeautifier
     pycodestyle
     python-magic
+    sqlparse
     termcolor
   ];
 
@@ -50,9 +54,10 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   pythonImportsCheck = [ "style50" ];
 
-  nativeCheckInputs = [ versionCheckHook ];
-
-  # no python tests
+  nativeCheckInputs = [
+    python3Packages.pytestCheckHook
+    versionCheckHook
+  ];
 
   meta = {
     description = "Tool for checking code against the CS50 style guide";

From f5f657ac66360c086e09c5eeb75dcbb69922e7e3 Mon Sep 17 00:00:00 2001
From: PhiliPdB <phlpdbrn@gmail.com>
Date: Wed, 3 Jun 2026 20:49:39 +0200
Subject: [PATCH 063/151] rapidraw: 1.5.5 -> 1.5.6

Changelog: https://github.com/CyberTimon/RapidRAW/releases/tag/v1.5.6
Diff: https://github.com/CyberTimon/RapidRAW/compare/v1.5.5...v1.5.6
---
 pkgs/by-name/ra/rapidraw/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ra/rapidraw/package.nix b/pkgs/by-name/ra/rapidraw/package.nix
index 7ea1c09446cb..25cbccf8d890 100644
--- a/pkgs/by-name/ra/rapidraw/package.nix
+++ b/pkgs/by-name/ra/rapidraw/package.nix
@@ -42,20 +42,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rapidraw";
-  version = "1.5.5";
+  version = "1.5.6";
 
   src = fetchFromGitHub {
     owner = "CyberTimon";
     repo = "RapidRAW";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CnH8EuHzHxuXbnOry2gMU/tMqpE8++ztyNPk3HHdZqE=";
+    hash = "sha256-pfOdq2Q7GLGbzcgFkrRiczMWnS5TImbayYE1VWenYuo=";
   };
 
-  cargoHash = "sha256-c2MK1DyonfeZKfZAVWfwVh/In5SqKq7nnFrlz2686SM=";
+  cargoHash = "sha256-liWOY+Jq8Yqo0QsntKjq2ntMAacfFyHCm6yhQM+KwRA=";
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
-    hash = "sha256-1A6b63FjNvkAbu62dRXfMjTL1y2wr2gEsZkLqYvTk0w=";
+    hash = "sha256-JtkzeCt21KIEshvoCHWo1QoxUgvVJN1loJrUHgvV4qE=";
   };
 
   nativeBuildInputs = [

From cfe306cfe52908320da49457d86c21fca9280e9e Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Thu, 4 Jun 2026 08:34:59 +0000
Subject: [PATCH 064/151] python3Packages.iterable-io: 1.0.1 -> 1.0.4

https://github.com/pR0Ps/iterable-io/blob/refs/tags/v1.0.4/CHANGELOG.md
https://github.com/pR0Ps/iterable-io/compare/refs/tags/v1.0.1...refs/tags/v1.0.4
---
 pkgs/development/python-modules/iterable-io/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/iterable-io/default.nix b/pkgs/development/python-modules/iterable-io/default.nix
index dd07c69333f4..06a30841f50d 100644
--- a/pkgs/development/python-modules/iterable-io/default.nix
+++ b/pkgs/development/python-modules/iterable-io/default.nix
@@ -2,23 +2,23 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  setuptools,
+  hatchling,
   pytestCheckHook,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "iterable-io";
-  version = "1.0.1";
+  version = "1.0.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pR0Ps";
     repo = "iterable-io";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mS8x3M0DNnwW6Ov3TG8b2J702rjOnZT9r38fsIUXkro=";
+    hash = "sha256-6qhizeRZONxEthkk468U6Lh7ES7kgWDBfwsdZm5tuX8=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  nativeBuildInputs = [ hatchling ];
 
   pythonImportsCheck = [ "iterableio" ];
 

From 235013cf37a7ef61d817af1e4c6115b295293bc4 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 3 Jun 2026 22:34:12 +0200
Subject: [PATCH 065/151] treewide: drop unnecessary toString calls

Scope:
- Combination of
  - Textual matches of "baseNameOf (toString"
  - Redundant toString calls I've found with my latest
    "lazy paths" nix branch as they force lazy fetches into
    the store. More info and new PR soon.
- Only cases I believe are worthwhile or easily determined

I've determined the validity by
- testing llvmPackages instantiation
- figuring out which types can pass into any particular
  toString call - "human fuzzy type checker"

Behavior considerations by type:

- `path`: converted back to a string *without* context
  `baseNameOf` does not copy things to the store on its own,
  equivalent to its behavior for string inputs
- `null`: converted to `""` -> may be valid input!
  ok if "" would not have been acceptable anyway
- `string` itself: passed through identically -> trivial
- `attrset` with `outPath`: same coercion as built into
  the `baseNameOf` function -> trivial
- other atomic types: generally not sensible inputs to
  `baseNameOf` -> fuzzy but true
---
 lib/sources.nix                                   |  4 ++--
 nixos/modules/services/hardware/fwupd.nix         |  2 +-
 .../replace-vars/replace-vars-with.nix            |  2 +-
 .../rust/build-rust-crate/test/rcgen-crates.nix   |  2 +-
 pkgs/build-support/substitute/substitute.nix      |  2 +-
 .../development/compilers/llvm/common/default.nix | 15 ++++++---------
 pkgs/kde/plasma/breeze-plymouth/default.nix       |  2 +-
 7 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/lib/sources.nix b/lib/sources.nix
index 43a374c16e73..81b8a8c77178 100644
--- a/lib/sources.nix
+++ b/lib/sources.nix
@@ -43,7 +43,7 @@ let
   cleanSourceFilter =
     name: type:
     let
-      baseName = baseNameOf (toString name);
+      baseName = baseNameOf name;
     in
     !(
       # Filter out version control software files/directories
@@ -270,7 +270,7 @@ let
       filter =
         name: type:
         let
-          base = baseNameOf (toString name);
+          base = baseNameOf name;
         in
         type == "directory" || lib.any (ext: lib.hasSuffix ext base) exts;
     in
diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix
index 1c059bf39e64..91e1afd1067e 100644
--- a/nixos/modules/services/hardware/fwupd.nix
+++ b/nixos/modules/services/hardware/fwupd.nix
@@ -35,7 +35,7 @@ let
     lib.listToAttrs (map mkEtcFile cfg.package.filesInstalledToEtc);
   extraTrustedKeys =
     let
-      mkName = p: "pki/fwupd/${baseNameOf (toString p)}";
+      mkName = p: "pki/fwupd/${baseNameOf p}";
       mkEtcFile = p: lib.nameValuePair (mkName p) { source = p; };
     in
     lib.listToAttrs (map mkEtcFile cfg.extraTrustedKeys);
diff --git a/pkgs/build-support/replace-vars/replace-vars-with.nix b/pkgs/build-support/replace-vars/replace-vars-with.nix
index c863c6fb617f..abbb9a1cc1a0 100644
--- a/pkgs/build-support/replace-vars/replace-vars-with.nix
+++ b/pkgs/build-support/replace-vars/replace-vars-with.nix
@@ -122,7 +122,7 @@ in
 
 stdenvNoCC.mkDerivation (
   {
-    name = baseNameOf (toString src);
+    name = baseNameOf src;
   }
   // optionalAttrs
   // forcedAttrs
diff --git a/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix
index 804308ed216f..563500ed0092 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix
@@ -4347,7 +4347,7 @@ rec {
     sourceFilter =
       name: type:
       let
-        baseName = baseNameOf (toString name);
+        baseName = baseNameOf name;
       in
       !(
         # Filter out git
diff --git a/pkgs/build-support/substitute/substitute.nix b/pkgs/build-support/substitute/substitute.nix
index 431a97c9b1ba..050e259f4eb1 100644
--- a/pkgs/build-support/substitute/substitute.nix
+++ b/pkgs/build-support/substitute/substitute.nix
@@ -29,7 +29,7 @@
 args:
 
 let
-  name = if args ? name then args.name else baseNameOf (toString args.src);
+  name = args.name or (baseNameOf args.src);
   deprecationReplacement = lib.pipe args.replacements [
     lib.toList
     (map (lib.splitString " "))
diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index 2a88fecc0b6e..cd15cd6f36a5 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -71,7 +71,7 @@ let
       ;
     src = monorepoSrc;
     versionDir =
-      (toString ../.) + "/${if (gitRelease != null) then "git" else lib.versions.major release_version}";
+      ../. + "/${if (gitRelease != null) then "git" else lib.versions.major release_version}";
     getVersionFile =
       p:
       builtins.path {
@@ -95,15 +95,12 @@ let
               matchBefore && matchAfter;
 
             patchDir =
-              toString
-                (
-                  if constraints == null then
-                    { path = metadata.versionDir; }
-                  else
-                    (lib.findFirst matchConstraint { path = metadata.versionDir; } constraints)
-                ).path;
+              if constraints == null then
+                metadata.versionDir
+              else
+                (lib.findFirst matchConstraint { path = metadata.versionDir; } constraints).path;
           in
-          "${patchDir}/${p}";
+          patchDir + ("/" + p);
       };
   };
 
diff --git a/pkgs/kde/plasma/breeze-plymouth/default.nix b/pkgs/kde/plasma/breeze-plymouth/default.nix
index d85dd1861a10..ccb7c6d9d3f0 100644
--- a/pkgs/kde/plasma/breeze-plymouth/default.nix
+++ b/pkgs/kde/plasma/breeze-plymouth/default.nix
@@ -26,7 +26,7 @@ let
   ];
   resolvedLogoName =
     if (logoFile != null && logoName == null) then
-      lib.strings.removeSuffix ".png" (baseNameOf (toString logoFile))
+      lib.strings.removeSuffix ".png" (baseNameOf logoFile)
     else
       logoName;
 in

From 5148bf43fd827ed56e3c7d1a104409ec72bb0089 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Thu, 4 Jun 2026 19:14:25 +0700
Subject: [PATCH 066/151] python3Packages.apcaccess: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/apcaccess/default.nix b/pkgs/development/python-modules/apcaccess/default.nix
index f3ada5f2a5ad..1fc9b155d61f 100644
--- a/pkgs/development/python-modules/apcaccess/default.nix
+++ b/pkgs/development/python-modules/apcaccess/default.nix
@@ -3,12 +3,13 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "apcaccess";
   version = "0.0.13";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "flyte";
@@ -22,6 +23,8 @@ buildPythonPackage rec {
       --replace "setup_requires='pytest-runner'," ""
   '';
 
+  build-system = [ setuptools ];
+
   pythonImportsCheck = [ "apcaccess" ];
 
   nativeCheckInputs = [ pytestCheckHook ];

From 0c3441fa08418895ced3091c4cac58b55d760fea Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Thu, 4 Jun 2026 19:16:23 +0700
Subject: [PATCH 067/151] python3Packages.apcaccess: modernize

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

diff --git a/pkgs/development/python-modules/apcaccess/default.nix b/pkgs/development/python-modules/apcaccess/default.nix
index 1fc9b155d61f..7b38dca90067 100644
--- a/pkgs/development/python-modules/apcaccess/default.nix
+++ b/pkgs/development/python-modules/apcaccess/default.nix
@@ -6,7 +6,7 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "apcaccess";
   version = "0.0.13";
   pyproject = true;
@@ -14,13 +14,13 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "flyte";
     repo = "apcaccess";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-XLoNRh6MgXCfRtWD9NpVZSyroW6E9nRYw6Grxa+AQkc=";
   };
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "setup_requires='pytest-runner'," ""
+      --replace-fail "setup_requires='pytest-runner'," ""
   '';
 
   build-system = [ setuptools ];
@@ -36,4 +36,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ uvnikita ];
   };
-}
+})

From 61006c1b34f70d670b9de64bca0e8ec501326345 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Thu, 4 Jun 2026 19:19:15 +0700
Subject: [PATCH 068/151] python3Packages.apcaccess: add meta.changelog

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

diff --git a/pkgs/development/python-modules/apcaccess/default.nix b/pkgs/development/python-modules/apcaccess/default.nix
index 7b38dca90067..2e14b11b614d 100644
--- a/pkgs/development/python-modules/apcaccess/default.nix
+++ b/pkgs/development/python-modules/apcaccess/default.nix
@@ -33,6 +33,7 @@ buildPythonPackage (finalAttrs: {
     description = "Library offers programmatic access to the status information provided by apcupsd over its Network Information Server";
     mainProgram = "apcaccess";
     homepage = "https://github.com/flyte/apcaccess";
+    changelog = "https://github.com/flyte/apcaccess/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ uvnikita ];
   };

From e29d520a1f2527447c57e4c58b3a8c2b1979d162 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 4 Jun 2026 15:04:41 +0000
Subject: [PATCH 069/151] python3Packages.pyzx: 0.9.0 -> 0.10.3

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

diff --git a/pkgs/development/python-modules/pyzx/default.nix b/pkgs/development/python-modules/pyzx/default.nix
index a27aa23ac3cc..6f4cd83f4da2 100644
--- a/pkgs/development/python-modules/pyzx/default.nix
+++ b/pkgs/development/python-modules/pyzx/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "pyzx";
-  version = "0.9.0";
+  version = "0.10.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zxcalc";
     repo = "pyzx";
     tag = "v${version}";
-    hash = "sha256-MhsbJIDeSIeF0LaHhI6nNxPD3ZjBWh5yvLGuwBH41a4=";
+    hash = "sha256-pvwn1Kva2T9twrWieqWmB7DR+vTbRsARs1ltHQ3V2g4=";
   };
 
   build-system = [ setuptools ];

From fbc7b7e6ca08b0ea27aa6cc7fbe3df09b63fb0a5 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Thu, 4 Jun 2026 22:25:51 +0700
Subject: [PATCH 070/151] python3Packages.azure-synapse-artifacts: migrate to
 pyproject

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

diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
index f85680118c80..0be87b69ae74 100644
--- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
+++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
@@ -6,12 +6,13 @@
   buildPythonPackage,
   fetchPypi,
   isodate,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "azure-synapse-artifacts";
   version = "0.22.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "azure_synapse_artifacts";
@@ -19,7 +20,9 @@ buildPythonPackage rec {
     hash = "sha256-3cD7Yic4w+q3RlzkKM+gzUGtAahw+9RTYeTVjRdcYjw=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     azure-common
     azure-core
     azure-mgmt-core

From 987a1216a15085045a501587f51ddb691e3b391a Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 4 Jun 2026 11:36:31 -0500
Subject: [PATCH 071/151] ankacoder-condensed: migrate to finalAttrs

Assisted-by: Cursor Composer 2.5
---
 pkgs/by-name/an/ankacoder-condensed/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/an/ankacoder-condensed/package.nix b/pkgs/by-name/an/ankacoder-condensed/package.nix
index 359fd69ad37b..0b9c914a2634 100644
--- a/pkgs/by-name/an/ankacoder-condensed/package.nix
+++ b/pkgs/by-name/an/ankacoder-condensed/package.nix
@@ -4,12 +4,12 @@
   fetchzip,
 }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "ankacoder-condensed";
   version = "1.100";
 
   src = fetchzip {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoderCondensed.${version}.zip";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoderCondensed.${finalAttrs.version}.zip";
     stripRoot = false;
     hash = "sha256-NHrkV4Sb7i+DC4e4lToEYzah3pI+sKyYf2rGbhWj7iY=";
   };
@@ -30,4 +30,4 @@ stdenvNoCC.mkDerivation rec {
     maintainers = [ ];
     platforms = lib.platforms.all;
   };
-}
+})

From 9cbc0b1da57c4463cf8361e3ed88a9abf0036823 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Thu, 4 Jun 2026 16:55:06 +0300
Subject: [PATCH 072/151] pigz: adopt

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

diff --git a/pkgs/by-name/pi/pigz/package.nix b/pkgs/by-name/pi/pigz/package.nix
index ed6c513cc5f1..099cea1f30b0 100644
--- a/pkgs/by-name/pi/pigz/package.nix
+++ b/pkgs/by-name/pi/pigz/package.nix
@@ -41,7 +41,9 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.zlib.net/pigz/";
     description = "Parallel implementation of gzip for multi-core machines";
     mainProgram = "pigz";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [
+      sandarukasa
+    ];
     license = lib.licenses.zlib;
     platforms = lib.platforms.unix;
   };

From 164e921f9423e06e9bbe30741b6a38b4f00db605 Mon Sep 17 00:00:00 2001
From: DarkOnion0 <darkonion0@clapot.org>
Date: Thu, 4 Jun 2026 19:31:52 +0200
Subject: [PATCH 073/151] drawio: 29.7.9 -> 30.0.4

https://github.com/jgraph/drawio-desktop/releases/tag/v30.0.4
---
 pkgs/by-name/dr/drawio/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/dr/drawio/package.nix b/pkgs/by-name/dr/drawio/package.nix
index cb8bd92affac..f93da550e2cd 100644
--- a/pkgs/by-name/dr/drawio/package.nix
+++ b/pkgs/by-name/dr/drawio/package.nix
@@ -14,25 +14,25 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "drawio";
-  version = "29.7.9";
+  version = "30.0.4";
 
   src = fetchFromGitHub {
     owner = "jgraph";
     repo = "drawio-desktop";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-D3jrVGP0RHKssSjvA8pg1qXfTjYq+linbXCbZz2kTNw=";
+    hash = "sha256-kkKiGRxztEVFo/wlcdBYcDlxadNarcTyL1MqwonfVY4=";
   };
 
   # `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead
   postPatch = ''
-    substituteInPlace ./build/fuses.cjs \
+    substituteInPlace ./build/fuses.mjs \
       --replace-fail "resetAdHocDarwinSignature:" "// resetAdHocDarwinSignature:"
   '';
 
   offlineCache = fetchNpmDeps {
     src = finalAttrs.src;
-    hash = "sha256-luOQn7S5hXdUa3VrJyQRt0IFLnzfrnTNHIIZSqHQhaI=";
+    hash = "sha256-hv1LQwsSOsBR5l/joUmXq6foQsVilH+jw3Wje24ISCg=";
   };
 
   nativeBuildInputs = [

From 118c019290d819932879a4254ccd395175f9ae41 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 4 Jun 2026 13:23:17 -0500
Subject: [PATCH 074/151] apache-jena: migrate to finalAttrs

Assisted-by: Cursor Composer 2.5
---
 pkgs/by-name/ap/apache-jena/package.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ap/apache-jena/package.nix b/pkgs/by-name/ap/apache-jena/package.nix
index 9a2160db1c54..08e41eee5a6e 100644
--- a/pkgs/by-name/ap/apache-jena/package.nix
+++ b/pkgs/by-name/ap/apache-jena/package.nix
@@ -6,22 +6,26 @@
   makeWrapper,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "apache-jena";
   version = "6.1.0";
+
   src = fetchurl {
-    url = "mirror://apache/jena/binaries/apache-jena-${version}.tar.gz";
+    url = "mirror://apache/jena/binaries/apache-jena-${finalAttrs.version}.tar.gz";
     hash = "sha256-ZTEIqR/Zswmom8dWJYuuC8oBWHzvR1lC0RhS4766KuM=";
   };
+
   nativeBuildInputs = [
     makeWrapper
   ];
+
   installPhase = ''
     cp -r . "$out"
     for i in "$out"/bin/*; do
       wrapProgram "$i" --prefix "PATH" : "${jre}/bin/"
     done
   '';
+
   meta = {
     description = "RDF database";
     license = lib.licenses.asl20;
@@ -30,4 +34,4 @@ stdenv.mkDerivation rec {
     homepage = "https://jena.apache.org";
     downloadPage = "https://archive.apache.org/dist/jena/binaries/";
   };
-}
+})

From ee8fb5d26bf0016e648da7701e71ca424934df44 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 4 Jun 2026 13:36:41 -0500
Subject: [PATCH 075/151] apache-jena-fuseki: migrate to finalAttrs

Assisted-by: Cursor Composer 2.5
---
 pkgs/by-name/ap/apache-jena-fuseki/package.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ap/apache-jena-fuseki/package.nix b/pkgs/by-name/ap/apache-jena-fuseki/package.nix
index 75d70a830dfc..7546db4358b7 100644
--- a/pkgs/by-name/ap/apache-jena-fuseki/package.nix
+++ b/pkgs/by-name/ap/apache-jena-fuseki/package.nix
@@ -10,16 +10,19 @@
   pkgs,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "apache-jena-fuseki";
   version = "5.1.0";
+
   src = fetchurl {
-    url = "mirror://apache/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
+    url = "mirror://apache/jena/binaries/apache-jena-fuseki-${finalAttrs.version}.tar.gz";
     hash = "sha256-GcwXcLVM2txPC+kkHjEIpqK9dTkQEN9Jkka0EaJRO7Q=";
   };
+
   nativeBuildInputs = [
     makeWrapper
   ];
+
   installPhase = ''
     cp -r . "$out"
     chmod +x $out/fuseki
@@ -34,11 +37,13 @@ stdenv.mkDerivation rec {
         ;
     done
   '';
+
   passthru = {
     tests = {
       basic-test = pkgs.callPackage ./basic-test.nix { };
     };
   };
+
   meta = {
     description = "SPARQL server";
     license = lib.licenses.asl20;
@@ -52,4 +57,4 @@ stdenv.mkDerivation rec {
     downloadPage = "https://archive.apache.org/dist/jena/binaries/";
     mainProgram = "fuseki";
   };
-}
+})

From 33394080e7aef8f364d29ff304408d6d4f971313 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Thu, 4 Jun 2026 22:43:40 +0300
Subject: [PATCH 076/151] pigz: enable `strictDeps` & `__structuredAttrs`

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

diff --git a/pkgs/by-name/pi/pigz/package.nix b/pkgs/by-name/pi/pigz/package.nix
index 099cea1f30b0..bf8de155a7f6 100644
--- a/pkgs/by-name/pi/pigz/package.nix
+++ b/pkgs/by-name/pi/pigz/package.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-PzdxyO4mCg2jE/oBk1MH+NUdWM95wIIIbncBg71BkmQ=";
   };
 
+  strictDeps = true;
+  __structuredAttrs = true;
   enableParallelBuilding = true;
 
   buildInputs = [ zlib ] ++ lib.optional stdenv.hostPlatform.isLinux util-linux;

From ec0bef96ec323f16e2c343e8e4456911fa7262d0 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Thu, 4 Jun 2026 22:43:40 +0300
Subject: [PATCH 077/151] pigz: split outputs

cc https://github.com/NixOS/nixpkgs/issues/515268
---
 pkgs/by-name/pi/pigz/package.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pi/pigz/package.nix b/pkgs/by-name/pi/pigz/package.nix
index bf8de155a7f6..7d0b5d81e9ab 100644
--- a/pkgs/by-name/pi/pigz/package.nix
+++ b/pkgs/by-name/pi/pigz/package.nix
@@ -21,6 +21,12 @@ stdenv.mkDerivation (finalAttrs: {
   __structuredAttrs = true;
   enableParallelBuilding = true;
 
+  outputs = [
+    "out"
+    "doc"
+    "man"
+  ];
+
   buildInputs = [ zlib ] ++ lib.optional stdenv.hostPlatform.isLinux util-linux;
 
   makeFlags = [ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" ];
@@ -32,9 +38,9 @@ stdenv.mkDerivation (finalAttrs: {
 
     install -Dm755 pigz "$out/bin/pigz"
     ln -s pigz "$out/bin/unpigz"
-    install -Dm755 pigz.1 "$out/share/man/man1/pigz.1"
-    ln -s pigz.1 "$out/share/man/man1/unpigz.1"
-    install -Dm755 pigz.pdf "$out/share/doc/pigz/pigz.pdf"
+    install -Dm755 pigz.1 "$man/share/man/man1/pigz.1"
+    ln -s pigz.1 "$man/share/man/man1/unpigz.1"
+    install -Dm755 pigz.pdf "$doc/share/doc/pigz/pigz.pdf"
 
     runHook postInstall
   '';

From e67ecb4b3d7a4a49cad5fea9f432cd28ecb210c0 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Thu, 4 Jun 2026 22:43:40 +0300
Subject: [PATCH 078/151] pigz: drop `util-linux` from `buildInputs`

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

diff --git a/pkgs/by-name/pi/pigz/package.nix b/pkgs/by-name/pi/pigz/package.nix
index 7d0b5d81e9ab..41fdee7f9496 100644
--- a/pkgs/by-name/pi/pigz/package.nix
+++ b/pkgs/by-name/pi/pigz/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchFromGitHub,
   zlib,
-  util-linux,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -27,9 +26,10 @@ stdenv.mkDerivation (finalAttrs: {
     "man"
   ];
 
-  buildInputs = [ zlib ] ++ lib.optional stdenv.hostPlatform.isLinux util-linux;
-
   makeFlags = [ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" ];
+  buildInputs = [
+    zlib
+  ];
 
   doCheck = stdenv.hostPlatform.isLinux;
   checkTarget = "tests";

From f9770c70876d1a7130da2659dbe2ff834e6bc181 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Thu, 4 Jun 2026 22:43:40 +0300
Subject: [PATCH 079/151] pigz: dont guess `cc` executable name

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

diff --git a/pkgs/by-name/pi/pigz/package.nix b/pkgs/by-name/pi/pigz/package.nix
index 41fdee7f9496..22b9e31c049d 100644
--- a/pkgs/by-name/pi/pigz/package.nix
+++ b/pkgs/by-name/pi/pigz/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     "man"
   ];
 
-  makeFlags = [ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" ];
+  makeFlags = [ "CC=${lib.getExe stdenv.cc}" ];
   buildInputs = [
     zlib
   ];

From d4df27fea5b30b5d81a5d51b3bc835b6422cd1c1 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Thu, 4 Jun 2026 22:43:40 +0300
Subject: [PATCH 080/151] pigz: add some `nativeCheckInputs`

it uses `which compress` in its tests
---
 pkgs/by-name/pi/pigz/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/pi/pigz/package.nix b/pkgs/by-name/pi/pigz/package.nix
index 22b9e31c049d..e81f417312ee 100644
--- a/pkgs/by-name/pi/pigz/package.nix
+++ b/pkgs/by-name/pi/pigz/package.nix
@@ -3,6 +3,8 @@
   stdenv,
   fetchFromGitHub,
   zlib,
+  ncompress,
+  which,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -33,6 +35,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = stdenv.hostPlatform.isLinux;
   checkTarget = "tests";
+  nativeCheckInputs = [
+    which
+    ncompress
+  ];
+
   installPhase = ''
     runHook preInstall
 

From 2f469e5b317aa089a4241dac0d7f36ec74491b2f Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Thu, 4 Jun 2026 23:14:41 +0300
Subject: [PATCH 081/151] pigz: add updateScript

---
 pkgs/by-name/pi/pigz/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/pi/pigz/package.nix b/pkgs/by-name/pi/pigz/package.nix
index e81f417312ee..c2acff0cfe94 100644
--- a/pkgs/by-name/pi/pigz/package.nix
+++ b/pkgs/by-name/pi/pigz/package.nix
@@ -5,6 +5,7 @@
   zlib,
   ncompress,
   which,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -52,6 +53,10 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     homepage = "https://www.zlib.net/pigz/";
     description = "Parallel implementation of gzip for multi-core machines";

From 826df6385405623e35a413aa292e8b90a1f8352e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 4 Jun 2026 20:38:17 +0000
Subject: [PATCH 082/151] gdcm: 3.2.6 -> 3.2.7

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

diff --git a/pkgs/by-name/gd/gdcm/package.nix b/pkgs/by-name/gd/gdcm/package.nix
index 731f569d38b4..15a1198dbe04 100644
--- a/pkgs/by-name/gd/gdcm/package.nix
+++ b/pkgs/by-name/gd/gdcm/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = if enablePython then "python-gdcm" else "gdcm";
-  version = "3.2.6";
+  version = "3.2.7";
 
   src = fetchFromGitHub {
     owner = "malaterre";
     repo = "GDCM";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8ZNq89a369mm/hPe0tywo4Tqzt65Xhb0pbEguy8CSsA=";
+    hash = "sha256-j4n/IOLQiw+9j2hAS/fN2zWJI1xItFgm0BquPOZJr9E=";
   };
 
   cmakeFlags = [

From 7f6e80418830eb9fd468ffdfdeeeb3d7dfd52bc9 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Thu, 4 Jun 2026 22:29:16 +0700
Subject: [PATCH 083/151] python3Packages.azure-synapse-artifacts: modernize

---
 .../python-modules/azure-synapse-artifacts/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
index 0be87b69ae74..7bb296f2e0e6 100644
--- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
+++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
@@ -9,14 +9,16 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "azure-synapse-artifacts";
   version = "0.22.0";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
     pname = "azure_synapse_artifacts";
-    inherit version;
+    inherit (finalAttrs) version;
     hash = "sha256-3cD7Yic4w+q3RlzkKM+gzUGtAahw+9RTYeTVjRdcYjw=";
   };
 
@@ -37,8 +39,8 @@ buildPythonPackage rec {
   meta = {
     description = "Microsoft Azure Synapse Artifacts Client Library for Python";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
-    changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-synapse-artifacts_${version}/sdk/synapse/azure-synapse-artifacts/CHANGELOG.md";
+    changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-synapse-artifacts_${finalAttrs.version}/sdk/synapse/azure-synapse-artifacts/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})

From fd711cd2489e8a079c6070f81417126bf929d401 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Fri, 5 Jun 2026 14:00:49 +0200
Subject: [PATCH 084/151] nixos/wpa_supplicant: use lib.warn for warnings

In order to display these consistently with all other warnings and to
abort on warnings correctly, lib.warn should be used instead of trace.
---
 nixos/modules/services/networking/wpa_supplicant.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index 0e092de5e609..46ec64b0a334 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -564,9 +564,9 @@ in
           coercedTo attrs (
             val:
             if builtins.isAttrs val && val ? enable then
-              trace "Obsolete option `networking.wireless.userControlled.enable' is used. It was renamed to networking.wireless.userControlled" val.enable
+              warn "Obsolete option `networking.wireless.userControlled.enable' is used. It was renamed to networking.wireless.userControlled" val.enable
             else if builtins.isAttrs val && val ? group then
-              trace
+              warn
                 "The option definition `networking.wireless.userControlled.group' no longer has any effect. The group is now fixed to `wpa_supplicant'."
                 (val.enable or false)
             else if builtins.isBool val then

From 742d9516f4b791dd749813e337bd3e4641a84db3 Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Fri, 5 Jun 2026 14:23:25 +0200
Subject: [PATCH 085/151] nirimon: init at 2026.605.1

---
 pkgs/by-name/ni/nirimon/package.nix | 52 +++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 pkgs/by-name/ni/nirimon/package.nix

diff --git a/pkgs/by-name/ni/nirimon/package.nix b/pkgs/by-name/ni/nirimon/package.nix
new file mode 100644
index 000000000000..43645f4ef3b3
--- /dev/null
+++ b/pkgs/by-name/ni/nirimon/package.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  makeWrapper,
+  nix-update-script,
+  versionCheckHook,
+  wl-mirror,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "nirimon";
+  version = "2026.605.1";
+
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "stepbrobd";
+    repo = "nirimon";
+    tag = finalAttrs.version;
+    hash = "sha256-mdBl2QuvAYEltGB2kE0EJhQtWSSZ78qdpSzWKreDZUY=";
+  };
+
+  vendorHash = "sha256-txuaYMyYYalKGQ5RIuPL/ERyDt/eMeo85aZSgx4HbZk=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.Version=${finalAttrs.version}"
+  ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postFixup = ''
+    wrapProgram $out/bin/nirimon --prefix PATH : "${lib.makeBinPath [ wl-mirror ]}"
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "-version";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "TUI monitor configuration tool for niri with visual layout, drag-and-drop, and profile management";
+    homepage = "https://github.com/stepbrobd/nirimon";
+    license = lib.licenses.asl20;
+    mainProgram = "nirimon";
+    maintainers = with lib.maintainers; [ stepbrobd ];
+    platforms = lib.platforms.linux;
+  };
+})

From 142ae7dd6979abeecda224ff7651c5f0c43fbe3a Mon Sep 17 00:00:00 2001
From: 2kybe3 <kybe@kybe.xyz>
Date: Fri, 5 Jun 2026 15:01:11 +0200
Subject: [PATCH 086/151] klog-rs: 0.5.1 -> 0.6.0

diff: https://github.com/tobifroe/klog/compare/0.5.1...0.6.0
changelog: https://github.com/tobifroe/klog/releases/tag/0.6.0
---
 pkgs/by-name/kl/klog-rs/package.nix | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/kl/klog-rs/package.nix b/pkgs/by-name/kl/klog-rs/package.nix
index 842e78c09578..1dc5bde22e3a 100644
--- a/pkgs/by-name/kl/klog-rs/package.nix
+++ b/pkgs/by-name/kl/klog-rs/package.nix
@@ -7,26 +7,34 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "klog-rs";
-  version = "0.5.1";
+  version = "0.6.0";
+
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "tobifroe";
     repo = "klog";
-    rev = finalAttrs.version;
-    hash = "sha256-VyUUzhVwJ1tNLICXwy7f85queH+pn4vL5HTL8IHcQ7w=";
+    tag = finalAttrs.version;
+    hash = "sha256-9NYtT4psGaWBVpwprpAdzEaWrmDRRnI1UDVD3Quzj6g=";
   };
 
-  cargoHash = "sha256-KJxssCN9/WoRR1Cv67CK5muVy+cqEEfzSioQtptplQs=";
-  checkFlags = [
+  cargoHash = "sha256-sDjNJAOFW+0wRN9CCDZRj1q0juczugLibst7ys/mERc=";
+
+  checkFlags = map (t: "--skip=${t}") [
     # this integration test depends on a running kubernetes cluster
-    "--skip=k8s::tests::test_get_pod_list"
-    "--skip=k8s::tests::test_get_pod_list_for_resource"
+    "k8s::tests::test_get_pod_list"
+    "k8s::tests::test_get_pod_list_for_resource"
+    "tests::test_active_pods_tracking"
+    "tests::test_pod_manager_clone"
+    "tests::test_pod_manager_creation"
+    "tests::test_refresh_interval_zero_disables_refresh"
+    "tests::test_start_pod_logs_spawns_task"
   ];
 
   meta = {
     description = "Tool to tail logs of multiple Kubernetes pods simultaneously";
     homepage = "https://github.com/tobifroe/klog";
-    changelog = "https://github.com/tobifroe/klog/releases/tag/${finalAttrs.version}";
+    changelog = "https://github.com/tobifroe/klog/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     mainProgram = "klog";
     maintainers = with lib.maintainers; [ tobifroe ];

From d5a560ba175eb6f893c0c2b0bb2c6ff4252d1d23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Bori?= <theobori@disroot.org>
Date: Sun, 31 May 2026 17:32:33 +0200
Subject: [PATCH 087/151] megabasterd: 8.51 -> 8.57

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

diff --git a/pkgs/by-name/me/megabasterd/package.nix b/pkgs/by-name/me/megabasterd/package.nix
index ab888aadef1f..ab56f5528fbe 100644
--- a/pkgs/by-name/me/megabasterd/package.nix
+++ b/pkgs/by-name/me/megabasterd/package.nix
@@ -6,7 +6,7 @@
   maven,
 }:
 let
-  version = "8.51";
+  version = "8.57";
 in
 maven.buildMavenPackage {
   pname = "megabasterd";
@@ -16,7 +16,7 @@ maven.buildMavenPackage {
     owner = "tonikelope";
     repo = "megabasterd";
     tag = "v${version}";
-    hash = "sha256-FbExOSdJ4XiXKzetIlsSPrD9x2H4MxM2kKCMA4XkMLA=";
+    hash = "sha256-6PKBzQA3lBa9/7J8bymGmnW3OPsRV4GgZ7dc7H6fOuE=";
   };
 
   mvnHash = "sha256-DVfPmW0ep6y/GxnwNKXxo68W5idcTkoNqUEKm7ouTEY=";

From b5c46dfd87234d8ab26c791f63d59c7c6d0d4db1 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 01:32:43 +0700
Subject: [PATCH 088/151] python3Packages.baseline: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/baseline/default.nix b/pkgs/development/python-modules/baseline/default.nix
index febab740c93d..8a47d5b6b544 100644
--- a/pkgs/development/python-modules/baseline/default.nix
+++ b/pkgs/development/python-modules/baseline/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   isPy3k,
   pytestCheckHook,
 }:
@@ -9,7 +10,7 @@
 buildPythonPackage {
   pname = "baseline";
   version = "1.2.1";
-  format = "setuptools";
+  pyproject = true;
   disabled = !isPy3k;
 
   src = fetchFromGitHub {
@@ -19,6 +20,8 @@ buildPythonPackage {
     sha256 = "0qjg46ipyfjflvjqzqr5p7iylwwqn2mhhrq952d01vi8wvfds10d";
   };
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   meta = {

From 80b7c3dabd10d2006ee080dfd00227ba42d2bc25 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 01:34:38 +0700
Subject: [PATCH 089/151] python3Packages.basiciw: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/basiciw/default.nix b/pkgs/development/python-modules/basiciw/default.nix
index e21dcbfa9f61..7e67d1f38362 100644
--- a/pkgs/development/python-modules/basiciw/default.nix
+++ b/pkgs/development/python-modules/basiciw/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   gcc,
   wirelesstools,
   isPyPy,
@@ -10,7 +11,7 @@
 buildPythonPackage rec {
   pname = "basiciw";
   version = "0.2.2";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = isPyPy;
 
@@ -19,8 +20,10 @@ buildPythonPackage rec {
     sha256 = "1ajmflvvlkflrcmqmkrx0zaira84z8kv4ssb2jprfwvjh8vfkysb";
   };
 
+  build-system = [ setuptools ];
+
   buildInputs = [ gcc ];
-  propagatedBuildInputs = [ wirelesstools ];
+  dependencies = [ wirelesstools ];
 
   meta = {
     description = "Get info about wireless interfaces using libiw";

From c8685a3dab5e4ede9a136a7ad44e8d65e0fc53cd Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 01:37:22 +0700
Subject: [PATCH 090/151] python3Packages.baseline: modernize

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

diff --git a/pkgs/development/python-modules/baseline/default.nix b/pkgs/development/python-modules/baseline/default.nix
index 8a47d5b6b544..218888366bae 100644
--- a/pkgs/development/python-modules/baseline/default.nix
+++ b/pkgs/development/python-modules/baseline/default.nix
@@ -11,19 +11,24 @@ buildPythonPackage {
   pname = "baseline";
   version = "1.2.1";
   pyproject = true;
+
+  __structuredAttrs = true;
+
   disabled = !isPy3k;
 
   src = fetchFromGitHub {
     owner = "dmgass";
     repo = "baseline";
     rev = "95a0b71806ed16310eb0f27bc48aa5e21f731423";
-    sha256 = "0qjg46ipyfjflvjqzqr5p7iylwwqn2mhhrq952d01vi8wvfds10d";
+    hash = "sha256-DQTd3OYo7gCaKAlnCKuwmHPq47kl44/lpk46f6MhT2I=";
   };
 
   build-system = [ setuptools ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  pythonImportsCheck = [ "baseline" ];
+
   meta = {
     description = "Easy String Baseline";
     mainProgram = "baseline";

From e1d51552ce58f327982b112846b9774aaad62d7b Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 01:46:09 +0700
Subject: [PATCH 091/151] python3Packages.basiciw: modernize

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

diff --git a/pkgs/development/python-modules/basiciw/default.nix b/pkgs/development/python-modules/basiciw/default.nix
index 7e67d1f38362..38c4f313ef31 100644
--- a/pkgs/development/python-modules/basiciw/default.nix
+++ b/pkgs/development/python-modules/basiciw/default.nix
@@ -8,16 +8,18 @@
   isPyPy,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "basiciw";
   version = "0.2.2";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   disabled = isPyPy;
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "1ajmflvvlkflrcmqmkrx0zaira84z8kv4ssb2jprfwvjh8vfkysb";
+    inherit (finalAttrs) pname version;
+    hash = "sha256-S/vpNoJyc5evFEtrsif6BKkc1Qc9z4ory9RNujd1Vao=";
   };
 
   build-system = [ setuptools ];
@@ -25,10 +27,12 @@ buildPythonPackage rec {
   buildInputs = [ gcc ];
   dependencies = [ wirelesstools ];
 
+  pythonImportsCheck = [ "basiciw" ];
+
   meta = {
     description = "Get info about wireless interfaces using libiw";
     homepage = "https://github.com/enkore/basiciw";
     platforms = lib.platforms.linux;
     license = lib.licenses.gpl2;
   };
-}
+})

From 08cf3d9531e45dc02bd78e0ff5f499b60461baa1 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 02:19:20 +0700
Subject: [PATCH 092/151] python3Packages.before-after: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/before-after/default.nix b/pkgs/development/python-modules/before-after/default.nix
index af65c35dc576..692af2f66298 100644
--- a/pkgs/development/python-modules/before-after/default.nix
+++ b/pkgs/development/python-modules/before-after/default.nix
@@ -2,6 +2,7 @@
   buildPythonPackage,
   fetchPypi,
   fetchpatch,
+  setuptools,
   pytestCheckHook,
   lib,
 }:
@@ -9,7 +10,7 @@
 buildPythonPackage rec {
   pname = "before-after";
   version = "1.0.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "before_after";
@@ -29,6 +30,8 @@ buildPythonPackage rec {
     })
   ];
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "before_after" ];

From 37bcd412acf90ec84b28c5dc3623f3181015888d Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 02:21:02 +0700
Subject: [PATCH 093/151] python3Packages.before-after: modernize

---
 pkgs/development/python-modules/before-after/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/before-after/default.nix b/pkgs/development/python-modules/before-after/default.nix
index 692af2f66298..5d6a58aad6d4 100644
--- a/pkgs/development/python-modules/before-after/default.nix
+++ b/pkgs/development/python-modules/before-after/default.nix
@@ -7,14 +7,16 @@
   lib,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "before-after";
   version = "1.0.1";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
     pname = "before_after";
-    inherit version;
+    inherit (finalAttrs) version;
     hash = "sha256-x9T5uLi7UgldoUxLnFnqaz9bnqn9zop7/HLsrg9aP4U=";
   };
 
@@ -42,4 +44,4 @@ buildPythonPackage rec {
     maintainers = [ ];
     license = lib.licenses.gpl2Only;
   };
-}
+})

From f9764da1c2a8ccbfa71e3f9afb8ba8dd037d2220 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 02:36:33 +0700
Subject: [PATCH 094/151] python3Packages.bincopy: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/bincopy/default.nix b/pkgs/development/python-modules/bincopy/default.nix
index 561ee88cbd61..1a709200066e 100644
--- a/pkgs/development/python-modules/bincopy/default.nix
+++ b/pkgs/development/python-modules/bincopy/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   argparse-addons,
   humanfriendly,
   pyelftools,
@@ -10,14 +11,16 @@
 buildPythonPackage (finalAttrs: {
   pname = "bincopy";
   version = "20.1.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
     hash = "sha256-6UpJi5pKvnZwPDdyqtRm8VY7T8mAnaeWXxG8dwlAk7k=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     argparse-addons
     humanfriendly
     pyelftools

From 0a1416733381981d45c6835475ce0a1491c2e0c4 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 02:38:44 +0700
Subject: [PATCH 095/151] python3Packages.bincopy: modernize

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

diff --git a/pkgs/development/python-modules/bincopy/default.nix b/pkgs/development/python-modules/bincopy/default.nix
index 1a709200066e..2151f44bd692 100644
--- a/pkgs/development/python-modules/bincopy/default.nix
+++ b/pkgs/development/python-modules/bincopy/default.nix
@@ -13,6 +13,8 @@ buildPythonPackage (finalAttrs: {
   version = "20.1.1";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
     inherit (finalAttrs) pname version;
     hash = "sha256-6UpJi5pKvnZwPDdyqtRm8VY7T8mAnaeWXxG8dwlAk7k=";

From 2081c7ffd4828dd6f857191e2b1edf7e9616e6fa Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Fri, 5 Jun 2026 22:20:40 +0200
Subject: [PATCH 096/151] pragtical: 3.9.0 -> 3.11.2

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

diff --git a/pkgs/by-name/pr/pragtical/package.nix b/pkgs/by-name/pr/pragtical/package.nix
index 34a7cab1ac95..da6b86952fc6 100644
--- a/pkgs/by-name/pr/pragtical/package.nix
+++ b/pkgs/by-name/pr/pragtical/package.nix
@@ -7,6 +7,7 @@
   ninja,
   pkg-config,
   freetype,
+  harfbuzz,
   libgit2,
   libkqueue,
   libuchardet,
@@ -17,14 +18,15 @@
   pcre2,
   sdl3,
   sdl3-image,
+  sdl3-net,
   xz,
   zlib,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pragtical";
-  version = "3.9.0";
-  pluginManagerRev = "ae9bd107783b1b8cbe7f0dec53b1b0b401f6ac91";
+  version = "3.11.2";
+  pluginManagerRev = "v1.5.1";
   linenoiseRev = "e78e236c8d85c078fdd9fc4e1f08716058aa1a42";
 
   src = fetchFromGitHub {
@@ -45,12 +47,14 @@ stdenv.mkDerivation (finalAttrs: {
         --replace-fail 'revision = master' 'revision = ${finalAttrs.linenoiseRev}'
 
       ${lib.getExe meson} subprojects download \
-          colors linenoise plugins ppm widget
+        colors linenoise plugins ppm widget mbedtls
+      # TODO: remove mbedtls from list once ppm supports mbedtls_4
+      # See https://github.com/pragtical/plugin-manager/issues/11
 
       find subprojects -type d -name .git -prune -execdir rm -r {} +
     '';
 
-    hash = "sha256-hs4WFBqR9G+YsHw9/qaO0BCeIMqPEWOvFaeuN2W9hSQ=";
+    hash = "sha256-6S4hnmSsejLr7IiZ4mtHT5ImBsVlyKFtLx9PBgv6b90=";
   };
 
   strictDeps = true;
@@ -64,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     freetype
+    harfbuzz
     libgit2
     libkqueue # optional
     libuchardet
@@ -74,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     pcre2
     sdl3
     sdl3-image
+    sdl3-net
     xz
     zlib
   ];

From 8dea11636de12461aea44d8618bf479da14bb4dc Mon Sep 17 00:00:00 2001
From: FlashOnFire_ <flashonfire@proton.me>
Date: Fri, 5 Jun 2026 22:45:54 +0200
Subject: [PATCH 097/151] oxicloud: remove target-cpu=native flag to make
 builds more portable

Co-authored-by: Darkone Linux <darkone@darkone.yt>
---
 pkgs/by-name/ox/oxicloud/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/ox/oxicloud/package.nix b/pkgs/by-name/ox/oxicloud/package.nix
index fe82bef6610e..d2a5d566400f 100644
--- a/pkgs/by-name/ox/oxicloud/package.nix
+++ b/pkgs/by-name/ox/oxicloud/package.nix
@@ -29,6 +29,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoBuildFlags = [ "--bin=oxicloud" ];
 
+  postPatch = ''
+    # Upstream pins `target-cpu=native`, making the binary non-portable
+    # (breaks the binary cache). Build for the generic baseline instead.
+    rm -f .cargo/config.toml
+  '';
+
   postInstall = ''
     mkdir -p $out/share/oxicloud
     cp -r static-dist $out/share/oxicloud/static

From d6ced4c232dcaa9ffafc64a4bafff06dd5c8ae3e Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Fri, 5 Jun 2026 16:16:14 -0700
Subject: [PATCH 098/151] python3Packages.exa-py: 2.12.0-unstable-2026-04-15 ->
 2.13.1-unstable-2026-06-03

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/development/python-modules/exa-py/default.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/exa-py/default.nix b/pkgs/development/python-modules/exa-py/default.nix
index 0dbe5c755d83..2566261e5276 100644
--- a/pkgs/development/python-modules/exa-py/default.nix
+++ b/pkgs/development/python-modules/exa-py/default.nix
@@ -27,7 +27,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "exa-py";
-  version = "2.12.0-unstable-2026-04-15";
+  version = "2.13.1-unstable-2026-06-03";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -35,18 +35,10 @@ buildPythonPackage (finalAttrs: {
   src = fetchFromGitHub {
     owner = "exa-labs";
     repo = "exa-py";
-    rev = "af7f88999763f1cb7e3c4a67f4aa24cef5f6eb11";
-    hash = "sha256-7rLEvjngSRObFdT1DcrZfqWBCsvWVxdNIgxBNhNNk+4=";
+    rev = "42fde906ecd069c15ad4888e1585b395a0db7edf";
+    hash = "sha256-6o4SKAeP5q+57LCbbw5vP7r/dEA1HiQNa9CkopbTlxg=";
   };
 
-  # https://github.com/pytest-dev/pytest-asyncio/issues/658
-  # default behaviour changes with new python version.
-  # planning on trying to vendor upstream
-  postPatch = ''
-    substituteInPlace tests/unit/test_search_monitors.py --replace-fail \
-      'get_event_loop().run_until_complete' 'run'
-  '';
-
   build-system = [
     poetry-core
   ];

From 4c4629059d23a42f12dbd501acddddd371cfa70d Mon Sep 17 00:00:00 2001
From: Jan-Niklas Burfeind <git@aiyionpri.me>
Date: Sat, 6 Jun 2026 01:25:28 +0200
Subject: [PATCH 099/151] xev: adopt

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

diff --git a/pkgs/by-name/xe/xev/package.nix b/pkgs/by-name/xe/xev/package.nix
index 06c7bd4b6d15..a99d8f00a063 100644
--- a/pkgs/by-name/xe/xev/package.nix
+++ b/pkgs/by-name/xe/xev/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://gitlab.freedesktop.org/xorg/app/xev";
     license = lib.licenses.x11;
     mainProgram = "xev";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ aiyion ];
     platforms = lib.platforms.unix;
   };
 })

From e082e86aaa1fc4f8474b2f8e5da4e0fc95c3d01f Mon Sep 17 00:00:00 2001
From: Ludovico Piero <lewdovico@gnuweeb.org>
Date: Fri, 5 Jun 2026 05:21:33 +0900
Subject: [PATCH 100/151] samrewritten: 1.4.0 -> 1.4.2

Signed-off-by: Ludovico Piero <lewdovico@gnuweeb.org>
---
 pkgs/by-name/sa/samrewritten/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sa/samrewritten/package.nix b/pkgs/by-name/sa/samrewritten/package.nix
index 26cf244add10..aa52a1cff34e 100644
--- a/pkgs/by-name/sa/samrewritten/package.nix
+++ b/pkgs/by-name/sa/samrewritten/package.nix
@@ -15,16 +15,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "samrewritten";
-  version = "1.4.0";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "PaulCombal";
     repo = "SamRewritten";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-y8ByD/dGjc+QJCbhy519fBHDXRh+m4sIC7ew17sj03g=";
+    hash = "sha256-p24V0rUnCPanci8KqxGhWA793HVcqO8VSHzabSAOR0A=";
   };
 
-  cargoHash = "sha256-anV5tiXgX9DviKe8ZlnbBrQw5vCnpgQ1xKUki8/f+20=";
+  cargoHash = "sha256-beHc4EETX6cyRFEHaiCghvaRZ6uYQOfllygdkiMg+OA=";
 
   # Tests require network access and a running Steam client. Skipping.
   doCheck = false;

From db6f5bcae2efeed3d5b189fd148bda83e66c5f62 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 09:10:30 +0700
Subject: [PATCH 101/151] python3Packages.bravia-tv: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/bravia-tv/default.nix b/pkgs/development/python-modules/bravia-tv/default.nix
index 96d58f553615..745dd8a70e4e 100644
--- a/pkgs/development/python-modules/bravia-tv/default.nix
+++ b/pkgs/development/python-modules/bravia-tv/default.nix
@@ -2,13 +2,14 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   requests,
 }:
 
 buildPythonPackage rec {
   pname = "bravia-tv";
   version = "1.0.11";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dcnielsen90";
@@ -17,7 +18,9 @@ buildPythonPackage rec {
     hash = "sha256-g47bDd5bZl0jad3o6T1jJLcnZj8nx944kz3Vxv8gD2U=";
   };
 
-  propagatedBuildInputs = [ requests ];
+  build-system = [ setuptools ];
+
+  dependencies = [ requests ];
 
   # Package does not include tests
   doCheck = false;

From 45015a185516e479a039341098ea982317bfe604 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 09:14:19 +0700
Subject: [PATCH 102/151] python3Packages.bravia-tv: modernize

---
 pkgs/development/python-modules/bravia-tv/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/bravia-tv/default.nix b/pkgs/development/python-modules/bravia-tv/default.nix
index 745dd8a70e4e..6198bd8a8dc2 100644
--- a/pkgs/development/python-modules/bravia-tv/default.nix
+++ b/pkgs/development/python-modules/bravia-tv/default.nix
@@ -6,15 +6,17 @@
   requests,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "bravia-tv";
   version = "1.0.11";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "dcnielsen90";
     repo = "python-bravia-tv";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-g47bDd5bZl0jad3o6T1jJLcnZj8nx944kz3Vxv8gD2U=";
   };
 
@@ -33,4 +35,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})

From db9fab6d4ceca03a0708131bf5e01cb11364f9d5 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 09:33:09 +0700
Subject: [PATCH 103/151] python3Packages.calysto: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/calysto/default.nix b/pkgs/development/python-modules/calysto/default.nix
index a9e62370f4c3..31ef18629c28 100644
--- a/pkgs/development/python-modules/calysto/default.nix
+++ b/pkgs/development/python-modules/calysto/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   metakernel,
   svgwrite,
   ipywidgets,
@@ -12,7 +13,7 @@
 buildPythonPackage rec {
   pname = "calysto";
   version = "1.0.6";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Calysto";
@@ -21,7 +22,9 @@ buildPythonPackage rec {
     hash = "sha256-lr/cHFshpFs/PGMCsa3FKMRPTP+eE9ziH5XCpV+KzO8=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     metakernel
     svgwrite
     ipywidgets

From 1cfa9ce4a598725721fdf133e1a21cb01bc058ea Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 09:36:02 +0700
Subject: [PATCH 104/151] python3Packages.calysto: modernize

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

diff --git a/pkgs/development/python-modules/calysto/default.nix b/pkgs/development/python-modules/calysto/default.nix
index 31ef18629c28..befb8548787d 100644
--- a/pkgs/development/python-modules/calysto/default.nix
+++ b/pkgs/development/python-modules/calysto/default.nix
@@ -10,15 +10,17 @@
   numpy,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "calysto";
   version = "1.0.6";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "Calysto";
     repo = "calysto";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-lr/cHFshpFs/PGMCsa3FKMRPTP+eE9ziH5XCpV+KzO8=";
   };
 
@@ -43,4 +45,4 @@ buildPythonPackage rec {
     license = lib.licenses.bsd2;
     maintainers = [ ];
   };
-}
+})

From 8322afea5d02c6e4d2a28a235a90922b9881e8b5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Jun 2026 04:26:28 +0000
Subject: [PATCH 105/151] sub-store-frontend: 2.17.19 -> 2.17.31

---
 pkgs/by-name/su/sub-store-frontend/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/su/sub-store-frontend/package.nix b/pkgs/by-name/su/sub-store-frontend/package.nix
index e161fa0dbc8c..4467d64f5ac8 100644
--- a/pkgs/by-name/su/sub-store-frontend/package.nix
+++ b/pkgs/by-name/su/sub-store-frontend/package.nix
@@ -14,13 +14,13 @@ let
 in
 buildNpmPackage (finalAttrs: {
   pname = "sub-store-frontend";
-  version = "2.17.19";
+  version = "2.17.31";
 
   src = fetchFromGitHub {
     owner = "sub-store-org";
     repo = "Sub-Store-Front-End";
     tag = finalAttrs.version;
-    hash = "sha256-fhJy/bErS9DHjjX5R+6KjqDNYyPOQaYPr54CS1vd3zc=";
+    hash = "sha256-/L5qdjqXZ8MjEjOGT8e8vdS/F9uudkemboAVrYih0Zc=";
   };
 
   nativeBuildInputs = [

From 6ef31ad2f4e75cf137bf548e800948f6015ac580 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Jun 2026 12:25:29 +0000
Subject: [PATCH 106/151] vscode-extensions.ms-python.black-formatter: 2026.4.0
 -> 2026.6.0

---
 .../vscode/extensions/ms-python.black-formatter/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.black-formatter/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.black-formatter/default.nix
index 4b9f0d6033c6..4d2fa6c14fea 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-python.black-formatter/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-python.black-formatter/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "ms-python";
     name = "black-formatter";
-    version = "2026.4.0";
-    hash = "sha256-lt/68RWEpoBFTBWEsSSb/KL6BRmdt8mELBA1ypb5Pm0=";
+    version = "2026.6.0";
+    hash = "sha256-jTq5cpP3QwyAOF1VihAJA5ZYCpb3qbmeNIUPFr9Xph8=";
   };
 
   meta = {

From cbbbe5d41a75c74de6717e596904a63a1029eaed Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Apr 2026 15:29:07 -0500
Subject: [PATCH 107/151] kilo: init at 7.3.40

---
 pkgs/by-name/ki/kilo/package.nix | 199 +++++++++++++++++++++++++++++++
 1 file changed, 199 insertions(+)
 create mode 100644 pkgs/by-name/ki/kilo/package.nix

diff --git a/pkgs/by-name/ki/kilo/package.nix b/pkgs/by-name/ki/kilo/package.nix
new file mode 100644
index 000000000000..fee4ee41eed6
--- /dev/null
+++ b/pkgs/by-name/ki/kilo/package.nix
@@ -0,0 +1,199 @@
+{
+  lib,
+  stdenvNoCC,
+  bun,
+  fetchFromGitHub,
+  installShellFiles,
+  makeBinaryWrapper,
+  models-dev,
+  nix-update-script,
+  ripgrep,
+  sysctl,
+  versionCheckHook,
+  writableTmpDirAsHomeHook,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "kilo";
+  version = "7.3.40";
+
+  src = fetchFromGitHub {
+    owner = "Kilo-Org";
+    repo = "kilocode";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Jw2C8C7dFPwOGp8tg6ewcRXdVsJEDDFSe+xuF86Xwfc=";
+  };
+
+  node_modules = stdenvNoCC.mkDerivation {
+    pname = "${finalAttrs.pname}-node_modules";
+    inherit (finalAttrs) version src;
+
+    impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
+      "GIT_PROXY_COMMAND"
+      "SOCKS_SERVER"
+    ];
+
+    nativeBuildInputs = [
+      bun
+      writableTmpDirAsHomeHook
+    ];
+
+    dontConfigure = true;
+
+    buildPhase = ''
+      runHook preBuild
+
+      export BUN_INSTALL_CACHE_DIR=$(mktemp -d)
+      bun install \
+        --cpu="*" \
+        --frozen-lockfile \
+        --ignore-scripts \
+        --no-progress \
+        --os="*"
+
+      bun --bun ./nix/scripts/canonicalize-node-modules.ts
+      bun --bun ./nix/scripts/normalize-bun-binaries.ts
+
+      runHook postBuild
+    '';
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out
+      find . -type d -name node_modules -exec cp -R --parents {} $out \;
+
+      runHook postInstall
+    '';
+
+    dontFixup = true;
+
+    outputHash = "sha256-Defmk7fN49UQtBpmWIFGnUiPlBpJtLp+8QaFFQCAY8k=";
+    outputHashAlgo = "sha256";
+    outputHashMode = "recursive";
+  };
+
+  nativeBuildInputs = [
+    bun
+    installShellFiles
+    makeBinaryWrapper
+    models-dev
+    writableTmpDirAsHomeHook
+  ];
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  postPatch = ''
+    # NOTE: Relax Bun version check to be a warning instead of an error.
+    substituteInPlace packages/script/src/index.ts \
+      --replace-fail 'throw new Error(`This script requires bun@''${expectedBunVersionRange}' \
+                     'console.warn(`Warning: This script requires bun@''${expectedBunVersionRange}'
+    substituteInPlace packages/opencode/script/build.ts \
+      --replace-fail 'await $`patchelf --set-interpreter ''${interpreter} dist/''${name}/bin/kilo`' \
+                     'await $`true`'
+  '';
+
+  configurePhase = ''
+    runHook preConfigure
+
+    cp -R ${finalAttrs.node_modules}/. .
+    patchShebangs node_modules
+    patchShebangs packages/*/node_modules
+
+    runHook postConfigure
+  '';
+
+  env.KILO_CHANNEL = "latest";
+  env.KILO_VERSION = finalAttrs.version;
+  env.MODELS_DEV_API_JSON = "${models-dev}/dist/_api.json";
+
+  buildPhase = ''
+    runHook preBuild
+
+    cd ./packages/opencode
+    bun --bun ./script/build.ts --single --skip-install --skip-embed-web-ui
+    bun --bun ./script/schema.ts config.json tui.json
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 dist/@kilocode/cli-*/bin/kilo $out/bin/kilo
+
+    wrapProgram $out/bin/kilo \
+      --prefix PATH : ${
+        lib.makeBinPath (
+          [
+            ripgrep
+          ]
+          ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [
+            sysctl
+          ]
+        )
+      }
+
+    install -Dm644 config.json $out/share/kilocode/config.json
+    install -Dm644 tui.json $out/share/kilocode/tui.json
+
+    runHook postInstall
+  '';
+
+  postInstall = lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) ''
+    installShellCompletion --cmd kilo \
+      --bash <($out/bin/kilo completion) \
+      --zsh <(SHELL=/bin/zsh $out/bin/kilo completion)
+  '';
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+    writableTmpDirAsHomeHook
+  ];
+  doInstallCheck = true;
+  versionCheckKeepEnvironment = [
+    "HOME"
+    "KILO_CHANNEL"
+    "KILO_VERSION"
+    "MODELS_DEV_API_JSON"
+  ];
+  versionCheckProgram = "${placeholder "out"}/bin/kilo";
+  versionCheckProgramArg = "--version";
+
+  passthru = {
+    jsonschema = {
+      config = "${placeholder "out"}/share/kilocode/config.json";
+      tui = "${placeholder "out"}/share/kilocode/tui.json";
+    };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--subpackage"
+        "node_modules"
+      ];
+    };
+  };
+
+  meta = {
+    description = "Terminal User Interface for Kilo Code";
+    homepage = "https://github.com/Kilo-Org/kilocode";
+    changelog = "https://github.com/Kilo-Org/kilocode/releases/tag/v${finalAttrs.version}";
+    downloadPage = "https://www.npmjs.com/package/@kilocode/cli";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      xiaoxiangmoe
+    ];
+    sourceProvenance = with lib.sourceTypes; [ fromSource ];
+    mainProgram = "kilo";
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+      "aarch64-darwin"
+      "x86_64-darwin"
+    ];
+    badPlatforms = [
+      # Broken due to Bun requiring AVX when run via Rosetta 2 on Apple Silicon.
+      "x86_64-darwin"
+    ];
+  };
+})

From 273cbef2d907d6d59fc146c0701a3c7fcee381c2 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Apr 2026 14:35:28 -0500
Subject: [PATCH 108/151] kilocode-cli: drop package, recommend kilo

Follow upstream package naming and drop `-cli` package that's on old
`cli-v` tags only. Add a backwards compatible symlink.
---
 pkgs/by-name/ki/kilo/package.nix         |   1 +
 pkgs/by-name/ki/kilocode-cli/package.nix | 136 -----------------------
 pkgs/top-level/aliases.nix               |   1 +
 3 files changed, 2 insertions(+), 136 deletions(-)
 delete mode 100644 pkgs/by-name/ki/kilocode-cli/package.nix

diff --git a/pkgs/by-name/ki/kilo/package.nix b/pkgs/by-name/ki/kilo/package.nix
index fee4ee41eed6..15dd55fab2e2 100644
--- a/pkgs/by-name/ki/kilo/package.nix
+++ b/pkgs/by-name/ki/kilo/package.nix
@@ -122,6 +122,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook preInstall
 
     install -Dm755 dist/@kilocode/cli-*/bin/kilo $out/bin/kilo
+    ln -s kilo $out/bin/kilocode
 
     wrapProgram $out/bin/kilo \
       --prefix PATH : ${
diff --git a/pkgs/by-name/ki/kilocode-cli/package.nix b/pkgs/by-name/ki/kilocode-cli/package.nix
deleted file mode 100644
index e12c8b0c31b9..000000000000
--- a/pkgs/by-name/ki/kilocode-cli/package.nix
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-  lib,
-  stdenv,
-  stdenvNoCC,
-  fetchFromGitHub,
-  fetchPnpmDeps,
-  fetchNpmDeps,
-  nodejs,
-  writableTmpDirAsHomeHook,
-  pnpmConfigHook,
-  pnpm_10,
-  unzip,
-  patchelf,
-  autoPatchelfHook,
-  ripgrep,
-  versionCheckHook,
-  nix-update-script,
-}:
-let
-  pnpm = pnpm_10;
-in
-stdenvNoCC.mkDerivation (finalAttrs: {
-  pname = "kilocode-cli";
-  version = "0.25.1";
-
-  src = fetchFromGitHub {
-    owner = "Kilo-Org";
-    repo = "kilocode-legacy";
-    tag = "cli-v${finalAttrs.version}";
-    hash = "sha256-XlJ9/9FABLpKVJXdIRzbzOpJVXdIzgFvPPeER1LRsuk=";
-  };
-
-  pnpmDeps = fetchPnpmDeps {
-    inherit (finalAttrs) pname version src;
-    inherit pnpm;
-    fetcherVersion = 3;
-    hash = "sha256-Q/LamZwVaIQVILtXRi1RQrYtpxYJWEKPAt3knwm47S0=";
-  };
-
-  npmDeps = fetchNpmDeps {
-    name = "${finalAttrs.pname}-npm-deps";
-    inherit (finalAttrs) src;
-    sourceRoot = "${finalAttrs.src.name}/cli";
-    postPatch = ''
-      cp ./npm-shrinkwrap.dist.json ./npm-shrinkwrap.json
-    '';
-    hash = "sha256-wH4Gyd5nv8sCSQStFqIidoICvlXXEs2xNNX+DH133wA=";
-  };
-
-  buildInputs = [
-    nodejs
-  ];
-
-  nativeBuildInputs = [
-    writableTmpDirAsHomeHook
-    pnpmConfigHook
-    pnpm
-    nodejs
-    unzip
-    patchelf
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isElf [ autoPatchelfHook ];
-
-  strictDeps = true;
-
-  env.npm_config_manage_package_manager_versions = "false";
-
-  buildPhase = ''
-    runHook preBuild
-
-    mkdir -p ./cli/.dist/
-    find ./cli -maxdepth 1 -type f -name "*.dist.*" -print0 | while IFS= read -r -d "" file; do
-      cp "$file" "./cli/.dist/$(basename "$file" | sed 's/\.dist\././')"
-    done
-
-    if ! diff "$PWD/cli/npm-shrinkwrap.dist.json" "$npmDeps/package-lock.json"; then
-      echo "npm-shrinkwrap.json is out of date"
-      echo "The npm-shrinkwrap.json in src is not the same as the in $npmDeps."
-      echo "To fix the issue:"
-      echo '1. Use `lib.fakeHash` as the npmDepsHash value'
-      echo "2. Build the derivation and wait for it to fail with a hash mismatch"
-      echo "3. Copy the 'got: sha256-' value back into the npmDepsHash field"
-      exit 1
-    fi
-    export npm_config_cache="$npmDeps"
-    export npm_config_offline="true"
-    export npm_config_progress="false"
-    (
-      cd ./cli/.dist
-      npm ci --omit=dev --ignore-scripts
-      patchShebangs node_modules
-      if [ -d node_modules/@vscode/ripgrep ]; then
-        mkdir -p node_modules/@vscode/ripgrep/bin
-        ln -s ${lib.getExe ripgrep} node_modules/@vscode/ripgrep/bin/rg
-      fi
-      npm rebuild
-    )
-    substituteInPlace cli/package.json \
-      --replace-fail 'npm install --omit=dev --prefix ./dist' 'mv ./.dist/node_modules ./dist/node_modules'
-
-    node --run cli:bundle
-    touch ./cli/dist/.env
-
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin/ $out/lib/node_modules/@kilocode/
-    mv ./cli/dist $out/lib/node_modules/@kilocode/cli
-    ln -s $out/lib/node_modules/@kilocode/cli/index.js $out/bin/kilocode
-    chmod +x $out/bin/kilocode
-
-    runHook postInstall
-  '';
-
-  nativeInstallCheckInputs = [ versionCheckHook ];
-  doInstallCheck = true;
-  versionCheckProgramArg = "--version";
-
-  passthru = {
-    updateScript = nix-update-script { extraArgs = [ "--version-regex=^cli-v(.+)$" ]; };
-  };
-
-  meta = {
-    description = "Terminal User Interface for Kilo Code";
-    homepage = "https://kilocode.ai/cli";
-    downloadPage = "https://www.npmjs.com/package/@kilocode/cli";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [
-      xiaoxiangmoe
-    ];
-    mainProgram = "kilocode";
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 860584e73a64..f45f9b513b27 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1071,6 +1071,7 @@ mapAliases {
   kgx = throw "'kgx' has been renamed to/replaced by 'gnome-console'"; # Converted to throw 2025-10-27
   khd = throw "'khd' has been removed as it has been pulled upstream"; # Added 2025-12-18
   khoj = throw "khoj has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11
+  kilocode-cli = warnAlias "'kilocode-cli' has been renamed to/replaced by 'kilo'" kilo; # Added 2026-04-30
   kio-fuse = throw "'kio-fuse' has been removed, as Plasma 5 has reached end of life. Use 'kdePackages.kio-fuse' for Plasma 6."; # Added 2026-05-01
   kmplayer = throw "'kmplayer' has been removed, as it is unmaintained upstream"; # Added 2025-08-30
   knot-resolver = warnAlias "'knot-resolver' is currently aliased to 'knot-resolver_5'. This will change with the knot-resolver 6 being declared as stable. Please explicitly use the 'knot-resolver_5' or 'knot-resolver_6' package until then." knot-resolver_5; # Added 2025-11-30

From 7a3739e1350b1e5a85aaca47c4ac7225b44a6859 Mon Sep 17 00:00:00 2001
From: Jack Rosenberg <mail@jackr.eu>
Date: Sat, 6 Jun 2026 16:38:49 +0200
Subject: [PATCH 109/151] simh: bump to pcre2

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

diff --git a/pkgs/by-name/si/simh/package.nix b/pkgs/by-name/si/simh/package.nix
index 14d5e2d7457e..fb6081ea3be9 100644
--- a/pkgs/by-name/si/simh/package.nix
+++ b/pkgs/by-name/si/simh/package.nix
@@ -6,7 +6,7 @@
   SDL2_ttf,
   libpcap,
   vde2,
-  pcre,
+  pcre2,
 }:
 
 stdenv.mkDerivation rec {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     SDL2_ttf
     libpcap
     vde2
-    pcre
+    pcre2
   ];
 
   dontConfigure = true;

From ed8bb235409babb92ebc8c2d5a2e490e0bb9a36c Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 6 Jun 2026 09:28:21 -0500
Subject: [PATCH 110/151] kulala-core: 0.13.0 -> 0.14.1

Changelog: https://github.com/mistweaverco/kulala-core/compare/v0.13.0...v0.14.1
---
 pkgs/by-name/ku/kulala-core/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ku/kulala-core/package.nix b/pkgs/by-name/ku/kulala-core/package.nix
index 1a9af47f754b..e16c7f26174f 100644
--- a/pkgs/by-name/ku/kulala-core/package.nix
+++ b/pkgs/by-name/ku/kulala-core/package.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kulala-core";
-  version = "0.13.0";
+  version = "0.14.1";
 
   strictDeps = true;
   __structuredAttrs = true;
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "mistweaverco";
     repo = "kulala-core";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pUBG8tlybpd/YPArIssCEy5Op47MVPLJsOOolVItZpU=";
+    hash = "sha256-1EtYAKulMQbtYWHZ8MkUA1fMcL3V07/Sz1sjl5PnaI4=";
   };
 
   node_modules = stdenv.mkDerivation {
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     dontFixup = true;
 
-    outputHash = "sha256-NjHm6KU6Cd0ZyL1c+bmNbEHb5E83/xjQ5UGRjY1hzgQ=";
+    outputHash = "sha256-XQlBawD3vt8pVc7Gy9XeiGie89HWbljNJt7kUEDaDKk=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };

From 21963ee1bc53c74a64af40e0dfb6541c2d0a9d34 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 6 Jun 2026 10:21:21 -0500
Subject: [PATCH 111/151] kulala-fmt: 1.4.0 -> 3.1.0

Changelog: https://github.com/mistweaverco/kulala-fmt/compare/v1.4.0...v3.1.0
---
 pkgs/by-name/ku/kulala-fmt/package.nix | 104 ++++++++++++++++++++++---
 1 file changed, 92 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ku/kulala-fmt/package.nix b/pkgs/by-name/ku/kulala-fmt/package.nix
index 08c80cb86ef2..b1b29d22a2df 100644
--- a/pkgs/by-name/ku/kulala-fmt/package.nix
+++ b/pkgs/by-name/ku/kulala-fmt/package.nix
@@ -1,36 +1,116 @@
 {
   lib,
-  buildGoModule,
+  stdenv,
+  bun,
   fetchFromGitHub,
+  kulala-core,
+  makeBinaryWrapper,
+  nodejs,
+  writableTmpDirAsHomeHook,
 }:
 
-buildGoModule (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "kulala-fmt";
-  version = "1.4.0";
+  version = "3.1.0";
+
+  strictDeps = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "mistweaverco";
     repo = "kulala-fmt";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-yq7DMrt+g5wM/tynI7Cf6MBJs/d+fP3IppndKnTJMTw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-4rVsw3dyoKrC6lj8m2R42iZmBk5G2LIVtV6Ro9pHSBo=";
   };
 
-  vendorHash = "sha256-GazDEm/qv0nh8vYT+Tf0n4QDGHlcYtbMIj5rlZBvpKo=";
+  node_modules = stdenv.mkDerivation {
+    pname = "${finalAttrs.pname}-node_modules";
+    inherit (finalAttrs) version src;
 
-  env.CGO_ENABLED = 0;
+    strictDeps = true;
+    __structuredAttrs = true;
 
-  ldflags = [
-    "-s"
-    "-w"
-    "-X github.com/mistweaverco/kulala-fmt/cmd/kulalafmt.VERSION=${finalAttrs.version}"
+    nativeBuildInputs = [
+      bun
+      writableTmpDirAsHomeHook
+    ];
+
+    dontConfigure = true;
+
+    buildPhase = ''
+      runHook preBuild
+
+      bun install \
+        --cpu="*" \
+        --frozen-lockfile \
+        --ignore-scripts \
+        --no-progress \
+        --os="*"
+
+      runHook postBuild
+    '';
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out
+      cp -R node_modules $out/
+
+      runHook postInstall
+    '';
+
+    dontFixup = true;
+
+    outputHash = "sha256-z+jQC2RCav3VG/agWizcWFat8KgkGdBzaGQriviEbyo=";
+    outputHashAlgo = "sha256";
+    outputHashMode = "recursive";
+  };
+
+  nativeBuildInputs = [
+    bun
+    makeBinaryWrapper
+    nodejs
   ];
 
+  dontConfigure = true;
+
+  buildPhase = ''
+    runHook preBuild
+
+    cp -R ${finalAttrs.node_modules}/node_modules .
+    patchShebangs node_modules
+    bun run build
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 dist/cli.cjs $out/lib/kulala-fmt/cli.cjs
+    makeBinaryWrapper ${lib.getExe nodejs} $out/bin/kulala-fmt \
+      --add-flags $out/lib/kulala-fmt/cli.cjs \
+      --set KULALA_CORE_PATH ${lib.getExe kulala-core}
+
+    runHook postInstall
+  '';
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    $out/bin/kulala-fmt --version | grep -x ${lib.escapeShellArg finalAttrs.version}
+    printf '%s\n' 'GET https://example.com' | $out/bin/kulala-fmt format --stdin | grep 'GET https://example.com'
+
+    runHook postInstallCheck
+  '';
+
   meta = {
     description = "Opinionated .http and .rest files linter and formatter";
     homepage = "https://github.com/mistweaverco/kulala-fmt";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ CnTeng ];
     mainProgram = "kulala-fmt";
-    platforms = lib.platforms.all;
+    platforms = nodejs.meta.platforms;
   };
 })

From 3cf8ae56a23af920dc793a43e96bfdde1fdfb9f4 Mon Sep 17 00:00:00 2001
From: HexoKnight <harvey.gream@gmail.com>
Date: Sat, 6 Jun 2026 17:31:12 +0100
Subject: [PATCH 112/151] vimPlugins.*: ensure `passthru.vimPlugin = true`

---
 .../non-generated/notmuch-vim/default.nix     |  18 +++-
 .../non-generated/parinfer-rust/default.nix   |   9 +-
 .../editors/vim/plugins/overrides.nix         | 102 ++++++++++--------
 pkgs/test/vim/default.nix                     |  37 +++++--
 4 files changed, 116 insertions(+), 50 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/notmuch-vim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/notmuch-vim/default.nix
index c9b44d89fa47..15cb11a97231 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/notmuch-vim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/notmuch-vim/default.nix
@@ -1 +1,17 @@
-{ notmuch }: notmuch.vim
+{
+  vimUtils,
+  notmuch,
+}:
+vimUtils.buildVimPlugin {
+  inherit (notmuch) pname version;
+  src = notmuch.vim;
+  meta = {
+    inherit (notmuch.meta)
+      changelog
+      description
+      homepage
+      license
+      platforms
+      ;
+  };
+}
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/parinfer-rust/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/parinfer-rust/default.nix
index bb36ee777641..0b19ad30e824 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/parinfer-rust/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/parinfer-rust/default.nix
@@ -1 +1,8 @@
-{ parinfer-rust }: parinfer-rust
+{
+  vimUtils,
+  parinfer-rust,
+}:
+vimUtils.buildVimPlugin {
+  inherit (parinfer-rust) pname version meta;
+  src = parinfer-rust;
+}
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index dd87bdf7fb58..af346eb995c6 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -478,21 +478,23 @@ assertNoAdditions {
     nvimSkipModules = [ "ccc.kit.Thread.Server._bootstrap" ];
   };
 
-  chadtree = super.chadtree.overrideAttrs {
+  chadtree = super.chadtree.overrideAttrs (old: {
     # > E5108: Error executing lua ...implugin-chadtree-0-unstable-2026-01-18/lua/chadtree.lua:162: Vim:Failed to start server: address already in use
     doCheck = stdenv.hostPlatform.isLinux;
     buildInputs = [
       python3
     ];
-    passthru.python3Dependencies =
-      ps: with ps; [
-        pynvim-pp
-        pyyaml
-        std2
-      ];
+    passthru = old.passthru // {
+      python3Dependencies =
+        ps: with ps; [
+          pynvim-pp
+          pyyaml
+          std2
+        ];
+    };
     # We need some patches so it stops complaining about not being in a venv
     patches = [ ./patches/chadtree/emulate-venv.patch ];
-  };
+  });
 
   ChatGPT-nvim = super.ChatGPT-nvim.overrideAttrs {
     dependencies = with self; [
@@ -1053,13 +1055,15 @@ assertNoAdditions {
     };
   });
 
-  coq_nvim = super.coq_nvim.overrideAttrs {
-    passthru.python3Dependencies =
-      ps: with ps; [
-        pynvim-pp
-        pyyaml
-        std2
-      ];
+  coq_nvim = super.coq_nvim.overrideAttrs (old: {
+    passthru = old.passthru // {
+      python3Dependencies =
+        ps: with ps; [
+          pynvim-pp
+          pyyaml
+          std2
+        ];
+    };
 
     # We need some patches so it stops complaining about not being in a venv
     patches = [ ./patches/coq_nvim/emulate-venv.patch ];
@@ -1068,7 +1072,7 @@ assertNoAdditions {
       # Other modules require global variables
       "coq"
     ];
-  };
+  });
 
   cornelis = super.cornelis.overrideAttrs {
     dependencies = [ self.vim-textobj-user ];
@@ -1265,7 +1269,9 @@ assertNoAdditions {
 
   deoplete-khard = super.deoplete-khard.overrideAttrs (old: {
     dependencies = [ self.deoplete-nvim ];
-    passthru.python3Dependencies = ps: [ (ps.toPythonModule khard) ];
+    passthru = old.passthru // {
+      python3Dependencies = ps: [ (ps.toPythonModule khard) ];
+    };
     meta = old.meta // {
       description = "Address-completion for khard via deoplete";
       homepage = "https://github.com/nicoe/deoplete-khard";
@@ -1446,7 +1452,9 @@ assertNoAdditions {
   };
 
   fcitx-vim = super.fcitx-vim.overrideAttrs (old: {
-    passthru.python3Dependencies = ps: with ps; [ dbus-python ];
+    passthru = old.passthru // {
+      python3Dependencies = ps: with ps; [ dbus-python ];
+    };
     meta = old.meta // {
       description = "Keep and restore fcitx state when leaving/re-entering insert mode or search mode";
       license = lib.licenses.mit;
@@ -1969,9 +1977,11 @@ assertNoAdditions {
     };
   });
 
-  jupytext-nvim = super.jupytext-nvim.overrideAttrs {
-    passthru.python3Dependencies = ps: [ ps.jupytext ];
-  };
+  jupytext-nvim = super.jupytext-nvim.overrideAttrs (old: {
+    passthru = old.passthru // {
+      python3Dependencies = ps: [ ps.jupytext ];
+    };
+  });
 
   just-nvim = super.just-nvim.overrideAttrs {
     checkInputs = with self; [
@@ -2366,20 +2376,22 @@ assertNoAdditions {
     runtimeDeps = [ luau-lsp ];
   };
 
-  magma-nvim = super.magma-nvim.overrideAttrs {
-    passthru.python3Dependencies =
-      ps: with ps; [
-        pynvim
-        jupyter-client
-        ueberzug
-        pillow
-        cairosvg
-        plotly
-        ipykernel
-        pyperclip
-        pnglatex
-      ];
-  };
+  magma-nvim = super.magma-nvim.overrideAttrs (old: {
+    passthru = old.passthru // {
+      python3Dependencies =
+        ps: with ps; [
+          pynvim
+          jupyter-client
+          ueberzug
+          pillow
+          cairosvg
+          plotly
+          ipykernel
+          pyperclip
+          pnglatex
+        ];
+    };
+  });
 
   maple-nvim = super.maple-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
@@ -2597,13 +2609,15 @@ assertNoAdditions {
     };
   });
 
-  ncm2-jedi = super.ncm2-jedi.overrideAttrs {
+  ncm2-jedi = super.ncm2-jedi.overrideAttrs (old: {
     dependencies = with self; [
       nvim-yarp
       ncm2
     ];
-    passthru.python3Dependencies = ps: with ps; [ jedi ];
-  };
+    passthru = old.passthru // {
+      python3Dependencies = ps: with ps; [ jedi ];
+    };
+  });
 
   ncm2-neoinclude = super.ncm2-neoinclude.overrideAttrs {
     dependencies = [ self.neoinclude-vim ];
@@ -4817,7 +4831,9 @@ assertNoAdditions {
   });
 
   vim-beancount = super.vim-beancount.overrideAttrs (old: {
-    passthru.python3Dependencies = ps: with ps; [ beancount ];
+    passthru = old.passthru // {
+      python3Dependencies = ps: with ps; [ beancount ];
+    };
     meta = old.meta // {
       license = lib.licenses.vim;
     };
@@ -5300,9 +5316,11 @@ assertNoAdditions {
     };
   });
 
-  vim-mediawiki-editor = super.vim-mediawiki-editor.overrideAttrs {
-    passthru.python3Dependencies = [ python3.pkgs.mwclient ];
-  };
+  vim-mediawiki-editor = super.vim-mediawiki-editor.overrideAttrs (old: {
+    passthru = old.passthru // {
+      python3Dependencies = [ python3.pkgs.mwclient ];
+    };
+  });
 
   vim-merginal = super.vim-merginal.overrideAttrs (old: {
     meta = old.meta // {
diff --git a/pkgs/test/vim/default.nix b/pkgs/test/vim/default.nix
index 75e8ee2c2af4..296409a7e035 100644
--- a/pkgs/test/vim/default.nix
+++ b/pkgs/test/vim/default.nix
@@ -3,13 +3,9 @@
   vimUtils,
   vim-full,
   vimPlugins,
+
+  pkgs,
 }:
-let
-  inherit (vimUtils) buildVimPlugin;
-
-  packages.myVimPackage.start = with vimPlugins; [ vim-nix ];
-
-in
 lib.recurseIntoAttrs {
   vim_empty_config = vimUtils.vimrcFile {
     beforePlugins = "";
@@ -28,4 +24,33 @@ lib.recurseIntoAttrs {
     name = "vim-with-vim-addon-nix";
     vimrcConfig.packages.myVimPackage.start = with vimPlugins; [ vim-nix ];
   };
+
+  # test that all vimPlugins have `passthru.vimPlugin = true`
+  test-all-plugins-have-vimPlugin-true =
+    let
+      # we remove aliases as they are irrelevant here and cause warning when evaling this test
+      pkgsNoAliases = (
+        pkgs.extend (
+          self: prev: {
+            config = prev.config // {
+              allowAliases = false;
+            };
+          }
+        )
+      );
+      vimPluginsNoAliases = pkgsNoAliases.vimPlugins;
+    in
+    assert
+      lib.attrNames (
+        lib.filterAttrs (
+          name: elem:
+          # exclude non-plugins
+          lib.isDerivation elem
+          && name != "corePlugins"
+          # only plugins that don't have `vimPlugin = true`
+          && elem.passthru.vimPlugin or false != true
+        ) vimPluginsNoAliases
+      ) == [ ];
+    # testing is done during evaluation above so this derivation is irrelevant
+    vim-full;
 }

From d332e23d908bfe6477082dc2dc92dad9ede5f4f1 Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Sat, 6 Jun 2026 19:18:21 +0200
Subject: [PATCH 113/151] python3Packages.whichcraft: use finalAttrs

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

diff --git a/pkgs/development/python-modules/whichcraft/default.nix b/pkgs/development/python-modules/whichcraft/default.nix
index b237513ef0f5..a8e78bc8ab45 100644
--- a/pkgs/development/python-modules/whichcraft/default.nix
+++ b/pkgs/development/python-modules/whichcraft/default.nix
@@ -6,13 +6,13 @@
   glibcLocales,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "whichcraft";
   version = "0.6.1";
   format = "setuptools";
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     sha256 = "11yfkzyplizdgndy34vyd5qlmr1n5mxis3a3svxmx8fnccdvknxc";
   };
 
@@ -30,4 +30,4 @@ buildPythonPackage rec {
     description = "Cross-platform cross-python shutil.which functionality";
     license = lib.licenses.bsd3;
   };
-}
+})

From 8bd5bfeceb3880ba7b850ce6f9cb2e8855bcd806 Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Sat, 6 Jun 2026 19:19:33 +0200
Subject: [PATCH 114/151] python3Packages.whichcraft: cleanup unused
 glibcLocales

Removing this causes now changes apart from the store path changing
---
 pkgs/development/python-modules/whichcraft/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/python-modules/whichcraft/default.nix b/pkgs/development/python-modules/whichcraft/default.nix
index a8e78bc8ab45..407c431512af 100644
--- a/pkgs/development/python-modules/whichcraft/default.nix
+++ b/pkgs/development/python-modules/whichcraft/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchPypi,
   pytest,
-  glibcLocales,
 }:
 
 buildPythonPackage (finalAttrs: {
@@ -16,9 +15,6 @@ buildPythonPackage (finalAttrs: {
     sha256 = "11yfkzyplizdgndy34vyd5qlmr1n5mxis3a3svxmx8fnccdvknxc";
   };
 
-  env.LC_ALL = "en_US.utf-8";
-  buildInputs = [ glibcLocales ];
-
   nativeCheckInputs = [ pytest ];
 
   checkPhase = ''

From 296e40d75f02a676e09e4ed752ce2cd1042c0c2f Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Sat, 6 Jun 2026 19:21:58 +0200
Subject: [PATCH 115/151] python3Packages.whichcraft: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/whichcraft/default.nix b/pkgs/development/python-modules/whichcraft/default.nix
index 407c431512af..bc48ee9a5155 100644
--- a/pkgs/development/python-modules/whichcraft/default.nix
+++ b/pkgs/development/python-modules/whichcraft/default.nix
@@ -2,19 +2,22 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   pytest,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "whichcraft";
   version = "0.6.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
     sha256 = "11yfkzyplizdgndy34vyd5qlmr1n5mxis3a3svxmx8fnccdvknxc";
   };
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [ pytest ];
 
   checkPhase = ''

From ea0b42ff401558f6743bcab05aec28a948da5b99 Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Sat, 6 Jun 2026 19:23:53 +0200
Subject: [PATCH 116/151] python3Packages.whichcraft: add changelog

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

diff --git a/pkgs/development/python-modules/whichcraft/default.nix b/pkgs/development/python-modules/whichcraft/default.nix
index bc48ee9a5155..56b0c55356d9 100644
--- a/pkgs/development/python-modules/whichcraft/default.nix
+++ b/pkgs/development/python-modules/whichcraft/default.nix
@@ -27,6 +27,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     homepage = "https://github.com/pydanny/whichcraft";
     description = "Cross-platform cross-python shutil.which functionality";
+    changelog = "https://github.com/cookiecutter/whichcraft/blob/${finalAttrs.version}/HISTORY.rst";
     license = lib.licenses.bsd3;
   };
 })

From 340b7f937a7c0900700770119cfea2eb5544ddbe Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sat, 6 Jun 2026 16:14:59 -0300
Subject: [PATCH 117/151] pgdog: 0.1.42 -> 0.1.43

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

diff --git a/pkgs/by-name/pg/pgdog/package.nix b/pkgs/by-name/pg/pgdog/package.nix
index ede4beff9bcd..ee08bfc63e8d 100644
--- a/pkgs/by-name/pg/pgdog/package.nix
+++ b/pkgs/by-name/pg/pgdog/package.nix
@@ -14,16 +14,16 @@ let
 in
 rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: {
   pname = "pgdog";
-  version = "0.1.42";
+  version = "0.1.43";
 
   src = fetchFromGitHub {
     owner = "pgdogdev";
     repo = "pgdog";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-X0UsaToKHWAZzDA/xBoBqtpFSlFdso3tMwci3SD80/I=";
+    hash = "sha256-0ilN89DChNOFcwsOZK7ZZPsbMCMH3NQlZlSvjT6F4oY=";
   };
 
-  cargoHash = "sha256-6iWmNqlUoRLi9HxsX7Vhpu+KIsNrakzG97/Orwt3LOU=";
+  cargoHash = "sha256-wh63mNo2dX4ngLW+dEu9UtWVuqNSBNrtYvK2ejHxNKg=";
 
   # Hardcoded paths for C compiler and linker
   postPatch = ''

From 36f78d2a1592613cfd7f626174a02599fe8c44b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 6 Jun 2026 22:05:56 +0200
Subject: [PATCH 118/151] python314Packages.oslo-metrics: 0.14.0 -> 0.16.0,
 fetch from github

Also for 0.14.0 the hashes where not updated by accident.
---
 .../python-modules/oslo-metrics/default.nix           | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/oslo-metrics/default.nix b/pkgs/development/python-modules/oslo-metrics/default.nix
index bcae5f3b226f..a4f266cac69f 100644
--- a/pkgs/development/python-modules/oslo-metrics/default.nix
+++ b/pkgs/development/python-modules/oslo-metrics/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchFromGitea,
+  fetchFromGitHub,
 
   # build-system
   pbr,
@@ -19,15 +19,14 @@
 
 buildPythonPackage rec {
   pname = "oslo-metrics";
-  version = "0.14.0";
+  version = "0.16.0";
   pyproject = true;
 
-  src = fetchFromGitea {
-    domain = "opendev.org";
+  src = fetchFromGitHub {
     owner = "openstack";
     repo = "oslo.metrics";
     tag = version;
-    hash = "sha256-PiMrfVWRV3GQPJ7PnXzhAdTncXcFDPZFd+sMHVr65UU=";
+    hash = "sha256-LV4NGHs0lBtktjzboOsPOnA56QqjnaKwtGGdy5WlW6Q=";
   };
 
   env.PBR_VERSION = version;
@@ -58,7 +57,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "OpenStack library for collecting metrics from Oslo libraries";
-    homepage = "https://opendev.org/openstack/oslo.metrics";
+    homepage = "https://github.com/openstack/oslo.metrics";
     license = lib.licenses.asl20;
     teams = [ lib.teams.openstack ];
   };

From fd2e48a710648e9f4c5d4965533e2545dad573a3 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 7 Jun 2026 01:13:14 +0200
Subject: [PATCH 119/151] python3Packages.starlette-admin: 0.16.0 -> 0.16.1

Changelog: https://jowilf.github.io/starlette-admin/changelog/
---
 pkgs/development/python-modules/starlette-admin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/starlette-admin/default.nix b/pkgs/development/python-modules/starlette-admin/default.nix
index 74ff7e1d48a0..500a940a2139 100644
--- a/pkgs/development/python-modules/starlette-admin/default.nix
+++ b/pkgs/development/python-modules/starlette-admin/default.nix
@@ -41,14 +41,14 @@
 
 buildPythonPackage rec {
   pname = "starlette-admin";
-  version = "0.16.0";
+  version = "0.16.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jowilf";
     repo = "starlette-admin";
     tag = version;
-    hash = "sha256-JVvrfbyKillkx6fOx4DEbHZoHIPxF1Gn3HzkxyJc66o=";
+    hash = "sha256-K6FHC7nzOjRh7O47QHveMPwspfvPChHzB6Tpyfsx02U=";
   };
 
   patches = [

From 432ff0c84d4529074a91c12a035aba6f82fe43fb Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 7 Jun 2026 01:14:05 +0200
Subject: [PATCH 120/151] python3Packages.cachier: 4.1.0 -> 4.2.0

Changelog: https://github.com/python-cachier/cachier/releases/tag/v4.2.0
---
 pkgs/development/python-modules/cachier/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/cachier/default.nix b/pkgs/development/python-modules/cachier/default.nix
index 1db5698775c6..cf13e7cf360f 100644
--- a/pkgs/development/python-modules/cachier/default.nix
+++ b/pkgs/development/python-modules/cachier/default.nix
@@ -6,9 +6,12 @@
   setuptools,
   click,
   watchdog,
+  pympler,
   portalocker,
   pytestCheckHook,
   pytest-cov-stub,
+  pytest-asyncio,
+  aiosqlite,
   sqlalchemy,
   pymongo,
   dnspython,
@@ -19,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "cachier";
-  version = "4.1.0";
+  version = "4.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-cachier";
     repo = "cachier";
     tag = "v${version}";
-    hash = "sha256-FmrwH5Ksmgt0HA5eUN5LU36P5sY4PymRKsUWVkQlvBo=";
+    hash = "sha256-hiyevLMtKV8M8znB2mznHLRM+pVN6uCxZZVf3H0gjTI=";
   };
 
   pythonRemoveDeps = [ "setuptools" ];
@@ -37,6 +40,7 @@ buildPythonPackage rec {
 
   dependencies = [
     watchdog
+    pympler
     portalocker
     # not listed as dep, but needed to run main script entrypoint
     click
@@ -45,6 +49,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     pytest-cov-stub
+    pytest-asyncio
+    aiosqlite
     sqlalchemy
     pymongo
     dnspython
@@ -83,7 +89,7 @@ buildPythonPackage rec {
 
   disabledTestPaths = [
     # Keeps breaking due to concurrent access or failing to close the db between tests.
-    "tests/test_sql_core.py"
+    "tests/sql_tests/test_sql_core.py"
   ];
 
   preBuild = ''

From 6b3a5bf71e15dc272661fdf90dc7e62423b34d8f Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 7 Jun 2026 07:58:36 +0700
Subject: [PATCH 121/151] python3Packages.cccolutils: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/cccolutils/default.nix b/pkgs/development/python-modules/cccolutils/default.nix
index ee5895c411dc..6ad65300fbfa 100644
--- a/pkgs/development/python-modules/cccolutils/default.nix
+++ b/pkgs/development/python-modules/cccolutils/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   git,
   gitpython,
   krb5-c, # C krb5 library, not PyPI krb5
@@ -12,7 +13,7 @@
 buildPythonPackage rec {
   pname = "cccolutils";
   version = "1.5";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "CCColUtils";
@@ -20,9 +21,11 @@ buildPythonPackage rec {
     hash = "sha256-YzKjG43biRbTZKtzSUHHhtzOfcZfzISHDFolqzrBjL8=";
   };
 
+  build-system = [ setuptools ];
+
   buildInputs = [ krb5-c ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     git
     gitpython
     mock

From 3de7dbbd400390931eb8c26a8db69e448a9b26b5 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 7 Jun 2026 08:00:15 +0700
Subject: [PATCH 122/151] python3Packages.cccolutils: modernize

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

diff --git a/pkgs/development/python-modules/cccolutils/default.nix b/pkgs/development/python-modules/cccolutils/default.nix
index 6ad65300fbfa..569016231253 100644
--- a/pkgs/development/python-modules/cccolutils/default.nix
+++ b/pkgs/development/python-modules/cccolutils/default.nix
@@ -10,14 +10,16 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "cccolutils";
   version = "1.5";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
     pname = "CCColUtils";
-    inherit version;
+    inherit (finalAttrs) version;
     hash = "sha256-YzKjG43biRbTZKtzSUHHhtzOfcZfzISHDFolqzrBjL8=";
   };
 
@@ -40,4 +42,4 @@ buildPythonPackage rec {
     homepage = "https://pagure.io/cccolutils";
     license = lib.licenses.gpl2Plus;
   };
-}
+})

From 4844ef1e84e52f24842358476f9cad4d5b7cb29f Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 7 Jun 2026 10:35:35 +0700
Subject: [PATCH 123/151] python3Packages.ci-py: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/ci-py/default.nix b/pkgs/development/python-modules/ci-py/default.nix
index b516b3624a9e..a8558967e50c 100644
--- a/pkgs/development/python-modules/ci-py/default.nix
+++ b/pkgs/development/python-modules/ci-py/default.nix
@@ -2,19 +2,22 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "ci-py";
   version = "1.0.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-R/6bLsXOKGxiJDZUvvOuvLp3usEhfg698qvvgOwBXYk=";
   };
 
+  build-system = [ setuptools ];
+
   postPatch = ''
     substituteInPlace setup.py \
       --replace "'pytest-runner', " ""

From ee484921df89f8dc29000a208b6a3cb0fc56e76d Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 7 Jun 2026 10:35:49 +0700
Subject: [PATCH 124/151] python3Packages.chat-downloader: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/chat-downloader/default.nix b/pkgs/development/python-modules/chat-downloader/default.nix
index 00e853a5a20d..e6621bc12896 100644
--- a/pkgs/development/python-modules/chat-downloader/default.nix
+++ b/pkgs/development/python-modules/chat-downloader/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   requests,
   isodate,
   docstring-parser,
@@ -13,14 +14,16 @@
 buildPythonPackage rec {
   pname = "chat-downloader";
   version = "0.2.8";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit version pname;
     hash = "sha256-WBasBhefgRkOdMdz2K/agvS+cY6m3/33wiu+Jl4d1Cg=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     requests
     isodate
     docstring-parser

From 1c40dca403b81d15f2a1623635f774fb8c32a59b Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 7 Jun 2026 10:36:12 +0700
Subject: [PATCH 125/151] python3Packages.ci-info: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/ci-info/default.nix b/pkgs/development/python-modules/ci-info/default.nix
index 32b08f75003d..7bb55383e907 100644
--- a/pkgs/development/python-modules/ci-info/default.nix
+++ b/pkgs/development/python-modules/ci-info/default.nix
@@ -2,14 +2,17 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   pytest,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   version = "0.3.0";
-  format = "setuptools";
   pname = "ci-info";
+  pyproject = true;
+
+  build-system = [ setuptools ];
 
   src = fetchPypi {
     inherit pname version;

From d2d1354b31b566287d2adf6b99c5138211ac0376 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 7 Jun 2026 10:40:32 +0700
Subject: [PATCH 126/151] python3Packages.ci-info: modernize

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

diff --git a/pkgs/development/python-modules/ci-info/default.nix b/pkgs/development/python-modules/ci-info/default.nix
index 7bb55383e907..d9b35e7fa3c8 100644
--- a/pkgs/development/python-modules/ci-info/default.nix
+++ b/pkgs/development/python-modules/ci-info/default.nix
@@ -7,15 +7,17 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
-  version = "0.3.0";
+buildPythonPackage (finalAttrs: {
   pname = "ci-info";
+  version = "0.3.0";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   build-system = [ setuptools ];
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-H9UMvUAfKa3/7rGLBIniMtFqwadFisa8MW3qtq5TX7A=";
   };
 
@@ -34,4 +36,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ bcdarwin ];
   };
-}
+})

From 5598c4df924c7fcb1d1888f275be43a04d176e97 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 7 Jun 2026 10:40:41 +0700
Subject: [PATCH 127/151] python3Packages.ci-py: modernize

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

diff --git a/pkgs/development/python-modules/ci-py/default.nix b/pkgs/development/python-modules/ci-py/default.nix
index a8558967e50c..66c2d4a8a257 100644
--- a/pkgs/development/python-modules/ci-py/default.nix
+++ b/pkgs/development/python-modules/ci-py/default.nix
@@ -6,13 +6,15 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "ci-py";
   version = "1.0.0";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-R/6bLsXOKGxiJDZUvvOuvLp3usEhfg698qvvgOwBXYk=";
   };
 
@@ -20,7 +22,7 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "'pytest-runner', " ""
+      --replace-fail "'pytest-runner', " ""
   '';
 
   nativeCheckInputs = [ pytestCheckHook ];
@@ -34,4 +36,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ bcdarwin ];
   };
-}
+})

From 9896e71998cfd0e7dccc29080d0ccf628efe37a2 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 7 Jun 2026 10:41:33 +0700
Subject: [PATCH 128/151] python3Packages.chat-downloader: modernize

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

diff --git a/pkgs/development/python-modules/chat-downloader/default.nix b/pkgs/development/python-modules/chat-downloader/default.nix
index e6621bc12896..10e08d167a4b 100644
--- a/pkgs/development/python-modules/chat-downloader/default.nix
+++ b/pkgs/development/python-modules/chat-downloader/default.nix
@@ -11,13 +11,15 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "chat-downloader";
   version = "0.2.8";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
-    inherit version pname;
+    inherit (finalAttrs) version pname;
     hash = "sha256-WBasBhefgRkOdMdz2K/agvS+cY6m3/33wiu+Jl4d1Cg=";
   };
 
@@ -42,8 +44,8 @@ buildPythonPackage rec {
     description = "Simple tool used to retrieve chat messages from livestreams, videos, clips and past broadcasts";
     mainProgram = "chat_downloader";
     homepage = "https://github.com/xenova/chat-downloader";
-    changelog = "https://github.com/xenova/chat-downloader/releases/tag/v${version}";
+    changelog = "https://github.com/xenova/chat-downloader/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})

From 32314454a2bac8ddfacd8b81278125ac792a31d1 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 7 Jun 2026 10:57:26 +0700
Subject: [PATCH 129/151] python3Packages.ciscomobilityexpress: migrate to
 pyproject

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

diff --git a/pkgs/development/python-modules/ciscomobilityexpress/default.nix b/pkgs/development/python-modules/ciscomobilityexpress/default.nix
index 57e127cc5c2a..1d2d11cc2db1 100644
--- a/pkgs/development/python-modules/ciscomobilityexpress/default.nix
+++ b/pkgs/development/python-modules/ciscomobilityexpress/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   requests,
   python,
 }:
@@ -9,14 +10,16 @@
 buildPythonPackage rec {
   pname = "ciscomobilityexpress";
   version = "1.0.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "d8787245598e8371a83baa4db1df949d8a942c43f13454fa26ee3b09c3ccafc0";
   };
 
-  propagatedBuildInputs = [ requests ];
+  build-system = [ setuptools ];
+
+  dependencies = [ requests ];
 
   # tests directory is set up, but has no tests
   checkPhase = ''

From 9138149da4b4aa81e286fcc02add88f439020c11 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 7 Jun 2026 10:59:59 +0700
Subject: [PATCH 130/151] python3Packages.clf: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/clf/default.nix b/pkgs/development/python-modules/clf/default.nix
index de884a48b30f..27964a87d6cd 100644
--- a/pkgs/development/python-modules/clf/default.nix
+++ b/pkgs/development/python-modules/clf/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   docopt,
   requests,
   pygments,
@@ -10,18 +11,20 @@
 buildPythonPackage rec {
   pname = "clf";
   version = "0.5.7";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "abc919a1e99667f32fdde15dfb4bc527dbe22cf86a17acb78a449d7f2dfe937e";
   };
 
+  build-system = [ setuptools ];
+
   patchPhase = ''
     sed -i 's/==/>=/' requirements.txt
   '';
 
-  propagatedBuildInputs = [
+  dependencies = [
     docopt
     requests
     pygments

From 2fbe0b8ca66b018af7e46426c785f724a277250c Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 7 Jun 2026 11:00:06 +0700
Subject: [PATCH 131/151] python3Packages.click-command-tree: migrate to
 pyproject

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

diff --git a/pkgs/development/python-modules/click-command-tree/default.nix b/pkgs/development/python-modules/click-command-tree/default.nix
index 5d7b2cf3da4c..6e67b31c24ae 100644
--- a/pkgs/development/python-modules/click-command-tree/default.nix
+++ b/pkgs/development/python-modules/click-command-tree/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   click,
   pytestCheckHook,
 }:
@@ -9,7 +10,7 @@
 buildPythonPackage (finalAttrs: {
   pname = "click-command-tree";
   version = "1.2.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "whwright";
@@ -18,7 +19,9 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-oshAHCGe8p5BQ0W21bXSxrTCEFgIxZ6BmUEiWB1xAoI=";
   };
 
-  propagatedBuildInputs = [ click ];
+  build-system = [ setuptools ];
+
+  dependencies = [ click ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 

From 03fc239cb1ece3c65d176bd5b26ec3f56d70a03a Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 7 Jun 2026 11:02:17 +0700
Subject: [PATCH 132/151] python3Packages.ciscomobilityexpress: modernize

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

diff --git a/pkgs/development/python-modules/ciscomobilityexpress/default.nix b/pkgs/development/python-modules/ciscomobilityexpress/default.nix
index 1d2d11cc2db1..502d189c17dc 100644
--- a/pkgs/development/python-modules/ciscomobilityexpress/default.nix
+++ b/pkgs/development/python-modules/ciscomobilityexpress/default.nix
@@ -7,14 +7,16 @@
   python,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "ciscomobilityexpress";
   version = "1.0.2";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "d8787245598e8371a83baa4db1df949d8a942c43f13454fa26ee3b09c3ccafc0";
+    inherit (finalAttrs) pname version;
+    hash = "sha256-2HhyRVmOg3GoO6pNsd+UnYqULEPxNFT6Ju47CcPMr8A=";
   };
 
   build-system = [ setuptools ];
@@ -34,4 +36,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ uvnikita ];
   };
-}
+})

From 315d63a6784bd541fd4df5fc48d341d4baf64c34 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 7 Jun 2026 11:03:49 +0700
Subject: [PATCH 133/151] python3Packages.click-command-tree: modernize

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

diff --git a/pkgs/development/python-modules/click-command-tree/default.nix b/pkgs/development/python-modules/click-command-tree/default.nix
index 6e67b31c24ae..bf1141b0c81c 100644
--- a/pkgs/development/python-modules/click-command-tree/default.nix
+++ b/pkgs/development/python-modules/click-command-tree/default.nix
@@ -12,6 +12,8 @@ buildPythonPackage (finalAttrs: {
   version = "1.2.0";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "whwright";
     repo = "click-command-tree";

From 9a911e58bb95f5b46dab6ac416f8818b03e1032f Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 7 Jun 2026 11:04:02 +0700
Subject: [PATCH 134/151] python3Packages.clf: modernize

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

diff --git a/pkgs/development/python-modules/clf/default.nix b/pkgs/development/python-modules/clf/default.nix
index 27964a87d6cd..c52aa46c9bbf 100644
--- a/pkgs/development/python-modules/clf/default.nix
+++ b/pkgs/development/python-modules/clf/default.nix
@@ -8,14 +8,16 @@
   pygments,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "clf";
   version = "0.5.7";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "abc919a1e99667f32fdde15dfb4bc527dbe22cf86a17acb78a449d7f2dfe937e";
+    inherit (finalAttrs) pname version;
+    hash = "sha256-q8kZoemWZ/Mv3eFd+0vFJ9viLPhqF6y3ikSdfy3+k34=";
   };
 
   build-system = [ setuptools ];
@@ -34,6 +36,8 @@ buildPythonPackage rec {
   # No local packages or download links found for requests
   doCheck = false;
 
+  pythonImportsCheck = [ "clf" ];
+
   meta = {
     homepage = "https://github.com/ncrocfer/clf";
     description = "Command line tool to search snippets on Commandlinefu.com";
@@ -41,4 +45,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ koral ];
   };
-}
+})

From 4dd55269ff3e7bcaa75e66dd48b8e0fa6b656a4c Mon Sep 17 00:00:00 2001
From: Shelvacu <git@shelvacu.com>
Date: Sat, 6 Jun 2026 22:56:55 -0700
Subject: [PATCH 135/151] maintainers: update shelvacu

---
 maintainers/maintainer-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f86bb07d690f..7412855918cf 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -25332,7 +25332,7 @@
   shelvacu = {
     name = "Shelvacu";
     email = "nix-maint@shelvacu.com";
-    matrix = "@s:consortium.chat";
+    matrix = "@s:sv.mt";
     github = "shelvacu";
     githubId = 1731537;
   };

From 9eea4b07a036acd90b9a98bab244703a80fbe591 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sun, 7 Jun 2026 08:32:27 +0200
Subject: [PATCH 136/151] weblate: relax hiredis dependency

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

diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix
index eeeaf2c02ea2..00ab7b20626d 100644
--- a/pkgs/by-name/we/weblate/package.nix
+++ b/pkgs/by-name/we/weblate/package.nix
@@ -97,6 +97,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     "requests"
     "pygobject"
     "certifi"
+    "hiredis"
   ];
 
   dependencies =

From 158e2741f2a0a14ecf028ad0a58abd994d8a03e0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 Jun 2026 06:39:53 +0000
Subject: [PATCH 137/151] cargo-mutants: 27.0.0 -> 27.1.0

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

diff --git a/pkgs/by-name/ca/cargo-mutants/package.nix b/pkgs/by-name/ca/cargo-mutants/package.nix
index 3ace6c52e066..2471dc7d9024 100644
--- a/pkgs/by-name/ca/cargo-mutants/package.nix
+++ b/pkgs/by-name/ca/cargo-mutants/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-mutants";
-  version = "27.0.0";
+  version = "27.1.0";
 
   src = fetchFromGitHub {
     owner = "sourcefrog";
     repo = "cargo-mutants";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ctbX5xoxmZzyvwJByDC7f71CLtpn8IkZTXTSdjXf25U=";
+    hash = "sha256-XPcxKBHTwLqHG67d/JNrCBC19DCnLyvLqj26v5MjHvM=";
   };
 
-  cargoHash = "sha256-+z2QSvSxKIt2giQYVcSOEqHvsUuLnxE2HqkA13W9KhY=";
+  cargoHash = "sha256-zKbw73lnOhgjSiCiXezo71S/9DaNfe7HII0QwUADrFA=";
 
   # too many tests require internet access
   doCheck = false;

From 04d01779f5d77d0775ece903de2d4be9e2ba821e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 Jun 2026 07:09:38 +0000
Subject: [PATCH 138/151] python3Packages.spotipyfree: 1.8.1 -> 1.9.5

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

diff --git a/pkgs/development/python-modules/spotipyfree/default.nix b/pkgs/development/python-modules/spotipyfree/default.nix
index fc8822451c99..962ab48a0e67 100644
--- a/pkgs/development/python-modules/spotipyfree/default.nix
+++ b/pkgs/development/python-modules/spotipyfree/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "spotipyfree";
-  version = "1.8.1";
+  version = "1.9.5";
   pyproject = true;
 
   # no tags on GitHub
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-HQJf0xkpUxykwa27kSdATSc6LL+uYtigzN/l+xRi6yc=";
+    hash = "sha256-1QvcyQcQsLXsEzk6fbNw9lga4KCcoPpxJGorJoacHto=";
   };
 
   build-system = [ setuptools ];

From 959ab72a8f09d571dd7384410a92964b02c5a8d6 Mon Sep 17 00:00:00 2001
From: Jack Rosenberg <mail@jackr.eu>
Date: Sat, 6 Jun 2026 12:13:40 +0200
Subject: [PATCH 139/151] xneur: drop

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

diff --git a/pkgs/by-name/xn/xneur/package.nix b/pkgs/by-name/xn/xneur/package.nix
deleted file mode 100644
index 4cbda825a2b9..000000000000
--- a/pkgs/by-name/xn/xneur/package.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchurl,
-  fetchpatch,
-  autoreconfHook,
-  intltool,
-  pkg-config,
-  wrapGAppsHook3,
-  enchant,
-  gdk-pixbuf,
-  glib,
-  gst_all_1,
-  libnotify,
-  pcre,
-  libxtst,
-  libxi,
-  libxext,
-  libx11,
-  xosd,
-}:
-
-stdenv.mkDerivation {
-  pname = "xneur";
-  version = "0.20.0";
-
-  src = fetchurl {
-    url = "https://github.com/AndrewCrewKuznetsov/xneur-devel/raw/f66723feb272c68f7c22a8bf0dbcafa5e3a8a5ee/dists/0.20.0/xneur_0.20.0.orig.tar.gz";
-    sha256 = "1lg3qpi9pkx9f5xvfc8yf39wwc98f769yb7i2438vqn66kla1xpr";
-  };
-
-  nativeBuildInputs = [
-    autoreconfHook
-    intltool
-    pkg-config
-    wrapGAppsHook3
-  ];
-
-  buildInputs = [
-    enchant
-    gdk-pixbuf
-    glib
-    gst_all_1.gst-plugins-base
-    gst_all_1.gst-plugins-good
-    gst_all_1.gstreamer
-    libnotify
-    pcre
-    libx11
-    libxext
-    libxi
-    libxtst
-    xosd
-  ];
-
-  patches = [
-    (fetchpatch {
-      name = "gcc-10.patch";
-      url = "https://salsa.debian.org/debian/xneur/-/raw/da38ad9c8e1bf4e349f5ed4ad909f810fdea44c9/debian/patches/gcc-10.patch";
-      sha256 = "0pc17a4sdrnrc4z7gz28889b9ywqsm5mzm6m41h67j2f5zh9k3fy";
-    })
-    (fetchpatch {
-      name = "enchant2.patch";
-      url = "https://salsa.debian.org/debian/xneur/-/raw/695b0fea56cde4ff6cf0f3988218c5cb9d7ff5ae/debian/patches/enchant2.patch";
-      sha256 = "02a3kkfzdvs5f8dfm6j5x3jcn5j8qah9ykfymp6ffqsf4fijp65n";
-    })
-  ];
-
-  postPatch = ''
-    sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure.ac
-  '';
-
-  meta = {
-    description = "Utility for switching between keyboard layouts";
-    mainProgram = "xneur";
-    homepage = "https://xneur.ru";
-    license = lib.licenses.gpl2Plus;
-    maintainers = [ lib.maintainers.raskin ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 860584e73a64..35e63381213f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2397,6 +2397,7 @@ mapAliases {
   xloadimage = throw "'xloadimage' has been removed as it was unmaintained upstream"; # Added 2026-05-05
   xmlada = throw "'xmlada' has been renamed to/replaced by 'gnatPackages.xmlada'"; # Converted to throw 2025-10-27
   xmlroff = throw "'xmlroff' has been removed as it is unmaintained and broken"; # Added 2025-05-18
+  xneur = throw "'xneur' has been removed as it is unmaintained and depends on pcre, which is deprecated"; # Added 2026-06-06
   xo = throw "Use 'dbtpl' instead of 'xo'"; # Added 2025-09-28
   xonsh-unwrapped = throw "'xonsh-unwrapped' has been renamed to/replaced by 'python3Packages.xonsh'"; # Converted to throw 2025-10-27
   xorg = # Added 2026-01-29

From 3c2f4fef323c44277ed52fedab12d4243b2b7917 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 Jun 2026 11:14:41 +0000
Subject: [PATCH 140/151] delineate: 0.1.1 -> 0.1.2

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

diff --git a/pkgs/by-name/de/delineate/package.nix b/pkgs/by-name/de/delineate/package.nix
index 25144bfc366f..7bdf8e5d48a6 100644
--- a/pkgs/by-name/de/delineate/package.nix
+++ b/pkgs/by-name/de/delineate/package.nix
@@ -39,18 +39,18 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "delineate";
-  version = "0.1.1";
+  version = "0.1.2";
 
   src = fetchFromGitHub {
     owner = "SeaDve";
     repo = "Delineate";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rYA5TKHX3QJHcUhaTFDpcXQ6tdaG3MbX8buvzV0V5iY=";
+    hash = "sha256-6SYYDxzBzs6nSrPp9TPKnIYHdoZJklTr5K0DSFx7S0s=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src;
-    hash = "sha256-6XBg9kbIr5k+TMQ/TE/qsAA5rKIevU9M1m+jsPrqfYw=";
+    hash = "sha256-G7K3aeSBnKcJHOlQQIHd3Kzoe/ienFVycTWOKOSRhZc=";
   };
 
   # rename $out/src -> $out/opt

From 2787b874601d88e5b44754b7a6607f7e44cb60e7 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Sun, 7 Jun 2026 14:44:10 +0300
Subject: [PATCH 141/151] nixosTests.systemd-initrd-luks-fido2: don't rely on
 autoFormat

b5611f96b6e1 dropped the patch that originally made this work,
fix the test in the same way as what was done in b13891782fde.
---
 nixos/tests/systemd-initrd-luks-fido2.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/systemd-initrd-luks-fido2.nix b/nixos/tests/systemd-initrd-luks-fido2.nix
index 783b9d7426e7..3c191dcbf509 100644
--- a/nixos/tests/systemd-initrd-luks-fido2.nix
+++ b/nixos/tests/systemd-initrd-luks-fido2.nix
@@ -38,7 +38,6 @@
           };
         };
         virtualisation.rootDevice = "/dev/mapper/cryptroot";
-        virtualisation.fileSystems."/".autoFormat = true;
       };
     };
 
@@ -52,6 +51,8 @@
       # Create encrypted volume
       machine.wait_for_unit("multi-user.target")
       machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdb -")
+      machine.succeed("echo -n supersecret | cryptsetup luksOpen   -q               /dev/vdb cryptroot")
+      machine.succeed("mkfs.ext4 /dev/mapper/cryptroot")
       machine.succeed("PASSWORD=supersecret SYSTEMD_LOG_LEVEL=debug systemd-cryptenroll --fido2-device=auto /dev/vdb |& systemd-cat")
 
       # Boot from the encrypted disk

From def1405cd3a395c682694a1113d310e9b750f2a7 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Sun, 7 Jun 2026 14:50:25 +0300
Subject: [PATCH 142/151] nixosTests.systemd-initrd-luks-unl0kr: fix testScript
 indentation

---
 nixos/tests/systemd-initrd-luks-unl0kr.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/tests/systemd-initrd-luks-unl0kr.nix b/nixos/tests/systemd-initrd-luks-unl0kr.nix
index b48bd2d1588f..4686fa0c5b02 100644
--- a/nixos/tests/systemd-initrd-luks-unl0kr.nix
+++ b/nixos/tests/systemd-initrd-luks-unl0kr.nix
@@ -73,7 +73,6 @@ in
           cryptroot2.device = "/dev/vdc";
         };
         virtualisation.rootDevice = "/dev/mapper/cryptroot";
-        virtualisation.fileSystems."/".autoFormat = true;
         # test mounting device unlocked in initrd after switching root
         virtualisation.fileSystems."/cryptroot2" = {
           device = "/dev/mapper/cryptroot2";
@@ -100,7 +99,7 @@ in
       machine.succeed("mkfs.ext4 /dev/mapper/cryptroot2")
 
       # Boot from the encrypted disk
-        machine.succeed("${boot-luks}/bin/switch-to-configuration boot")
+      machine.succeed("${boot-luks}/bin/switch-to-configuration boot")
       machine.succeed("sync")
       machine.crash()
 

From 359d0249e4cb77c7feea77bb6d6d270a830db724 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 Jun 2026 11:58:42 +0000
Subject: [PATCH 143/151] vacuum-tube: 1.7.1 -> 1.7.2

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

diff --git a/pkgs/by-name/va/vacuum-tube/package.nix b/pkgs/by-name/va/vacuum-tube/package.nix
index c9ade8f615be..e158a71c9de2 100644
--- a/pkgs/by-name/va/vacuum-tube/package.nix
+++ b/pkgs/by-name/va/vacuum-tube/package.nix
@@ -10,16 +10,16 @@
 
 buildNpmPackage rec {
   pname = "vacuum-tube";
-  version = "1.7.1";
+  version = "1.7.2";
 
   src = fetchFromGitHub {
     owner = "shy1132";
     repo = "VacuumTube";
     tag = "v${version}";
-    hash = "sha256-ccxJ2ALWnU9D6OTKbP9IfV0uYGR2DnIEAckoIOWVt6Q=";
+    hash = "sha256-WSK0SKgT7CZ+7ibTCpMw6LUVvis7/Iqfyzi8sWclYDM=";
   };
 
-  npmDepsHash = "sha256-V0XlTsFX/TM7KwplYHCEdkj/KJDEUOleeM6KpL2vWHk=";
+  npmDepsHash = "sha256-jnWsxMxMTA+tsPSRJIQa/iJWWrLTWlWsVfAz8okRDhk=";
   makeCacheWritable = true;
 
   env = {

From 1e9305e34606fb75f5808d05d886bae6523f6752 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Sun, 7 Jun 2026 15:05:55 +0300
Subject: [PATCH 144/151] systemd: re-enable systemd-initrd-luks-fido2 in
 passthru.tests

---
 pkgs/os-specific/linux/systemd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 7451a098ae33..6af44a1f2b30 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -791,7 +791,7 @@ stdenv.mkDerivation (finalAttrs: {
           systemd-credentials-tpm2
           systemd-escaping
           systemd-initrd-btrfs-raid
-          # systemd-initrd-luks-fido2 # broken on master
+          systemd-initrd-luks-fido2
           systemd-initrd-luks-keyfile
           systemd-initrd-luks-empty-passphrase
           systemd-initrd-luks-password

From 33c831ec1ee30119f703459d5756e25ad5e70bfc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 Jun 2026 12:49:34 +0000
Subject: [PATCH 145/151] ocamlPackages.awa: 0.6.0 -> 0.6.1

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

diff --git a/pkgs/development/ocaml-modules/awa/default.nix b/pkgs/development/ocaml-modules/awa/default.nix
index 6e387054ab35..e7fe22b2a2c9 100644
--- a/pkgs/development/ocaml-modules/awa/default.nix
+++ b/pkgs/development/ocaml-modules/awa/default.nix
@@ -20,11 +20,11 @@
 
 buildDunePackage (finalAttrs: {
   pname = "awa";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchurl {
     url = "https://github.com/mirage/awa-ssh/releases/download/v${finalAttrs.version}/awa-${finalAttrs.version}.tbz";
-    hash = "sha256-TO4O2n+L1avIGGKBnZ0wo6jSQBml5Yn6C46VWEPvcvE=";
+    hash = "sha256-xis3+I4cY9gQVSZmMCavIl9qGe7njoRQKfFZ6yh1kQE=";
   };
 
   propagatedBuildInputs = [

From a7f60f83080e43f3a10bcf9ef8aa388ac51815f4 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 7 Jun 2026 09:15:15 -0500
Subject: [PATCH 146/151] vimPlugins.vim-mediawiki-editor: fix
 python3Dependencies

---
 pkgs/applications/editors/vim/plugins/overrides.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index af346eb995c6..6dfb586dc699 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -5318,7 +5318,7 @@ assertNoAdditions {
 
   vim-mediawiki-editor = super.vim-mediawiki-editor.overrideAttrs (old: {
     passthru = old.passthru // {
-      python3Dependencies = [ python3.pkgs.mwclient ];
+      python3Dependencies = ps: [ ps.mwclient ];
     };
   });
 

From 9f33a10dd0a5fe70532c2330a2e583fe920b639b Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 7 Jun 2026 09:31:03 -0500
Subject: [PATCH 147/151] vimPlugins: normalize nvimSkipModules values

---
 .../non-generated/fff-nvim/default.nix        |  2 +-
 .../editors/vim/plugins/overrides.nix         | 40 +++++++++----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
index d881cc24d8ce..2fbb9ffbc986 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
@@ -92,7 +92,7 @@ vimUtils.buildVimPlugin {
         "return '${fff-nvim-lib}/lib'"
   '';
 
-  nvimSkipModule = [
+  nvimSkipModules = [
     # Skip single file dev config for testing fff.nvim locally
     "empty_config"
   ];
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index af346eb995c6..069ed0bbabc3 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1866,7 +1866,7 @@ assertNoAdditions {
 
   indent-blankline-nvim = super.indent-blankline-nvim.overrideAttrs {
     # Meta file
-    nvimSkipModules = "ibl.config.types";
+    nvimSkipModules = [ "ibl.config.types" ];
   };
 
   indent-tools-nvim = super.indent-tools-nvim.overrideAttrs {
@@ -2556,7 +2556,7 @@ assertNoAdditions {
 
   modicator-nvim = super.modicator-nvim.overrideAttrs {
     # Optional lualine integration
-    nvimSkipModules = "modicator.integration.lualine.init";
+    nvimSkipModules = [ "modicator.integration.lualine.init" ];
   };
 
   molokai = super.molokai.overrideAttrs (old: {
@@ -2662,7 +2662,7 @@ assertNoAdditions {
       plenary-nvim
       nui-nvim
     ];
-    nvimSkipModule = [
+    nvimSkipModules = [
       "neo-tree.types.fixes.compat-0.10"
     ];
   };
@@ -2869,7 +2869,7 @@ assertNoAdditions {
       nvim-nio
     ];
     # Unit test assert
-    nvimSkipModules = "neotest-jest-assertions";
+    nvimSkipModules = [ "neotest-jest-assertions" ];
   };
 
   neotest-minitest = super.neotest-minitest.overrideAttrs {
@@ -2918,7 +2918,7 @@ assertNoAdditions {
       plenary-nvim
     ];
     # Unit test assert
-    nvimSkipModules = "neotest-playwright-assertions";
+    nvimSkipModules = [ "neotest-playwright-assertions" ];
   };
 
   neotest-plenary = super.neotest-plenary.overrideAttrs {
@@ -2979,7 +2979,7 @@ assertNoAdditions {
       plenary-nvim
     ];
     # Unit test assert
-    nvimSkipModules = "neotest-vitest-assertions";
+    nvimSkipModules = [ "neotest-vitest-assertions" ];
   };
 
   neotest-zig = super.neotest-zig.overrideAttrs {
@@ -3220,7 +3220,7 @@ assertNoAdditions {
   nvim-fzf-commands = super.nvim-fzf-commands.overrideAttrs {
     dependencies = [ self.nvim-fzf ];
     # Requires global variable setup nvim_fzf_directory
-    nvimSkipModules = "fzf-commands.rg";
+    nvimSkipModules = [ "fzf-commands.rg" ];
   };
 
   nvim-genghis = super.nvim-genghis.overrideAttrs {
@@ -3294,7 +3294,7 @@ assertNoAdditions {
   };
 
   nvim-lilypond-suite = super.nvim-lilypond-suite.overrideAttrs {
-    nvimSkipModule = [
+    nvimSkipModules = [
       # Option not set immediately
       "nvls.errors.lilypond-book"
       "nvls.tex"
@@ -3605,7 +3605,7 @@ assertNoAdditions {
 
   omni-vim = super.omni-vim.overrideAttrs {
     # Optional lightline integration
-    nvimSkipModules = "omni-lightline";
+    nvimSkipModules = [ "omni-lightline" ];
   };
 
   omnisharp-extended-lsp-nvim = super.omnisharp-extended-lsp-nvim.overrideAttrs (old: {
@@ -3690,7 +3690,7 @@ assertNoAdditions {
 
   outline-nvim = super.outline-nvim.overrideAttrs {
     # Requires setup call
-    nvimSkipModules = "outline.providers.norg";
+    nvimSkipModules = [ "outline.providers.norg" ];
   };
 
   overseer-nvim = super.overseer-nvim.overrideAttrs {
@@ -3782,7 +3782,7 @@ assertNoAdditions {
 
   poimandres-nvim = super.poimandres-nvim.overrideAttrs {
     # Optional treesitter support
-    nvimSkipModules = "poimandres.highlights";
+    nvimSkipModules = [ "poimandres.highlights" ];
   };
 
   popup-nvim = super.popup-nvim.overrideAttrs {
@@ -3843,7 +3843,7 @@ assertNoAdditions {
 
   pywal-nvim = super.pywal-nvim.overrideAttrs {
     # Optional feline integration
-    nvimSkipModules = "pywal.feline";
+    nvimSkipModules = [ "pywal.feline" ];
   };
 
   QFEnter = super.QFEnter.overrideAttrs (old: {
@@ -4135,7 +4135,7 @@ assertNoAdditions {
 
   spaceman-nvim = super.spaceman-nvim.overrideAttrs {
     # Optional telescope integration
-    nvimSkipModules = "spaceman.adapters.telescope";
+    nvimSkipModules = [ "spaceman.adapters.telescope" ];
   };
 
   sqlite-lua = super.sqlite-lua.overrideAttrs (
@@ -4341,7 +4341,7 @@ assertNoAdditions {
       plenary-nvim
     ];
     # Meta
-    nvimSkipModules = "frecency.types";
+    nvimSkipModules = [ "frecency.types" ];
   };
 
   telescope-fzf-native-nvim = super.telescope-fzf-native-nvim.overrideAttrs (old: {
@@ -4562,7 +4562,7 @@ assertNoAdditions {
 
   trouble-nvim = super.trouble-nvim.overrideAttrs {
     # Meta file
-    nvimSkipModules = "trouble.docs";
+    nvimSkipModules = [ "trouble.docs" ];
   };
 
   trust-vim = super.trust-vim.overrideAttrs (old: {
@@ -4581,7 +4581,7 @@ assertNoAdditions {
     '';
 
     # Unit test
-    nvimSkipModules = "tsc.better-messages-test";
+    nvimSkipModules = [ "tsc.better-messages-test" ];
   };
 
   tslime-vim = super.tslime-vim.overrideAttrs (old: {
@@ -5085,7 +5085,7 @@ assertNoAdditions {
 
   vim-flog = super.vim-flog.overrideAttrs (old: {
     # Not intended to be required, used by vim plugin
-    nvimSkipModules = "flog.graph_bin";
+    nvimSkipModules = [ "flog.graph_bin" ];
     meta = old.meta // {
       license = lib.licenses.vim;
     };
@@ -5670,7 +5670,7 @@ assertNoAdditions {
 
   vim-tpipeline = super.vim-tpipeline.overrideAttrs {
     # Requires global variable
-    nvimSkipModules = "tpipeline.main";
+    nvimSkipModules = [ "tpipeline.main" ];
   };
 
   vim-twiggy = super.vim-twiggy.overrideAttrs (old: {
@@ -5878,7 +5878,7 @@ assertNoAdditions {
 
   virt-column-nvim = super.virt-column-nvim.overrideAttrs {
     # Meta file
-    nvimSkipModules = "virt-column.config.types";
+    nvimSkipModules = [ "virt-column.config.types" ];
   };
 
   vis = super.vis.overrideAttrs (old: {
@@ -5966,7 +5966,7 @@ assertNoAdditions {
   });
 
   xmake-nvim = super.xmake-nvim.overrideAttrs {
-    nvimSkipModule = [
+    nvimSkipModules = [
       # attempt to index upvalue 'options' (a nil value)
       "xmake.action"
       "xmake.command"

From ab72f58ea478fe35270207488653a3f2cfb2b5e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 Jun 2026 15:44:34 +0000
Subject: [PATCH 148/151] handheld-daemon: 4.1.8 -> 4.1.9

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

diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix
index 76ef3ee4b932..b9f075e7a415 100644
--- a/pkgs/by-name/ha/handheld-daemon/package.nix
+++ b/pkgs/by-name/ha/handheld-daemon/package.nix
@@ -16,14 +16,14 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "handheld-daemon";
-  version = "4.1.8";
+  version = "4.1.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hhd-dev";
     repo = "hhd";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KPjna0yJXXSQBwpRO5b3Fc9C6H14uboJzvQ1LefeXFc=";
+    hash = "sha256-pzcMIXLZUkSqJuZTujAoKjfPuZgtit4u08wHZPPz8Ss=";
   };
 
   # Handheld-daemon runs some selinux-related utils which are not in nixpkgs.

From cd7818254b58ccb7ff5d779968ddd6c82e91968f Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 7 Jun 2026 19:13:05 +0300
Subject: [PATCH 149/151] yarn-berry-fetcher: 1.2.3 -> 1.3.0

This now uses reqwest, so HTTP_PROXY works.

It also now has a --fetch-concurrency flag to make the amount of
download threads configurable.
---
 pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-fetcher.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-fetcher.nix b/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-fetcher.nix
index 2ab308b5901c..bab1f2d2ecde 100644
--- a/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-fetcher.nix
+++ b/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-fetcher.nix
@@ -13,17 +13,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "yarn-berry-${toString berryVersion}-fetcher";
-  version = "1.2.3";
+  version = "1.3.0";
 
   src = fetchFromGitLab {
     domain = "cyberchaos.dev";
     owner = "yuka";
     repo = "yarn-berry-fetcher";
     tag = finalAttrs.version;
-    hash = "sha256-Qfhx1lwd050GabP2Xj0kRi4nIlOHUE4xbZO0kO0IJ8A=";
+    hash = "sha256-7WW/fHTi1i7dcsSJDl4kb1E6hUY6flRaVdbjD93OKPk=";
   };
 
-  cargoHash = "sha256-tOu1x8kmVCXKvthV0xyzisTb7BwOtfWTyu/cv4HRbpc=";
+  cargoHash = "sha256-l8zTzr2y8i2ENb8iadIBz59YLmNwfDZcrbUqIUibFqg=";
 
   env.YARN_ZIP_SUPPORTED_CACHE_VERSION = berryCacheVersion;
   env.LIBZIP_SYS_USE_PKG_CONFIG = 1;

From 091c580304b8ef692c594cdd8a151c64b545a69b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 Jun 2026 16:56:09 +0000
Subject: [PATCH 150/151] olympus-unwrapped: 26.05.23.02 -> 26.06.06.03

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

diff --git a/pkgs/by-name/ol/olympus-unwrapped/package.nix b/pkgs/by-name/ol/olympus-unwrapped/package.nix
index 7be76b1d9849..3d6293a20071 100644
--- a/pkgs/by-name/ol/olympus-unwrapped/package.nix
+++ b/pkgs/by-name/ol/olympus-unwrapped/package.nix
@@ -22,9 +22,9 @@ let
 
   phome = "$out/lib/olympus";
   # The following variables are to be updated by the update script.
-  version = "26.05.23.02";
-  buildId = "5612"; # IMPORTANT: This line is matched with regex in update.sh.
-  rev = "989853e83d30d5eebcd767341db401d647169bef";
+  version = "26.06.06.03";
+  buildId = "5632"; # IMPORTANT: This line is matched with regex in update.sh.
+  rev = "bc2ed6f1e1082d4bff67c871be2d0f215f6dbc85";
 in
 buildDotnetModule {
   pname = "olympus-unwrapped";
@@ -37,7 +37,7 @@ buildDotnetModule {
     owner = "EverestAPI";
     repo = "Olympus";
     fetchSubmodules = true; # Required. See upstream's README.
-    hash = "sha256-63MeXtRxp7e9QAfhGrqozRwnhN2kk18lAx+gDWV2sRM=";
+    hash = "sha256-86APse6yodcqWUgi7eG/LJIcoN1JEiIgyKaZRHTstCY=";
   };
 
   nativeBuildInputs = [

From dee85d5b48a5bcc374fe81cb93d15ff5f2dcba53 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sun, 7 Jun 2026 20:00:43 +0200
Subject: [PATCH 151/151] glm: fix version-hash missmatch

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

diff --git a/pkgs/by-name/gl/glm/package.nix b/pkgs/by-name/gl/glm/package.nix
index dd8d9779f7e3..ee687f537b0a 100644
--- a/pkgs/by-name/gl/glm/package.nix
+++ b/pkgs/by-name/gl/glm/package.nix
@@ -4,7 +4,7 @@
 }:
 
 callPackage ./generic.nix rec {
-  version = "1.0.2";
+  version = "1.0.3";
 
   src = fetchFromGitHub {
     owner = "g-truc";