From bcb87b091417e16035abc1c2d6c015c8435eff2d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 May 2026 08:26:02 +0000
Subject: [PATCH 01/60] gradle-completion: 9.4.1 -> 9.5.0

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

diff --git a/pkgs/by-name/gr/gradle-completion/package.nix b/pkgs/by-name/gr/gradle-completion/package.nix
index 0e50c2c13bf6..35ae2014913d 100644
--- a/pkgs/by-name/gr/gradle-completion/package.nix
+++ b/pkgs/by-name/gr/gradle-completion/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "gradle-completion";
-  version = "9.4.1";
+  version = "9.5.0";
 
   src = fetchFromGitHub {
     owner = "gradle";
     repo = "gradle-completion";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bqbi0Mg+MahS4ICmfC6kuEWVJ6t6GUdHB6Y5ATtbJ8c=";
+    hash = "sha256-8UwIrMfomyyIgw5MCfrpqtX0KHrn5ELU8eG0mWCX28o=";
   };
 
   nativeBuildInputs = [

From 77456b834919be3e6e8ed00bd26eebd32046dc8e Mon Sep 17 00:00:00 2001
From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com>
Date: Sat, 9 May 2026 20:06:06 +0100
Subject: [PATCH 02/60] fetchurl: add TeX historic archive mirrors

---
 pkgs/build-support/fetchurl/mirrors.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index f9f5b25557d2..5d7ebc7cd87b 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -332,6 +332,17 @@
     "https://test.pypi.io/packages/source/"
   ];
 
+  # TeX historic archive (see https://tug.org/historic/)
+  texhistoric = [
+    "https://ftp.math.utah.edu/pub/tex/historic/"
+    "https://texlive.info/historic/"
+    "https://ftp.tu-chemnitz.de/pub/tug/historic/"
+    "https://pi.kwarc.info/historic/"
+    "https://mirrors.tuna.tsinghua.edu.cn/tex-historic-archive/"
+    "https://mirror.nju.edu.cn/tex-historic/"
+    "ftp://tug.org/texlive/historic/"
+  ];
+
   ### Linux distros
 
   # CentOS

From 46ca66150d29182bd104093ad4b942eec25e0526 Mon Sep 17 00:00:00 2001
From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com>
Date: Sat, 9 May 2026 20:06:07 +0100
Subject: [PATCH 03/60] texlive: use texhistoric mirror list

---
 pkgs/tools/typesetting/tex/texlive/bin.nix     | 5 +----
 pkgs/tools/typesetting/tex/texlive/default.nix | 3 +--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 371f34a3bd0c..8fefe065f759 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -141,10 +141,7 @@ let
   common = {
     # initial TeX Live 2025 release
     # src = fetchurl {
-    #   urls = [
-    #     "http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${year}/texlive-${year}0308-source.tar.xz"
-    #     "ftp://tug.ctan.org/pub/tex/historic/systems/texlive/${year}/texlive-${year}0308-source.tar.xz"
-    #   ];
+    #   url = "mirror://texhistoric/systems/texlive/${year}/texlive-${year}0308-source.tar.xz";
     #   hash = "sha256-//2xo9FDwXekOYoiKaQNaojxgJjl9tz9V2SMnyQXSQ8=";
     # };
 
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index c1b23064f3ed..aa37fceca8d1 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -154,8 +154,7 @@ let
         [
           # tlnet-final snapshot; used when texlive.tlpdb is frozen
           # the TeX Live yearly freeze typically happens in mid-March
-          "http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${toString version.texliveYear}/tlnet-final"
-          "ftp://tug.org/texlive/historic/${toString version.texliveYear}/tlnet-final"
+          "mirror://texhistoric/systems/texlive/${toString version.texliveYear}/tlnet-final"
         ]
       else
         [

From fec2da645a82daf7ac91e5a31aea3a138ab57a5f Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Sat, 30 May 2026 12:00:00 +0000
Subject: [PATCH 04/60] zap-chip-gui: remove

the gui starts up but does not seem functional. There is probably no
point in keeping the gui variant. home-assistant only needs the cli.
---
 pkgs/by-name/za/zap-chip/package.nix | 26 +-------------------------
 pkgs/top-level/aliases.nix           |  1 +
 pkgs/top-level/all-packages.nix      |  2 --
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/pkgs/by-name/za/zap-chip/package.nix b/pkgs/by-name/za/zap-chip/package.nix
index dfb9b0a3967c..6602468b5aa9 100644
--- a/pkgs/by-name/za/zap-chip/package.nix
+++ b/pkgs/by-name/za/zap-chip/package.nix
@@ -2,11 +2,9 @@
   lib,
   stdenv,
   buildNpmPackage,
-  electron,
   fetchFromGitHub,
   writers,
   makeWrapper,
-  withGui ? false,
 }:
 
 buildNpmPackage rec {
@@ -55,35 +53,13 @@ buildNpmPackage rec {
       cat .version.json
     '';
 
-  postBuild = lib.optionalString withGui ''
-    npm exec electron-builder -- \
-      --dir \
-      -c.electronDist=${electron.dist} \
-      -c.electronVersion=${electron.version}
-  '';
-
   nativeBuildInputs = [ makeWrapper ];
 
   postInstall = ''
     # this file is also used at runtime
     install -m644 .version.json $out/lib/node_modules/zap/
-  ''
-  + lib.optionalString (!withGui) ''
     # home-assistant chip-* python packages need the executable under the name zap-cli
     mv $out/bin/zap $out/bin/zap-cli
-  ''
-  + lib.optionalString withGui ''
-    pushd dist/linux-*unpacked
-    mkdir -p $out/opt/zap-chip
-    cp -r locales resources{,.pak} $out/opt/zap-chip
-    popd
-
-    rm $out/bin/zap
-    makeWrapper '${lib.getExe electron}' "$out/bin/zap" \
-      --add-flags $out/opt/zap-chip/resources/app.asar \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
-      --set-default ELECTRON_IS_DEV 0 \
-      --inherit-argv0
   '';
 
   meta = {
@@ -92,7 +68,7 @@ buildNpmPackage rec {
     homepage = "https://github.com/project-chip/zap";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ symphorien ];
-    mainProgram = "zap" + lib.optionalString (!withGui) "-cli";
+    mainProgram = "zap-cli";
     broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6d85a8eecd08..3ff87caead2e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2626,6 +2626,7 @@ mapAliases {
   zabbix72 = throw "'zabbix72' was removed as it has reached its end of life"; # Added 2026-02-11
   zandronum-alpha = throw "'zandronum-alpha' has been removed as it was broken and the stable version has caught up"; # Added 2025-10-19
   zandronum-alpha-server = throw "'zandronum-alpha-server' has been removed as it was broken and the stable version has caught up"; # Added 2025-10-19
+  zap-chip-gui = throw "the gui variant of zap-chip was removed as it was not really functional"; # Added 2026-05-30
   zbackup = throw "'zbackup' has been removed due to being unmaintained upstream"; # Added 2025-08-22
   zdoom = throw "'zdoom' has been removed as it was broken and unmaintained upstream. Consider using UZDoom instead."; # Added 2026-04-04
   zeal-qt5 = warnAlias "'zeal-qt5' has been removed from nixpkgs. Please use 'zeal' instead" zeal; # Added 2025-08-31
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 412eb9b256dd..6e75afea6859 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11778,8 +11778,6 @@ with pkgs;
 
   yamale = with python3Packages; toPythonApplication yamale;
 
-  zap-chip-gui = zap-chip.override { withGui = true; };
-
   myEnvFun = callPackage ../misc/my-env {
     inherit (stdenv) mkDerivation;
   };

From 880a1ba0187a2616ce1664da6ed6149cbcf498a0 Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Sat, 30 May 2026 12:00:00 +0000
Subject: [PATCH 05/60] zap-chip: 2026.02.26 -> 2026.05.21

---
 pkgs/by-name/za/zap-chip/package.nix          |  7 ++-
 .../za/zap-chip/universal-npm-lock.patch      | 56 ++++++++++---------
 2 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/pkgs/by-name/za/zap-chip/package.nix b/pkgs/by-name/za/zap-chip/package.nix
index 6602468b5aa9..5ac7bcc71a92 100644
--- a/pkgs/by-name/za/zap-chip/package.nix
+++ b/pkgs/by-name/za/zap-chip/package.nix
@@ -9,16 +9,16 @@
 
 buildNpmPackage rec {
   pname = "zap-chip";
-  version = "2026.02.26";
+  version = "2026.05.21";
 
   src = fetchFromGitHub {
     owner = "project-chip";
     repo = "zap";
     rev = "v${version}";
-    hash = "sha256-iAubYY/gFVjqNGnI8PIv3twc5j/8a46ycAiaZ7nw1VY=";
+    hash = "sha256-rX8WTaQQbVWlabMEvv5SCalxy0XmB5jFpCk1uQCbunM=";
   };
 
-  npmDepsHash = "sha256-SIworjSX2SLiNA2Oshvem0mOW795WkbHWP8WFD9yp8g=";
+  npmDepsHash = "sha256-R95ljHvKPGyJh3tlWI1feo9HVE7abPLVLzScqReJBPw=";
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
   env.CYPRESS_INSTALL_BINARY = "0";
@@ -27,6 +27,7 @@ buildNpmPackage rec {
     # The release's package-lock.json file is not universal. It misses
     # architecture-related packages, caused by an NPM bug. Add these to the
     # lock otherwise `npm ci` complains.
+    # Regenerate the patch by `npm install --package-lock-only`
     # https://github.com/npm/cli/issues/8805
     ./universal-npm-lock.patch
     # the build system creates a file `.version.json` from a git command
diff --git a/pkgs/by-name/za/zap-chip/universal-npm-lock.patch b/pkgs/by-name/za/zap-chip/universal-npm-lock.patch
index ef97b5372d22..595e990acdef 100644
--- a/pkgs/by-name/za/zap-chip/universal-npm-lock.patch
+++ b/pkgs/by-name/za/zap-chip/universal-npm-lock.patch
@@ -1,33 +1,8 @@
 diff --git a/package-lock.json b/package-lock.json
-index 3034c5e47fdd..b6cf9a9995b9 100644
+index cb7db10b..10a4b683 100644
 --- a/package-lock.json
 +++ b/package-lock.json
-@@ -81,20 +81,20 @@
-         "eslint-plugin-vue": "^9.27.0",
-         "eslint-webpack-plugin": "^4.2.0",
-         "folder-hash": "^4.0.1",
--        "husky": "^9.1.7",
-+        "husky": "9.1.7",
-         "is-reachable": "^5.2.1",
-         "jest": "^29.2.2",
-         "jest-junit": "^16.0.0",
-         "jest-sonar-reporter": "^2.0.0",
--        "jsdoc": "^4.0.5",
-+        "jsdoc": "4.0.5",
-         "jsdoc-to-markdown": "^8.0.3",
-         "license-checker": "^25.0.1",
-         "node-7z": "^3.0.0",
-         "node-gyp": "^10.2.0",
-         "nodejs-file-downloader": "^4.9.3",
-         "octokit": "^1.7.2",
--        "prettier": "^3.6.2",
--        "pretty-quick": "^4.2.2",
-+        "prettier": "3.6.2",
-+        "pretty-quick": "4.2.2",
-         "sonar-scanner": "^3.1.0",
-         "test-utils": "^1.1.1",
-         "typescript": "4.6",
-@@ -6071,6 +6071,246 @@
+@@ -6116,6 +6116,273 @@
          }
        }
      },
@@ -99,6 +74,9 @@ index 3034c5e47fdd..b6cf9a9995b9 100644
 +        "arm"
 +      ],
 +      "dev": true,
++      "libc": [
++        "glibc"
++      ],
 +      "license": "MIT",
 +      "optional": true,
 +      "os": [
@@ -114,6 +92,9 @@ index 3034c5e47fdd..b6cf9a9995b9 100644
 +        "arm"
 +      ],
 +      "dev": true,
++      "libc": [
++        "musl"
++      ],
 +      "license": "MIT",
 +      "optional": true,
 +      "os": [
@@ -129,6 +110,9 @@ index 3034c5e47fdd..b6cf9a9995b9 100644
 +        "arm64"
 +      ],
 +      "dev": true,
++      "libc": [
++        "glibc"
++      ],
 +      "license": "MIT",
 +      "optional": true,
 +      "os": [
@@ -144,6 +128,9 @@ index 3034c5e47fdd..b6cf9a9995b9 100644
 +        "arm64"
 +      ],
 +      "dev": true,
++      "libc": [
++        "musl"
++      ],
 +      "license": "MIT",
 +      "optional": true,
 +      "os": [
@@ -159,6 +146,9 @@ index 3034c5e47fdd..b6cf9a9995b9 100644
 +        "ppc64"
 +      ],
 +      "dev": true,
++      "libc": [
++        "glibc"
++      ],
 +      "license": "MIT",
 +      "optional": true,
 +      "os": [
@@ -174,6 +164,9 @@ index 3034c5e47fdd..b6cf9a9995b9 100644
 +        "riscv64"
 +      ],
 +      "dev": true,
++      "libc": [
++        "glibc"
++      ],
 +      "license": "MIT",
 +      "optional": true,
 +      "os": [
@@ -189,6 +182,9 @@ index 3034c5e47fdd..b6cf9a9995b9 100644
 +        "s390x"
 +      ],
 +      "dev": true,
++      "libc": [
++        "glibc"
++      ],
 +      "license": "MIT",
 +      "optional": true,
 +      "os": [
@@ -204,6 +200,9 @@ index 3034c5e47fdd..b6cf9a9995b9 100644
 +        "x64"
 +      ],
 +      "dev": true,
++      "libc": [
++        "glibc"
++      ],
 +      "license": "MIT",
 +      "optional": true,
 +      "os": [
@@ -219,6 +218,9 @@ index 3034c5e47fdd..b6cf9a9995b9 100644
 +        "x64"
 +      ],
 +      "dev": true,
++      "libc": [
++        "musl"
++      ],
 +      "license": "MIT",
 +      "optional": true,
 +      "os": [

From 37e81aa5b5d8c649e475a06659c577c7bcd3c622 Mon Sep 17 00:00:00 2001
From: Mike Sperber <sperber@deinprogramm.de>
Date: Thu, 4 Jun 2026 14:40:28 +0200
Subject: [PATCH 06/60] verifast: add Darwin support

---
 pkgs/by-name/ve/verifast/package.nix | 96 ++++++++++++++++++++--------
 1 file changed, 70 insertions(+), 26 deletions(-)

diff --git a/pkgs/by-name/ve/verifast/package.nix b/pkgs/by-name/ve/verifast/package.nix
index 6239c16dd2b8..bf1db3540bd2 100644
--- a/pkgs/by-name/ve/verifast/package.nix
+++ b/pkgs/by-name/ve/verifast/package.nix
@@ -12,10 +12,12 @@
   fontconfig,
   libxml2,
   gnome2,
+  darwin,
 }:
 
 let
 
+  # Linux only
   libPath =
     lib.makeLibraryPath [
       stdenv.cc.libc
@@ -42,35 +44,77 @@ let
     patchelf --set-rpath ${libPath} ${x}
   '';
 
-in
-stdenv.mkDerivation (finalAttrs: {
   pname = "verifast";
   version = "25.08";
 
-  src = fetchurl {
-    url = "https://github.com/verifast/verifast/releases/download/${finalAttrs.version}/verifast-${finalAttrs.version}-linux.tar.gz";
-    sha256 = "sha256-HkABnWrdkb9yFByG9AB/L+Hu9n9FPLf7jx9at9MdUJ8=";
-  };
+in
+stdenv.mkDerivation (
+  finalAttrs:
+  let
+    srcs = {
+      x86_64-linux = fetchurl {
+        url = "https://github.com/verifast/verifast/releases/download/${finalAttrs.version}/${pname}-${finalAttrs.version}-linux.tar.gz";
+        hash = "sha256-HkABnWrdkb9yFByG9AB/L+Hu9n9FPLf7jx9at9MdUJ8=";
+      };
+      aarch64-darwin = fetchurl {
+        url = "https://github.com/verifast/verifast/releases/download/${finalAttrs.version}/${pname}-${finalAttrs.version}-macos-aarch.tar.gz";
+        hash = "sha256-/UicTlA4lFRk3OBgcsiS8YtDGmb7R7d6zeVLZo49HV8=";
+      };
+      x86_64-darwin = fetchurl {
+        url = "https://github.com/verifast/verifast/releases/download/${finalAttrs.version}/${pname}-${finalAttrs.version}-macos.tar.gz";
+        hash = "sha256-EVYPcnPsERfs2bqVQMbdR6TAv/ChQDrmCZNRl2Qs1Qw=";
+      };
+    };
+  in
+  {
+    inherit pname version;
 
-  dontConfigure = true;
-  dontStrip = true;
-  installPhase = ''
-    mkdir -p $out/bin
-    cp -R bin $out/libexec
+    src =
+      srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
 
-    ${patchExe "$out/libexec/verifast"}
-    ${patchExe "$out/libexec/vfide"}
-    ${patchLib "$out/libexec/libz3.so"}
-    ln -s $out/libexec/verifast $out/bin/verifast
-    ln -s $out/libexec/vfide    $out/bin/vfide
-  '';
+    dontConfigure = true;
+    dontStrip = true;
 
-  meta = {
-    description = "Verification for C and Java programs via separation logic";
-    homepage = "https://people.cs.kuleuven.be/~bart.jacobs/verifast/";
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    license = lib.licenses.mit;
-    platforms = [ "x86_64-linux" ];
-    maintainers = [ lib.maintainers.thoughtpolice ];
-  };
-})
+    nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.sigtool;
+
+    installPhase = ''
+      mkdir -p $out/bin
+      cp -R bin $out/libexec
+    ''
+    + (lib.optionalString stdenv.hostPlatform.isLinux ''
+      ${patchExe "$out/libexec/verifast"}
+      ${patchExe "$out/libexec/vfide"}
+      ${patchLib "$out/libexec/libz3.so"}
+    '')
+    + (lib.optionalString stdenv.hostPlatform.isDarwin ''
+      cp -R lib $out/lib
+      install_name_tool -change '@executable_path/../lib/libz3.dylib' $out/lib/libz3.dylib $out/libexec/verifast
+
+      install_name_tool -change libz3.dylib $out/lib/libz3.dylib $out/libexec/vfide-core
+      ln -s $out/libexec/vfide-core $out/bin/vfide-core
+
+      for f in $out/libexec/vfide-core $out/lib/*.dylib; do
+          for old in `otool -L $f | fgrep homebrew | sed -E 's|^[[:space:]]+([^ ]+).*$|\1|g'`; do
+              new=`echo $old | sed -E 's|/opt/homebrew/.+/lib/([^ ]+)|\1|'`
+              install_name_tool -change $old $out/lib/$new $f
+              codesign --force -s - $f
+          done
+      done
+      # include path points to $out/bin
+      ln -s $out/libexec/*.{h,gh,cfmanifest,c} $out/bin/
+    '')
+    + ''
+      ln -s $out/libexec/verifast $out/bin/verifast
+      ln -s $out/libexec/vfide    $out/bin/vfide
+    '';
+
+    meta = {
+      description = "Verification for C and Java programs via separation logic";
+      homepage = "https://people.cs.kuleuven.be/~bart.jacobs/verifast/";
+      sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+      license = lib.licenses.mit;
+      platforms = builtins.attrNames srcs;
+      maintainers = [ lib.maintainers.thoughtpolice ];
+    };
+  }
+)

From a68ab6c8372ac6a85ff7f043168c8a7e71180e5c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 6 Jun 2026 21:58:31 +0200
Subject: [PATCH 07/60] ctranslate2: 4.7.2 -> 4.8.0

https://github.com/OpenNMT/CTranslate2/blob/v4.8.0/CHANGELOG.md
---
 pkgs/by-name/ct/ctranslate2/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ct/ctranslate2/package.nix b/pkgs/by-name/ct/ctranslate2/package.nix
index bf13d9e7044f..5838cd4540fb 100644
--- a/pkgs/by-name/ct/ctranslate2/package.nix
+++ b/pkgs/by-name/ct/ctranslate2/package.nix
@@ -28,14 +28,14 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
   pname = "ctranslate2";
-  version = "4.7.2";
+  version = "4.8.0";
 
   src = fetchFromGitHub {
     owner = "OpenNMT";
     repo = "CTranslate2";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-jtOfMrC5kFKQN4eFEZeawo0blWHbpMu+peM3XtTSf5w=";
+    hash = "sha256-Z7Gq+kXIfMdZs48WeptRGXhXnLfehegAwTtQpTbPM4U=";
   };
 
   # Fix CMake 4 compatibility

From 4d920c0d9adcea3599d0ceeee26a95bcbac446f2 Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Wed, 10 Jun 2026 15:06:37 +0200
Subject: [PATCH 08/60] python3Packages.interruptingcow: use finalAttrs

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

diff --git a/pkgs/development/python-modules/interruptingcow/default.nix b/pkgs/development/python-modules/interruptingcow/default.nix
index cbcd976c5624..25ad895e50de 100644
--- a/pkgs/development/python-modules/interruptingcow/default.nix
+++ b/pkgs/development/python-modules/interruptingcow/default.nix
@@ -3,13 +3,13 @@
   buildPythonPackage,
   fetchPypi,
 }:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "interruptingcow";
   version = "0.8";
   format = "setuptools";
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     sha256 = "3e8cd5058b651e625702cba53e3b1fb76d7a5ec07ab69c52a167a9f784e3306c";
   };
 
@@ -19,4 +19,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ benley ];
   };
-}
+})

From 059d6f3b00d61728af72fcf88582ebbab8cf2d90 Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Wed, 10 Jun 2026 15:08:55 +0200
Subject: [PATCH 09/60] python3Packages.interruptingcow: enable
 __structuredAttrs

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

diff --git a/pkgs/development/python-modules/interruptingcow/default.nix b/pkgs/development/python-modules/interruptingcow/default.nix
index 25ad895e50de..5aa3891d7a56 100644
--- a/pkgs/development/python-modules/interruptingcow/default.nix
+++ b/pkgs/development/python-modules/interruptingcow/default.nix
@@ -8,6 +8,8 @@ buildPythonPackage (finalAttrs: {
   version = "0.8";
   format = "setuptools";
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
     inherit (finalAttrs) pname version;
     sha256 = "3e8cd5058b651e625702cba53e3b1fb76d7a5ec07ab69c52a167a9f784e3306c";

From 5272c2a612627e82001e05268a79ec2326017080 Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Wed, 10 Jun 2026 15:10:20 +0200
Subject: [PATCH 10/60] python3Packages.interruptingcow: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/interruptingcow/default.nix b/pkgs/development/python-modules/interruptingcow/default.nix
index 5aa3891d7a56..4f8cfe01985a 100644
--- a/pkgs/development/python-modules/interruptingcow/default.nix
+++ b/pkgs/development/python-modules/interruptingcow/default.nix
@@ -2,11 +2,12 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
 }:
 buildPythonPackage (finalAttrs: {
   pname = "interruptingcow";
   version = "0.8";
-  format = "setuptools";
+  pyproject = true;
 
   __structuredAttrs = true;
 
@@ -15,6 +16,10 @@ buildPythonPackage (finalAttrs: {
     sha256 = "3e8cd5058b651e625702cba53e3b1fb76d7a5ec07ab69c52a167a9f784e3306c";
   };
 
+  build-system = [
+    setuptools
+  ];
+
   meta = {
     description = "Watchdog that interrupts long running code";
     homepage = "https://bitbucket.org/evzijst/interruptingcow";

From 6004393057619a04b7b1fcec654b00425fe0109e Mon Sep 17 00:00:00 2001
From: superwhiskers <whiskerdev@protonmail.com>
Date: Mon, 15 Jun 2026 00:17:02 -0500
Subject: [PATCH 11/60] kakounePlugins.kak-ansi: 0.2.4 -> 0.3.0

---
 pkgs/applications/editors/kakoune/plugins/overrides.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/kakoune/plugins/overrides.nix b/pkgs/applications/editors/kakoune/plugins/overrides.nix
index 054ad9cebd92..71537c1f51ac 100644
--- a/pkgs/applications/editors/kakoune/plugins/overrides.nix
+++ b/pkgs/applications/editors/kakoune/plugins/overrides.nix
@@ -47,13 +47,13 @@ self: super: {
 
   kak-ansi = stdenv.mkDerivation (finalAttrs: {
     pname = "kak-ansi";
-    version = "0.2.4";
+    version = "0.3.0";
 
     src = fetchFromGitHub {
       owner = "eraserhd";
       repo = "kak-ansi";
       rev = "v${finalAttrs.version}";
-      sha256 = "kFjTYFy0KF5WWEHU4hHFAnD/03/d3ptjqMMbTSaGImE=";
+      sha256 = "sha256-Tp+cKZxDESlpks6l+6J0H/1BvHyfQSqCxeutUcsZrEc=";
     };
 
     installPhase = ''

From 94a8be95019879a70ecf8e55e68283f4e36ab074 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Mon, 15 Jun 2026 02:23:19 -0600
Subject: [PATCH 12/60] libu2f-emu: install headers back in original location

---
 pkgs/by-name/li/libu2f-emu/package.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/by-name/li/libu2f-emu/package.nix b/pkgs/by-name/li/libu2f-emu/package.nix
index 640402e64d20..97e9a69032e8 100644
--- a/pkgs/by-name/li/libu2f-emu/package.nix
+++ b/pkgs/by-name/li/libu2f-emu/package.nix
@@ -39,12 +39,6 @@ stdenv.mkDerivation {
     # Fix header guard typo: TRANSaCTION_H -> TRANSACTION_H
     substituteInPlace src/usb/transaction.h \
       --replace-fail "define TRANSaCTION_H" "define TRANSACTION_H"
-
-    # Install headers into a u2f-emu/ subdirectory so consumers can
-    # use #include <u2f-emu/u2f-emu.h> (expected by QEMU).
-    substituteInPlace src/meson.build \
-      --replace-fail "install_headers(u2f_emu_headers)" \
-                     "install_headers(u2f_emu_headers, subdir: 'u2f-emu')"
   '';
 
   # Disable -Werror: upstream uses OpenSSL EC_KEY APIs deprecated since 3.0.

From e802c76a960a5688d8a6a127832ca342b81ea5a4 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Fri, 12 Jun 2026 18:36:29 -0400
Subject: [PATCH 13/60] perlPackages.DBDCSV: backport fix for build on latest
 DBI

Need to vendor as need to elide the changelog diff from the commit as it
conflicts.
---
 pkgs/top-level/perl-packages.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b58cd5bd0732..88923b265b25 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9731,6 +9731,13 @@ with self;
       url = "mirror://cpan/authors/id/H/HM/HMBRAND/DBD-CSV-0.60.tgz";
       hash = "sha256-AYuDow95mXm8jDwwRMixyAAc32C9w+dGhIgYGVJUtOc=";
     };
+    patches = [
+      (fetchpatch2 {
+        url = "https://github.com/perl5-dbi/DBD-CSV/commit/ae091790398088a66b22fa572856bfeb4db4c78a.patch?full_index=1";
+        excludes = [ "ChangeLog" ];
+        hash = "sha256-eZdCNSi3YJrZdZcK/8nFx5Q4rB89b0ynKemupvKrfys=";
+      })
+    ];
     propagatedBuildInputs = [
       DBI
       SQLStatement

From 6636d2bf3dc2ba4c3052a467f0c324a6368a3f1a Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Fri, 12 Jun 2026 18:37:18 -0400
Subject: [PATCH 14/60] perlPackages.DBDCSV: 0.60 -> 0.62

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 88923b265b25..510f3cf89a29 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9726,10 +9726,10 @@ with self;
 
   DBDCSV = buildPerlPackage {
     pname = "DBD-CSV";
-    version = "0.60";
+    version = "0.62";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/H/HM/HMBRAND/DBD-CSV-0.60.tgz";
-      hash = "sha256-AYuDow95mXm8jDwwRMixyAAc32C9w+dGhIgYGVJUtOc=";
+      url = "mirror://cpan/authors/id/H/HM/HMBRAND/DBD-CSV-0.62.tgz";
+      hash = "sha256-0/EVD+IGfA49FJWHZeqNQZWDSY+WMTawQC2qkwvJMOM=";
     };
     patches = [
       (fetchpatch2 {

From a4016aefd4b95617bd141f0121eaa541c002b918 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 15:02:54 +0000
Subject: [PATCH 15/60] flow: 0.317.0 -> 0.318.0

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

diff --git a/pkgs/by-name/fl/flow/package.nix b/pkgs/by-name/fl/flow/package.nix
index d92a8bed0415..fe9bd6dcc814 100644
--- a/pkgs/by-name/fl/flow/package.nix
+++ b/pkgs/by-name/fl/flow/package.nix
@@ -16,13 +16,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "flow";
-  version = "0.317.0";
+  version = "0.318.0";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3r330N+bmtMhUszOoaRqVqbrno7tZatXMO6szvPKqAc=";
+    hash = "sha256-FlrQzfFYGDydlYR7AgC+sXBGQtMhDzazV1C5OxVbuuY=";
   };
 
   patches = [

From f76708f72b05011e4af467daef75198bcc67037e 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, 15 Jun 2026 21:28:16 +0700
Subject: [PATCH 16/60] =?UTF-8?q?nixtamal:=201.6.0=20=E2=86=92=201.7.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds shell completions & syncs synopsis
---
 pkgs/by-name/ni/nixtamal/package.nix | 44 ++++++++++++++++++----------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/ni/nixtamal/package.nix b/pkgs/by-name/ni/nixtamal/package.nix
index cb79390c8a10..768fef8cb15b 100644
--- a/pkgs/by-name/ni/nixtamal/package.nix
+++ b/pkgs/by-name/ni/nixtamal/package.nix
@@ -6,6 +6,8 @@
   ocamlPackages,
   darwin,
   makeBinaryWrapper,
+  removeReferencesTo,
+  installShellFiles,
   coreutils,
   curl,
   gawk,
@@ -13,14 +15,13 @@
   nix-prefetch-fossil,
   nix-prefetch-git,
   nix-prefetch-pijul,
-  removeReferencesTo,
   testers,
   nixtamal,
 }:
 
 ocamlPackages.buildDunePackage (finalAttrs: {
   pname = "nixtamal";
-  version = "1.6.0";
+  version = "1.7.0";
   release_year = 2026;
 
   minimalOCamlVersion = "5.3";
@@ -29,19 +30,20 @@ ocamlPackages.buildDunePackage (finalAttrs: {
     url = "https://darcs.toastal.in.th/nixtamal/stable/";
     mirrors = [ "https://smeder.ee/~toastal/nixtamal.darcs" ];
     rev = finalAttrs.version;
-    hash = "sha256-OOAulI6ZJGbbUMi68jnJQ+cJpZVQYL5F5HUfdOZ3wEs=";
+    hash = "sha256-EMm/hAmOZw5Zcmr3XUTz9M2LigqTnZpDElGMxWML6ug=";
   };
 
   nativeBuildInputs = [
     makeBinaryWrapper
     removeReferencesTo
+    installShellFiles
+    # Completions
+    ocamlPackages.cmdliner
     # For manpages
     python3Packages.docutils
     python3Packages.pygments
   ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.sigtool
-  ];
+  ++ lib.optional stdenv.hostPlatform.isDarwin darwin.sigtool;
 
   buildInputs = with ocamlPackages; [
     cmdliner
@@ -104,9 +106,8 @@ ocamlPackages.buildDunePackage (finalAttrs: {
        --libdir="$lib/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib" \
        nixtamal
 
-    for dep in "${ocamlPackages.ocaml}" "${ocamlPackages.camomile}"
-    do
-        remove-references-to -t "$dep" "$bin/bin/nixtamal"
+    for dep in "${ocamlPackages.ocaml}" "${ocamlPackages.camomile}"; do
+       remove-references-to -t "$dep" "$bin/bin/nixtamal"
     done
 
     wrapProgram "$bin/bin/nixtamal" --prefix PATH : ${
@@ -121,6 +122,17 @@ ocamlPackages.buildDunePackage (finalAttrs: {
       ]
     }
 
+    ${lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) /* sh */ ''
+      mkdir -p "$TMPDIR"
+      cmdliner tool-completion --standalone-completion bash nixtamal >"$TMPDIR/completion.bash"
+      cmdliner tool-completion --standalone-completion zsh nixtamal >"$TMPDIR/completion.zsh"
+      substituteInPlace "$TMPDIR/completion.zsh" --replace-fail "_nixtamal_cmdliner" "_nixtamal"
+
+      installShellCompletion --bash --cmd nixtamal "$TMPDIR/completion.bash"
+      installShellCompletion --fish --cmd nixtamal "script/completion.fish"
+      installShellCompletion --zsh --cmd nixtamal "$TMPDIR/completion.zsh"
+    ''}
+
     runHook postInstall
   '';
 
@@ -143,14 +155,14 @@ ocamlPackages.buildDunePackage (finalAttrs: {
     changelog = "https://nixtamal.toast.al/changelog/";
     description = "Fulfilling input pinning for Nix";
     longDescription = ''
-      Nixtamal’s keys features
-
-      • Automate the manual work of input pinning, allowing to lock & refresh inputs
-      • Declarative KDL manifest file over imperative CLI flags
+      • Automate the manual work of input pinning for dependency management
+      • Allow easy ways to lock & refresh those inputs
+      • Declarative manifest file over imperative CLI flags
       • diff/grep-friendly lockfile
-      • Host, forge, VCS-agnostic
-      • Choose eval time fetchers (builtins) or build time fetchers (Nixpkgs, default) — which opens up fetching Darcs, Pijul, & Fossil
-      • Supports mirrors
+      • Declarative patch/diff management for inputs
+      • Host-, forge-, VCS-agnostic
+      • Choose eval time fetchers (builtins) or build time fetchers (Nixpkgs, default) — which opens up fetching now-supported Darcs, Pijul, & Fossil
+      • Supports mirrors, failing over when a server is down
       • Override hash algorithm on a per-project & per-input basis — including BLAKE3 support
       • Custom freshness commands
       • No experimental Nix features required

From ebbacf47e21fef75ea6392c7d7ce52ee3122bda0 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Tue, 16 Jun 2026 20:36:26 +0200
Subject: [PATCH 17/60] clive: fix doInstallCheck attribute

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

diff --git a/pkgs/by-name/cl/clive/package.nix b/pkgs/by-name/cl/clive/package.nix
index fb03c20f4b1b..53a6c558dcfb 100644
--- a/pkgs/by-name/cl/clive/package.nix
+++ b/pkgs/by-name/cl/clive/package.nix
@@ -43,7 +43,7 @@ buildGoModule (finalAttrs: {
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  doinstallCheck = true;
+  doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
 

From 7bea36fbdd3e401ecf3f125badf7f725be10cd1b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jun 2026 21:08:23 +0000
Subject: [PATCH 18/60] claude-agent-acp: 0.42.0 -> 0.45.1

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

diff --git a/pkgs/by-name/cl/claude-agent-acp/package.nix b/pkgs/by-name/cl/claude-agent-acp/package.nix
index 4c16ea153213..26dc14b0c45a 100644
--- a/pkgs/by-name/cl/claude-agent-acp/package.nix
+++ b/pkgs/by-name/cl/claude-agent-acp/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "claude-agent-acp";
-  version = "0.42.0";
+  version = "0.45.1";
 
   src = fetchFromGitHub {
     owner = "agentclientprotocol";
     repo = "claude-agent-acp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yvljKMNVCQAFcobHzgPwXSTYGU1IWdOGdX6nsxBfWyw=";
+    hash = "sha256-NiDsm0tcK80CQyG8zn974ErwDP0hXXOHbCLX9BpErKY=";
   };
 
-  npmDepsHash = "sha256-ecMy4cgsM+PKdsiqAG4Deoiz8DQeJRDgZ8aWzjS/EjA=";
+  npmDepsHash = "sha256-WB+ZMtDmqZrEg8/k9peCm+EbKvZc8qfOV33STT1vj8k=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From dd781ebb55367f63cafd3457ea5033530b5ea44f Mon Sep 17 00:00:00 2001
From: Nicky Mouha <nmouha@users.noreply.github.com>
Date: Tue, 16 Jun 2026 22:28:43 -0400
Subject: [PATCH 19/60] whisper-cpp: 1.8.5 -> 1.8.7

---
 pkgs/by-name/wh/whisper-cpp/package.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/wh/whisper-cpp/package.nix b/pkgs/by-name/wh/whisper-cpp/package.nix
index 9684826bb140..cbe9c366bd63 100644
--- a/pkgs/by-name/wh/whisper-cpp/package.nix
+++ b/pkgs/by-name/wh/whisper-cpp/package.nix
@@ -31,7 +31,7 @@
 
   withSDL ? true,
 
-  withFFmpegSupport ? false,
+  withFFmpegSupport ? stdenv.hostPlatform.isLinux,
 }:
 
 assert metalSupport -> stdenv.hostPlatform.isDarwin;
@@ -81,13 +81,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "whisper-cpp";
-  version = "1.8.5";
+  version = "1.8.7";
 
   src = fetchFromGitHub {
     owner = "ggml-org";
     repo = "whisper.cpp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wZYSk0IVCL8bt00HVo6iqXS31GZJ2C8Z2be6wiMs7l8=";
+    hash = "sha256-hzgO2IqV1+JQjiYBBmFSOLfp1BgH0DgU0TZyO7OzFHE=";
   };
 
   # The upstream download script tries to download the models to the
@@ -135,7 +135,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     (cmakeBool "BUILD_SHARED_LIBS" (!isStatic))
   ]
   ++ optionals isLinux [
-    (cmakeBool "WHISPER_FFMPEG" withFFmpegSupport)
+    (cmakeBool "WHISPER_COMMON_FFMPEG" withFFmpegSupport)
   ]
   ++ optionals (isx86 && !isStatic) [
     (cmakeBool "GGML_BACKEND_DL" true)
@@ -188,6 +188,11 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     runHook postInstallCheck
   '';
 
+  postFixup = ''
+    substituteInPlace $out/lib/pkgconfig/whisper.pc \
+      --replace-fail '//' '/'
+  '';
+
   passthru.updateScript = nix-update-script { };
 
   meta = {

From 0fcb265f914f557ee8cf08a5d6b069cd5e84b9cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Chocholat=C3=BD?= <chocholaty.david@protonmail.com>
Date: Wed, 17 Jun 2026 07:52:21 +0200
Subject: [PATCH 20/60] anytype: Raise memory limit for Node.js build

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

diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix
index 5a5739564494..e6f428405645 100644
--- a/pkgs/by-name/an/anytype/package.nix
+++ b/pkgs/by-name/an/anytype/package.nix
@@ -93,6 +93,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+    # used upstream for builds: https://github.com/anyproto/anytype-ts/blob/5d66657f764c0649410e37c9e9c06e3ff18487ee/.github/workflows/build.yml#L192.
+    NODE_OPTIONS = "--max-old-space-size=8192";
   };
 
   nativeBuildInputs = [

From b9758476dea7d784135e7f146e344b3b07d272ff Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Wed, 17 Jun 2026 08:18:35 +0200
Subject: [PATCH 21/60] claude-code: 2.1.177 -> 2.1.179

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

Assisted-by: Claude Code (Claude Opus 4.8)
---
 pkgs/by-name/cl/claude-code/manifest.json | 38 +++++++++++------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json
index 2f0552a443c4..944c08d08e6f 100644
--- a/pkgs/by-name/cl/claude-code/manifest.json
+++ b/pkgs/by-name/cl/claude-code/manifest.json
@@ -1,47 +1,47 @@
 {
-  "version": "2.1.177",
-  "commit": "6fae7a072b111776fc95ca221caac31b7439eb25",
-  "buildDate": "2026-06-13T00:29:44Z",
+  "version": "2.1.179",
+  "commit": "8c865e06ae1320b1c9b005bdeb6f6589ada9d0b3",
+  "buildDate": "2026-06-16T02:06:40Z",
   "platforms": {
     "darwin-arm64": {
       "binary": "claude",
-      "checksum": "eb0730351be2f02b482b1855870f5877489085aac86b0c4c1db4e458d9e40ed9",
-      "size": 225124512
+      "checksum": "af2a2d0cb99b0e8b094bc5dbe114ed2d5b2d27ba440987ef6f2f209da9954253",
+      "size": 226082208
     },
     "darwin-x64": {
       "binary": "claude",
-      "checksum": "fcdc6c6679d4e1e3a0a3812f24e8b08ab73156732072c2ca5ee6248bee8313bd",
-      "size": 227642800
+      "checksum": "a0ad60761294bd208eda6cb0fd8e896c64397c8d317546a696c5e627782ec8cb",
+      "size": 228600496
     },
     "linux-arm64": {
       "binary": "claude",
-      "checksum": "baf3926dc166215772f959e367da9784ff4c75157aaafe4524fdc79ebff984b1",
-      "size": 250394248
+      "checksum": "25d2eba2351df153f872a8e19289f5042a26b430cd446564bd92a0dec5d681cd",
+      "size": 251311752
     },
     "linux-x64": {
       "binary": "claude",
-      "checksum": "ff41753634b20c869ef6a32a20863521b33d4186ac0d6a49379ab48a48395ee7",
-      "size": 250480336
+      "checksum": "6d8422de5ac8ac2077b20e2a6307083f85609aaf45f8c783ec2f7d71e8781e70",
+      "size": 251418320
     },
     "linux-arm64-musl": {
       "binary": "claude",
-      "checksum": "bc756f27912d993d632a5f86be9a0364fc3c1373d146a367e46c8d01d3ca1620",
-      "size": 243248984
+      "checksum": "8273ab58b79a6324fa8d56361cd394a4ffa5d30f28be3abecaafb2596d7ae2ee",
+      "size": 244166488
     },
     "linux-x64-musl": {
       "binary": "claude",
-      "checksum": "4884b1512bf2863a85f1717eee58840b05d558568f817be71b1a116a430f4a96",
-      "size": 244890672
+      "checksum": "891b13f5aa5a798c209b13ce9c556c9a9162b6ad574eea97b223c80e4ee1d9dd",
+      "size": 245828656
     },
     "win32-x64": {
       "binary": "claude.exe",
-      "checksum": "408ddf27d45fc6b6516843c0513072bc0f474d7bface60ae8bbbc633bef9feb2",
-      "size": 245856928
+      "checksum": "1025f57fb260a3adac9517eb643c78c67e756c1ef5514d9ad8c57d5d784f8be3",
+      "size": 246756512
     },
     "win32-arm64": {
       "binary": "claude.exe",
-      "checksum": "89652ac1f73ccc3fe039a1d388af81af82608af1cac7a32b5ebc2189b8ae2d62",
-      "size": 241821856
+      "checksum": "0320d4b49e3d434fcf94cf1a73e4d7e95df831a22c2c94d2a0cd471a59a27eac",
+      "size": 242721440
     }
   }
 }

From f6109ecfc2d927c72355c68923f5563d508e254a Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Wed, 17 Jun 2026 08:18:35 +0200
Subject: [PATCH 22/60] vscode-extensions.anthropic.claude-code: 2.1.175 ->
 2.1.179

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

Assisted-by: Claude Code (Claude Opus 4.8)
---
 .../extensions/anthropic.claude-code/default.nix       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index 3acd29d4b269..19a1e7a770b7 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -21,26 +21,26 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
       sources = {
         "x86_64-linux" = {
           arch = "linux-x64";
-          hash = "sha256-XA4xSd/sg9vhOGqcCNliHzloBxPZsgXW/dSkKp/RzM0=";
+          hash = "sha256-hjj2PRcpRsC6kWqwhGlBt071rHVq9ZN+OcNsT78IuWc=";
         };
         "aarch64-linux" = {
           arch = "linux-arm64";
-          hash = "sha256-l2NjDHBOMBzJT9Pis7sqSuFuG07eZPALximND+hVqDU=";
+          hash = "sha256-7lhfn95LI8vg2MvzTuQw57bmhJOXInl+T/e3ZSLNMKA=";
         };
         "x86_64-darwin" = {
           arch = "darwin-x64";
-          hash = "sha256-hE/1N28f9uAzg2fG3Hrc4z1kW21rdhtCRmF9SphqiFc=";
+          hash = "sha256-/aSCQP6yQ30qmgz1ZcgZ91MiLwpxkr77m3NIlidfgnw=";
         };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
-          hash = "sha256-68CmDax385o0juoQWNX/NLx+tjIt9YytTHjRZkqAR98=";
+          hash = "sha256-uDVR6Y1GoY8G8OLBoAGY6YMLL2Qj7eHpZ6p0Z0OCN/4=";
         };
       };
     in
     {
       name = "claude-code";
       publisher = "anthropic";
-      version = "2.1.175";
+      version = "2.1.179";
     }
     // sources.${stdenvNoCC.hostPlatform.system}
       or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");

From b229bca72e6d5d381aa15a3dd4d958c535ac7398 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 17 Jun 2026 08:49:03 +0200
Subject: [PATCH 23/60] python3Packages.tencentcloud-sdk-python: 3.1.116 ->
 3.1.117

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/3.1.116...3.1.117

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.1.117/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index e8535389af88..523461f1b43e 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "tencentcloud-sdk-python";
-  version = "3.1.116";
+  version = "3.1.117";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = finalAttrs.version;
-    hash = "sha256-56WyEdYo0TWZYyYKIaenZDJiXRPFZKuIrpXvjMIgRMU=";
+    hash = "sha256-u0vTpcRkgnHeO6lj5eU359p3E8RcyHMM+ukAVlcdfuU=";
   };
 
   build-system = [ setuptools ];

From c8a7c30b7fcf463555b58e4246e801169c9fdf8b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Jun 2026 07:35:55 +0000
Subject: [PATCH 24/60] chroma: 2.26.1 -> 2.27.0

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

diff --git a/pkgs/by-name/ch/chroma/package.nix b/pkgs/by-name/ch/chroma/package.nix
index 965c5eb69add..b16544b934cb 100644
--- a/pkgs/by-name/ch/chroma/package.nix
+++ b/pkgs/by-name/ch/chroma/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "chroma";
-  version = "2.26.1";
+  version = "2.27.0";
 
   src = fetchFromGitHub {
     owner = "alecthomas";
     repo = "chroma";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kOhPaiqtFU3H43jz+GjfOOIVEy5acpP9SwQ1/2xsMQc=";
+    hash = "sha256-iIu0FFAavXbma/LiKEDltvrGMYYd4uxSfHpNTrmN6aI=";
   };
 
-  vendorHash = "sha256-mPB7qPPMIQLjmyN2T7qX/X1Ip0E4X0jNv5h+UfVEHrY=";
+  vendorHash = "sha256-B2TvCIBqgdTpQApmQkO2COIarqmgF9mhZ0HG5aFgVhY=";
 
   modRoot = "./cmd/chroma";
 

From e2132a53f1b9b77feb7a66ce7633dc14b4d8d085 Mon Sep 17 00:00:00 2001
From: 74k1 <git.t@betsumei.com>
Date: Wed, 17 Jun 2026 10:09:27 +0200
Subject: [PATCH 25/60] maintainers: add 74k1

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 454cb3da93aa..0f2f4e343193 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -289,6 +289,14 @@
     githubId = 92977828;
     name = "Mori Zen";
   };
+  _74k1 = {
+    email = "git.t@betsumei.com";
+    github = "74k1";
+    githubId = 49000471;
+    keys = [ { fingerprint = "46F3 422F 63A3 1369 7EAB  83D5 1CF1 55F7 6F21 3503"; } ];
+    matrix = "@74k1:matrix.org";
+    name = "Tim";
+  };
   _7591yj = {
     email = "yeongjin.kim@proton.me";
     github = "7591yj";

From 221e00b9e248dc72b81338a37c963a969778b8ef Mon Sep 17 00:00:00 2001
From: 74k1 <git.t@betsumei.com>
Date: Wed, 17 Jun 2026 10:09:27 +0200
Subject: [PATCH 26/60] sure: add 74k1 to maintainers

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

diff --git a/pkgs/by-name/su/sure/package.nix b/pkgs/by-name/su/sure/package.nix
index 0aafb55ad92c..70e905cf92f3 100644
--- a/pkgs/by-name/su/sure/package.nix
+++ b/pkgs/by-name/su/sure/package.nix
@@ -91,6 +91,7 @@ stdenv.mkDerivation rec {
     homepage = "https://sure.am/";
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [
+      _74k1
       pjrm
     ];
     platforms = lib.platforms.linux;

From 499d913a1af97416e866d5c4ecdeaad76ed708fc Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Wed, 17 Jun 2026 08:22:18 +0200
Subject: [PATCH 27/60] rocqPackage.mathcomp-real-closed: init at 2.0.5

---
 .../coq-modules/coqeal/default.nix            |   1 +
 .../coq-modules/mathcomp-abel/default.nix     |   1 +
 .../mathcomp-real-closed/default.nix          | 148 ++++++++++--------
 .../mathcomp-real-closed/default.nix          |  50 ++++++
 pkgs/top-level/rocq-packages.nix              |   1 +
 5 files changed, 137 insertions(+), 64 deletions(-)
 create mode 100644 pkgs/development/rocq-modules/mathcomp-real-closed/default.nix

diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix
index 3ada8a25b79a..929728ce225b 100644
--- a/pkgs/development/coq-modules/coqeal/default.nix
+++ b/pkgs/development/coq-modules/coqeal/default.nix
@@ -58,6 +58,7 @@ let
     release."1.0.3".sha256 = "0hc63ny7phzbihy8l7wxjvn3haxx8jfnhi91iw8hkq8n29i23v24";
 
     propagatedBuildInputs = [
+      mathcomp.ssreflect
       mathcomp.algebra
       bignums
       multinomials
diff --git a/pkgs/development/coq-modules/mathcomp-abel/default.nix b/pkgs/development/coq-modules/mathcomp-abel/default.nix
index bfdf24521c42..dacadca383e8 100644
--- a/pkgs/development/coq-modules/mathcomp-abel/default.nix
+++ b/pkgs/development/coq-modules/mathcomp-abel/default.nix
@@ -43,6 +43,7 @@ mkCoqDerivation {
   release."1.0.0".sha256 = "190jd8hb8anqsvr9ysr514pm5sh8qhw4030ddykvwxx9d9q6rbp3";
 
   propagatedBuildInputs = [
+    mathcomp.ssreflect
     mathcomp.field
     mathcomp-real-closed
   ];
diff --git a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix
index 811946457893..76bbf1161aff 100644
--- a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix
+++ b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix
@@ -7,69 +7,89 @@
   version ? null,
 }:
 
-mkCoqDerivation {
+let
+  derivation = mkCoqDerivation {
 
-  namePrefix = [
-    "coq"
-    "mathcomp"
-  ];
-  pname = "real-closed";
-  owner = "math-comp";
-  inherit version;
-  release = {
-    "2.0.3".sha256 = "sha256-heZ7aZ7TO9YNAESIvbAc1qqzO91xMyLAox8VKueIk/s=";
-    "2.0.2".sha256 = "sha256-hBo9JMtmXDYBmf5ihKGksQLHv3c0+zDBnd8/aI2V/ao=";
-    "2.0.1".sha256 = "sha256-tQTI3PCl0q1vWpps28oATlzOI8TpVQh1jhTwVmhaZic=";
-    "2.0.0".sha256 = "sha256-sZvfiC5+5Lg4nRhfKKqyFzovCj2foAhqaq/w9F2bdU8=";
-    "1.1.4".sha256 = "sha256-8Hs6XfowbpeRD8RhMRf4ZJe2xf8kE0e8m7bPUzR/IM4=";
-    "1.1.3".sha256 = "1vwmmnzy8i4f203i2s60dn9i0kr27lsmwlqlyyzdpsghvbr8h5b7";
-    "1.1.2".sha256 = "0907x4nf7nnvn764q3x9lx41g74rilvq5cki5ziwgpsdgb98pppn";
-    "1.1.1".sha256 = "0ksjscrgq1i79vys4zrmgvzy2y4ylxa8wdsf4kih63apw6v5ws6b";
-    "1.0.5".sha256 = "0q8nkxr9fba4naylr5xk7hfxsqzq2pvwlg1j0xxlhlgr3fmlavg2";
-    "1.0.4".sha256 = "058v9dj973h9kfhqmvcy9a6xhhxzljr90cf99hdfcdx68fi2ha1b";
-    "1.0.3".sha256 = "1xbzkzqgw5p42dx1liy6wy8lzdk39zwd6j14fwvv5735k660z7yb";
-    "1.0.1".sha256 = "0j81gkjbza5vg89v4n9z598mfdbql416963rj4b8fzm7dp2r4rxg";
+    namePrefix = [
+      "coq"
+      "mathcomp"
+    ];
+    pname = "real-closed";
+    owner = "math-comp";
+    inherit version;
+    release = {
+      "2.0.3".sha256 = "sha256-heZ7aZ7TO9YNAESIvbAc1qqzO91xMyLAox8VKueIk/s=";
+      "2.0.2".sha256 = "sha256-hBo9JMtmXDYBmf5ihKGksQLHv3c0+zDBnd8/aI2V/ao=";
+      "2.0.1".sha256 = "sha256-tQTI3PCl0q1vWpps28oATlzOI8TpVQh1jhTwVmhaZic=";
+      "2.0.0".sha256 = "sha256-sZvfiC5+5Lg4nRhfKKqyFzovCj2foAhqaq/w9F2bdU8=";
+      "1.1.4".sha256 = "sha256-8Hs6XfowbpeRD8RhMRf4ZJe2xf8kE0e8m7bPUzR/IM4=";
+      "1.1.3".sha256 = "1vwmmnzy8i4f203i2s60dn9i0kr27lsmwlqlyyzdpsghvbr8h5b7";
+      "1.1.2".sha256 = "0907x4nf7nnvn764q3x9lx41g74rilvq5cki5ziwgpsdgb98pppn";
+      "1.1.1".sha256 = "0ksjscrgq1i79vys4zrmgvzy2y4ylxa8wdsf4kih63apw6v5ws6b";
+      "1.0.5".sha256 = "0q8nkxr9fba4naylr5xk7hfxsqzq2pvwlg1j0xxlhlgr3fmlavg2";
+      "1.0.4".sha256 = "058v9dj973h9kfhqmvcy9a6xhhxzljr90cf99hdfcdx68fi2ha1b";
+      "1.0.3".sha256 = "1xbzkzqgw5p42dx1liy6wy8lzdk39zwd6j14fwvv5735k660z7yb";
+      "1.0.1".sha256 = "0j81gkjbza5vg89v4n9z598mfdbql416963rj4b8fzm7dp2r4rxg";
+    };
+
+    defaultVersion =
+      let
+        case = coq: mc: out: {
+          cases = [
+            coq
+            mc
+          ];
+          inherit out;
+        };
+      in
+      with lib.versions;
+      lib.switch
+        [ coq.version mathcomp.version ]
+        [
+          (case (range "8.18" "9.1") (isGe "2.2.0") "2.0.3")
+          (case (range "8.17" "9.0") (range "2.1.0" "2.3.0") "2.0.2")
+          (case (range "8.17" "8.20") (range "2.0.0" "2.2.0") "2.0.1")
+          (case (range "8.16" "8.19") (range "2.0.0" "2.2.0") "2.0.0")
+          (case (range "8.13" "8.19") (range "1.13.0" "1.19.0") "1.1.4")
+          (case (isGe "8.13") (range "1.12.0" "1.18.0") "1.1.3")
+          (case (isGe "8.10") (range "1.12.0" "1.18.0") "1.1.2")
+          (case (isGe "8.7") "1.11.0" "1.1.1")
+          (case (isGe "8.7") (range "1.9.0" "1.10.0") "1.0.4")
+          (case (isGe "8.7") "1.8.0" "1.0.3")
+          (case (isGe "8.7") "1.7.0" "1.0.1")
+        ]
+        null;
+
+    propagatedBuildInputs = [
+      mathcomp.ssreflect
+      mathcomp.algebra
+      mathcomp.field
+      mathcomp.fingroup
+      mathcomp.solvable
+      mathcomp-bigenough
+    ];
+
+    meta = {
+      description = "Mathematical Components Library on real closed fields";
+      license = lib.licenses.cecill-c;
+    };
   };
-
-  defaultVersion =
-    let
-      case = coq: mc: out: {
-        cases = [
-          coq
-          mc
-        ];
-        inherit out;
-      };
-    in
-    with lib.versions;
-    lib.switch
-      [ coq.version mathcomp.version ]
-      [
-        (case (range "8.18" "9.1") (isGe "2.2.0") "2.0.3")
-        (case (range "8.17" "9.0") (range "2.1.0" "2.3.0") "2.0.2")
-        (case (range "8.17" "8.20") (range "2.0.0" "2.2.0") "2.0.1")
-        (case (range "8.16" "8.19") (range "2.0.0" "2.2.0") "2.0.0")
-        (case (range "8.13" "8.19") (range "1.13.0" "1.19.0") "1.1.4")
-        (case (isGe "8.13") (range "1.12.0" "1.18.0") "1.1.3")
-        (case (isGe "8.10") (range "1.12.0" "1.18.0") "1.1.2")
-        (case (isGe "8.7") "1.11.0" "1.1.1")
-        (case (isGe "8.7") (range "1.9.0" "1.10.0") "1.0.4")
-        (case (isGe "8.7") "1.8.0" "1.0.3")
-        (case (isGe "8.7") "1.7.0" "1.0.1")
-      ]
-      null;
-
-  propagatedBuildInputs = [
-    mathcomp.ssreflect
-    mathcomp.algebra
-    mathcomp.field
-    mathcomp.fingroup
-    mathcomp.solvable
-    mathcomp-bigenough
-  ];
-
-  meta = {
-    description = "Mathematical Components Library on real closed fields";
-    license = lib.licenses.cecill-c;
-  };
-}
+in
+# this is just a wrapper for rocqPackages.mathcomp-real-closed for Rocq >= 9.0
+if
+  coq.rocqPackages ? mathcomp-real-closed
+  && !(lib.elem version [
+    "2.0.2"
+    "2.0.3"
+  ])
+then
+  coq.rocqPackages.mathcomp-real-closed.override {
+    inherit version;
+    inherit
+      mathcomp
+      mathcomp-bigenough
+      ;
+    inherit (coq.rocqPackages) rocq-core;
+  }
+else
+  derivation
diff --git a/pkgs/development/rocq-modules/mathcomp-real-closed/default.nix b/pkgs/development/rocq-modules/mathcomp-real-closed/default.nix
new file mode 100644
index 000000000000..e260b8308d0b
--- /dev/null
+++ b/pkgs/development/rocq-modules/mathcomp-real-closed/default.nix
@@ -0,0 +1,50 @@
+{
+  rocq-core,
+  mkRocqDerivation,
+  mathcomp,
+  mathcomp-bigenough,
+  lib,
+  version ? null,
+}:
+
+mkRocqDerivation {
+
+  namePrefix = [
+    "rocq-core"
+    "mathcomp"
+  ];
+  pname = "real-closed";
+  owner = "math-comp";
+  inherit version;
+  release = {
+    "2.0.5".sha256 = "sha256-nns1TF3isv8FpWqtXilfMEVKvR50fvS6MXnYVzbCzVs=";
+  };
+
+  defaultVersion =
+    let
+      case = rocq: mc: out: {
+        cases = [
+          rocq
+          mc
+        ];
+        inherit out;
+      };
+    in
+    with lib.versions;
+    lib.switch
+      [ rocq-core.version mathcomp.version ]
+      [
+        (case (range "9.0" "9.2") (isGe "2.5.0") "2.0.5")
+      ]
+      null;
+
+  propagatedBuildInputs = [
+    mathcomp.field
+    mathcomp-bigenough
+  ];
+
+  meta = {
+    description = "Mathematical Components Library on real closed fields";
+    license = lib.licenses.cecill-c;
+  };
+}
diff --git a/pkgs/top-level/rocq-packages.nix b/pkgs/top-level/rocq-packages.nix
index 34af9d8c93a5..ce62650f358a 100644
--- a/pkgs/top-level/rocq-packages.nix
+++ b/pkgs/top-level/rocq-packages.nix
@@ -55,6 +55,7 @@ let
       mathcomp-classical = self.mathcomp-analysis.classical;
       mathcomp-experimental-reals = self.mathcomp-analysis.experimental-reals;
       mathcomp-finmap = callPackage ../development/rocq-modules/mathcomp-finmap { };
+      mathcomp-real-closed = callPackage ../development/rocq-modules/mathcomp-real-closed { };
       mathcomp-reals = self.mathcomp-analysis.reals;
       mathcomp-reals-stdlib = self.mathcomp-analysis.reals-stdlib;
       micromega-plugin = callPackage ../development/rocq-modules/micromega-plugin { };

From 66ac29af89f695dd833d0ff995af7fcd850a48ec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Jun 2026 10:03:22 +0000
Subject: [PATCH 28/60] xan: 0.58.0 -> 0.59.0

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

diff --git a/pkgs/by-name/xa/xan/package.nix b/pkgs/by-name/xa/xan/package.nix
index 0207123803d4..c040ece72f6a 100644
--- a/pkgs/by-name/xa/xan/package.nix
+++ b/pkgs/by-name/xa/xan/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "xan";
-  version = "0.58.0";
+  version = "0.59.0";
 
   src = fetchFromGitHub {
     owner = "medialab";
     repo = "xan";
     tag = finalAttrs.version;
-    hash = "sha256-/+ONiDuqDHkHnrtdbOJFLDPtJaJbUz6hM9AmGVkUZzQ=";
+    hash = "sha256-jbtastPhBKrZ31TTr0LT4njTM2PrH/Suv8z6UVSkt1I=";
   };
 
-  cargoHash = "sha256-8ZywAhljm/m1TIC+znzw4ustCWLybB4wuMPiXuALj/I=";
+  cargoHash = "sha256-wh74QO+7QLMdKlqnH5AD52WnkBmn+Hb+CopuGXfPUII=";
 
   # FIXME: tests fail and I do not have the time to investigate. Temporarily disable
   # tests so that we can manually run and test the package for packaging purposes.

From 44f3f028ef32aa53c47dbc77b77d11c293dafb89 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Jun 2026 10:10:41 +0000
Subject: [PATCH 29/60] home-assistant-custom-components.solax_modbus:
 2026.06.3 -> 2026.06.5

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

diff --git a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
index 2bfd7b7769e5..79cba9d5d0f4 100644
--- a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "wills106";
   domain = "solax_modbus";
-  version = "2026.06.3";
+  version = "2026.06.5";
 
   src = fetchFromGitHub {
     owner = "wills106";
     repo = "homeassistant-solax-modbus";
     tag = version;
-    hash = "sha256-2lJ4lVrGG8jtNymA2lwkJS1DKd0w6TYs5PAnCynBOWM=";
+    hash = "sha256-FNb/3SwpJb5fPJ/qegLy6XMxHs3YQjHAjkgmL+14qMI=";
   };
 
   dependencies = [ pymodbus ];

From 9a12567baa77d69df29327107896517b28e50444 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Jun 2026 10:12:47 +0000
Subject: [PATCH 30/60] phpunit: 13.2.0 -> 13.2.1

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

diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix
index 12c23e4ff368..54c32945edd5 100644
--- a/pkgs/by-name/ph/phpunit/package.nix
+++ b/pkgs/by-name/ph/phpunit/package.nix
@@ -8,16 +8,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "phpunit";
-  version = "13.2.0";
+  version = "13.2.1";
 
   src = fetchFromGitHub {
     owner = "sebastianbergmann";
     repo = "phpunit";
     tag = finalAttrs.version;
-    hash = "sha256-BCrL70H/VVK4UnRBCqqrC33OdltLV0V2OXmpsHfDVZY=";
+    hash = "sha256-bwedO6b4gL3FiddxmOnPn0czIV2UwCiV5iM1Cu7kFR0=";
   };
 
-  vendorHash = "sha256-MccgE9NEH9TKrldfdO/ahCQl0iyS2EK7i0O/glsJHV0=";
+  vendorHash = "sha256-u89MpsCKwYn44/69evX+a+SJtqMctx6uCXnhKEdqhTE=";
 
   passthru = {
     updateScript = nix-update-script { };

From 36d1ce50a7839820c005c4d4e79dc5581bd52c1e Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Wed, 17 Jun 2026 08:03:21 +0200
Subject: [PATCH 31/60] rocqPackages.mathcomp-analysis: now depends on
 real-closed

---
 pkgs/development/coq-modules/mathcomp-analysis/default.nix  | 2 --
 pkgs/development/rocq-modules/mathcomp-analysis/default.nix | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix
index be83ed4778a9..0df390b8a9ee 100644
--- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix
+++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix
@@ -4,7 +4,6 @@
   mathcomp,
   mathcomp-finmap,
   mathcomp-bigenough,
-  mathcomp-real-closed,
   hierarchy-builder,
   stdlib,
   single ? false,
@@ -105,7 +104,6 @@ let
       analysis-deps = [
         mathcomp.field
         mathcomp-bigenough
-        mathcomp-real-closed
       ];
       intra-deps = lib.optionals (package != "single") (map mathcomp_ packages.${package});
       pkgpath = lib.switch package [
diff --git a/pkgs/development/rocq-modules/mathcomp-analysis/default.nix b/pkgs/development/rocq-modules/mathcomp-analysis/default.nix
index 1a77e673e4f7..c40340feeb35 100644
--- a/pkgs/development/rocq-modules/mathcomp-analysis/default.nix
+++ b/pkgs/development/rocq-modules/mathcomp-analysis/default.nix
@@ -4,6 +4,7 @@
   mathcomp,
   mathcomp-finmap,
   mathcomp-bigenough,
+  mathcomp-real-closed,
   stdlib,
   single ? false,
   rocq-core,
@@ -58,6 +59,7 @@ let
       analysis-deps = [
         mathcomp.field
         mathcomp-bigenough
+        mathcomp-real-closed
       ];
       intra-deps = lib.optionals (package != "single") (map mathcomp_ packages.${package});
       pkgpath =

From 13d3738f860cf39ba43b206a498d9444b4f0d359 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Wed, 17 Jun 2026 13:45:36 +0200
Subject: [PATCH 32/60] chromium,chromedriver: 149.0.7827.114 -> 149.0.7827.155

https://chromereleases.googleblog.com/2026/06/stable-channel-update-for-desktop_01750511403.html

This update includes 33 security fixes.

CVEs:
CVE-2026-12437 CVE-2026-12438 CVE-2026-12439 CVE-2026-12440
CVE-2026-12441 CVE-2026-12442 CVE-2026-12443 CVE-2026-12444
CVE-2026-12445 CVE-2026-12446 CVE-2026-12447 CVE-2026-12448
CVE-2026-12449 CVE-2026-12450 CVE-2026-12451 CVE-2026-12452
CVE-2026-12453 CVE-2026-12454 CVE-2026-12455 CVE-2026-12456
CVE-2026-12457 CVE-2026-12458 CVE-2026-12459 CVE-2026-12460
CVE-2026-12461 CVE-2026-12462 CVE-2026-12463 CVE-2026-12464
CVE-2026-12465 CVE-2026-12466 CVE-2026-12467 CVE-2026-12468
CVE-2026-12469
---
 .../networking/browsers/chromium/info.json    | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 3b348ec2911a..f7f873b76de3 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,10 +1,10 @@
 {
   "chromium": {
-    "version": "149.0.7827.114",
+    "version": "149.0.7827.155",
     "chromedriver": {
-      "version": "149.0.7827.115",
-      "hash_darwin": "sha256-DOhM1knKphvLNyrkf0uvb9NZ3kBwSuVN5hkQLqAZR1Y=",
-      "hash_darwin_aarch64": "sha256-HXWvAjMdMMbeF8DsgFKNM+S0ZEYr2M8Wj0uUZC7tmxY="
+      "version": "149.0.7827.156",
+      "hash_darwin": "sha256-V7ZBijHsPzyphJPipWlIcU5Mb9l1OWzLc6PzxFKFuR8=",
+      "hash_darwin_aarch64": "sha256-sUG2Qg+nPIrYQC0iKNK78O1l92qTSDbRnJFfrqJMpts="
     },
     "deps": {
       "depot_tools": {
@@ -21,8 +21,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "5be7af702aa73ed64f47858cecc86290e42f2a20",
-        "hash": "sha256-R2vnW3Wa+REar23OhyFWzOo44F8NN9IqH7GjWJ1g1lo=",
+        "rev": "07b52360cc15066f987c910ab34dfbcd4a8778d2",
+        "hash": "sha256-D9RKH0kzEfaMsCDnFFIGCGLyfhghnGMOLA0XmOa9MtI=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -92,8 +92,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "4b8c7f0f321952bba4f81056b4aa57d0d6428642",
-        "hash": "sha256-ADG0WfkeFRq4NF0m+s3a/N5+u3q4ApExuWUnV3m5uAI="
+        "rev": "591ee1999d950f2bc54be89651eb62c8d7925314",
+        "hash": "sha256-crooDCkJ6voJyDBIUvtjmXnA4xOx7YmGltuf2ulTLIk="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -132,8 +132,8 @@
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "c1179de12ec3ed8feb91e922f12a90ae33f4a8cf",
-        "hash": "sha256-VFEBqbSsn/3jqRGJgTM/r5DEtfhvTOIfS9fGIKzYo9I="
+        "rev": "5f4c5ef509c5ffa65822302341cf9b2ccad471f9",
+        "hash": "sha256-h+0Gep+RWTTEVoRrXCRDCtHdbYlSYdNK1botahtqUX0="
       },
       "src/third_party/dawn/third_party/glfw3/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -192,8 +192,8 @@
       },
       "src/third_party/breakpad/breakpad": {
         "url": "https://chromium.googlesource.com/breakpad/breakpad.git",
-        "rev": "afa2870e449ef33ad41545e7670c574cf70926a4",
-        "hash": "sha256-+N6FPtSiLQmNqf5+x5XDSksrRq/YDVSMVx5Rv1PGjfI="
+        "rev": "8ef5673404a3bbc192b0997e1c2df559cc5bd79d",
+        "hash": "sha256-NplvLz9oET6mhTuBkHH6pZc8qdfhqI7g69eZRCyae0A="
       },
       "src/third_party/cast_core/public/src": {
         "url": "https://chromium.googlesource.com/cast_core/public",
@@ -537,8 +537,8 @@
       },
       "src/third_party/libvpx/source/libvpx": {
         "url": "https://chromium.googlesource.com/webm/libvpx.git",
-        "rev": "640d4ce27ba918783e28a0da46a8a37abe4a65b6",
-        "hash": "sha256-uCa/MEfw2s05kK91uubi/TqztHulwattzt1vfr0LR4E="
+        "rev": "d1268a5f3f3553ad7735911c614e8548381ca3cd",
+        "hash": "sha256-6IZTDhtjVWiqTv+jUC6Wr/tSqvql3thi9+mt+M3ixt4="
       },
       "src/third_party/libwebm/source": {
         "url": "https://chromium.googlesource.com/webm/libwebm.git",
@@ -602,8 +602,8 @@
       },
       "src/third_party/pdfium": {
         "url": "https://pdfium.googlesource.com/pdfium.git",
-        "rev": "74d747ce1d383caca3ec0e604d77bac35ccd1e58",
-        "hash": "sha256-qMY6L93hlnMgGZ5Blk5ldDnI/LUXYyuk+b7FXCiVV6s="
+        "rev": "be702d63baba7507bb1f6f6ff2d35be9c133c08c",
+        "hash": "sha256-hXqSJn1C0ISLWx68UicggiL8xzgQX2Y8l75vtpJgHeU="
       },
       "src/third_party/perfetto": {
         "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
@@ -652,8 +652,8 @@
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "92a56ebeef43061f4878aa869aa1f2160265c24c",
-        "hash": "sha256-QEY9Wy2guRuS4CXeXHUhUNigCJWWndnNCbWQmaSYJ/A="
+        "rev": "75c589e1f436688fca8f5b7f7a8affeafaa4f923",
+        "hash": "sha256-x0jEek7iJv7WBNdkOUPc5VvIYJw9QPzzTChFUofqErM="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -787,8 +787,8 @@
       },
       "src/third_party/webrtc": {
         "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "e8b4d4c5952a8fb7b35c2a6cba4e8c3de2ea2e1e",
-        "hash": "sha256-94U9URlFGLYe94KCFU0giY9bBbrHNDCBr9GEwbRbOK4="
+        "rev": "28311abc149a9bb7e6761a3d54f362a8d77e6793",
+        "hash": "sha256-WuaxKrbISJ1nwyoj2sPAhGCNz33xEYSX1WlDiM+zxpw="
       },
       "src/third_party/wuffs/src": {
         "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -817,8 +817,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "16ef80c1f5d3cfade812bd1743952a4cfd480a31",
-        "hash": "sha256-GI0NWA0XYGocxZp3+lPen6BkwaG7X3EDaEWM9rejgkI="
+        "rev": "6511f6cfab1f24c360d0fb737d205c27da48a623",
+        "hash": "sha256-Dpe0Z/zjdPlOlqi85c9QSr7rLs7dww+a/BY68B2MTCw="
       }
     }
   },

From 3326bbd5537ee6be79ec2b263f312b8645d96a71 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Jun 2026 12:05:27 +0000
Subject: [PATCH 33/60] libretro.play: 0-unstable-2026-06-05 ->
 0-unstable-2026-06-06

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

diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix
index b08e3f75140a..1d99963ceb0b 100644
--- a/pkgs/applications/emulators/libretro/cores/play.nix
+++ b/pkgs/applications/emulators/libretro/cores/play.nix
@@ -14,13 +14,13 @@
 }:
 mkLibretroCore {
   core = "play";
-  version = "0-unstable-2026-06-05";
+  version = "0-unstable-2026-06-06";
 
   src = fetchFromGitHub {
     owner = "jpd002";
     repo = "Play-";
-    rev = "3a904f67694ce6ce8f88fd97ebaf30240bd87dce";
-    hash = "sha256-vxedP/J6LhTqhoRw1bn6uCNedRJUpKHZnD8OQ5z1rxY=";
+    rev = "ee1334610cb2181bd9a84e837ba3ea667ebdb16a";
+    hash = "sha256-oriF08elBRg8jTlPz1Qoc6SmKQPknkegJlOtcOV4RX8=";
     fetchSubmodules = true;
   };
 

From ab62a640def343fe4a0bb90c0b57cdb398235a36 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Jun 2026 12:34:38 +0000
Subject: [PATCH 34/60] zwave-js-ui: 11.19.1 -> 11.20.0

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

diff --git a/pkgs/by-name/zw/zwave-js-ui/package.nix b/pkgs/by-name/zw/zwave-js-ui/package.nix
index b07070e8f65a..9eae37d2d4ef 100644
--- a/pkgs/by-name/zw/zwave-js-ui/package.nix
+++ b/pkgs/by-name/zw/zwave-js-ui/package.nix
@@ -7,15 +7,15 @@
 
 buildNpmPackage rec {
   pname = "zwave-js-ui";
-  version = "11.19.1";
+  version = "11.20.0";
 
   src = fetchFromGitHub {
     owner = "zwave-js";
     repo = "zwave-js-ui";
     tag = "v${version}";
-    hash = "sha256-9dqvQxlk+DdYcpCgoLR8EqtgwJwMA4Dvtwc8n1K8Cic=";
+    hash = "sha256-No9s6fZk8b2eE4LPYbX7juSBNDpG49kMTdEeAcC62Ms=";
   };
-  npmDepsHash = "sha256-dED08xcbgO3zfNRP9iNuTcL+73HnfBnwDrPCGY4TZBQ=";
+  npmDepsHash = "sha256-/mAUsCdOd9aDzUnJCEI9gr++55xdwDy6OXgUkF8EcM0=";
 
   passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui;
 

From f0caa3bbdcbc93b154e6b9b9496f0e8c52d41deb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Jun 2026 13:01:47 +0000
Subject: [PATCH 35/60] mcp-gateway: 2.12.2 -> 2.19.0

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

diff --git a/pkgs/by-name/mc/mcp-gateway/package.nix b/pkgs/by-name/mc/mcp-gateway/package.nix
index f44143cf8bfc..582fb3a18536 100644
--- a/pkgs/by-name/mc/mcp-gateway/package.nix
+++ b/pkgs/by-name/mc/mcp-gateway/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mcp-gateway";
-  version = "2.12.2";
+  version = "2.19.0";
 
   src = fetchFromGitHub {
     owner = "MikkoParkkola";
     repo = "mcp-gateway";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4zgWW9cWSdjOY7ECl7xdTlxtkmI86FfaYCjVTixSdSA=";
+    hash = "sha256-Rt2FoIBSFEA9Zgy27ZlVeVOgI3NF09FuPC+XW/WV8Ns=";
   };
 
-  cargoHash = "sha256-ncVF+wgkSWssgECvPF2Ug46nplBK47ggezUSZdJkwL4=";
+  cargoHash = "sha256-tMIsJkHxSNxwLkgoqVoSK1EFRgnhoCej7nAwcZcmLlQ=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From a7c74c847c68ad1c28583e5e3d480094293174a4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Jun 2026 13:54:20 +0000
Subject: [PATCH 36/60] mullvad-compass: 0.0.3 -> 0.0.4

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

diff --git a/pkgs/by-name/mu/mullvad-compass/package.nix b/pkgs/by-name/mu/mullvad-compass/package.nix
index 6888e00ed773..f4bff4938257 100644
--- a/pkgs/by-name/mu/mullvad-compass/package.nix
+++ b/pkgs/by-name/mu/mullvad-compass/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "mullvad-compass";
-  version = "0.0.3";
+  version = "0.0.4";
 
   src = fetchFromGitHub {
     owner = "Ch00k";
     repo = "mullvad-compass";
     tag = finalAttrs.version;
-    hash = "sha256-OhaXabjkimeMXty6msqDJVvnWXu8G6jWz/E2x7ZYrDI=";
+    hash = "sha256-4Q6Pm20stbuY+KQHhIPGegCIwGiYIagduN//d+CKKXE=";
   };
 
   vendorHash = "sha256-gEdtoJjCa0nVyi7T4zzv6xUDTQCYFi4ANFaqXGeqcsI=";

From b9b69329fcfd7afc2cb7c05527d32c8f932bf48c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Jun 2026 13:59:13 +0000
Subject: [PATCH 37/60] minijinja: 2.20.0 -> 2.21.0

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

diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix
index 656e0837d125..9c03a3de2a9d 100644
--- a/pkgs/by-name/mi/minijinja/package.nix
+++ b/pkgs/by-name/mi/minijinja/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "minijinja";
-  version = "2.20.0";
+  version = "2.21.0";
 
   src = fetchFromGitHub {
     owner = "mitsuhiko";
     repo = "minijinja";
     rev = finalAttrs.version;
-    hash = "sha256-8EEhtdfTU+q9TON6InIv0gdAS154745NeQX2TE513J0=";
+    hash = "sha256-1BPChGjf8ke9dEm6aVD+aKM2tDuWhG7VifV3RvukbdY=";
   };
 
-  cargoHash = "sha256-uCyG+gT8zltsqwfwsQguoUvIEs5zLG70nBJC7txRLsI=";
+  cargoHash = "sha256-KpPPapS2iavhC/EP+qyeojo0nngfpjvyboSYzhGdI/0=";
 
   # The tests relies on the presence of network connection
   doCheck = false;

From 1389fbcbab189af4531dd896628b8e0b0e356a45 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Jun 2026 13:59:59 +0000
Subject: [PATCH 38/60] python3Packages.snowflake-core: 1.11.0 -> 1.12.1

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

diff --git a/pkgs/development/python-modules/snowflake-core/default.nix b/pkgs/development/python-modules/snowflake-core/default.nix
index a02ea3d24bfe..d0ecc7b2a2eb 100644
--- a/pkgs/development/python-modules/snowflake-core/default.nix
+++ b/pkgs/development/python-modules/snowflake-core/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname = "snowflake-core";
-  version = "1.11.0";
+  version = "1.12.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "snowflake_core";
     inherit version;
-    hash = "sha256-qNwgnEXUE8P+DrGpOb32R6BapNkWwEJBbeljYYhVU5I=";
+    hash = "sha256-bLECcQHXxtoS/vZQQf8qUahaOU27HwrAlQAMoFTyan4=";
   };
 
   build-system = [ hatchling ];

From 072f09508bfde103fb2c67459d822d5da76ad49b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Jun 2026 14:36:49 +0000
Subject: [PATCH 39/60] goldendict-ng: 26.5.7 -> 26.6.0

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

diff --git a/pkgs/by-name/go/goldendict-ng/package.nix b/pkgs/by-name/go/goldendict-ng/package.nix
index 24314df20c70..cc7ccf2f2a97 100644
--- a/pkgs/by-name/go/goldendict-ng/package.nix
+++ b/pkgs/by-name/go/goldendict-ng/package.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "goldendict-ng";
-  version = "26.5.7";
+  version = "26.6.0";
 
   src = fetchFromGitHub {
     owner = "xiaoyifang";
     repo = "goldendict-ng";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oTx0gEnyKg23E8fl+t1Cbi6jRoOYQGevaHGrJHSBA7s=";
+    hash = "sha256-gV1nDKKRCN8p+B9dZ28uzzvYEbKDB58h+fMyQ44nOXU=";
   };
 
   strictDeps = true;

From 974ab2920d48735062a0c51e4b589427b6e812ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Jun 2026 15:16:40 +0000
Subject: [PATCH 40/60] devin-cli: 2026.5.26-8 -> 2026.7.16

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

diff --git a/pkgs/by-name/de/devin-cli/package.nix b/pkgs/by-name/de/devin-cli/package.nix
index feded437d996..146a2529d491 100644
--- a/pkgs/by-name/de/devin-cli/package.nix
+++ b/pkgs/by-name/de/devin-cli/package.nix
@@ -7,29 +7,29 @@
 }:
 
 let
-  version = "2026.5.26-8";
+  version = "2026.7.16";
 
   throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}";
 
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://static.devin.ai/cli/${version}/devin-${version}-x86_64-unknown-linux.tar.gz";
-      hash = "sha256-TqSABBxigiYTafi0vxFYnssLjHbiXYaNxI8prkkp8CE=";
+      hash = "sha256-nbp5I6Ta6OFpz5P+TwKVxTdtoq3QcChii1QzYHizzzY=";
     };
 
     aarch64-linux = fetchurl {
       url = "https://static.devin.ai/cli/${version}/devin-${version}-aarch64-unknown-linux.tar.gz";
-      hash = "sha256-1hoTd6JR43nR+heLqU7igP+debI1bhWcIlG6BGyaj3I=";
+      hash = "sha256-8BiJnLlUk4BxTNo4tbZg6QHZjfMLRDEx/X9tcAenB9k=";
     };
 
     aarch64-darwin = fetchurl {
       url = "https://static.devin.ai/cli/${version}/devin-${version}-aarch64-apple-darwin.tar.gz";
-      hash = "sha256-/8vd26V0z1qyt8EOJ2Z/JdWNGjb+iN+YkgaJQRoBHUk=";
+      hash = "sha256-iRt56RmT7U3lgFpw/e9KFkAoBg6UuJNdf79/zHiRwc0=";
     };
 
     x86_64-darwin = fetchurl {
       url = "https://static.devin.ai/cli/${version}/devin-${version}-x86_64-apple-darwin.tar.gz";
-      hash = "sha256-uF6ORbWwC0hgIURFoXFQh/5oPvfS4cgRBaCui4S0E0E=";
+      hash = "sha256-luSuvOyXHPs4NDzF9Iql9cFUN1ac9key/bNr1saLZBE=";
     };
   };
 in

From eb1492622e72f4a24fae693d36e41d72c227b888 Mon Sep 17 00:00:00 2001
From: superherointj <sergiomarcelo@ya.ru>
Date: Wed, 17 Jun 2026 12:26:20 -0300
Subject: [PATCH 41/60] openspec: remove superherointj from maintainers

---
 pkgs/by-name/op/openspec/package.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/op/openspec/package.nix b/pkgs/by-name/op/openspec/package.nix
index c8c48047f71c..47133c832d37 100644
--- a/pkgs/by-name/op/openspec/package.nix
+++ b/pkgs/by-name/op/openspec/package.nix
@@ -76,10 +76,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "AI-native system for spec-driven development";
     homepage = "https://github.com/Fission-AI/OpenSpec";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [
-      kalbasit
-      superherointj
-    ];
+    maintainers = with lib.maintainers; [ kalbasit ];
     platforms = lib.platforms.all;
     mainProgram = "openspec";
   };

From 3ce0672e05be882db5b4b35435467d93f82e621a Mon Sep 17 00:00:00 2001
From: superherointj <sergiomarcelo@ya.ru>
Date: Wed, 17 Jun 2026 12:27:21 -0300
Subject: [PATCH 42/60] fluxcd: remove superherointj from maintainers

---
 pkgs/by-name/fl/fluxcd/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/fl/fluxcd/package.nix b/pkgs/by-name/fl/fluxcd/package.nix
index 79f2cf5543d5..91a5b01408c4 100644
--- a/pkgs/by-name/fl/fluxcd/package.nix
+++ b/pkgs/by-name/fl/fluxcd/package.nix
@@ -85,7 +85,6 @@ buildGoModule rec {
       ryan4yin
       SchahinRohani
       stealthybox
-      superherointj
     ];
     mainProgram = "flux";
   };

From 828fcd258f040b362a3b31f57ae45063088dbe33 Mon Sep 17 00:00:00 2001
From: superherointj <sergiomarcelo@ya.ru>
Date: Wed, 17 Jun 2026 12:28:13 -0300
Subject: [PATCH 43/60] etcd_3_6: remove superherointj from maintainers

---
 pkgs/by-name/et/etcd_3_6/package.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/et/etcd_3_6/package.nix b/pkgs/by-name/et/etcd_3_6/package.nix
index 47aa69616fa4..7101639e6079 100644
--- a/pkgs/by-name/et/etcd_3_6/package.nix
+++ b/pkgs/by-name/et/etcd_3_6/package.nix
@@ -31,10 +31,7 @@ let
     downloadPage = "https://github.com/etcd-io/etcd";
     license = lib.licenses.asl20;
     homepage = "https://etcd.io/";
-    maintainers = with lib.maintainers; [
-      dtomvan
-      superherointj
-    ];
+    maintainers = with lib.maintainers; [ dtomvan ];
     platforms = lib.platforms.darwin ++ lib.platforms.linux;
   };
 

From 124fe5eaabe6c6bdd35885c0adfc0b4e63e99a8d Mon Sep 17 00:00:00 2001
From: superherointj <sergiomarcelo@ya.ru>
Date: Wed, 17 Jun 2026 12:29:23 -0300
Subject: [PATCH 44/60] etcd_3_5: remove superherointj from maintainers

---
 pkgs/by-name/et/etcd_3_5/package.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/et/etcd_3_5/package.nix b/pkgs/by-name/et/etcd_3_5/package.nix
index 376ebcf8a0c3..3e506da7b4bd 100644
--- a/pkgs/by-name/et/etcd_3_5/package.nix
+++ b/pkgs/by-name/et/etcd_3_5/package.nix
@@ -28,10 +28,7 @@ let
     description = "Distributed reliable key-value store for the most critical data of a distributed system";
     license = lib.licenses.asl20;
     homepage = "https://etcd.io/";
-    maintainers = with lib.maintainers; [
-      dtomvan
-      superherointj
-    ];
+    maintainers = with lib.maintainers; [ dtomvan ];
     platforms = lib.platforms.darwin ++ lib.platforms.linux;
   };
 

From bf2acbd51800dcf4b21b8db1cf9aff71e924f1de Mon Sep 17 00:00:00 2001
From: superherointj <sergiomarcelo@ya.ru>
Date: Wed, 17 Jun 2026 12:30:31 -0300
Subject: [PATCH 45/60] minimax-mcp: remove superherointj from maintainers

---
 pkgs/by-name/mi/minimax-mcp/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/mi/minimax-mcp/package.nix b/pkgs/by-name/mi/minimax-mcp/package.nix
index 532adbfeb053..082cb010077d 100644
--- a/pkgs/by-name/mi/minimax-mcp/package.nix
+++ b/pkgs/by-name/mi/minimax-mcp/package.nix
@@ -45,7 +45,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     '';
     homepage = "https://github.com/MiniMax-AI/MiniMax-MCP";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ superherointj ];
+    maintainers = [ ];
     mainProgram = "minimax-mcp";
   };
 })

From 673a4d6f939afd078def3b84274432be7ff92204 Mon Sep 17 00:00:00 2001
From: superherointj <sergiomarcelo@ya.ru>
Date: Wed, 17 Jun 2026 12:31:22 -0300
Subject: [PATCH 46/60] minimax-coding-plan-mcp: remove superherointj from
 maintainers

---
 pkgs/by-name/mi/minimax-coding-plan-mcp/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/mi/minimax-coding-plan-mcp/package.nix b/pkgs/by-name/mi/minimax-coding-plan-mcp/package.nix
index cb21debb8ed5..af9717ff4a3f 100644
--- a/pkgs/by-name/mi/minimax-coding-plan-mcp/package.nix
+++ b/pkgs/by-name/mi/minimax-coding-plan-mcp/package.nix
@@ -30,7 +30,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     description = "MiniMax MCP server for coding-plan users with web search and image understanding";
     homepage = "https://github.com/MiniMax-AI/MiniMax-Coding-Plan-MCP";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ superherointj ];
+    maintainers = [ ];
     mainProgram = "minimax-coding-plan-mcp";
   };
 })

From 09ba607003bbc8365c45d6a8c9d93b7dc411cbd8 Mon Sep 17 00:00:00 2001
From: superherointj <sergiomarcelo@ya.ru>
Date: Wed, 17 Jun 2026 12:32:17 -0300
Subject: [PATCH 47/60] etcd_3_4: remove superherointj from maintainers

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

diff --git a/pkgs/by-name/et/etcd_3_4/package.nix b/pkgs/by-name/et/etcd_3_4/package.nix
index 887610e273bd..4aa1160b36f8 100644
--- a/pkgs/by-name/et/etcd_3_4/package.nix
+++ b/pkgs/by-name/et/etcd_3_4/package.nix
@@ -44,6 +44,6 @@ buildGoModule (finalAttrs: {
     downloadPage = "https://github.com/etcd-io/etcd/";
     license = lib.licenses.asl20;
     homepage = "https://etcd.io/";
-    maintainers = with lib.maintainers; [ superherointj ];
+    maintainers = [ ];
   };
 })

From 6ae20ab8cf35032914898864778094263bdd0c8d Mon Sep 17 00:00:00 2001
From: superherointj <sergiomarcelo@ya.ru>
Date: Wed, 17 Jun 2026 12:33:15 -0300
Subject: [PATCH 48/60] godot-mcp: remove superherointj from maintainers

---
 pkgs/by-name/go/godot-mcp/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/go/godot-mcp/package.nix b/pkgs/by-name/go/godot-mcp/package.nix
index bf099173ea6d..2c079ec04153 100644
--- a/pkgs/by-name/go/godot-mcp/package.nix
+++ b/pkgs/by-name/go/godot-mcp/package.nix
@@ -38,7 +38,7 @@ buildNpmPackage {
     mainProgram = "godot-mcp";
     homepage = "https://github.com/Coding-Solo/godot-mcp";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ superherointj ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 }

From 6b011c1fd98a69053a372de48b2777618e540373 Mon Sep 17 00:00:00 2001
From: superherointj <sergiomarcelo@ya.ru>
Date: Wed, 17 Jun 2026 12:33:55 -0300
Subject: [PATCH 49/60] godot: remove superherointj from maintainers

---
 pkgs/development/tools/godot/common.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/tools/godot/common.nix b/pkgs/development/tools/godot/common.nix
index f2d068f68adc..a7b38916f72b 100644
--- a/pkgs/development/tools/godot/common.nix
+++ b/pkgs/development/tools/godot/common.nix
@@ -768,7 +768,6 @@ let
           maintainers = with lib.maintainers; [
             corngood
             shiryel
-            superherointj
           ];
           mainProgram = "godot${suffix}";
         };

From f3e13344623a25d05561fe37a8937087eb256349 Mon Sep 17 00:00:00 2001
From: superherointj <sergiomarcelo@ya.ru>
Date: Wed, 17 Jun 2026 12:34:41 -0300
Subject: [PATCH 50/60] gitea-actions-runner: remove superherointj from
 maintainers

---
 pkgs/by-name/gi/gitea-actions-runner/package.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/gi/gitea-actions-runner/package.nix b/pkgs/by-name/gi/gitea-actions-runner/package.nix
index 6f8dc249f6f4..4040504bdd65 100644
--- a/pkgs/by-name/gi/gitea-actions-runner/package.nix
+++ b/pkgs/by-name/gi/gitea-actions-runner/package.nix
@@ -44,9 +44,6 @@ buildGoModule (finalAttrs: {
     homepage = "https://gitea.com/gitea/runner";
     license = lib.licenses.mit;
     mainProgram = "gitea-runner";
-    maintainers = with lib.maintainers; [
-      superherointj
-      techknowlogick
-    ];
+    maintainers = with lib.maintainers; [ techknowlogick ];
   };
 })

From 1098d335bc4456e2e612a4b77212309a73524022 Mon Sep 17 00:00:00 2001
From: superherointj <sergiomarcelo@ya.ru>
Date: Wed, 17 Jun 2026 12:35:30 -0300
Subject: [PATCH 51/60] opencode: remove superherointj from maintainers

---
 pkgs/by-name/op/opencode/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 9b5eb5d6cc52..668fd555a405 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -184,7 +184,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       delafthi
       DuskyElf
       graham33
-      superherointj
     ];
     sourceProvenance = with lib.sourceTypes; [ fromSource ];
     platforms = [

From 9716ded4aa47132c4abc27e9263299220bdabf5b Mon Sep 17 00:00:00 2001
From: superherointj <sergiomarcelo@ya.ru>
Date: Wed, 17 Jun 2026 12:36:15 -0300
Subject: [PATCH 52/60] maintainers: remove superherointj

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 816d9e792a87..26c771d8f2d4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -26684,13 +26684,6 @@
     githubId = 36031171;
     name = "Supa";
   };
-  superherointj = {
-    email = "sergiomarcelo@yandex.com";
-    github = "superherointj";
-    githubId = 5861043;
-    matrix = "@superherointj:matrix.org";
-    name = "Sérgio Marcelo";
-  };
   supermarin = {
     email = "git+nixpkgs@mar.in";
     name = "marin";

From c7726f7685d8ba1ca514c7105bccf9297bb5a21f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Jun 2026 15:44:43 +0000
Subject: [PATCH 53/60] zapzap: 6.5.1 -> 6.5.2.1

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

diff --git a/pkgs/by-name/za/zapzap/package.nix b/pkgs/by-name/za/zapzap/package.nix
index f151e271f559..6dc58d202b3c 100644
--- a/pkgs/by-name/za/zapzap/package.nix
+++ b/pkgs/by-name/za/zapzap/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "zapzap";
-  version = "6.5.1";
+  version = "6.5.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rafatosta";
     repo = "zapzap";
     tag = finalAttrs.version;
-    hash = "sha256-elSMrH62oKZ2F6W9gkormdUi60u0r7Yy3AYOm47vGcE=";
+    hash = "sha256-6W4Crf3zNRLOvBqnM6K9r2u8Z/lF4JnEse0ctMM+1m4=";
   };
 
   nativeBuildInputs = [

From e1b6db53021ef73bb16367242575deacec6ee00f Mon Sep 17 00:00:00 2001
From: Marc Bornand <dev.mbornand@systemb.ch>
Date: Mon, 15 Jun 2026 23:58:45 +0200
Subject: [PATCH 54/60] librewolf-unwrapped: add mBornand as maintainer

---
 pkgs/by-name/li/librewolf-unwrapped/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/li/librewolf-unwrapped/package.nix b/pkgs/by-name/li/librewolf-unwrapped/package.nix
index 896157af360f..7acf0e75b074 100644
--- a/pkgs/by-name/li/librewolf-unwrapped/package.nix
+++ b/pkgs/by-name/li/librewolf-unwrapped/package.nix
@@ -32,6 +32,7 @@ in
       dwrege
       fpletz
       hythera
+      mBornand
       thbemme
     ];
     platforms = lib.platforms.unix;

From ebadae9eaea16b598422203deccf783c87bd530f Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 17 Jun 2026 18:47:21 +0300
Subject: [PATCH 55/60] octavePackages: drop mesa dependencies

Those don't do anything. statistics tests still pass, image tests
also pass but the hook doesn't know how to handle xfail so the build
fails.
---
 pkgs/development/octave-modules/image/default.nix      | 2 --
 pkgs/development/octave-modules/statistics/default.nix | 2 --
 pkgs/top-level/octave-packages.nix                     | 1 -
 3 files changed, 5 deletions(-)

diff --git a/pkgs/development/octave-modules/image/default.nix b/pkgs/development/octave-modules/image/default.nix
index 3a5df2b848cd..e09b93e71bbe 100644
--- a/pkgs/development/octave-modules/image/default.nix
+++ b/pkgs/development/octave-modules/image/default.nix
@@ -2,7 +2,6 @@
   buildOctavePackage,
   lib,
   fetchurl,
-  mesa,
   gnuplot,
   makeFontsConf,
   writableTmpDirAsHomeHook,
@@ -18,7 +17,6 @@ buildOctavePackage rec {
   };
 
   nativeOctavePkgTestInputs = [
-    mesa
     gnuplot
     writableTmpDirAsHomeHook
   ];
diff --git a/pkgs/development/octave-modules/statistics/default.nix b/pkgs/development/octave-modules/statistics/default.nix
index e29b26e52230..dd7e397834f4 100644
--- a/pkgs/development/octave-modules/statistics/default.nix
+++ b/pkgs/development/octave-modules/statistics/default.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   io,
   datatypes,
-  mesa,
   gnuplot,
   makeFontsConf,
   writableTmpDirAsHomeHook,
@@ -27,7 +26,6 @@ buildOctavePackage rec {
   ];
 
   nativeOctavePkgTestInputs = [
-    mesa
     gnuplot
     writableTmpDirAsHomeHook
   ];
diff --git a/pkgs/top-level/octave-packages.nix b/pkgs/top-level/octave-packages.nix
index 08dc904487d3..89a847c6dcea 100644
--- a/pkgs/top-level/octave-packages.nix
+++ b/pkgs/top-level/octave-packages.nix
@@ -118,7 +118,6 @@ makeScope newScope (
 
     image = callPackage ../development/octave-modules/image {
       inherit (pkgs)
-        mesa
         gnuplot
         makeFontsConf
         writableTmpDirAsHomeHook

From 5ae9acc8933249ec84cbb12cb8cdfa9cb16c1821 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Jun 2026 16:02:23 +0000
Subject: [PATCH 56/60] home-assistant-custom-components.garmin_connect: 3.0.11
 -> 3.0.12

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

diff --git a/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix b/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix
index 6a6e8c30b1cd..f3a83f838dc8 100644
--- a/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "cyberjunky";
   domain = "garmin_connect";
-  version = "3.0.11";
+  version = "3.0.12";
 
   src = fetchFromGitHub {
     owner = "cyberjunky";
     repo = "home-assistant-garmin_connect";
     tag = version;
-    hash = "sha256-Sx7ribYJCpFwr3mo2VH2TsWyBTAZKK1q4AdGozB/y88=";
+    hash = "sha256-8pyuH3GgFTov4M2ckmh3KCYmAzVG4iYkGGpA+Cd9/wk=";
   };
 
   dependencies = [

From cac87cf2d542636659b87e82b63fbf6e5b5e7980 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 17 Jun 2026 19:22:56 +0300
Subject: [PATCH 57/60] mesa: migrate to finalAttrs

---
 pkgs/development/libraries/mesa/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 14c690a882c5..8afb9543d51b 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -111,7 +111,6 @@
     "screenshot"
     "vram-report-limit"
   ],
-  mesa,
   mesa-gl-headers,
   makeSetupHook,
 }:
@@ -143,7 +142,7 @@ let
 
   common = import ./common.nix { inherit lib fetchFromGitLab; };
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   inherit (common)
     pname
     version
@@ -395,20 +394,20 @@ stdenv.mkDerivation {
       ;
 
     # for compatibility
-    drivers = lib.warn "`mesa.drivers` is deprecated, use `mesa` instead" mesa;
+    drivers = lib.warn "`mesa.drivers` is deprecated, use `mesa` instead" finalAttrs.finalPackage;
 
     tests.outDoesNotDependOnLLVM = stdenv.mkDerivation {
       name = "mesa-does-not-depend-on-llvm";
       buildCommand = ''
-        echo ${mesa} >>$out
+        echo ${finalAttrs.finalPackage} >>$out
       '';
       disallowedRequisites = [ llvmPackages.llvm ];
     };
 
     llvmpipeHook = makeSetupHook {
       name = "llvmpipe-hook";
-      substitutions.mesa = mesa;
+      substitutions.mesa = finalAttrs.finalPackage;
       meta.license = lib.licenses.mit;
     } ./llvmpipe-hook.sh;
   };
-}
+})

From 55d7545a2b011738a2eb57c59d210a36d5fe48bc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Jun 2026 16:28:31 +0000
Subject: [PATCH 58/60] sabnzbd: 5.0.3 -> 5.0.4

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

diff --git a/pkgs/by-name/sa/sabnzbd/package.nix b/pkgs/by-name/sa/sabnzbd/package.nix
index d9bca070a823..0ffa4d855104 100644
--- a/pkgs/by-name/sa/sabnzbd/package.nix
+++ b/pkgs/by-name/sa/sabnzbd/package.nix
@@ -73,14 +73,14 @@ let
   ];
 in
 stdenv.mkDerivation rec {
-  version = "5.0.3";
+  version = "5.0.4";
   pname = "sabnzbd";
 
   src = fetchFromGitHub {
     owner = "sabnzbd";
     repo = "sabnzbd";
     rev = version;
-    hash = "sha256-UTzdBM64fCbyY8+h94G8XbTIdoXk0mDZjlnGPywRB4Q=";
+    hash = "sha256-Fi42ctRVNv3fJwNF/5CW/EJjdrjgotJS5sD2jHoc7/I=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From b1c5eac91be8178a6bc97718c37ba1cbc6a069b2 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, 18 Jun 2026 00:26:01 +0700
Subject: [PATCH 59/60] =?UTF-8?q?nixtamal:=201.7.0=20=E2=86=92=201.7.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/ni/nixtamal/package.nix b/pkgs/by-name/ni/nixtamal/package.nix
index 768fef8cb15b..1d72220e18f6 100644
--- a/pkgs/by-name/ni/nixtamal/package.nix
+++ b/pkgs/by-name/ni/nixtamal/package.nix
@@ -21,7 +21,7 @@
 
 ocamlPackages.buildDunePackage (finalAttrs: {
   pname = "nixtamal";
-  version = "1.7.0";
+  version = "1.7.1";
   release_year = 2026;
 
   minimalOCamlVersion = "5.3";
@@ -30,7 +30,7 @@ ocamlPackages.buildDunePackage (finalAttrs: {
     url = "https://darcs.toastal.in.th/nixtamal/stable/";
     mirrors = [ "https://smeder.ee/~toastal/nixtamal.darcs" ];
     rev = finalAttrs.version;
-    hash = "sha256-EMm/hAmOZw5Zcmr3XUTz9M2LigqTnZpDElGMxWML6ug=";
+    hash = "sha256-C6d6Ra9w0NG78QSVFS4Glj3HoNRugXjowjFOoJbzHT0=";
   };
 
   nativeBuildInputs = [

From a161f4aa5a4cd0087a614c0412bd78f62978969d Mon Sep 17 00:00:00 2001
From: coolcuber <rpgeorg@clemson.edu>
Date: Wed, 17 Jun 2026 13:43:48 -0400
Subject: [PATCH 60/60] xaos: add coolcuber as maintainer

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

diff --git a/pkgs/by-name/xa/xaos/package.nix b/pkgs/by-name/xa/xaos/package.nix
index 40f9172eef24..ed899d4d149e 100644
--- a/pkgs/by-name/xa/xaos/package.nix
+++ b/pkgs/by-name/xa/xaos/package.nix
@@ -70,5 +70,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://xaos-project.github.io/";
     license = lib.licenses.gpl2Plus;
     platforms = [ "x86_64-linux" ];
+    maintainers = with lib.maintainers; [ coolcuber ];
   };
 })