From 27a954803e7bca90d0426c7f4d0cc34f26389164 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Mar 2026 10:30:52 +0000
Subject: [PATCH 01/66] python3Packages.rpy2-robjects: 3.6.3 -> 3.6.5

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

diff --git a/pkgs/development/python-modules/rpy2-robjects/default.nix b/pkgs/development/python-modules/rpy2-robjects/default.nix
index 01e9e2e16602..72034f447237 100644
--- a/pkgs/development/python-modules/rpy2-robjects/default.nix
+++ b/pkgs/development/python-modules/rpy2-robjects/default.nix
@@ -16,7 +16,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "3.6.3";
+  version = "3.6.5";
   pyproject = true;
   pname = "rpy2-robjects";
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${
       builtins.replaceStrings [ "-" ] [ "_" ] pname
     }-${version}.tar.gz";
-    hash = "sha256-cxqhpJBcSyXAVk1yy/2F+SMBAvmJ56IlFYhekdTfPUA=";
+    hash = "sha256-A9CZ9DagGotR+4+L9gJCCpnHzdqMP84OOg9TLja0r+Q=";
   };
 
   patches = [

From e6a6e82493f5a20dcceaf1f4c37e769b4b909050 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 4 May 2026 02:05:36 +0000
Subject: [PATCH 02/66] mathjax: 4.1.1 -> 4.1.2

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

diff --git a/pkgs/by-name/ma/mathjax/package.nix b/pkgs/by-name/ma/mathjax/package.nix
index 1bbe418c7726..a7f6bc9c3590 100644
--- a/pkgs/by-name/ma/mathjax/package.nix
+++ b/pkgs/by-name/ma/mathjax/package.nix
@@ -5,13 +5,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "mathjax";
-  version = "4.1.1";
+  version = "4.1.2";
 
   src = fetchFromGitHub {
     owner = "mathjax";
     repo = "mathjax";
     tag = finalAttrs.version;
-    hash = "sha256-ptM7dLG4wc9XoYOtn0R92LVH4J0tbP8J/0TpGqrVIaQ=";
+    hash = "sha256-x4aRA1EDBpx/PmWF8YmWs1Le7yX/hJo0Egrhc/nrWsE=";
   };
 
   installPhase = ''

From aed445c0167fed5457b7e71707193de08c82a08d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 May 2026 12:22:44 +0000
Subject: [PATCH 03/66] parca: 0.27.1 -> 0.28.0

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

diff --git a/pkgs/by-name/pa/parca/package.nix b/pkgs/by-name/pa/parca/package.nix
index 3babc527626c..f31b71498456 100644
--- a/pkgs/by-name/pa/parca/package.nix
+++ b/pkgs/by-name/pa/parca/package.nix
@@ -10,13 +10,13 @@
   stdenv,
 }:
 let
-  version = "0.27.1";
+  version = "0.28.0";
 
   parca-src = fetchFromGitHub {
     owner = "parca-dev";
     repo = "parca";
     tag = "v${version}";
-    hash = "sha256-pI2SV2BiBqqga4RADEE5Z0FffdGb3fxhRRNj4S9Hxzc=";
+    hash = "sha256-7ndRiOYa7HiOwwHRXqeCr3A+5EAVvbo4I4vkoqSya+E=";
   };
 
   ui = stdenv.mkDerivation (finalAttrs: {
@@ -28,7 +28,7 @@ let
       inherit (finalAttrs) pname src version;
       pnpm = pnpm_9;
       fetcherVersion = 3;
-      hash = "sha256-3eICZpJJacvcD9MGQ9AmoMMnlcNt/LCxIIM+H+oJdR8=";
+      hash = "sha256-zHdMwJyeafzbIlp+Fhh1khcUVrLsoUg6ViSGm/ByGAA=";
     };
 
     nativeBuildInputs = [
@@ -61,7 +61,7 @@ buildGoModule rec {
   pname = "parca";
   src = parca-src;
 
-  vendorHash = "sha256-dAFGcavDaN1vW4SdjZ78IRWCnfqaRipLOQHc+V6MuDw=";
+  vendorHash = "sha256-eZPAgxOi1jgTHmisFG/Sz2y3vhxUu/L3Iodb5mrKnVs=";
 
   ldflags = [
     "-X=main.version=${version}"

From 1c03a3fb23189a22771953a3b0e4e557a0c83944 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sun, 24 May 2026 14:26:40 +0200
Subject: [PATCH 04/66] n8n: fix update script

Upstream added versions with -exp-\d suffix which broke the script.
Instead of adding another filter to the current query, let's try getting
the latest stable version instead.
IIRC previously they didn't correctly mark stable releases which is why
we didn't use this method.
---
 pkgs/by-name/n8/n8n/update.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/n8/n8n/update.sh b/pkgs/by-name/n8/n8n/update.sh
index 74ce4a18986d..501aecf308f0 100755
--- a/pkgs/by-name/n8/n8n/update.sh
+++ b/pkgs/by-name/n8/n8n/update.sh
@@ -2,9 +2,7 @@
 #!nix-shell --pure -i bash -p bash curl jq nix-update cacert git
 set -euo pipefail
 
-new_version="$(curl -s 'https://api.github.com/repos/n8n-io/n8n/releases?per_page=30' | \
-  jq -r '
-    map(select(.prerelease | not) | .tag_name | select(startswith("n8n@")) | sub("^n8n@"; ""))
-    | sort_by(split(".") | map(tonumber)) | last
-    ')"
+new_version="$(curl -s ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} \
+  'https://api.github.com/repos/n8n-io/n8n/releases/latest' |
+  jq -r '.tag_name | sub("^n8n@"; "")')"
 nix-update n8n --version "$new_version"

From f5f042bb7afe5170503cb2a3a98cf3c84a2b10e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Apr 2026 17:39:27 +0000
Subject: [PATCH 05/66] python3Packages.html2pdf4doc: 0.0.31 -> 0.0.33

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

diff --git a/pkgs/development/python-modules/html2pdf4doc/default.nix b/pkgs/development/python-modules/html2pdf4doc/default.nix
index 216d5ed88243..f47f4012a0f5 100644
--- a/pkgs/development/python-modules/html2pdf4doc/default.nix
+++ b/pkgs/development/python-modules/html2pdf4doc/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "html2pdf4doc";
-  version = "0.0.31";
+  version = "0.0.33";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mettta";
     repo = "html2pdf4doc_python";
     tag = version;
-    hash = "sha256-ailiZfqO2NacJmCbWWtZ2bnerjc9mdJZKDVWNUTMEAg=";
+    hash = "sha256-d5Y1llC7Yb1Vw2tvxAhgIw7wk18mFJ+sm8Rrr+UwxUI=";
   };
 
   build-system = [

From 00f12acc8331fb003150cda4ae2c659110b60efd Mon Sep 17 00:00:00 2001
From: puzzlewolf <nixos@nora.pink>
Date: Wed, 27 May 2026 11:26:16 +0200
Subject: [PATCH 06/66] strictdoc: 0.19.0 -> 0.21.1

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

diff --git a/pkgs/by-name/st/strictdoc/package.nix b/pkgs/by-name/st/strictdoc/package.nix
index ba4e634bc9f0..d0ecfb9f6883 100644
--- a/pkgs/by-name/st/strictdoc/package.nix
+++ b/pkgs/by-name/st/strictdoc/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "strictdoc";
-  version = "0.19.0";
+  version = "0.21.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "strictdoc-project";
     repo = "strictdoc";
     tag = finalAttrs.version;
-    hash = "sha256-UkXVn1GVWBBhjFaRvkVk+E9mug3i2k7SQk+7JVA8KSo=";
+    hash = "sha256-kKygvUCrkftEEKLoinVkP5DARsHGguSfsPaTpYYXPpU=";
   };
 
   build-system = [

From aa0918d8d970a1430992b8e9c2a666f5db63273d Mon Sep 17 00:00:00 2001
From: puzzlewolf <nixos@nora.pink>
Date: Wed, 27 May 2026 11:31:25 +0200
Subject: [PATCH 07/66] strictdoc: fix changelog location

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

diff --git a/pkgs/by-name/st/strictdoc/package.nix b/pkgs/by-name/st/strictdoc/package.nix
index d0ecfb9f6883..c02084371d6a 100644
--- a/pkgs/by-name/st/strictdoc/package.nix
+++ b/pkgs/by-name/st/strictdoc/package.nix
@@ -79,7 +79,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Software for technical documentation and requirements management";
     homepage = "https://github.com/strictdoc-project/strictdoc";
-    changelog = "https://github.com/strictdoc-project/strictdoc/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/strictdoc-project/strictdoc/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.puzzlewolf ];
     mainProgram = "strictdoc";

From 8fce018efdf36eb72c1c36d02a5933d24d26c8d5 Mon Sep 17 00:00:00 2001
From: whispers <whispersofthedawn@duck.com>
Date: Wed, 27 May 2026 10:16:04 -0400
Subject: [PATCH 08/66] tor-browser: remove unnecessary auto-update policies

This came up in Firefox as
https://bugzilla.mozilla.org/show_bug.cgi?id=2042197, where policies
caused different behavior to be active (also see
https://github.com/NixOS/nixpkgs/pull/524793). We should not observe any
such differences, but this indicates that the policy is unnecessary for
disabling the updater.

Tor/Mullvad Browser have supported is-packaged-app for a long time
(https://gitlab.torproject.org/tpo/applications/tor-browser/-/merge_requests/985),
and it's preferred by Firefox (i.e. it actually has meaning there:
https://searchfox.org/firefox-main/search?q=is-packaged-app&path=&case=false&regexp=false), so we switch from `system-install` to that one. This shouldn't
change anything else user visible.

This removes the "Your browser is being managed by your organization."
text from about:preferences and changes about:policies from showing this
singular policy to "The Enterprise Policies service is inactive." (the
intended upstream behavior), so this seems like a win for clarity.

Tested by downgrading the version in the derivation, and seeing no
update UI appear, either in the hamburger menu in the toolbar or under
Help > About Tor Browser.
---
 pkgs/by-name/to/tor-browser/package.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix
index 83bc910e7697..009c201e13f6 100644
--- a/pkgs/by-name/to/tor-browser/package.nix
+++ b/pkgs/by-name/to/tor-browser/package.nix
@@ -136,12 +136,6 @@ let
       };
     }
   );
-
-  policiesJson = writeText "policies.json" (
-    builtins.toJSON {
-      policies.DisableAppUpdate = true;
-    }
-  );
 in
 stdenv.mkDerivation rec {
   pname = "tor-browser";
@@ -213,8 +207,8 @@ stdenv.mkDerivation rec {
     # firefox is a wrapper that checks for a more recent libstdc++ & appends it to the ld path
     mv firefox.real firefox
 
-    # store state at `~/.tor browser` instead of relative to executable
-    touch "$TBB_IN_STORE/system-install"
+    # store state at `~/.tor project` instead of relative to executable
+    touch "$TBB_IN_STORE/is-packaged-app"
 
     # The final libPath.  Note, we could split this into firefoxLibPath
     # and torLibPath for accuracy, but this is more convenient ...
@@ -331,7 +325,6 @@ stdenv.mkDerivation rec {
 
     # Install distribution customizations
     install -Dvm644 ${distributionIni} $out/share/tor-browser/distribution/distribution.ini
-    install -Dvm644 ${policiesJson} $out/share/tor-browser/distribution/policies.json
 
     runHook postInstall
   '';

From 75b48cfbf17e146a25f546b5f731a2e9f6b4c56d Mon Sep 17 00:00:00 2001
From: whispers <whispersofthedawn@duck.com>
Date: Wed, 27 May 2026 10:44:07 -0400
Subject: [PATCH 09/66] mullvad-browser: remove unnecessary auto-update
 policies

This came up in Firefox as
https://bugzilla.mozilla.org/show_bug.cgi?id=2042197, where policies
caused different behavior to be active (also see
https://github.com/NixOS/nixpkgs/pull/524793). We should not observe any
such differences, but this indicates that the policy is unnecessary for
disabling the updater.

Tor/Mullvad Browser have supported is-packaged-app for a long time
(https://gitlab.torproject.org/tpo/applications/tor-browser/-/merge_requests/985),
and it's preferred by Firefox (i.e. it actually has meaning there:
https://searchfox.org/firefox-main/search?q=is-packaged-app&path=&case=false&regexp=false), so we switch from `system-install` to that one. This shouldn't
change anything else user visible.

This removes the "Your browser is being managed by your organization."
text from about:preferences and changes about:policies from showing this
singular policy to "The Enterprise Policies service is inactive." (the
intended upstream behavior), so this seems like a win for clarity.

Tested by downgrading the version in the derivation, and seeing no
update UI appear, either in the hamburger menu in the toolbar or under
Help > About Mullvad Browser.
---
 pkgs/by-name/mu/mullvad-browser/package.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix
index 5dba16159a22..6f7675405b2e 100644
--- a/pkgs/by-name/mu/mullvad-browser/package.nix
+++ b/pkgs/by-name/mu/mullvad-browser/package.nix
@@ -123,12 +123,6 @@ let
       };
     }
   );
-
-  policiesJson = writeText "policies.json" (
-    builtins.toJSON {
-      policies.DisableAppUpdate = true;
-    }
-  );
 in
 stdenv.mkDerivation rec {
   pname = "mullvad-browser";
@@ -200,7 +194,7 @@ stdenv.mkDerivation rec {
     mv mullvadbrowser.real mullvadbrowser
 
     # store state at `~/.mullvad` instead of relative to executable
-    touch "$MB_IN_STORE/system-install"
+    touch "$MB_IN_STORE/is-packaged-app"
 
     # Add bundled libraries to libPath.
     libPath=${libPath}:$MB_IN_STORE
@@ -282,7 +276,6 @@ stdenv.mkDerivation rec {
 
     # Install distribution customizations
     install -Dvm644 ${distributionIni} $out/share/mullvad-browser/distribution/distribution.ini
-    install -Dvm644 ${policiesJson} $out/share/mullvad-browser/distribution/policies.json
 
     runHook postInstall
   '';

From 4d8e0c9c7abd677916598ab628ee4813a582365a Mon Sep 17 00:00:00 2001
From: Sean Gilligan <sean@msgilligan.com>
Date: Thu, 28 May 2026 16:11:35 -0700
Subject: [PATCH 10/66] maven: add mvnGoal and mvnOffline parameters to
 buildMavenPackage

mvnGoal allows overriding the main Maven goal used in the derivation.

mvnOffline allows defaults to `true`, but allows the offline (`-o`) argument
to `mvn` to be removed for special cases (e.g. `deploy` goal) where we
will just rely on the Nix sandbox enforcing offline operation.
---
 pkgs/by-name/ma/maven/build-maven-package.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ma/maven/build-maven-package.nix b/pkgs/by-name/ma/maven/build-maven-package.nix
index f737507ddb73..afa25872e976 100644
--- a/pkgs/by-name/ma/maven/build-maven-package.nix
+++ b/pkgs/by-name/ma/maven/build-maven-package.nix
@@ -20,6 +20,15 @@ let
       version,
       mvnJdk ? jdk,
       mvnHash ? "",
+      /**
+        Maven goal to execute. Normally the the default should be used, but some special cases need other goals.
+      */
+      mvnGoal ? "package",
+      /**
+        Set the Maven offline argument, `-o`. Normally the default is preferred, but to call `mvn deploy` with
+        a directory destination `-o` must be removed. In that case we rely on the Nix sandbox to keep things hermetic.
+      */
+      mvnOffline ? true,
       mvnFetchExtraArgs ? { },
       mvnDepsParameters ? "",
       manualMvnArtifacts ? [ ],
@@ -143,7 +152,9 @@ let
 
           mvnDeps=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)
           runHook afterDepsSetup
-          mvn package -o -nsu "-Dmaven.repo.local=$mvnDeps/.m2" ${mvnSkipTests} ${mvnParameters}
+          mvn ${mvnGoal} ${
+            if mvnOffline then "-o" else ""
+          } -nsu "-Dmaven.repo.local=$mvnDeps/.m2" ${mvnSkipTests} ${mvnParameters}
 
           runHook postBuild
         '';

From 23066e881996175ab7f42450eff2dad67705e598 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sun, 24 May 2026 17:45:18 +0000
Subject: [PATCH 11/66] n8n: 2.20.6 -> 2.22.5

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

diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix
index 84491ae199d9..8a3b39bf0c54 100644
--- a/pkgs/by-name/n8/n8n/package.nix
+++ b/pkgs/by-name/n8/n8n/package.nix
@@ -26,20 +26,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "n8n";
-  version = "2.20.6";
+  version = "2.22.5";
 
   src = fetchFromGitHub {
     owner = "n8n-io";
     repo = "n8n";
     tag = "n8n@${finalAttrs.version}";
-    hash = "sha256-c0O6tC+QDhHN3nmzXqNwhAM4+NoFYVO1mtO3V348hDs=";
+    hash = "sha256-YF6VJLA+y8pcAE3RwTub1XjPVfeh8cR+3TQqb3VvV5U=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_10;
     fetcherVersion = 3;
-    hash = "sha256-ft7n3J7L+u2hwEiR32Jw2k0ZsHCfI5yIB+IfmtB8xMY=";
+    hash = "sha256-lAe3GuZRdzEwOXWmpBtF7YfGvA4XJumLf80uDYS6j30=";
   };
 
   nativeBuildInputs = [

From c48ddafb964cdd623545314f589ac3e1023f8225 Mon Sep 17 00:00:00 2001
From: jaredmontoya <49511278+jaredmontoya@users.noreply.github.com>
Date: Wed, 20 May 2026 22:01:09 +0200
Subject: [PATCH 12/66] python3Packages.dbgpu: init at 2025.12

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

diff --git a/pkgs/development/python-modules/dbgpu/default.nix b/pkgs/development/python-modules/dbgpu/default.nix
new file mode 100644
index 000000000000..ee31a2e407a3
--- /dev/null
+++ b/pkgs/development/python-modules/dbgpu/default.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+
+  setuptools,
+
+  click,
+  pydantic,
+
+  thefuzz,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "dbgpu";
+  version = "2025.12";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit (finalAttrs) pname version;
+    hash = "sha256-1KL9w2/1/yrzfo/Yo+B0CrKvc8xeD9oZn9/z1vFob04=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    click
+    pydantic
+  ];
+
+  optional-dependencies = {
+    fuzz = [ thefuzz ];
+  };
+
+  pythonImportsCheck = [ "dbgpu" ];
+
+  meta = {
+    description = "A small, easy-to-use open source database of over 2000 GPUs with architecture, manufacturing, API support and performance details";
+    homepage = "https://github.com/painebenjamin/dbgpu";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jaredmontoya ];
+    mainProgram = "dbgpu";
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cdd6de621e08..ed5a2863f454 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3712,6 +3712,8 @@ self: super: with self; {
 
   dbglib = callPackage ../development/python-modules/dbglib { };
 
+  dbgpu = callPackage ../development/python-modules/dbgpu { };
+
   dbt-adapters = callPackage ../development/python-modules/dbt-adapters { };
 
   dbt-bigquery = callPackage ../development/python-modules/dbt-bigquery { };

From 0528f1fbbe0b42ddd77c900ab189cbcb760dc4ec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 May 2026 14:52:53 +0000
Subject: [PATCH 13/66] anytype-cli: 0.3.2 -> 0.3.3

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

diff --git a/pkgs/by-name/an/anytype-cli/package.nix b/pkgs/by-name/an/anytype-cli/package.nix
index 1c7b8b4e8722..7c112e42cb8e 100644
--- a/pkgs/by-name/an/anytype-cli/package.nix
+++ b/pkgs/by-name/an/anytype-cli/package.nix
@@ -9,16 +9,16 @@ buildGoModule (finalAttrs: {
   __structuredAttrs = true;
 
   pname = "anytype-cli";
-  version = "0.3.2";
+  version = "0.3.3";
 
   src = fetchFromGitHub {
     owner = "anyproto";
     repo = "anytype-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9jJ4FV4ASUrhUvW/lI4qs7AmK06OkPfnD0+okl5blrs=";
+    hash = "sha256-t1EdNrXmG1kTMx17Ni5jM81V1bfZTGA2jMDm+wdqKAE=";
   };
 
-  vendorHash = "sha256-7J/nW4Jn2vdAs8sN+rV3wg6nV3JhtQrnLwlxNI0uja0=";
+  vendorHash = "sha256-/yF5niHBEPKvIGoWUVvZ00vrEaxG5s3kK5uFNdGCYcA=";
   proxyVendor = true;
 
   env.CGO_ENABLED = 1;

From 6996a952c99caa705282ba98bc3a4fcc292d8579 Mon Sep 17 00:00:00 2001
From: Johannes Kirschbauer <hsjobeki@gmail.com>
Date: Sat, 30 May 2026 00:25:06 +0200
Subject: [PATCH 14/66] nixos/kernel_config: remove redundant mergeEqualOption

---
 nixos/modules/system/boot/kernel_config.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/system/boot/kernel_config.nix b/nixos/modules/system/boot/kernel_config.nix
index 2cf34e899cae..115b55d98143 100644
--- a/nixos/modules/system/boot/kernel_config.nix
+++ b/nixos/modules/system/boot/kernel_config.nix
@@ -29,9 +29,7 @@ let
       };
 
       freeform = mkOption {
-        type = types.nullOr types.str // {
-          merge = mergeEqualOption;
-        };
+        type = types.nullOr types.str;
         default = null;
         example = ''MMC_BLOCK_MINORS.freeform = "32";'';
         description = ''

From 6d2532593145aa9a1f8191ee9f9b8e9784852d69 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 30 May 2026 00:18:03 +0200
Subject: [PATCH 15/66] silver-searcher: drop

Stuck on pcre and no development since 2020. We want to yank pcre because
it is obsolete.
---
 .../si/silver-searcher/bash-completion.patch  |  5 --
 pkgs/by-name/si/silver-searcher/package.nix   | 55 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 3 files changed, 1 insertion(+), 60 deletions(-)
 delete mode 100644 pkgs/by-name/si/silver-searcher/bash-completion.patch
 delete mode 100644 pkgs/by-name/si/silver-searcher/package.nix

diff --git a/pkgs/by-name/si/silver-searcher/bash-completion.patch b/pkgs/by-name/si/silver-searcher/bash-completion.patch
deleted file mode 100644
index 30e8c72389b7..000000000000
--- a/pkgs/by-name/si/silver-searcher/bash-completion.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -9 +9 @@
--bashcompdir = $(pkgdatadir)/completions
-+bashcompdir = $(datadir)/bash-completion/completions
diff --git a/pkgs/by-name/si/silver-searcher/package.nix b/pkgs/by-name/si/silver-searcher/package.nix
deleted file mode 100644
index 6015d39697c6..000000000000
--- a/pkgs/by-name/si/silver-searcher/package.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  autoreconfHook,
-  pkg-config,
-  pcre,
-  zlib,
-  xz,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "silver-searcher";
-  version = "2.2.0";
-
-  src = fetchFromGitHub {
-    owner = "ggreer";
-    repo = "the_silver_searcher";
-    rev = finalAttrs.version;
-    sha256 = "0cyazh7a66pgcabijd27xnk1alhsccywivv6yihw378dqxb22i1p";
-  };
-
-  patches = [ ./bash-completion.patch ];
-
-  env = {
-    # Workaround build failure on -fno-common toolchains like upstream
-    # gcc-10. Otherwise build fails as:
-    #   ld: src/zfile.o:/build/source/src/log.h:12: multiple definition of
-    #     `print_mtx'; src/ignore.o:/build/source/src/log.h:12: first defined here
-    # TODO: remove once next release has https://github.com/ggreer/the_silver_searcher/pull/1377
-    NIX_CFLAGS_COMPILE = "-fcommon";
-  }
-  // lib.optionalAttrs stdenv.hostPlatform.isLinux {
-    NIX_LDFLAGS = "-lgcc_s";
-  };
-
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-  ];
-  buildInputs = [
-    pcre
-    zlib
-    xz
-  ];
-
-  meta = {
-    homepage = "https://github.com/ggreer/the_silver_searcher/";
-    description = "Code-searching tool similar to ack, but faster";
-    maintainers = with lib.maintainers; [ madjar ];
-    mainProgram = "ag";
-    platforms = lib.platforms.all;
-    license = lib.licenses.asl20;
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3d4c509b845b..9ab4f5778e6b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1936,6 +1936,7 @@ mapAliases {
   sierra-breeze-enhanced = throw "'sierra-breeze-enhanced' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   signal-desktop-bin = throw "'signal-desktop-bin' has been replaced by 'signal-desktop' which is built from source"; # Added 2026-03-02
   signal-desktop-source = throw "'signal-desktop-source' has been renamed to/replaced by 'signal-desktop'"; # Converted to throw 2025-10-27
+  silver-searcher = throw "'silver-surfer' has been removed as it has seen no development since 2020 and is stuck on the obsolete pcre library";
   simpleBluez = warnAlias "'simpleBluez' has been renamed to 'simplebluez'" simplebluez; # Added 2026-02-18
   simpleDBus = warnAlias "'simpleDBus' has been renamed to 'simpledbus'" simpledbus; # Added 2026-02-12
   simplesamlphp = throw "'simplesamlphp' was removed because it was unmaintained in nixpkgs"; # Added 2025-10-17

From 5fea6e4c83e4f41097f544c7d84fc179046392f2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 May 2026 01:41:27 +0000
Subject: [PATCH 16/66] hyprshell: 4.10.4 -> 4.10.6

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

diff --git a/pkgs/by-name/hy/hyprshell/package.nix b/pkgs/by-name/hy/hyprshell/package.nix
index 507d1c9b52ce..3845463b8b1e 100644
--- a/pkgs/by-name/hy/hyprshell/package.nix
+++ b/pkgs/by-name/hy/hyprshell/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hyprshell";
-  version = "4.10.4";
+  version = "4.10.6";
 
   src = fetchFromGitHub {
     owner = "H3rmt";
     repo = "hyprshell";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-33qau/UP4CHBwL/6damFBTjsy/6gX8Nuh87uuhmqVfA=";
+    hash = "sha256-ud3tZngQzl6eupFCSvpcEdNuOA/g7bmkWWO+3h7V1mg=";
   };
 
-  cargoHash = "sha256-6m0ZvZBO30DbhcBJQWBx3PoHeZuS2FKiGJhcJx1eEfo=";
+  cargoHash = "sha256-gPZZWz6ihBgpcnLvzwE4b4AvNph5Euaomm220n/0GA8=";
 
   nativeBuildInputs = [
     wrapGAppsHook4

From ae82c67a8e2537deeb619b9676c44fe20e2bcbe1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Apr 2026 02:20:36 +0000
Subject: [PATCH 17/66] vscode-extensions.rocq-prover.vsrocq: 2.3.4 -> 2.4.3

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 97d492a6b34e..dbcf4236cc3b 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3967,8 +3967,8 @@ let
           publisher = "rocq-prover";
           name = "vsrocq";
           # When updating the version here, also update the language server vsrocq-language-server
-          version = "2.3.4";
-          hash = "sha256-2zYoCUtyhboQt68UJEmWOvrTrIOV2QmpaXU5mUhJfsA=";
+          version = "2.4.3";
+          hash = "sha256-o9rsSDCDYRWZQBMDA7DtWay50tBI76kw7H7CivrZpKo=";
         };
         meta = {
           description = "VsRocq is an extension for Visual Studio Code with support for the Rocq Prover";

From 9f822bb13bb5fa744b61eaf1297b42338eaa3888 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Fri, 22 May 2026 17:11:24 +0300
Subject: [PATCH 18/66] rocqPackages.vsrocq-language-server: 2.3.4 -> 2.4.3

---
 .../rocq-modules/vsrocq-language-server/default.nix           | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/rocq-modules/vsrocq-language-server/default.nix b/pkgs/development/rocq-modules/vsrocq-language-server/default.nix
index d5965f8a4e7e..b65295d03b47 100644
--- a/pkgs/development/rocq-modules/vsrocq-language-server/default.nix
+++ b/pkgs/development/rocq-modules/vsrocq-language-server/default.nix
@@ -17,7 +17,7 @@ let
     in
     lib.switch rocq-core.rocq-version [
       # When updating the default version here, also update the VsRocq VS Code extension
-      (case (lib.versions.range "8.18" "9.1") "2.3.4")
+      (case (lib.versions.range "8.18" "9.1") "2.4.3")
     ] null;
   location = {
     domain = "github.com";
@@ -31,6 +31,8 @@ let
     release."2.3.3".sha256 = "sha256-wgn28wqWhZS4UOLUblkgXQISgLV+XdSIIEMx9uMT/ig=";
     release."2.3.4".rev = "v2.3.4";
     release."2.3.4".sha256 = "sha256-v1hQjE8U1o2VYOlUjH0seIsNG+NrMNZ8ixt4bQNyGvI=";
+    release."2.4.3".rev = "v2.4.3";
+    release."2.4.3".sha256 = "sha256-R/fpTiYZ9uvtKQcWD4jwUZPvUrcdvHc/wpoTrdkEQoQ=";
     inherit location;
   };
   fetched = fetch (if version != null then version else defaultVersion);

From c274bda53f168e68ddd36eb7335671e1e4f3d269 Mon Sep 17 00:00:00 2001
From: joachimschmidt557 <joachim.schmidt557@outlook.com>
Date: Sat, 30 May 2026 17:57:51 +0200
Subject: [PATCH 19/66] nimmm: 0.4.0 -> 0.5.0

---
 pkgs/by-name/ni/nimmm/lock.json   | 12 ++++++++++++
 pkgs/by-name/ni/nimmm/package.nix |  5 ++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ni/nimmm/lock.json b/pkgs/by-name/ni/nimmm/lock.json
index f21abc4d2954..8b8025308375 100644
--- a/pkgs/by-name/ni/nimmm/lock.json
+++ b/pkgs/by-name/ni/nimmm/lock.json
@@ -35,6 +35,18 @@
       "sha256": "06b9ylqbjcxgm9mjfzljbi8gr9sbajykcqpcxgyqymynqyhxmqjn",
       "srcDir": "src",
       "url": "https://github.com/shoyu777/wcwidth-nim/archive/86f8db1a883f6a64e590a56aed81e788389b7196.tar.gz"
+    },
+    {
+      "method": "fetchzip",
+      "packages": [
+        "tinyre"
+      ],
+      "path": "/nix/store/w556rbsnv2fxb229av2iq180ri9x0d9j-source",
+      "ref": "1.6.0",
+      "rev": "77469f58916369bc3863194cabb05238577fb257",
+      "sha256": "18wjz5yqzr1dz6286p2w02fk2xjr54l477g90bz4pskjcqrqnjbv",
+      "srcDir": "",
+      "url": "https://github.com/khchen/tinyre/archive/77469f58916369bc3863194cabb05238577fb257.tar.gz"
     }
   ]
 }
diff --git a/pkgs/by-name/ni/nimmm/package.nix b/pkgs/by-name/ni/nimmm/package.nix
index 3a5dcb628108..f1e261d043c7 100644
--- a/pkgs/by-name/ni/nimmm/package.nix
+++ b/pkgs/by-name/ni/nimmm/package.nix
@@ -8,20 +8,19 @@
 
 buildNimPackage (finalAttrs: {
   pname = "nimmm";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "joachimschmidt557";
     repo = "nimmm";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-yq91rQlX6bfYHHw72+8m53PCD7hViLe56jAwPTeBBcg=";
+    hash = "sha256-NK2OH5eAlcityUdz9p95Y7iNOX39ed0Krdns1+2NKLU=";
   };
 
   lockFile = ./lock.json;
 
   buildInputs = [
     termbox
-    pcre
   ];
 
   meta = {

From 334b8af3c30f10cfc21b12ec0a5b1af3de18f02d Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 30 May 2026 14:21:52 -0400
Subject: [PATCH 20/66] zabbix: pcre -> pcre2

---
 pkgs/servers/monitoring/zabbix/agent.nix  | 5 ++---
 pkgs/servers/monitoring/zabbix/agent2.nix | 5 ++---
 pkgs/servers/monitoring/zabbix/proxy.nix  | 5 ++---
 pkgs/servers/monitoring/zabbix/server.nix | 5 ++---
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/servers/monitoring/zabbix/agent.nix b/pkgs/servers/monitoring/zabbix/agent.nix
index 8266301b77c3..d96790f9841b 100644
--- a/pkgs/servers/monitoring/zabbix/agent.nix
+++ b/pkgs/servers/monitoring/zabbix/agent.nix
@@ -5,7 +5,6 @@
   pkg-config,
   libiconv,
   openssl,
-  pcre,
   pcre2,
 }:
 
@@ -26,14 +25,14 @@ import ./versions.nix (
     buildInputs = [
       libiconv
       openssl
-      (if (lib.versions.major version >= "7" && lib.versions.minor version >= "4") then pcre2 else pcre)
+      pcre2
     ];
 
     configureFlags = [
       "--enable-agent"
       "--enable-ipv6"
       "--with-iconv"
-      "--with-libpcre"
+      "--with-libpcre2"
       "--with-openssl=${openssl.dev}"
     ];
     makeFlags = [
diff --git a/pkgs/servers/monitoring/zabbix/agent2.nix b/pkgs/servers/monitoring/zabbix/agent2.nix
index 1bd5bae89d3a..c6bd5ba7af18 100644
--- a/pkgs/servers/monitoring/zabbix/agent2.nix
+++ b/pkgs/servers/monitoring/zabbix/agent2.nix
@@ -6,7 +6,6 @@
   pkg-config,
   libiconv,
   openssl,
-  pcre,
   pcre2,
   zlib,
 }:
@@ -37,7 +36,7 @@ import ./versions.nix (
     buildInputs = [
       libiconv
       openssl
-      (if (lib.versions.major version >= "7" && lib.versions.minor version >= "4") then pcre2 else pcre)
+      pcre2
       zlib
     ];
 
@@ -57,7 +56,7 @@ import ./versions.nix (
         --enable-agent2 \
         --enable-ipv6 \
         --with-iconv \
-        --with-libpcre \
+        --with-libpcre2 \
         --with-openssl=${openssl.dev}
     '';
 
diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix
index 688524e6f3ec..87fc5caa8591 100644
--- a/pkgs/servers/monitoring/zabbix/proxy.nix
+++ b/pkgs/servers/monitoring/zabbix/proxy.nix
@@ -7,7 +7,6 @@
   libevent,
   libiconv,
   openssl,
-  pcre,
   pcre2,
   zlib,
   buildPackages,
@@ -64,7 +63,7 @@ import ./versions.nix (
       libevent
       libiconv
       openssl
-      (if (lib.versions.major version >= "7" && lib.versions.minor version >= "4") then pcre2 else pcre)
+      pcre2
       zlib
     ]
     ++ optional odbcSupport unixodbc
@@ -80,7 +79,7 @@ import ./versions.nix (
       "--with-iconv"
       "--with-libcurl"
       "--with-libevent"
-      "--with-libpcre"
+      "--with-libpcre2"
       "--with-openssl=${openssl.dev}"
       "--with-zlib=${zlib}"
     ]
diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix
index 9a01605a6238..901f79c00cb7 100644
--- a/pkgs/servers/monitoring/zabbix/server.nix
+++ b/pkgs/servers/monitoring/zabbix/server.nix
@@ -9,7 +9,6 @@
   libiconv,
   libxml2,
   openssl,
-  pcre,
   pcre2,
   zlib,
   jabberSupport ? true,
@@ -61,7 +60,7 @@ import ./versions.nix (
       libiconv
       libxml2
       openssl
-      (if lib.versionAtLeast version "7.4" then pcre2 else pcre)
+      pcre2
       zlib
     ]
     ++ optional odbcSupport unixodbc
@@ -79,7 +78,7 @@ import ./versions.nix (
       "--with-iconv"
       "--with-libcurl"
       "--with-libevent"
-      "--with-libpcre"
+      "--with-libpcre2"
       "--with-libxml2"
       "--with-openssl=${openssl.dev}"
       "--with-zlib=${zlib}"

From db098ec66c6d82d8fa107d19f29b171b373e05f2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 May 2026 20:40:22 +0000
Subject: [PATCH 21/66] sunsetr: 0.12.2 -> 0.12.3

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

diff --git a/pkgs/by-name/su/sunsetr/package.nix b/pkgs/by-name/su/sunsetr/package.nix
index 030c3fa3bfc8..8ed957040af3 100644
--- a/pkgs/by-name/su/sunsetr/package.nix
+++ b/pkgs/by-name/su/sunsetr/package.nix
@@ -6,16 +6,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sunsetr";
-  version = "0.12.2";
+  version = "0.12.3";
 
   src = fetchFromGitHub {
     owner = "psi4j";
     repo = "sunsetr";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-M91eW8FKJDlR8pdvXcKte3OL3uJlpapShTUNpnA/Jvo=";
+    hash = "sha256-hbr7NpJCi2dulzgN2JVtUJewoo7s4rr1zGt+KpKYTWE=";
   };
 
-  cargoHash = "sha256-fFk/JPB6MGmYnwARMuKF1/fVZOf+W1C+YqQvuG/ub60=";
+  cargoHash = "sha256-yOU96xWnpMKzvBo64ewhzktRHLzSBn4ZXdSFrhrejZE=";
 
   checkFlags = [
     "--skip=config::tests::test_geo_toml_exists_before_config_creation"

From cf4f45459c925994026e6e7c4ec3a0971695e143 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 May 2026 11:43:35 +0000
Subject: [PATCH 22/66] pocketbase: 0.38.2 -> 0.39.0

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

diff --git a/pkgs/by-name/po/pocketbase/package.nix b/pkgs/by-name/po/pocketbase/package.nix
index 74032329b167..513a14fdb9d6 100644
--- a/pkgs/by-name/po/pocketbase/package.nix
+++ b/pkgs/by-name/po/pocketbase/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "pocketbase";
-  version = "0.38.2";
+  version = "0.39.0";
 
   src = fetchFromGitHub {
     owner = "pocketbase";
     repo = "pocketbase";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-p2cyZ1g5F2sIkhoXVPvDvy67gIJl57mX4dn5dH+E3kI=";
+    hash = "sha256-4myp2MleKb6mAwDKhN39uyc5PZJhB3lvm2x/KDR9u0g=";
   };
 
-  vendorHash = "sha256-TrcCWMZx9rVathC4nSLQB72SlF6pQIX1+SseSbx6UDU=";
+  vendorHash = "sha256-VBsClxCOA9Mp/kCHQKuBPd2Nt5sfXkVRx/8mGk5Gkcg=";
 
   # This is the released subpackage from upstream repo
   subPackages = [ "examples/base" ];

From 57b89494a6826c9cfabfd6a623614b65b1e31afd Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Sun, 31 May 2026 21:31:39 +0530
Subject: [PATCH 23/66] livebook: 0.18.6 -> 0.19.8; fix build

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 .../beam-modules/livebook/default.nix         | 104 +++++++++++++++---
 1 file changed, 90 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/beam-modules/livebook/default.nix b/pkgs/development/beam-modules/livebook/default.nix
index 81adf8d0e35a..57beb218cef4 100644
--- a/pkgs/development/beam-modules/livebook/default.nix
+++ b/pkgs/development/beam-modules/livebook/default.nix
@@ -1,46 +1,121 @@
 {
   lib,
-  beamPackages,
+  stdenv,
   makeWrapper,
   fetchFromGitHub,
+  versionCheckHook,
+  writableTmpDirAsHomeHook,
+
+  bun,
+  beamPackages,
+
   nixosTests,
   nix-update-script,
 }:
 
 beamPackages.mixRelease rec {
   pname = "livebook";
-  version = "0.18.6";
+  version = "0.19.8";
 
   inherit (beamPackages) elixir;
 
   buildInputs = [ beamPackages.erlang ];
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [
+    bun
+    makeWrapper
+    writableTmpDirAsHomeHook
+  ];
 
   src = fetchFromGitHub {
     owner = "livebook-dev";
     repo = "livebook";
     tag = "v${version}";
-    hash = "sha256-8pFvY86ht2NMUtknjt5M7QasOKnoHvQdYJrOlgTyueU=";
+    hash = "sha256-cIFnGUJ8yRnEBL9eu4Jpg1sMlTV1t/ybhHusLSFdZEY=";
   };
 
   mixFodDeps = beamPackages.fetchMixDeps {
     pname = "mix-deps-${pname}";
     inherit src version;
-    hash = "sha256-pfHzcYEEvj+x1/vLKhJ6bAsKGg19UisVK6h0xskhu74=";
+    hash = "sha256-T74RmUORPdNibxdl+bRGyYyOdnKs1TyjtdutLtfLNLM=";
   };
 
-  postInstall = ''
-    wrapProgram $out/bin/livebook \
-      --prefix PATH : ${
-        lib.makeBinPath [
-          beamPackages.elixir
-          beamPackages.erlang
-        ]
-      } \
-      --set MIX_REBAR3 ${beamPackages.rebar3}/bin/rebar3
+  node_modules = stdenv.mkDerivation {
+    pname = "${pname}-node_modules";
+    inherit src version;
+    nativeBuildInputs = [
+      bun
+      writableTmpDirAsHomeHook
+    ];
+    dontBuild = true;
+    dontFixup = true;
+    installPhase = ''
+      mkdir -p deps/phoenix deps/phoenix_html deps/phoenix_live_view
+      echo '{"name": "phoenix", "version": "1.0.0"}' > deps/phoenix/package.json
+      echo '{"name": "phoenix_html", "version": "1.0.0"}' > deps/phoenix_html/package.json
+      echo '{"name": "phoenix_live_view", "version": "1.0.0"}' > deps/phoenix_live_view/package.json
+      cd assets
+      bun install \
+        --no-cache \
+        --backend=copyfile \
+        --cpu="*" \
+        --frozen-lockfile \
+        --ignore-scripts \
+        --no-progress \
+        --os="*"
+      mkdir -p $out
+      cp -r node_modules $out/
+      rm -rf $out/node_modules/phoenix
+      rm -rf $out/node_modules/phoenix_html
+      rm -rf $out/node_modules/phoenix_live_view
+    '';
+    outputHashMode = "recursive";
+    outputHashAlgo = "sha256";
+    outputHash = "sha256-XtEkedj5QJh1tveKKd5sh4xcC6Gol1DUweQKEw1jLgU=";
+  };
+
+  postPatch = ''
+    substituteInPlace lib/mix/tasks/compile.ensure_livebook_priv.ex \
+      --replace-fail 'Mix.Task.run("bun.install", ~w"--if-missing")' ':ok' \
+      --replace-fail 'Mix.Task.run("bun", ~w"assets install")' ':ok' \
+      --replace-fail 'Mix.Task.run("bun", ~w" assets run build")' ':ok'
   '';
 
+  preBuild = ''
+    cp -r ${node_modules}/node_modules assets/node_modules
+    chmod -R +w assets/node_modules
+    ln -sf ../../deps/phoenix assets/node_modules/phoenix
+    ln -sf ../../deps/phoenix_html assets/node_modules/phoenix_html
+    ln -sf ../../deps/phoenix_live_view assets/node_modules/phoenix_live_view
+    pushd assets
+    bun --bun ./node_modules/vite/bin/vite.js build
+    popd
+  '';
+
+  postInstall =
+    let
+      path = lib.makeBinPath [
+        beamPackages.elixir
+        beamPackages.erlang
+      ];
+    in
+    ''
+      wrapProgram $out/bin/livebook \
+        --prefix PATH : ${path} \
+        --set MIX_REBAR3 ${beamPackages.rebar3}/bin/rebar3
+
+      wrapProgram $out/bin/server \
+        --prefix PATH : ${path}
+    '';
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+    writableTmpDirAsHomeHook
+  ];
+  versionCheckProgramArg = [ "version" ];
+  versionCheckKeepEnvironment = [ "HOME" ];
+  doInstallCheck = true;
+
   passthru = {
     updateScript = nix-update-script { };
     tests = {
@@ -52,6 +127,7 @@ beamPackages.mixRelease rec {
     license = lib.licenses.asl20;
     homepage = "https://livebook.dev/";
     description = "Automate code & data workflows with interactive Elixir notebooks";
+    mainProgram = "livebook";
     maintainers = with lib.maintainers; [
       munksgaard
       scvalex

From cf27100ad816ccd9d433a28691d53bef20dd48fd Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Sun, 31 May 2026 23:14:33 +0530
Subject: [PATCH 24/66] livebook: add ngi team

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/development/beam-modules/livebook/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/beam-modules/livebook/default.nix b/pkgs/development/beam-modules/livebook/default.nix
index 57beb218cef4..ec77a1344c3f 100644
--- a/pkgs/development/beam-modules/livebook/default.nix
+++ b/pkgs/development/beam-modules/livebook/default.nix
@@ -133,6 +133,9 @@ beamPackages.mixRelease rec {
       scvalex
     ];
     platforms = lib.platforms.unix;
-    teams = [ lib.teams.beam ];
+    teams = [
+      lib.teams.beam
+      lib.teams.ngi
+    ];
   };
 }

From 84f14169bb46232d4757439617bd71d47768a6a4 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 31 May 2026 21:15:06 +0200
Subject: [PATCH 25/66] yoshimi: remove unused pcre dependency

---
 pkgs/by-name/yo/yoshimi/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/yo/yoshimi/package.nix b/pkgs/by-name/yo/yoshimi/package.nix
index f973d270d6c1..2b35570f0248 100644
--- a/pkgs/by-name/yo/yoshimi/package.nix
+++ b/pkgs/by-name/yo/yoshimi/package.nix
@@ -14,7 +14,6 @@
   libxdmcp,
   lv2,
   minixml,
-  pcre,
   pkg-config,
   readline,
   libpthread-stubs,
@@ -56,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: {
     libxdmcp
     lv2
     minixml
-    pcre
     readline
     libpthread-stubs
     zlib

From 24335181f1f82a15e4061e45b4086ea4cbc0300a Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m+github@matteopacini.me>
Date: Sun, 31 May 2026 11:19:51 +0100
Subject: [PATCH 26/66] _86box{,-with-roms}: 5.3 -> 6.0

Assisted-by: Claude Code (Opus 4.8)
---
 pkgs/by-name/_8/_86box/package.nix | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/_8/_86box/package.nix b/pkgs/by-name/_8/_86box/package.nix
index d83bb8b0f2c5..9c2af3bc015f 100644
--- a/pkgs/by-name/_8/_86box/package.nix
+++ b/pkgs/by-name/_8/_86box/package.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   kdePackages,
   pkg-config,
@@ -21,6 +20,7 @@
   discord-gamesdk,
   libpcap,
   libslirp,
+  libserialport,
   wayland,
   wayland-scanner,
   libsndfile,
@@ -41,24 +41,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "86box";
-  version = "5.3";
+  version = "6.0";
 
   src = fetchFromGitHub {
     owner = "86Box";
     repo = "86Box";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-n68Ghhsv15TzpOMH4dBTNxa6AYwqN5s2C5pyO9VVaco=";
+    hash = "sha256-Qm7y/7LpBopti0K+jrC9TgORfFGjFYP/4rYPr7802gw=";
   };
 
   patches = [
     ./darwin.patch
-    # Fix build: Only make the fallthrough define available in C code
-    # https://github.com/86Box/86Box/issues/6607
-    (fetchpatch {
-      name = "fix-fallthrough-define-c-only.patch";
-      url = "https://github.com/86Box/86Box/commit/0092ce15de3efac108b961882f870a8c05e8c38f.patch";
-      hash = "sha256-DqjOtnyk6Zv9XHCLeuxD1wcLfvjGwGFvUWS0alXcchs=";
-    })
   ];
 
   postPatch = ''
@@ -87,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
     jack2
     libpcap
     libslirp
+    libserialport
     qt5.qtbase
     qt5.qttools
     libsndfile
@@ -105,6 +99,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags =
     lib.optional stdenv.hostPlatform.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF"
+    # On Darwin, 86Box ignores pkg-config for libserialport and links
+    # $LIBSERIALPORT_ROOT/lib/libserialport.dylib directly, so point it at the store path.
+    ++ lib.optional stdenv.hostPlatform.isDarwin "-DLIBSERIALPORT_ROOT=${libserialport}"
     ++ lib.optional enableNewDynarec "-DNEW_DYNAREC=ON"
     ++ lib.optional enableVncRenderer "-DVNC=ON"
     ++ lib.optional (!enableDynarec) "-DDYNAREC=OFF"
@@ -114,9 +111,9 @@ stdenv.mkDerivation (finalAttrs: {
     lib.optionalString stdenv.hostPlatform.isLinux ''
       install -Dm644 -t $out/share/applications $src/src/unix/assets/net.86box.86Box.desktop
 
-      for size in 48 64 72 96 128 192 256 512; do
-        install -Dm644 -t $out/share/icons/hicolor/"$size"x"$size"/apps \
-          $src/src/unix/assets/"$size"x"$size"/net.86box.86Box.png
+      for icon in $src/src/unix/assets/*x*/net.86box.86Box.png; do
+        size=$(basename "$(dirname "$icon")")
+        install -Dm644 -t $out/share/icons/hicolor/"$size"/apps "$icon"
       done;
     ''
     + lib.optionalString unfreeEnableRoms ''
@@ -129,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: {
       owner = "86Box";
       repo = "roms";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-7/xhhT29ijGNVlW7oJXdyJuhUwVs0b4dIUjc3lVtNEY=";
+      hash = "sha256-AjFxyxW6Op4w637k5AXPtibqablVoPK03Axh2h2JWdI=";
     };
     updateScript = ./update.sh;
   };

From b79dd976d0fe71384a0d846a6896a5009da4ca9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 31 May 2026 12:55:06 -0700
Subject: [PATCH 27/66] ghex: 50.0 -> 50.2

Changelog: https://gitlab.gnome.org/GNOME/ghex/-/blob/50.2/NEWS?ref_type=tags
---
 pkgs/by-name/gh/ghex/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gh/ghex/package.nix b/pkgs/by-name/gh/ghex/package.nix
index 9a1e8de811c5..b060d9b1b31d 100644
--- a/pkgs/by-name/gh/ghex/package.nix
+++ b/pkgs/by-name/gh/ghex/package.nix
@@ -21,7 +21,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ghex";
-  version = "50.0";
+  version = "50.2";
 
   outputs = [
     "out"
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/ghex/${lib.versions.major finalAttrs.version}/ghex-${finalAttrs.version}.tar.xz";
-    hash = "sha256-gyXKSx+nU3XPiVHmL4Z/pqhCgiwt1aRqmHc2CBizAhI=";
+    hash = "sha256-QTTSMYsqqtx6s90z4H1+bb8xZjzvW/0tIbqQ3tX1hKs=";
   };
 
   nativeBuildInputs = [

From a98144115f93e572215b618193e2939a24065b9c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 May 2026 20:18:28 +0000
Subject: [PATCH 28/66] tk-safe: 25.12.3 -> 26.1.1

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

diff --git a/pkgs/by-name/tk/tk-safe/package.nix b/pkgs/by-name/tk/tk-safe/package.nix
index 395801cce4d6..913a2fa42ea0 100644
--- a/pkgs/by-name/tk/tk-safe/package.nix
+++ b/pkgs/by-name/tk/tk-safe/package.nix
@@ -21,12 +21,12 @@
 
 stdenv.mkDerivation rec {
   pname = "tk-safe";
-  version = "25.12.3";
-  revision = "25";
+  version = "26.1.1";
+  revision = "27";
 
   src = fetchurl {
     url = "https://api.snapcraft.io/api/v1/snaps/download/rLNeIGEaag0TKFQLO0TxF3ARXg3rcTNx_${revision}.snap";
-    hash = "sha512-RdcScrTOQHVUn5JE59Z7S44+l2naNXBgID5VqMVelni0bPvnBigEDgRp5BID65Q52MXMe79lzzqo7qRmbYkb3Q==";
+    hash = "sha512-idCFUt0nzg5rM2HXvuMzPPzukmvHSMxCEX+PIM/23A8j8IT3IhUQCvZLaXLnUs6eb1hWNvsNEr+XlaM8cSTdWA==";
   };
 
   desktopItems = [

From 1f9a45d327c783996acc4690e83ff661fe1cf1b5 Mon Sep 17 00:00:00 2001
From: Maciej Wojterski <maciej.wojterski@paylandnet.pl>
Date: Sun, 31 May 2026 23:12:45 +0200
Subject: [PATCH 29/66] claude-code: use baseUrl from official install script

---
 pkgs/by-name/cl/claude-code/package.nix | 2 +-
 pkgs/by-name/cl/claude-code/update.sh   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index e7b6b4190de9..1fded730bd27 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -19,7 +19,7 @@
 }:
 let
   stdenv = stdenvNoCC;
-  baseUrl = "https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases";
+  baseUrl = "https://downloads.claude.ai/claude-code-releases";
   manifest = lib.importJSON ./manifest.json;
   platformKey = "${stdenv.hostPlatform.node.platform}-${stdenv.hostPlatform.node.arch}";
   platformManifestEntry = manifest.platforms.${platformKey};
diff --git a/pkgs/by-name/cl/claude-code/update.sh b/pkgs/by-name/cl/claude-code/update.sh
index 1e2125a74625..fd0e340365a5 100755
--- a/pkgs/by-name/cl/claude-code/update.sh
+++ b/pkgs/by-name/cl/claude-code/update.sh
@@ -5,7 +5,7 @@ set -euo pipefail
 
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
-BASE_URL="https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases"
+BASE_URL="https://downloads.claude.ai/claude-code-releases"
 
 VERSION="${1:-$(curl -fsSL "$BASE_URL/latest")}"
 

From dc9631de97e89dca7ffdc4d86af6914bd40f3783 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 31 May 2026 21:20:31 +0000
Subject: [PATCH 30/66] vcmi: fix build

---
 pkgs/by-name/vc/vcmi/package.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vc/vcmi/package.nix b/pkgs/by-name/vc/vcmi/package.nix
index ef2c940b8c1d..db4ece2e1b64 100644
--- a/pkgs/by-name/vc/vcmi/package.nix
+++ b/pkgs/by-name/vc/vcmi/package.nix
@@ -5,6 +5,7 @@
   SDL2_ttf,
   boost,
   cmake,
+  gettext,
   fetchFromGitHub,
   ffmpeg,
   fuzzylite,
@@ -30,16 +31,27 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "vcmi";
   version = "1.7.4";
 
+  __structuredAttrs = true;
+  strictDeps = true;
+
   src = fetchFromGitHub {
     owner = "vcmi";
     repo = "vcmi";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-uzdnRKF0xb2B2r6kTzk6OEDGBdOwcu9eGYsvv4ALCF0=";
+    # Disable git background maintenance for the whole prefetch, including submodule clones.
+    # Upstream nix-prefetch-git only disables it on the outer repo (NixOS/nixpkgs#524215), so
+    # submodule clones can still race with their own maintenance and break `.git` cleanup.
+    preFetch = ''
+      export GIT_CONFIG_GLOBAL="$TMPDIR/gitconfig"
+      printf '[maintenance]\n\tauto = false\n' > "$GIT_CONFIG_GLOBAL"
+    '';
+    hash = "sha256-iV1twkoOJyUsUkq17mdTYk1YvfmUtLHdtR3H77BoNJk=";
   };
 
   nativeBuildInputs = [
     cmake
+    gettext # msgfmt
     ninja
     pkg-config
     python3
@@ -98,13 +110,13 @@ stdenv.mkDerivation (finalAttrs: {
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/vcmiclient";
-  versionCheckProgramArg = "--version";
   versionCheckKeepEnvironment = [
     "XDG_CACHE_HOME"
     "XDG_CONFIG_HOME"
     "XDG_DATA_HOME"
   ];
   preVersionCheck = ''
+    cd $(mktemp -d)
     export \
       XDG_CACHE_HOME="$TMPDIR" \
       XDG_CONFIG_HOME="$TMPDIR" \

From 5001e038ac269c66ca791b86a9826378d3c26bb1 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 29 May 2026 23:22:39 +0000
Subject: [PATCH 31/66] python3Packages.ale-py: 0.11.2 -> 0.12.0

Diff: https://github.com/Farama-Foundation/Arcade-Learning-Environment/compare/v0.11.2...v0.12.0

Changelog: https://github.com/Farama-Foundation/Arcade-Learning-Environment/releases/tag/v0.12.0
---
 .../python-modules/ale-py/default.nix         | 97 ++++++++-----------
 1 file changed, 41 insertions(+), 56 deletions(-)

diff --git a/pkgs/development/python-modules/ale-py/default.nix b/pkgs/development/python-modules/ale-py/default.nix
index 3cbf53d33cdf..3282fd421f5d 100644
--- a/pkgs/development/python-modules/ale-py/default.nix
+++ b/pkgs/development/python-modules/ale-py/default.nix
@@ -7,8 +7,10 @@
   # build-system
   cmake,
   ninja,
-  pybind11,
-  setuptools,
+  nanobind,
+  scikit-build-core,
+  # linux-only
+  jax,
 
   # buildInputs
   SDL2,
@@ -16,86 +18,54 @@
   zlib,
 
   # dependencies
-  importlib-resources,
   numpy,
-  typing-extensions,
-  jax,
 
   # tests
+  chex,
   gymnasium,
-  opencv-python,
   pytestCheckHook,
-
-  # Whether to enable recently added vector environments:
-  # https://github.com/Farama-Foundation/Arcade-Learning-Environment/blob/v0.11.0/docs/vector-environment.md
-  # FIXME: Disabled by default as it mysteriously causes stable-baselines3's tests to hang indefinitely.
-  withVectorEnv ? false,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "ale-py";
-  version = "0.11.2";
+  version = "0.12.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "Farama-Foundation";
     repo = "Arcade-Learning-Environment";
-    tag = "v${version}";
-    hash = "sha256-4IkjW8HX21uBEHFtb3qETxco6FfDMgLbG1BDHWwvn58=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-hFbreHk0i4h+JOyvDYcNX3TmwgvxNC5U0l5Xrqqz1zQ=";
   };
 
   build-system = [
     cmake
     ninja
-    pybind11
-    setuptools
-  ];
-
-  buildInputs = [
-    SDL2
-    zlib
-  ]
-  ++ lib.optionals withVectorEnv [
-    opencv
-  ];
-
-  dependencies = [
-    gymnasium
-    importlib-resources
-    numpy
-    typing-extensions
+    scikit-build-core
+    nanobind
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     jax
   ];
-
-  postPatch =
-    # Relax the pybind11 version
-    ''
-      substituteInPlace src/ale/python/CMakeLists.txt \
-        --replace-fail \
-          'find_package(pybind11 ''${PYBIND11_VER} QUIET)' \
-          'find_package(pybind11 QUIET)'
-    ''
-    + lib.optionalString (!withVectorEnv) ''
-      substituteInPlace setup.py \
-        --replace-fail \
-          "-DBUILD_VECTOR_LIB=ON" \
-          "-DBUILD_VECTOR_LIB=OFF"
-    '';
-
   dontUseCmakeConfigure = true;
 
+  buildInputs = [
+    SDL2
+    zlib
+    opencv
+  ];
+
+  dependencies = [
+    numpy
+  ];
+
   pythonImportsCheck = [ "ale_py" ];
 
-  doCheck = false;
-
   nativeCheckInputs = [
+    chex
     gymnasium
     pytestCheckHook
-  ]
-  + lib.optionals withVectorEnv [
-    opencv-python
   ];
 
   disabledTests = [
@@ -103,20 +73,35 @@ buildPythonPackage rec {
     # line 414 in test_display_screen
     "test_display_screen"
 
-    # test_atari_env.py tests fail on the majority of the environments because the ROM are missing.
+    # Most Atari tests fail because the ROM are missing.
     # The user is expected to manually download the roms:
     # https://github.com/Farama-Foundation/Arcade-Learning-Environment/blob/v0.9.0/docs/faq.md#i-downloaded-ale-and-i-installed-it-successfully-but-i-cannot-find-any-rom-file-at-roms-do-i-have-to-get-them-somewhere-else
+    "TestVectorEnv"
     "test_check_env"
+    "test_clone_pickle_restore_new_env"
+    "test_clone_restore"
+    "test_continuous_actions"
+    "test_determinism"
+    "test_gym_keys_to_action"
+    "test_jit"
+    "test_obs_params"
     "test_reset_step_shapes"
     "test_rollout_consistency"
+    "test_seeding"
     "test_sound_obs"
+    "test_state_serialize_roundtrip"
+  ];
+
+  disabledTestPaths = [
+    #
+    "tests/python/test_atari_vector_xla.py"
   ];
 
   meta = {
     description = "Simple framework that allows researchers and hobbyists to develop AI agents for Atari 2600 games";
     mainProgram = "ale-import-roms";
     homepage = "https://github.com/mgbellemare/Arcade-Learning-Environment";
-    changelog = "https://github.com/Farama-Foundation/Arcade-Learning-Environment/releases/tag/v${version}";
+    changelog = "https://github.com/Farama-Foundation/Arcade-Learning-Environment/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.gpl2;
     maintainers = with lib.maintainers; [ billhuang ];
     badPlatforms = [
@@ -125,4 +110,4 @@ buildPythonPackage rec {
       lib.systems.inspect.patterns.isDarwin
     ];
   };
-}
+})

From 2f7bf9cf02e518b0af88c1e7da1aa3b7f29fe31f Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Mon, 1 Jun 2026 01:07:05 +0200
Subject: [PATCH 32/66] python3Packages.alectryon: 1.4.0 -> 2.0.0

---
 .../python-modules/alectryon/default.nix          | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/alectryon/default.nix b/pkgs/development/python-modules/alectryon/default.nix
index 035a272b3be1..44666d12935d 100644
--- a/pkgs/development/python-modules/alectryon/default.nix
+++ b/pkgs/development/python-modules/alectryon/default.nix
@@ -6,27 +6,34 @@
   dominate,
   beautifulsoup4,
   docutils,
+  myst-parser,
+  setuptools,
   sphinx,
 }:
 
 buildPythonPackage rec {
   pname = "alectryon";
-  version = "1.4.0";
-  format = "setuptools";
+  version = "2.0.0";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "00cxzfifvgcf3d3s8lsj1yxcwyf3a1964p86fj7b42q8pa0b4r3i";
+    sha256 = "sha256-ouuCwipCQKSlH8NpF5QZd4jx4mEYooyIcnRhtDRWOnU=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     pygments
     dominate
     beautifulsoup4
     docutils
+    myst-parser
     sphinx
   ];
 
+  pythonImportsCheck = [ "alectryon" ];
+
   doCheck = false;
 
   meta = {

From c682871500f39543b370a4382897b3a2eb391837 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Mon, 1 Jun 2026 01:07:26 +0200
Subject: [PATCH 33/66] python3Packages.alectryon: use finalAttrs

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

diff --git a/pkgs/development/python-modules/alectryon/default.nix b/pkgs/development/python-modules/alectryon/default.nix
index 44666d12935d..7895437e6b17 100644
--- a/pkgs/development/python-modules/alectryon/default.nix
+++ b/pkgs/development/python-modules/alectryon/default.nix
@@ -11,13 +11,13 @@
   sphinx,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "alectryon";
   version = "2.0.0";
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     sha256 = "sha256-ouuCwipCQKSlH8NpF5QZd4jx4mEYooyIcnRhtDRWOnU=";
   };
 
@@ -43,4 +43,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ Zimmi48 ];
   };
-}
+})

From 88af445ecc2bd8faaaedb3b1178ef4561bfbdf4e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jun 2026 00:08:35 +0000
Subject: [PATCH 34/66] python3Packages.schemdraw: 0.22 -> 0.23

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

diff --git a/pkgs/development/python-modules/schemdraw/default.nix b/pkgs/development/python-modules/schemdraw/default.nix
index cab4e58a4ebf..38e2ee2bad65 100644
--- a/pkgs/development/python-modules/schemdraw/default.nix
+++ b/pkgs/development/python-modules/schemdraw/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "schemdraw";
-  version = "0.22";
+  version = "0.23";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cdelker";
     repo = "schemdraw";
     tag = version;
-    hash = "sha256-trhpPv9x+S4d9AHT52/uvuCDOX4tJj6EhPzYBxtzyeQ=";
+    hash = "sha256-NAvJDrJKf4CYs9W4zdNAU8WnuXlCK6FU44+5flWzyAk=";
   };
 
   build-system = [ setuptools ];

From fd78df9a6fbcf1ed8943e0344c2f567231dd7791 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jun 2026 00:35:39 +0000
Subject: [PATCH 35/66] nostr-rs-relay: 0.9.0 -> 0.10.0

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

diff --git a/pkgs/by-name/no/nostr-rs-relay/package.nix b/pkgs/by-name/no/nostr-rs-relay/package.nix
index 7aea9427584e..26703226408d 100644
--- a/pkgs/by-name/no/nostr-rs-relay/package.nix
+++ b/pkgs/by-name/no/nostr-rs-relay/package.nix
@@ -11,15 +11,15 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nostr-rs-relay";
-  version = "0.9.0";
+  version = "0.10.0";
   src = fetchFromGitHub {
     owner = "scsibug";
     repo = "nostr-rs-relay";
     rev = finalAttrs.version;
-    hash = "sha256-MS5jgUh9aLAFr4Nnf3Wid+ki0PTfsyob3r16/EXYZ7E=";
+    hash = "sha256-HNAoCb6NHfSXpz+qDsxeqSiV8ydd4f9/t5JfS5p9af4=";
   };
 
-  cargoHash = "sha256-hrq9EEUot9painlXVGjIh+NMlrH4iRQ28U3PLGnvYsw=";
+  cargoHash = "sha256-zLLkAj1Kahkrahru7STSSdyzsLihc3z34c4v5BrFXvU=";
 
   buildInputs = [
     openssl.dev

From 2dcf354cc02be34a2ab823be68fbf4b809f9a9ff Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Sat, 30 May 2026 23:17:45 +0100
Subject: [PATCH 36/66] =?UTF-8?q?nixfmt:=201.2.0=20=E2=86=92=201.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/NixOS/nixfmt/releases/tag/v1.3.0
https://github.com/NixOS/nixfmt/releases/tag/v1.3.1
---
 pkgs/by-name/ni/nixfmt/generated-package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ni/nixfmt/generated-package.nix b/pkgs/by-name/ni/nixfmt/generated-package.nix
index 15d12a654017..e1c3e1c67fd1 100644
--- a/pkgs/by-name/ni/nixfmt/generated-package.nix
+++ b/pkgs/by-name/ni/nixfmt/generated-package.nix
@@ -24,10 +24,10 @@
 }:
 mkDerivation {
   pname = "nixfmt";
-  version = "1.2.0";
+  version = "1.3.1";
   src = fetchzip {
-    url = "https://github.com/nixos/nixfmt/archive/v1.2.0.tar.gz";
-    sha256 = "1qvj1sddh7bgggqnj7cnhvfh4iz1pwzc9a9awc1g7y349yvpwad3";
+    url = "https://github.com/nixos/nixfmt/archive/v1.3.1.tar.gz";
+    sha256 = "1c0iz6hrzafld8vkldcmall7fvby6xgzzqgap8c3bxwhaxhq86hm";
   };
   isLibrary = true;
   isExecutable = true;
@@ -58,6 +58,6 @@ mkDerivation {
   jailbreak = true;
   homepage = "https://github.com/NixOS/nixfmt";
   description = "Official formatter for Nix code";
-  license = lib.licenses.mpl20;
+  license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
   mainProgram = "nixfmt";
 }

From ce5210e9c728c8a89a103d7a6c8c6662cac081c3 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Sat, 30 May 2026 23:44:21 +0100
Subject: [PATCH 37/66] nixfmt: add versionCheckHook

Replace the `passthru.tests` --version test by running versionCheckHook
during the package build.

As `haskellPackages.mkDerivation` is very locked-down and doesn't allow
access to things like `nativeInstallCheckInputs` (or any input lists),
we add a separate `.overrideAttrs` call to the pipeline.

    Running phase: installCheckPhase
    Executing versionCheckPhase
    Successfully managed to find version 1.3.0 in the output of the command /nix/store/3fg7y7qww3c3hvyb66n75d9j5y362n4j-nixfmt-1.3.0/bin/nixfmt --version
    nixfmt 1.3.0
    Finished versionCheckPhase
---
 pkgs/by-name/ni/nixfmt/package.nix | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ni/nixfmt/package.nix b/pkgs/by-name/ni/nixfmt/package.nix
index 93a198f73f2a..ebd16230063c 100644
--- a/pkgs/by-name/ni/nixfmt/package.nix
+++ b/pkgs/by-name/ni/nixfmt/package.nix
@@ -2,27 +2,31 @@
   haskell,
   haskellPackages,
   lib,
-  runCommand,
-  nixfmt,
+  stdenv,
+  versionCheckHook,
 }:
 let
   inherit (haskell.lib.compose) overrideCabal justStaticExecutables;
 
-  overrides = {
+  cabalOverrides = {
     passthru.updateScript = ./update.sh;
-
     teams = [ lib.teams.formatter ];
-
-    # These tests can be run with the following command.
-    #
-    # $ nix-build -A nixfmt.tests
-    passthru.tests = runCommand "nixfmt-tests" { nativeBuildInputs = [ nixfmt ]; } ''
-      nixfmt --version > $out
-    '';
   };
+
+  # haskellPackages.mkDerivation and haskell.lib.compose.overrideCabal
+  # do not allow access to `doInstallCheck` or `nativeInstallCheckInputs`,
+  # so we override directly with `.overrideAttrs`.
+  lateOverrides = finalAttrs: prevAttrs: {
+    doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+    nativeInstallCheckInputs = prevAttrs.nativeInstallCheckInputs or [ ] ++ [
+      versionCheckHook
+    ];
+  };
+
   raw-pkg = haskellPackages.callPackage ./generated-package.nix { };
 in
 lib.pipe raw-pkg [
-  (overrideCabal overrides)
+  (overrideCabal cabalOverrides)
   justStaticExecutables
+  (drv: drv.overrideAttrs lateOverrides)
 ]

From dededefefa26bd3ebb20ab5b0c3676d19687b5d5 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Sat, 30 May 2026 23:58:22 +0100
Subject: [PATCH 38/66] nixfmt: add `meta.changelog`

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

diff --git a/pkgs/by-name/ni/nixfmt/package.nix b/pkgs/by-name/ni/nixfmt/package.nix
index ebd16230063c..c12ec5d2ed4f 100644
--- a/pkgs/by-name/ni/nixfmt/package.nix
+++ b/pkgs/by-name/ni/nixfmt/package.nix
@@ -8,9 +8,10 @@
 let
   inherit (haskell.lib.compose) overrideCabal justStaticExecutables;
 
-  cabalOverrides = {
+  cabalOverrides = drv: {
     passthru.updateScript = ./update.sh;
     teams = [ lib.teams.formatter ];
+    changelog = "https://github.com/NixOS/nixfmt/releases/tag/v${drv.version}";
   };
 
   # haskellPackages.mkDerivation and haskell.lib.compose.overrideCabal

From 6a299fd09676ceebb288f8305d79f4e6b58ae7c7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jun 2026 01:49:11 +0000
Subject: [PATCH 39/66] python3Packages.moyopy: 0.9.0 -> 0.10.0

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

diff --git a/pkgs/development/python-modules/moyopy/default.nix b/pkgs/development/python-modules/moyopy/default.nix
index ba3bbdb78128..1523fe4f4482 100644
--- a/pkgs/development/python-modules/moyopy/default.nix
+++ b/pkgs/development/python-modules/moyopy/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "moyopy";
-  version = "0.9.0";
+  version = "0.10.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -24,7 +24,7 @@ buildPythonPackage (finalAttrs: {
     owner = "spglib";
     repo = "moyo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aOkxA9oQjP7EEJ+VoXTy+Hb8wHZD1V3hS4Xwhc0GsOM=";
+    hash = "sha256-C1260FQ/V/puPU41LQHxsvvQ3BAabxRKWBCVEm79gp0=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/moyopy";
@@ -47,7 +47,7 @@ buildPythonPackage (finalAttrs: {
       sourceRoot
       cargoRoot
       ;
-    hash = "sha256-+Qhxn2nvPN4FKlz6nyPtxQeHcu/3bgmtvkgAM2gp85I=";
+    hash = "sha256-M/AWtXfexXbnFHYd6DxxrRSTuejXdt0DVxU/XtT9iPQ=";
   };
 
   build-system = [

From 835756a3e32a42f25e06a3ce64f56c9938d41ed3 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 31 May 2026 21:50:12 -0400
Subject: [PATCH 40/66] bodyclose: drop

Broken for an entire release cycle, needs a Go version we don't package.
---
 pkgs/by-name/bo/bodyclose/package.nix | 35 ---------------------------
 pkgs/top-level/aliases.nix            |  1 +
 2 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 pkgs/by-name/bo/bodyclose/package.nix

diff --git a/pkgs/by-name/bo/bodyclose/package.nix b/pkgs/by-name/bo/bodyclose/package.nix
deleted file mode 100644
index cdf353e7b586..000000000000
--- a/pkgs/by-name/bo/bodyclose/package.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-  unstableGitUpdater,
-}:
-
-buildGoModule {
-  pname = "bodyclose";
-  version = "0-unstable-2024-12-22";
-
-  src = fetchFromGitHub {
-    owner = "timakin";
-    repo = "bodyclose";
-    rev = "1db5c5ca4d6719fe28430df1ae8d337ee2ac09c7";
-    hash = "sha256-s5bWvpV6gHGEsuiNXJl2ZuyDaffD82/rCbusov3zsyw=";
-  };
-
-  vendorHash = "sha256-8grdJuV8aSETsJr2VazC/3ctfnGh3UgjOWD4/xf3uC8=";
-
-  ldflags = [
-    "-s"
-    "-w"
-  ];
-
-  passthru.updateScript = unstableGitUpdater { };
-
-  meta = {
-    description = "Golang linter to check whether HTTP response body is closed and a re-use of TCP connection is not blocked";
-    mainProgram = "bodyclose";
-    homepage = "https://github.com/timakin/bodyclose";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ meain ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index bc8ede1d87e7..3b8070ff8e87 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -402,6 +402,7 @@ mapAliases {
   blueberry = throw "'blueberry' has been removed as it is unmaintained upstream. Consider using blueman instead"; # Added 2026-03-09
   bmap-tools = throw "'bmap-tools' has been renamed to/replaced by 'bmaptool'"; # Converted to throw 2025-10-27
   bob = throw "'bob' has been removed as it is unmaintained upstream and has vulnerable dependencies."; # Added 2025-12-29
+  bodyclose = throw "'bodyclose' has been removed because it was broken for an entire release cycle."; # Added 2026-05-31
   boost177 = throw "Boost 1.77 has been removed as it is obsolete and no longer used by anything in Nixpkgs"; # Added 2026-04-20
   botan2 = throw "botan2 has been removed as it is EOL"; # Added 2025-10-20
   bower2nix = throw "bower2nix has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17

From 59e48eaa2cd7fffd4d05266b393feeef8d994883 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jun 2026 03:24:01 +0000
Subject: [PATCH 41/66] crc: 2.59.0 -> 2.61.0

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

diff --git a/pkgs/by-name/cr/crc/package.nix b/pkgs/by-name/cr/crc/package.nix
index e3497b0cd54a..dc35dffb6f76 100644
--- a/pkgs/by-name/cr/crc/package.nix
+++ b/pkgs/by-name/cr/crc/package.nix
@@ -8,16 +8,16 @@
 }:
 
 let
-  openShiftVersion = "4.21.4";
-  okdVersion = "4.21.0-okd-scos.5";
-  microshiftVersion = "4.21.0";
+  openShiftVersion = "4.21.14";
+  okdVersion = "4.21.0-okd-scos.8";
+  microshiftVersion = "4.21.7";
   writeKey = "$(MODULEPATH)/pkg/crc/segment.WriteKey=cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp";
-  gitCommit = "e90757a62cf73025d22e2bcdc7b04bf5e5e9a0e0";
-  gitHash = "sha256-0Rs+kpuiCQzgLKpZ4fkspZEiH/cnkkN3jdObgAK9hGw=";
+  gitCommit = "6eb443d169c5a6dd461db1181f95506aa429f34b";
+  gitHash = "sha256-sVByFqYvPLrpG90GYigLEDemaJVF2fj+tSgERmmRzsM=";
 in
 buildGoModule (finalAttrs: {
   pname = "crc";
-  version = "2.59.0";
+  version = "2.61.0";
 
   src = fetchFromGitHub {
     owner = "crc-org";

From ad3acf699895881ae75a7c61b7856c7e2f32dd2d Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 31 May 2026 22:39:37 -0500
Subject: [PATCH 42/66] vimPlugins.neotest-bun: init at 0-unstable-2026-01-05

https://github.com/Arthur944/neotest-bun
---
 .../applications/editors/vim/plugins/generated.nix | 14 ++++++++++++++
 .../applications/editors/vim/plugins/overrides.nix |  7 +++++++
 .../editors/vim/plugins/vim-plugin-names           |  1 +
 3 files changed, 22 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 2aad4186b645..02e65e9c6652 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -11231,6 +11231,20 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  neotest-bun = buildVimPlugin {
+    pname = "neotest-bun";
+    version = "0-unstable-2026-01-05";
+    src = fetchFromGitHub {
+      owner = "Arthur944";
+      repo = "neotest-bun";
+      rev = "af0f8684cd00a96f1e0359f1aeff2b9bf7a0ec88";
+      hash = "sha256-Y1I0zW8S8/Fz46rPIkHzTGbm7C8BXOfjq+V19YrzPlo=";
+    };
+    meta.homepage = "https://github.com/Arthur944/neotest-bun/";
+    meta.license = getLicenseFromSpdxId "MIT";
+    meta.hydraPlatforms = [ ];
+  };
+
   neotest-ctest = buildVimPlugin {
     pname = "neotest-ctest";
     version = "0.3.0";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index a1989d0e7c17..cd4c0d3344b0 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -2809,6 +2809,13 @@ assertNoAdditions {
     ];
   };
 
+  neotest-bun = super.neotest-bun.overrideAttrs {
+    dependencies = with self; [
+      neotest
+      nvim-nio
+    ];
+  };
+
   neotest-ctest = super.neotest-ctest.overrideAttrs {
     dependencies = with self; [
       neotest
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 9d98d2d27261..5b70195343c2 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -800,6 +800,7 @@ https://github.com/Shougo/neosnippet.vim/,,
 https://github.com/kawre/neotab.nvim/,,
 https://github.com/kassio/neoterm/,,
 https://github.com/rcasia/neotest-bash/,,
+https://github.com/Arthur944/neotest-bun/,,
 https://github.com/orjangj/neotest-ctest/,,
 https://github.com/sidlatau/neotest-dart/,,
 https://github.com/MarkEmmons/neotest-deno/,,

From cc1c8e70212326aeeabf8eb56d1ba1c7c9e8b62d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jun 2026 03:57:42 +0000
Subject: [PATCH 43/66] davis: 5.3.0 -> 5.4.2

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

diff --git a/pkgs/by-name/da/davis/package.nix b/pkgs/by-name/da/davis/package.nix
index f4b66521c282..30b4805bac3f 100644
--- a/pkgs/by-name/da/davis/package.nix
+++ b/pkgs/by-name/da/davis/package.nix
@@ -7,17 +7,17 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "davis";
-  version = "5.3.0";
+  version = "5.4.2";
 
   src = fetchFromGitHub {
     owner = "tchapi";
     repo = "davis";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-YLVfcoC8cIcCfi7R2zWXNxD4P+KIXOCL+MqFEt2Z7Tc=";
+    hash = "sha256-ZoNd4RvHKdKhfWZN8KrDBGvRbLG6SWUytVEuCQRlnG4=";
   };
 
   composerNoPlugins = false;
-  vendorHash = "sha256-VpINHPy2gwA5dk8OGQjmWnCpS9JVyEAUG+bptggCybk=";
+  vendorHash = "sha256-Cpwr8YP1WiMW/ki7WK4zu88ycULP31vXbsqnzYEFHKs=";
 
   postInstall = ''
     chmod -R u+w $out/share

From a98bdf5909ac9312be82b377d6b24ed0cb6e8058 Mon Sep 17 00:00:00 2001
From: Ivy Pierlot <ivyp@outlook.com.au>
Date: Mon, 1 Jun 2026 13:57:59 +1000
Subject: [PATCH 44/66] vimPlugins.jujutsu-nvim: init at 0-unstable-2026-05-14

https://github.com/yannvanhalewyn/jujutsu.nvim
---
 .../applications/editors/vim/plugins/generated.nix | 14 ++++++++++++++
 .../editors/vim/plugins/vim-plugin-names           |  1 +
 2 files changed, 15 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 2aad4186b645..31b1108c893b 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -8164,6 +8164,20 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  jujutsu-nvim = buildVimPlugin {
+    pname = "jujutsu.nvim";
+    version = "0-unstable-2026-05-14";
+    src = fetchFromGitHub {
+      owner = "yannvanhalewyn";
+      repo = "jujutsu.nvim";
+      rev = "17ab008d71cbcd31f8c2891e11cb758579f597c0";
+      hash = "sha256-KygJ73YZNPtTfECWyrwK86AfO7jXDEfIMFia3yvorM0=";
+    };
+    meta.homepage = "https://github.com/yannvanhalewyn/jujutsu.nvim/";
+    meta.license = getLicenseFromSpdxId "MIT";
+    meta.hydraPlatforms = [ ];
+  };
+
   jule-nvim = buildVimPlugin {
     pname = "jule.nvim";
     version = "0-unstable-2025-12-26";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 9d98d2d27261..cde634738c55 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -581,6 +581,7 @@ https://github.com/NicolasGB/jj.nvim/,,
 https://github.com/vito-c/jq.vim/,,
 https://github.com/neoclide/jsonc.vim/,,
 https://git.myzel394.app/Myzel394/jsonfly.nvim,,
+https://github.com/yannvanhalewyn/jujutsu.nvim/,,
 https://github.com/julelang/jule.nvim/,,
 https://github.com/JuliaEditorSupport/julia-vim/,,
 https://github.com/GCBallesteros/jupytext.nvim/,,

From 892fa9f6e78bb5c053412923816f6f4cd9a5d85b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jun 2026 04:22:08 +0000
Subject: [PATCH 45/66] solanum: 0-unstable-2026-05-23 -> 0-unstable-2026-05-24

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

diff --git a/pkgs/by-name/so/solanum/package.nix b/pkgs/by-name/so/solanum/package.nix
index cb0e89a330c8..3c5bd47709db 100644
--- a/pkgs/by-name/so/solanum/package.nix
+++ b/pkgs/by-name/so/solanum/package.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "solanum";
-  version = "0-unstable-2026-05-23";
+  version = "0-unstable-2026-05-24";
 
   src = fetchFromGitHub {
     owner = "solanum-ircd";
     repo = "solanum";
-    rev = "dfe6757a577109d2180465da6270b5a6bc08f8d7";
-    hash = "sha256-ngg/0HPZeCYodIWt8p9zpCj6hQMiVoc9E2cm/87eE8k=";
+    rev = "eb62eb9cab93ce0519c0ca2c8fa10e688054434d";
+    hash = "sha256-ujSNxSc7HT55YaN4RKD4gDfqt3joVBPGgEzFgLJS5as=";
   };
 
   postPatch = ''

From c950a61256356e6bae5c5ae0dd80fa78d8c2707c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jun 2026 05:43:58 +0000
Subject: [PATCH 46/66] lint-staged: 17.0.5 -> 17.0.7

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

diff --git a/pkgs/by-name/li/lint-staged/package.nix b/pkgs/by-name/li/lint-staged/package.nix
index 495ecff0c54e..f3e71e4eb565 100644
--- a/pkgs/by-name/li/lint-staged/package.nix
+++ b/pkgs/by-name/li/lint-staged/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "lint-staged";
-  version = "17.0.5";
+  version = "17.0.7";
 
   src = fetchFromGitHub {
     owner = "okonet";
     repo = "lint-staged";
     rev = "v${version}";
-    hash = "sha256-W9OW4ylRhgeUq7AlJlSkfN0IKv8Us6IEhmfE08UXzH8=";
+    hash = "sha256-oh4t1MlCs006W8oL0ljrNnckGfGqZOkER6J/FigoOZs=";
   };
 
-  npmDepsHash = "sha256-ifz75kaLfDq42cdnN7eel/HtG6Fmr+1BFbD0b1vcjCA=";
+  npmDepsHash = "sha256-MCFfmIXoFk2RyXg19Aho3MLf/W3hYGPelRhLka7lQWc=";
 
   dontNpmBuild = true;
 

From ba6b02b89023e2699472212916a43795e3712ed8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jun 2026 06:08:40 +0000
Subject: [PATCH 47/66] resterm: 0.39.5 -> 0.41.1

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

diff --git a/pkgs/by-name/re/resterm/package.nix b/pkgs/by-name/re/resterm/package.nix
index 163e13a8899f..76e510f4737d 100644
--- a/pkgs/by-name/re/resterm/package.nix
+++ b/pkgs/by-name/re/resterm/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "resterm";
-  version = "0.39.5";
+  version = "0.41.1";
 
   src = fetchFromGitHub {
     owner = "unkn0wn-root";
     repo = "resterm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Qd7ocX2w2dDyoXvv5oaEqpLJYieBahjjkPMom4EVBss=";
+    hash = "sha256-PSWgbq1aV+9AEhAXL3gZGKh6BzKc5CxufLTp80T0Tno=";
   };
 
   vendorHash = "sha256-AjckKD6NScBa8w9nWMdVExuNadz3vHnK854XXg3nj84=";

From 01a951ba89ee8858a3449850db40dc587abe7ba4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jun 2026 06:38:21 +0000
Subject: [PATCH 48/66] home-assistant-custom-components.mitsubishi: 0.5.5 ->
 0.5.6

---
 .../home-assistant/custom-components/mitsubishi/package.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix b/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix
index 050a1b771cd3..94864fb3b271 100644
--- a/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix
@@ -11,13 +11,13 @@
 buildHomeAssistantComponent rec {
   owner = "pymitsubishi";
   domain = "mitsubishi";
-  version = "0.5.5";
+  version = "0.5.6";
 
   src = fetchFromGitHub {
     owner = "pymitsubishi";
     repo = "homeassistant-mitsubishi";
     tag = "v${version}";
-    hash = "sha256-qP2jLkDeiNMdTlHg0G8AryRb2v0ohGnkIoQWIWvbTbs=";
+    hash = "sha256-F9T2egZEEUrXYgPmYFwHO+WasYwbgoHtUZf4RFar9Ck=";
   };
 
   dependencies = [

From 4dd829b7bb52e4721dba3a0ca540135acde45729 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jun 2026 06:41:44 +0000
Subject: [PATCH 49/66] ddcutil-service: 1.0.14 -> 1.0.15

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

diff --git a/pkgs/by-name/dd/ddcutil-service/package.nix b/pkgs/by-name/dd/ddcutil-service/package.nix
index 497ddc511397..0eb2febe4aee 100644
--- a/pkgs/by-name/dd/ddcutil-service/package.nix
+++ b/pkgs/by-name/dd/ddcutil-service/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ddcutil-service";
-  version = "1.0.14";
+  version = "1.0.15";
 
   src = fetchFromGitHub {
     owner = "digitaltrails";
     repo = "ddcutil-service";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-IZ6s9z0zxMZT7qd+yuQJGLnKc1WISIvhJlIGsM/Dw3w=";
+    hash = "sha256-r66Ua+4jGl1wFEX3RoRHN60GujNApGbDHtJnVDtP3Z4=";
   };
 
   nativeBuildInputs = [

From 0bf2a9a9e8732d9c601affc06d308c899b6fac20 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jun 2026 06:42:53 +0000
Subject: [PATCH 50/66] roslyn-ls: 5.7.0-1.26220.12 -> 5.8.0-1.26262.9

---
 pkgs/by-name/ro/roslyn-ls/deps.json   | 42 +++++++++++++--------------
 pkgs/by-name/ro/roslyn-ls/package.nix |  6 ++--
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pkgs/by-name/ro/roslyn-ls/deps.json b/pkgs/by-name/ro/roslyn-ls/deps.json
index 5b106ea95e4b..d0e8ecefd297 100644
--- a/pkgs/by-name/ro/roslyn-ls/deps.json
+++ b/pkgs/by-name/ro/roslyn-ls/deps.json
@@ -79,9 +79,9 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
-    "version": "5.7.0-1.26215.121",
-    "hash": "sha256-91me6S6uT9wAM5stwzWc86ilPnVGxuWPg0WeCdhbIRs=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/5.7.0-1.26215.121/microsoft.codeanalysis.bannedapianalyzers.5.7.0-1.26215.121.nupkg"
+    "version": "5.7.0-1.26227.104",
+    "hash": "sha256-AKe8YV9hIgC8SSQ43ve3cdYGjJJOFU3H5I8psUlPZ94=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/5.7.0-1.26227.104/microsoft.codeanalysis.bannedapianalyzers.5.7.0-1.26227.104.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.Common",
@@ -103,9 +103,9 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.PublicApiAnalyzers",
-    "version": "5.7.0-1.26215.121",
-    "hash": "sha256-RwRhXL8XuRypKne2WEH5xm05AePSJcH2LGBF4kwDMH0=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/5.7.0-1.26215.121/microsoft.codeanalysis.publicapianalyzers.5.7.0-1.26215.121.nupkg"
+    "version": "5.7.0-1.26227.104",
+    "hash": "sha256-xsfLYDo5tdRJNjyRvvr5TA/yM2qicxwZ9m7DYZfd4Rg=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/5.7.0-1.26227.104/microsoft.codeanalysis.publicapianalyzers.5.7.0-1.26227.104.nupkg"
   },
   {
     "pname": "Microsoft.CSharp",
@@ -121,15 +121,15 @@
   },
   {
     "pname": "Microsoft.DotNet.Arcade.Sdk",
-    "version": "10.0.0-beta.26208.4",
-    "hash": "sha256-2IyF5OTwwHaOdpvoZK4hI/uXksNozsspxdg8dP8FeWM=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/10.0.0-beta.26208.4/microsoft.dotnet.arcade.sdk.10.0.0-beta.26208.4.nupkg"
+    "version": "10.0.0-beta.26257.4",
+    "hash": "sha256-SMGV9wBaog3i0bHH0OCNw9s+t418+xhqVvRSBFugHJI=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/10.0.0-beta.26257.4/microsoft.dotnet.arcade.sdk.10.0.0-beta.26257.4.nupkg"
   },
   {
     "pname": "Microsoft.DotNet.XliffTasks",
-    "version": "10.0.0-beta.26208.4",
-    "hash": "sha256-ZGH2bAXTyc0dVJwrPNZrcLEeD0pyKo/9M5p1w/hx0oE=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/10.0.0-beta.26208.4/microsoft.dotnet.xlifftasks.10.0.0-beta.26208.4.nupkg"
+    "version": "10.0.0-beta.26257.4",
+    "hash": "sha256-0SyzThHnzmWcY7hiiw4LgrjV67YxerOvT+pZkRyehe4=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/10.0.0-beta.26257.4/microsoft.dotnet.xlifftasks.10.0.0-beta.26257.4.nupkg"
   },
   {
     "pname": "Microsoft.Extensions.Configuration",
@@ -433,9 +433,9 @@
   },
   {
     "pname": "Roslyn.Diagnostics.Analyzers",
-    "version": "5.7.0-1.26215.121",
-    "hash": "sha256-24oGYM1xHKZHKr0a5d/pAC5d6dIwCsWqq3Ykx6VziWU=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/roslyn.diagnostics.analyzers/5.7.0-1.26215.121/roslyn.diagnostics.analyzers.5.7.0-1.26215.121.nupkg"
+    "version": "5.7.0-1.26227.104",
+    "hash": "sha256-b5++ZAtq5ZsKDuSPkH7P8lWlQn38lSIXhLThiS5/R/A=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/roslyn.diagnostics.analyzers/5.7.0-1.26227.104/roslyn.diagnostics.analyzers.5.7.0-1.26227.104.nupkg"
   },
   {
     "pname": "SQLitePCLRaw.bundle_green",
@@ -499,9 +499,9 @@
   },
   {
     "pname": "System.CommandLine",
-    "version": "3.0.0-preview.4.26215.121",
-    "hash": "sha256-GJjEBeXmrAwXeGfXjJ4GFeFVdKvdAgIMzOhR0svAH2o=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/3.0.0-preview.4.26215.121/system.commandline.3.0.0-preview.4.26215.121.nupkg"
+    "version": "3.0.0-preview.5.26227.104",
+    "hash": "sha256-J8JFd0mMtcCi1L6u6mpFrnu0I/4iLuaPPdwlxHqrqjc=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/3.0.0-preview.5.26227.104/system.commandline.3.0.0-preview.5.26227.104.nupkg"
   },
   {
     "pname": "System.ComponentModel.Composition",
@@ -661,9 +661,9 @@
   },
   {
     "pname": "System.Security.Cryptography.Pkcs",
-    "version": "8.0.0",
-    "hash": "sha256-yqfIIeZchsII2KdcxJyApZNzxM/VKknjs25gDWlweBI=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.pkcs/8.0.0/system.security.cryptography.pkcs.8.0.0.nupkg"
+    "version": "8.0.1",
+    "hash": "sha256-KMNIkJ3yQ/5O6WIhPjyAIarsvIMhkp26A6aby5KkneU=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.pkcs/8.0.1/system.security.cryptography.pkcs.8.0.1.nupkg"
   },
   {
     "pname": "System.Security.Cryptography.ProtectedData",
diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix
index 0d70848f0623..15c2f7232bfd 100644
--- a/pkgs/by-name/ro/roslyn-ls/package.nix
+++ b/pkgs/by-name/ro/roslyn-ls/package.nix
@@ -38,18 +38,18 @@ in
 buildDotnetModule (finalAttrs: {
   inherit pname dotnet-sdk dotnet-runtime;
 
-  vsVersion = "2.136.19-prerelease";
+  vsVersion = "2.142.16-prerelease";
   src = fetchFromGitHub {
     owner = "dotnet";
     repo = "roslyn";
     rev = "VSCode-CSharp-${finalAttrs.vsVersion}";
-    hash = "sha256-xBxWBh4J8NJWQUDGdVLf/vXz0UTFP8q/2VoN9r55kvc=";
+    hash = "sha256-aErsCXA8SiR41QVz2ePcn85qAyCcoAKV4vog6L7x+8E=";
   };
 
   # versioned independently from vscode-csharp
   # "roslyn" in here:
   # https://github.com/dotnet/vscode-csharp/blob/main/package.json
-  version = "5.7.0-1.26220.12";
+  version = "5.8.0-1.26262.9";
   projectFile = "src/LanguageServer/${project}/${project}.csproj";
   useDotnetFromEnv = true;
   nugetDeps = ./deps.json;

From 185d2cf532e64b13615ead97561449fd99b1ff32 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jun 2026 06:46:38 +0000
Subject: [PATCH 51/66] dq: 20251001 -> 20260601

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

diff --git a/pkgs/by-name/dq/dq/package.nix b/pkgs/by-name/dq/dq/package.nix
index f43d7b08e4e5..ae9db4717ede 100644
--- a/pkgs/by-name/dq/dq/package.nix
+++ b/pkgs/by-name/dq/dq/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dq";
-  version = "20251001";
+  version = "20260601";
 
   src = fetchFromGitHub {
     owner = "janmojzis";
     repo = "dq";
     tag = finalAttrs.version;
-    hash = "sha256-+3NGtHx9DI7s3V8aIJkW25apYAoFuLuiQ4TGsr981c8=";
+    hash = "sha256-hXDRmCtQuRWk9bViffjojaDf2S57HlHBBobuLFC9nzM=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From 375f5c0b2b7b2cf01d2725ed532cf74c52ef324d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Plagborg=20Bak=20S=C3=B8rensen?=
 <kristoffer.plagborgbak.soerensen@beumer.com>
Date: Mon, 1 Jun 2026 09:11:01 +0200
Subject: [PATCH 52/66] yaziPlugins.yatline-created-time: init at
 0-unstable-2025-09-04

---
 .../plugins/yatline-created-time/default.nix  | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 pkgs/by-name/ya/yazi/plugins/yatline-created-time/default.nix

diff --git a/pkgs/by-name/ya/yazi/plugins/yatline-created-time/default.nix b/pkgs/by-name/ya/yazi/plugins/yatline-created-time/default.nix
new file mode 100644
index 000000000000..8066350696b3
--- /dev/null
+++ b/pkgs/by-name/ya/yazi/plugins/yatline-created-time/default.nix
@@ -0,0 +1,23 @@
+{
+  lib,
+  fetchFromGitHub,
+  mkYaziPlugin,
+}:
+mkYaziPlugin {
+  pname = "yatline-created-time.yazi";
+  version = "0-unstable-2025-09-04";
+
+  src = fetchFromGitHub {
+    owner = "wekauwau";
+    repo = "yatline-created-time.yazi";
+    rev = "7cd5e216554b0d6fcfd04bcde617726194a110ba";
+    hash = "sha256-yhm/tzRHBL011Gp+bOqT+Ck/0BcR5smo49Gqfv0L3oI=";
+  };
+
+  meta = {
+    description = "An addon to display the creation time of file or folder in your yatline.yazi";
+    homepage = "https://github.com/wekauwau/yatline-created-time.yazi";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kpbaks ];
+  };
+}

From 431d3833863cc5c6c689f638548fe9ef9d0749aa Mon Sep 17 00:00:00 2001
From: Chloe A <chloe@sapphic.moe>
Date: Mon, 1 Jun 2026 12:18:41 +0500
Subject: [PATCH 53/66] nsis: unbreak on darwin

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

diff --git a/pkgs/by-name/ns/nsis/package.nix b/pkgs/by-name/ns/nsis/package.nix
index 05e25a5ed97d..0538abab156b 100644
--- a/pkgs/by-name/ns/nsis/package.nix
+++ b/pkgs/by-name/ns/nsis/package.nix
@@ -4,6 +4,8 @@
   symlinkJoin,
   fetchurl,
   fetchzip,
+  makeWrapper,
+  runCommand,
   scons,
   zlib,
   libiconv,
@@ -29,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
     chmod -R u+w $out/share/nsis
   '';
 
-  nativeBuildInputs = [ scons ];
+  nativeBuildInputs = [ scons ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ];
   buildInputs = [ zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
   env = {
@@ -67,6 +69,36 @@ stdenv.mkDerivation (finalAttrs: {
   prefixKey = "PREFIX=";
   installTargets = [ "install-compiler" ];
 
+  # NSIS can crash when compiling Unicode installers under non-UTF-8 locales on macOS
+  # see https://sourceforge.net/p/nsis/bugs/1165/ for more info
+  # code adapted from the makensis formulae in Homebrew
+  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    wrapProgram $out/bin/makensis \
+      --run '
+        case "''${LC_ALL:-}" in
+          *UTF-8*|*utf8*) ;;
+          "")
+            case "''${LC_CTYPE:-} ''${LANG:-}" in
+              *UTF-8*|*utf8*) ;;
+              *) export LC_ALL=en_US.UTF-8 ;;
+            esac
+            ;;
+          *) export LC_ALL=en_US.UTF-8 ;;
+        esac
+      '
+  '';
+
+  passthru.tests = {
+    compile-bigtest =
+      runCommand "nsis-compile-bigtest" { nativeBuildInputs = [ finalAttrs.finalPackage ]; }
+        ''
+          pushd ${finalAttrs.srcWinDistributable}/Examples >/dev/null
+          makensis bigtest.nsi "-XOutfile /dev/null"
+          popd >/dev/null
+          touch $out
+        '';
+  };
+
   meta = {
     description = "Free scriptable win32 installer/uninstaller system that doesn't suck and isn't huge";
     homepage = "https://nsis.sourceforge.io/";
@@ -74,6 +106,5 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ pombeirp ];
     mainProgram = "makensis";
-    broken = stdenv.hostPlatform.isDarwin;
   };
 })

From 68be53ef08b8358cf768d26e854ec97dd9a98fe8 Mon Sep 17 00:00:00 2001
From: jaredmontoya <49511278+jaredmontoya@users.noreply.github.com>
Date: Wed, 20 May 2026 22:01:44 +0200
Subject: [PATCH 54/66] whichllm: init at 0.5.7

---
 pkgs/by-name/wh/whichllm/package.nix | 55 ++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 pkgs/by-name/wh/whichllm/package.nix

diff --git a/pkgs/by-name/wh/whichllm/package.nix b/pkgs/by-name/wh/whichllm/package.nix
new file mode 100644
index 000000000000..8bdf145dd472
--- /dev/null
+++ b/pkgs/by-name/wh/whichllm/package.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  versionCheckHook,
+}:
+
+python3Packages.buildPythonApplication (finalAttrs: {
+  pname = "whichllm";
+  version = "0.5.7";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "Andyyyy64";
+    repo = "whichllm";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-UvhCSC9tKpdgXFCMGn0HWM0kuHhXSauEr/ys/9PUIRs=";
+  };
+
+  build-system = with python3Packages; [ hatchling ];
+
+  dependencies =
+    with python3Packages;
+    [
+      dbgpu
+      httpx
+      nvidia-ml-py
+      psutil
+      rich
+      typer
+    ]
+    ++ python3Packages.dbgpu.optional-dependencies.fuzz;
+
+  nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
+
+  disabledTests = [
+    # require network access
+    "test_plan_no_model_found_shows_error"
+    "test_snippet_no_model_found"
+  ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  pythonImportsCheck = [ "whichllm" ];
+
+  meta = {
+    description = "Find the local LLM that actually runs and performs best on your hardware. Ranked by real, recency-aware benchmarks, not parameter count. One command, run it instantly";
+    homepage = "https://github.com/Andyyyy64/whichllm";
+    changelog = "https://github.com/Andyyyy64/whichllm/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jaredmontoya ];
+    mainProgram = "whichllm";
+  };
+})

From eaa0626624e49c4e089f5d56173213c6862cf752 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jun 2026 07:28:57 +0000
Subject: [PATCH 55/66] openapi-python-client: 0.28.4 -> 0.29.0

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

diff --git a/pkgs/by-name/op/openapi-python-client/package.nix b/pkgs/by-name/op/openapi-python-client/package.nix
index 3a0a86ccec4b..4576c937c365 100644
--- a/pkgs/by-name/op/openapi-python-client/package.nix
+++ b/pkgs/by-name/op/openapi-python-client/package.nix
@@ -11,7 +11,7 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "openapi-python-client";
-  version = "0.28.4";
+  version = "0.29.0";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     owner = "openapi-generators";
     repo = "openapi-python-client";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-YwEF7ZJzxAznGoxZDGYGVUkwQo8AD+tDMl2s2Yplvek=";
+    hash = "sha256-TxLwRi7zoFO5ejYLXllprxkiEbRtvidqjzLLpQOuQG8=";
   };
 
   nativeBuildInputs = [

From a132e8df037d29e84de905d128985eee508c808e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jun 2026 07:30:18 +0000
Subject: [PATCH 56/66] python3Packages.cuda-pathfinder: 1.5.4 -> 1.5.5

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

diff --git a/pkgs/development/python-modules/cuda-pathfinder/default.nix b/pkgs/development/python-modules/cuda-pathfinder/default.nix
index d70070d20644..ce922a403f35 100644
--- a/pkgs/development/python-modules/cuda-pathfinder/default.nix
+++ b/pkgs/development/python-modules/cuda-pathfinder/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "cuda-pathfinder";
-  version = "1.5.4";
+  version = "1.5.5";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -22,7 +22,7 @@ buildPythonPackage (finalAttrs: {
     owner = "NVIDIA";
     repo = "cuda-python";
     tag = "cuda-pathfinder-v${finalAttrs.version}";
-    hash = "sha256-0hUcc9jZooN7yQ63MJhpNJb1IyfwwTRbp4NjjbK4y1A=";
+    hash = "sha256-hvCwN6uLGiZLdAholFy3Jqb+ys7mAqVNc9UonPXm3+M=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/cuda_pathfinder";

From 3bc337a56243179812469f428d59d600a85a3614 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 29 May 2026 15:54:57 +0000
Subject: [PATCH 57/66] python3Packages.flash-attn-4: init at 4.0.0.beta15

Co-authored-by: Sizhe Zhao <prc.zhao@outlook.com>
---
 .../python-modules/flash-attn-4/default.nix   | 68 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 70 insertions(+)
 create mode 100644 pkgs/development/python-modules/flash-attn-4/default.nix

diff --git a/pkgs/development/python-modules/flash-attn-4/default.nix b/pkgs/development/python-modules/flash-attn-4/default.nix
new file mode 100644
index 000000000000..072f4a43ad16
--- /dev/null
+++ b/pkgs/development/python-modules/flash-attn-4/default.nix
@@ -0,0 +1,68 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+  setuptools-scm,
+
+  # dependencies
+  apache-tvm-ffi,
+  cuda-bindings,
+  einops,
+  nvidia-cutlass-dsl,
+  quack-kernels,
+  torch,
+  torch-c-dlpack-ext,
+}:
+buildPythonPackage (finalAttrs: {
+  pname = "flash-attn-4";
+  version = "4.0.0.beta15";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "Dao-AILab";
+    repo = "flash-attention";
+    tag = "fa4-v${finalAttrs.version}";
+    hash = "sha256-k6158mEJocKIRS4MQIM+Ih4VMHnXCKJGcykZFi91J2w=";
+  };
+
+  # FA4 is a separate distribution shipped under flash_attn/cute/ with its own pyproject.toml.
+  # The top-level setup.py builds the classic compiled flash-attn and excludes flash_attn.cute.
+  sourceRoot = "${finalAttrs.src.name}/flash_attn/cute";
+
+  env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    apache-tvm-ffi
+    cuda-bindings
+    einops
+    nvidia-cutlass-dsl
+    quack-kernels
+    torch
+    torch-c-dlpack-ext
+  ];
+
+  pythonImportsCheck = [ "flash_attn.cute" ];
+
+  # No tests
+  doCheck = false;
+
+  meta = {
+    description = "CuTeDSL-based implementation of FlashAttention for Hopper and Blackwell GPUs";
+    homepage = "https://github.com/Dao-AILab/flash-attention/tree/main/flash_attn/cute";
+    changelog = "https://github.com/Dao-AILab/flash-attention/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
+      GaetanLepage
+      prince213
+    ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 40dfc6372763..ffe1520697b8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5705,6 +5705,8 @@ self: super: with self; {
 
   flash-attn = callPackage ../development/python-modules/flash-attn { };
 
+  flash-attn-4 = callPackage ../development/python-modules/flash-attn-4 { };
+
   flash-mla = callPackage ../development/python-modules/flash-mla { };
 
   flashinfer = callPackage ../development/python-modules/flashinfer { };

From 40c5aac39ed571e3f53736861fa6b7e973e89d5e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jun 2026 08:27:01 +0000
Subject: [PATCH 58/66] home-assistant-custom-components.emporia_vue: 0.12.0 ->
 0.12.1

---
 .../home-assistant/custom-components/emporia_vue/package.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix b/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix
index d2859e1b8342..cda6f31556be 100644
--- a/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "magico13";
   domain = "emporia_vue";
-  version = "0.12.0";
+  version = "0.12.1";
 
   src = fetchFromGitHub {
     owner = "magico13";
     repo = "ha-emporia-vue";
     rev = "v${version}";
-    hash = "sha256-6VeyKmFKbBG6MgQqylkTg1blZJlBKBWYdkUmCYyEV2I=";
+    hash = "sha256-kdTM5keDxRNz46uwq+tXIv7Hz80lxmbQVVzk7bmRm1w=";
   };
 
   dependencies = [

From f14c7c2af936164128e90ea4f17421740606efbd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 May 2026 18:34:26 +0000
Subject: [PATCH 59/66] python3Packages.pytorch-tokenizers: 1.2.0 -> 1.3.0

---
 .../pytorch-tokenizers/default.nix              | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytorch-tokenizers/default.nix b/pkgs/development/python-modules/pytorch-tokenizers/default.nix
index 842cef4a1697..55e789733d5c 100644
--- a/pkgs/development/python-modules/pytorch-tokenizers/default.nix
+++ b/pkgs/development/python-modules/pytorch-tokenizers/default.nix
@@ -30,15 +30,16 @@ let
 in
 buildPythonPackage (finalAttrs: {
   pname = "pytorch-tokenizers";
-  version = "1.2.0";
+  version = "1.3.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "meta-pytorch";
     repo = "tokenizers";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-4VWOKCdRx1VpYoJq7LYfpdcAAQeHnLD5mxI65XrrEHs=";
+    hash = "sha256-1G6mDUSwy4KXKgdtEimj9rrQDonGHdo8R8DvPQppvwE=";
   };
 
   patches = [
@@ -62,6 +63,17 @@ buildPythonPackage (finalAttrs: {
   ];
   dontUseCmakeConfigure = true;
 
+  # pkgs/by-name/cm/cmake/setup-hook.sh
+  preBuild = ''
+    if ! [[ -v enableParallelBuilding ]]; then
+        enableParallelBuilding=1
+        echo "cmake: enabled parallel building"
+    fi
+    if [[ "$enableParallelBuilding" -ne 0 ]]; then
+        export CMAKE_BUILD_PARALLEL_LEVEL=$NIX_BUILD_CORES
+    fi
+  '';
+
   dependencies = [
     sentencepiece
     tiktoken
@@ -90,6 +102,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "C++ implementations for various tokenizers (sentencepiece, tiktoken, etc.)";
     homepage = "https://github.com/meta-pytorch/tokenizers";
+    changelog = "https://github.com/meta-pytorch/tokenizers/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ GaetanLepage ];
   };

From fd4751d20990947d38a9b2d7ea3210f2a795a38c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 31 May 2026 22:52:50 +0000
Subject: [PATCH 60/66] python3Packages.executorch: patch failing test

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

diff --git a/pkgs/development/python-modules/executorch/default.nix b/pkgs/development/python-modules/executorch/default.nix
index 16c5f2255d10..c727a336c17e 100644
--- a/pkgs/development/python-modules/executorch/default.nix
+++ b/pkgs/development/python-modules/executorch/default.nix
@@ -102,6 +102,12 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
 
       sed -i "1i #include <cstdint>" backends/apple/coreml/runtime/inmemoryfs/memory_buffer.hpp
       sed -i "1i #include <cstdint>" extension/llm/tokenizers/third-party/sentencepiece/src/sentencepiece_processor.h
+    ''
+    + ''
+      substituteInPlace extension/llm/tokenizers/test/test_python_bindings.py \
+        --replace-fail \
+          'self.assertEqual(pytorch_tokenizers.__version__, "0.1.0")' \
+          'self.assertEqual(pytorch_tokenizers.__version__, "${pytorch-tokenizers.version}")'
     '';
 
   env = {

From 606dda60e029e775009bee63cedd34f1a129ce63 Mon Sep 17 00:00:00 2001
From: BatteredBunny <ayes2022@protonmail.com>
Date: Mon, 1 Jun 2026 13:20:41 +0300
Subject: [PATCH 61/66] svnfs: drop

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

diff --git a/pkgs/by-name/sv/svnfs/package.nix b/pkgs/by-name/sv/svnfs/package.nix
deleted file mode 100644
index a6a9e5e148ea..000000000000
--- a/pkgs/by-name/sv/svnfs/package.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  autoreconfHook,
-  subversion,
-  fuse,
-  apr,
-  perl,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "svnfs";
-  version = "0.4";
-
-  src = fetchurl {
-    url = "http://www.jmadden.eu/wp-content/uploads/svnfs/svnfs-${finalAttrs.version}.tgz";
-    sha256 = "1lrzjr0812lrnkkwk60bws9k1hq2iibphm0nhqyv26axdsygkfky";
-  };
-
-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [
-    subversion
-    fuse
-    apr
-    perl
-  ];
-
-  # autoconf's AC_CHECK_HEADERS and AC_CHECK_LIBS fail to detect libfuse on
-  # Darwin if FUSE_USE_VERSION isn't set at configure time.
-  #
-  # NOTE: Make sure the value of FUSE_USE_VERSION specified here matches the
-  # actual version used in the source code:
-  #
-  #     $ tar xf "$(nix-build -A svnfs.src)"
-  #     $ grep -R FUSE_USE_VERSION
-  configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "CFLAGS=-DFUSE_USE_VERSION=25" ];
-
-  # why is this required?
-  preConfigure = ''
-    export LD_LIBRARY_PATH=${subversion.out}/lib
-  '';
-
-  env = {
-    # -fcommon: workaround build failure on -fno-common toolchains like upstream
-    # gcc-10. Otherwise build fails as:
-    #   ld: svnclient.o:/build/svnfs-0.4/src/svnfs.h:40: multiple definition of
-    #     `dirbuf'; svnfs.o:/build/svnfs-0.4/src/svnfs.h:40: first defined here
-    NIX_CFLAGS_COMPILE = toString [
-      "-I ${subversion.dev}/include/subversion-1"
-      "-fcommon"
-    ];
-    NIX_LDFLAGS = toString [
-      "-lsvn_client-1"
-      "-lsvn_subr-1"
-    ];
-  };
-
-  meta = {
-    description = "FUSE filesystem for accessing Subversion repositories";
-    homepage = "https://www.jmadden.eu/index.php/svnfs/";
-    license = lib.licenses.gpl2Only;
-    maintainers = [ ];
-    platforms = lib.platforms.unix;
-    mainProgram = "svnfs";
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index bc8ede1d87e7..edd35552959c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2057,6 +2057,7 @@ mapAliases {
   superTux = warnAlias "'superTux' has been renamed to 'supertux'" supertux; # Added 2026-02-12
   superTuxKart = warnAlias "'superTuxKart' has been renamed to 'supertuxkart'" supertuxkart; # Added 2026-02-12
   surge-XT = warnAlias "'surge-XT' has been renamed to 'surge-xt'" surge-xt; # Added 2026-02-12
+  svnfs = throw "'svnfs' has been removed as it was unmaintained upstream"; # Added 2026-06-01
   svox = warnAlias "'svox' has been renamed to/replaced by 'picotts'" picotts; # Added 2026-03-04
   svt-av1-psy = warnAlias "'svt-av1-psy' has been replaced by 'svt-av1-psyex'" svt-av1-psyex; # Added 2026-01-10
   swagger-cli = throw "'swagger-cli' has been removed as it is broken and unmaintained. Upstream suggests using 'redocly' instead"; # Added 2026-04-23

From c1f4b82c3f521a8e0d9d9947c5d64c454adcd450 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 27 May 2026 20:26:23 +0200
Subject: [PATCH 62/66] strichliste: 2.0.1 -> 2.1.0

https://github.com/strichliste/strichliste/releases/tag/v2.1.0
https://github.com/strichliste/strichliste-web-frontend/releases/tag/v2.1.0

Co-Authored-By: Micha Ober <git@ober-mail.de>
---
 .../modules/services/web-apps/strichliste.nix | 38 +++++++++++--------
 pkgs/by-name/st/strichliste/frontend.nix      |  8 ++--
 pkgs/by-name/st/strichliste/package.nix       |  8 ++--
 3 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/nixos/modules/services/web-apps/strichliste.nix b/nixos/modules/services/web-apps/strichliste.nix
index 4f7db7cd31da..e32a2a169169 100644
--- a/nixos/modules/services/web-apps/strichliste.nix
+++ b/nixos/modules/services/web-apps/strichliste.nix
@@ -246,6 +246,16 @@ in
               };
             };
 
+            splitInvoice = {
+              enabled = mkOption {
+                type = types.bool;
+                default = true;
+                description = ''
+                  Whether to allow splitting invoices.
+                '';
+              };
+            };
+
             transaction = {
               enabled = mkOption {
                 type = types.bool;
@@ -464,26 +474,22 @@ in
         wants = unitDependencies;
         after = unitDependencies;
         inherit (cfg) environment;
-        preStart = ''
-          set -ex
-          if [ ! -e "/var/lib/strichliste/.db-init" ]; then
-            ${lib.optionalString (lib.hasInfix "sqlite" cfg.environment.DATABASE_URL) ''
-              ${lib.getExe cfg.packages.backend} doctrine:database:create
-            ''}
-            ${lib.getExe cfg.packages.backend} doctrine:schema:create
-            touch "/var/lib/strichliste/.db-init"
-          fi
-        '';
         serviceConfig = {
-          Type = "exec";
+          Type = "oneshot";
           User = "strichliste";
           Group = "strichliste";
           EnvironmentFile = cfg.environmentFiles;
-          ExecStart = toString [
-            (lib.getExe cfg.packages.backend)
-            "doctrine:migrations:migrate"
-            "--allow-no-migration"
-            "--no-interaction"
+          ExecStart = map toString [
+            [
+              (lib.getExe cfg.packages.backend)
+              "cache:clear"
+            ]
+            [
+              (lib.getExe cfg.packages.backend)
+              "doctrine:migrations:migrate"
+              "--allow-no-migration"
+              "--no-interaction"
+            ]
           ];
         };
       };
diff --git a/pkgs/by-name/st/strichliste/frontend.nix b/pkgs/by-name/st/strichliste/frontend.nix
index a30c4fff3766..21c37325772f 100644
--- a/pkgs/by-name/st/strichliste/frontend.nix
+++ b/pkgs/by-name/st/strichliste/frontend.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "strichliste-frontend";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "strichliste";
     repo = "strichliste-web-frontend";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fi4pz3ylWyC4yvDWsK2Rvv8KDaXeHNVz0jY6PpF07hE=";
+    hash = "sha256-LzTdFYuIIFmAVuHtGjljqSBZGEPibwXcK5WuYB6ELNg=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
@@ -39,5 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   __structuredAttrs = true;
 
-  inherit meta;
+  meta = meta // {
+    changelog = "https://github.com/strichliste/strichliste-web-frontend/releases/tag/${finalAttrs.src.tag}";
+  };
 })
diff --git a/pkgs/by-name/st/strichliste/package.nix b/pkgs/by-name/st/strichliste/package.nix
index d26d2dfef174..f81fceed7452 100644
--- a/pkgs/by-name/st/strichliste/package.nix
+++ b/pkgs/by-name/st/strichliste/package.nix
@@ -9,17 +9,18 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "strichliste-backend";
-  version = "2.0.1";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "strichliste";
     repo = "strichliste-backend";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yI20cUp19ehtOnWdu+MItwgOlNDnt1VK3giInaTQQ4Y=";
+    hash = "sha256-ps0IJBXVchPaW2Tx4rfD02EFYiv3oTyaNB6/V7txeM0=";
   };
 
-  vendorHash = "sha256-vYPjUaNIf62GoKXopC4nGqIa+Z3C8Q5dnX9FPvM1Ers=";
+  vendorHash = "sha256-PLq+XiZIJyyzVq+87timGO/jbPB4ZYQqSZilZMIE4Cw=";
   composerNoDev = true;
+  composerNoPlugins = false;
   composerStrictValidation = false;
 
   postPatch = ''
@@ -45,6 +46,7 @@ php.buildComposerProject2 (finalAttrs: {
   };
 
   meta = {
+    changelog = "https://github.com/strichliste/strichliste/releases/tag/${finalAttrs.src.tag}";
     description = "strichliste is a tool to replace a tally sheet.";
     homepage = "https://www.strichliste.org/";
     license = lib.licenses.mit;

From 1f56fbcf9c7ee5af57804778a4f44f9393f1a41e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 1 Jun 2026 13:24:05 +0200
Subject: [PATCH 63/66] nixos/tests/strichliste: migrate to nspawn container

---
 nixos/tests/web-apps/strichliste.nix | 66 ++++++++++++++--------------
 1 file changed, 32 insertions(+), 34 deletions(-)

diff --git a/nixos/tests/web-apps/strichliste.nix b/nixos/tests/web-apps/strichliste.nix
index 36c3617af50e..71ff7fa20479 100644
--- a/nixos/tests/web-apps/strichliste.nix
+++ b/nixos/tests/web-apps/strichliste.nix
@@ -7,38 +7,36 @@
   name = "strichliste";
   meta.maintainers = pkgs.strichliste.meta.maintainers;
 
-  nodes = {
-    server =
-      { config, ... }:
-      {
-        networking.extraHosts = ''
-          127.0.0.1 strichliste.local
-        '';
+  containers.server =
+    { config, ... }:
+    {
+      networking.extraHosts = ''
+        127.0.0.1 strichliste.local
+      '';
 
-        environment.systemPackages = with pkgs; [ httpie ];
+      environment.systemPackages = with pkgs; [ httpie ];
 
-        time.timeZone = "Europe/Berlin";
+      time.timeZone = "Europe/Berlin";
 
-        services.strichliste = {
-          enable = true;
-          domain = "strichliste.local";
-          environmentFiles = [
-            (pkgs.writeText "strichliste-secret.env" ''
-              APP_SECRET=changemechangemechangeme
-            '')
-          ];
-          settings = {
-            i18n = {
-              currency = {
-                alpha3 = "EUR";
-                name = "Euro";
-                symbol = "€";
-              };
+      services.strichliste = {
+        enable = true;
+        domain = "strichliste.local";
+        environmentFiles = [
+          (pkgs.writeText "strichliste-secret.env" ''
+            APP_SECRET=changemechangemechangeme
+          '')
+        ];
+        settings = {
+          i18n = {
+            currency = {
+              alpha3 = "EUR";
+              name = "Euro";
+              symbol = "€";
             };
           };
         };
       };
-  };
+    };
 
   testScript =
     {
@@ -52,12 +50,12 @@
       start_all()
 
       def get_users():
-        response = server.succeed("http --check-status http://strichliste.local/api/user")
+        response = server.succeed("http --ignore-stdin --check-status http://strichliste.local/api/user")
         users = json.loads(response)["users"]
         return users
 
       def get_user(uid: int):
-        response = server.succeed(f"http --check-status http://strichliste.local/api/user/{uid}")
+        response = server.succeed(f"http --ignore-stdin --check-status http://strichliste.local/api/user/{uid}")
         user = json.loads(response)["user"]
         return user
 
@@ -67,7 +65,7 @@
           t.assertEqual(len(users), 0, "Strichliste must not have users.")
 
         with subtest("Create user"):
-          server.succeed("http --check-status post http://strichliste.local/api/user name=Alice")
+          server.succeed("http --ignore-stdin --check-status post http://strichliste.local/api/user name=Alice")
           users = get_users()
           t.assertEqual(len(users), 1, "Strichliste must have exactly one user.")
 
@@ -77,27 +75,27 @@
           t.assertEqual(user["balance"], 0, "New users should have a balance of 0")
 
         with subtest("Deposit money"):
-          server.succeed("http --check-status post http://strichliste.local/api/user/1/transaction amount=500")
+          server.succeed("http --ignore-stdin --check-status post http://strichliste.local/api/user/1/transaction amount=500")
           user = get_user(1)
           t.assertEqual(user["balance"], 500, "Balance must be 500 after depositing 500")
 
         with subtest("Dispense money"):
-          server.succeed("http --check-status post http://strichliste.local/api/user/1/transaction amount=-1000")
+          server.succeed("http --ignore-stdin --check-status post http://strichliste.local/api/user/1/transaction amount=-1000")
           user = get_user(1)
           t.assertEqual(user["balance"], -500, "Balance must be -500 after dispensing 1000")
 
         with subtest("Undo transaction"):
-          response = server.succeed("http --check-status post http://strichliste.local/api/user/1/transaction amount=7500")
+          response = server.succeed("http --ignore-stdin --check-status post http://strichliste.local/api/user/1/transaction amount=7500")
           transaction = json.loads(response)["transaction"]
-          server.succeed(f"http --check-status delete http://strichliste.local/api/user/1/transaction/{transaction['id']}")
+          server.succeed(f"http --ignore-stdin --check-status delete http://strichliste.local/api/user/1/transaction/{transaction['id']}")
 
       server.wait_for_unit("phpfpm-strichliste.service")
 
       # frontend
-      server.wait_until_succeeds("http --check-status http://strichliste.local/ | grep -q '<title>Strichliste</title>'")
+      server.wait_until_succeeds("http --ignore-stdin --check-status http://strichliste.local/ | grep -q '<title>Strichliste</title>'")
 
       # backend
-      server.wait_until_succeeds("http --check-status http://strichliste.local/api/settings")
+      server.wait_until_succeeds("http --ignore-stdin --check-status http://strichliste.local/api/settings")
 
       # sqlite
       test()

From 394b33b74aac26b3a97ebc9f43d464d7ee49f15e Mon Sep 17 00:00:00 2001
From: fe2-Nyxar <nyxar49@gmail.com>
Date: Sun, 31 May 2026 14:02:34 +0100
Subject: [PATCH 64/66] vimPlugins.harpoon-lualine: init at
 0-unstable-2025-07-28

https://github.com/letieu/harpoon-lualine
---
 .../applications/editors/vim/plugins/generated.nix | 14 ++++++++++++++
 .../applications/editors/vim/plugins/overrides.nix | 12 ++++++++----
 .../editors/vim/plugins/vim-plugin-names           |  1 +
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 2aad4186b645..b89387f9e6a6 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -7169,6 +7169,20 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  harpoon-lualine = buildVimPlugin {
+    pname = "harpoon-lualine";
+    version = "0-unstable-2025-07-28";
+    src = fetchFromGitHub {
+      owner = "letieu";
+      repo = "harpoon-lualine";
+      rev = "215c0847dfb787b19268f7b42eed83bdcf06b966";
+      hash = "sha256-HGbz/b2AVl8145BCy8I47dDrhBVMSQQIr+mWbOrmj5Q=";
+    };
+    meta.homepage = "https://github.com/letieu/harpoon-lualine/";
+    meta.license = unfree;
+    meta.hydraPlatforms = [ ];
+  };
+
   harpoon2 = buildVimPlugin {
     pname = "harpoon2";
     version = "0-unstable-2025-10-31";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index a1989d0e7c17..939e535fee1d 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -150,7 +150,6 @@ let
       }"
       overrides;
 in
-
 assertNoAdditions {
   # keep-sorted start case=no block=yes newline_separated=yes
   ack-vim = super.ack-vim.overrideAttrs (old: {
@@ -1579,7 +1578,6 @@ assertNoAdditions {
     ];
     dependencies = [ self.fzf-vim ];
     passthru = old.passthru // {
-
       initLua = "vim.g.hoogle_fzf_cache_file = vim.fn.stdpath('cache')..'/hoogle_cache.json";
     };
   });
@@ -1778,6 +1776,13 @@ assertNoAdditions {
     dependencies = [ self.plenary-nvim ];
   };
 
+  harpoon-lualine = super.harpoon-lualine.overrideAttrs {
+    dependencies = [
+      self.lualine-nvim
+      self.harpoon2
+    ];
+  };
+
   harpoon2 = super.harpoon2.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
     nvimSkipModules = [
@@ -4122,7 +4127,6 @@ assertNoAdditions {
           }
       '';
     };
-
   });
 
   rtorrent-syntax-file = super.rtorrent-syntax-file.overrideAttrs (old: {
@@ -4419,6 +4423,7 @@ assertNoAdditions {
       # the vim plugin expects evinceSync.py to be a python file, but it is a C wrapper
       pythonWrapper =
         writeText "evinceSync-wrapper.py" # python
+
           ''
             #!${python3}/bin/python3
             import os
@@ -4824,7 +4829,6 @@ assertNoAdditions {
        --replace-fail "['tinymist'] = nil," "tinymist = '${lib.getExe tinymist}'," \
        --replace-fail "['websocat'] = nil," "websocat = '${lib.getExe websocat}',"
     '';
-
   };
 
   unicode-vim =
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 9d98d2d27261..4137f19252af 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -510,6 +510,7 @@ https://github.com/TheSnakeWitcher/hardhat.nvim/,,
 https://github.com/m4xshen/hardtime.nvim/,,
 https://git.sr.ht/~sircmpwn/hare.vim,,
 https://github.com/ThePrimeagen/harpoon/,,
+https://github.com/letieu/harpoon-lualine/,,
 https://github.com/ThePrimeagen/harpoon/,harpoon2,harpoon2
 https://github.com/kiyoon/haskell-scope-highlighting.nvim/,,
 https://github.com/mrcjkb/haskell-snippets.nvim/,,

From 01d28de3cc2c70eae45a009537db63e2212ec011 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jun 2026 11:44:37 +0000
Subject: [PATCH 65/66] python3Packages.oelint-data: 1.5.1 -> 1.5.2

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

diff --git a/pkgs/development/python-modules/oelint-data/default.nix b/pkgs/development/python-modules/oelint-data/default.nix
index 49a93b0021d6..210e0b730448 100644
--- a/pkgs/development/python-modules/oelint-data/default.nix
+++ b/pkgs/development/python-modules/oelint-data/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "oelint-data";
-  version = "1.5.1";
+  version = "1.5.2";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: {
     owner = "priv-kweihmann";
     repo = "oelint-data";
     tag = finalAttrs.version;
-    hash = "sha256-9dsiyWVQ5FGspOXq9pyHatSfOtmOYKUP74CHDS7RoD8=";
+    hash = "sha256-M0vGXXoQvVW6801gWQ6gf6/Z/ZFzREfVlHD6pTyG7rU=";
   };
 
   build-system = [

From 8156552b3a8ad1f21b9d61ccb838ed355aeec830 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Mon, 1 Jun 2026 15:11:31 +0200
Subject: [PATCH 66/66] nodejs_26: 26.2.0 -> 26.3.0

---
 pkgs/development/web/nodejs/v26.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v26.nix b/pkgs/development/web/nodejs/v26.nix
index 7abb9b12f71f..930d8a474aa4 100644
--- a/pkgs/development/web/nodejs/v26.nix
+++ b/pkgs/development/web/nodejs/v26.nix
@@ -23,8 +23,8 @@ let
       [ ];
 in
 buildNodejs {
-  version = "26.2.0";
-  sha256 = "ea82be7db418f54b3ef153a02d44d4f6748466f4765ae80bc484f34af40df610";
+  version = "26.3.0";
+  sha256 = "319ad5d7d20cc622e55eb75b9f1a2546b77a08bd462b67030d0c89316c2c2349";
   patches =
     (
       if (stdenv.hostPlatform.emulatorAvailable buildPackages) then