From e0c6bed8b97edd1301d57df5d3a3bfe9bc40c043 Mon Sep 17 00:00:00 2001
From: Marc Fournier <marc.fournier@qoqa.com>
Date: Sun, 29 Mar 2026 16:03:33 +0200
Subject: [PATCH 01/71] granted: point to fwdcloudsec github org

Project maintenance has been transfered to the fwdcloudsec organisation.
See announcement: https://www.commonfate.io/blog/winding-down
---
 pkgs/by-name/gr/granted/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/gr/granted/package.nix b/pkgs/by-name/gr/granted/package.nix
index c1e1ee9b979c..4b0a99f54c79 100644
--- a/pkgs/by-name/gr/granted/package.nix
+++ b/pkgs/by-name/gr/granted/package.nix
@@ -14,7 +14,7 @@ buildGoModule (finalAttrs: {
   version = "0.38.0";
 
   src = fetchFromGitHub {
-    owner = "common-fate";
+    owner = "fwdcloudsec";
     repo = "granted";
     rev = "v${finalAttrs.version}";
     sha256 = "sha256-xHpYtHG0fJ/VvJ/4lJ90ept3yGzJRnmtFQFbYxJtxwY=";
@@ -27,11 +27,11 @@ buildGoModule (finalAttrs: {
   ldflags = [
     "-s"
     "-w"
-    "-X github.com/common-fate/granted/internal/build.Version=v${finalAttrs.version}"
-    "-X github.com/common-fate/granted/internal/build.Commit=${finalAttrs.src.rev}"
-    "-X github.com/common-fate/granted/internal/build.Date=1970-01-01-00:00:01"
-    "-X github.com/common-fate/granted/internal/build.BuiltBy=Nix"
-    "-X github.com/common-fate/granted/internal/build.ConfigFolderName=.granted"
+    "-X github.com/fwdcloudsec/granted/internal/build.Version=v${finalAttrs.version}"
+    "-X github.com/fwdcloudsec/granted/internal/build.Commit=${finalAttrs.src.rev}"
+    "-X github.com/fwdcloudsec/granted/internal/build.Date=1970-01-01-00:00:01"
+    "-X github.com/fwdcloudsec/granted/internal/build.BuiltBy=Nix"
+    "-X github.com/fwdcloudsec/granted/internal/build.ConfigFolderName=.granted"
   ];
 
   subPackages = [
@@ -87,8 +87,8 @@ buildGoModule (finalAttrs: {
 
   meta = {
     description = "Easiest way to access your cloud";
-    homepage = "https://github.com/common-fate/granted";
-    changelog = "https://github.com/common-fate/granted/releases/tag/${finalAttrs.version}";
+    homepage = "https://github.com/fwdcloudsec/granted";
+    changelog = "https://github.com/fwdcloudsec/granted/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       jlbribeiro

From 0b8f3faca8408c07184675af49f832f7de498706 Mon Sep 17 00:00:00 2001
From: Marc Fournier <marc.fournier@qoqa.com>
Date: Sun, 29 Mar 2026 16:08:00 +0200
Subject: [PATCH 02/71] granted: 0.38.0 -> 0.39.0

Diff: https://github.com/fwdcloudsec/granted/compare/v0.38.0...v0.39.0
Changelog: https://github.com/fwdcloudsec/granted/releases/tag/v0.39.0
---
 pkgs/by-name/gr/granted/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gr/granted/package.nix b/pkgs/by-name/gr/granted/package.nix
index 4b0a99f54c79..079eb7f6f6c3 100644
--- a/pkgs/by-name/gr/granted/package.nix
+++ b/pkgs/by-name/gr/granted/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "granted";
-  version = "0.38.0";
+  version = "0.39.0";
 
   src = fetchFromGitHub {
     owner = "fwdcloudsec";
     repo = "granted";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-xHpYtHG0fJ/VvJ/4lJ90ept3yGzJRnmtFQFbYxJtxwY=";
+    sha256 = "sha256-/5JP6laC+k+O8GWSl1eo0slqzYzYB86UF3irDX6Z0iQ=";
   };
 
-  vendorHash = "sha256-Y8g5495IYgQ2lvq5qbnQmoxwEYfzzx12KfMS6wF2QXE=";
+  vendorHash = "sha256-L96zj/AEUze/SfuFeK+I1+w2zXcxr5BSW3wGQFbTbJU=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From bb91a2d28ed24193ff98f4e56c939f92664348de Mon Sep 17 00:00:00 2001
From: Marc Fournier <marc@bl.uem.li>
Date: Mon, 30 Mar 2026 21:16:58 +0200
Subject: [PATCH 03/71] granted: update changelog URL

Co-authored-by: Harinn <prinn.dev@pm.me>
---
 pkgs/by-name/gr/granted/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/gr/granted/package.nix b/pkgs/by-name/gr/granted/package.nix
index 079eb7f6f6c3..78ea0b092353 100644
--- a/pkgs/by-name/gr/granted/package.nix
+++ b/pkgs/by-name/gr/granted/package.nix
@@ -88,7 +88,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Easiest way to access your cloud";
     homepage = "https://github.com/fwdcloudsec/granted";
-    changelog = "https://github.com/fwdcloudsec/granted/releases/tag/${finalAttrs.version}";
+    changelog = "https://github.com/fwdcloudsec/granted/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       jlbribeiro

From ad3d3788cdee87ef3a9f7bb70d7b5f95c70a0005 Mon Sep 17 00:00:00 2001
From: Marc Fournier <marc@bl.uem.li>
Date: Mon, 30 Mar 2026 21:19:09 +0200
Subject: [PATCH 04/71] granted: point to release tag

Co-authored-by: Harinn <prinn.dev@pm.me>
---
 pkgs/by-name/gr/granted/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/gr/granted/package.nix b/pkgs/by-name/gr/granted/package.nix
index 78ea0b092353..8bb3dfc49db5 100644
--- a/pkgs/by-name/gr/granted/package.nix
+++ b/pkgs/by-name/gr/granted/package.nix
@@ -16,7 +16,7 @@ buildGoModule (finalAttrs: {
   src = fetchFromGitHub {
     owner = "fwdcloudsec";
     repo = "granted";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-/5JP6laC+k+O8GWSl1eo0slqzYzYB86UF3irDX6Z0iQ=";
   };
 

From a4112cd368ac0535a44a9b0f282333eb2b706251 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Ostroluck=C3=BD?= <gabriel.ostrolucky@gmail.com>
Date: Mon, 11 May 2026 23:07:18 +0200
Subject: [PATCH 05/71] phpExtensions.relay: Fix wrong dylib mapping in Darwin

---
 .../php-packages/relay/default.nix            | 60 +++++++++++++++----
 1 file changed, 47 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/php-packages/relay/default.nix b/pkgs/development/php-packages/relay/default.nix
index 4f84accf0b55..8877bc8a42bd 100644
--- a/pkgs/development/php-packages/relay/default.nix
+++ b/pkgs/development/php-packages/relay/default.nix
@@ -10,6 +10,7 @@
   lz4,
   autoPatchelfHook,
   writeShellScript,
+  runCommand,
   curl,
   common-updater-scripts,
 }:
@@ -89,20 +90,46 @@ stdenv.mkDerivation (finalAttrs: {
     if stdenv.hostPlatform.isDarwin then
       let
         args =
-          lib.strings.concatMapStrings
-            (v: " -change ${v.name}" + " ${lib.strings.makeLibraryPath [ v.value ]}/${baseNameOf v.name}")
+          lib.concatMapStrings
             (
-              with lib.attrsets;
-              [
-                (nameValuePair "/opt/homebrew/opt/hiredis/lib/libhiredis.1.1.0.dylib" hiredis)
-                (nameValuePair "/opt/homebrew/opt/hiredis/lib/libhiredis_ssl.dylib.1.1.0" hiredis)
-                (nameValuePair "/opt/homebrew/opt/concurrencykit/lib/libck.0.dylib" libck)
-                (nameValuePair "/opt/homebrew/opt/openssl@3/lib/libssl.3.dylib" openssl)
-                (nameValuePair "/opt/homebrew/opt/openssl@3/lib/libcrypto.3.dylib" openssl)
-                (nameValuePair "/opt/homebrew/opt/zstd/lib/libzstd.1.dylib" zstd)
-                (nameValuePair "/opt/homebrew/opt/lz4/lib/liblz4.1.dylib" lz4)
-              ]
-            );
+              v:
+              let
+                targetName = if v ? to then v.to else builtins.baseNameOf v.from;
+              in
+              " -change ${v.from} ${lib.strings.makeLibraryPath [ v.pkg ]}/${targetName}"
+            )
+            [
+              {
+                from = "/opt/homebrew/opt/concurrencykit/lib/libck.0.dylib";
+                pkg = libck;
+              }
+              {
+                from = "/opt/homebrew/opt/openssl@3/lib/libssl.3.dylib";
+                pkg = openssl;
+              }
+              {
+                from = "/opt/homebrew/opt/openssl@3/lib/libcrypto.3.dylib";
+                pkg = openssl;
+              }
+              {
+                from = "/opt/homebrew/opt/zstd/lib/libzstd.1.dylib";
+                pkg = zstd;
+              }
+              {
+                from = "/opt/homebrew/opt/lz4/lib/liblz4.1.dylib";
+                pkg = lz4;
+              }
+              {
+                from = "/opt/homebrew/opt/hiredis/lib/libhiredis.1.3.0.dylib";
+                pkg = hiredis;
+                to = "libhiredis.1.1.0.dylib";
+              }
+              {
+                from = "/opt/homebrew/opt/hiredis/lib/libhiredis_ssl.1.3.0.dylib";
+                pkg = hiredis;
+                to = "libhiredis_ssl.dylib.1.1.0";
+              }
+            ];
       in
       # fixDarwinDylibNames can't be used here because we need to completely remap .dylibs, not just add absolute paths
       ''
@@ -120,6 +147,13 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru = {
+    tests.smokeTest = runCommand "php-relay-smoke-test" { } ''
+      ${lib.getExe php} \
+        -d extension=${finalAttrs.finalPackage}/lib/php/extensions/relay.so \
+        -r 'exit(extension_loaded("relay") ? 0 : 1);'
+      touch $out
+    '';
+
     updateScript = writeShellScript "update-${finalAttrs.pname}" ''
       set -o errexit
       export PATH="$PATH:${

From e5c2d65fddaf7377abc397f4f037eb6240b528f9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 May 2026 17:54:44 +0000
Subject: [PATCH 06/71] python3Packages.multiregex: 2.0.3 -> 2.0.4

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

diff --git a/pkgs/development/python-modules/multiregex/default.nix b/pkgs/development/python-modules/multiregex/default.nix
index caa7739cc86c..33e1ecdeebd9 100644
--- a/pkgs/development/python-modules/multiregex/default.nix
+++ b/pkgs/development/python-modules/multiregex/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "multiregex";
-  version = "2.0.3";
+  version = "2.0.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "quantco";
     repo = "multiregex";
     tag = version;
-    hash = "sha256-S10FJwtFNK4CarE2YAcUM38hRYTDL0Vp4B8NqGvJs5M=";
+    hash = "sha256-BWADzarhnzcz2ZvD33XcQpQIIJ0hmhUT33HyUbB1wH0=";
   };
 
   build-system = [

From 78937945928f08ced8289136838bb644929ab3b0 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Thu, 4 Jun 2026 17:16:20 +0800
Subject: [PATCH 07/71] tokenspeed-triton-llvm: init at
 23.0.0-unstable-2026-04-08

---
 .../to/tokenspeed-triton-llvm/package.nix     | 82 +++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 pkgs/by-name/to/tokenspeed-triton-llvm/package.nix

diff --git a/pkgs/by-name/to/tokenspeed-triton-llvm/package.nix b/pkgs/by-name/to/tokenspeed-triton-llvm/package.nix
new file mode 100644
index 000000000000..568542fccfe3
--- /dev/null
+++ b/pkgs/by-name/to/tokenspeed-triton-llvm/package.nix
@@ -0,0 +1,82 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+
+  cmake,
+  python3,
+
+  llvmTargetsToBuild ? [ "NATIVE" ], # "NATIVE" resolves into x86 or aarch64 depending on stdenv
+  llvmProjectsToBuild ? [
+    # Required for building triton>=3.7.0
+    # https://github.com/triton-lang/triton/blob/a34f373ba47899831f3de3c83cd8f4877bf23d69/third_party/nvidia/CMakeLists.txt#L14
+    "clang"
+
+    # Required for building triton>=3.5.0
+    # https://github.com/triton-lang/triton/blob/c3c476f357f1e9768ea4e45aa5c17528449ab9ef/third_party/amd/CMakeLists.txt#L6
+    "lld"
+
+    "llvm"
+    "mlir"
+  ],
+}:
+let
+  llvmNativeTarget =
+    if stdenv.hostPlatform.isx86_64 then
+      "X86"
+    else if stdenv.hostPlatform.isAarch64 then
+      "AArch64"
+    else
+      throw "Currently unsupported LLVM platform '${stdenv.hostPlatform.config}'";
+
+  inferNativeTarget = t: if t == "NATIVE" then llvmNativeTarget else t;
+  llvmTargetsToBuild' = [
+    "AMDGPU"
+    "NVPTX"
+  ]
+  ++ map inferNativeTarget llvmTargetsToBuild;
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "tokenspeed-triton-llvm";
+  version = "23.0.0-unstable-2026-04-08"; # See cmake/Modules/LLVMVersion.cmake
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  # See https://github.com/lightseekorg/triton/blob/v3.7.10.post20260531/cmake/llvm-info.json
+  src = fetchFromGitHub {
+    owner = "llvm";
+    repo = "llvm-project";
+    rev = "87717bf9f81f7b29466c5d9a30a3453bdfc93941";
+    hash = "sha256-8+Q19pOgovZgpN0it5TDrrQfXZFGiIRoP0Ha5dLQJp0=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    python3
+  ];
+
+  preConfigure = ''
+    cd llvm
+  '';
+
+  cmakeFlags = [
+    (lib.cmakeFeature "LLVM_TARGETS_TO_BUILD" (lib.concatStringsSep ";" llvmTargetsToBuild'))
+    (lib.cmakeFeature "LLVM_ENABLE_PROJECTS" (lib.concatStringsSep ";" llvmProjectsToBuild))
+    (lib.cmakeBool "LLVM_INSTALL_UTILS" true)
+  ];
+
+  requiredSystemFeatures = [ "big-parallel" ];
+
+  meta = {
+    description = "Collection of modular and reusable compiler and toolchain technologies";
+    homepage = "https://github.com/llvm/llvm-project";
+    license =
+      with lib.licenses;
+      AND [
+        ncsa
+        (WITH asl20 llvm-exception)
+      ];
+    maintainers = with lib.maintainers; [ prince213 ];
+    platforms = with lib.platforms; aarch64 ++ x86;
+  };
+})

From 1503d10ee4e6af997e06545964df06897e54adec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Mon, 25 May 2026 15:03:02 +0700
Subject: [PATCH 08/71] =?UTF-8?q?h2o:=202.3.0-rolling-2026-05-15=20?=
 =?UTF-8?q?=E2=86=92=202.3.0-rolling-2026-05-25?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index f74e3a2575d9..3214b820177b 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0-rolling-2026-05-15";
+  version = "2.3.0-rolling-2026-05-25";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "9e7f283e5801bd0707cc5d48d0188c4c162fe7b3";
-    hash = "sha256-8FdUQLX67E+7f4HyoH6atLDxYzniVEFqc+jbjzTytFM=";
+    rev = "e27c3e6d8cc04b8b7c3dea35dbd00e41d5ad734c";
+    hash = "sha256-9KMAwNR8Ensdom7fijEvtae/hcYmH8wZsk4tDZf01Bw=";
   };
 
   outputs = [

From e22df82761e44df34d3c6f8e18087c1fbcb05b61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Thu, 28 May 2026 10:43:04 +0700
Subject: [PATCH 09/71] =?UTF-8?q?h2o:=202.3.0-rolling-2026-05-25=20?=
 =?UTF-8?q?=E2=86=92=202.3.0-rolling-2026-05-28?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index 3214b820177b..dde25bc993f8 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0-rolling-2026-05-25";
+  version = "2.3.0-rolling-2026-05-28";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "e27c3e6d8cc04b8b7c3dea35dbd00e41d5ad734c";
-    hash = "sha256-9KMAwNR8Ensdom7fijEvtae/hcYmH8wZsk4tDZf01Bw=";
+    rev = "11b0cfa2771e3ccad4a852e72473e4e278ab1de7";
+    hash = "sha256-uqzjq0+SmmdjNIFU0lrQ1JVZJISBdEqo8nTuEGIp7hI=";
   };
 
   outputs = [

From 80af164903e1e001cf53cd21bc92d9e79dc6b6ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Fri, 29 May 2026 20:31:24 +0700
Subject: [PATCH 10/71] =?UTF-8?q?h2o:=202.3.0-rolling-2026-05-28=20?=
 =?UTF-8?q?=E2=86=92=202.3.0-rolling-2026-05-29?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index dde25bc993f8..5c447ed2c146 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0-rolling-2026-05-28";
+  version = "2.3.0-rolling-2026-05-29";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "11b0cfa2771e3ccad4a852e72473e4e278ab1de7";
-    hash = "sha256-uqzjq0+SmmdjNIFU0lrQ1JVZJISBdEqo8nTuEGIp7hI=";
+    rev = "8dc37cb1e6171f7f772667618ea440696fed82c3";
+    hash = "sha256-tLHo8UXgef6rN/mBSwNIk7S2C4ZrweFTGUjjRw1S7KY=";
   };
 
   outputs = [

From 5379e268b1c36d4cf3424d44f3891993de60c339 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Thu, 4 Jun 2026 19:07:48 +0700
Subject: [PATCH 11/71] =?UTF-8?q?h2o:=202.3.0-rolling-2026-05-29=20?=
 =?UTF-8?q?=E2=86=92=202.3.0-rolling-2026-06-04?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index 5c447ed2c146..7f39a6e685de 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0-rolling-2026-05-29";
+  version = "2.3.0-rolling-2026-06-04";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "8dc37cb1e6171f7f772667618ea440696fed82c3";
-    hash = "sha256-tLHo8UXgef6rN/mBSwNIk7S2C4ZrweFTGUjjRw1S7KY=";
+    rev = "cd4703768c56d45b1384880ba9f73961140d084f";
+    hash = "sha256-EbpLS9Y733BszHSlvogPKTJY8p7hfVl+KF/OSwO8UZs=";
   };
 
   outputs = [

From 013498f6d1365d98a592ba63193e75a71e96c384 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Thu, 4 Jun 2026 16:13:40 +0800
Subject: [PATCH 12/71] python3Packages.tokenspeed-triton: init at
 3.7.10.post20260531

---
 .../tokenspeed-triton/default.nix             | 92 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 94 insertions(+)
 create mode 100644 pkgs/development/python-modules/tokenspeed-triton/default.nix

diff --git a/pkgs/development/python-modules/tokenspeed-triton/default.nix b/pkgs/development/python-modules/tokenspeed-triton/default.nix
new file mode 100644
index 000000000000..f63b1973cee8
--- /dev/null
+++ b/pkgs/development/python-modules/tokenspeed-triton/default.nix
@@ -0,0 +1,92 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonAtLeast,
+
+  # build-system
+  cmake,
+  nanobind,
+  ninja,
+  setuptools,
+
+  # nativeBuildInputs
+  writableTmpDirAsHomeHook,
+
+  # buildInputs
+  tokenspeed-triton-llvm,
+  nlohmann_json,
+  zlib,
+}:
+buildPythonPackage (finalAttrs: {
+  pname = "tokenspeed-triton";
+  version = "3.7.10.post20260531";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "lightseekorg";
+    repo = "triton";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-xsV63z2NtB5BM0rF0J+cnMH2RYzoWkpsSXHQI2nIEdQ=";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail "TRITON_VERSION = " 'TRITON_VERSION = "${finalAttrs.version}" # '
+
+    sed -i '/def is_git_repo()/a\\    return False' setup.py
+
+    substituteInPlace pyproject.toml \
+      --replace-fail "cmake>=3.20,<4.0" "cmake>=3.20" \
+      --replace-fail "nanobind==2.10.2" "nanobind>=2.10.2"
+  '';
+
+  build-system = [
+    cmake
+    nanobind
+    ninja
+    setuptools
+  ];
+
+  dontUseCmakeConfigure = true;
+
+  nativeBuildInputs = [
+    writableTmpDirAsHomeHook
+  ];
+
+  # https://github.com/lightseekorg/triton/blob/v3.7.10.post20260531/.github/workflows/wheels.yml#L109-L117
+  env = {
+    TRITON_OFFLINE_BUILD = true;
+    TRITON_BUILD_RELEASE = true;
+    TRITON_BUILD_PROTON = false;
+    TRITON_STABLE_ABI = pythonAtLeast "3.12";
+    LLVM_SYSPATH = tokenspeed-triton-llvm;
+    JSON_SYSPATH = nlohmann_json;
+    NIX_CFLAGS_COMPILE = "-Wno-stringop-overflow";
+  };
+
+  buildInputs = [
+    zlib
+  ];
+
+  pythonImportsCheck = [
+    "tokenspeed_triton"
+  ];
+
+  # tests import triton instead of tokenspeed_triton
+  doCheck = false;
+
+  meta = {
+    description = "Language and compiler for custom Deep Learning operations";
+    homepage = "https://github.com/lightseekorg/triton";
+    downloadPage = "https://pypi.org/project/tokenspeed-triton/#files";
+    changelog = "https://github.com/lightseekorg/triton/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ prince213 ];
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+    ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index edeaf390c28d..413bf4899c55 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19800,6 +19800,8 @@ self: super: with self; {
 
   tokenlib = callPackage ../development/python-modules/tokenlib { };
 
+  tokenspeed-triton = callPackage ../development/python-modules/tokenspeed-triton { };
+
   tokentrim = callPackage ../development/python-modules/tokentrim { };
 
   tololib = callPackage ../development/python-modules/tololib { };

From 4d411b1251455e9b90672c0f3f9cb3b68f5432ba Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Thu, 4 Jun 2026 14:38:22 +0800
Subject: [PATCH 13/71] python3Packages.tokenspeed-triton-bin: init at
 3.7.10.post20260531

---
 .../python-modules/tokenspeed-triton/bin.nix  | 73 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 75 insertions(+)
 create mode 100644 pkgs/development/python-modules/tokenspeed-triton/bin.nix

diff --git a/pkgs/development/python-modules/tokenspeed-triton/bin.nix b/pkgs/development/python-modules/tokenspeed-triton/bin.nix
new file mode 100644
index 000000000000..6b7b834a98de
--- /dev/null
+++ b/pkgs/development/python-modules/tokenspeed-triton/bin.nix
@@ -0,0 +1,73 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  python,
+  pythonAtLeast,
+  stdenv,
+
+  # nativeBuildInputs
+  autoPatchelfHook,
+  pypaInstallHook,
+  wheelUnpackHook,
+
+  # buildInputs
+  zlib,
+}:
+let
+  inherit (stdenv.hostPlatform) system;
+  pythonVersion = if pythonAtLeast "3.12" then "3.12" else python.pythonVersion;
+  abiTag = if pythonAtLeast "3.12" then "abi3" else pythonTag;
+  pythonTag = "cp${lib.replaceStrings [ "." ] [ "" ] pythonVersion}";
+
+  hashes = {
+    aarch64-linux = {
+      cp310 = "sha256-rRex0Y8vvOsLsJO+gxeZNkRF+iT/79IWQ5ShvwZJm3Y=";
+      cp311 = "sha256-Ds3Y1+o63Z19ckG4NcgMEthCZSvWsg3NhNsYojXhYIQ=";
+      abi3 = "sha256-Fs0KP8HP/rRYp+A+hohxT0n98LWhCL/KmZ9GWXw/qrs=";
+    };
+    x86_64-linux = {
+      cp310 = "sha256-GGrclq8qFWW1Z27JIvYSZdf+u5pK6KK/5ioTigYMJ7Y=";
+      cp311 = "sha256-Ur4JbdxSJcbyNF4NCQrStWRmqFu+uGbMEaIOD+Pd4b8=";
+      abi3 = "sha256-uQrEHn8VkzeXVF/xqegDqdi+tMqbpw9tQang/CZIT1w=";
+    };
+  };
+in
+buildPythonPackage (finalAttrs: {
+  pname = "tokenspeed-triton";
+  version = "3.7.10.post20260531";
+  pyproject = false;
+  __structuredAttrs = true;
+
+  src = fetchPypi {
+    format = "wheel";
+    pname = "tokenspeed_triton";
+    inherit (finalAttrs) version;
+    dist = pythonTag;
+    python = pythonTag;
+    abi = abiTag;
+    platform = "manylinux_2_27_${stdenv.hostPlatform.uname.processor}.manylinux_2_28_${stdenv.hostPlatform.uname.processor}";
+    hash = hashes.${system}.${abiTag} or (throw "Unsupported system: ${system}");
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    pypaInstallHook
+    wheelUnpackHook
+  ];
+
+  buildInputs = [ zlib ];
+
+  pythonImportsCheck = [ "tokenspeed_triton" ];
+
+  meta = {
+    description = "Language and compiler for custom Deep Learning operations";
+    homepage = "https://github.com/lightseekorg/triton";
+    downloadPage = "https://pypi.org/project/tokenspeed-triton/#files";
+    changelog = "https://github.com/lightseekorg/triton/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with lib.maintainers; [ prince213 ];
+    platforms = lib.attrNames hashes;
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 413bf4899c55..3fa73bbd6cea 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19802,6 +19802,8 @@ self: super: with self; {
 
   tokenspeed-triton = callPackage ../development/python-modules/tokenspeed-triton { };
 
+  tokenspeed-triton-bin = callPackage ../development/python-modules/tokenspeed-triton/bin.nix { };
+
   tokentrim = callPackage ../development/python-modules/tokentrim { };
 
   tololib = callPackage ../development/python-modules/tololib { };

From cf6aef351e3d98f41e554f0f4e0737cfc82aadae Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Thu, 4 Jun 2026 21:15:14 +0800
Subject: [PATCH 14/71] python3Packages.tokenspeed-mla: init at 0.1.5

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

diff --git a/pkgs/development/python-modules/tokenspeed-mla/default.nix b/pkgs/development/python-modules/tokenspeed-mla/default.nix
new file mode 100644
index 000000000000..4813cd099604
--- /dev/null
+++ b/pkgs/development/python-modules/tokenspeed-mla/default.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  apache-tvm-ffi,
+  nvidia-cutlass-dsl,
+  tokenspeed-triton,
+  torch,
+}:
+buildPythonPackage (finalAttrs: {
+  pname = "tokenspeed-mla";
+  version = "0.1.5";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "lightseekorg";
+    repo = "tokenspeed";
+    rev = "a39b3854dfd9b08a410028dbe5260eda08ef6b63";
+    hash = "sha256-rl+cpZabmK24nMcam5Ud4GqnpLA3TqpVRznlX6lz6Xs=";
+  };
+
+  sourceRoot = "${finalAttrs.src.name}/tokenspeed-mla";
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    apache-tvm-ffi
+    nvidia-cutlass-dsl
+    tokenspeed-triton
+    torch
+  ];
+
+  pythonImportsCheck = [ "tokenspeed_mla" ];
+
+  # no tests
+  doCheck = false;
+
+  meta = {
+    description = "Speed-of-light TokenSpeed MLA kernels for Blackwell SM100 and SM103";
+    homepage = "https://github.com/lightseekorg/tokenspeed/tree/main/tokenspeed-mla";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ prince213 ];
+    broken = !torch.cudaSupport;
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3fa73bbd6cea..6cb712605dff 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19800,6 +19800,8 @@ self: super: with self; {
 
   tokenlib = callPackage ../development/python-modules/tokenlib { };
 
+  tokenspeed-mla = callPackage ../development/python-modules/tokenspeed-mla { };
+
   tokenspeed-triton = callPackage ../development/python-modules/tokenspeed-triton { };
 
   tokenspeed-triton-bin = callPackage ../development/python-modules/tokenspeed-triton/bin.nix { };

From 5387185762a64e5e7f001bccb53baaf782e7dd33 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Thu, 4 Jun 2026 11:35:47 +0800
Subject: [PATCH 15/71] python3Packages.tokenspeed-mla-bin: init at 0.1.5

---
 .../python-modules/tokenspeed-mla/bin.nix     | 79 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 81 insertions(+)
 create mode 100644 pkgs/development/python-modules/tokenspeed-mla/bin.nix

diff --git a/pkgs/development/python-modules/tokenspeed-mla/bin.nix b/pkgs/development/python-modules/tokenspeed-mla/bin.nix
new file mode 100644
index 000000000000..832d2d5eff19
--- /dev/null
+++ b/pkgs/development/python-modules/tokenspeed-mla/bin.nix
@@ -0,0 +1,79 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  python,
+  stdenv,
+
+  # nativeBuildInputs
+  autoPatchelfHook,
+  pypaInstallHook,
+  pythonRuntimeDepsCheckHook,
+  wheelUnpackHook,
+
+  # dependencies
+  apache-tvm-ffi,
+  nvidia-cutlass-dsl,
+  nvidia-cutlass-dsl-libs-base,
+  tokenspeed-triton,
+  torch,
+}:
+let
+  inherit (stdenv.hostPlatform) system;
+
+  hashes = {
+    aarch64-linux = "sha256-rD4rFrvtQXuICjBOkFfmzj3DaGRC4RHGX5EV4x/3T34=";
+    x86_64-linux = "sha256-1gW6k7nZT4Luj1LOLWaAs91AHBmPi0XCL11loqaCHqQ=";
+  };
+in
+buildPythonPackage (finalAttrs: {
+  pname = "tokenspeed-mla";
+  version = "0.1.5";
+  pyproject = false;
+  __structuredAttrs = true;
+
+  src = fetchPypi {
+    format = "wheel";
+    pname = "tokenspeed_mla";
+    inherit (finalAttrs) version;
+    dist = "py3";
+    python = "py3";
+    abi = "none";
+    platform = "manylinux_2_28_${stdenv.hostPlatform.uname.processor}";
+    hash = hashes.${system} or (throw "Unsupported system: ${system}");
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    pypaInstallHook
+    pythonRuntimeDepsCheckHook
+    wheelUnpackHook
+  ];
+
+  dependencies = [
+    apache-tvm-ffi
+    nvidia-cutlass-dsl
+    tokenspeed-triton
+    torch
+  ];
+
+  preFixup = ''
+    # libtvm_ffi.so
+    addAutoPatchelfSearchPath "${apache-tvm-ffi}/${python.sitePackages}/tvm_ffi/lib"
+    # libcute_dsl_runtime.so
+    addAutoPatchelfSearchPath "${nvidia-cutlass-dsl-libs-base}/${python.sitePackages}/nvidia_cutlass_dsl/lib"
+  '';
+
+  pythonImportsCheck = [ "tokenspeed_mla" ];
+
+  meta = {
+    description = "Speed-of-light TokenSpeed MLA kernels for Blackwell SM100 and SM103";
+    homepage = "https://github.com/lightseekorg/tokenspeed/tree/main/tokenspeed-mla";
+    downloadPage = "https://pypi.org/project/tokenspeed-mla/#files";
+    license = lib.licenses.mit;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with lib.maintainers; [ prince213 ];
+    platforms = lib.attrNames hashes;
+    broken = !torch.cudaSupport;
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6cb712605dff..7d0681312a9a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19802,6 +19802,8 @@ self: super: with self; {
 
   tokenspeed-mla = callPackage ../development/python-modules/tokenspeed-mla { };
 
+  tokenspeed-mla-bin = callPackage ../development/python-modules/tokenspeed-mla/bin.nix { };
+
   tokenspeed-triton = callPackage ../development/python-modules/tokenspeed-triton { };
 
   tokenspeed-triton-bin = callPackage ../development/python-modules/tokenspeed-triton/bin.nix { };

From a584acd329ad5df332cf985e8f660b81891ba62f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Jun 2026 01:46:39 +0000
Subject: [PATCH 16/71] libxfs: 6.19.0 -> 7.0.1

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

diff --git a/pkgs/by-name/xf/xfsprogs/package.nix b/pkgs/by-name/xf/xfsprogs/package.nix
index ed780f6ecd4c..924688cae10b 100644
--- a/pkgs/by-name/xf/xfsprogs/package.nix
+++ b/pkgs/by-name/xf/xfsprogs/package.nix
@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xfsprogs";
-  version = "6.19.0";
+  version = "7.0.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/xfsprogs-${finalAttrs.version}.tar.xz";
-    hash = "sha256-87DXWO04ArIPg4/vxCu/9DHg8N8v4DzVDQqkrYbc0Pw=";
+    hash = "sha256-SoyoOnrLjNksmX1jtprmTxcAVrNmopJKdT5H1LtLiwY=";
   };
 
   postPatch = ''

From c9e6c110409d7adf8fa319b03a2d56e57ccda0d5 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 6 Jun 2026 19:30:59 +0000
Subject: [PATCH 17/71] tokenspeed-triton-llvm: mark as broken on x86_64-darwin

---
 pkgs/by-name/to/tokenspeed-triton-llvm/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/to/tokenspeed-triton-llvm/package.nix b/pkgs/by-name/to/tokenspeed-triton-llvm/package.nix
index 568542fccfe3..9c039a344ef0 100644
--- a/pkgs/by-name/to/tokenspeed-triton-llvm/package.nix
+++ b/pkgs/by-name/to/tokenspeed-triton-llvm/package.nix
@@ -78,5 +78,9 @@ stdenv.mkDerivation (finalAttrs: {
       ];
     maintainers = with lib.maintainers; [ prince213 ];
     platforms = with lib.platforms; aarch64 ++ x86;
+    badPlatforms = [
+      # clang++: error: clang frontend command failed with exit code 139
+      "x86_64-darwin"
+    ];
   };
 })

From 956294df21af52137d31a5083af3d6811df87cb8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 Jun 2026 09:57:40 +0000
Subject: [PATCH 18/71] nlopt: 2.10.1 -> 2.11.0

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

diff --git a/pkgs/by-name/nl/nlopt/package.nix b/pkgs/by-name/nl/nlopt/package.nix
index 17cd33778114..e6b9f8cd3a38 100644
--- a/pkgs/by-name/nl/nlopt/package.nix
+++ b/pkgs/by-name/nl/nlopt/package.nix
@@ -41,13 +41,13 @@ let
 in
 clangStdenv.mkDerivation (finalAttrs: {
   pname = "nlopt";
-  version = "2.10.1";
+  version = "2.11.0";
 
   src = fetchFromGitHub {
     owner = "stevengj";
     repo = "nlopt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-i+Cd2VLMbI4PUSXennR8jgF+/ZkzKX9WkVTPtayr8vs=";
+    hash = "sha256-ooZv75xkg07w+8ZlP1+1hqVwhOuDBSBNfhFscsLLu1I=";
   };
 
   outputs = [ "out" ] ++ lib.optional withDocs "doc";

From 8a4df751cdedfd8ecc9acfbe20af2f9a0d0b9804 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Jun 2026 11:52:26 +0000
Subject: [PATCH 19/71] mirrord: 3.213.0 -> 3.216.0

---
 pkgs/by-name/mi/mirrord/manifest.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json
index 74781ac8546b..588347bfa29e 100644
--- a/pkgs/by-name/mi/mirrord/manifest.json
+++ b/pkgs/by-name/mi/mirrord/manifest.json
@@ -1,21 +1,21 @@
 {
-  "version": "3.213.0",
+  "version": "3.216.0",
   "assets": {
     "x86_64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.213.0/mirrord_linux_x86_64",
-      "hash": "sha256-Bm4dLCd4u6WouFfgfMlyrM9HxiL1u3V+i31H0DDYYRE="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.216.0/mirrord_linux_x86_64",
+      "hash": "sha256-w4x1G12uifLTQzf9KWUgUYeu+4SQTI51HToI/cgB4ew="
     },
     "aarch64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.213.0/mirrord_linux_aarch64",
-      "hash": "sha256-5GhBdNgd60WGlaZmGM/Ck4qxbna6E07p9dxx9CfgDRg="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.216.0/mirrord_linux_aarch64",
+      "hash": "sha256-GLwDMlCV7izckP5roJGsVROK3+PSkwDH/Vbu4j9X1sk="
     },
     "aarch64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.213.0/mirrord_mac_universal",
-      "hash": "sha256-iW22NPH2cwiWRMlc+fOWkkn3OCbRmzYL4oFkau9QtFQ="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.216.0/mirrord_mac_universal",
+      "hash": "sha256-LCHPpdVWyBtmrcP+2bFqwaqhtH+nsXf2R3SeXJMFtVg="
     },
     "x86_64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.213.0/mirrord_mac_universal",
-      "hash": "sha256-iW22NPH2cwiWRMlc+fOWkkn3OCbRmzYL4oFkau9QtFQ="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.216.0/mirrord_mac_universal",
+      "hash": "sha256-LCHPpdVWyBtmrcP+2bFqwaqhtH+nsXf2R3SeXJMFtVg="
     }
   }
 }

From 652675a4f893663c3cc952b6bb516feb156f6626 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Tue, 9 Jun 2026 20:59:53 +0200
Subject: [PATCH 20/71] =?UTF-8?q?remind:=2006.02.06=20=E2=86=92=2006.02.07?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/re/remind/package.nix b/pkgs/by-name/re/remind/package.nix
index 486c6f8d24a1..1c331eaef24a 100644
--- a/pkgs/by-name/re/remind/package.nix
+++ b/pkgs/by-name/re/remind/package.nix
@@ -16,14 +16,14 @@
 
 tcl.mkTclDerivation rec {
   pname = "remind";
-  version = "06.02.06";
+  version = "06.02.07";
 
   src = fetchFromGitea {
     domain = "git.skoll.ca";
     owner = "Skollsoft-Public";
     repo = "Remind";
     rev = version;
-    hash = "sha256-Bsrl9WZXb59rznoZEBa/7S6F1QR4S+y1xolfDwJN3kk=";
+    hash = "sha256-5Cg7UdftyzjQg7pdewc7z8SfA3jtXQdPboXs9V/vDDo=";
   };
 
   propagatedBuildInputs = lib.optionals withGui [

From 51144a1a0e2e0ef70daf31bee646fcfff8628aa0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 10 Jun 2026 03:53:08 +0000
Subject: [PATCH 21/71] python3Packages.pytorch-memlab: 0.3.0 -> 0.3.2

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

diff --git a/pkgs/development/python-modules/pytorch-memlab/default.nix b/pkgs/development/python-modules/pytorch-memlab/default.nix
index c4a7fcf7a830..49d3a25cfe2e 100644
--- a/pkgs/development/python-modules/pytorch-memlab/default.nix
+++ b/pkgs/development/python-modules/pytorch-memlab/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pytorch-memlab";
-  version = "0.3.0";
+  version = "0.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Stonesjtu";
     repo = "pytorch_memlab";
     tag = version;
-    hash = "sha256-wNgbipvi3vYr9Ka9hA7I+C4y8Nf6AiZXUoXX+qKtZ+I=";
+    hash = "sha256-46C/2RvzhbHt1IHPmPCrLsIk2D3POhzuADNaXqUe0F4=";
   };
 
   build-system = [ setuptools ];

From 3ce189835eff3f9bb601a170b9aa00127d20bcbf Mon Sep 17 00:00:00 2001
From: Christoph Jabs <christoph.jabs@helsinki.fi>
Date: Wed, 10 Jun 2026 09:27:26 +0300
Subject: [PATCH 22/71] python3Package.python-sat: 1.9.dev2 -> 1.9.dev5

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

diff --git a/pkgs/development/python-modules/python-sat/default.nix b/pkgs/development/python-modules/python-sat/default.nix
index 094e040e707b..92a72f0f88ea 100644
--- a/pkgs/development/python-modules/python-sat/default.nix
+++ b/pkgs/development/python-modules/python-sat/default.nix
@@ -13,10 +13,14 @@ let
     url = "https://github.com/arminbiere/kissat/archive/refs/tags/rel-4.0.4.tar.gz";
     hash = "sha256-v+k+qmMjtIAR5LH890s/LiD53lRHZ+coAJ5bIBgpYZM=";
   };
+  minisatepsrc = fetchurl {
+    url = "https://github.com/hchenqide/minisat/archive/90305f7b9ab9c9c9c560238f16b47c26506d0750.zip";
+    hash = "sha256-eS5+wPrcZ00DRZMaJp4yZOZ1uz72Auin6FK6G2SId64=";
+  };
 in
 buildPythonPackage (finalAttrs: {
   pname = "python-sat";
-  version = "1.9.dev2";
+  version = "1.9.dev5";
   pyproject = true;
 
   build-system = [ setuptools ];
@@ -24,13 +28,14 @@ buildPythonPackage (finalAttrs: {
   src = fetchPypi {
     inherit (finalAttrs) version;
     pname = "python_sat";
-    hash = "sha256-JntHdC4xhDVt8uzZzMn7bmIkMFjrwlZWBs8z0E4WeeU=";
+    hash = "sha256-OxH2AQbusuv5aB/t85nrNOXAuyCfNFZRvMFMWFfmdhg=";
   };
 
   # The kissat source archive is not included in the repo and pysat attempts to
   # download it at build time. We therefore prefetch and link it.
   prePatch = ''
     ln -s ${kissat404src} solvers/kissat404.tar.gz
+    ln -s ${minisatepsrc} solvers/minisatep.zip
   '';
 
   preBuild = ''

From 0207c9d3f4701fd16d2734d0d3d9f8fe41b0ec73 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 10 Jun 2026 10:55:55 +0000
Subject: [PATCH 23/71] cloudflared: 2026.5.2 -> 2026.6.0

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

diff --git a/pkgs/by-name/cl/cloudflared/package.nix b/pkgs/by-name/cl/cloudflared/package.nix
index 421ddd40ae67..758efddd4e50 100644
--- a/pkgs/by-name/cl/cloudflared/package.nix
+++ b/pkgs/by-name/cl/cloudflared/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "cloudflared";
-  version = "2026.5.2";
+  version = "2026.6.0";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "cloudflared";
     tag = finalAttrs.version;
-    hash = "sha256-3rMA+DsyC1/ycscL4VfSCS8fZcJzMdDUw8zgmmUhRyQ=";
+    hash = "sha256-V3fHxDNkxF7MwChZpyHZ7pn8bBgBe/ugNql2QzqSLFA=";
   };
 
   vendorHash = null;

From 107761b8e77828f9736fb7ae808c60b814f0feed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 10 Jun 2026 12:31:09 +0000
Subject: [PATCH 24/71] wxmaxima: 26.05.0 -> 26.06.1

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

diff --git a/pkgs/by-name/wx/wxmaxima/package.nix b/pkgs/by-name/wx/wxmaxima/package.nix
index 2defc671f091..fefbde1d3e20 100644
--- a/pkgs/by-name/wx/wxmaxima/package.nix
+++ b/pkgs/by-name/wx/wxmaxima/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wxmaxima";
-  version = "26.05.0";
+  version = "26.06.1";
 
   src = fetchFromGitHub {
     owner = "wxMaxima-developers";
     repo = "wxmaxima";
     rev = "Version-${finalAttrs.version}";
-    hash = "sha256-/O57UjejHb9lDYiLs9jdtmt/S7CTHY0tlq07fAxh5TM=";
+    hash = "sha256-A20uF1cRm9hjTyqJDCMEuAwhG8hagHu0tKdQK5Lnz94=";
   };
 
   buildInputs = [

From 905da8fe31fb40a71415601d02cd83d14ff41e93 Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Wed, 10 Jun 2026 15:24:02 +0200
Subject: [PATCH 25/71] python3Packages.demjson3: use finalAttrs

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

diff --git a/pkgs/development/python-modules/demjson3/default.nix b/pkgs/development/python-modules/demjson3/default.nix
index 6a46dc56adee..6171bc3281c8 100644
--- a/pkgs/development/python-modules/demjson3/default.nix
+++ b/pkgs/development/python-modules/demjson3/default.nix
@@ -5,13 +5,13 @@
   python,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "demjson3";
   version = "3.0.6";
   format = "setuptools";
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-N8g7DG6wjSXe/IjfCipIddWKeAmpZQvW7uev2AU826w=";
   };
 
@@ -28,4 +28,4 @@ buildPythonPackage rec {
     license = lib.licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 45515764f3b0ba54ad4e0b2b2b7a1e037b8d7fe3 Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Wed, 10 Jun 2026 15:25:56 +0200
Subject: [PATCH 26/71] python3Packages.demjson3: enable __structuredAttrs

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

diff --git a/pkgs/development/python-modules/demjson3/default.nix b/pkgs/development/python-modules/demjson3/default.nix
index 6171bc3281c8..d365f9e95a2c 100644
--- a/pkgs/development/python-modules/demjson3/default.nix
+++ b/pkgs/development/python-modules/demjson3/default.nix
@@ -10,6 +10,8 @@ buildPythonPackage (finalAttrs: {
   version = "3.0.6";
   format = "setuptools";
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
     inherit (finalAttrs) pname version;
     hash = "sha256-N8g7DG6wjSXe/IjfCipIddWKeAmpZQvW7uev2AU826w=";

From 43ce110e69ba8cbf79344e28300433bbb0c6b458 Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Wed, 10 Jun 2026 15:27:05 +0200
Subject: [PATCH 27/71] python3Packages.demjson3: use pytestCheckHook

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

diff --git a/pkgs/development/python-modules/demjson3/default.nix b/pkgs/development/python-modules/demjson3/default.nix
index d365f9e95a2c..1b5b48755912 100644
--- a/pkgs/development/python-modules/demjson3/default.nix
+++ b/pkgs/development/python-modules/demjson3/default.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  python,
+  pytestCheckHook,
 }:
 
 buildPythonPackage (finalAttrs: {
@@ -17,9 +17,7 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-N8g7DG6wjSXe/IjfCipIddWKeAmpZQvW7uev2AU826w=";
   };
 
-  checkPhase = ''
-    ${python.interpreter} test/test_demjson3.py
-  '';
+  nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "demjson3" ];
 

From 43281640444498baa127b47ea337776fa2a7d12e Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Wed, 10 Jun 2026 15:28:36 +0200
Subject: [PATCH 28/71] python3Packages.demjson3: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/demjson3/default.nix b/pkgs/development/python-modules/demjson3/default.nix
index 1b5b48755912..2c6101fa4d3b 100644
--- a/pkgs/development/python-modules/demjson3/default.nix
+++ b/pkgs/development/python-modules/demjson3/default.nix
@@ -3,12 +3,13 @@
   buildPythonPackage,
   fetchPypi,
   pytestCheckHook,
+  setuptools,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "demjson3";
   version = "3.0.6";
-  format = "setuptools";
+  pyproject = true;
 
   __structuredAttrs = true;
 
@@ -17,6 +18,8 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-N8g7DG6wjSXe/IjfCipIddWKeAmpZQvW7uev2AU826w=";
   };
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "demjson3" ];

From 6fd6bfb28d0068385e75d78749a37977d2a7c025 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Sat, 6 Jun 2026 19:38:20 +0800
Subject: [PATCH 29/71] emacs: test upstream bug#81105 in the withPackages test

Currently, the test only passes on Emacs < 31.  We have to work around
it before upstream fixes the bug (if they decide to fix it).

https://debbugs.gnu.org/cgi/bugreport.cgi?bug=81105
---
 .../editors/emacs/build-support/wrapper-test.nix          | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/applications/editors/emacs/build-support/wrapper-test.nix b/pkgs/applications/editors/emacs/build-support/wrapper-test.nix
index e782bc5d50b6..6ba33006ce64 100644
--- a/pkgs/applications/editors/emacs/build-support/wrapper-test.nix
+++ b/pkgs/applications/editors/emacs/build-support/wrapper-test.nix
@@ -15,6 +15,10 @@ runCommand "test-emacs-withPackages-wrapper"
       ))
       git # needed by magit
     ];
+    env = {
+      # emulate a default NixOS env where INFOPATH is set like this (not ending with a ":")
+      INFOPATH = "/fake-info-dir1:/fake-info-dir2";
+    };
   }
   ''
     emacs --batch --eval="(require 'magit)"
@@ -23,5 +27,9 @@ runCommand "test-emacs-withPackages-wrapper"
     # transitive dependencies should be made available
     # https://github.com/NixOS/nixpkgs/issues/388829
     emacs --batch --eval="(require 'flx)"
+
+    # test that https://debbugs.gnu.org/cgi/bugreport.cgi?bug=81105 is fixed or worked around
+    emacs --batch --eval='(progn (package-activate-all) (info "(magit)Top"))'
+
     touch $out
   ''

From 24497429cdf35ffe3fb7b6c6284b1c10ed91667a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 10 Jun 2026 17:18:02 +0000
Subject: [PATCH 30/71] mcp-grafana: 0.14.0 -> 0.15.2

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

diff --git a/pkgs/by-name/mc/mcp-grafana/package.nix b/pkgs/by-name/mc/mcp-grafana/package.nix
index 0c4afffab866..1cbef5c243a8 100644
--- a/pkgs/by-name/mc/mcp-grafana/package.nix
+++ b/pkgs/by-name/mc/mcp-grafana/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "mcp-grafana";
-  version = "0.14.0";
+  version = "0.15.2";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "mcp-grafana";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-YV+loz2C8CSonfqv5RgvTHAmC5zXGSZikeMf/QBCG7k=";
+    hash = "sha256-qjK8v3nUTGcBWdEF1hMKDRQtPKcYbZRU5+O8D89eZHI=";
   };
 
-  vendorHash = "sha256-gTTvEJ2TUpQ526K70gYBIMrlqTjTbze+zbh+Jf6/s+Y=";
+  vendorHash = "sha256-E7Uh5nG6elUhEa+4RCtgGrle0Py6TjRc+OOvjtik1D8=";
 
   ldflags = [
     "-s"

From 31085ec4b31bdf6044a4eb92285d5435b3482b76 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 10 Jun 2026 19:26:31 +0000
Subject: [PATCH 31/71] urlscan: 1.0.8 -> 1.0.9

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

diff --git a/pkgs/by-name/ur/urlscan/package.nix b/pkgs/by-name/ur/urlscan/package.nix
index f31285e03d09..11a098dc5081 100644
--- a/pkgs/by-name/ur/urlscan/package.nix
+++ b/pkgs/by-name/ur/urlscan/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "urlscan";
-  version = "1.0.8";
+  version = "1.0.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "firecat53";
     repo = "urlscan";
     tag = finalAttrs.version;
-    hash = "sha256-7Sq+5dWbrPofRP54xr/UTfjAxJ7EVXQyGz3zzHLZd2Y=";
+    hash = "sha256-WWnWQRDo2Q023qLvR5gExE0uptYRGErnFmd7dZNJQ+k=";
   };
 
   build-system = with python3.pkgs; [

From 553af601e92ae7a90a4761e8024c283a7442dcd5 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Thu, 11 Jun 2026 00:31:12 +0800
Subject: [PATCH 32/71] emacs: work around upstream Emacs bug#81105[1] for
 Emacs 31

Emacs 31 changes[3] the behavior of extending info path for installed
elisp pkgs at startup.  Previously, it called function
`info-initialize' and extended `Info-directory-list'.  Now, it does
not call function `info-initialize' and instead extends
`Info-default-directory-list' in most cases.

The new behavior does not work if Emacs is started with an environment
variable INFOPATH without a trailing ":".  This is tracked in upstream
Emacs bug#81105[1].

Also note that Emacs 31 changes the order of startup operations[2] to
this:

1. load site-start.el
2. load early-init.el
3. active packages
4. load init.el
5. load default.el
6. handle CLI args such as --eval

This patch works around bug#81105[1] by adding a trailing ":" to
INFOPATH when needed in site-start.el.  An alternative workaround is
to call function `info-initialize' in site-start.el, which
basically (not 100%, due to the startup order changes) keeps the old
behavior of Emacs 30.

Both workarounds invalidate part of `Info-directory-list' docstring.
The workaround used in this patch makes users unable to ignore
default info path items[4] like `Info-default-directory-list' when
initializing `Info-directory-list'.  The alternative one basically
always ignores `Info-default-directory-list' when initializing
`Info-directory-list' because `info-initialize` is called too early
and `Info-default-directory-list' has no value yet.  Note that the
alternative workaround does allow users to decide if they want other
default info path items[4] such as `configure-info-directory'.

In addition, the workaround used in this patch should be faster than
the alternative one.

Both workarounds can be undone by users.  To undo the one used in this
patch, users can removed the added ":" of INFOPATH in early-init.el.
For the alternative workaround, users need to re-initialize info path
after package activation like this:
(progn (setq Info-directory-list nil) (info-initialize)).

[1]: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=81105
[2]: see the `command-line' function in startup.el
[3]: 7c22a7d312c7a3f3b6b511df5e6334ad8b2795b1
[4]: see the `Info-default-dirs' function in info.el
---
 pkgs/applications/editors/emacs/site-start.el | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/applications/editors/emacs/site-start.el b/pkgs/applications/editors/emacs/site-start.el
index 8c7ea3dfc913..06e13c756759 100644
--- a/pkgs/applications/editors/emacs/site-start.el
+++ b/pkgs/applications/editors/emacs/site-start.el
@@ -72,6 +72,14 @@ least specific (the system profile)"
                          (nix--profile-paths))
                  woman-manpath)))
 
+;;; Make info manuals of installed elisp pkgs available (work around Emacs bug#81105)
+(when-let* ((path (getenv "INFOPATH")))
+  ;; Normally, Emacs 31 extends `Info-default-directory-list' when activating elisp pkgs.
+  ;; We add a trailing path-separator ":" to INFOPATH when needed
+  ;; to ensure `Info-default-directory-list' is used to initialize `Info-directory-list'.
+  (unless (string-suffix-p path-separator path)
+    (setenv "INFOPATH" (concat path path-separator))))
+
 ;;; Make tramp work for remote NixOS machines
 (defvar tramp-remote-path)
 (eval-after-load 'tramp

From 16fd1aa718db6f9407112fecfa1cb10345b8ee01 Mon Sep 17 00:00:00 2001
From: Aiden Schembri <aidsch0605@outlook.com>
Date: Wed, 10 Jun 2026 21:49:04 +0200
Subject: [PATCH 33/71] zed-editor: 1.5.4 -> 1.6.3

---
 pkgs/by-name/ze/zed-editor/package.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index a1ffef86f5ec..094749694b18 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -98,7 +98,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "1.5.4";
+  version = "1.6.3";
 
   outputs = [
     "out"
@@ -111,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-I9+v5qeubBA9bAS4OU7V/BsxxfP5rj9aS4xvopbF578=";
+    hash = "sha256-9YdmsOtqjQT79R5IwrAtinaJ741xjyW1kZxZiEC0dAc=";
   };
 
   postPatch = ''
@@ -134,13 +134,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail 'builder.include(&glib_path_config);' 'builder.include("${lib.getLib glib}/lib/glib-2.0/include");'
   '';
 
-  # remove package that has a broken Cargo.toml
-  # see: https://github.com/NixOS/nixpkgs/pull/445924#issuecomment-3334648753
-  depsExtraArgs.postBuild = ''
-    rm -r $out/git/*/candle-book/
-  '';
-
-  cargoHash = "sha256-x40nSnpksKX+JFuN1RSsVm3OrrArb0rtalQplLstAd8=";
+  cargoHash = "sha256-U7vOTZsWtOTP3XCn5iSVvM1HmuvG+bRMMjN1EbB/TkI=";
 
   __structuredAttrs = true;
 

From 1f69a29f9f3e15fd366f2384d4e2a4be1a18bc16 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 10 Jun 2026 22:32:09 +0200
Subject: [PATCH 34/71] python3Packages.types-deprecated: 1.3.1.20251101 ->
 1.3.1.20260520

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

diff --git a/pkgs/development/python-modules/types-deprecated/default.nix b/pkgs/development/python-modules/types-deprecated/default.nix
index b9d6243a8657..0fe1c6d398fc 100644
--- a/pkgs/development/python-modules/types-deprecated/default.nix
+++ b/pkgs/development/python-modules/types-deprecated/default.nix
@@ -7,15 +7,21 @@
 
 buildPythonPackage rec {
   pname = "types-deprecated";
-  version = "1.3.1.20251101";
+  version = "1.3.1.20260520";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_deprecated";
     inherit version;
-    hash = "sha256-8ALSZrcyAfRuxvxxLB8BYGfsbLRDV1Wc21DIawEJUac=";
+    hash = "sha256-TQ2eVSFDLZzogWn7i3k7RdcNjozBp+zVpEZau/g8mrQ=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools>=82.0.1" "setuptools" \
+      --replace-fail "'deprecated-stubs' =" "'*' ="
+  '';
+
   build-system = [ setuptools ];
 
   # Modules has no tests

From e0c2076f7791a85d908a022918eb98f00056a3eb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 10 Jun 2026 22:34:16 +0200
Subject: [PATCH 35/71] python3Packages.types-deprecated: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/types-deprecated/default.nix b/pkgs/development/python-modules/types-deprecated/default.nix
index 0fe1c6d398fc..2752f60a592c 100644
--- a/pkgs/development/python-modules/types-deprecated/default.nix
+++ b/pkgs/development/python-modules/types-deprecated/default.nix
@@ -5,14 +5,14 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "types-deprecated";
   version = "1.3.1.20260520";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_deprecated";
-    inherit version;
+    inherit (finalAttrs) version;
     hash = "sha256-TQ2eVSFDLZzogWn7i3k7RdcNjozBp+zVpEZau/g8mrQ=";
   };
 
@@ -35,4 +35,4 @@ buildPythonPackage rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 014cc8b5eee6a6d7003d5898ccbf79fa83cc0563 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 10 Jun 2026 22:34:24 +0000
Subject: [PATCH 36/71] lstk: 0.10.0 -> 0.11.0

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

diff --git a/pkgs/by-name/ls/lstk/package.nix b/pkgs/by-name/ls/lstk/package.nix
index b9e89be7d2f3..022d2797a46a 100644
--- a/pkgs/by-name/ls/lstk/package.nix
+++ b/pkgs/by-name/ls/lstk/package.nix
@@ -7,7 +7,7 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "lstk";
-  version = "0.10.0";
+  version = "0.11.0";
 
   __structuredAttrs = true;
 
@@ -15,7 +15,7 @@ buildGoModule (finalAttrs: {
     owner = "localstack";
     repo = "lstk";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-hypUvZWhYIT1WTd8M/DVCY1Cy4EApSwSnPWLIfc9Nng=";
+    sha256 = "sha256-2PViyzcJ2AGigfxLwQ5FnULV4zF0FPQIr6nqg5d90S4=";
   };
 
   vendorHash = "sha256-y/QlgdYS4IeU9Xf/2trHRvjB5QOHDbFDrF57y9B6jxI=";

From eb4f1c629f97b1ac91b2c6d00289ee0fb1e8797a Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 8 Jun 2026 22:48:17 +0200
Subject: [PATCH 37/71] python3Packages.uarray: 0.9.3 -> 0.9.4

Changelog: https://github.com/Quansight-Labs/uarray/releases/tag/0.9.4
---
 .../python-modules/uarray/default.nix         | 41 ++++++-------------
 1 file changed, 13 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix
index acf010a08e74..479fd09413a6 100644
--- a/pkgs/development/python-modules/uarray/default.nix
+++ b/pkgs/development/python-modules/uarray/default.nix
@@ -2,57 +2,42 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  scikit-build-core,
-  setuptools,
-  setuptools-scm,
-  cmake,
-  ninja,
-  matchpy,
-  numpy,
-  typing-extensions,
+  meson-python,
+  versioningit,
+  pkg-config,
   nix-update-script,
   pytestCheckHook,
-  pytest-cov-stub,
 }:
 
 buildPythonPackage rec {
   pname = "uarray";
-  version = "0.9.3";
+  version = "0.9.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Quansight-Labs";
     repo = "uarray";
     tag = version;
-    hash = "sha256-Nog7jvRG/EFf3n3W2DWC7UML5NyrlaaS0ECis5rtCSk=";
+    hash = "sha256-gCoSpyFPQTIi86y+4xtRb+vsRkjZ2O6KcCj8mj8tcTQ=";
   };
 
+  preBuild = ''
+    echo "__version__ = '$version'" > src/uarray/_version.py
+  '';
+
   build-system = [
-    scikit-build-core
-    setuptools
-    setuptools-scm
-    cmake
-    ninja
+    meson-python
+    versioningit
   ];
 
-  dontUseCmakeConfigure = true;
-
-  dependencies = [
-    matchpy
-    numpy
-    typing-extensions
+  nativeBuildInputs = [
+    pkg-config
   ];
 
   nativeCheckInputs = [
     pytestCheckHook
-    pytest-cov-stub
   ];
 
-  # Tests must be run from outside the source directory
-  preCheck = ''
-    cd $TMP
-  '';
-
   pytestFlags = [
     "--pyargs"
     "uarray"

From 44cfc6c29924821e816c6dac5adead7d8f043438 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 10 Jun 2026 19:15:26 -0500
Subject: [PATCH 38/71] vimPlugins: update on 2026-06-10

- fugit2-nvim: patch upstream require typo fugit2.core.pendulum ->
  fugit2.util.pendulum introduced by upstream utils move
- live-share-nvim: load libcrypto from nixpkgs openssl via absolute
  path; FFI-loading the system libcrypto aborts the process on darwin
- openscad-nvim: drop zathura, plugin now uses configurable
  vim.g.openscad_pdf_cmd instead of hardcoding zathura
- vCoolor-vim: only add zenity on linux, plugin uses AppleScript on
  darwin
---
 .../editors/vim/plugins/generated.nix         | 364 +++++++++---------
 .../editors/vim/plugins/overrides.nix         |  28 +-
 2 files changed, 202 insertions(+), 190 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index af2ae0423ce2..65faa0676f7c 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -446,12 +446,12 @@ final: prev: {
 
   SchemaStore-nvim = buildVimPlugin {
     pname = "SchemaStore.nvim";
-    version = "0-unstable-2026-06-04";
+    version = "0-unstable-2026-06-10";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "SchemaStore.nvim";
-      rev = "fce1d90e76c59337b6d3778c272c1b972a658269";
-      hash = "sha256-L8Z1w9et3mExtffCxm0cTeOzHPViQAy+d0xdPNUoej4=";
+      rev = "961c2a806abf56d4e100713ec9dc71d2c8d9d022";
+      hash = "sha256-p4YkQeJybRAbZ2zwK39rm/0Q5iSJqYlhJde7bXV6J/Y=";
     };
     meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -926,12 +926,12 @@ final: prev: {
     pname = "amp.nvim";
     version = "0-unstable-2025-12-15";
     src = fetchFromGitHub {
-      owner = "sourcegraph";
+      owner = "ampcode";
       repo = "amp.nvim";
       rev = "3b9ad5ef0328de1b35cc9bfa723a37db5daf9434";
       hash = "sha256-f/li32jpVigbZANnnbgSArnOH4nusj0DUz7952K+Znw=";
     };
-    meta.homepage = "https://github.com/sourcegraph/amp.nvim/";
+    meta.homepage = "https://github.com/ampcode/amp.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
@@ -1064,12 +1064,12 @@ final: prev: {
 
   astrocore = buildVimPlugin {
     pname = "astrocore";
-    version = "3.0.4";
+    version = "3.0.5";
     src = fetchFromGitHub {
       owner = "AstroNvim";
       repo = "astrocore";
-      tag = "v3.0.4";
-      hash = "sha256-XQPoaZy4BS6eI5CCrLoGxRmMrsridddjsBnfRm3U5SI=";
+      tag = "v3.0.5";
+      hash = "sha256-YH9mb8d/mwzvR0w/UQVzI27dad1x5B5uTkZcxFb6uAQ=";
     };
     meta.homepage = "https://github.com/AstroNvim/astrocore/";
     meta.license = getLicenseFromSpdxId "GPL-3.0-only";
@@ -1120,12 +1120,12 @@ final: prev: {
 
   async-nvim = buildVimPlugin {
     pname = "async.nvim";
-    version = "0-unstable-2026-04-18";
+    version = "0-unstable-2026-06-10";
     src = fetchFromGitHub {
       owner = "lewis6991";
       repo = "async.nvim";
-      rev = "7a1d7d49933fbe902b84b55f352a3b10fd587331";
-      hash = "sha256-uyUvZVN7L7SqPAE1woc1T8dlhpH24FBj3/WD4VMwWF8=";
+      rev = "f72017409d703ecf25972a05c6f89acb31adb952";
+      hash = "sha256-E8ZS7m2QejmImzmQ+wrgSUlC2x4tkMHv7xGt+XDqcXQ=";
     };
     meta.homepage = "https://github.com/lewis6991/async.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -1288,12 +1288,12 @@ final: prev: {
 
   augment-vim = buildVimPlugin {
     pname = "augment.vim";
-    version = "0.46.0-unstable-2026-01-12";
+    version = "0.48.1-unstable-2026-06-09";
     src = fetchFromGitHub {
       owner = "augmentcode";
       repo = "augment.vim";
-      rev = "c3219039c350f8cb08ba0764c4d94674ff71a3e0";
-      hash = "sha256-6BKH0HpTE+/w8S6v8U8TWhprQ93Vi+ctKDAHFiMRLdE=";
+      rev = "67f6a0eb405d5dbdcb1c735b1b9949963969f55d";
+      hash = "sha256-/T7Qex1AzmfzazLfr5UIoMjilORH5wd5XU5Sh8cZ34Q=";
     };
     meta.homepage = "https://github.com/augmentcode/augment.vim/";
     meta.license = unfree;
@@ -1400,12 +1400,12 @@ final: prev: {
 
   auto-session = buildVimPlugin {
     pname = "auto-session";
-    version = "2.5.1-unstable-2026-05-21";
+    version = "2.5.1-unstable-2026-06-10";
     src = fetchFromGitHub {
       owner = "rmagatti";
       repo = "auto-session";
-      rev = "3e145ee9af42eb6764908a1a481f53fe7f0bdbe5";
-      hash = "sha256-Ew7l61hyWpF1YkyvDEzh8U1+zIslPP5UQpOt7O242Qs=";
+      rev = "6cde3874a9283c2db55627acca5f28e4fa402320";
+      hash = "sha256-j9O2kLuBSCrwFDat4BJfzDSCjr3lm9BEWDPzN0KWFvk=";
     };
     meta.homepage = "https://github.com/rmagatti/auto-session/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -1582,12 +1582,12 @@ final: prev: {
 
   barbar-nvim = buildVimPlugin {
     pname = "barbar.nvim";
-    version = "1.9.1-unstable-2026-04-28";
+    version = "1.9.1-unstable-2026-06-10";
     src = fetchFromGitHub {
       owner = "romgrk";
       repo = "barbar.nvim";
-      rev = "a4bef5b4fc1f064f2f673172252028eae18191c9";
-      hash = "sha256-D2/zgmi+dgq8w00ZdPDbppaPaXi/AYNnDOyYMG7nJ5I=";
+      rev = "337ecfadb8bf005050990bf2f624dc4fc828dabd";
+      hash = "sha256-Vnr3HVwZYxlkVzBRIS3F7aEuKvrTz4cyzbYsy/mtFuc=";
     };
     meta.homepage = "https://github.com/romgrk/barbar.nvim/";
     meta.license = unfree;
@@ -2547,12 +2547,12 @@ final: prev: {
 
   claudecode-nvim = buildVimPlugin {
     pname = "claudecode.nvim";
-    version = "0.3.0-unstable-2026-06-03";
+    version = "0.3.0-unstable-2026-06-09";
     src = fetchFromGitHub {
       owner = "coder";
       repo = "claudecode.nvim";
-      rev = "8ec321279d3d9eddb0ce5f52d4b0d051dafb5743";
-      hash = "sha256-l/PcQlCSQKr0aSfnPUwRf7rY6QAx9u5twYsSX72B4xI=";
+      rev = "7b8b7090c16f4151401a281741a4bf37050ebd26";
+      hash = "sha256-NHhoAqCTa1+go+DYFj25eH0ZDmAqbA9tpHtj3IarCUU=";
     };
     meta.homepage = "https://github.com/coder/claudecode.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -2631,12 +2631,12 @@ final: prev: {
 
   cmake-tools-nvim = buildVimPlugin {
     pname = "cmake-tools.nvim";
-    version = "0-unstable-2026-04-28";
+    version = "0-unstable-2026-06-05";
     src = fetchFromGitHub {
       owner = "Civitasv";
       repo = "cmake-tools.nvim";
-      rev = "f9a3eb2be0b8148df470244e5c25aede3a3a28a5";
-      hash = "sha256-WJx/BYvYQDYL+/0ROXi4lzjaEcDOHSc+73qEIXxYuPI=";
+      rev = "38f320fb9f0c4c9f1019f412f561c4d370a94d23";
+      hash = "sha256-U8lLK5FzeOiJVUI0Y3AQ7TM+21tegMnnRbn18c7yXfc=";
     };
     meta.homepage = "https://github.com/Civitasv/cmake-tools.nvim/";
     meta.license = getLicenseFromSpdxId "GPL-3.0-only";
@@ -2687,11 +2687,11 @@ final: prev: {
 
   cmp-async-path = buildVimPlugin {
     pname = "cmp-async-path";
-    version = "0-unstable-2026-01-28";
+    version = "0-unstable-2026-06-09";
     src = fetchgit {
       url = "https://codeberg.org/FelipeLema/cmp-async-path/";
-      rev = "f8af3f726e07f2e9d37672eaa9102581aefce149";
-      hash = "sha256-ALMK7TnEB7/UZibVgOl4r6/gYsHCo6YAZcAR536VL4g=";
+      rev = "98185a91d49ff5dd249aebf2f7456e18063fa2a0";
+      hash = "sha256-IbKvelOwrNRFHjWRQ8yydLMpL1fok2PZzaB/uJfzbkw=";
     };
     meta.homepage = "https://codeberg.org/FelipeLema/cmp-async-path/";
     meta.license = unfree;
@@ -3484,12 +3484,12 @@ final: prev: {
 
   coc-nvim = buildVimPlugin {
     pname = "coc.nvim";
-    version = "0.0.82-unstable-2026-06-03";
+    version = "0.0.82-unstable-2026-06-08";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "a1a5c2fe902ef637eede94a03b470cab17096002";
-      hash = "sha256-NBajKELH3hpYN1wb9vq03ty8WQb3wJMcrU0J3cV9EPo=";
+      rev = "92ab906cab1e6b19ad03f754df4f3930f9eae22c";
+      hash = "sha256-c0ChbihCajCuEh1hu5XOFtomiFA6OzbCl7eNpzPfBXM=";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
     meta.license = unfree;
@@ -3568,12 +3568,12 @@ final: prev: {
 
   codecompanion-nvim = buildVimPlugin {
     pname = "codecompanion.nvim";
-    version = "19.14.0";
+    version = "19.15.0";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "codecompanion.nvim";
-      tag = "v19.14.0";
-      hash = "sha256-/cx7LV866OPfTaK781dPbouPRjb2HXJZ3SwGVU/rnsA=";
+      tag = "v19.15.0";
+      hash = "sha256-M/2pkFeL+sWwrXiCcE38WWmPb73kdCwC8AWg3ldScY0=";
     };
     meta.homepage = "https://github.com/olimorris/codecompanion.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -4115,12 +4115,12 @@ final: prev: {
 
   coq-artifacts = buildVimPlugin {
     pname = "coq.artifacts";
-    version = "0-unstable-2025-01-20";
+    version = "0-unstable-2026-06-08";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq.artifacts";
-      rev = "ef5f21d638ccc456cfa5b8d0ab37093cefe48c8b";
-      hash = "sha256-91OF1qsqAln/E8H1vJLQHIdnpcEmTn1NCPgSU2768EA=";
+      rev = "d545035d06408f2d68cd03bc401425e42c298fc4";
+      hash = "sha256-E3FG8Q+VZwrcCcynIXdZarXDJFD9fuj7OvEgEuDKhCU=";
     };
     meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
     meta.license = unfree;
@@ -4171,12 +4171,12 @@ final: prev: {
 
   coq_nvim = buildVimPlugin {
     pname = "coq_nvim";
-    version = "0-unstable-2026-04-23";
+    version = "0-unstable-2026-06-10";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq_nvim";
-      rev = "bcc1bf327b98042e6a77a9637cd465cbceca2679";
-      hash = "sha256-GKwfDWCKSJ6uQ8PZfKUW3MjMYtEhKVhmkJzbmdQkF9Y=";
+      rev = "5054268e58e9e45dbdae598c2d7cca232085d2ce";
+      hash = "sha256-SxffEztUDSXp1skO52Pi8XQCinWwFbw34Nn3cvC9GW8=";
     };
     meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
     meta.license = getLicenseFromSpdxId "GPL-3.0-only";
@@ -4479,12 +4479,12 @@ final: prev: {
 
   dart-vim-plugin = buildVimPlugin {
     pname = "dart-vim-plugin";
-    version = "0.1.0-unstable-2026-04-04";
+    version = "0.1.0-unstable-2026-06-05";
     src = fetchFromGitHub {
       owner = "dart-lang";
       repo = "dart-vim-plugin";
-      rev = "dd74e59c50e29896483a87373743136f2cbd24e7";
-      hash = "sha256-nsJKWCNJ3InidTaP0/cQ65YIX/6a1/wH56rlkNkJWJE=";
+      rev = "13fa42674f1685a1c5a095c1dac74d94e43a9849";
+      hash = "sha256-LLi4DwYKyAyP2EI4zZU3ab+yj3zQ956zMGE+aTmfF7M=";
     };
     meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/";
     meta.license = getLicenseFromSpdxId "BSD-3-Clause";
@@ -5419,12 +5419,12 @@ final: prev: {
 
   easy-dotnet-nvim = buildVimPlugin {
     pname = "easy-dotnet.nvim";
-    version = "0-unstable-2026-06-04";
+    version = "0-unstable-2026-06-09";
     src = fetchFromGitHub {
       owner = "GustavEikaas";
       repo = "easy-dotnet.nvim";
-      rev = "9c39976abe0c9d412a388b66ae212db99f4b9783";
-      hash = "sha256-1EsZNc9AueNbJQiWnwiGgR2UrthV4jr9uUCBWgtlGOI=";
+      rev = "5c9577f6fc086e211ccc7d93b763e9a5ace4e64b";
+      hash = "sha256-E+f0SHaTN8FI3gEs4t+6NuS5xn45kneK39kSam+Ya9M=";
     };
     meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -5701,12 +5701,12 @@ final: prev: {
 
   everforest = buildVimPlugin {
     pname = "everforest";
-    version = "0.3.0-unstable-2026-04-16";
+    version = "0.3.0-unstable-2026-06-08";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "everforest";
-      rev = "aeef62ee97872d2557d25904d160ec93a4a355f8";
-      hash = "sha256-fkNyypxo1fm0rkV1CKayLLMHObsjgSI2nndhkpXHlFc=";
+      rev = "85a86eb62409e3ec88713bff3d1b9d7374e112e4";
+      hash = "sha256-286paC/KOSs9XU4k9q8DMVsi84V9LGT22Z4RzFKVSbM=";
     };
     meta.homepage = "https://github.com/sainnhe/everforest/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -5812,12 +5812,12 @@ final: prev: {
 
   faster-nvim = buildVimPlugin {
     pname = "faster.nvim";
-    version = "0.2.0";
+    version = "0.2.1";
     src = fetchFromGitHub {
       owner = "pteroctopus";
       repo = "faster.nvim";
-      tag = "v0.2.0";
-      hash = "sha256-bm3qnQ9iEW2N+3/VXjwOVT8nGCs5+TiPCKXfhOQ4tuE=";
+      tag = "v0.2.1";
+      hash = "sha256-CIwZCMgErtXc9+EV6xTXvoxfmo0/qwDf1iuS8nlv/rQ=";
     };
     meta.homepage = "https://github.com/pteroctopus/faster.nvim/";
     meta.license = unfree;
@@ -5896,12 +5896,12 @@ final: prev: {
 
   file-line = buildVimPlugin {
     pname = "file-line";
-    version = "1.0-unstable-2016-10-21";
+    version = "1.0-unstable-2026-06-04";
     src = fetchFromGitHub {
       owner = "bogado";
       repo = "file-line";
-      rev = "559088afaf10124ea663ee0f4f73b1de48fb1632";
-      hash = "sha256-r47H2vfQQM283YIMZFGjLfTxu6mHy1BN/VsiCcEbKPA=";
+      rev = "067ebe45dd3da0344d543b09441ee9b7fd886851";
+      hash = "sha256-B395F/kcBUC/fkGaSOzlJboN0epBUcyno2vYemY+zZM=";
     };
     meta.homepage = "https://github.com/bogado/file-line/";
     meta.license = unfree;
@@ -6262,12 +6262,12 @@ final: prev: {
 
   fugit2-nvim = buildVimPlugin {
     pname = "fugit2.nvim";
-    version = "0.2.1-unstable-2026-05-24";
+    version = "0.2.1-unstable-2026-06-07";
     src = fetchFromGitHub {
       owner = "SuperBo";
       repo = "fugit2.nvim";
-      rev = "d6513bfc443470a85426ab366be591aadd444053";
-      hash = "sha256-bvr/iosdWFGUEfbwELCdV/tnlxeDfg/94AssXGVZSEw=";
+      rev = "7783d338436a60c337a624e22753a50e37df3fa6";
+      hash = "sha256-woHURSVLIx3/ecHHMfiO9P2rXRLcfG9mt3WZm/5esL8=";
     };
     meta.homepage = "https://github.com/SuperBo/fugit2.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -6682,11 +6682,11 @@ final: prev: {
 
   gitlab-vim = buildVimPlugin {
     pname = "gitlab.vim";
-    version = "1.1.0-unstable-2026-05-21";
+    version = "1.1.0-unstable-2026-06-10";
     src = fetchgit {
       url = "https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim";
-      rev = "9e196cf8497eb99c4a0834f801d2f55499630cc9";
-      hash = "sha256-yXVtP6SZ5H121VWUiFTDcWZ2l/xst1O38jI3iBav6VA=";
+      rev = "eaddfb6717d7d1118b40403dd8ae76b79e28eb33";
+      hash = "sha256-RSPu9WhHfb5JyaYYZGJ4tYe0USOQ4ap68Z27ZhkA5Vc=";
     };
     meta.homepage = "https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim";
     meta.license = unfree;
@@ -6919,12 +6919,12 @@ final: prev: {
 
   gruvbox = buildVimPlugin {
     pname = "gruvbox";
-    version = "3.0.1-rc.0-unstable-2025-04-20";
+    version = "3.0.1-rc.0-unstable-2026-06-08";
     src = fetchFromGitHub {
       owner = "morhetz";
       repo = "gruvbox";
-      rev = "697c00291db857ca0af00ec154e5bd514a79191f";
-      hash = "sha256-fmX4WuD25BaaJBZCcUyrtgq1a39tVpxLe3KE72dcQT4=";
+      rev = "5d15b2765f59754d7ac263c88a0f6e3e58124951";
+      hash = "sha256-cVUOwm7TudiLNQxnmOfjDMth61f5ndDqxYSl15fQzSE=";
     };
     meta.homepage = "https://github.com/morhetz/gruvbox/";
     meta.license = unfree;
@@ -7073,12 +7073,12 @@ final: prev: {
 
   guh-nvim = buildVimPlugin {
     pname = "guh.nvim";
-    version = "2026-06-09";
+    version = "0.0.1-unstable-2026-06-10";
     src = fetchFromGitHub {
       owner = "justinmk";
       repo = "guh.nvim";
-      rev = "e8d8df780eb13da78a992fdc387bbc5f1401dd6f";
-      hash = "sha256-vkBP9TvNbUsChtntdgFkHaT01R84HfUAjGXk+SbZUng=";
+      rev = "89bca23616361fa316c72b1171bc7aa3401800be";
+      hash = "sha256-HEDQMSbWWg7UEru+hf0cT+7KbIMi1r1cU5YcgaBLq/E=";
     };
     meta.homepage = "https://github.com/justinmk/guh.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -7438,12 +7438,12 @@ final: prev: {
 
   hlargs-nvim = buildVimPlugin {
     pname = "hlargs.nvim";
-    version = "0-unstable-2025-09-23";
+    version = "0-unstable-2026-06-05";
     src = fetchFromGitHub {
       owner = "m-demare";
       repo = "hlargs.nvim";
-      rev = "0b29317c944fb1f76503ce4540d6dceffbb5ccd2";
-      hash = "sha256-WjmVefR0qk2ANWgyHSuYMTuCfzlVTF7tqzAL+uatKkc=";
+      rev = "05f3d1789642d5e1807121c05c42a5e883ba46d3";
+      hash = "sha256-daCx0OHqsGNasfnxHxVO2309aS8LYZIxbeaZ/pEtNFU=";
     };
     meta.homepage = "https://github.com/m-demare/hlargs.nvim/";
     meta.license = getLicenseFromSpdxId "GPL-3.0-only";
@@ -8460,12 +8460,12 @@ final: prev: {
 
   kulala-nvim = buildVimPlugin {
     pname = "kulala.nvim";
-    version = "6.8.1";
+    version = "6.9.2";
     src = fetchFromGitHub {
       owner = "mistweaverco";
       repo = "kulala.nvim";
-      tag = "v6.8.1";
-      hash = "sha256-EM+NNUeQhY38hNtwQklLL41g2aTvj4gdyvrD7770Y3Y=";
+      tag = "v6.9.2";
+      hash = "sha256-7q/lV939qxozpsE0SM272ztSdzqIDuAdrgXSITCDLko=";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/mistweaverco/kulala.nvim/";
@@ -8671,11 +8671,11 @@ final: prev: {
 
   leap-nvim = buildVimPlugin {
     pname = "leap.nvim";
-    version = "0-unstable-2026-05-17";
+    version = "0-unstable-2026-06-10";
     src = fetchgit {
       url = "https://codeberg.org/andyg/leap.nvim/";
-      rev = "59d70b1bdf8e76e0637e6ebcc150fb6767f67fc5";
-      hash = "sha256-B3nwquR/ilBtuIPXw0r0048Ougt1VZ7FUFhT66yAH+8=";
+      rev = "d7f8ee64155b7790188f17a993390f32577cfb81";
+      hash = "sha256-x+oaVsaY69GrKtEt+8BS+XlRCc0QkYO1b7I4AABc/zs=";
     };
     meta.homepage = "https://codeberg.org/andyg/leap.nvim/";
     meta.license = unfree;
@@ -9104,12 +9104,12 @@ final: prev: {
 
   llama-vim = buildVimPlugin {
     pname = "llama.vim";
-    version = "0-unstable-2026-05-12";
+    version = "0-unstable-2026-06-05";
     src = fetchFromGitHub {
       owner = "ggml-org";
       repo = "llama.vim";
-      rev = "0e26efd52491bc83f81991c4f09252f688b9746e";
-      hash = "sha256-Gfhj8fTFdHgny3meBakVVIrxu9KOUau8FMQ+iTDnRtA=";
+      rev = "77db2afe488a7f700a2027527f17ab771988e358";
+      hash = "sha256-TP9bjCeZCq0dqE1C5dXdNJWFKcXDNcsUbdVKdNZkOOg=";
     };
     meta.homepage = "https://github.com/ggml-org/llama.vim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9160,12 +9160,12 @@ final: prev: {
 
   lsp-format-nvim = buildVimPlugin {
     pname = "lsp-format.nvim";
-    version = "2.7.2";
+    version = "2.7.3";
     src = fetchFromGitHub {
       owner = "lukas-reineke";
       repo = "lsp-format.nvim";
-      tag = "v2.7.2";
-      hash = "sha256-x++L67u2mE95Zeh+ZIh6mJa+ZfMm6/5JLtHZmC/EVR4=";
+      tag = "v2.7.3";
+      hash = "sha256-D6N3dQq4WHticdHjrPr3edx775JV3H9/GlFVTR7dqoY=";
     };
     meta.homepage = "https://github.com/lukas-reineke/lsp-format.nvim/";
     meta.license = unfree;
@@ -9818,12 +9818,12 @@ final: prev: {
 
   mini-ai = buildVimPlugin {
     pname = "mini.ai";
-    version = "0.17.0-unstable-2026-06-04";
+    version = "0.17.0-unstable-2026-06-05";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.ai";
-      rev = "268ee376924c4c6a75935e9be73d3db5ad2eec46";
-      hash = "sha256-BJjfbCo7G5hLg1kw+TFQzwmBYaDjTarTAIk8K6HJpTI=";
+      rev = "4511b3481707c1d021485475d34f2ed2a50bf47b";
+      hash = "sha256-weROF3Xf/XzUYJyI1NGm1HRnWEWjWbiEc5th5Gv55Tk=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.ai/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9832,12 +9832,12 @@ final: prev: {
 
   mini-align = buildVimPlugin {
     pname = "mini.align";
-    version = "0.17.0-unstable-2026-06-04";
+    version = "0.17.0-unstable-2026-06-05";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.align";
-      rev = "36b0cd9f8b315946849e37f4d0918cf01bb66214";
-      hash = "sha256-CQk91ao7clv9urKHuEWb47LoWawXg/LpiycJTnDsZ3c=";
+      rev = "a7cd9465ac72c65d726f8fdc8b71ceb63ce8c0fd";
+      hash = "sha256-SBc4LHrQ2WqJINLjJC3qQfTfKVP7p6gxa7D+sz15CSc=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.align/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9916,12 +9916,12 @@ final: prev: {
 
   mini-clue = buildVimPlugin {
     pname = "mini.clue";
-    version = "0.17.0-unstable-2026-05-19";
+    version = "0.17.0-unstable-2026-06-05";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.clue";
-      rev = "0e37cddd6307eb40248e4226be65304e85df1d18";
-      hash = "sha256-96h7E3O3Akakd1BxlACWn0O5ALQzyP8nJXSqZ4c5f0Y=";
+      rev = "4b3db71003fa06200680afb9f1d05506b79eb953";
+      hash = "sha256-6ttyphQgT3yjWOOzmLKzSqQUtyah2FvZz3jDprqKjno=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.clue/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10042,12 +10042,12 @@ final: prev: {
 
   mini-extra = buildVimPlugin {
     pname = "mini.extra";
-    version = "0.17.0-unstable-2026-05-29";
+    version = "0.17.0-unstable-2026-06-07";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.extra";
-      rev = "ffb7b3a726e059b011b3655f26e61ec6f7cf5b84";
-      hash = "sha256-ZG0Op0bHvAgS/avKgMwFz5PIVNx6PAxtO+4Qn+y/UVE=";
+      rev = "eb21c1117207d3aa1ae532c666c692e94909087e";
+      hash = "sha256-kViQTJ5jzCXf7McuikvwaqfzB54JSheyeiBzSKoq9vY=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.extra/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10056,12 +10056,12 @@ final: prev: {
 
   mini-files = buildVimPlugin {
     pname = "mini.files";
-    version = "0.17.0-unstable-2026-06-02";
+    version = "0.17.0-unstable-2026-06-05";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.files";
-      rev = "500f9e18f3ae387b5aecf2261e33845bc5dd7b68";
-      hash = "sha256-iOqdlnk+0xLtyQKxc53q/nEseato+Y34KjUM9NFDB1c=";
+      rev = "02874bc653fbecf2bee2c65441d0ebd09110f011";
+      hash = "sha256-IfV2W9EFVtfXofEbwiWwCK8zprJlXiAKZgvKhnsp/mc=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.files/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10140,12 +10140,12 @@ final: prev: {
 
   mini-indentscope = buildVimPlugin {
     pname = "mini.indentscope";
-    version = "0.17.0-unstable-2026-05-19";
+    version = "0.17.0-unstable-2026-06-07";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.indentscope";
-      rev = "ad19b1f02223391f3d40440f7ff10607f0043585";
-      hash = "sha256-rUmoWT/Sc9yAXXyKXI/Ho4VwZkwlsHx+/k2QE8uKlYA=";
+      rev = "98453149c3394ca3d1bf252e838e4777573b63e2";
+      hash = "sha256-6b6rVX74wp6cnSaQyZ0hCfWOD94skyFInZgg8JHD5HY=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.indentscope/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10154,12 +10154,12 @@ final: prev: {
 
   mini-input = buildVimPlugin {
     pname = "mini.input";
-    version = "0-unstable-2026-06-06";
+    version = "0-unstable-2026-06-07";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.input";
-      rev = "73a50edd8d0350feb8c018fe367121a241fd7c56";
-      hash = "sha256-6IC7krZ5pIKoR8t75h+z5yq3mKdyEaZ4iVl/dyc5Yis=";
+      rev = "44477bc40a1d9556decab08cd0e13187f9d909e4";
+      hash = "sha256-ex0BKThn97+lnWm6EaI4JuCViQ7B6na+n5yCX9OJavU=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.input/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10168,12 +10168,12 @@ final: prev: {
 
   mini-jump = buildVimPlugin {
     pname = "mini.jump";
-    version = "0.17.0-unstable-2026-05-19";
+    version = "0.17.0-unstable-2026-06-07";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.jump";
-      rev = "a0bb5dedc981a47826fc95498583b192c69353df";
-      hash = "sha256-DwzMkDl6TqahZ1niM06OxIFRdE553i5KJBMP8PdEuqg=";
+      rev = "741a2ac3ac4015a78ee5e7b90ba054508686457a";
+      hash = "sha256-q5e1HScZsQFNNiMBd9Kn4qjW+oV5XfZUtkBeYduZ9+o=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.jump/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10182,12 +10182,12 @@ final: prev: {
 
   mini-jump2d = buildVimPlugin {
     pname = "mini.jump2d";
-    version = "0.17.0-unstable-2026-06-04";
+    version = "0.17.0-unstable-2026-06-05";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.jump2d";
-      rev = "f68d0e583b7e340741c20aabc4a7fd650ad7f207";
-      hash = "sha256-jXcNC0YEV9C3hyqXv0giGzLJjb2OV6Xz/8yKek4whto=";
+      rev = "f95769bc20586f63d16d814175f759bf4d44bfd2";
+      hash = "sha256-AvkV549zYxtRnjWtZHwGwwPHMy1D2sWNxkUSUQhMyCE=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.jump2d/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10266,12 +10266,12 @@ final: prev: {
 
   mini-nvim = buildVimPlugin {
     pname = "mini.nvim";
-    version = "0.17.0-unstable-2026-06-04";
+    version = "0.17.0-unstable-2026-06-07";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.nvim";
-      rev = "cbae4fa396bbf9c802b3d2dc2e9c5362e8fb9468";
-      hash = "sha256-GjKn8zMkiN3ojucy5+aX2Kt+RD40m609tn9nj5kterk=";
+      rev = "ff8b3580935818ef2f21bdd651f057a2ae071eab";
+      hash = "sha256-wVRhe2ufPG/2DRtJGyAAhoCOTX8CLB2zZ8TQOQz9TqQ=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10308,12 +10308,12 @@ final: prev: {
 
   mini-pick = buildVimPlugin {
     pname = "mini.pick";
-    version = "0.17.0-unstable-2026-06-04";
+    version = "0.17.0-unstable-2026-06-06";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.pick";
-      rev = "34fdef3b0966974378c4f39e3ddb54ffc628fbe9";
-      hash = "sha256-xDSTxH8KgDxS/4AnTlmNaW8tkznG3HxIBcruFhvKJAg=";
+      rev = "1ffba38c7221669d3da7792d4bbe1c9761075f4d";
+      hash = "sha256-N/RdA7mEno3E5D4c9gxm9ZIlzAz3f7CPAJbyGEiECBM=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.pick/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10392,12 +10392,12 @@ final: prev: {
 
   mini-surround = buildVimPlugin {
     pname = "mini.surround";
-    version = "0.17.0-unstable-2026-06-04";
+    version = "0.17.0-unstable-2026-06-05";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.surround";
-      rev = "03dee7d518eb783907e5876cf569a18d7120b166";
-      hash = "sha256-EWYRBT6jtFv84Qy5t30DY5GA7GBorsWN6DRTucGY8y0=";
+      rev = "9fd5ebef2b34cc4ac3c0f1811a6726ea6d92fa91";
+      hash = "sha256-5dJ8GI9NtYbiAUvYdRjtxrTIUVS41VRkWvLtrBNqbhs=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.surround/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -11022,12 +11022,12 @@ final: prev: {
 
   neoconf-nvim = buildVimPlugin {
     pname = "neoconf.nvim";
-    version = "1.4.0-unstable-2026-06-04";
+    version = "1.4.0-unstable-2026-06-10";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "53ff3ce70013d7881f7216180f52b862ad9f6a72";
-      hash = "sha256-4O8lv9+EEeamn+6t5RbdXC5ZYqyt+5+txSTH+68Ntj8=";
+      rev = "3a0a976a10cba0ff9d9406e4652755881321ecf9";
+      hash = "sha256-hPv22eaPTY0UKoCxOXq/D1eUGOomAc8D0CB5mRs1ueQ=";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -12645,12 +12645,12 @@ final: prev: {
 
   nvim-dap-view = buildVimPlugin {
     pname = "nvim-dap-view";
-    version = "1.1.1";
+    version = "1.2.0";
     src = fetchFromGitHub {
       owner = "igorlfs";
       repo = "nvim-dap-view";
-      tag = "v1.1.1";
-      hash = "sha256-YMAP9csr7SHN2h5yPJ/nx1lezX9DaE0nLjVnr6c7xyw=";
+      tag = "v1.2.0";
+      hash = "sha256-JRFLk+Ok8Fo8yJzwVxstcnfSIztsg+I+yQp+3g3DMcA=";
     };
     meta.homepage = "https://github.com/igorlfs/nvim-dap-view/";
     meta.license = getLicenseFromSpdxId "GPL-3.0-only";
@@ -12771,12 +12771,12 @@ final: prev: {
 
   nvim-genghis = buildVimPlugin {
     pname = "nvim-genghis";
-    version = "0-unstable-2026-04-13";
+    version = "0-unstable-2026-06-05";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-genghis";
-      rev = "12d62b0aaeb0bf6e52f2335d532813a8b8105baa";
-      hash = "sha256-Lv92CKF0iocchQcK/AQ7TMVqGILnzd+Z8eKZZYXcwxU=";
+      rev = "e6fd1f42736b15e63c0c703457c5ca162228a2f3";
+      hash = "sha256-UG3yDZJ/j4Z+fDm5/qrVuUUA8rU4oc4chqFJK25jjYw=";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -13077,11 +13077,11 @@ final: prev: {
 
   nvim-lint = buildVimPlugin {
     pname = "nvim-lint";
-    version = "05-unstable-2026-05-19";
+    version = "05-unstable-2026-06-06";
     src = fetchgit {
       url = "https://codeberg.org/mfussenegger/nvim-lint/";
-      rev = "d48f3a76189d03b2239f6df1b2f7e3fa8353743b";
-      hash = "sha256-5mlNCE0KFGfJTocV5NMlczZMmZKGzxqVdUO23KVZ4O8=";
+      rev = "99cbc3ca8a76845fca50e496be7212bebf907dd3";
+      hash = "sha256-c0LEEbbWHZAKk+dpLGOjKvS1miuYLsxUM3AUf/t9ti8=";
     };
     meta.homepage = "https://codeberg.org/mfussenegger/nvim-lint/";
     meta.license = unfree;
@@ -13132,12 +13132,12 @@ final: prev: {
 
   nvim-lspconfig = buildVimPlugin {
     pname = "nvim-lspconfig";
-    version = "2.9.0";
+    version = "2.10.0";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      tag = "v2.9.0";
-      hash = "sha256-FuajmzcxEFxl4ZDJIJk23x2k0cqq/YRhRzzGvdVwN9M=";
+      tag = "v2.10.0";
+      hash = "sha256-RDhwY+C2ZHZPPRe1yvgJqonLcez77dVYvTIttVnFPis=";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -13412,12 +13412,12 @@ final: prev: {
 
   nvim-pqf = buildVimPlugin {
     pname = "nvim-pqf";
-    version = "0-unstable-2024-05-20";
+    version = "0-unstable-2026-06-10";
     src = fetchFromGitHub {
       owner = "yorickpeterse";
       repo = "nvim-pqf";
-      rev = "148ee2ca8b06d83fd9bf6f9b9497724ad39a07d6";
-      hash = "sha256-5VH1ffXvQuMDm32xt2t2UlEJiKuZWbkAMTXJic/8BYI=";
+      rev = "0f11180718b861986ac06a2fef16c404a58b3645";
+      hash = "sha256-qTGnbLbaTf+k8ujHqvXXzxHbnEFvWukYuKIW3gKt1Jw=";
     };
     meta.homepage = "https://github.com/yorickpeterse/nvim-pqf/";
     meta.license = getLicenseFromSpdxId "MPL-2.0";
@@ -13636,12 +13636,12 @@ final: prev: {
 
   nvim-surround = buildVimPlugin {
     pname = "nvim-surround";
-    version = "4.0.5-unstable-2026-05-02";
+    version = "4.0.5-unstable-2026-06-08";
     src = fetchFromGitHub {
       owner = "kylechui";
       repo = "nvim-surround";
-      rev = "2e93e154de9ff326def6480a4358bfc149d5da2c";
-      hash = "sha256-U3nm27yb+Hz9MiB3yclO/TlB1AgQRoWTG6Arfl10SFA=";
+      rev = "8b47db616ef658b8fc27e61db2896aa2f40134de";
+      hash = "sha256-1aMDbmzCvOP5da/IUq0+B8GqkwvaMqfXAp9Q+MyIUZ0=";
     };
     meta.homepage = "https://github.com/kylechui/nvim-surround/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -13706,12 +13706,12 @@ final: prev: {
 
   nvim-tree-lua = buildVimPlugin {
     pname = "nvim-tree.lua";
-    version = "1.17.0-unstable-2026-05-15";
+    version = "1.17.0-unstable-2026-06-08";
     src = fetchFromGitHub {
       owner = "nvim-tree";
       repo = "nvim-tree.lua";
-      rev = "07f541fcaa4a5ae019598240362449ab7e9812b3";
-      hash = "sha256-ao0a2zszbZEXOEIS4fbFRAsoBiQDRpD90k/mTqcUBX4=";
+      rev = "82f58063d67defc620e1ef8be606fc62a7b5dc1e";
+      hash = "sha256-JfOkJkTGVWPw7dhcbDNPsyeNbidrtIvzJhPYUQJ1NoY=";
     };
     meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
     meta.license = unfree;
@@ -14182,12 +14182,12 @@ final: prev: {
 
   octo-nvim = buildVimPlugin {
     pname = "octo.nvim";
-    version = "0-unstable-2026-06-02";
+    version = "0-unstable-2026-06-05";
     src = fetchFromGitHub {
       owner = "pwntester";
       repo = "octo.nvim";
-      rev = "c86a43da3514dbe916eb96ecac4d776890078786";
-      hash = "sha256-PXLzZ4+vXIIEbhOaoSowKCmsfDaHlDfpFlYrijamVC8=";
+      rev = "7fed87415c401954f73401bbed0fd736b9611e7c";
+      hash = "sha256-9f8ZKK8OKlQSMjvFW6VY/861IZ/EugKfj5WLDkjg+ac=";
     };
     meta.homepage = "https://github.com/pwntester/octo.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -14434,12 +14434,12 @@ final: prev: {
 
   opencode-nvim = buildVimPlugin {
     pname = "opencode.nvim";
-    version = "0.10.1";
+    version = "0.11.0";
     src = fetchFromGitHub {
       owner = "nickjvandyke";
       repo = "opencode.nvim";
-      tag = "v0.10.1";
-      hash = "sha256-hpRlUUI1wEluMyWfAnxjztbozIVgN7Yan2zH+HmEsSw=";
+      tag = "v0.11.0";
+      hash = "sha256-i6Ty/TXy9Ph6Ex39qumfgH7ArenH159EHy1UFvNBJfI=";
     };
     meta.homepage = "https://github.com/nickjvandyke/opencode.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -15094,12 +15094,12 @@ final: prev: {
 
   project-nvim = buildVimPlugin {
     pname = "project.nvim";
-    version = "4.2.1-1";
+    version = "5.0.0-1";
     src = fetchFromGitHub {
       owner = "DrKJeff16";
       repo = "project.nvim";
-      tag = "v4.2.1-1";
-      hash = "sha256-4OvPpaJUyZF8yVHOYmC20oXZOsm0bEZf+DC3AMjhAlo=";
+      tag = "v5.0.0-1";
+      hash = "sha256-zJ/UMESO69829eGgsq53a/LttRSE1bRTo2vy4HjaHY8=";
     };
     meta.homepage = "https://github.com/DrKJeff16/project.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -15711,12 +15711,12 @@ final: prev: {
 
   roslyn-nvim = buildVimPlugin {
     pname = "roslyn.nvim";
-    version = "0-unstable-2026-06-01";
+    version = "0-unstable-2026-06-07";
     src = fetchFromGitHub {
       owner = "seblyng";
       repo = "roslyn.nvim";
-      rev = "dedfc3f539c51a5841feb572e8b73ec58ff2ca9d";
-      hash = "sha256-Qjmbh93ztg9UHlwr8ZGKWW9XtCJ8pH74SROC+egWgao=";
+      rev = "9c5da79216e5776e020dcc6c157983f5352f3f11";
+      hash = "sha256-EGsDK45Tl+slGT0fibcwQDdHS1obJHPWgd1+jaOw8fg=";
     };
     meta.homepage = "https://github.com/seblyng/roslyn.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -16187,12 +16187,12 @@ final: prev: {
 
   smart-splits-nvim = buildVimPlugin {
     pname = "smart-splits.nvim";
-    version = "2.1.0-unstable-2026-05-29";
+    version = "2.1.0-unstable-2026-06-05";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "smart-splits.nvim";
-      rev = "1865e6826b1cd90098f198acb0f5b744a7b40c22";
-      hash = "sha256-1LnZdJazx5gI1C7rPdDL5PMKf5Z0fTUpRD7T6tHdjjs=";
+      rev = "6806149fd36d1c5e797debe3e18b2c07219b685a";
+      hash = "sha256-INxUHLtQBnnmbKBmQNgcdm4FxP5Amig2Q2s6pAub11U=";
     };
     meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -16677,12 +16677,12 @@ final: prev: {
 
   startup-nvim = buildVimPlugin {
     pname = "startup.nvim";
-    version = "0.1-beta-unstable-2026-05-10";
+    version = "0.1-beta-unstable-2026-06-07";
     src = fetchFromGitHub {
       owner = "max397574";
       repo = "startup.nvim";
-      rev = "cd5fe95f61fdf6ef7db3732be79126032ab1dd3e";
-      hash = "sha256-vwLvzQiQctkFitOPcg/bjKKGInU5AIfrpjI/e26ZBSA=";
+      rev = "bd835f4fd95dbb30cb4607a8d7a090216fb6d035";
+      hash = "sha256-gNqPvccaOzeoprPqkXAWteBqzDns1wWOm8/povzxqGk=";
     };
     meta.homepage = "https://github.com/max397574/startup.nvim/";
     meta.license = getLicenseFromSpdxId "GPL-2.0-only";
@@ -17956,12 +17956,12 @@ final: prev: {
 
   tiny-inline-diagnostic-nvim = buildVimPlugin {
     pname = "tiny-inline-diagnostic.nvim";
-    version = "0-unstable-2026-05-29";
+    version = "0-unstable-2026-06-09";
     src = fetchFromGitHub {
       owner = "rachartier";
       repo = "tiny-inline-diagnostic.nvim";
-      rev = "680762989e8b05a72e90769959d0fb9a557e6917";
-      hash = "sha256-zTUJuMPkUxesm8LBu4IQtDlpdzJiprbVA4mfjoIWd2I=";
+      rev = "e930d0a46031645040d5492595b46cdf6ab3514f";
+      hash = "sha256-m4ax8+4P+fWtne7hLn3I9RXPeC8y/CZXqtqKCVa8e7c=";
     };
     meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -18295,12 +18295,12 @@ final: prev: {
 
   ts-autotag-nvim = buildVimPlugin {
     pname = "ts-autotag.nvim";
-    version = "0-unstable-2026-05-31";
+    version = "0-unstable-2026-06-10";
     src = fetchFromGitHub {
       owner = "tronikelis";
       repo = "ts-autotag.nvim";
-      rev = "07bcd146fa22558adf0d900e4a2601b6d142c805";
-      hash = "sha256-qgUy412pWyAmE6b3YBtT1DEhp4VmeOi02tmgngxFxXU=";
+      rev = "b1d0dd4fe5e63e9a744595bdfd41b74c3dea2e88";
+      hash = "sha256-lGDnNpG5kcKOI2AlVovuuTHx+AntKagw9c9e1Eg4T2M=";
     };
     meta.homepage = "https://github.com/tronikelis/ts-autotag.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -18744,12 +18744,12 @@ final: prev: {
 
   vague-nvim = buildVimPlugin {
     pname = "vague.nvim";
-    version = "2.1.1";
+    version = "2.1.2";
     src = fetchFromGitHub {
       owner = "vague-theme";
       repo = "vague.nvim";
-      tag = "v2.1.1";
-      hash = "sha256-IuEbZU/SkC5knIiBAupApY9MADKsYSDPdRx/CuiQcYw=";
+      tag = "v2.1.2";
+      hash = "sha256-8y4Dc+AXx4+DmnOAYYD6Yyi0GDyI6fwdM4AKsmM5hZU=";
     };
     meta.homepage = "https://github.com/vague-theme/vague.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -18800,12 +18800,12 @@ final: prev: {
 
   vifm-vim = buildVimPlugin {
     pname = "vifm.vim";
-    version = "0.14-unstable-2026-06-03";
+    version = "0.14-unstable-2026-06-07";
     src = fetchFromGitHub {
       owner = "vifm";
       repo = "vifm.vim";
-      rev = "c85c850b79d0deac4c9bab1a7996ccae535a718d";
-      hash = "sha256-WEwDPQ4Xl6On0COxv3ERi8a2P28iY64nUoe+1JvHiKI=";
+      rev = "6bffbab9c448f2814217ea2f7f982ad73b8fa718";
+      hash = "sha256-/8lN8y20+g9pWzBrXgVArgZQq0CfXyLGRVDpweDmguE=";
     };
     meta.homepage = "https://github.com/vifm/vifm.vim/";
     meta.license = unfree;
@@ -21194,12 +21194,12 @@ final: prev: {
 
   vim-habamax = buildVimPlugin {
     pname = "vim-habamax";
-    version = "0-unstable-2026-05-27";
+    version = "0-unstable-2026-06-10";
     src = fetchFromGitHub {
       owner = "habamax";
       repo = "vim-habamax";
-      rev = "b1ecb8b42390e6a4f3cbfcb1e919436ac1d98773";
-      hash = "sha256-s3P4FHXx2BmEoHx24GzzUVw+2ImAUDx8yBCqpWn/gVk=";
+      rev = "cf275f3cb71afb52773cced233f5da3c8e168250";
+      hash = "sha256-oiTjsrld7jqcaBYP/q4ndQlySoY1XTxIv/Jj9zqb6fo=";
     };
     meta.homepage = "https://github.com/habamax/vim-habamax/";
     meta.license = unfree;
@@ -25339,12 +25339,12 @@ final: prev: {
 
   visual-whitespace-nvim = buildVimPlugin {
     pname = "visual-whitespace.nvim";
-    version = "0-unstable-2026-05-24";
+    version = "0-unstable-2026-06-05";
     src = fetchFromGitHub {
       owner = "mcauley-penney";
       repo = "visual-whitespace.nvim";
-      rev = "02714f141dc0783eb814af6be534bdb0273142ff";
-      hash = "sha256-DFzkAAJvzb2blLXwVZ6u9KkpjnUSLCyPUGV+Eai8n+E=";
+      rev = "d1f8889dd09ca9b07bc3b7af7cd5d1bfb5a7ea71";
+      hash = "sha256-X8AVvOSnnY594tFmgi50+yYjC+A9l6UN1McoRIFJ8e8=";
     };
     meta.homepage = "https://github.com/mcauley-penney/visual-whitespace.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -25843,12 +25843,12 @@ final: prev: {
 
   yanky-nvim = buildVimPlugin {
     pname = "yanky.nvim";
-    version = "2.0.0-unstable-2026-05-20";
+    version = "2.0.0-unstable-2026-06-07";
     src = fetchFromGitHub {
       owner = "gbprod";
       repo = "yanky.nvim";
-      rev = "b13d318dc7c816e2eee626dde61fa0a7237bc77e";
-      hash = "sha256-6WukBxyEIc9vEay0vN8R0zfxxU54+bkxLAQzsqc6AA8=";
+      rev = "020c22d0cfa60358569e49d1d7b91630f175aef0";
+      hash = "sha256-gdOwMMQP3AyP2dQU8QlEc8COfqdK8tzIcVmuQ3xOERM=";
     };
     meta.homepage = "https://github.com/gbprod/yanky.nvim/";
     meta.license = getLicenseFromSpdxId "WTFPL";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index eacd2a8686e2..1ec5967d4459 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -37,6 +37,7 @@
   nodejs,
   openscad,
   openssh,
+  openssl,
   ranger,
   ripgrep,
   sqlite,
@@ -54,7 +55,6 @@
   xwininfo,
   xxd,
   ycmd,
-  zathura,
   zenity,
   zoxide,
   zsh,
@@ -1523,6 +1523,12 @@ assertNoAdditions {
         --replace-fail \
         'local gpgme_library_path = "gpgme"' \
         'local gpgme_library_path = "${lib.getLib gpgme}/lib/libgpgme${stdenv.hostPlatform.extensions.sharedLibrary}"'
+
+      # Upstream typo: pendulum was moved to fugit2.util but this require was not updated
+      substituteInPlace lua/fugit2/view/git_blame_file.lua \
+        --replace-fail \
+        'require "fugit2.core.pendulum"' \
+        'require "fugit2.util.pendulum"'
     '';
   };
 
@@ -2308,6 +2314,17 @@ assertNoAdditions {
     };
   });
 
+  live-share-nvim = super.live-share-nvim.overrideAttrs {
+    # Loading the system libcrypto aborts the process on darwin,
+    # point the FFI loader at the nixpkgs openssl instead
+    postPatch = ''
+      substituteInPlace lua/live-share/collab/crypto.lua \
+        --replace-fail \
+        '"crypto",' \
+        '"${lib.getLib openssl}/lib/libcrypto${stdenv.hostPlatform.extensions.sharedLibrary}",'
+    '';
+  };
+
   lsp-format-modifications-nvim = super.lsp-format-modifications-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
   };
@@ -3657,11 +3674,6 @@ assertNoAdditions {
       openscad
     ];
 
-    buildInputs = [
-      zathura
-      openscad
-    ];
-
     # FIXME: can't find plugin root dir
     nvimSkipModules = [
       "openscad"
@@ -4686,8 +4698,8 @@ assertNoAdditions {
   });
 
   vCoolor-vim = super.vCoolor-vim.overrideAttrs (old: {
-    # on linux can use either Zenity or Yad.
-    propagatedBuildInputs = [ zenity ];
+    # on linux can use either Zenity or Yad, on darwin it uses AppleScript
+    propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ zenity ];
     meta = old.meta // {
       description = "Simple color selector/picker plugin";
       license = lib.licenses.publicDomain;

From a1ebc50977108fcf46e27287a1eacc00c54b1594 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 10 Jun 2026 19:17:40 -0500
Subject: [PATCH 39/71] vimPlugins: resolve github repository redirects

---
 pkgs/applications/editors/vim/plugins/vim-plugin-names | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index d4a7bfa86c94..d813e9230d58 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -64,7 +64,7 @@ https://github.com/dense-analysis/ale/,,
 https://github.com/vim-scripts/align/,,
 https://github.com/Vonr/align.nvim/,,
 https://github.com/goolord/alpha-nvim/,,
-https://github.com/sourcegraph/amp.nvim/,,
+https://github.com/ampcode/amp.nvim/,,
 https://github.com/anuvyklack/animation.nvim/,,
 https://github.com/Olical/aniseed/,,
 https://github.com/pearofducks/ansible-vim/,,

From b2072775624fe09a2c5c51541168503958a62b1d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 11 Jun 2026 02:03:49 +0000
Subject: [PATCH 40/71] release-plz: 0.3.158 -> 0.3.159

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

diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix
index 0ff18e5110ad..dd33a852967a 100644
--- a/pkgs/by-name/re/release-plz/package.nix
+++ b/pkgs/by-name/re/release-plz/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "release-plz";
-  version = "0.3.158";
+  version = "0.3.159";
 
   src = fetchFromGitHub {
     owner = "MarcoIeni";
     repo = "release-plz";
     rev = "release-plz-v${finalAttrs.version}";
-    hash = "sha256-AFqSj5utn5PGo7mC1LdZSdw71kDEGg1F+ELNolkBgV0=";
+    hash = "sha256-p0KzeGM1erpdD3akoUHCnIw6lPzjfxBcESTB0bHwWoo=";
   };
 
-  cargoHash = "sha256-0rd5ouIsdZQexyprsOA0MRy3nRMhRHk23aEyF8QaZ2o=";
+  cargoHash = "sha256-tiDDniYO7nXeXMLCT2EJhP6Ii9SUJ3cRJZHZTo0rtak=";
 
   nativeBuildInputs = [
     installShellFiles

From 3003247ac67feb6181331981ed6390cf964beedb Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Wed, 10 Jun 2026 22:44:05 -0400
Subject: [PATCH 41/71] beamPackages.expert: 0.1.3 -> 0.1.5

Changelog: https://github.com/expert-lsp/expert/blob/v0.1.1/CHANGELOG.md
---
 pkgs/development/beam-modules/expert/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/beam-modules/expert/default.nix b/pkgs/development/beam-modules/expert/default.nix
index 4cd3a438e436..9cd0fd7aebbd 100644
--- a/pkgs/development/beam-modules/expert/default.nix
+++ b/pkgs/development/beam-modules/expert/default.nix
@@ -11,20 +11,20 @@
   writeShellApplication,
 }:
 let
-  version = "0.1.3";
+  version = "0.1.5";
 
   src = fetchFromGitHub {
     owner = "expert-lsp";
     repo = "expert";
     tag = "v${version}";
-    hash = "sha256-CGWWbzrBjCbz9S8f1nCLx2x6j4MFgsSd5XjgrxhuvzE=";
+    hash = "sha256-QpL58+rzXCl8jT/8sbvDmDZtcWz0+ZKg47XC33EwFyE=";
   };
 
   engineDeps = fetchMixDeps {
     pname = "mix-deps-expert-engine";
 
     inherit src version;
-    hash = "sha256-relCdTBialz4Z/BpXZxmuhSYrvJqLINg/AVGfEhuDGo=";
+    hash = "sha256-4l0Tc/6sOcjGVQtzEOG6QP/ss8rqh+AOnwxuJsuCZCk=";
 
     preConfigure = ''
       cd apps/engine
@@ -38,7 +38,7 @@ mixRelease rec {
   mixFodDeps = fetchMixDeps {
     pname = "mix-deps-${pname}";
     inherit src version;
-    hash = "sha256-Rx5O77UEIDKcCz967h/8z1MAdaw0syzvLG5JOSaqgLE=";
+    hash = "sha256-q6OOealif+LClT0HlJTojDtvMk4MEtI/EjQHbLntiP8=";
 
     preConfigure = ''
       cd apps/expert

From 1f05de2560eda57492f55f040219835c069a6b76 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Wed, 10 Jun 2026 22:47:25 -0400
Subject: [PATCH 42/71] beamPackages.elixir-ls: 0.31.0 -> 0.31.1

Changelog: https://github.com/elixir-lsp/elixir-ls/releases/tag/v0.31.1
---
 pkgs/development/beam-modules/elixir-ls/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix
index 0a1c6b294dfc..2386596dc44f 100644
--- a/pkgs/development/beam-modules/elixir-ls/default.nix
+++ b/pkgs/development/beam-modules/elixir-ls/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elixir-ls";
-  version = "0.31.0";
+  version = "0.31.1";
 
   src = fetchFromGitHub {
     owner = "elixir-lsp";
     repo = "elixir-ls";
     rev = "v${version}";
-    hash = "sha256-AKJJyQUCZSsFpqVPtwL7+arCOzDC0251MwooEM8JFM4=";
+    hash = "sha256-H7u2rcH0qSiswC6aHdaFdM8IyEpXS74RQrVFuJx35Lo=";
   };
 
   patches = [

From 4f8b82fcaa03ff8f5e7de095413dcc574516d014 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 11 Jun 2026 03:04:59 +0000
Subject: [PATCH 43/71] python3Packages.txtai: 9.9.0 -> 9.10.0

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

diff --git a/pkgs/development/python-modules/txtai/default.nix b/pkgs/development/python-modules/txtai/default.nix
index 80c799e48417..8dff7438d4d6 100644
--- a/pkgs/development/python-modules/txtai/default.nix
+++ b/pkgs/development/python-modules/txtai/default.nix
@@ -93,7 +93,7 @@
   pytestCheckHook,
 }:
 let
-  version = "9.9.0";
+  version = "9.10.0";
   agent = [
     mcpadapt
     smolagents
@@ -241,7 +241,7 @@ let
     owner = "neuml";
     repo = "txtai";
     tag = "v${version}";
-    hash = "sha256-lbNWDHSZDZt8V5OEyVxvOoX6se4/GXG13BeqAeU+FHc=";
+    hash = "sha256-J+JIsaK43LXPoVrrw7Eh/zVMJ1b6WAsTdghE/jLjRX0=";
   };
 in
 buildPythonPackage {

From b521a3c494945193fe36199b41afcd8b29cd08aa Mon Sep 17 00:00:00 2001
From: kashw2 <supra4keanu@hotmail.com>
Date: Thu, 11 Jun 2026 13:01:33 +1000
Subject: [PATCH 44/71] openscad: override glew to disable EGL

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

diff --git a/pkgs/by-name/op/openscad/package.nix b/pkgs/by-name/op/openscad/package.nix
index ede0cdbd0c8c..7cf1da9371b2 100644
--- a/pkgs/by-name/op/openscad/package.nix
+++ b/pkgs/by-name/op/openscad/package.nix
@@ -127,7 +127,9 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     eigen
     boost
-    glew
+    # OpenSCAD's GLX offscreen renderer needs GLEW's GLXEW symbols (`__GLXEW_SGIX_pbuffer`, `__GLXEW_SGIX_fbconfig`)
+    # which are not found in the default EGL-enabled glew and causes the build failure in https://github.com/NixOS/nixpkgs/issues/530529
+    (glew.override { enableEGL = false; })
     opencsg
     cgal_5
     mpfr

From 4dd044c78fe1c52c0358c20199989d11f9699f73 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 11 Jun 2026 03:40:34 +0000
Subject: [PATCH 45/71] gefyra: 2.4.7 -> 2.5.1

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

diff --git a/pkgs/by-name/ge/gefyra/package.nix b/pkgs/by-name/ge/gefyra/package.nix
index 6d5758f85863..14a29ca5908e 100644
--- a/pkgs/by-name/ge/gefyra/package.nix
+++ b/pkgs/by-name/ge/gefyra/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gefyra";
-  version = "2.4.7";
+  version = "2.5.1";
 
   src = fetchzip {
     url = "https://github.com/gefyrahq/gefyra/releases/download/${finalAttrs.version}/gefyra-${finalAttrs.version}-linux-amd64.zip";
-    hash = "sha256-6RJgEl/uteoitNumw5upkozPCrNPW1kC1STLRyycHiY=";
+    hash = "sha256-RwosuoLT7lONDvUsWHQBHr52On4M5B8FoHEgUdPJwmI=";
     stripRoot = false;
   };
 

From 8787ae194fdaefeb303c7e3ae7e9948650028787 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 11 Jun 2026 03:54:45 +0000
Subject: [PATCH 46/71] emacsPackages.ghostel: 0.33.0-unstable-2026-06-06 ->
 0.34.0-unstable-2026-06-08

---
 .../elisp-packages/manual-packages/ghostel/package.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix
index d42d07ceca11..cbb23ee3e9ff 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix
@@ -13,13 +13,13 @@ let
 
   pname = "ghostel";
 
-  version = "0.33.0-unstable-2026-06-06";
+  version = "0.34.0-unstable-2026-06-08";
 
   src = fetchFromGitHub {
     owner = "dakra";
     repo = "ghostel";
-    rev = "a614f0f30d8a65da928a840e62cc9b2c6a1381af";
-    hash = "sha256-vG7JfgXUm6b1zf0WgyDlvy29wpTvcI/X74NP8s66c/4=";
+    rev = "f7800f6430b6ab85dbfc2db2129625e8a28ac17e";
+    hash = "sha256-o9EQFA6xunwt/chdA5z8bqadr9V3COBPjRqiAY3jkp0=";
   };
 
   module = stdenv.mkDerivation (finalAttrs: {

From 6432e364ed85626c81b9aa918269c6b00856cedc Mon Sep 17 00:00:00 2001
From: William Huebner <wilhueb@gmail.com>
Date: Thu, 11 Jun 2026 00:01:02 -0400
Subject: [PATCH 47/71] bartender: 6.4.1 -> 6.5.2

Changelog: https://downloads.macbartender.com/B2/updates/6-5-2/rnotes.html
---
 pkgs/by-name/ba/bartender/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ba/bartender/package.nix b/pkgs/by-name/ba/bartender/package.nix
index 63460778435c..67a14d429c5c 100644
--- a/pkgs/by-name/ba/bartender/package.nix
+++ b/pkgs/by-name/ba/bartender/package.nix
@@ -11,13 +11,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "bartender";
-  version = "6.4.1";
+  version = "6.5.2";
 
   src = fetchzip {
-    url = "https://www.macbartender.com/B2/updates/${
+    url = "https://downloads.macbartender.com/B2/updates/${
       builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version
     }/Bartender%20${lib.versions.major finalAttrs.version}.zip";
-    hash = "sha256-UtLTfRhL7JTYzQXf7kyYyGZXy1TLJ0ODk1nRs2pLfQ4=";
+    hash = "sha256-b2FOhbsVCk8Ae5g/Si9RJLmgN+v5ETnxaRas3GOTb08=";
   };
 
   dontPatch = true;
@@ -46,7 +46,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     ];
     text = ''
       version_major="${lib.versions.major finalAttrs.version}"
-      url="https://www.macbartender.com/B2/updates/AppcastB$version_major.xml"
+      url="https://downloads.macbartender.com/B2/updates/AppcastB$version_major.xml"
       version=$(curl -s "$url" | xmlstarlet sel -t -v '(//item)[last()]/sparkle:shortVersionString' -n)
       update-source-version bartender "$version"
     '';
@@ -59,7 +59,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       Bartender improves your workflow with quick reveal, search, custom hotkeys and triggers, and lots more.
     '';
     homepage = "https://www.macbartender.com";
-    changelog = "https://macbartender.com/B2/updates/${
+    changelog = "https://downloads.macbartender.com/B2/updates/${
       builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version
     }/rnotes.html";
     license = [ lib.licenses.unfree ];

From 9a56cf4b86e37e471664feb2cd3667a71c60600b Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Thu, 11 Jun 2026 07:18:13 +0200
Subject: [PATCH 48/71] jenkins: 2.555.2 -> 2.555.3

Changelog: https://www.jenkins.io/changelog-stable/#v2.555.3

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/by-name/je/jenkins/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix
index 1c88fc244922..b6f35b371667 100644
--- a/pkgs/by-name/je/jenkins/package.nix
+++ b/pkgs/by-name/je/jenkins/package.nix
@@ -18,11 +18,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "jenkins";
-  version = "2.555.2";
+  version = "2.555.3";
 
   src = fetchurl {
     url = "https://get.jenkins.io/war-stable/${finalAttrs.version}/jenkins.war";
-    hash = "sha256-39oJV4xcGxjyjVDsNihoMF9XLDt674uQ0A96lDamKGc=";
+    hash = "sha256-XRmQXmwPI6/4n/AH3lVkuW4KBcE/TRqS0P3LabAzu5o=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From c8fec47e784018896fbae9d1291d41e26680a314 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Wed, 10 Jun 2026 22:21:30 -0700
Subject: [PATCH 49/71] llama-swap: 216 -> 224

Release notes: https://github.com/mostlygeek/llama-swap/releases

Additional changes:

1. One of the tests now creates a bash script, so we need to fix said
bash script's shebang.
2. The embedded UI has moved.
---
 pkgs/by-name/ll/llama-swap/package.nix | 17 ++++++++++++-----
 pkgs/by-name/ll/llama-swap/ui.nix      |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ll/llama-swap/package.nix b/pkgs/by-name/ll/llama-swap/package.nix
index 59758a573257..94762b624033 100644
--- a/pkgs/by-name/ll/llama-swap/package.nix
+++ b/pkgs/by-name/ll/llama-swap/package.nix
@@ -8,6 +8,8 @@
 
   callPackage,
 
+  bash,
+
   nixosTests,
   nix-update-script,
 }:
@@ -17,7 +19,7 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "llama-swap";
-  version = "216";
+  version = "224";
 
   outputs = [
     "out"
@@ -28,7 +30,7 @@ buildGoModule (finalAttrs: {
     owner = "mostlygeek";
     repo = "llama-swap";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PHSY4z2h406xL+EcIYyrzr4s28txO7SCsWm8hrXf+2U=";
+    hash = "sha256-IblAaM9FBdI2Y9rg36SWpclQ0jV6Y93RC+N+cXWEO94=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -41,7 +43,7 @@ buildGoModule (finalAttrs: {
     '';
   };
 
-  vendorHash = "sha256-QysQ7YdwJcLTziwL25j73n3tQVvzVQIFxN4GkTU8JZg=";
+  vendorHash = "sha256-b+RreafBMCWT/jbWTlXaiDRzA4DRe76WaCEbrfRxV/4=";
 
   passthru.ui = callPackage ./ui.nix { llama-swap = finalAttrs.finalPackage; };
 
@@ -58,13 +60,18 @@ buildGoModule (finalAttrs: {
     "-X main.version=${finalAttrs.version}"
   ];
 
+  postPatch = ''
+    substituteInPlace internal/process/process_command_forking_test.go \
+      --replace "#!/bin/bash" "#!${lib.getExe bash}"
+  '';
+
   preBuild = ''
     # ldflags based on metadata from git and source
     ldflags+=" -X main.commit=$(cat COMMIT)"
     ldflags+=" -X main.date=$(cat SOURCE_DATE_EPOCH)"
 
-    # copy for go:embed in proxy/ui_embed.go
-    cp -r ${finalAttrs.passthru.ui}/ui_dist proxy/
+    # copy for go:embed in internal/server/ui_embed.go
+    cp -r ${finalAttrs.passthru.ui}/ui_dist internal/server/
   '';
 
   excludedPackages = [
diff --git a/pkgs/by-name/ll/llama-swap/ui.nix b/pkgs/by-name/ll/llama-swap/ui.nix
index 15a326366bff..9d43a142c60d 100644
--- a/pkgs/by-name/ll/llama-swap/ui.nix
+++ b/pkgs/by-name/ll/llama-swap/ui.nix
@@ -11,7 +11,7 @@ buildNpmPackage (finalAttrs: {
 
   postPatch = ''
     substituteInPlace vite.config.ts \
-      --replace-fail "../proxy/ui_dist" "${placeholder "out"}/ui_dist"
+      --replace-fail "../internal/server/ui_dist" "${placeholder "out"}/ui_dist"
   '';
 
   sourceRoot = "${finalAttrs.src.name}/ui-svelte";

From b0d4ef7b4f7a653c62ec43beae77b899c960c352 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 11 Jun 2026 09:04:48 +0200
Subject: [PATCH 50/71] python3Packages.google-ai-generativelanguage: 0.10.0 ->
 0.12.0

Diff: https://github.com/googleapis/google-cloud-python/compare/google-ai-generativelanguage-v0.10.0...google-ai-generativelanguage-v0.12.0

Changelog: https://github.com/googleapis/google-cloud-python/blob/google-ai-generativelanguage-v0.12.0/packages/google-ai-generativelanguage/CHANGELOG.md
---
 .../python-modules/google-ai-generativelanguage/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix
index 23b078be98bb..9a376ae59007 100644
--- a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix
+++ b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "google-ai-generativelanguage";
-  version = "0.10.0";
+  version = "0.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "google-cloud-python";
     tag = "google-ai-generativelanguage-v${finalAttrs.version}";
-    hash = "sha256-dVgcnnInqjUjySL7wjxGzI33t1YZJ8e9mSsmjAJ+fBI=";
+    hash = "sha256-M/7uDWWz4YCfxa4gyM9BaAo10iyTMvtR2MhNpdFYnis=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/packages/google-ai-generativelanguage";

From 376c7454173b73d4dc876e9e6981a7958e36f386 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 11 Jun 2026 09:12:36 +0200
Subject: [PATCH 51/71] python3Packages.multiregex: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/multiregex/default.nix b/pkgs/development/python-modules/multiregex/default.nix
index 33e1ecdeebd9..994d7c401fb3 100644
--- a/pkgs/development/python-modules/multiregex/default.nix
+++ b/pkgs/development/python-modules/multiregex/default.nix
@@ -8,7 +8,7 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "multiregex";
   version = "2.0.4";
   pyproject = true;
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "quantco";
     repo = "multiregex";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-BWADzarhnzcz2ZvD33XcQpQIIJ0hmhUT33HyUbB1wH0=";
   };
 
@@ -34,8 +34,8 @@ buildPythonPackage rec {
   meta = {
     description = "Quickly match many regexes against a string";
     homepage = "https://github.com/quantco/multiregex";
-    changelog = "https://github.com/quantco/multiregex/blob/${src.tag}/CHANGELOG.rst";
+    changelog = "https://github.com/quantco/multiregex/blob/${finalAttrs.src.tag}/CHANGELOG.rst";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 4c1a84d7fc68694ae15ec0f62ab953065250b7a4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 11 Jun 2026 07:40:48 +0000
Subject: [PATCH 52/71] ollama-cpu: 0.30.6 -> 0.30.7

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

diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index d2f5b86b850b..853e7ef721c0 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -152,13 +152,13 @@ let
 in
 goBuild (finalAttrs: {
   pname = "ollama";
-  version = "0.30.6";
+  version = "0.30.7";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qO+Tsjg64QekGHNNiNy5YGSDoToGSnqiN5hN+0LCp4Q=";
+    hash = "sha256-pS6Wd//g+Q1Oqw32+mr2h5ag7C2HNwf/8ZVrTKOvdWE=";
   };
 
   vendorHash = "sha256-lZdGzGb9xRjTm1Rm7/wHjqM490gLznLEndmb4mNbCX0=";

From 45f0137e81ff0576e3c46f6974aa131e7b314513 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 11 Jun 2026 07:41:18 +0000
Subject: [PATCH 53/71] python3Packages.executorch: fix failing test

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

diff --git a/pkgs/development/python-modules/executorch/default.nix b/pkgs/development/python-modules/executorch/default.nix
index 16c5f2255d10..0fc670c7ded9 100644
--- a/pkgs/development/python-modules/executorch/default.nix
+++ b/pkgs/development/python-modules/executorch/default.nix
@@ -102,6 +102,13 @@ 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
+    ''
+    # AssertionError: '1.3.0' != '0.1.0'
+    + ''
+      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 ff1c761afd77bc8788931f020b9ef7c88028b977 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 11 Jun 2026 07:46:19 +0000
Subject: [PATCH 54/71] python3Packages.dsmr-parser: 1.7.0 -> 1.8.0

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

diff --git a/pkgs/development/python-modules/dsmr-parser/default.nix b/pkgs/development/python-modules/dsmr-parser/default.nix
index 8f383bd1bb2b..e3d1a8d372e3 100644
--- a/pkgs/development/python-modules/dsmr-parser/default.nix
+++ b/pkgs/development/python-modules/dsmr-parser/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "dsmr-parser";
-  version = "1.7.0";
+  version = "1.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ndokter";
     repo = "dsmr_parser";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-AnOnyvqmRRWYwJTeBLGgLSJT0/hkMXTmJQe8EJ6myFA=";
+    hash = "sha256-h7huLTdyDon2l2dUXwqilrM0tr6Tkk6918KLK/c2S9s=";
   };
 
   pythonRelaxDeps = [ "dlms_cosem" ];

From c517dbed558166e59c5f9e6d863535ee3c6a4ac2 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Thu, 11 Jun 2026 09:57:50 +0200
Subject: [PATCH 55/71] kdash: fix source hash

Diff: https://github.com/kdash-rs/kdash/compare/1d03bb19155ac505a6669e061c61f6956af5f6b7...ca137f951373ed53ee022a42a433ca818d36ae5e
---
 pkgs/by-name/kd/kdash/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/kd/kdash/package.nix b/pkgs/by-name/kd/kdash/package.nix
index dfff244ffb0b..ada605369681 100644
--- a/pkgs/by-name/kd/kdash/package.nix
+++ b/pkgs/by-name/kd/kdash/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "kdash-rs";
     repo = "kdash";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-xc2vNPQWg6P+FWxKekvOTW3QHxgmkD6t/jgYGdoaMeI=";
+    hash = "sha256-CFGZIRZgOUiB/evCDUQFB+w5PJCJNtrWqYzx2yRQKpE=";
   };
 
   nativeBuildInputs = [

From d2784e8ba7886aac8293b0c7077f87148ccb05b5 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Thu, 11 Jun 2026 09:58:06 +0200
Subject: [PATCH 56/71] kdash: add `meta.changelog`

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

diff --git a/pkgs/by-name/kd/kdash/package.nix b/pkgs/by-name/kd/kdash/package.nix
index ada605369681..2f7f467c87e7 100644
--- a/pkgs/by-name/kd/kdash/package.nix
+++ b/pkgs/by-name/kd/kdash/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   src = fetchFromGitHub {
     owner = "kdash-rs";
     repo = "kdash";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-CFGZIRZgOUiB/evCDUQFB+w5PJCJNtrWqYzx2yRQKpE=";
   };
 
@@ -40,6 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Simple and fast dashboard for Kubernetes";
     mainProgram = "kdash";
     homepage = "https://github.com/kdash-rs/kdash";
+    changelog = "https://github.com/kdash-rs/kdash/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ matthiasbeyer ];
   };

From 8849051363c41e67e2fb9ec46a80ecae3b30aae5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 11 Jun 2026 09:15:09 +0000
Subject: [PATCH 57/71] iroh-ssh: 0.2.11 -> 0.2.12

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

diff --git a/pkgs/by-name/ir/iroh-ssh/package.nix b/pkgs/by-name/ir/iroh-ssh/package.nix
index 5d9ad7314e19..b9e17b5b8f71 100644
--- a/pkgs/by-name/ir/iroh-ssh/package.nix
+++ b/pkgs/by-name/ir/iroh-ssh/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "iroh-ssh";
-  version = "0.2.11";
+  version = "0.2.12";
 
   src = fetchFromGitHub {
     owner = "rustonbsd";
     repo = "iroh-ssh";
     tag = finalAttrs.version;
-    hash = "sha256-/g5U8WW/iqf+ccIsZ5tPhkjVFsoVgDj6sfk/aSgGJBw=";
+    hash = "sha256-zt5Adq3U+sp0w5+X1xf/vEgQsxQ9G5tZL4+SOCHo5ws=";
   };
 
-  cargoHash = "sha256-2NAl4ClPN+OI1EBAkuL/KSiByxU34sBmYDjnRXYuiOY=";
+  cargoHash = "sha256-NFiOsBYJ1nJCH8E7F7WuL2Xj0/djdnvrJ/0S+9SItpo=";
 
   nativeBuildInputs = [
     installShellFiles

From 89b22c08e77a5ed81fd608dedf5f5630971981a9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 11 Jun 2026 02:28:51 +0000
Subject: [PATCH 58/71] python3Packages.databricks-sdk: 0.113.0 -> 0.116.0

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

diff --git a/pkgs/development/python-modules/databricks-sdk/default.nix b/pkgs/development/python-modules/databricks-sdk/default.nix
index 1b3acbf0b4fb..42337ed81885 100644
--- a/pkgs/development/python-modules/databricks-sdk/default.nix
+++ b/pkgs/development/python-modules/databricks-sdk/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "databricks-sdk";
-  version = "0.113.0";
+  version = "0.116.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -30,7 +30,7 @@ buildPythonPackage (finalAttrs: {
     owner = "databricks";
     repo = "databricks-sdk-py";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pe7Dh9P54AnyOtnBU4a7gRwg/dyC9OSwzbKOo+9kCtY=";
+    hash = "sha256-o9QVw0x2FFNT+cgdGELH7f2DEmzq2xeyisjyY0FNTaE=";
   };
 
   build-system = [

From 62b2e4409182a855368da256e0c133073dea680b Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Thu, 11 Jun 2026 10:22:07 +0200
Subject: [PATCH 59/71] kdash: Remove

Upstream re-tagged their 1.1.2 release:

    https://github.com/kdash-rs/kdash/activity?ref=refs/tags/v1.1.2

which I was notified about in

    https://github.com/NixOS/nixpkgs/pull/530639

After analyzing what upstream did from the old v1.1.2 tag to the new one
- github allowed me to fetch the old commit which apparently is

    ca579f42ff9ae6e1506637f7d5ed69bbcc24ce69

as I found by using the "..." button and then "compare changes" on the
page of the former link: The diff itself does not look fishy to me:

    https://github.com/kdash-rs/kdash/compare/1d03bb19155ac505a6669e061c61f6956af5f6b7...ca137f951373ed53ee022a42a433ca818d36ae5e

Still, I see no reason why a project would ever re-tag their stuff!
And this did not happen within a few minutes - so it was not a 'oh shit
I tagged the wrong thing' - which I wouldn't tolerate either btw - it
happened after at least a week!

TL;DR: I lost trust in upstream. Lets remove this.

Co-authored-by: Tom <github@thunze.de>
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/kd/kdash/package.nix | 47 -------------------------------
 pkgs/top-level/aliases.nix        |  1 +
 2 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100644 pkgs/by-name/kd/kdash/package.nix

diff --git a/pkgs/by-name/kd/kdash/package.nix b/pkgs/by-name/kd/kdash/package.nix
deleted file mode 100644
index 2f7f467c87e7..000000000000
--- a/pkgs/by-name/kd/kdash/package.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  rustPlatform,
-  pkg-config,
-  perl,
-  python3,
-  openssl,
-  libxcb-util,
-}:
-
-rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "kdash";
-  version = "1.1.2";
-
-  src = fetchFromGitHub {
-    owner = "kdash-rs";
-    repo = "kdash";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-CFGZIRZgOUiB/evCDUQFB+w5PJCJNtrWqYzx2yRQKpE=";
-  };
-
-  nativeBuildInputs = [
-    perl
-    python3
-    pkg-config
-  ];
-
-  buildInputs = [
-    openssl
-    libxcb-util
-  ];
-
-  # Fix for build failure with gcc15
-  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
-
-  cargoHash = "sha256-aEVV5E0GvskhSRwwPD8at4xwkn2Q6k5SO1fyFrsDbFM=";
-
-  meta = {
-    description = "Simple and fast dashboard for Kubernetes";
-    mainProgram = "kdash";
-    homepage = "https://github.com/kdash-rs/kdash";
-    changelog = "https://github.com/kdash-rs/kdash/blob/${finalAttrs.src.tag}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
-    maintainers = with lib.maintainers; [ matthiasbeyer ];
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 59f65f83ef84..244fbb2fdfa1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1069,6 +1069,7 @@ mapAliases {
   kbibtex = throw "'kbibtex' has been removed, as it is unmaintained upstream"; # Added 2025-08-30
   kchmviewer = throw "'kchmviewer' has been removed as it was unmaintained upstream since 2022 and depended on qt5 webengine. Consider switching to 'uchmviewer', a fork of 'kchmviewer'."; # Added 2026-02-10
   kcli = throw "kcli has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
+  kdash = throw "'kdash' has been removed because upstream tag changes broke the source derivation and trust in future tag stability"; # Added 2026-06-11
   kdeltacht = throw "'kdeltachat' has been removed as it depended on EOL qt5 webengine and was unmaintained"; # Added 2026-04-17
   kdesvn = throw "'kdesvn' has been removed due to outdated KF5 dependencies."; # Added 2026-05-01
   keepkey-agent = throw "keepkey-agent has been removed because upstream dropped KeepKey support"; # Added 2026-03-11

From da363d534f041ea5d72094cdf60772419c61c0cb Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Thu, 11 Jun 2026 11:37:49 +0200
Subject: [PATCH 60/71] transmission_4: 4.1.1 -> 4.1.2

Changelog: https://github.com/transmission/transmission/releases/tag/4.1.2
---
 pkgs/by-name/tr/transmission_4/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tr/transmission_4/package.nix b/pkgs/by-name/tr/transmission_4/package.nix
index cd79a8bb1f04..3c19ae576f1d 100644
--- a/pkgs/by-name/tr/transmission_4/package.nix
+++ b/pkgs/by-name/tr/transmission_4/package.nix
@@ -67,13 +67,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "transmission";
-  version = "4.1.1";
+  version = "4.1.2";
 
   src = fetchFromGitHub {
     owner = "transmission";
     repo = "transmission";
     tag = finalAttrs.version;
-    hash = "sha256-c3BOQ25xWIj4bLDQDnfzw9ZyuPemyHrK2Ua0jbOSuOw=";
+    hash = "sha256-FI/qH0VqhEjiN+31UCOiDLWkyucMKfH4i0bYW7lceQk=";
     fetchSubmodules = true;
   };
 

From 046a0c6211c5085d5977974ae6f1cc75a3e436f5 Mon Sep 17 00:00:00 2001
From: Emre Sahin <emre.tr@outlook.com>
Date: Thu, 11 Jun 2026 11:54:37 +0200
Subject: [PATCH 61/71] python3.tests.condaExamplePackage: fix eval warning for
 buildInputs

---
 pkgs/development/interpreters/python/tests.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix
index fd0d21577379..30920e4b8154 100644
--- a/pkgs/development/interpreters/python/tests.nix
+++ b/pkgs/development/interpreters/python/tests.nix
@@ -261,9 +261,7 @@ let
             condaUnpackHook
             condaInstallHook
           ]);
-          buildInputs = [
-            pythonCondaPackages.condaPatchelfLibs
-          ];
+          buildInputs = pythonCondaPackages.condaPatchelfLibs;
           propagatedBuildInputs = with python.pkgs; [
             chardet
             idna

From 0e159412f8e1e9685c56f39d3d0f4fe467c6d305 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 11 Jun 2026 10:08:49 +0000
Subject: [PATCH 62/71] fertilizer: 0.3.0 -> 0.3.2

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

diff --git a/pkgs/by-name/fe/fertilizer/package.nix b/pkgs/by-name/fe/fertilizer/package.nix
index 1a3f8608e588..55048e8cf58d 100644
--- a/pkgs/by-name/fe/fertilizer/package.nix
+++ b/pkgs/by-name/fe/fertilizer/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "fertilizer";
-  version = "0.3.0";
+  version = "0.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "moleculekayak";
     repo = "fertilizer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sDoAjEiKxHf+HtFLZr6RwuXN+rl0ZQnFUoQ09QiE6Xc=";
+    hash = "sha256-dPTR3GfofXBV1gwQ8Xdl8Dyz23CU9qBLAahwpxj8z+Q=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];

From 68d1fbb6d87de5c410b9b77da22e38deb5cdc0b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 11 Jun 2026 10:18:29 +0000
Subject: [PATCH 63/71] monkeys-audio: 13.01 -> 13.03

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

diff --git a/pkgs/by-name/mo/monkeys-audio/package.nix b/pkgs/by-name/mo/monkeys-audio/package.nix
index 8872c762b6fa..2d7bf79c6796 100644
--- a/pkgs/by-name/mo/monkeys-audio/package.nix
+++ b/pkgs/by-name/mo/monkeys-audio/package.nix
@@ -6,12 +6,12 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "13.01";
+  version = "13.03";
   pname = "monkeys-audio";
 
   src = fetchzip {
     url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
-    hash = "sha256-8rJVQ4Z2yyepgnkxdeMx1iw8o24i9DrTm+UIGdXwlGI=";
+    hash = "sha256-cZc6UtoZVEL3aWXPzLjfKshsr78V7y8X0Dw6qvJcVco=";
     stripRoot = false;
   };
 

From 0a1ed56ae16364f4b28c569374acbba21b938328 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 11 Jun 2026 10:34:21 +0000
Subject: [PATCH 64/71] libretro.stella: 0-unstable-2026-06-01 ->
 0-unstable-2026-06-09

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

diff --git a/pkgs/applications/emulators/libretro/cores/stella.nix b/pkgs/applications/emulators/libretro/cores/stella.nix
index 46fd3ee332fb..a662a9176249 100644
--- a/pkgs/applications/emulators/libretro/cores/stella.nix
+++ b/pkgs/applications/emulators/libretro/cores/stella.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "stella";
-  version = "0-unstable-2026-06-01";
+  version = "0-unstable-2026-06-09";
 
   src = fetchFromGitHub {
     owner = "stella-emu";
     repo = "stella";
-    rev = "502f15b41708a3911048f2770a320a3ef20b0415";
-    hash = "sha256-1/Zl6YNZhsIDJobbzGKAWKGEsep7k/iXAbwL7sK98M8=";
+    rev = "3e3061809913e59a4378737127ce0ae95b36e889";
+    hash = "sha256-fKivb4sFR4F0ub1NLpazLg3i3M9LOely08M8kBEczmo=";
   };
 
   makefile = "Makefile";

From 7cd9ae3e82449a11dcd01d2c2623735ad5c1ca2d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 11 Jun 2026 10:36:06 +0000
Subject: [PATCH 65/71] dnscontrol: 4.40.0 -> 4.41.0

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

diff --git a/pkgs/by-name/dn/dnscontrol/package.nix b/pkgs/by-name/dn/dnscontrol/package.nix
index 5b903277b5a0..0764db1ccbbb 100644
--- a/pkgs/by-name/dn/dnscontrol/package.nix
+++ b/pkgs/by-name/dn/dnscontrol/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "dnscontrol";
-  version = "4.40.0";
+  version = "4.41.0";
 
   src = fetchFromGitHub {
     owner = "DNSControl";
     repo = "dnscontrol";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1W37AZT3VJ84onz0HCJLZb/uGSuWVdsahBAIY5g1ssA=";
+    hash = "sha256-oz4hF3W6QKjPda/6AZ7djeZr32oFMqdMD34gWLMnFRQ=";
   };
 
-  vendorHash = "sha256-MH06qnCc9YSBmPWGuoh+8V1gRxaKw8W5ejhrNeceZSE=";
+  vendorHash = "sha256-DQmfwSPdUnoSmVDiKlwrHifKR59KuMe+0DGJtavpmLc=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 862fd66db486d822557d75d119fe1e1787317ce3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 11 Jun 2026 10:46:50 +0000
Subject: [PATCH 66/71] par-lang: 0-unstable-2026-06-01 ->
 0-unstable-2026-06-08

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

diff --git a/pkgs/by-name/pa/par-lang/package.nix b/pkgs/by-name/pa/par-lang/package.nix
index 4d89a5c7713c..81636f9e52ed 100644
--- a/pkgs/by-name/pa/par-lang/package.nix
+++ b/pkgs/by-name/pa/par-lang/package.nix
@@ -19,13 +19,13 @@
 
 rustPlatform.buildRustPackage {
   pname = "par-lang";
-  version = "0-unstable-2026-06-01";
+  version = "0-unstable-2026-06-08";
 
   src = fetchFromGitHub {
     owner = "par-team";
     repo = "par-lang";
-    rev = "b4cb6f58a696d0c159df241c302f6dac220a0421";
-    hash = "sha256-FO3XhIjead6Om/1wMWTFq6cx3pGps8JKs1/7MN1fllo=";
+    rev = "00bc7dc279ec622c68dac81ff226dbb189f42cc4";
+    hash = "sha256-a5uqmtTj+zS1C6ARu/y3aYykeBVINKSlh7p9fmAlsIs=";
   };
 
   cargoHash = "sha256-IoZbNvCzeuOMVjfbTUGr+qs73IvFmPTK9rn6x40SYBQ=";

From 981670f190d41098133861ec6ee87cc8eb79d877 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 11 Jun 2026 09:46:42 +0200
Subject: [PATCH 67/71] python3Packages.pycifrw: init at 5.0.1

Python library for reading and writing CIF files

https://github.com/jamesrhester/pycifrw
---
 .../python-modules/pycifrw/default.nix        | 52 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/python-modules/pycifrw/default.nix

diff --git a/pkgs/development/python-modules/pycifrw/default.nix b/pkgs/development/python-modules/pycifrw/default.nix
new file mode 100644
index 000000000000..8ff36cd7486f
--- /dev/null
+++ b/pkgs/development/python-modules/pycifrw/default.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  nix-update-script,
+  numpy,
+  ply,
+  prettytable,
+  setuptools,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "pycifrw";
+  version = "5.0.1";
+  pyproject = true;
+
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "jamesrhester";
+    repo = "pycifrw";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-b55+Vb2H/ADl586o5ch0X4HurwsbbgDg5XS5/8QhFZM=";
+  };
+
+  preBuild = ''
+    make -C src Parsers
+  '';
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    numpy
+    prettytable
+    ply
+  ];
+
+  # Requires external dictionaries (dics/DDLm/cif_mag.dic) which are not available
+  doCheck = false;
+
+  pythonImportsCheck = [ "CifFile" ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Python library for reading and writing CIF files";
+    homepage = "https://github.com/jamesrhester/pycifrw";
+    changelog = "https://github.com/jamesrhester/pycifrw/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.psfl;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e82b1fc240a6..0a2d66e29eb9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13742,6 +13742,8 @@ self: super: with self; {
 
   pychromecast = callPackage ../development/python-modules/pychromecast { };
 
+  pycifrw = callPackage ../development/python-modules/pycifrw { };
+
   pycketcasts = callPackage ../development/python-modules/pycketcasts { };
 
   pyclibrary = callPackage ../development/python-modules/pyclibrary { };

From 2239b501d0cc3e7eee915573e733f12647c81330 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 11 Jun 2026 13:29:46 +0200
Subject: [PATCH 68/71] python3Packages.pytorch-memlab: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/pytorch-memlab/default.nix b/pkgs/development/python-modules/pytorch-memlab/default.nix
index 49d3a25cfe2e..7a1ae6a13114 100644
--- a/pkgs/development/python-modules/pytorch-memlab/default.nix
+++ b/pkgs/development/python-modules/pytorch-memlab/default.nix
@@ -9,7 +9,7 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pytorch-memlab";
   version = "0.3.2";
   pyproject = true;
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Stonesjtu";
     repo = "pytorch_memlab";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-46C/2RvzhbHt1IHPmPCrLsIk2D3POhzuADNaXqUe0F4=";
   };
 
@@ -42,8 +42,8 @@ buildPythonPackage rec {
   meta = {
     description = "Simple and accurate CUDA memory management laboratory for pytorch";
     homepage = "https://github.com/Stonesjtu/pytorch_memlab";
-    changelog = "https://github.com/Stonesjtu/pytorch_memlab/releases/tag/${version}";
+    changelog = "https://github.com/Stonesjtu/pytorch_memlab/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ jherland ];
   };
-}
+})

From 1fdf8fd586508bc91d6d815fc8900695348f2902 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 11 Jun 2026 15:38:11 +0300
Subject: [PATCH 69/71] bootspec: honor boot.kernel.enable

WSL and other container-brained-but-not-really systems may not want a kernel,
and now that bootspec is no longer optional, this pulls one in anyway.
---
 nixos/modules/system/activation/bootspec.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/activation/bootspec.nix b/nixos/modules/system/activation/bootspec.nix
index 6f0653e1c44b..9f8c1da7359f 100644
--- a/nixos/modules/system/activation/bootspec.nix
+++ b/nixos/modules/system/activation/bootspec.nix
@@ -26,9 +26,11 @@ let
             // {
               "org.nixos.bootspec.v1" = {
                 system = config.boot.kernelPackages.stdenv.hostPlatform.system;
+                label = "${config.system.nixos.distroName} ${config.system.nixos.codeName} ${config.system.nixos.label} (Linux ${config.boot.kernelPackages.kernel.modDirVersion})";
+              }
+              // lib.optionalAttrs config.boot.kernel.enable {
                 kernel = "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}";
                 kernelParams = config.boot.kernelParams;
-                label = "${config.system.nixos.distroName} ${config.system.nixos.codeName} ${config.system.nixos.label} (Linux ${config.boot.kernelPackages.kernel.modDirVersion})";
               }
               // lib.optionalAttrs config.boot.initrd.enable {
                 initrd = "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}";

From 994e6bd462d9b384727ba9cf53888abad577ea87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 11 Jun 2026 14:53:45 +0200
Subject: [PATCH 70/71] tests/pnpm: add opencloud

---
 pkgs/test/pnpm/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/test/pnpm/default.nix b/pkgs/test/pnpm/default.nix
index 27938a8a0405..3a75e146cafa 100644
--- a/pkgs/test/pnpm/default.nix
+++ b/pkgs/test/pnpm/default.nix
@@ -1,8 +1,18 @@
-{ callPackage, lib }:
+{
+  callPackage,
+  lib,
+  opencloud,
+}:
+
 {
   pnpm-empty-lockfile = callPackage ./pnpm-empty-lockfile { };
   pnpm-fixup-state-db = callPackage ./pnpm-fixup-state-db { };
   pnpm-workspaces = lib.recurseIntoAttrs (callPackage ./pnpm-workspaces { });
   pnpm_11_v3 = callPackage ./pnpm_11_v3 { };
   pnpm_11_v4 = callPackage ./pnpm_11_v4 { };
+
+  # pnpm reverse dependencies that don't have a top-level package
+  opencloud = lib.recurseIntoAttrs {
+    inherit (opencloud.passthru) web idp-web;
+  };
 }

From 4809582d2c2096b845f5ad087eb56d73a7c933c9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Jun 2026 02:14:29 +0000
Subject: [PATCH 71/71] ocamlPackages.hxd: 0.4.0 -> 0.5.0

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

diff --git a/pkgs/development/ocaml-modules/hxd/default.nix b/pkgs/development/ocaml-modules/hxd/default.nix
index 9d965c50a226..002977656c68 100644
--- a/pkgs/development/ocaml-modules/hxd/default.nix
+++ b/pkgs/development/ocaml-modules/hxd/default.nix
@@ -10,13 +10,11 @@
 
 buildDunePackage (finalAttrs: {
   pname = "hxd";
-  version = "0.4.0";
-
-  minimalOCamlVersion = "4.08";
+  version = "0.5.0";
 
   src = fetchurl {
     url = "https://github.com/dinosaure/hxd/releases/download/v${finalAttrs.version}/hxd-${finalAttrs.version}.tbz";
-    sha256 = "sha256-EAMLciahdQRHGAmtWvwMIAchJkxcbdPVldJIBApxgFg=";
+    hash = "sha256-RTw5TsFWeMXObvEjVuTVgGoCYRdmAPrMp2XexBZx+qk=";
   };
 
   propagatedBuildInputs = lib.optional withLwt lwt;