From 675234b0cef7fdcee350ab6a0b9635816ee6231d Mon Sep 17 00:00:00 2001
From: KorkutKardes7 <korkutkardes7@hotmail.com>
Date: Thu, 12 Mar 2026 18:31:11 +0300
Subject: [PATCH 01/71] maintainers: add korkutkardes7

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index afd1340bcc6b..c273a47ad708 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -14303,6 +14303,12 @@
     githubId = 913109;
     name = "Emil Fresk";
   };
+  korkutkardes7 = {
+    email = "korkutkardes7@hotmail.com";
+    github = "KorkutKardes7";
+    githubId = 148012191;
+    name = "Korkut Kardeşseven";
+  };
   kornholi = {
     email = "kornholijo@gmail.com";
     github = "kornholi";

From c6e67b45f5cc9353033d739e4447388e42f9dbb2 Mon Sep 17 00:00:00 2001
From: KorkutKardes7 <korkutkardes7@hotmail.com>
Date: Thu, 12 Mar 2026 18:41:22 +0300
Subject: [PATCH 02/71] wire-desktop: build from source

Co-authored-by: ern775 <eren.demir2479090@gmail.com>
---
 .../by-name/wi/wire-desktop/build-linux.patch |  10 +
 .../by-name/wi/wire-desktop/build-macos.patch |  10 +
 .../wi/wire-desktop/missing-hashes.json       |  23 ++
 pkgs/by-name/wi/wire-desktop/package.nix      | 348 +++++++++---------
 pkgs/by-name/wi/wire-desktop/update.sh        |  89 -----
 pkgs/by-name/wi/wire-desktop/versions.json    |  10 -
 6 files changed, 212 insertions(+), 278 deletions(-)
 create mode 100644 pkgs/by-name/wi/wire-desktop/build-linux.patch
 create mode 100644 pkgs/by-name/wi/wire-desktop/build-macos.patch
 create mode 100644 pkgs/by-name/wi/wire-desktop/missing-hashes.json
 delete mode 100755 pkgs/by-name/wi/wire-desktop/update.sh
 delete mode 100644 pkgs/by-name/wi/wire-desktop/versions.json

diff --git a/pkgs/by-name/wi/wire-desktop/build-linux.patch b/pkgs/by-name/wi/wire-desktop/build-linux.patch
new file mode 100644
index 000000000000..ccb29ec8610a
--- /dev/null
+++ b/pkgs/by-name/wi/wire-desktop/build-linux.patch
@@ -0,0 +1,10 @@
+--- a/bin/build-tools/lib/build-linux.ts	2026-03-14 16:55:05.607020706 +0300
++++ b/bin/build-tools/lib/build-linux.ts	2026-03-14 16:56:36.314018156 +0300
+@@ -115,6 +115,7 @@
+       ...platformSpecificConfig,
+       depends: rpmDepends,
+     },
++    electronDist: "node_modules/electron-dist",
+   };
+ 
+   return {builderConfig, linuxConfig};
diff --git a/pkgs/by-name/wi/wire-desktop/build-macos.patch b/pkgs/by-name/wi/wire-desktop/build-macos.patch
new file mode 100644
index 000000000000..de4f524bec09
--- /dev/null
+++ b/pkgs/by-name/wi/wire-desktop/build-macos.patch
@@ -0,0 +1,10 @@
+--- a/bin/build-tools/lib/build-macos.ts	2026-03-14 19:53:19.400997490 +0300
++++ b/bin/build-tools/lib/build-macos.ts	2026-03-14 19:53:21.919315580 +0300
+@@ -98,6 +98,7 @@
+     protocols: [{name: `${commonConfig.name} Core Protocol`, schemes: [commonConfig.customProtocolName]}],
+     prune: true,
+     quiet: false,
++    electronZipDir: "node_modules/electron-dist",
+   };
+ 
+   if (macOSConfig.electronMirror) {
diff --git a/pkgs/by-name/wi/wire-desktop/missing-hashes.json b/pkgs/by-name/wi/wire-desktop/missing-hashes.json
new file mode 100644
index 000000000000..8218613607db
--- /dev/null
+++ b/pkgs/by-name/wi/wire-desktop/missing-hashes.json
@@ -0,0 +1,23 @@
+{
+  "@unrs/resolver-binding-android-arm-eabi@npm:1.11.1": "61ec7f4f3602cda87a24701f7d9904b13eb7d0b579ef7033455541d5a7b13a7868557d3df962b0dc3b84db442e9b829c54355d7ead6d0bf078f2660f10779511",
+  "@unrs/resolver-binding-android-arm64@npm:1.11.1": "98af481a2ff7ef2a88dff7117085c4aa16f522d9a069cc1111c0c01a849fe1752de5a6d846fbd5d6b143b7962831edb929f4a2e71fa60ffa8354bc605a5361d9",
+  "@unrs/resolver-binding-darwin-arm64@npm:1.11.1": "cdd8a50fa3d09e19a3f28f02bd06735948aa2839806d9771f9be4531ee25aba5f673d561d33c9390aece4bdde9f81f6b79f51127f60df32513f35436e2ce227e",
+  "@unrs/resolver-binding-darwin-x64@npm:1.11.1": "d89ca565eb69b5b9709f1978402a4ae1b83613764e946db35340c3c3ea229c7fb3754a3da169e79a8dc0e552765690ccb62209b17160d1f7d524dca47e36f2f3",
+  "@unrs/resolver-binding-freebsd-x64@npm:1.11.1": "0b8679c0d7136d7421cb13302311db2fc7e7770d605726814b257e6f03979004ad3e546947d8be159059946c91fa88eef4371e0ab1539453092b1a02491f63db",
+  "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.11.1": "003aa1bd9c950d8b2547e21610cb40bf1cd81e5fd50d8e2bfdcebca9c1c14f902b2d83315cf27415d99a0c35921b9feb3be99ff9cf0e05342b66ec7f2e9cc7cb",
+  "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.11.1": "0f9a66eaffbda26a53f1ad958e02e651cf2e35c3d9e4d8dca794dcdb57312b528dc5aef5419c6a8537bc97cc569e5d4d64673620523279c00648c90359befe1d",
+  "@unrs/resolver-binding-linux-arm64-gnu@npm:1.11.1": "4e57baf96705e1a690e43a0a62da074a2245b5b17d60339230aa974a35d7c1e7160bde4ac700d7b9b8a5a535ec733675b6c50876310a2e66222b395ac3977305",
+  "@unrs/resolver-binding-linux-arm64-musl@npm:1.11.1": "772327066fdf6f457b27a71f1b58b348c829b29053154320980e63a67b8d53b18c342b699f6fffce9f0626cbe93a86e367e0b614581fb875c1897d281381c732",
+  "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.11.1": "60f7876213b834ae92d03d0ab20e914f428d5e9167ef65571061e5921d9dd09e6cc90e02d9394d6e34f645605731f2d7cdc997239b4e33d1799352ce673451f9",
+  "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.11.1": "a947ec594e963273c05352cf1b140da0202ec3f6c6b2bcbb51401b2032fde3298677ec985b3b76640ec21ae2a83ab186290e2e89cb559bffe6e23e069b83dc1a",
+  "@unrs/resolver-binding-linux-riscv64-musl@npm:1.11.1": "46e462d52b0f064beecc6b3015a4e450e2227da971dab34cb02557756dc082253aec04da64a1e39fa72f4fc1b40779b4964594c702a2dc57728e83ac87ae632d",
+  "@unrs/resolver-binding-linux-s390x-gnu@npm:1.11.1": "1f0fc98eb80152dc1d81a02eaccefdb4d613992a11d1d584298a4045390534a83ab07f3b25429f5e83ab97c9645491021950960961478da17d1275b071c335e1",
+  "@unrs/resolver-binding-linux-x64-gnu@npm:1.11.1": "bddb12a68a6ae78ff036c8403299b31a4a6b8cd87d04ae72197be13dcef9561cf2ae2e5f6727c19ad038c025a57229c8759a6a4ea3ac2c05cc950da62adbb7d1",
+  "@unrs/resolver-binding-linux-x64-musl@npm:1.11.1": "1b00602cce9d99d8f35d1eb6447f14b6a38c0b4bc39807c738c7a0fd64763145d3079adbdcb5b6f0793e5056af636746ef53bbc5ae1f5d300fdf682deb43e887",
+  "@unrs/resolver-binding-wasm32-wasi@npm:1.11.1": "f0b1d5ef2066690fa9987ee47d156b459cf597945e9f0f4b8ae46d0aa8d5ff9693aeb73b302f21b90fde29ed4cedfcbcb19376ad7f1e1f2baf56e9267b9bec67",
+  "@unrs/resolver-binding-win32-arm64-msvc@npm:1.11.1": "6a00804da3a6388259b15e28ed276367767325ccd08e8f9c6ea0baf8c7cea8d709c4fea9005853fa0024577947d0819e8e41031505b4af6ddbfba4ad98a0ec47",
+  "@unrs/resolver-binding-win32-ia32-msvc@npm:1.11.1": "68df9e7db0f0253a77d1ac09794e89f47db0878f329f5d079a2f5a73c4200c7b3e5b42c5a6d36eece4372aafb6d8c0f25c632c1c2beee75ef62fa6e204ea2232",
+  "@unrs/resolver-binding-win32-x64-msvc@npm:1.11.1": "0fd962a79572c3a47533acd2bba2274583a9d6905d62f4927177c48525b91a3ad67ea680cb9e89bd1802c71cd65a414fc8d11937dad33f6fbf83013eb435acd6",
+  "dmg-license@npm:1.0.11": "be760b0fc5bb36a31ad623597e8c883eee85a2a775107892354b1fb8fd11fba7bf6c2c0e96bb6c43a8f27a448bd4188d6073dbc4c0f53034f42f05660c4571ee",
+  "iconv-corefoundation@npm:1.1.7": "e9456c1ece923480330e2de94c214afa04ef28b72bc9e982ada8c2fdad270a0e6af99cccb303f87406dde84cbf82b807c73152252ecc90f54d89cdd1b0e7351e"
+}
diff --git a/pkgs/by-name/wi/wire-desktop/package.nix b/pkgs/by-name/wi/wire-desktop/package.nix
index 3e98eef5298d..f430c998cec8 100644
--- a/pkgs/by-name/wi/wire-desktop/package.nix
+++ b/pkgs/by-name/wi/wire-desktop/package.nix
@@ -1,48 +1,173 @@
 {
-  autoPatchelfHook,
-  dpkg,
-  fetchurl,
-  makeDesktopItem,
-  makeWrapper,
-  stdenv,
   lib,
-  udev,
-  buildPackages,
-  cpio,
-  xar,
-  libdbusmenu,
-  alsa-lib,
-  libgbm,
-  nss,
-  nspr,
-  systemd,
+  stdenv,
+  stdenvNoCC,
+  fetchFromGitHub,
+  electron,
+  nodejs,
+  yarn-berry_3,
+  makeWrapper,
+  makeDesktopItem,
+  darwin,
+  zip,
+  jq,
 }:
-
 let
-
-  inherit (stdenv.hostPlatform) system;
-
-  throwSystem = throw "Unsupported system: ${system}";
-
+  hostPlatform = stdenvNoCC.hostPlatform;
+  nodeArch = hostPlatform.node.arch;
+  yarn-berry = yarn-berry_3;
+  # same hash for this release but can change in the future
+  sources = rec {
+    x86_64-linux = rec {
+      version = "3.40.3882";
+      src = fetchFromGitHub {
+        owner = "wireapp";
+        repo = "wire-desktop";
+        tag = "linux/${version}";
+        hash = "sha256-pNu+/JKvaKSqHxNeDL8RcDy+FiY3aynQH06t05qgXrA=";
+      };
+    };
+    x86_64-darwin = rec {
+      version = "3.40.5442";
+      src = fetchFromGitHub {
+        owner = "wireapp";
+        repo = "wire-desktop";
+        tag = "macos/${version}";
+        hash = "sha256-pNu+/JKvaKSqHxNeDL8RcDy+FiY3aynQH06t05qgXrA=";
+      };
+    };
+    aarch64-linux = x86_64-linux;
+    aarch64-darwin = x86_64-darwin;
+  };
+  web-config = fetchFromGitHub {
+    owner = "wireapp";
+    repo = "wire-web-config-wire";
+    tag = "v0.34.9-0";
+    hash = "sha256-E9x/tRcMfXw/tjgNBUTefym9/m/Xu9/9CclwSmxpDzU=";
+  };
+  electron-dist-zip = stdenvNoCC.mkDerivation {
+    pname = "electron-dist-zip";
+    version = electron.version;
+    src = electron.dist;
+    nativeBuildInputs = [ zip ];
+    buildPhase = ''
+      zip --recurse-paths - . > $out
+    '';
+    dontInstall = true;
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "wire-desktop";
+  inherit (sources.${stdenv.system}) version src;
 
-  versions = builtins.fromJSON (builtins.readFile ./versions.json);
+  missingHashes = ./missing-hashes.json;
+  offlineCache = yarn-berry.fetchYarnBerryDeps {
+    inherit (finalAttrs) src missingHashes;
+    hash = "sha256-md7B8NSqT9dmPxrp9zbWifNow+1j2tuTRMOljG1V8WE=";
+  };
 
-  version =
-    {
-      x86_64-darwin = versions.macos.version;
-      aarch64-darwin = versions.macos.version;
-      x86_64-linux = versions.linux.version;
-    }
-    .${system} or throwSystem;
+  nativeBuildInputs = [
+    nodejs
+    yarn-berry.yarnBerryConfigHook
+    yarn-berry
+    makeWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    jq
+    darwin.autoSignDarwinBinariesHook
+  ];
 
-  hash =
-    {
-      x86_64-darwin = versions.macos.hash;
-      aarch64-darwin = versions.macos.hash;
-      x86_64-linux = versions.linux.hash;
-    }
-    .${system} or throwSystem;
+  patches = [
+    ./build-linux.patch
+    ./build-macos.patch
+  ];
+
+  # we provide web-config externally due to yarn trying to fetch from github on build phase
+  postPatch = ''
+    substituteInPlace .copyconfigrc.js \
+      --replace-fail 'repositoryUrl,' 'repositoryUrl, externalDir : "${web-config}",'
+  '';
+
+  env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+
+  # we put the electrons for each platform under `node_modules/electron-dist` due to electron packager grabbing it otherwise
+  buildPhase = ''
+    runHook preBuild
+
+    export BUILD_NUMBER=$(echo ${finalAttrs.version} | awk -F. '{print $NF}')
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+
+    # this is needed due to macos builder using electron-packager directly
+    # we put the zipped electron into a custom path which is defined in the patch, see build-macos.patch
+    ELECTRON_VERSION_IN_LOCKFILE=$(yarn why electron --json | tail --lines 1 | jq --raw-output '.children | to_entries | first | .key ' | cut -d : -f 2)
+    mkdir node_modules/electron-dist
+    cp ${electron-dist-zip} node_modules/electron-dist/electron-v$ELECTRON_VERSION_IN_LOCKFILE-mas-${nodeArch}.zip
+
+    # these variables are needed to skip signing on darwin, we sign with autoSignDarwinBinariesHook later
+    export MACOS_CERTIFICATE_NAME_APPLICATION="" MACOS_CERTIFICATE_NAME_INSTALLER=""
+    yarn build:macos:${nodeArch}
+
+  ''
+  + lib.optionalString (stdenv.hostPlatform.isLinux) ''
+
+    cp -R ${electron.dist} node_modules/electron-dist
+    # electron needs to have write access otherwire electron-fuses fails
+    chmod -R u+w node_modules/electron-dist
+
+    # we build only for the linux-unpacked output, not other targets
+    export LINUX_TARGET=dir
+    yarn build:linux
+
+  ''
+  + ''
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+
+    mkdir -p $out/{Applications,bin}
+    cp -r wrap/build/Wire-mas-${nodeArch}/Wire.app $out/Applications
+
+    makeWrapper $out/Applications/Wire.app/Contents/MacOS/Wire $out/bin/wire-desktop
+
+  ''
+  + lib.optionalString (stdenv.hostPlatform.isLinux) ''
+
+    mkdir -p $out/share/wire-desktop
+    cp -r wrap/dist/linux-unpacked/{locales,resources{,.pak}} $out/share/wire-desktop
+
+    makeWrapper ${lib.getExe electron} $out/bin/wire-desktop \
+      --add-flags $out/share/wire-desktop/resources/app.asar \
+      --inherit-argv0
+
+    for size in 32 256; do
+      install -Dm644 "resources/icons/"$size"x"$size".png" "$out/share/icons/hicolor/"$size"x"$size"/apps/wire-desktop.png"
+    done
+
+  ''
+  + ''
+    runHook postInstall
+  '';
+
+  desktopItem = makeDesktopItem {
+    categories = [
+      "Network"
+      "InstantMessaging"
+      "Chat"
+      "VideoConference"
+    ];
+    comment = "Secure messenger for everyone";
+    desktopName = "Wire";
+    exec = "wire-desktop %U";
+    genericName = "Secure messenger";
+    icon = "wire-desktop";
+    name = "wire-desktop";
+    startupWMClass = "Wire";
+  };
 
   meta = {
     description = "Modern, secure messenger for everyone";
@@ -59,153 +184,18 @@ let
     '';
     homepage = "https://wire.com/";
     downloadPage = "https://wire.com/download/";
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       arianvp
+      ern775
+      korkutkardes7
       toonn
     ];
-    platforms = lib.platforms.darwin ++ [
+    platforms = [
       "x86_64-linux"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
     ];
-    hydraPlatforms = [ ];
   };
-
-  passthru.updateScript = {
-    command = [
-      ./update.sh
-      ./.
-    ];
-    # R-ryantm does not respect the commit feature, leading to inaccurate
-    # commit messages because it only sees the Linux version numbers.
-    # nixpkgs-update: no auto update
-    supportedFeatures = [ "commit" ];
-  };
-
-  linux = stdenv.mkDerivation rec {
-    inherit
-      pname
-      version
-      meta
-      passthru
-      ;
-
-    src = fetchurl {
-      url = "https://wire-app.wire.com/linux/debian/pool/main/Wire-${version}_amd64.deb";
-      inherit hash;
-    };
-
-    desktopItem = makeDesktopItem {
-      categories = [
-        "Network"
-        "InstantMessaging"
-        "Chat"
-        "VideoConference"
-      ];
-      comment = "Secure messenger for everyone";
-      desktopName = "Wire";
-      exec = "wire-desktop %U";
-      genericName = "Secure messenger";
-      icon = "wire-desktop";
-      name = "wire-desktop";
-      startupWMClass = "Wire";
-    };
-
-    dontBuild = true;
-    dontConfigure = true;
-    dontPatchELF = true;
-    dontWrapGApps = true;
-
-    # TODO: migrate off autoPatchelfHook and use nixpkgs' electron
-    nativeBuildInputs = [
-      autoPatchelfHook
-      dpkg
-      makeWrapper
-      (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; })
-    ];
-
-    buildInputs = [
-      alsa-lib
-      libgbm
-      nss
-      nspr
-      systemd
-    ];
-
-    installPhase = ''
-      runHook preInstall
-
-      mkdir -p "$out/bin"
-      cp -R "opt" "$out"
-      cp -R "usr/share" "$out/share"
-      chmod -R g-w "$out"
-
-      # Desktop file
-      mkdir -p "$out/share/applications"
-      cp "${desktopItem}/share/applications/"* "$out/share/applications"
-
-      runHook postInstall
-    '';
-
-    runtimeDependencies = [
-      (lib.getLib udev)
-      libdbusmenu
-    ];
-
-    preFixup = ''
-      gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}")
-    '';
-
-    postFixup = ''
-      makeWrapper $out/opt/Wire/wire-desktop $out/bin/wire-desktop \
-        "''${gappsWrapperArgs[@]}"
-    '';
-  };
-
-  darwin = stdenv.mkDerivation {
-    inherit
-      pname
-      version
-      meta
-      passthru
-      ;
-
-    src = fetchurl {
-      url = "https://github.com/wireapp/wire-desktop/releases/download/macos%2F${version}/Wire.pkg";
-      inherit hash;
-    };
-
-    buildInputs = [
-      cpio
-      xar
-    ];
-
-    unpackPhase = ''
-      runHook preUnpack
-
-      xar -xf $src
-      cd com.wearezeta.zclient.mac.pkg
-
-      runHook postUnpack
-    '';
-
-    buildPhase = ''
-      runHook preBuild
-
-      cat Payload | gunzip -dc | cpio -i
-
-      runHook postBuild
-    '';
-
-    installPhase = ''
-      runHook preInstall
-
-      mkdir -p $out/Applications
-      cp -r Wire.app $out/Applications
-
-      runHook postInstall
-    '';
-  };
-
-in
-if stdenv.hostPlatform.isDarwin then darwin else linux
+})
diff --git a/pkgs/by-name/wi/wire-desktop/update.sh b/pkgs/by-name/wi/wire-desktop/update.sh
deleted file mode 100755
index 65fb554d6aab..000000000000
--- a/pkgs/by-name/wi/wire-desktop/update.sh
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl jq
-
-set -e
-
-cd $1
-
-releases=$(curl -L \
-  -H "Accept: application/vnd.github+json" \
-  -H "X-GitHub-Api-Version: 2022-11-28" \
-  "https://api.github.com/repos/wireapp/wire-desktop/releases" \
-)
-
-latest=$(jq --argjson suffix '{ "linux": ".deb", "macos": ".pkg" }' \
-  --slurpfile versions versions.json '
-  def platform_latest(platform):
-    map(select(.tag_name | startswith(platform)))
-    | max_by(.tag_name)
-    | { version: .tag_name | ltrimstr(platform + "/")
-      , url: .assets.[]
-             | .browser_download_url
-             | select(endswith($suffix.[platform]))
-      };
-
-  . as $releases
-  | $versions.[] as $old
-  | $old
-  | with_entries( .key as $key
-                  | { key: $key, value: $releases | platform_latest($key) }
-                  | select(.value.version != $old.[$key].version)
-                )
-' <<< "$releases"
-)
-
-urlHashes=$(
-  printf '{ '
-  function entries () {
-    local sep=''
-    for url in $(jq --raw-output '.[].url' <<< "$latest"); do
-      hash=$(nix-hash --to-sri --type sha256 $(nix-prefetch-url $url))
-      if [ -z "$hash" ]; then
-        printf 'Failed to retrieve hash for %s\n' "$url" 2>&1
-      fi
-      printf '%s"%s": "%s"\n' "$sep" "$url" "$hash"
-      sep=', '
-    done
-  }
-  entries
-  printf '}'
-)
-
-commit=$(jq --arg versionJSON "$(printf '%s/versions.json' "$1")" \
-  --slurpfile versions versions.json '
-  $versions.[] as $old
-  | to_entries
-  | map("\(.key) \($old.[.key].version) -> \(.value.version)")
-  | join(", ")
-  | [ if . == ""
-      then empty
-      else { attrPath: "wire-desktop"
-           , oldVersion: "A"
-           , newVersion: "B"
-           , files: [ $versionJSON ]
-           , commitMessage: "wire-desktop: \(.)"
-           }
-      end
-    ]
-' <<< "$latest"
-)
-
-tempfile=$(mktemp)
-
-updated=$(jq --argjson hashes "$urlHashes" --slurpfile versions versions.json '
-  $versions.[] as $old
-  | $old + map_values(with_entries(if .key == "url"
-                                   then { key: "hash"
-                                        , value: $hashes.[.value]
-                                        }
-                                   else .
-                                   end
-                                  )
-                     )
-' <<< "$latest" > $tempfile
-)
-
-mv $tempfile versions.json
-
-printf '%s' "$commit"
-exit 0
diff --git a/pkgs/by-name/wi/wire-desktop/versions.json b/pkgs/by-name/wi/wire-desktop/versions.json
deleted file mode 100644
index d1771695f066..000000000000
--- a/pkgs/by-name/wi/wire-desktop/versions.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "linux": {
-    "version": "3.40.3882",
-    "hash": "sha256-8cZGbOngQ0LcUdCcalexkF2nEDb+u3I0zqEbRf/sRiw="
-  },
-  "macos": {
-    "version": "3.40.5442",
-    "hash": "sha256-BxGkAbkl5kgeHq4dgITYsU1fXFY8XDWEOfwjHnk6XtQ="
-  }
-}

From d6b20a42a9982450ed6cc79f0cab1e6220f84d82 Mon Sep 17 00:00:00 2001
From: etwas <ein@etwas.me>
Date: Fri, 10 Apr 2026 18:34:59 +0200
Subject: [PATCH 03/71] qgis-ltr: 3.44.8 -> 3.44.9

---
 pkgs/applications/gis/qgis/unwrapped-ltr.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
index 5bfa3cfad0d0..27c94bef4440 100644
--- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix
+++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
@@ -87,7 +87,7 @@ let
   ];
 in
 mkDerivation rec {
-  version = "3.44.8";
+  version = "3.44.9";
   pname = "qgis-ltr-unwrapped";
   outputs = [ "out" ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) "man";
 
@@ -95,7 +95,7 @@ mkDerivation rec {
     owner = "qgis";
     repo = "QGIS";
     rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-FL/JqvcLqKhHsG96o/7Mel8wH8OaL+2LDtq6jngjW50=";
+    hash = "sha256-aeTWjzYRCKcgdB9sknrcqO5oWEuwU7OuvrvAi8W4bWE=";
   };
 
   passthru = {

From fac1e8039fcc2ad888dd2be334eeb207f7756d55 Mon Sep 17 00:00:00 2001
From: David Wronek <david.wronek@mainlining.org>
Date: Tue, 14 Apr 2026 07:44:09 +0200
Subject: [PATCH 04/71] grooveauthor: 1.1.3 -> 1.1.4

Signed-off-by: David Wronek <david.wronek@mainlining.org>
---
 pkgs/by-name/gr/grooveauthor/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gr/grooveauthor/package.nix b/pkgs/by-name/gr/grooveauthor/package.nix
index 261ac7b44723..0db2a404a0c2 100644
--- a/pkgs/by-name/gr/grooveauthor/package.nix
+++ b/pkgs/by-name/gr/grooveauthor/package.nix
@@ -13,11 +13,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "grooveauthor";
-  version = "1.1.3";
+  version = "1.1.4";
 
   src = fetchzip {
     url = "https://github.com/PerryAsleep/GrooveAuthor/releases/download/v${finalAttrs.version}/GrooveAuthor-v${finalAttrs.version}-linux-x64.tar.gz";
-    hash = "sha256-XuELs7Sj/M32ros5clKxKuVo/CdCja39Lwc+zsFGvFU=";
+    hash = "sha256-LjOOI1cUbYpl4tmY1eAZV3S99yQOb4V6LU9Gu/hTtnY=";
     stripRoot = false;
   };
 
@@ -70,7 +70,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   preFixup = ''
     gappsWrapperArgs+=(
-      --set DOTNET_ROOT ${dotnetCorePackages.runtime_8_0}/share/dotnet
+      --set DOTNET_ROOT ${dotnetCorePackages.runtime_10_0}/share/dotnet
       --suffix LD_LIBRARY_PATH : "${
         lib.makeLibraryPath [
           alsa-lib

From d82df5528a04c083543644b24905e2c2a3574bd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Korkut=20Karde=C5=9Fseven?=
 <148012191+KorkutKardes7@users.noreply.github.com>
Date: Sat, 18 Apr 2026 19:19:25 +0000
Subject: [PATCH 05/71] wire-desktop: remove toonn from maintainers As
 requested in #499529

---
 pkgs/by-name/wi/wire-desktop/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/wi/wire-desktop/package.nix b/pkgs/by-name/wi/wire-desktop/package.nix
index f430c998cec8..3d6091263bb9 100644
--- a/pkgs/by-name/wi/wire-desktop/package.nix
+++ b/pkgs/by-name/wi/wire-desktop/package.nix
@@ -189,7 +189,6 @@ stdenv.mkDerivation (finalAttrs: {
       arianvp
       ern775
       korkutkardes7
-      toonn
     ];
     platforms = [
       "x86_64-linux"

From f3e8dc860b45cb27d2e79738a26979b78d8540a1 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Sun, 19 Apr 2026 10:05:25 +0300
Subject: [PATCH 06/71] darwin.xcode: add 26.4.1

---
 pkgs/os-specific/darwin/xcode/default.nix | 2 ++
 pkgs/top-level/darwin-packages.nix        | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix
index 136b7baeb6d9..8052d58a8eb3 100644
--- a/pkgs/os-specific/darwin/xcode/default.nix
+++ b/pkgs/os-specific/darwin/xcode/default.nix
@@ -129,6 +129,8 @@ lib.makeExtensible (self: {
   xcode_26_3_Apple_silicon = requireXcode "26.3_Apple_silicon" "sha256-q2p45zqAZUH6Z1Q3DHbZgpuuFTjZoMPhEfFdeIUvclw=";
   xcode_26_4 = requireXcode "26.4_Universal" "sha256-0Cg4Ytu2+JOLEqw1ZZoB6hxFXNA2KriTLwLpT8bmA7I=";
   xcode_26_4_Apple_silicon = requireXcode "26.4_Apple_silicon" "sha256-urkJVqUY6+5z0YiEqCru9M/OneDLAMzdGfOt7i3d1WI=";
+  xcode_26_4_1 = requireXcode "26.4.1_Universal" "sha256-N9QgPKfZV64gJPlr4r/0gPS0yAgJd3a+qlr0YbzMCU4=";
+  xcode_26_4_1_Apple_silicon = requireXcode "26.4.1_Apple_silicon" "sha256-8MtGX97e/2+zvY2Et9Jm9eXqVmyr+U02UqsKmffh9hs=";
   xcode =
     self."xcode_${
       lib.replaceStrings [ "." ] [ "_" ] (
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index fa9b60790eff..b508524c4d61 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -162,6 +162,8 @@ makeScopeWithSplicing' {
         xcode_26_3_Apple_silicon
         xcode_26_4
         xcode_26_4_Apple_silicon
+        xcode_26_4_1
+        xcode_26_4_1_Apple_silicon
         xcode
         requireXcode
         ;

From 13ea73de627d8c2d04e19ab8ba997668ff1f10ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 21 Apr 2026 18:20:00 +0200
Subject: [PATCH 07/71] vsmartcard-vpcd: add missing wrapPythonPrograms

Fixes this issue:

  $ vicc
  Traceback (most recent call last):
    File "/run/current-system/sw/bin/vicc", line 116, in <module>
      from virtualsmartcard.VirtualSmartcard import VirtualICC
  ModuleNotFoundError: No module named 'virtualsmartcard'
---
 pkgs/by-name/vs/vsmartcard-vpcd/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/vs/vsmartcard-vpcd/package.nix b/pkgs/by-name/vs/vsmartcard-vpcd/package.nix
index 6ac2a3f67935..b85ec94a6ac3 100644
--- a/pkgs/by-name/vs/vsmartcard-vpcd/package.nix
+++ b/pkgs/by-name/vs/vsmartcard-vpcd/package.nix
@@ -8,6 +8,7 @@
   pcsclite,
   qrencode,
   python3,
+  python3Packages,
   help2man,
 }:
 
@@ -28,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
     autoreconfHook
     libtool
     pkg-config
+    python3Packages.wrapPython
     help2man
   ];
 
@@ -47,6 +49,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   configureFlags = lib.optional stdenv.hostPlatform.isDarwin "--enable-infoplist";
 
+  postFixup = ''
+    wrapPythonPrograms
+  '';
+
   meta = {
     description = "Emulates a smart card and makes it accessible through PC/SC";
     homepage = "http://frankmorgner.github.io/vsmartcard/virtualsmartcard/README.html";

From ea90036825277f286e2e3c5772adbb77c976a865 Mon Sep 17 00:00:00 2001
From: Alex Martens <alex@thinglab.org>
Date: Mon, 20 Apr 2026 19:41:58 -0700
Subject: [PATCH 08/71] home-assistant-custom-components.auth_oidc: 0.6.5-alpha
 -> 1.0.2

https://github.com/christiaangoossens/hass-oidc-auth/releases/tag/v1.0.2
---
 .../custom-components/auth_oidc/package.nix   | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/auth_oidc/package.nix b/pkgs/servers/home-assistant/custom-components/auth_oidc/package.nix
index dbbd4ce371eb..196286b30579 100644
--- a/pkgs/servers/home-assistant/custom-components/auth_oidc/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/auth_oidc/package.nix
@@ -4,34 +4,40 @@
   fetchFromGitHub,
   fetchNpmDeps,
   aiofiles,
-  bcrypt,
   jinja2,
   joserfc,
   nodejs,
   npmHooks,
-  python-jose,
+  pytestCheckHook,
+  pytest-homeassistant-custom-component,
+  pytest-cov-stub,
 }:
 
 buildHomeAssistantComponent rec {
   owner = "christaangoossens";
   domain = "auth_oidc";
-  version = "0.6.5-alpha";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "christiaangoossens";
     repo = "hass-oidc-auth";
     tag = "v${version}";
-    hash = "sha256-nclrSO6KmPnwXRPuuFwR6iYHsyfqcelPRGERWVJpdyk=";
+    hash = "sha256-ZYJD0PVh2E07cdY1a7uxSxdooAMz78HwJpwr4uWofZM=";
   };
 
   postPatch = ''
-    rm custom_components/auth_oidc/static/style.css
+    # Tests import directly from auth_oidc, but the component is installed
+    # under custom_components.auth_oidc
+    for f in tests/test_hass_webserver.py tests/test_state_store.py; do
+      substituteInPlace "$f" \
+        --replace-fail "from auth_oidc" "from custom_components.auth_oidc"
+    done
   '';
 
   env.npmDeps = fetchNpmDeps {
     name = "${domain}-npm-deps";
     inherit src;
-    hash = "sha256-i75YeCZVSMFDWzaiDJRTYqQee5I15n9ll0YYX1PXYbA=";
+    hash = "sha256-R5i4o2VnaXwgX72r6cBJULxSKadkU22vriMMWoMc5As=";
   };
 
   nativeBuildInputs = [
@@ -41,16 +47,20 @@ buildHomeAssistantComponent rec {
 
   dependencies = [
     aiofiles
-    bcrypt
     jinja2
     joserfc
-    python-jose
   ];
 
   postBuild = ''
     npm run css
   '';
 
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-homeassistant-custom-component
+    pytest-cov-stub
+  ];
+
   meta = {
     changelog = "https://github.com/christiaangoossens/hass-oidc-auth/releases/tag/v${version}";
     description = "OpenID Connect authentication provider for Home Assistant";

From 680d59619e0de9c8fe32c3915bcc50eb2f47b01c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 19 Apr 2026 21:21:59 +0000
Subject: [PATCH 09/71] python3Packages.jax: 0.9.2 -> 0.10.0

Diff: https://github.com/google/jax/compare/jax-v0.9.2...jax-v0.10.0

Changelog: https://docs.jax.dev/en/latest/changelog.html
---
 .../jax-cuda12-pjrt/default.nix               |  4 +--
 .../jax-cuda12-plugin/default.nix             | 16 +++++------
 .../python-modules/jax/default.nix            | 14 ++--------
 .../development/python-modules/jaxlib/bin.nix | 28 ++++++++++---------
 4 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
index c7826b24546f..57454d4f84b6 100644
--- a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
+++ b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
@@ -50,8 +50,8 @@ buildPythonPackage (finalAttrs: {
       .${stdenv.hostPlatform.system};
     hash =
       {
-        x86_64-linux = "sha256-U2owUpInbFdF77un61dXaEnFp8dzmKOp5h/TG69RAvA=";
-        aarch64-linux = "sha256-VvSifl8ZypFMD0QCU5RpqpLQG/cTNqzQ7Y/dwgqRvI0=";
+        x86_64-linux = "sha256-MJUVRT9Zyq2Vv3bIvGScJLwOPRLQe68895K+CCq97js=";
+        aarch64-linux = "sha256-NqwxbFiKDgjrZPhoJwUmrco4VtS3CxN2C36bc76F0s8=";
       }
       .${stdenv.hostPlatform.system};
   };
diff --git a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
index 0ccf040f552f..ad450298399c 100644
--- a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
+++ b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
@@ -39,42 +39,42 @@ let
     "3.11-x86_64-linux" = getSrcFromPypi {
       platform = "manylinux_2_27_x86_64";
       dist = "cp311";
-      hash = "sha256-1Vd82Ge9kmd2nkU7rYUNSAeoQ5a8l29jKlFe29d+SEs=";
+      hash = "sha256-lXMXyv8eawBqE1UXM3cN8jWidHBkviawJ0YP46WPWO4=";
     };
     "3.11-aarch64-linux" = getSrcFromPypi {
       platform = "manylinux_2_27_aarch64";
       dist = "cp311";
-      hash = "sha256-s5VfN10XkC8NJ+cFlnLNGWOlU0WVOkJpnk4HjOxyWtw=";
+      hash = "sha256-GkpKVqgyrTDgHBQIWx+iRApV+kzggI5AXnNlDv+K+zE=";
     };
     "3.12-x86_64-linux" = getSrcFromPypi {
       platform = "manylinux_2_27_x86_64";
       dist = "cp312";
-      hash = "sha256-iKVZCNd1sG3akqjE9MAVd44lulw2BbV/hLAAUvZujvE=";
+      hash = "sha256-oWugDXI2YUWCfKOajISfn+4Rd9ZzjJ7f1ys6n+31zxg=";
     };
     "3.12-aarch64-linux" = getSrcFromPypi {
       platform = "manylinux_2_27_aarch64";
       dist = "cp312";
-      hash = "sha256-sozPBbzAvHzLy9Mm2AKEZXTPbaA5FY52FHvZb1xvEYk=";
+      hash = "sha256-6vGmGVqg60i0IMcfIrktGXeNlIAkl3yuRkEnnV9sH4E=";
     };
     "3.13-x86_64-linux" = getSrcFromPypi {
       platform = "manylinux_2_27_x86_64";
       dist = "cp313";
-      hash = "sha256-vX3+0Xv6nQ4wFvjCpnZ8dHnZHhvf33kW6ysHQ1zEZY4=";
+      hash = "sha256-7QdNN5Z7zmHBuv3fndCoMCMGwS+QcAylrfo9CP3Uruc=";
     };
     "3.13-aarch64-linux" = getSrcFromPypi {
       platform = "manylinux_2_27_aarch64";
       dist = "cp313";
-      hash = "sha256-uaJwhdiTzFnCsoaxeJdV+Rzz6rHeobW+nmMvTJc5og4=";
+      hash = "sha256-dHnmfZ2Y1KD1JflPi4GIDcwFhjH23hGLkd6R2xtAle0=";
     };
     "3.14-x86_64-linux" = getSrcFromPypi {
       platform = "manylinux_2_27_x86_64";
       dist = "cp314";
-      hash = "sha256-U1F0LA/LIdqeCUoZZasg/eUlhih392kYpJCxtWZk1To=";
+      hash = "sha256-96ahiBNJ3DnyRIGioBn/KUuUkJuAqIge/iHUW2pfaR0=";
     };
     "3.14-aarch64-linux" = getSrcFromPypi {
       platform = "manylinux_2_27_aarch64";
       dist = "cp314";
-      hash = "sha256-MyEmmeG7sb7V0q4Urp/3Kh7tLQkqUearzAJ4prK4KHQ=";
+      hash = "sha256-iIb8V5df7gG+FyX4mLaSkvYVtwgwrvXC+95jgzNha10=";
     };
   };
 in
diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix
index c68c1e516388..d2a0a7109cf2 100644
--- a/pkgs/development/python-modules/jax/default.nix
+++ b/pkgs/development/python-modules/jax/default.nix
@@ -6,7 +6,6 @@
   lapack,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch2,
   cudaSupport ? config.cudaSupport,
 
   # build-system
@@ -41,25 +40,18 @@ let
 in
 buildPythonPackage (finalAttrs: {
   pname = "jax";
-  version = "0.9.2";
+  version = "0.10.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "jax";
     # google/jax contains tags for jax and jaxlib. Only use jax tags!
     tag = "jax-v${finalAttrs.version}";
-    hash = "sha256-/vLCTAF46M1H0Q64RLM7+IFMofmjZmZ4IFzvm/y7zkg=";
+    hash = "sha256-/RCihrjONN/+QwyQRNEmlIa7JsCLzz+SkBe5sd+ThgU=";
   };
 
-  patches = [
-    # https://github.com/jax-ml/jax/pull/32840
-    (fetchpatch2 {
-      url = "https://github.com/Prince213/jax/commit/af5c211d49f3b99447db2252d2cc2b8e0fb54d1c.patch?full_index=1";
-      hash = "sha256-ijEd+MDe91qyYfE+aMzR5rNmTeGadin6Io8PIfJWc3o=";
-    })
-  ];
-
   build-system = [ setuptools ];
 
   # The version is automatically set to ".dev" if this variable is not set.
diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix
index ef55de72ac84..deb80c9b68ad 100644
--- a/pkgs/development/python-modules/jaxlib/bin.nix
+++ b/pkgs/development/python-modules/jaxlib/bin.nix
@@ -18,7 +18,7 @@
 }:
 
 let
-  version = "0.9.2";
+  version = "0.10.0";
   inherit (python) pythonVersion;
 
   # As of 2023-06-06, google/jax upstream is no longer publishing CPU-only wheels to their GCS bucket. Instead the
@@ -49,65 +49,65 @@ let
       "3.11-x86_64-linux" = getSrcFromPypi {
         platform = "manylinux_2_27_x86_64";
         dist = "cp311";
-        hash = "sha256-msmVtLoaru2uDWnzGZh9UV3K7NRQW2QrYxL54VQ5NR8=";
+        hash = "sha256-m+IpmTpB5bK4TyNOzBml3gLzXt2xGVzwJ71TnhYB4V0=";
       };
       "3.11-aarch64-linux" = getSrcFromPypi {
         platform = "manylinux_2_27_aarch64";
         dist = "cp311";
-        hash = "sha256-MG3lSh3nOGyAbHI+NWzjMtkj73SPinLWdP77dIEh1Nw=";
+        hash = "sha256-PblOvIWTddlV3jUEGCrdfOFzPOPTDBXg7wMWAstRpVk=";
       };
       "3.11-aarch64-darwin" = getSrcFromPypi {
         platform = "macosx_11_0_arm64";
         dist = "cp311";
-        hash = "sha256-eF8XfD63jLfceXxV7VxLYxIUGEXJpoaVfkhLrL/OXog=";
+        hash = "sha256-J3Ay6fB0w/1f/R4MsD1P5m4nLeRyZnzbxBitmbIbZGo=";
       };
 
       "3.12-x86_64-linux" = getSrcFromPypi {
         platform = "manylinux_2_27_x86_64";
         dist = "cp312";
-        hash = "sha256-iLJ2px9PIHGx/S6SKr/WfIfGl3pVGhA2/rzqeNXvfiI=";
+        hash = "sha256-sL+4ZaB98ubXQYwLDCkt0pS1UAUjsd1YcrGA2yqkgNQ=";
       };
       "3.12-aarch64-linux" = getSrcFromPypi {
         platform = "manylinux_2_27_aarch64";
         dist = "cp312";
-        hash = "sha256-/vAthGhjtybnJFKZOIOoWW6sMl8ioux+qSHaD7xVCbQ=";
+        hash = "sha256-qh1w8aTifrQDZU5x4vso1XhtPpt3/BhH6MU4mICSfKQ=";
       };
       "3.12-aarch64-darwin" = getSrcFromPypi {
         platform = "macosx_11_0_arm64";
         dist = "cp312";
-        hash = "sha256-l8L75Yy+5KJ9lMpzXXCdIxspmrbtizsQdfUthk39MsE=";
+        hash = "sha256-fB2bRjMnx6IzPyEBFOywTyj+/FG6gjOoWiKAzOdb20I=";
       };
 
       "3.13-x86_64-linux" = getSrcFromPypi {
         platform = "manylinux_2_27_x86_64";
         dist = "cp313";
-        hash = "sha256-ttUAPjrdXDRqNK6e3EcFjLwttgyO1cUAllIhdtrwHJ8=";
+        hash = "sha256-0wPcMbZei3k9VgD4GxWDvgPcm4dqTBCz4lm2YJocvjs=";
       };
       "3.13-aarch64-linux" = getSrcFromPypi {
         platform = "manylinux_2_27_aarch64";
         dist = "cp313";
-        hash = "sha256-vvYe7zbtOM7BBp6pc/iK+eAzNeiE9lAew/5/YiKhVVs=";
+        hash = "sha256-bY14twcLNOTFu6X34Qkn5/Sqybab4X6bCliYVTpDOPM=";
       };
       "3.13-aarch64-darwin" = getSrcFromPypi {
         platform = "macosx_11_0_arm64";
         dist = "cp313";
-        hash = "sha256-UqADJQj4z1eRx6e+4UJTHucGw8BVGBF/sLbujV4X/ec=";
+        hash = "sha256-OEY1//VYmaKVu8gu5sb3c6MA54fcRyypK755q/qsg2k=";
       };
 
       "3.14-x86_64-linux" = getSrcFromPypi {
         platform = "manylinux_2_27_x86_64";
         dist = "cp314";
-        hash = "sha256-PXFRFApJNvMhiy0bE0PdI3vShlz1FEKIS22C/ohKPec=";
+        hash = "sha256-KkLPBMD4i8A7FQoX+n3bsvQOCWZn7IobhA7YeRPm5zU=";
       };
       "3.14-aarch64-linux" = getSrcFromPypi {
         platform = "manylinux_2_27_aarch64";
         dist = "cp314";
-        hash = "sha256-vkYnxC1Erdf+F9KE71ef+NFZ48tpR/ZDd1jzQXfoeOY=";
+        hash = "sha256-rUfgckMJeewhY3qkh9TcRkAouOm+JyaPN95pU2x240E=";
       };
       "3.14-aarch64-darwin" = getSrcFromPypi {
         platform = "macosx_11_0_arm64";
         dist = "cp314";
-        hash = "sha256-urFo0lVVRkRhvQdzI0hPaQxHHmnOiww5o5+4Gz46i/A=";
+        hash = "sha256-mLJmcpQ2cnQoc/ZbwDIWgZ/FUyXJnxRlkNAHwBcr/zA=";
       };
     };
 in
@@ -116,6 +116,8 @@ buildPythonPackage {
   inherit version;
   format = "wheel";
 
+  __structuredAttrs = true;
+
   # See https://discourse.nixos.org/t/ofborg-does-not-respect-meta-platforms/27019/6.
   src = (
     srcs."${pythonVersion}-${stdenv.hostPlatform.system}"

From a85c981e8af00c065722988403224b7c5e0e3b0f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 19 Apr 2026 21:59:15 +0000
Subject: [PATCH 10/71] python3Packages.chex: cleanup

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

diff --git a/pkgs/development/python-modules/chex/default.nix b/pkgs/development/python-modules/chex/default.nix
index dde855d7415c..739fa4bcdc5b 100644
--- a/pkgs/development/python-modules/chex/default.nix
+++ b/pkgs/development/python-modules/chex/default.nix
@@ -20,15 +20,16 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "chex";
   version = "0.1.91";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "deepmind";
     repo = "chex";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-lJ9+kvG7dRtfDVgvkcJ9/jtnX0lMfxY4mmZ290y/74U=";
   };
 
@@ -36,9 +37,6 @@ buildPythonPackage rec {
     flit-core
   ];
 
-  pythonRelaxDeps = [
-    "typing_extensions"
-  ];
   dependencies = [
     absl-py
     jax
@@ -69,8 +67,8 @@ buildPythonPackage rec {
   meta = {
     description = "Library of utilities for helping to write reliable JAX code";
     homepage = "https://github.com/deepmind/chex";
-    changelog = "https://github.com/google-deepmind/chex/releases/tag/v${version}";
+    changelog = "https://github.com/google-deepmind/chex/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ ndl ];
   };
-}
+})

From 25f652d97518adf3fe4c265c5b4a5639736288cd Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 19 Apr 2026 22:00:23 +0000
Subject: [PATCH 11/71] python3Packages.chex: fix jax 0.10.0 compatibility

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

diff --git a/pkgs/development/python-modules/chex/default.nix b/pkgs/development/python-modules/chex/default.nix
index 739fa4bcdc5b..ed93783889d6 100644
--- a/pkgs/development/python-modules/chex/default.nix
+++ b/pkgs/development/python-modules/chex/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
 
   # build-system
   flit-core,
@@ -33,6 +34,18 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-lJ9+kvG7dRtfDVgvkcJ9/jtnX0lMfxY4mmZ290y/74U=";
   };
 
+  patches = [
+    # jax.device_put_replicated is removed in jax 0.10.0
+    # This fix was merged upstream -> remove when updating to the next release
+    (fetchpatch {
+      url = "https://github.com/google-deepmind/chex/commit/5fbd2c9a9936799daf92354e0307b9e88b9cc163.patch";
+      excludes = [
+        "chex/_src/variants.py"
+      ];
+      hash = "sha256-ZTimSq7/yt2UEiWmLcfFBadX8+VcaxuPhkQJEyiEZlE=";
+    })
+  ];
+
   build-system = [
     flit-core
   ];

From 0d698af98c9553b9fbee6547f340b637ea8e9f55 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 20 Apr 2026 16:24:42 +0000
Subject: [PATCH 12/71] python3Packages.equinox: 0.13.6 -> 0.13.7

Diff: https://github.com/patrick-kidger/equinox/compare/v0.13.6...v0.13.7

Changelog: https://github.com/patrick-kidger/equinox/releases/tag/v0.13.7
---
 .../python-modules/equinox/default.nix        | 24 +++----------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/equinox/default.nix b/pkgs/development/python-modules/equinox/default.nix
index 841e4f2858ab..4cfb141ecdb0 100644
--- a/pkgs/development/python-modules/equinox/default.nix
+++ b/pkgs/development/python-modules/equinox/default.nix
@@ -21,14 +21,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "equinox";
-  version = "0.13.6";
+  version = "0.13.7";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "patrick-kidger";
     repo = "equinox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OETWXAcCp945mMrpC8U4gSBvEeQX8RoUGZR4irBs7Ak=";
+    hash = "sha256-vgmU8cqNCyiZYah1SSwzVtLS+YB2T1uooCC17k12+h8=";
   };
 
   # Relax speed constraints on tests that can fail on busy builders
@@ -56,25 +57,6 @@ buildPythonPackage (finalAttrs: {
     pytestCheckHook
   ];
 
-  pytestFlags = [
-    # DeprecationWarning: The default axis_types will change in JAX v0.9.0 to jax.sharding.AxisType.Explicit.
-    "-Wignore::DeprecationWarning"
-  ];
-
-  disabledTestPaths = [
-    # ValueError: not enough values to unpack (expected 2, got 0)
-    "tests/test_finalise_jaxpr.py"
-  ];
-
-  disabledTests = [
-    # Failed: DID NOT WARN. No warnings of type (<class 'Warning'>,) were emitted.
-    # Reported upstream: https://github.com/patrick-kidger/equinox/issues/1186
-    "test_jax_transform_warn"
-
-    # Flaky: AssertionError: Non-linear scaling detected
-    "test_speed_buffer_while"
-  ];
-
   pythonImportsCheck = [ "equinox" ];
 
   meta = {

From d1c8f9b6739fd1a7cf512646e07331e45a6d74d6 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 20 Apr 2026 17:41:25 +0000
Subject: [PATCH 13/71] python3Packages.distrax: enable __structuredAttrs

Diff: https://github.com/google-deepmind/distrax/compare/v0.1.7...v0.1.8

Changelog:
https://github.com/google-deepmind/distrax/releases/tag/v0.1.8
---
 pkgs/development/python-modules/distrax/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/distrax/default.nix b/pkgs/development/python-modules/distrax/default.nix
index b438f69eebec..8f6cf0d383cb 100644
--- a/pkgs/development/python-modules/distrax/default.nix
+++ b/pkgs/development/python-modules/distrax/default.nix
@@ -24,6 +24,7 @@ buildPythonPackage (finalAttrs: {
   pname = "distrax";
   version = "0.1.8";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "google-deepmind";

From eea397c5920f2e4228b88e5d86ae689a351f3ef0 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 22 Apr 2026 08:45:52 +0000
Subject: [PATCH 14/71] python3Packages.flax: 0.12.6 -> 0.12.7

Diff: https://github.com/google/flax/compare/v0.12.6...v0.12.7

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

diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix
index 119b841cde81..89f24260f486 100644
--- a/pkgs/development/python-modules/flax/default.nix
+++ b/pkgs/development/python-modules/flax/default.nix
@@ -13,7 +13,6 @@
   numpy,
   optax,
   orbax-checkpoint,
-  orbax-export,
   pyyaml,
   rich,
   tensorstore,
@@ -36,14 +35,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "flax";
-  version = "0.12.6";
+  version = "0.12.7";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "flax";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rIDfF9W8cxF0njH4e4uhqURQ0C4N8Boe76u6meMgC34=";
+    hash = "sha256-a78KiTsCCARWZvbxz9QKdUKnjkDJGXcPVVJu5rU4m/U=";
   };
 
   build-system = [
@@ -58,7 +58,6 @@ buildPythonPackage (finalAttrs: {
     numpy
     optax
     orbax-checkpoint
-    orbax-export
     pyyaml
     rich
     tensorstore
@@ -78,11 +77,6 @@ buildPythonPackage (finalAttrs: {
     tensorflow
   ];
 
-  pytestFlags = [
-    # FutureWarning: In the future `np.object` will be defined as the corresponding NumPy scalar.
-    "-Wignore::FutureWarning"
-  ];
-
   disabledTestPaths = [
     # Docs test, needs extra deps + we're not interested in it.
     "docs/_ext/codediff_test.py"

From 1aa137ea39a2bbf5da14cc68a9ec96ca3b2251af Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 20 Apr 2026 19:30:53 +0000
Subject: [PATCH 15/71] python3Packages.brax: fix jax 0.10.0 compatibility

---
 .../python-modules/brax/default.nix           | 15 ++++
 ...ont-use-device_put_replicated-compat.patch | 68 +++++++++++++++++++
 2 files changed, 83 insertions(+)
 create mode 100644 pkgs/development/python-modules/brax/dont-use-device_put_replicated-compat.patch

diff --git a/pkgs/development/python-modules/brax/default.nix b/pkgs/development/python-modules/brax/default.nix
index e2609c149536..d74a839c505a 100644
--- a/pkgs/development/python-modules/brax/default.nix
+++ b/pkgs/development/python-modules/brax/default.nix
@@ -40,6 +40,7 @@ buildPythonPackage (finalAttrs: {
   pname = "brax";
   version = "0.14.2";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "google";
@@ -48,6 +49,20 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-/oznBa44xKl+9T1YrTVhCbuKZj16V1BTlnmCGRbF45g=";
   };
 
+  patches = [
+    # AttributeError: jax.device_put_replicated is deprecated; use jax.device_put instead.
+    # See https://docs.jax.dev/en/latest/migrate_pmap.html#drop-in-replacements for a drop-in replacement.
+    ./dont-use-device_put_replicated-compat.patch
+  ];
+
+  # TypeError: clip() got an unexpected keyword argument 'a_min'
+  postPatch = ''
+    substituteInPlace brax/fluid.py \
+      --replace-fail \
+        "box = 6.0 * jp.clip(jp.sum(diag_inertia_v, axis=-1), a_min=1e-12)" \
+        "box = 6.0 * jp.clip(jp.sum(diag_inertia_v, axis=-1), min=1e-12)"
+  '';
+
   build-system = [
     hatchling
   ];
diff --git a/pkgs/development/python-modules/brax/dont-use-device_put_replicated-compat.patch b/pkgs/development/python-modules/brax/dont-use-device_put_replicated-compat.patch
new file mode 100644
index 000000000000..261aa5907a60
--- /dev/null
+++ b/pkgs/development/python-modules/brax/dont-use-device_put_replicated-compat.patch
@@ -0,0 +1,68 @@
+diff --git a/brax/training/agents/apg/train.py b/brax/training/agents/apg/train.py
+index f5fcb0e..87b198f 100644
+--- a/brax/training/agents/apg/train.py
++++ b/brax/training/agents/apg/train.py
+@@ -310,7 +310,7 @@ def train(
+           specs.Array((env.observation_size,), jnp.dtype(dtype))
+       ),
+   )
+-  training_state = jax.device_put_replicated(
++  training_state = pmap.device_put_replicated(
+       training_state, jax.local_devices()[:local_devices_to_use]
+   )
+ 
+diff --git a/brax/training/agents/ppo/train.py b/brax/training/agents/ppo/train.py
+index 9aec960..6624733 100644
+--- a/brax/training/agents/ppo/train.py
++++ b/brax/training/agents/ppo/train.py
+@@ -753,7 +753,7 @@ def train(
+         {},
+     )
+ 
+-  training_state = jax.device_put_replicated(
++  training_state = pmap.device_put_replicated(
+       training_state, jax.local_devices()[:local_devices_to_use]
+   )
+ 
+diff --git a/brax/training/agents/sac/train.py b/brax/training/agents/sac/train.py
+index be716e9..8dcf3bf 100644
+--- a/brax/training/agents/sac/train.py
++++ b/brax/training/agents/sac/train.py
+@@ -108,7 +108,7 @@ def _init_training_state(
+       alpha_params=log_alpha,
+       normalizer_params=normalizer_params,
+   )
+-  return jax.device_put_replicated(
++  return pmap.device_put_replicated(
+       training_state, jax.local_devices()[:local_devices_to_use]
+   )
+ 
+diff --git a/brax/training/pmap.py b/brax/training/pmap.py
+index 82760fc..af62ef8 100644
+--- a/brax/training/pmap.py
++++ b/brax/training/pmap.py
+@@ -19,12 +19,23 @@ from typing import Any
+ 
+ import jax
+ import jax.numpy as jnp
++from jax.sharding import Mesh, NamedSharding, PartitionSpec as P
++import numpy as np
++
++
++def device_put_replicated(x, devices):
++  """Drop-in replacement for jax.device_put_replicated supporting pytrees."""
++  mesh = Mesh(np.array(devices), ('x',))
++  sharding = NamedSharding(mesh, P('x'))
++  return jax.tree.map(
++      lambda y: jax.device_put(jnp.stack([y] * len(devices)), sharding), x
++  )
+ 
+ 
+ def bcast_local_devices(value, local_devices_to_use=1):
+   """Broadcasts an object to all local devices."""
+   devices = jax.local_devices()[:local_devices_to_use]
+-  return jax.device_put_replicated(value, devices)
++  return device_put_replicated(value, devices)
+ 
+ 
+ def synchronize_hosts():

From bf948e86c2115343ea9806e86335973c4e444c80 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 20 Apr 2026 19:39:13 +0000
Subject: [PATCH 16/71] python3Packages.rlax: fix jax 0.10.0 compatibility

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

diff --git a/pkgs/development/python-modules/rlax/default.nix b/pkgs/development/python-modules/rlax/default.nix
index 8e106b949c65..45f634ca431f 100644
--- a/pkgs/development/python-modules/rlax/default.nix
+++ b/pkgs/development/python-modules/rlax/default.nix
@@ -22,18 +22,25 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "rlax";
   version = "0.1.8";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "google-deepmind";
     repo = "rlax";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-E/zYFd5bfx58FfA3uR7hzRAIs844QzJA8TZTwmwDByk=";
   };
 
+  # TypeError: clip() got an unexpected keyword argument 'a_min'
+  postPatch = ''
+    substituteInPlace rlax/_src/mpo_ops.py \
+      --replace-fail "a_min=" "min="
+  '';
+
   build-system = [
     flit-core
   ];
@@ -82,8 +89,8 @@ buildPythonPackage rec {
   meta = {
     description = "Library of reinforcement learning building blocks in JAX";
     homepage = "https://github.com/deepmind/rlax";
-    changelog = "https://github.com/google-deepmind/rlax/releases/tag/${src.tag}";
+    changelog = "https://github.com/google-deepmind/rlax/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ onny ];
   };
-}
+})

From 5f5f0d6211b108439ce3bb6f43f23abb14c128da Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 20 Apr 2026 21:45:30 +0000
Subject: [PATCH 17/71] python3Packages.numpyro: fix jax 0.10.0 compatibility

---
 .../python-modules/numpyro/default.nix        |  5 +++++
 .../numpyro/fix-jax-0.10.0-compat.patch       | 20 +++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/python-modules/numpyro/fix-jax-0.10.0-compat.patch

diff --git a/pkgs/development/python-modules/numpyro/default.nix b/pkgs/development/python-modules/numpyro/default.nix
index b25f958cc9b9..2e114b7b5e06 100644
--- a/pkgs/development/python-modules/numpyro/default.nix
+++ b/pkgs/development/python-modules/numpyro/default.nix
@@ -40,6 +40,11 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-sNqllL9nBwXp0kn+HAjvIaHf7LR0UKh9q7DZ20yCr5A=";
   };
 
+  patches = [
+    # Remove usage of xla_pmap_p which was removed in jax 0.10.0
+    ./fix-jax-0.10.0-compat.patch
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/numpyro/fix-jax-0.10.0-compat.patch b/pkgs/development/python-modules/numpyro/fix-jax-0.10.0-compat.patch
new file mode 100644
index 000000000000..ad9e937a1e06
--- /dev/null
+++ b/pkgs/development/python-modules/numpyro/fix-jax-0.10.0-compat.patch
@@ -0,0 +1,20 @@
+diff --git a/numpyro/ops/provenance.py b/numpyro/ops/provenance.py
+index 1234567..abcdefg 100644
+--- a/numpyro/ops/provenance.py
++++ b/numpyro/ops/provenance.py
+@@ -4,7 +4,7 @@
+ import jax
+ from jax.api_util import debug_info, flatten_fun, shaped_abstractify
+ from jax.extend.core import Literal
+-from jax.extend.core.primitives import call_p, closed_call_p, jit_p, xla_pmap_p
++from jax.extend.core.primitives import call_p, closed_call_p, jit_p
+ import jax.extend.linear_util as lu
+ from jax.interpreters.partial_eval import trace_to_jaxpr_dynamic
+
+@@ -114,7 +114,6 @@ def track_deps_call_rule(eqn, provenance_inputs):
+
+ track_deps_rules[call_p] = track_deps_call_rule
+-track_deps_rules[xla_pmap_p] = track_deps_call_rule
+
+
+ def track_deps_closed_call_rule(eqn, provenance_inputs):

From 05f96ae10672e9f511e8f61ff1779f7568128139 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 21 Apr 2026 07:32:27 +0000
Subject: [PATCH 18/71] python3Packages.clu: fix jax 0.10.0 compatibility

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

diff --git a/pkgs/development/python-modules/clu/default.nix b/pkgs/development/python-modules/clu/default.nix
index 9f6f4f966517..5818e92219e3 100644
--- a/pkgs/development/python-modules/clu/default.nix
+++ b/pkgs/development/python-modules/clu/default.nix
@@ -31,6 +31,7 @@ buildPythonPackage (finalAttrs: {
   pname = "clu";
   version = "0.0.12";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "google";
@@ -39,6 +40,15 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-ntqRz3fCXMf0EDQsddT68Mdi105ECBVQpVsStzk2kvQ=";
   };
 
+  # Fix Jax 0.10.0 compatibility
+  # TypeError: clip() got an unexpected keyword argument 'a_min'
+  postPatch = ''
+    substituteInPlace clu/metrics.py \
+      --replace-fail \
+        "variance = jnp.clip(variance, a_min=0.0)" \
+        "variance = jnp.clip(variance, min=0.0)"
+  '';
+
   build-system = [
     setuptools
   ];

From 14e819b83b99152b473902f34ba788f98fded4ec Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 21 Apr 2026 07:48:53 +0000
Subject: [PATCH 19/71] python3Packages.skrl: fix jax 0.10.0 compatibility

---
 .../development/python-modules/skrl/default.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/development/python-modules/skrl/default.nix b/pkgs/development/python-modules/skrl/default.nix
index 0b37d4d0261b..2990385ef1ab 100644
--- a/pkgs/development/python-modules/skrl/default.nix
+++ b/pkgs/development/python-modules/skrl/default.nix
@@ -37,6 +37,23 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-5lkoYAmMIWqK3+E3WxXMWS9zal2DhZkfl30EkrHKpdI=";
   };
 
+  # Fix Jax 0.10.0 compatibility
+  # TypeError: clip() got an unexpected keyword argument 'a_min'
+  postPatch = ''
+    substituteInPlace skrl/models/jax/gaussian.py \
+      --replace-fail \
+        "jnp.clip(log_std, a_min=log_std_min, a_max=log_std_max)" \
+        "jnp.clip(log_std, min=log_std_min, max=log_std_max)" \
+      --replace-fail \
+        "jnp.clip(actions, a_min=clip_actions_min, a_max=clip_actions_max)" \
+        "jnp.clip(actions, min=clip_actions_min, max=clip_actions_max)"
+
+    substituteInPlace skrl/models/jax/deterministic.py \
+      --replace-fail \
+        "jnp.clip(actions, a_min=self._d_clip_actions_min, a_max=self._d_clip_actions_max)" \
+        "jnp.clip(actions, min=self._d_clip_actions_min, max=self._d_clip_actions_max)"
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [

From 3d6866c34c8c27ae1055a74c67d6d0a248b878b7 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 23 Apr 2026 22:56:28 +0000
Subject: [PATCH 20/71] python3Packages.funsor: fix jax 0.10.0 compatibility

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

diff --git a/pkgs/development/python-modules/funsor/default.nix b/pkgs/development/python-modules/funsor/default.nix
index b82ca7614486..96c7dcd3a62e 100644
--- a/pkgs/development/python-modules/funsor/default.nix
+++ b/pkgs/development/python-modules/funsor/default.nix
@@ -49,6 +49,13 @@ buildPythonPackage rec {
     })
   ];
 
+  # TypeError: clip() got an unexpected keyword argument 'a_max'
+  postPatch = ''
+    substituteInPlace funsor/jax/ops.py \
+      --replace-fail "a_max=" "max=" \
+      --replace-fail "a_min=" "min="
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [

From bd7c7e5189c03d1fb0f215e66b47c6eacdf94b77 Mon Sep 17 00:00:00 2001
From: r4v3n6101 <raven6107@gmail.com>
Date: Fri, 24 Apr 2026 03:59:41 +0300
Subject: [PATCH 21/71] nix-index-unwrapped: 0.1.9-unstable-2026-02-05 ->
 0.1.9-unstable-2026-04-20

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

diff --git a/pkgs/by-name/ni/nix-index-unwrapped/package.nix b/pkgs/by-name/ni/nix-index-unwrapped/package.nix
index 3c952f49dc2f..7ae10d730c82 100644
--- a/pkgs/by-name/ni/nix-index-unwrapped/package.nix
+++ b/pkgs/by-name/ni/nix-index-unwrapped/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nix-index";
-  version = "0.1.9-unstable-2026-02-05";
+  version = "0.1.9-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-index";
-    rev = "8c84f67a33c4c26ec12f166cb5f63a77fafebe21";
-    hash = "sha256-8ZMKtBbsBPbccEWH1XHCYsxXX4hckHXwQNr5OzGrU0Q=";
+    rev = "0f68b51886bde4014629e43d9be4b66cff450990";
+    hash = "sha256-polUDx4tWFmyxsn83XRrw9YQlDq/ggNY1hq6xw9NOoQ=";
   };
 
-  cargoHash = "sha256-0yrTPrxN/4TOALqpQ5GW7LXKisc8msx3DvEpg8uO+IQ=";
+  cargoHash = "sha256-2Ar7mj9r5eKdbXDC4+jSWG7HvGFTeowEPt2SBM6a6e4=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [

From fa8fdd65b43f3029a92972fcb3fa34744b6fa23b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Apr 2026 10:15:05 +0000
Subject: [PATCH 22/71] phel: 0.32.0 -> 0.34.1

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

diff --git a/pkgs/by-name/ph/phel/package.nix b/pkgs/by-name/ph/phel/package.nix
index 55cfb27604ff..456460f1c94d 100644
--- a/pkgs/by-name/ph/phel/package.nix
+++ b/pkgs/by-name/ph/phel/package.nix
@@ -7,16 +7,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "phel";
-  version = "0.32.0";
+  version = "0.34.1";
 
   src = fetchFromGitHub {
     owner = "phel-lang";
     repo = "phel-lang";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-h+YNS9CWSAlP2K2RV9BVMko6iYC/aJUiD6YexCrRHNI=";
+    hash = "sha256-xopkED6wnbLm3O/ZpuewwHEHWzugO5eght3o/w3vQVE=";
   };
 
-  vendorHash = "sha256-efobguWNFK6cC17WYtmXyTu3MGFQnT0Y69E8CZ3++fA=";
+  vendorHash = "sha256-WrevFD9DErVPw6RyKMyTJMCG9j9BNnuAYEYPji0JjZU=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From 4cafd52abf0cfce86653737862a0de80909cc600 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 24 Apr 2026 14:22:12 +0200
Subject: [PATCH 23/71] grafana: 12.4.2 -> 13.0.1

Announcement: https://grafana.com/docs/grafana/latest/whatsnew/whats-new-in-v13-0/

ChangeLogs:
* https://github.com/grafana/grafana/releases/tag/v13.0.0
  (https://github.com/grafana/grafana/blob/b8475db9a78b2cae5ffa20ecbbca29d1ffdc24a3/CHANGELOG.md#1300-2026-04-14)
* https://github.com/grafana/grafana/releases/tag/v13.0.1
---
 nixos/modules/services/monitoring/grafana.nix |   2 +-
 pkgs/by-name/gr/grafana/missing-hashes.json   | 115 +++++++++---------
 pkgs/by-name/gr/grafana/package.nix           |  10 +-
 3 files changed, 61 insertions(+), 66 deletions(-)

diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index 0d6c7eb055d4..40eca66a2afb 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -2091,7 +2091,7 @@ in
         set -o errexit -o pipefail -o nounset -o errtrace
         shopt -s inherit_errexit
 
-        exec ${cfg.package}/bin/grafana server -homepath ${cfg.dataDir} -config ${configFile}
+        exec ${lib.getExe cfg.package} server -homepath ${cfg.dataDir} -config ${configFile}
       '';
       serviceConfig = {
         WorkingDirectory = cfg.dataDir;
diff --git a/pkgs/by-name/gr/grafana/missing-hashes.json b/pkgs/by-name/gr/grafana/missing-hashes.json
index a08c50062bc6..9107957eb5a9 100644
--- a/pkgs/by-name/gr/grafana/missing-hashes.json
+++ b/pkgs/by-name/gr/grafana/missing-hashes.json
@@ -51,26 +51,16 @@
   "@esbuild/win32-ia32@npm:0.27.2": "96e8c1fa0ec2b5529ead2ba703e5da7644c138b2f9b6e285c05513f0455e99b2b0dcf399f01779fb384e22810e82f892491e44402772c62d3fe094b025bbdc0f",
   "@esbuild/win32-x64@npm:0.25.8": "4bf57733c5c4c1409cfceaf19bf5b8ce3c9b9a29705bc8a24fc72652846afd0bd478b14a17db326ae27896574ee346ffb96b2fa043f0716d1a7f30b89f8b3855",
   "@esbuild/win32-x64@npm:0.27.2": "1ed08bebd916c16003f3784276ae683ab41d34951a0c272f6e072b8067a2b4bacd6f6f75a8dcea375b8545e15891d305425cf7c8dd31f7deab56ef22cde4a1e2",
-  "@nx/nx-darwin-arm64@npm:21.3.11": "b02f760415cfe1b4803d6aac8fb25dbe7e94c120b2d2d1313561fca92cee8519f826e4cec481268c7c574de892daa38353f1c7812e254239b5385f5d9d2315ff",
-  "@nx/nx-darwin-arm64@npm:22.3.3": "1f252a2295761b0e4731b99982450ce2c67b8e350e6e45690e134ae8d0b58666a8998a8559f4167462b314310446dba15a656bc98463490c42cd4f229c202490",
-  "@nx/nx-darwin-x64@npm:21.3.11": "f6f39817f7e409ff4234002a8bac75b8be58d366554c641a12da3d6311fb0270c9915dd29a35edb29e10834693fb2744242f524c87067f1d28ec757259803643",
-  "@nx/nx-darwin-x64@npm:22.3.3": "3ed451614243d0ff851cff9d4ba68cb3ec3525e0d8f2082238934b8405f5883897a98c162543c79988ed71edf73d9373a58fbb7f069e5dc0a13e20be075dcf0e",
-  "@nx/nx-freebsd-x64@npm:21.3.11": "07a997916a58ea581593cec985144beb801e508a15b924ca92d44d73508a7dc7104065a78cd058a606817856f66b47a53e08add8e68733ce9b86c07ab3484083",
-  "@nx/nx-freebsd-x64@npm:22.3.3": "637fd184ef86bcda7a9cf76fc85ae899b21659e194f84798aab6259f348020a21debcb0f87f799e71e4a147f1712ae15e436fcd75056c8f2ee6c33a49870f5cc",
-  "@nx/nx-linux-arm-gnueabihf@npm:21.3.11": "f0549860c4399bf589bd8e769889622f6ee2e3372c26173f45ff44ea46a832abd46ca8c53fa7d1b6287cc3d8e7d6ea78cf6bb5172d4ea92724f4b770d5aa3c6e",
-  "@nx/nx-linux-arm-gnueabihf@npm:22.3.3": "439e66be856b127a7921c9e60bcbb1ffb7024229f3ebc4df4f4749f361d52f80cb7dc91d96c63c2d6f48494418b9342142622dad5aa738fc8038ea1fa138cfd2",
-  "@nx/nx-linux-arm64-gnu@npm:21.3.11": "784cdb07b35a52110b7cfc8462292b497b87b3eaf7fecedb7f66d9da05ff9feb31d384c06950bc3c5c602fd35d637671404dcd2b1ca9ed2e76e6f52c0ff1b644",
-  "@nx/nx-linux-arm64-gnu@npm:22.3.3": "cd4a762eca51574254f61bdbd25438b692e96ab358bb2b68ea70338ed6d7d845691946e8f9c96f12e07730657bc5c4ef8f9ff9baf1e476fb8eeaef3a9fd64a48",
-  "@nx/nx-linux-arm64-musl@npm:21.3.11": "2e0af30c3a4cc91f79a1febd7cb2d1b3f082d4870207ad3790b35b2c0959ebdfac51c4104cbceba7b24d31589b57689b39fb73b9b8c114bbbb07145591cb27e6",
-  "@nx/nx-linux-arm64-musl@npm:22.3.3": "63f96bb2fc0c4886c13d949f945e18cafe03c612e364712103a3242cd9887c84cbf0ae54bbe5fce30cfa55ce083dc96436bccd0dac16d8d5a2f2e4b509da8aca",
-  "@nx/nx-linux-x64-gnu@npm:21.3.11": "ff67dffc04fa63f3df7913b2acb44536798652f999b9959e2bd553ec38dec0060d4f7e29f6a162cd21498e912a968d62ffab35ddea796c96e13a363174ce8ec4",
-  "@nx/nx-linux-x64-gnu@npm:22.3.3": "26b1ba111409c239bf4ef3cb3543e79898518fb780f94ad6f49bc04206735fa21e9d330df38b21e0879efb5af83ccf4953f781d8024c88482f157d1849f9055b",
-  "@nx/nx-linux-x64-musl@npm:21.3.11": "d1dc84080c92793ee1acfdbaeb63e5531ad5a79f5a0e5c3519530bebdadbe447c469e53463bf774199f6d1fe2c7bc4a674f6b952be81b09051d0ebda4b6f51ed",
-  "@nx/nx-linux-x64-musl@npm:22.3.3": "3c921a75e283a0c48a108a9d6523d0225955217a4eb412e03de71873fb1e0f7d35479bb16dfcd53093b5165bd345635ce8645e881fc66424b5cda44507d53bcc",
-  "@nx/nx-win32-arm64-msvc@npm:21.3.11": "62a7c4c02812f821a615f20164190f50330b18415fd68d80b1b5b15458ef16a9a0a0d14ce1a96326f1e4e9dbd317f1da8bee995e85c8aea43ab1b83c98f9699c",
-  "@nx/nx-win32-arm64-msvc@npm:22.3.3": "e2b06c38ac3cc8bcfa7187520c523c2d9c0b433c11df84751ada390b11e117a6d5fc32f47c38cb2d18156ad463eff4b904216e92ee23c202eaac142e334041bb",
-  "@nx/nx-win32-x64-msvc@npm:21.3.11": "c653c2b4fb8679986afac7443fc557264c9dd4cc22ee5db8f5c0e8d6516d5f4b3cc872a9a7276c1681248877dc46637970aa40e4d2e1fef0451d4c88c9c7b27e",
-  "@nx/nx-win32-x64-msvc@npm:22.3.3": "f08a7ce3bf06e0eece6916798f5b4cef26f4be035f395f6cb930a2f5d072e3ad307f8a7cfb1738255283d6c9a1b60bdfafb36040b9d69f952ec5d22bc6cf4cde",
+  "@nx/nx-darwin-arm64@npm:22.5.4": "003e36b1b5c7e97cb253133a6a978d59edd2d75d4d57202169647ed8efaa052ea6b8025d79aefd6eec119b18423a3d6fef96c70e73a33a9a53134a64d25a3a4d",
+  "@nx/nx-darwin-x64@npm:22.5.4": "e23cd9122715c8089393ead47a0ecd0948437c10fa4cb335fae237cbd984a7e464089bd2adb27837684eddfe0e5b0c469a069a8054d379b552b3e22d2799cb9e",
+  "@nx/nx-freebsd-x64@npm:22.5.4": "1158a781e28cf886e131248ac1a70581578e51788eac92fd972938d21712085aed97116887bb687c7493548f8baba833f7baaefe9a96ec58515b9c5f2511ac14",
+  "@nx/nx-linux-arm-gnueabihf@npm:22.5.4": "947bb1a2fde49c32005b86bc8ed435db5b3a7de481da3a9769c91be9d7046908a1552ee12548138134a64ef36d7b1d37618fef3c01951532527356eae9ba7765",
+  "@nx/nx-linux-arm64-gnu@npm:22.5.4": "1873a9f9ddf02615d65ed985ecf25ad40fae0e0abffcf00ad4275f0d87bf52283c8029d7890782f436e76086065cf7ecd56d5198e90b0220e81b8dba2aad9c11",
+  "@nx/nx-linux-arm64-musl@npm:22.5.4": "bb9a637a2932d2457d8c4e8c268cef8ce0bdb63268dd444576b210e6084cc17b01d93d45e1900d741e2ca4b1af64becde5d27b1b0f365af83f8f999460ca874f",
+  "@nx/nx-linux-x64-gnu@npm:22.5.4": "3a880c441e6a057cb0e0db4141d87a1102d9995f4b81cc4eda9f9ef14c2c470dd726c689775a98741929b84dccf2efd6a64e0fac8e4aadc0b3711fad32ed92a5",
+  "@nx/nx-linux-x64-musl@npm:22.5.4": "f2be6705e8203c0db17e5fc900f609de160052617075344429d5fa6da3a0f13a90ac654e90124df6100d7b2cde62acb84d9981d791eb8c494098896c19762274",
+  "@nx/nx-win32-arm64-msvc@npm:22.5.4": "dbef169673a327f5764992da802e4adb4252d35ae8d708bef87b6f321cfb989165d2be80d35021278cbcd4243159cdd149be09519d8f694e9775bc6cbf46297d",
+  "@nx/nx-win32-x64-msvc@npm:22.5.4": "8071d2641f0959957503e353fb6fa4357910fcc3eef403fab8400d8363dbbf959d8f0c225475516e903fc32cdd5389fee7c36e784d164620cb67632ccc944797",
   "@parcel/watcher-android-arm64@npm:2.4.1": "279ac643abaccb2f9c986f35e39478e242b33bdda3128ca9e728ca1429b923d5f1bdc22268946138b0ced130ac3b2294cf2a44ff080b27c06a79062a5bbba13c",
   "@parcel/watcher-darwin-arm64@npm:2.4.1": "312fd03aaf7e75824fb84b6b99649caa4db01d55320320d88fb75ad5151bd24876555ae19fe8fdf81f92952bcf01e0a82db7c3bf540e54cee5beb20b85a6a80c",
   "@parcel/watcher-darwin-x64@npm:2.4.1": "47d8fd40e17e419459294b75c455ac7ce2a53dfcc578f2c2ab0fb0f59ad1ee6a6e87b6ecb92708139f48ed8568ffdd675fe5e57ed1468abac6a2a650fe490926",
@@ -83,54 +73,59 @@
   "@parcel/watcher-win32-arm64@npm:2.4.1": "a1395a97d1373dd7075da7234af8996302e45cb9d2507633a0f8188c239e8121e63842dded6fc13613986e0833c88435a8750b3c6b35d86b9e1af2b97430b940",
   "@parcel/watcher-win32-ia32@npm:2.4.1": "05a294e24923a02febe852154d8f8dd75fdeb53db8522c3bc87860523f1dc70d41a7507318b3ac93a24feda44526720dba2f1a7e0e20de7ca815c7dd175e3c11",
   "@parcel/watcher-win32-x64@npm:2.4.1": "28dc8dc547c4ef8b24193356bab99c4e5aafb2c8097e2d06b875c2ce4d767a9034ff82fbfac34a86fd331f8daea91a3aeee5c179ed69120c02e035f72dd44877",
-  "@rollup/rollup-android-arm-eabi@npm:4.46.1": "3db36af320f1b9e55faed805583f05ac7bff150c1b350a5bca92fe1930acd692da09aa88e118da623ffe507c6392bff3fc093ce0410017d06584904a60cfd015",
-  "@rollup/rollup-android-arm64@npm:4.46.1": "416acc45eeb6d531aa71a9d88faae1c10d885e91e8927a11db2a42627443740e770588041e14bb775cbf9ea2e66193b6a5c73919743799d0a73b19cfa080b809",
-  "@rollup/rollup-darwin-arm64@npm:4.46.1": "4ae2fdd07446b185ecaf00c867155e48b61a3efef8bfabc3a9e89ce78cf6fc1552f5c276679dd95f03b4349805f10c092fc1e8c158bb2a935e4788eb5797dae9",
-  "@rollup/rollup-darwin-x64@npm:4.46.1": "92362936476c92519f39a194fe0767b8c000f6c6ff2eb910cb6cfd4ad6980a18624f368a1a286238c3fb53cb4842ab11d47bbaabfa9420d5f34ea7895b6fc5a0",
-  "@rollup/rollup-freebsd-arm64@npm:4.46.1": "ae52a9906031e98b23c4c1ea4838f3811a6a1458665f98243269e2231c087ff8a20987726209ec9b54f90bace9771a4f7209c4d7493015dc8104f2e7d62aeb84",
-  "@rollup/rollup-freebsd-x64@npm:4.46.1": "8aeaa25e652a3409cbed62a5be329824886512e4997b779e6da5413240024ee4f77f0cd75d9c8e35e2706e79544b505421324b467d91ee3fff2f1321ce0c4240",
-  "@rollup/rollup-linux-arm-gnueabihf@npm:4.46.1": "27baf0800307cc82f5ba3388f730553d4c30e4cf77dc59c5b90f86b68c9c9193467a37bec64822582a16f3ab59b6fc9c3fe8f6d6d399912a53a3973618583b76",
-  "@rollup/rollup-linux-arm-musleabihf@npm:4.46.1": "8d74daffca58b5e9599ee3643fbe0cde61f01fb54c890ef25a641e11d23403adaa6374bb4e7f520daeb181b3134bed0c159d25f0aa933ec4d66c43b703b75c3c",
-  "@rollup/rollup-linux-arm64-gnu@npm:4.46.1": "dc6e777c7fde0a4ec99343e34bb533358af730df0060ba40446dd71fcf83322040aebf6661bb4dfb86f31873d670c42f80fb492ae58e0a251ef510b86566c8cd",
-  "@rollup/rollup-linux-arm64-musl@npm:4.46.1": "2e1d5d58788f6d9499ef0db653eba8d4de2f29acc1fc6767436122d2d8d67e1516cb5b958b3136f347bb8f416e147bdb92b7dd02a712b1ccb7802a292544c972",
-  "@rollup/rollup-linux-loongarch64-gnu@npm:4.46.1": "f434514fa5153838cb5d019b1463ac82f2f843e7390220e6567cba9516d791997fecbe6b9242756328f20898d4be6726f7f2a9fbba673b9421300026d9a1e857",
-  "@rollup/rollup-linux-ppc64-gnu@npm:4.46.1": "6a64579bd64e247e1f92cfe8144669dae803b057913bee580735237e596d54bf70d5abaab3f47916df8db30a0c412b8e7c36b1f679332215239ba63f96f2c7a3",
-  "@rollup/rollup-linux-riscv64-gnu@npm:4.46.1": "aa52a1bf36877db538a57a94943ce66cc897df5a3ef130a2659b20aa3172c0f41d58e9a7a93a35fdd8ae958fcc261abe3e2d2819353ff5e84cd013466a09950e",
-  "@rollup/rollup-linux-riscv64-musl@npm:4.46.1": "68f4e4548384fb2c0c9d5f5c33bea8bc900cf3507b6b550d8fecdcb6faaedb8dbf1ae6c4fe55600944d6ef799e8a5aa3dfc7df9055ecd2046455c3e2a9e359d9",
-  "@rollup/rollup-linux-s390x-gnu@npm:4.46.1": "830338101f2161d450ff6faf3dfcd9f009a36c884d4e2e71a20975a5d6fc459d1c560ca68cb5291f983f497b4cbfe8d0bc5afbd5572c6c6966f7076cc3ceac76",
-  "@rollup/rollup-linux-x64-gnu@npm:4.46.1": "58fbd1ebf407f9473878a485b1c1e6d3b379346c3b90f53537a2809584cc4907774c8736ce25c9b41960a278ccc813bb052e6246445d1c8c2e6c809de2fc924a",
-  "@rollup/rollup-linux-x64-musl@npm:4.46.1": "7d7a795ec3f96030c62ae9f4bc59c4e5367de13588fa27e2813787b69b9366706c1b200ef5cdf80c2a3b5b684e5a2567e0b9c293d2a5841fa11b63f57190a3ea",
-  "@rollup/rollup-win32-arm64-msvc@npm:4.46.1": "eb0203af6adb0b38bb6ffa9cbe64dc95acf92908498df0254df15d8d1f16857da44a584729a8f7a9f2e608d6ec8e2716132186bc27349752b1c049fcfb95ee63",
-  "@rollup/rollup-win32-ia32-msvc@npm:4.46.1": "37956d2acf2044b1ce45826407571155bdd3cd1f81f8dccf0e476021e4ec05aa0f940b2e81267a76d0d538a766d022958f67eaa12ec807b26bed0591130778f2",
-  "@rollup/rollup-win32-x64-msvc@npm:4.46.1": "2560ef23f34fd4cb86fbe61366e339509b3c94b1e823484cb601e5913d81667de3cd10b6dafa84bc56b1376861f84b5b518a9158beaff13df72bf67291519f88",
+  "@rollup/rollup-android-arm-eabi@npm:4.59.0": "b2c5a1b261311a80e412c747b1f8644d43a472d6d45486d19becd78a1a75ec87422199783ac23c1178a7e94c2924be730e822062fe040f4dbc0093e6695ca84a",
+  "@rollup/rollup-android-arm64@npm:4.59.0": "5eb6a5e2c73348d2362e1df2b6e7b7eeb3c86ac12e7a1dcbfa435e5cd0d35771d6da7c319f60934884b1a8168001d2882e99c14ffb68916e419503fa4da13c8b",
+  "@rollup/rollup-darwin-arm64@npm:4.59.0": "64b5aa35d5140be4f0df2726485a3d375fccde2279f6aea82d8d256a7325cb6094eb01108a5aefd95b295bff25010447adf1d849b496fdab911afc5807866eb1",
+  "@rollup/rollup-darwin-x64@npm:4.59.0": "b14fe9c114130c89baaf807c2a69fd4962d0a6eb5464ab6a846b2ea023a63e4e3eb092c1cd293c13c5867c61ff09f01877294755a72c202ceaf0e497316ba954",
+  "@rollup/rollup-freebsd-arm64@npm:4.59.0": "1ce79859de5a6e48c162268cf8a33deedc9a318cb6229489f705bb9fe3903b39c91cdc2529b65d09b57c8862650c0eac350df80f1b798c86f7abd652f3d44179",
+  "@rollup/rollup-freebsd-x64@npm:4.59.0": "751dd34d4aea1521f4671aa0aa1377c0f2cdf82b04c1e14c24778774298b0db6ae58a7d574a0802ccefe8ad0631c4f1b4f6a8f88729520dd20a2be313045523b",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.59.0": "6cc3a24c867feec15fe90d23920a480e95ff7ed216e57e258574dd4180086f416711724438cab144f132b4537a9d1728bd6866989a88d43c2de87a9036ef8550",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.59.0": "59022fc0788e950c15c9461a0b9b2b6e48fdf20678f97fc7c63e39c97c3200674f6ca4570eff40582e14be191361da8400c217e380a94a728d2190cab7443056",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.59.0": "78e80b5c7d01a30f4d7adaea126dc376021291d8328224eed9f29a0ff4f82ec2168afdff03d7fc5c4e4c1cb57c4056e8bb1007c5d3d5b2ef07f148130890ff2f",
+  "@rollup/rollup-linux-arm64-musl@npm:4.59.0": "35c6bda8aac1cc017b5a0841f9d392d9ba96379ac871593e9b7864a34356b1074982d0a0f7ee9d19af28f252ceeb61c026541b57e09c147c7475ab7bf1c5f6e5",
+  "@rollup/rollup-linux-loong64-gnu@npm:4.59.0": "fbb0cac0c248e465c32450cd3d369eb24cf1a75bded681a58cf99d1652b60ac5269ea6d619da429e5589360563cf6c6d879f940e3f436d8c283c957b49dace03",
+  "@rollup/rollup-linux-loong64-musl@npm:4.59.0": "39c1ef5d7e36bd84386cf8e50a7b26fabae26a7f819e481489ec8cba6528e6ae00d93e7d7aa54dda83a3166842e5e501edc1f743d31be4c971d2bb5e16f8ef90",
+  "@rollup/rollup-linux-ppc64-gnu@npm:4.59.0": "885029215e74dfd8a0afa747f53c597962c4186bfa16b86b986d85a3de460b177e1ba38f9823d5602f972dc33720a1a7b84a0bb441cc77aa2cb2b988eb90f3fb",
+  "@rollup/rollup-linux-ppc64-musl@npm:4.59.0": "6785e3d207e63b8f840da35b738b00090d20f85186ebf2654bd891556f970398847d3abf9b1ae5cf19aa098de8776454cd0b42b78e75d1142532051d6f9e9a58",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.59.0": "9ccfd99174d06ba523cad217068d527a6667a770e0332abc1f55a64b02fd09e586e542ec8731702888a771477257c00b6334911d72205093f1d10fc1baaec9b1",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.59.0": "3a1ebc6fc9683a10e8c5d4e0080897bc247a7ba52aa39b0f586e80b92cefaa5bcb570c0dcf1475b7ea87a44dc551524d7ab9f5717e6ebdf85a55d7d4447dbfd3",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.59.0": "df4cf92ef58379fd530ae14363bb8547352bf9c65ef68f6f01b6f4a1bcc558d0c4e2363361c35cb1627a2d87f30c579126dda1c91a36efe81e1002d26304f2a9",
+  "@rollup/rollup-linux-x64-gnu@npm:4.59.0": "fd48952a450a7c3f117445694878ab99941858f6c40920aef34678dea7880213af504ef490cdb269e038efbf5a497d4aab3cbf0a785ffcb0ee9bdc3b73e9c0a2",
+  "@rollup/rollup-linux-x64-musl@npm:4.59.0": "58811bbe6e78b4b0cce1b2c9f84768fe16bef8784152f01aa3e6479a92ebbe377cdd70c2d676cb5df93d62139a94eb0b5082f68347d57f2f364cc50cebc0a3b8",
+  "@rollup/rollup-openbsd-x64@npm:4.59.0": "f21f3d73b87f5298fa1d314d2d344319d55d9aea777d9551b5ede0176980a406a6e48b1f08ade1dd96e993460833a282b3abdce179f75af45d12b58ada8a1aed",
+  "@rollup/rollup-openharmony-arm64@npm:4.59.0": "b2eda04dd7fff48ca968a6a7a166aef4082cbeb2d1c41e45fd9824c80babc483ec86f6ed6e3b70ebeeedabb9f0d99cc611959652e87f6beaa9eea3c5d7691ae8",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.59.0": "656459997e6f192387a29e3a88e734f981db1af6e78c1ed857e3596b46d361398e47ab390774d2bfee17e94aa760dd16a0448fa868f3f56b5f639eede29345c8",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.59.0": "f0eabd43696d0a25bad55194bc0363ded364674ad0c1dd117d1e3fafbc4d0f077a2c60e81d756baaaa0859012949316d204c67b14c9f3ab8a80c9ea76983fc95",
+  "@rollup/rollup-win32-x64-gnu@npm:4.59.0": "c39d866bf3305397b1772c0ecc4d7bc9b9b1f0240d4425f1e938d4aaed206d8418d5b6e1e11608e7c4c4258cd723f101cc40e8beb1758d163adb1b6cd70bcc35",
+  "@rollup/rollup-win32-x64-msvc@npm:4.59.0": "34e03ac4acaf58e756ab0aec133d28c1cdcebde173e20a471f3f66292601a2a0c9b0bc2a24023ca30162ce039fddcc5c0264789d9f242945de169646b752c7cf",
   "@swc/core-darwin-arm64@npm:1.13.3": "02e4c06e113dbf57a560c04bdfb0d9abc9eefbf6277a19f8f78fb42be710defd41bfd784f427a94dd23b371ce5c604a8cfae92509fef213c9de427ab3e64b25d",
-  "@swc/core-darwin-arm64@npm:1.15.2": "811bb38ede1d92045c3c84169f7b2202bbf7caf2745d26cb9b141cb188465dd94a700733b0d9dc8a97590d9ebb1a92ef5ed40346d3fac7f88832365cca5d2678",
-  "@swc/core-darwin-arm64@npm:1.15.3": "0348e8301b4105309817952cb0242f42d82685b2403b4381e0a771f4c8aa9a1b9917dff9545505f902fa5be0e3a9ed46d6bece251673b7864c96a6e6f770936d",
+  "@swc/core-darwin-arm64@npm:1.15.17": "5699f18e1a03441a625d9304913f5cc4ecc0a348817e5527ed2463261da3b868e21e60a0f76c1d8c032d0aa95da3b745ea92683b57be85a85d0073bc889f8f42",
+  "@swc/core-darwin-arm64@npm:1.15.18": "1597877545538954d6445a21f4a102766f098aa2b0d55ded3a766993b527bf1bae9bca54e50e3289b8f6a0cdb42b550f65da38564340d954690df15d2e27f56a",
   "@swc/core-darwin-x64@npm:1.13.3": "39ed8633b500b8a32fd507c0a57ecbaed1d4840d75a1dcee9d8cafe36b378029299d9f5552404230800c186b7b972dd476401d7c216cb16f2d87c5f95ff8c58e",
-  "@swc/core-darwin-x64@npm:1.15.2": "b0fce366539c7daae5aab6041f10e9e70a767b277fff0f6ad3fea09b46d95f0208961ce1c6a0a55486718a3997ffa8dc38bd03030faa09395f9261792a42752e",
-  "@swc/core-darwin-x64@npm:1.15.3": "80d2159159976ad45256a6d2315747cf077f202fb1f1af699f2a171b31b330f7447887e3f7a5f0d15fe65a660f92d390f92fc21bc8a86a5e6554687114079cfd",
+  "@swc/core-darwin-x64@npm:1.15.17": "e52ead49ec28a4f5799436f222298b923566516a015caa667dac0a6e68c3a1d102a944e2f4b328a8ba731b3b2098453ad4a3359fa47113459ff8172ab3d009ac",
+  "@swc/core-darwin-x64@npm:1.15.18": "326b8c3309c303a53bf4ed6afbfb0baee0acdb527253e734fe5cefc6916cea598d75fb508265e482143e92fabaf2cacfe9e3a30301ed527c32a727f998a65239",
   "@swc/core-linux-arm-gnueabihf@npm:1.13.3": "d3889724b5b787db220a65424b5e5e4b2a587f658582905d5a296e8931f30bd42202c356d05d650cfb649984884b05e1513412edaf4ce97c7a055547e3d26fd0",
-  "@swc/core-linux-arm-gnueabihf@npm:1.15.2": "b55975abf42d5af0db4a149ad5e8a4935619473517acfccba978d90a300f5d97c4b883f2c3fe95bce57be36b0f0d21ad889a681f492e9e1338a87751d9858602",
-  "@swc/core-linux-arm-gnueabihf@npm:1.15.3": "f51347e0223a2ee93e2f55f7c054b9ec133591abacd36ba78ecbf1deb83c7b7f19e33a288cdb018c3192289e644bb664df0a68c9e704cb65f4655afd95cb6641",
+  "@swc/core-linux-arm-gnueabihf@npm:1.15.17": "eeae5f54a2a051fdbe45efb5b21aa08c5646afd9d5032e0388f1d55b1ecad1ba4fee27546ecd08a1076f9ae290451f73633405ea0782241e5c69294613eafdf0",
+  "@swc/core-linux-arm-gnueabihf@npm:1.15.18": "0d26738b4675ee1ff5b0322295c947f351e6d2494303248971b601e2fcfd666a17357a030f0a745e11b60065329652daa58db44abcfc7620f2da8d92733dd0ee",
   "@swc/core-linux-arm64-gnu@npm:1.13.3": "9ab7ed4e31d4dba8df4b25109248c0225c33573a0046ef7380449fe348a9404dcf4115320e649ba5b5476a38a12dbc52dfe534f7dd7ad92dc5995e9aa9513dba",
-  "@swc/core-linux-arm64-gnu@npm:1.15.2": "6345874a4385e8a1793a2c80b1e20e7883faed348e118619420c58cfcf6f7106ce76b179c10220f8fdccfa92bd5ca45c3749bc2e36075e8684b58df367a714df",
-  "@swc/core-linux-arm64-gnu@npm:1.15.3": "43521ed4c9cf545f32c8b20e3e8d7dc13574d7af0d2d52a4fa53b0d98082245efc14ecf7c336cc05ecc1ff20ab5e7e438d35ddf817d87d0d6957adf69a70c33a",
+  "@swc/core-linux-arm64-gnu@npm:1.15.17": "56740456ab0df1238fab445a363a1cf4f29422710c67011efbaaaf17fa3b2260c731489836a80a84e75b8986de459251b60082e5f91ae42c403d704921771365",
+  "@swc/core-linux-arm64-gnu@npm:1.15.18": "96aa824334204b6ae8a9c337a745a64dedd4913331f313561eb9544b853e142d9a933230d06052eb677cffbed0b1c961389f1d626936a9b5fad6400ad254229e",
   "@swc/core-linux-arm64-musl@npm:1.13.3": "39ce1201862d2368ed7a89a9f1960bcbf56da875c353da720894bccc75110d71ab2cb7f99a252518f96e678c5dd42ed2e1a588bf343e175f41a532785c03ffaf",
-  "@swc/core-linux-arm64-musl@npm:1.15.2": "7b1d51d7f566e42b178b49dd8dde9d630afc6e5d9cf89dcee1af39ad9c1016759e9cc5da37b58c52df50801c3a410edf0c00cc1a7f7ac93027a0628b5a5d05f4",
-  "@swc/core-linux-arm64-musl@npm:1.15.3": "c9d9a5847ca3e58c67fb906294e31b01e5885c5669ab57c645bc9b3707b7f6d2e6133aded89ff321c633cc632f6fe163a127739f0af8b976e3a18c06b55949bf",
+  "@swc/core-linux-arm64-musl@npm:1.15.17": "c2c63181909bf180c4d57c60eeba7eab30680ff65944c7f76f4e89fd615acb68b3fc5aaba485ee63aeecefc183777261480eeb1de03668f5be43a28001190021",
+  "@swc/core-linux-arm64-musl@npm:1.15.18": "3781cb4bfce767fb85506a69bc6fb7745ec53be2a53735750ae88f51c3d6803725a3a906cb954888c529e7f675d3ff0f746bb22c646f1ac2caebdc2be64a852e",
   "@swc/core-linux-x64-gnu@npm:1.13.3": "9e7edee322efd9b35a62d8507300adacbbcd53630a26e935cee8ede5ecf8710fac1ae60ce490cd2d6297d27196d8202a9281b6193da223689804ef9afab451c0",
-  "@swc/core-linux-x64-gnu@npm:1.15.2": "5e888708763bbe3ddf4e7c4f6de75247ca3eede869fc7964999c7e950ffeace38e36f50ffd67e4644055913a0af5d18dab895c701cf94c83321a48c31044d26b",
-  "@swc/core-linux-x64-gnu@npm:1.15.3": "a3a0249485d79867d7faac60f896c6354e2967fa1d0a9b1dae4ccd465ac16efb23fca28cf37147926070fde9f611f9b497b44b84788b3a4bb9bb1b6b3056b34d",
+  "@swc/core-linux-x64-gnu@npm:1.15.17": "69321e9b263f07d11f98e389d8f6b94fdaabaf91adea24ccbe25107a75a7b348dafbffa2746aee1caeea24d0b3d29aa5d8d160419fe36b986a5a6350f1068d30",
+  "@swc/core-linux-x64-gnu@npm:1.15.18": "26f6fe774e88f8d58a48c18666eda6345cd7064cf065f02eae683f6eaac3e345a5fdbef22a8b3aa7069e332fe95c4b496cbab438bc2b474a9fdc8b37a616be0a",
   "@swc/core-linux-x64-musl@npm:1.13.3": "89f256a8a7da0317cf0b504846cf6d077695b7f86f3cb85e727deedcc82f00fbd42c36e5ec6ff9ead3a2ab1fda748b4d3fd59d93420b6abd3629e902f5a34828",
-  "@swc/core-linux-x64-musl@npm:1.15.2": "aadabca760a39a4f4425b83557a836960998d250f7c0b5e3d8104bf4e9597cb00539d89461678dc592053d68dc0bfa4da64de215b5af74890cd1d455dec90728",
-  "@swc/core-linux-x64-musl@npm:1.15.3": "d89eb33661355eb7ed519672c221099b6e4feb326f8685fe58f9a222ee115974c320d9746d1d66d561fcd1934c0f35944fff9a56e7b16aea83994ef78da5605b",
+  "@swc/core-linux-x64-musl@npm:1.15.17": "d02f7e4b55f2b22bf042093aa9c45356e851845a0ad8b87ff967033b6cbe474c196f03f2387ac9154a10988943674bbb80739a1c7ecc8a79fb174431bc5527ce",
+  "@swc/core-linux-x64-musl@npm:1.15.18": "96b5bd1bbacebbf806f9a6a02698d68ba2a677ce86b5c2d7a92ea6083b40d55a0a84abebd16b5afd7a574e727b8c19e9039315e8ef40f6c852bbfaee26f999cd",
   "@swc/core-win32-arm64-msvc@npm:1.13.3": "18929504fef4c53a191512a9bdb5384fe2ef701f4cf43927aaaadd8fab199cf5c970f8ca48b9533e8190c4a88fc514147beb17768cf5232055b6ba075457ae09",
-  "@swc/core-win32-arm64-msvc@npm:1.15.2": "1c009bc927578943b5e08f43ef69dd6997545feeaedacc7fcd415e5a6e7d669186f0591f1e3617b0218a67567216dfa134d77c133a75f44c8f11f44d52c73532",
-  "@swc/core-win32-arm64-msvc@npm:1.15.3": "85de0d2c97997827d50ca0d1d78ec83d26dd66757795c6f694b663e8ef8f58506f8c67d515316553e467749662cda46ff7371415540c5e14401425b3f033c2d1",
+  "@swc/core-win32-arm64-msvc@npm:1.15.17": "32f56af42c1ae67467479f72d9fa12c83d0242abf92dc79b001ce570341297e2e24b66682f28b514c6ac4ce794d426a599328b4bcb35c719cced967a4ccafb46",
+  "@swc/core-win32-arm64-msvc@npm:1.15.18": "3a170183da529015301e48bd305f9ea1bcbd38259ff25f1f6e778ee4bb68fda44552c696f067005729aa77407295b1388717a31d9429844725d7ee29645bde82",
   "@swc/core-win32-ia32-msvc@npm:1.13.3": "0b7d5fc610de99bd24e0bd5430569e5b71dc0e2660a6e17aaffc7671ed0474a5a18096ea23acb83aadaa287fef5ff4c245a544c5ba38cb498ac4d843f7ca2256",
-  "@swc/core-win32-ia32-msvc@npm:1.15.2": "88e9beeafa768fb212a64b0652f66d2aa2f6728a0309ce6f8962200d65ff370638578f13b783a83d499e91ffafbfeb9160b3a5fb37521d1120b506e9ddf1e89e",
-  "@swc/core-win32-ia32-msvc@npm:1.15.3": "f8f82ed4a1e598db4b5627519c045fb1915e6fa09b80d8e374f4694e9a6c5590865530a80291d8068f4d60258ea2dff19cd74fd65627ac007fb979976481b328",
+  "@swc/core-win32-ia32-msvc@npm:1.15.17": "538f8276536cc51d790cd2f2b84e501f14796bba1bb96a09a2e4cb556efe90c8f525d42a8bdb79371b30c9a34ff32836dac34aef18fc70208ffef9a3f689b067",
+  "@swc/core-win32-ia32-msvc@npm:1.15.18": "a950c9d1d6338939734249ddb766c495e86e05509bb6a42f58d2713d419d4412c06fb0c11c7711c6612ab3e74520a8c1581449340aa3f4fe26f71c53675f37b4",
   "@swc/core-win32-x64-msvc@npm:1.13.3": "632eac6a4997f4299e710f8be1a1d6df862a852beaa3b30dc1dce9ba5acd128d6e93af6ce64f8b39e4c37318b254f4f10d27ad5df1cf5bb493de39d7f205d1b7",
-  "@swc/core-win32-x64-msvc@npm:1.15.2": "df51454cdd0a5ea999d267a3230e9c51daef93f0fefec3c3aed5d3f8c8409f89514971edb99270fece2e3342bccf3c55a28a32a87e5cd250f25c2410218ddb8f",
-  "@swc/core-win32-x64-msvc@npm:1.15.3": "c6a910e3064974cbc1d2628999be54daf624c4d1f66cb5ae82de6ad9e703c608f4aeeeb50d4d97db93f2551528554982267c2b1783260a7a3fdf026d5528a83f"
+  "@swc/core-win32-x64-msvc@npm:1.15.17": "e8636df1516b3ab23c6eeb156dc0f97014d3a77af071f035876b3185fe51bb4172de3ac7976a4270baa8bd9b1cd58d488ee4ef176e0804507593c687c3276947",
+  "@swc/core-win32-x64-msvc@npm:1.15.18": "68eac0d5148e7326b748a0f0adf44bffcfb1d0c78e366448aad9859eda537941391ea95e1863118460a49a58235ce9791ae1b20afc04a034677167e6ea43a5e2"
 }
diff --git a/pkgs/by-name/gr/grafana/package.nix b/pkgs/by-name/gr/grafana/package.nix
index 7780918825af..c44a93d6695d 100644
--- a/pkgs/by-name/gr/grafana/package.nix
+++ b/pkgs/by-name/gr/grafana/package.nix
@@ -21,7 +21,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "grafana";
-  version = "12.4.2";
+  version = "13.0.1";
 
   subPackages = [
     "pkg/cmd/grafana"
@@ -33,7 +33,7 @@ buildGoModule (finalAttrs: {
     owner = "grafana";
     repo = "grafana";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-cA+SLXry+aomj3O7ShiVOCkZVMk0XLq6EmYuOfi+hyk=";
+    hash = "sha256-fGRvCDIOQcF743SimatyNmX0gZtO0tvgEAFuk38rl88=";
   };
 
   # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22
@@ -49,12 +49,12 @@ buildGoModule (finalAttrs: {
   # Since this is not a dependency attribute the buildPackages has to be specified.
   offlineCache = buildPackages.yarn-berry_4-fetcher.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes;
-    hash = "sha256-dbYgn1hB3xe5KCFyLwO1Xe6YJ2vPl9xymnx4i42J0Dc=";
+    hash = "sha256-5aInVAn9UMGp8U+LEIR1D19RI9vKVrNpt5Frbr1sBJs=";
   };
 
   disallowedRequisites = [ finalAttrs.offlineCache ];
 
-  vendorHash = "sha256-q+AFeXM1NQB4WVGiahiVRiXAhLNMa/H9IL3kv6Ybl+M=";
+  vendorHash = "sha256-PEGgrkTguHvqrclzvZDQ7yk6rwTKDLXdUSjeaQFnYtU=";
 
   # Grafana seems to just set it to the latest version available
   # nowadays.
@@ -172,6 +172,6 @@ buildGoModule (finalAttrs: {
       "aarch64-darwin"
       "riscv64-linux"
     ];
-    mainProgram = "grafana-server";
+    mainProgram = "grafana";
   };
 })

From 5ec953c4b74351df098e107dc998cc4646cd4c0f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Apr 2026 12:38:27 +0000
Subject: [PATCH 24/71] influxdb2-cli: 2.7.5 -> 2.8.0

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

diff --git a/pkgs/by-name/in/influxdb2-cli/package.nix b/pkgs/by-name/in/influxdb2-cli/package.nix
index c7833547a8a3..4cd697ab2f86 100644
--- a/pkgs/by-name/in/influxdb2-cli/package.nix
+++ b/pkgs/by-name/in/influxdb2-cli/package.nix
@@ -7,13 +7,13 @@
 }:
 
 let
-  version = "2.7.5";
+  version = "2.8.0";
 
   src = fetchFromGitHub {
     owner = "influxdata";
     repo = "influx-cli";
     rev = "v${version}";
-    sha256 = "sha256-0Gyoy9T5pA+40k8kKybWBMtOfpKZxw3Vvp4ZB4ptcJs=";
+    sha256 = "sha256-3DCvWaiGLw9OSs/b9za1jgrPDo2Txw5b5h46ElTMEks=";
   };
 
 in
@@ -24,7 +24,7 @@ buildGoModule {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  vendorHash = "sha256-Ov0TPoMm0qi7kkWUUni677sCP1LwkT9+n3KHcAlQkDA=";
+  vendorHash = "sha256-NsOkQwMH/AANUBReXmGR0fFQAtosA9iSla5JXyhrPYE=";
   subPackages = [ "cmd/influx" ];
 
   ldflags = [

From b2d91e208ccc54e76fe443370ccd15deb052f758 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Fri, 24 Apr 2026 21:52:45 +0800
Subject: [PATCH 25/71] emacs: update patches for tree-sitter 0.26
 compatibility

The vendored patch fixing build issue is replaced by fetching from
Gentoo.  In addition, another patch from Gentoo is added to fix the
runtime issue.
---
 .../applications/editors/emacs/make-emacs.nix |  3 -
 pkgs/applications/editors/emacs/sources.nix   | 13 ++++-
 .../editors/emacs/tree-sitter-0.26.patch      | 56 -------------------
 3 files changed, 10 insertions(+), 62 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs/tree-sitter-0.26.patch

diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix
index 48474bc4b7cd..c4373316be26 100644
--- a/pkgs/applications/editors/emacs/make-emacs.nix
+++ b/pkgs/applications/editors/emacs/make-emacs.nix
@@ -252,13 +252,10 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     makeWrapper
     pkg-config
-  ]
-  ++ lib.optionals (variant == "macport") [
     texinfo
   ]
   ++ lib.optionals srcRepo [
     autoreconfHook
-    texinfo
   ]
   ++ lib.optionals (withPgtk || withX && (withGTK3 || withXwidgets)) [ wrapGAppsHook3 ];
 
diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix
index 47af77ac4703..becbd58af1e9 100644
--- a/pkgs/applications/editors/emacs/sources.nix
+++ b/pkgs/applications/editors/emacs/sources.nix
@@ -121,9 +121,16 @@ in
         name = "inhibit-lexical-cookie-warning-67916.patch";
         path = ./inhibit-lexical-cookie-warning-67916-30.patch;
       })
-      # tree-sitter 0.26 compatibility fix, from FreeBSD
-      # https://cgit.freebsd.org/ports/plain/editors/emacs/files/patch-src_treesit.c
-      ./tree-sitter-0.26.patch
+      (fetchpatch {
+        # tree-sitter 0.26 compatibility fix, see https://bugs.gentoo.org/970856
+        url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/30.2/01_all_treesit-0.26.patch?id=d0f47979806d9be5a190fdb4ffa1bde439b2d616";
+        hash = "sha256-3pWeRxjAhr3ntBR3xDhoDUZDjU6xICU23NUpb/Vl6R4=";
+      })
+      (fetchpatch {
+        # tree-sitter 0.26 compatibility fix, see https://bugs.gentoo.org/971731
+        url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/30.2/02_all_ts-query-pred.patch?id=86190bf195b3e17108372d8ad89eb57037180dd2";
+        hash = "sha256-0GPyfKLSaB09a8hamrSf6lx4Qk8Big4AKMOivkN1wEM=";
+      })
     ];
   });
 
diff --git a/pkgs/applications/editors/emacs/tree-sitter-0.26.patch b/pkgs/applications/editors/emacs/tree-sitter-0.26.patch
deleted file mode 100644
index fe3b9ee8db3b..000000000000
--- a/pkgs/applications/editors/emacs/tree-sitter-0.26.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/src/treesit.c
-+++ b/src/treesit.c
-@@ -34,7 +34,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.or
- # include "w32common.h"
- 
- /* In alphabetical order.  */
--#undef ts_language_version
-+#undef ts_language_abi_version
- #undef ts_node_child
- #undef ts_node_child_by_field_name
- #undef ts_node_child_count
-@@ -89,7 +89,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.or
- #undef ts_tree_get_changed_ranges
- #undef ts_tree_root_node
- 
--DEF_DLL_FN (uint32_t, ts_language_version, (const TSLanguage *));
-+DEF_DLL_FN (uint32_t, ts_language_abi_version, (const TSLanguage *));
- DEF_DLL_FN (TSNode, ts_node_child, (TSNode, uint32_t));
- DEF_DLL_FN (TSNode, ts_node_child_by_field_name,
- 	    (TSNode, const char *, uint32_t));
-@@ -166,7 +166,7 @@ init_treesit_functions (void)
-   if (!library)
-     return false;
- 
--  LOAD_DLL_FN (library, ts_language_version);
-+  LOAD_DLL_FN (library, ts_language_abi_version);
-   LOAD_DLL_FN (library, ts_node_child);
-   LOAD_DLL_FN (library, ts_node_child_by_field_name);
-   LOAD_DLL_FN (library, ts_node_child_count);
-@@ -224,7 +224,7 @@ init_treesit_functions (void)
-   return true;
- }
- 
--#define ts_language_version fn_ts_language_version
-+#define ts_language_abi_version fn_ts_language_abi_version
- #define ts_node_child fn_ts_node_child
- #define ts_node_child_by_field_name fn_ts_node_child_by_field_name
- #define ts_node_child_count fn_ts_node_child_count
-@@ -746,7 +746,7 @@ treesit_load_language (Lisp_Object language_symbol,
-     {
-       *signal_symbol = Qtreesit_load_language_error;
-       *signal_data = list2 (Qversion_mismatch,
--			    make_fixnum (ts_language_version (lang)));
-+			    make_fixnum (ts_language_abi_version (lang)));
-       return NULL;
-     }
-   return lang;
-@@ -817,7 +817,7 @@ Return nil if a grammar library for LANGUAGE is not av
- 						       &signal_data);
-       if (ts_language == NULL)
- 	return Qnil;
--      uint32_t version =  ts_language_version (ts_language);
-+      uint32_t version =  ts_language_abi_version (ts_language);
-       return make_fixnum((ptrdiff_t) version);
-     }
- }
\ No newline at end of file

From 3d730cb1ecb627c085a7b585d7e644239965797e Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Fri, 24 Apr 2026 17:53:00 +0200
Subject: [PATCH 26/71] vencord: 1.14.7 -> 1.14.10

https://github.com/Vendicated/Vencord/compare/v1.14.7...cacd0efd87a8aba95ad2a3be8ae569a295b9eaae

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/by-name/ve/vencord/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index 724b6369d488..5467002ebef5 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -19,13 +19,14 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vencord";
-  version = "1.14.7";
+  version = "1.14.10";
 
   src = fetchFromGitHub {
     owner = "Vendicated";
     repo = "Vencord";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-uLuWTquRwguWYu3eolrHa5rguSI8ydwzHY6CrOcP7qM=";
+    # For some reason 1.14.10 is not tagged
+    rev = "cacd0efd87a8aba95ad2a3be8ae569a295b9eaae";
+    hash = "sha256-RnxhUGI0eji7gQf+FJnG+BoHphJmjxT9EF5FYUWYCbs=";
   };
 
   patches = [ ./fix-deps.patch ];
@@ -44,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
       ;
     pnpm = pnpm_10;
     fetcherVersion = 2;
-    hash = "sha256-b8Ko87Ddu3jcigbxluhsADJTsGVatiW5snXSXtrYho0=";
+    hash = "sha256-GiUV2x8i7ewzn66v5wBUq67oNvrxZzOsh5TuQUtpJNQ=";
   };
 
   nativeBuildInputs = [

From 0e48ad176a92a98413f98267195df1198e049c0b Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Thu, 26 Feb 2026 03:43:03 +0200
Subject: [PATCH 27/71] tailwindcss-language-server: migrate from
 fetcherVersion = 1 to fetcherVersion = 3

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

diff --git a/pkgs/by-name/ta/tailwindcss-language-server/package.nix b/pkgs/by-name/ta/tailwindcss-language-server/package.nix
index 22201196087c..0a4b336074c2 100644
--- a/pkgs/by-name/ta/tailwindcss-language-server/package.nix
+++ b/pkgs/by-name/ta/tailwindcss-language-server/package.nix
@@ -27,8 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
       pnpmWorkspaces
       ;
     pnpm = pnpm_9;
-    fetcherVersion = 1;
-    hash = "sha256-1F4DeqJWJs3L1hDzNn7PJr9sSBv2TcN8QfV8/pwAKuU=";
+    fetcherVersion = 3;
+    hash = "sha256-3pHEmYMgQuHFFMyGeFzo9BWRFt6yvWzFFMJEdRhwS2w=";
   };
 
   nativeBuildInputs = [

From 1f87138f859a0681168b17bb0104e400a8a8cfcb Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Thu, 26 Feb 2026 03:43:03 +0200
Subject: [PATCH 28/71] taler-wallet-core: migrate from fetcherVersion = 1 to
 fetcherVersion = 3

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

diff --git a/pkgs/by-name/ta/taler-wallet-core/package.nix b/pkgs/by-name/ta/taler-wallet-core/package.nix
index e490ee3477c2..ca4a6daed17f 100644
--- a/pkgs/by-name/ta/taler-wallet-core/package.nix
+++ b/pkgs/by-name/ta/taler-wallet-core/package.nix
@@ -61,8 +61,8 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm';
-    fetcherVersion = 1;
-    hash = "sha256-jwoSvqE0hqRxu76vDtUOpZxvi4SsmKukfpmp5G6ZV/I=";
+    fetcherVersion = 3;
+    hash = "sha256-a1ym/UpUufUPTGL3dozZ9Jb0eX1XVB7Hahek25eLvc4=";
   };
 
   buildInputs = [ nodejs_20 ];

From 119ab22a1da287580517d929a9ea843fff902ad7 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Thu, 26 Feb 2026 03:43:03 +0200
Subject: [PATCH 29/71] taze: migrate from fetcherVersion = 1 to fetcherVersion
 = 3

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

diff --git a/pkgs/by-name/ta/taze/package.nix b/pkgs/by-name/ta/taze/package.nix
index 344d52586270..f72cb837498a 100644
--- a/pkgs/by-name/ta/taze/package.nix
+++ b/pkgs/by-name/ta/taze/package.nix
@@ -24,8 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_9;
-    fetcherVersion = 1;
-    hash = "sha256-cLh9iiDLW3CDg8R+I3TSEMdnyv1KaHelubvF31oGrWk=";
+    fetcherVersion = 3;
+    hash = "sha256-x9XPnvyrAmFqIMhjBFQYQE1qKDG6uxzd0NnxIjdOXio=";
   };
 
   nativeBuildInputs = [

From cf2031103c92d2a0f1db86893a98d8aa6780d3d8 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Thu, 26 Feb 2026 03:43:04 +0200
Subject: [PATCH 30/71] textlint: migrate from fetcherVersion = 1 to
 fetcherVersion = 3

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

diff --git a/pkgs/by-name/te/textlint/package.nix b/pkgs/by-name/te/textlint/package.nix
index 279c11080103..ddb43b9e6b20 100644
--- a/pkgs/by-name/te/textlint/package.nix
+++ b/pkgs/by-name/te/textlint/package.nix
@@ -58,8 +58,8 @@ stdenv.mkDerivation (finalAttrs: {
       patches
       ;
     pnpm = pnpm_9;
-    fetcherVersion = 1;
-    hash = "sha256-TyKtH4HjCDTydVd/poG05Yh5nRSfcrSPzFLEE3Oq2uo=";
+    fetcherVersion = 3;
+    hash = "sha256-TYMhAcmfWHbj/0yLNYiJXWd1GiYb+zqBLj2/83cGbzg=";
   };
 
   nativeBuildInputs = [

From 4faa077e5c1c9c0d426fcfe3614012fce67e4563 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Thu, 26 Feb 2026 03:43:04 +0200
Subject: [PATCH 31/71] tsx: migrate from fetcherVersion = 1 to fetcherVersion
 = 3

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

diff --git a/pkgs/by-name/ts/tsx/package.nix b/pkgs/by-name/ts/tsx/package.nix
index ac2e8a6ccd28..38379fd7ee34 100644
--- a/pkgs/by-name/ts/tsx/package.nix
+++ b/pkgs/by-name/ts/tsx/package.nix
@@ -30,8 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
       src
       ;
     pnpm = pnpm';
-    fetcherVersion = 1;
-    hash = "sha256-6ZizQtZC43yXrz634VXksRCKGkDKryICvT3Q+JCuIEw=";
+    fetcherVersion = 3;
+    hash = "sha256-7JdL2qz663+y3tzeK0LLn57vSsQ0P0d+FofRimWVjrM=";
   };
 
   nativeBuildInputs = [

From 917573f893c3d3094a37cd0e51626c8d220acbf8 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Thu, 26 Feb 2026 03:43:05 +0200
Subject: [PATCH 32/71] vtsls: migrate from fetcherVersion = 1 to
 fetcherVersion = 3

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

diff --git a/pkgs/by-name/vt/vtsls/package.nix b/pkgs/by-name/vt/vtsls/package.nix
index c1999351dc10..c4c71278a15d 100644
--- a/pkgs/by-name/vt/vtsls/package.nix
+++ b/pkgs/by-name/vt/vtsls/package.nix
@@ -46,8 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
       version
       ;
     pnpm = pnpm';
-    fetcherVersion = 1;
-    hash = "sha256-SdqeTYRH60CyU522+nBo0uCDnzxDP48eWBAtGTL/pqg=";
+    fetcherVersion = 3;
+    hash = "sha256-1P2ph8ZX6/KptkLP4wk0dZzuvnYCLOWorM1b9+otKsE=";
   };
 
   # Patches to get submodule sha from file instead of 'git submodule status'

From be2935276c375e50ace71a7bebc48265dc4af6b1 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Thu, 26 Feb 2026 03:43:05 +0200
Subject: [PATCH 33/71] vue-language-server: migrate from fetcherVersion = 1 to
 fetcherVersion = 3

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

diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix
index 02e95b048124..06c129532f6c 100644
--- a/pkgs/by-name/vu/vue-language-server/package.nix
+++ b/pkgs/by-name/vu/vue-language-server/package.nix
@@ -22,8 +22,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
-    fetcherVersion = 1;
-    hash = "sha256-unlZBLcDGP6laU2smtOP+hVrvp8HDPBqEk3MmmhO8sE=";
+    fetcherVersion = 3;
+    hash = "sha256-koRJkT/JloptmtQKLprqms53TL/Q4XHaktIl/6PIasw=";
   };
 
   nativeBuildInputs = [

From 429e84e2452c8ef2003f71a79716e60c1692b4a5 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Thu, 26 Feb 2026 03:43:06 +0200
Subject: [PATCH 34/71] wealthfolio: migrate from fetcherVersion = 1 to
 fetcherVersion = 3

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

diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix
index c7ad96f655ff..e0c71d5e1811 100644
--- a/pkgs/by-name/we/wealthfolio/package.nix
+++ b/pkgs/by-name/we/wealthfolio/package.nix
@@ -31,8 +31,8 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) src pname version;
     pnpm = pnpm_9;
-    fetcherVersion = 1;
-    hash = "sha256-feM1jQsUDKVX4+x4Otdwx6AEM+FO7fiaJjmMbU6GDf8=";
+    fetcherVersion = 3;
+    hash = "sha256-PnKQthd36HiomYIsjB+TQqVNUX5Wocgnrz0SeHfhEyY=";
   };
 
   cargoRoot = ".";

From bddb13076221c7a9a0dd585417ad9807bec41022 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Thu, 26 Feb 2026 03:43:06 +0200
Subject: [PATCH 35/71] zenn-cli: migrate from fetcherVersion = 1 to
 fetcherVersion = 3

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

diff --git a/pkgs/by-name/ze/zenn-cli/package.nix b/pkgs/by-name/ze/zenn-cli/package.nix
index f8e8cf443630..432303a01549 100644
--- a/pkgs/by-name/ze/zenn-cli/package.nix
+++ b/pkgs/by-name/ze/zenn-cli/package.nix
@@ -40,8 +40,8 @@ stdenv.mkDerivation (finalAttrs: {
       pnpmWorkspaces
       ;
     pnpm = pnpm_10;
-    fetcherVersion = 1;
-    hash = "sha256-WXsS5/J08n/dWV5MbyX4vK7j1mfiUoLdzwmzyqoX3FA=";
+    fetcherVersion = 3;
+    hash = "sha256-uxeZnYZzwyNOZN1x1f6tzcYgPbJhSc3gTdsfaE+967w=";
   };
 
   preBuild = ''

From 259ec20aeed61fa2c2e7807a5cfc1b3d1818ea12 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Thu, 26 Feb 2026 03:43:07 +0200
Subject: [PATCH 36/71] zigbee2mqtt: migrate from fetcherVersion = 1 to
 fetcherVersion = 3

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

diff --git a/pkgs/by-name/zi/zigbee2mqtt/package.nix b/pkgs/by-name/zi/zigbee2mqtt/package.nix
index 52365017d72a..39f9521557ce 100644
--- a/pkgs/by-name/zi/zigbee2mqtt/package.nix
+++ b/pkgs/by-name/zi/zigbee2mqtt/package.nix
@@ -26,8 +26,8 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_9;
-    fetcherVersion = 1;
-    hash = "sha256-8ioe9/gSI9u9ehrnj3L1j+vPS9p+nJGs2d8TdZTEsk4=";
+    fetcherVersion = 3;
+    hash = "sha256-uYzY1ixKTughpc6JfoMmp4/RKdgP1cKBuMMLZspSx18=";
   };
 
   nativeBuildInputs = [

From 01d1fb1eed0bb36f3dfd5c6731b7214a6a9aca51 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Thu, 26 Feb 2026 03:43:13 +0200
Subject: [PATCH 37/71] django-filingcabinet: migrate from fetcherVersion = 1
 to fetcherVersion = 3

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

diff --git a/pkgs/development/python-modules/django-filingcabinet/default.nix b/pkgs/development/python-modules/django-filingcabinet/default.nix
index ac426b332d98..9dd305b3ad37 100644
--- a/pkgs/development/python-modules/django-filingcabinet/default.nix
+++ b/pkgs/development/python-modules/django-filingcabinet/default.nix
@@ -97,8 +97,8 @@ buildPythonPackage rec {
 
   pnpmDeps = fetchPnpmDeps {
     inherit pname version src;
-    fetcherVersion = 1;
-    hash = "sha256-kvLV/pCX/wQHG0ttrjSro7/CoQ5K1T0aFChafQOwvNw=";
+    fetcherVersion = 3;
+    hash = "sha256-p+RpEDVbdYmeSD4bB0oUMrTpsVDGYkqME13awnoTNd0=";
   };
 
   postBuild = ''

From f3224fa2ca0f6bee2a1bf185a3ee76c416f8f62a Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Thu, 26 Feb 2026 03:43:13 +0200
Subject: [PATCH 38/71] discourse: migrate from fetcherVersion = 1 to
 fetcherVersion = 3

---
 pkgs/servers/web-apps/discourse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix
index 061a2fe543c3..5c572d71511d 100644
--- a/pkgs/servers/web-apps/discourse/default.nix
+++ b/pkgs/servers/web-apps/discourse/default.nix
@@ -305,8 +305,8 @@ let
       pname = "discourse-assets";
       inherit version src;
       pnpm = pnpm;
-      fetcherVersion = 1;
-      hash = "sha256-/vPNHEB/ZuHWnSLqfz2NM/scSRH9wzotzjunDAw5Imc=";
+      fetcherVersion = 3;
+      hash = "sha256-xft/2x0iti0yJ53uI9q2+FSvKgWWfKQzlMlPFz3RZsE=";
     };
 
     nativeBuildInputs = runtimeDeps ++ [

From 9493e1a9c95306640b2781aa9ccf1600f9019deb Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Thu, 26 Feb 2026 03:50:40 +0200
Subject: [PATCH 39/71] flood: migrate from fetcherVersion = 1 to
 fetcherVersion = 3

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

diff --git a/pkgs/by-name/fl/flood/package.nix b/pkgs/by-name/fl/flood/package.nix
index 330d72f5f3f0..5842bd71ce81 100644
--- a/pkgs/by-name/fl/flood/package.nix
+++ b/pkgs/by-name/fl/flood/package.nix
@@ -30,8 +30,8 @@ buildNpmPackage rec {
       src
       ;
     pnpm = pnpm_9;
-    fetcherVersion = 1;
-    hash = "sha256-CT0e/IaAhFqRG+FdlA6ZIXOcmy1IzDdd677XV81SgHY=";
+    fetcherVersion = 3;
+    hash = "sha256-OqaRlqL08W8V35TYBk2mvgPDl58rLQV/avnSQGBvdNY=";
   };
 
   passthru = {

From 4c40c88521ea30b9ee8c854147643e7549de66fe Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 24 Apr 2026 21:48:17 +0300
Subject: [PATCH 40/71] ocis.web: migrate from fetcherVersion = 1 to
 fetcherVersion = 3

---
 pkgs/by-name/oc/ocis/web.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/oc/ocis/web.nix b/pkgs/by-name/oc/ocis/web.nix
index 9568c5c30b02..8aa78a3d340c 100644
--- a/pkgs/by-name/oc/ocis/web.nix
+++ b/pkgs/by-name/oc/ocis/web.nix
@@ -44,8 +44,8 @@ stdenvNoCC.mkDerivation rec {
       src
       ;
     pnpm = pnpm_9;
-    fetcherVersion = 1;
-    hash = "sha256-3Erva6srdkX1YQ727trx34Ufx524nz19MUyaDQToz6M=";
+    fetcherVersion = 3;
+    hash = "sha256-EsoGio2D8HZmbe+uuzsOhhwaLMSbJcfV4iUJUaqtA0M=";
   };
 
   meta = {

From 4599f379e8d06fafd0a15e1626206a257837a5ff Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 24 Apr 2026 21:48:17 +0300
Subject: [PATCH 41/71] custom-sidebar: migrate from fetcherVersion = 1 to
 fetcherVersion = 3

---
 .../custom-lovelace-modules/custom-sidebar/package.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix
index 98edabe58f96..4e56645c71d1 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix
@@ -21,8 +21,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
-    fetcherVersion = 1;
-    hash = "sha256-VbmbqTwuXfJQVSaQHGVwIZJf7350HsH+TGeVCtCXL38=";
+    fetcherVersion = 3;
+    hash = "sha256-gUVETXrl5rcXvn0YeKLfM+eErUpMxCuVlAOoyqQkLXs=";
   };
 
   nativeBuildInputs = [

From f5c91dbe823ee294806b0ecf10689d4f2265cac8 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Fri, 24 Apr 2026 21:51:14 +0300
Subject: [PATCH 42/71] rune: add progrm_jarvis to maintainers

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

diff --git a/pkgs/by-name/ru/rune/package.nix b/pkgs/by-name/ru/rune/package.nix
index dcaec79cc982..9e9cbc2e9d7e 100644
--- a/pkgs/by-name/ru/rune/package.nix
+++ b/pkgs/by-name/ru/rune/package.nix
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       asl20
       mit
     ];
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.progrm_jarvis ];
     mainProgram = "rune";
   };
 })

From 653246f3a001cf9256c5802696e22169a9b83bdf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Apr 2026 18:51:33 +0000
Subject: [PATCH 43/71] 
 vscode-extensions.divyanshuagrawal.competitive-programming-helper:
 2025.12.1766739309 -> 2026.4.1776958969

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 440021fdaebf..49a2cc3a6a94 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1375,8 +1375,8 @@ let
         mktplcRef = {
           name = "competitive-programming-helper";
           publisher = "DivyanshuAgrawal";
-          version = "2025.12.1766739309";
-          hash = "sha256-innqhXTflK6yS9n3Sw1sbRKT4/BT+Aa6hsKrc1pOsZ4=";
+          version = "2026.4.1776958969";
+          hash = "sha256-Ng9Yw1Jq2lSLqczHj6tjhtINfzx1bOXlVN0K1pogIKw=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/DivyanshuAgrawal.competitive-programming-helper/changelog";

From aa8de1459b3a1d3b27efe578916f068fed46fe66 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Fri, 24 Apr 2026 21:54:34 +0300
Subject: [PATCH 44/71] rune: add versionCheckHook

---
 pkgs/by-name/ru/rune/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/ru/rune/package.nix b/pkgs/by-name/ru/rune/package.nix
index 9e9cbc2e9d7e..27e7dbd86679 100644
--- a/pkgs/by-name/ru/rune/package.nix
+++ b/pkgs/by-name/ru/rune/package.nix
@@ -2,6 +2,7 @@
   lib,
   rustPlatform,
   fetchCrate,
+  versionCheckHook,
   nix-update-script,
 }:
 
@@ -21,6 +22,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     RUNE_VERSION = finalAttrs.version;
   };
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
   passthru.updateScript = nix-update-script { };
 
   meta = {

From 0de8465d2b54ddd962422706d932c3354b4237ec Mon Sep 17 00:00:00 2001
From: Jhony Elmer Angulo Fabian <leohjaf@gmail.com>
Date: Fri, 24 Apr 2026 15:14:33 -0500
Subject: [PATCH 45/71] codex: 0.124.0 -> 0.125.0

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

diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix
index 191d1c1dac3e..03387cde9e34 100644
--- a/pkgs/by-name/co/codex/package.nix
+++ b/pkgs/by-name/co/codex/package.nix
@@ -25,18 +25,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "codex";
-  version = "0.124.0";
+  version = "0.125.0";
 
   src = fetchFromGitHub {
     owner = "openai";
     repo = "codex";
     tag = "rust-v${finalAttrs.version}";
-    hash = "sha256-YFnzzwCm9/b30qLDMbkf/rEizuTjeqdCgoBZeS0wNBo=";
+    hash = "sha256-q175gmBw+edb5+w8TM36yUeFsyIdB1/IwWzbxBbBmoA=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/codex-rs";
 
-  cargoHash = "sha256-tuUY+Mg7DwYnYLt1zfqo0rrz5ip0fukxj947yBJAyks=";
+  cargoHash = "sha256-fDVlj7zAZnwP9YBaYaSQZXYYWrBm5IEyLT9zoorvzFg=";
 
   # Match upstream's release build (codex only) and drop the expensive
   # release profile tweaks that dominate cold build time in nixpkgs.

From a006263d626cf36bb87b42446b5bceee8ebc76f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Apr 2026 23:15:24 +0000
Subject: [PATCH 46/71] libretro.mame2015: 0-unstable-2026-03-31 ->
 0-unstable-2026-04-22

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

diff --git a/pkgs/applications/emulators/libretro/cores/mame2015.nix b/pkgs/applications/emulators/libretro/cores/mame2015.nix
index b181972e4111..6165afd0b93d 100644
--- a/pkgs/applications/emulators/libretro/cores/mame2015.nix
+++ b/pkgs/applications/emulators/libretro/cores/mame2015.nix
@@ -7,13 +7,13 @@
 }:
 mkLibretroCore {
   core = "mame2015";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-22";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mame2015-libretro";
-    rev = "48fdf6532f31e3bb8b58b9ae10198b047cd8de42";
-    hash = "sha256-z/SjAx615RZUOytoDPFFXl89E5063cbc0OFIV2/HZBo=";
+    rev = "b0cd015f4de7a3979374ab70613db65415e99477";
+    hash = "sha256-EyXnHzSbLD2yAGISX8obpAUM4toVobBxM/b/Fx1F9xY=";
   };
 
   patches = [ ./patches/mame2015-python311.patch ];

From c8f82c38f5ddd273eb125218c4837f0ef0d91d99 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 22 Apr 2026 11:42:21 +0000
Subject: [PATCH 47/71] python3Packages.rq: 2.7 -> 2.8

Diff: https://github.com/rq/rq/compare/v2.7...v2.8

Changelog: https://github.com/rq/rq/releases/tag/v2.8
---
 .../development/python-modules/rq/default.nix | 29 ++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix
index 246d508816a8..8f3c55996e7d 100644
--- a/pkgs/development/python-modules/rq/default.nix
+++ b/pkgs/development/python-modules/rq/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   buildPythonPackage,
+  pythonAtLeast,
 
   # build-system
   hatchling,
@@ -22,14 +23,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "rq";
-  version = "2.7";
+  version = "2.8";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "rq";
     repo = "rq";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-332K+n3mWf+k7/QvIFJFhuDXqd1t2p8ZVv/l+Y167Bk=";
+    hash = "sha256-ZO67rsqub9hBUt4XMqrx+P7Dj1dEKD9zp4O5x1Kehe0=";
   };
 
   build-system = [ hatchling ];
@@ -57,11 +59,24 @@ buildPythonPackage (finalAttrs: {
   # redisTestHook does not work on darwin-x86_64
   doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64);
 
-  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
-    # PermissionError: [Errno 13] Permission denied: '/tmp/rq-tests.txt'
-    "test_deleted_jobs_arent_executed"
-    "test_suspend_worker_execution"
-  ];
+  disabledTests =
+    lib.optionals
+      ((pythonAtLeast "3.14") && stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64)
+      [
+        # AssertionError
+        "test_create_job_with_ttl_should_expire"
+        "test_execution_order_with_dual_dependency"
+        "test_execution_order_with_sole_dependency"
+        "test_sigint_handling"
+        "test_successful_job_repeat"
+        "test_suspend_worker_execution"
+        "test_work"
+      ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # PermissionError: [Errno 13] Permission denied: '/tmp/rq-tests.txt'
+      "test_deleted_jobs_arent_executed"
+      "test_suspend_worker_execution"
+    ];
 
   pythonImportsCheck = [ "rq" ];
 

From eb1482cb4fe79edf2a1fe36e6b31a33580ba27a8 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 22 Apr 2026 12:07:50 +0000
Subject: [PATCH 48/71] python3Packages.django-rq: skip failing test

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

diff --git a/pkgs/development/python-modules/django-rq/default.nix b/pkgs/development/python-modules/django-rq/default.nix
index 43859c8dcbeb..a946f4d89b54 100644
--- a/pkgs/development/python-modules/django-rq/default.nix
+++ b/pkgs/development/python-modules/django-rq/default.nix
@@ -53,6 +53,11 @@ buildPythonPackage (finalAttrs: {
     export DJANGO_SETTINGS_MODULE=tests.settings
   '';
 
+  disabledTests = [
+    # ValueError: Job ID must only contain letters, numbers, underscores and dashes
+    "test_scheduled_jobs"
+  ];
+
   meta = {
     description = "Simple app that provides django integration for RQ (Redis Queue)";
     homepage = "https://github.com/rq/django-rq";

From 85b87c26b73486d0775256f9bb927c97922bcdc6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Apr 2026 00:14:06 +0000
Subject: [PATCH 49/71] libretro.beetle-wswan: 0-unstable-2026-03-31 ->
 0-unstable-2026-04-20

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

diff --git a/pkgs/applications/emulators/libretro/cores/beetle-wswan.nix b/pkgs/applications/emulators/libretro/cores/beetle-wswan.nix
index 5c971144454e..4bb8aeb1326b 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-wswan.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-wswan.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-wswan";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-wswan-libretro";
-    rev = "392db084316475411f3f24bd1ea54dba72ecbe51";
-    hash = "sha256-GbjE2PqfZGrP9tp4TgyIzdyyC1PatGiQRSscsmcIbPQ=";
+    rev = "da6d0d9acb8d4e9bd6725ab44225a275325d8352";
+    hash = "sha256-ky/8ywP7scg8VXpqwDISw3A0zKwWbh7zAdaLhM91+Rw=";
   };
 
   makefile = "Makefile";

From 7fe312478659d0b09312a072e54374f3f08e7cd5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Apr 2026 03:51:23 +0000
Subject: [PATCH 50/71] yggdrasil-ng: 0.1.4 -> 0.1.6

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

diff --git a/pkgs/by-name/yg/yggdrasil-ng/package.nix b/pkgs/by-name/yg/yggdrasil-ng/package.nix
index 7af423a0b2de..e4a109846271 100644
--- a/pkgs/by-name/yg/yggdrasil-ng/package.nix
+++ b/pkgs/by-name/yg/yggdrasil-ng/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage (oldAttrs: {
   pname = "yggdrasil-ng";
-  version = "0.1.4";
+  version = "0.1.6";
 
   src = fetchFromGitHub {
     owner = "Revertron";
     repo = "Yggdrasil-ng";
     tag = "v${oldAttrs.version}";
-    hash = "sha256-AutOV1FXBeiG9CNoVSili3sF+QndZI2L7b72jdPOe5E=";
+    hash = "sha256-nJLK5O2kjFRGZ3JwqwLHtYqvJfrOxtZOjdM6q2NNrbk=";
   };
 
-  cargoHash = "sha256-9/whbfM5fMZT6COo2HvdCmeCFC93NI1GXhGNAAaTiLM=";
+  cargoHash = "sha256-mJr8IMTbB+mSrsxzq6ehnfBueulNqZtxU/1aHAyv954=";
 
   __structuredAttrs = true;
 

From bf46485b356ca994ca87c9711843ca7df284ef74 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Apr 2026 04:02:52 +0000
Subject: [PATCH 51/71] beads: 1.0.0 -> 1.0.3

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

diff --git a/pkgs/by-name/be/beads/package.nix b/pkgs/by-name/be/beads/package.nix
index 388231d2c499..89e8f2686234 100644
--- a/pkgs/by-name/be/beads/package.nix
+++ b/pkgs/by-name/be/beads/package.nix
@@ -15,16 +15,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "beads";
-  version = "1.0.0";
+  version = "1.0.3";
 
   src = fetchFromGitHub {
     owner = "gastownhall";
     repo = "beads";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-D2jShGpkOWKx9aRmRvV5bmV8t0/Y2eAE8q0m54QrRN0=";
+    hash = "sha256-K3X67XgUl55mZS4r4V/KTbXPNqCV7fPHi8HnrDime+E=";
   };
 
-  vendorHash = "sha256-7DJgqJX2HDa9gcGD8fLNHLIXvGAEivYeDYx3snCUyCE=";
+  vendorHash = "sha256-Rn1MnasYUOBbIgjFx0E6R2Zak6la1VajDkHqoiFpHtw=";
 
   subPackages = [ "cmd/bd" ];
 

From a7aaaafb47a85cbc618e53fe5c5ac2245fbdd24a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Apr 2026 04:07:10 +0000
Subject: [PATCH 52/71] vscode-extensions.discloud.discloud: 2.28.5 -> 2.28.7

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 440021fdaebf..e29d41184518 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1346,8 +1346,8 @@ let
         mktplcRef = {
           publisher = "discloud";
           name = "discloud";
-          version = "2.28.5";
-          hash = "sha256-G5WgFSrmQOOtsDFfmJaJxvgbKfnpQSmMf+xAJeuhvhU=";
+          version = "2.28.7";
+          hash = "sha256-0RCuCZXDJ9svmI9Kc6vBE/l0f33aB3BXCFuHLFpa8nI=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/discloud.discloud/changelog";

From 1a49dc94e36ad57aaac27b9b92ff601ea22ffb40 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Apr 2026 04:26:01 +0000
Subject: [PATCH 53/71] vscode-extensions.ms-azuretools.vscode-containers:
 2.4.1 -> 2.4.2

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

diff --git a/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-containers/default.nix b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-containers/default.nix
index a1c5234b2f3d..b74a72a52c9e 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-containers/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-containers/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "ms-azuretools";
     name = "vscode-containers";
-    version = "2.4.1";
-    hash = "sha256-OwxJJVW15MivWVeSlbFQNQbrxjDgpXePrPf+r3qb+As=";
+    version = "2.4.2";
+    hash = "sha256-qkQAv53y+PVKJdReffjHwoJbvj20o4DF/c6omLIWB80=";
   };
 
   meta = {

From 3b5e86167e8d85d10cfd87b69a72a4f71f0cb4f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Apr 2026 04:56:39 +0000
Subject: [PATCH 54/71] tgeraser: 1.5.3 -> 1.5.4

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

diff --git a/pkgs/by-name/tg/tgeraser/package.nix b/pkgs/by-name/tg/tgeraser/package.nix
index a44f8806dd07..b73610efb6ba 100644
--- a/pkgs/by-name/tg/tgeraser/package.nix
+++ b/pkgs/by-name/tg/tgeraser/package.nix
@@ -6,14 +6,14 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "tgeraser";
-  version = "1.5.3";
+  version = "1.5.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "en9inerd";
     repo = "tgeraser";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PpqkjXI4bH7paLIRQihAEXByZJPqbkTm52280GLCF/Y=";
+    hash = "sha256-NvRS+No4RSnKh8RQfn+vGUVHnh7lqnSB8x8zFF4UrHY=";
   };
 
   build-system = [ python3Packages.setuptools ];

From ec35938da6c761236830dc66380b5445bc8e6b38 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Apr 2026 04:57:58 +0000
Subject: [PATCH 55/71] cargo-zigbuild: 0.22.1 -> 0.22.2

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

diff --git a/pkgs/by-name/ca/cargo-zigbuild/package.nix b/pkgs/by-name/ca/cargo-zigbuild/package.nix
index eb93138b5b41..8a4297d4d47e 100644
--- a/pkgs/by-name/ca/cargo-zigbuild/package.nix
+++ b/pkgs/by-name/ca/cargo-zigbuild/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-zigbuild";
-  version = "0.22.1";
+  version = "0.22.2";
 
   src = fetchFromGitHub {
     owner = "messense";
     repo = "cargo-zigbuild";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-t96yIRfXLGN92xoygl32Q1rpsebySdOsrmkwQ5zH5xQ=";
+    hash = "sha256-kQnbein4NcZ8IpwCsw7hg+d+Dlg1HChnjXp3lWzECrA=";
   };
 
-  cargoHash = "sha256-HOzkO81xVcKwe4ySe1IkOYcX5i1Un0mGNX7824/eh0k=";
+  cargoHash = "sha256-QUE7rNPe0eYPSA2Dd1pSsCz2B+ZLaZBZ+psEwTMdsZ0=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From 028c3b04bc3f9d7cbc81c0760727adb9b6ac9709 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Apr 2026 05:15:20 +0000
Subject: [PATCH 56/71] vscode-extensions.github.vscode-pull-request-github:
 0.136.0 -> 0.138.0

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 440021fdaebf..75ffaaac8a0b 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1986,8 +1986,8 @@ let
         mktplcRef = {
           publisher = "github";
           name = "vscode-pull-request-github";
-          version = "0.136.0";
-          hash = "sha256-WUdA5aD3EC45gHBo4ctxVUog8QTEIq6IXlCOPZBBXmo=";
+          version = "0.138.0";
+          hash = "sha256-tOqBBgA6HxBc5TT4/A3OWKxDvaoqw8zXCtMa+K3Ku1E=";
         };
         meta = {
           license = lib.licenses.mit;

From 6b6cfa2b475181dca4d72c055cd79cd833be772b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Apr 2026 05:44:03 +0000
Subject: [PATCH 57/71] pyrefly: 0.60.0 -> 0.62.0

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

diff --git a/pkgs/by-name/py/pyrefly/package.nix b/pkgs/by-name/py/pyrefly/package.nix
index 24f89b5ea9e0..896d4a94bce0 100644
--- a/pkgs/by-name/py/pyrefly/package.nix
+++ b/pkgs/by-name/py/pyrefly/package.nix
@@ -10,17 +10,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pyrefly";
-  version = "0.60.0";
+  version = "0.62.0";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "pyrefly";
     tag = finalAttrs.version;
-    hash = "sha256-3dvuhVyvVueXmQvxM9md8EK7u9TaiL+h4EBaKHnvcRc=";
+    hash = "sha256-5KGHm4dtpqeabv+Qw2FK4GvE5K6saUfyVInTrd3+MWI=";
   };
 
   buildAndTestSubdir = "pyrefly";
-  cargoHash = "sha256-lxtd9f1o/9sWBIv5f7FfZhM5SyUz/om5fswc+/vIhSk=";
+  cargoHash = "sha256-MWnz6KGrKduC2CmLcojd7I6C3M8PR9k3FgCWU+X+KCo=";
 
   buildInputs = [ rust-jemalloc-sys ];
 

From 9eed6ae8489a3ec5c258389ce52d3e71fe142cf6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Apr 2026 05:58:41 +0000
Subject: [PATCH 58/71] python3Packages.pyoverkiz: 1.20.1 -> 1.20.2

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

diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix
index aeb3153acd7c..1375a365b892 100644
--- a/pkgs/development/python-modules/pyoverkiz/default.nix
+++ b/pkgs/development/python-modules/pyoverkiz/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pyoverkiz";
-  version = "1.20.1";
+  version = "1.20.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "iMicknl";
     repo = "python-overkiz-api";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PaJ4AC0N82iGTsgP620uI6Iw9l0aHrR7UutWLYxrOYE=";
+    hash = "sha256-6KcxtHO+mwyKyb2MGGY80M40o2OKwLYPBANipb3ySAY=";
   };
 
   build-system = [ hatchling ];

From f0431ff157f8c6eb86a1aeb4b492b246b7a7e2eb Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Sat, 25 Apr 2026 09:25:45 +0300
Subject: [PATCH 59/71] mactracker: 7.13.5 -> 8.2.1

---
 doc/release-notes/rl-2605.section.md   | 2 ++
 pkgs/by-name/ma/mactracker/package.nix | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md
index e429d0aeb599..4dde72103dfb 100644
--- a/doc/release-notes/rl-2605.section.md
+++ b/doc/release-notes/rl-2605.section.md
@@ -135,6 +135,8 @@
 
 - `pulsar` has finally migrated from electron v12 to v30, backup `~/.pulsar` before upgrading. See [Pulsar on Electron 30: what it means for you](https://blog.pulsar-edit.dev/posts/20251202-savetheclocktower-pulsar-on-electron-30/).
 
+- `mactracker` has been updated to major version 8, which now [requires macOS 11 Big Sur or later](https://mactracker.ca/releasenotes-mac.html#:~:text=System%20requirements%20updated%20to%20macOS%2011%20Big%20Sur%20and%20later). The previous version supported Mac OS X 10.6.8 or later.
+
 - `bartender` has been updated to major version 6. This removes support for MacOS Sonoma (and adds support for Tahoe). For more information, see [the release notes](https://www.macbartender.com/Bartender6/release_notes/) or [the Bartender 6 support page](https://www.macbartender.com/Bartender6/support/).
 
 - `lima` has been updated from `1.x` to `2.x`. This major update includes several breaking changes, such as `/tmp/lima` no longer being mounted by default.
diff --git a/pkgs/by-name/ma/mactracker/package.nix b/pkgs/by-name/ma/mactracker/package.nix
index 849ae8502a7c..6ed1c53b5007 100644
--- a/pkgs/by-name/ma/mactracker/package.nix
+++ b/pkgs/by-name/ma/mactracker/package.nix
@@ -11,16 +11,16 @@
   common-updater-scripts,
   versionCheckHook,
   writeShellScript,
-  xcbuild,
+  re-plistbuddy,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "mactracker";
-  version = "7.13.5";
+  version = "8.2.1";
 
   src = fetchurl {
     url = "https://mactracker.ca/downloads/Mactracker_${finalAttrs.version}.zip";
-    hash = "sha256-VCcpEgMWo5U3BJpDSc0mQUIlmPuTKD7JBcmmKmYNf1Y=";
+    hash = "sha256-c78Bj63nJ+/qejUiD7hBEJlxubmIc+wElazwHGRRyfI=";
   };
 
   dontPatch = true;
@@ -58,7 +58,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = writeShellScript "version-check" ''
-    ${xcbuild}/bin/PlistBuddy -c "Print :CFBundleVersion" "$1"
+    ${lib.getExe' re-plistbuddy "PlistBuddy"} -c "Print :CFBundleVersion" "$1"
   '';
   versionCheckProgramArg = [ "${placeholder "out"}/Applications/Mactracker.app/Contents/Info.plist" ];
   doInstallCheck = true;

From 46ed45c6a3ecf0513bfd727a68488d761a84d85c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Apr 2026 06:27:13 +0000
Subject: [PATCH 60/71] libretro.genesis-plus-gx: 0-unstable-2026-04-03 ->
 0-unstable-2026-04-24

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

diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
index 824bb0b16e3d..5a7bc340b77e 100644
--- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
+++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "genesis-plus-gx";
-  version = "0-unstable-2026-04-03";
+  version = "0-unstable-2026-04-24";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "Genesis-Plus-GX";
-    rev = "b72b8c967adc50311dc3bb700c0818518bee74ef";
-    hash = "sha256-/wfV0+HfxJZigLHi8bkXVa9n/L9CRblt4BeHCMb5bjs=";
+    rev = "eb4216246a2590281ffaf4aa644155c8757025d2";
+    hash = "sha256-2gaPh3Z20eCKLQAcVs49v9R+4WjDQKdJqPWasRRwUa0=";
   };
 
   meta = {

From 545486213776ae113c3cf742f45f3a422a5d5dfc Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Sat, 25 Apr 2026 09:33:22 +0300
Subject: [PATCH 61/71] rapidapi: 4.4.3-4004003001 -> 4.5.5-4005005001

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

diff --git a/pkgs/by-name/ra/rapidapi/package.nix b/pkgs/by-name/ra/rapidapi/package.nix
index 48f041a3d4e2..9b5bdc7c5348 100644
--- a/pkgs/by-name/ra/rapidapi/package.nix
+++ b/pkgs/by-name/ra/rapidapi/package.nix
@@ -10,17 +10,16 @@
   common-updater-scripts,
   versionCheckHook,
   writeShellScript,
-  xcbuild,
-  coreutils,
+  re-plistbuddy,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "rapidapi";
-  version = "4.4.3-4004003001";
+  version = "4.5.5-4005005001";
 
   src = fetchurl {
     url = "https://cdn-builds.paw.cloud/paw/RapidAPI-${finalAttrs.version}.zip";
-    hash = "sha256-eckLVX/NnyYa2Ad1+D6RUxR6nGrRcG5HFkudhFWhII0=";
+    hash = "sha256-1UR7Lj/4fdhwYIvlWjso8tGDO+0sH8XkiysXN2i6/78=";
   };
 
   dontPatch = true;
@@ -59,8 +58,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = writeShellScript "version-check" ''
-    marketing_version=$(${xcbuild}/bin/PlistBuddy -c "Print :CFBundleShortVersionString" "$1" | ${coreutils}/bin/tr -d '"')
-    build_version=$(${xcbuild}/bin/PlistBuddy -c "Print :CFBundleVersion" "$1")
+    marketing_version=$(${lib.getExe' re-plistbuddy "PlistBuddy"} -c "Print :CFBundleShortVersionString" "$1")
+    build_version=$(${lib.getExe' re-plistbuddy "PlistBuddy"} -c "Print :CFBundleVersion" "$1")
     echo $marketing_version-$build_version
   '';
   versionCheckProgramArg = [ "${placeholder "out"}/Applications/RapidAPI.app/Contents/Info.plist" ];

From ba2918e316a24207e9f81251844cb36bd3347ee6 Mon Sep 17 00:00:00 2001
From: codgician <15964984+codgician@users.noreply.github.com>
Date: Sat, 25 Apr 2026 15:32:08 +0800
Subject: [PATCH 62/71] open-webui: 0.9.1 -> 0.9.2

Diff: https://github.com/open-webui/open-webui/compare/v0.9.1...v0.9.2

Changelog: https://github.com/open-webui/open-webui/blob/v0.9.2/CHANGELOG.md
---
 pkgs/by-name/op/open-webui/package.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix
index db3ee11e75e2..d959271bcbfc 100644
--- a/pkgs/by-name/op/open-webui/package.nix
+++ b/pkgs/by-name/op/open-webui/package.nix
@@ -9,13 +9,13 @@
 }:
 let
   pname = "open-webui";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "open-webui";
     repo = "open-webui";
     tag = "v${version}";
-    hash = "sha256-INUxpLGN+Jn2oYggA9kkp1zGY+LPQNXuRop4DaOi9Ps=";
+    hash = "sha256-NiB8V7B5H57t4NjKlAcQdK1E1dfS3nc/+8tWbSE3MBQ=";
   };
 
   frontend = buildNpmPackage rec {
@@ -32,7 +32,7 @@ let
       url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2";
     };
 
-    npmDepsHash = "sha256-tn76LGDLRaR87VM0pHgkutsbg4X4Kco04HwgGSS8Uug=";
+    npmDepsHash = "sha256-8bsC6LM+v7RTbhAjGYHKClKoiC/rLhzt+UGVp3CVDB0=";
 
     # See https://github.com/open-webui/open-webui/issues/15880
     npmFlags = [
@@ -99,7 +99,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
       argon2-cffi
       asgiref
       async-timeout
-      asyncpg
       authlib
       azure-ai-documentintelligence
       azure-identity
@@ -109,6 +108,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
       black
       boto3
       brotli
+      brotlicffi
       chardet
       chromadb
       cryptography
@@ -160,6 +160,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
       peewee-migrate
       pillow
       psutil
+      psycopg
       pyarrow
       pycrdt
       pydub
@@ -185,6 +186,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
       sentence-transformers
       sentencepiece
       soundfile
+      sqlalchemy
       starlette-compress
       starsessions
       tiktoken
@@ -194,7 +196,9 @@ python3Packages.buildPythonApplication (finalAttrs: {
       xlrd
       youtube-transcript-api
     ]
+    ++ psycopg.optional-dependencies.c
     ++ pyjwt.optional-dependencies.crypto
+    ++ sqlalchemy.optional-dependencies.asyncio
     ++ starsessions.optional-dependencies.redis;
 
   optional-dependencies = with python3Packages; {
@@ -215,7 +219,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
       azure-search-documents
       colbert-ai
       elasticsearch
-      firecrawl-py
       gcp-storage-emulator
       moto
       oracledb

From d6977b0525e8df90b91c2e88bb2fb33478ac54b9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Apr 2026 08:00:37 +0000
Subject: [PATCH 63/71] xremap: 0.15.1 -> 0.15.2

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

diff --git a/pkgs/by-name/xr/xremap/package.nix b/pkgs/by-name/xr/xremap/package.nix
index f94197d0e164..3ee0e4d02b91 100644
--- a/pkgs/by-name/xr/xremap/package.nix
+++ b/pkgs/by-name/xr/xremap/package.nix
@@ -58,13 +58,13 @@ assert (
 );
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "xremap${variant.suffix or ""}";
-  version = "0.15.1";
+  version = "0.15.2";
 
   src = fetchFromGitHub {
     owner = "xremap";
     repo = "xremap";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PvhpPdgAnCT8HaPEQHdTSympmGqRAK9/t3T5KEHovMM=";
+    hash = "sha256-J07iDGltzJg/2r+bUlBaOpZxAhg020J1giqbTZNSDRY=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -72,7 +72,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildNoDefaultFeatures = true;
   buildFeatures = variant.features;
 
-  cargoHash = "sha256-t32EVL8btJEeqWL5601+6pptT/Mt4KxMeVVlNo/nw5k=";
+  cargoHash = "sha256-iBlX0ikkzZu2VTKXF9UEe9qA+i9OjEOwWSpwvsqGPFQ=";
 
   passthru = lib.mapAttrs (name: lib.const (xremap.override { withVariant = name; })) variants;
 

From 87598330c166e5366d559b2c42527058e1871690 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Apr 2026 08:05:37 +0000
Subject: [PATCH 64/71] skills: 1.5.0 -> 1.5.1

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

diff --git a/pkgs/by-name/sk/skills/package.nix b/pkgs/by-name/sk/skills/package.nix
index a0a6c5205a03..7fbaff73ff6e 100644
--- a/pkgs/by-name/sk/skills/package.nix
+++ b/pkgs/by-name/sk/skills/package.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "skills";
-  version = "1.5.0";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "vercel-labs";
     repo = "skills";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cdundZSbWn8wXByYeXI4lQ3gWtBj3DkPQ37Py0bL3IY=";
+    hash = "sha256-JVJeottMyjxdiGPS7O4QsshKdbwbYcKMvwe/PB7I/Zw=";
   };
 
   pnpmDeps = fetchPnpmDeps {

From 5c0e95206f60d2fc39a13d5aad8d6b1d4de6aab8 Mon Sep 17 00:00:00 2001
From: Heinz Deinhart <heinz@nix.at>
Date: Sat, 25 Apr 2026 10:44:35 +0200
Subject: [PATCH 65/71] ddnet: 19.8.2 -> 19.8.3

https://ddnet.org/downloads/#19.8.3
https://github.com/ddnet/ddnet/compare/19.8.2...19.8.3
---
 pkgs/by-name/dd/ddnet/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/dd/ddnet/package.nix b/pkgs/by-name/dd/ddnet/package.nix
index e20f0259813e..ff19ad0993ee 100644
--- a/pkgs/by-name/dd/ddnet/package.nix
+++ b/pkgs/by-name/dd/ddnet/package.nix
@@ -32,13 +32,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ddnet";
-  version = "19.8.2";
+  version = "19.8.3";
 
   src = fetchFromGitHub {
     owner = "ddnet";
     repo = "ddnet";
     tag = version;
-    hash = "sha256-EBtcJZ+8AQfPftNiWFanX0bRb2zfMRK4i53J/pPdBEg=";
+    hash = "sha256-/SfUDliB6fdc/yf2yVXHiqYlH+cIIoxz3RkP8SxsgA4=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {

From 9a79399dfc45bd030223d43973096df87f5b281a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Apr 2026 08:54:34 +0000
Subject: [PATCH 66/71] libretro.o2em: 0-unstable-2026-03-31 ->
 0-unstable-2026-04-20

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

diff --git a/pkgs/applications/emulators/libretro/cores/o2em.nix b/pkgs/applications/emulators/libretro/cores/o2em.nix
index bce4470721ca..1b5d66d9b473 100644
--- a/pkgs/applications/emulators/libretro/cores/o2em.nix
+++ b/pkgs/applications/emulators/libretro/cores/o2em.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "o2em";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-o2em";
-    rev = "dee1076eb70c728d4ff47186aea9cd1c11ce7638";
-    hash = "sha256-djj7sEkUIoze1sZaZciIw7PdYDb1wETuZd4CFdZTiUM=";
+    rev = "e03d3be88f79fe940b933e53f1515d97313f6c59";
+    hash = "sha256-OSW81RXyXbv4s6hGDdQwE0FEk6xeeA0SM3d47M+mQVw=";
   };
 
   makefile = "Makefile";

From 5769517536ba8f8bb44ac12c13c7b22608ca0e96 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Apr 2026 10:05:34 +0000
Subject: [PATCH 67/71] python3Packages.python-iso639: 2026.1.31 -> 2026.4.20

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

diff --git a/pkgs/development/python-modules/python-iso639/default.nix b/pkgs/development/python-modules/python-iso639/default.nix
index 88f34647d506..3218ae1c1eec 100644
--- a/pkgs/development/python-modules/python-iso639/default.nix
+++ b/pkgs/development/python-modules/python-iso639/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "python-iso639";
-  version = "2026.1.31";
+  version = "2026.4.20";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jacksonllee";
     repo = "iso639";
     tag = "v${version}";
-    hash = "sha256-mavTbjf57EYUMil3DBOmTZl8WwRW7sjxddb4WuK+YlI=";
+    hash = "sha256-aXckFcWG8zcP9GELTT5eHnQzklAYG70LyX34fhVGdTo=";
   };
 
   build-system = [ setuptools ];

From 973798e2132772ab6bcf1b0fa3ad4ac9597e7bb2 Mon Sep 17 00:00:00 2001
From: Doro Rose <doroerose@gmail.com>
Date: Sat, 25 Apr 2026 12:05:17 +0200
Subject: [PATCH 68/71] emacs-macport: update patches for tree-sitter 0.26
 compatibility

---
 pkgs/applications/editors/emacs/sources.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix
index becbd58af1e9..fb9d9697cd85 100644
--- a/pkgs/applications/editors/emacs/sources.nix
+++ b/pkgs/applications/editors/emacs/sources.nix
@@ -146,6 +146,16 @@ in
         url = "https://cgit.git.savannah.gnu.org/cgit/emacs.git/patch/?id=8f535370b9efbc91673b20c6987a5cae4f6dc562";
         hash = "sha256-ny44eIi8DUa9pQhVGzhGz4H6FXU4+ki86SITLXhkwpw=";
       })
+      (fetchpatch {
+        # tree-sitter 0.26 compatibility fix, see https://bugs.gentoo.org/970856
+        url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/30.2/01_all_treesit-0.26.patch?id=d0f47979806d9be5a190fdb4ffa1bde439b2d616";
+        hash = "sha256-3pWeRxjAhr3ntBR3xDhoDUZDjU6xICU23NUpb/Vl6R4=";
+      })
+      (fetchpatch {
+        # tree-sitter 0.26 compatibility fix, see https://bugs.gentoo.org/971731
+        url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/30.2/02_all_ts-query-pred.patch?id=86190bf195b3e17108372d8ad89eb57037180dd2";
+        hash = "sha256-0GPyfKLSaB09a8hamrSf6lx4Qk8Big4AKMOivkN1wEM=";
+      })
     ];
   });
 }

From 2fe9c9f8462bd6b68f4b281123a845b4247508fb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 25 Apr 2026 12:21:40 +0200
Subject: [PATCH 69/71] python3Packages.python-iso639: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/python-iso639/default.nix b/pkgs/development/python-modules/python-iso639/default.nix
index 3218ae1c1eec..c30777c78f1f 100644
--- a/pkgs/development/python-modules/python-iso639/default.nix
+++ b/pkgs/development/python-modules/python-iso639/default.nix
@@ -6,7 +6,7 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "python-iso639";
   version = "2026.4.20";
   pyproject = true;
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "jacksonllee";
     repo = "iso639";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-aXckFcWG8zcP9GELTT5eHnQzklAYG70LyX34fhVGdTo=";
   };
 
@@ -27,10 +27,10 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/jacksonllee/iso639/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/jacksonllee/iso639/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     description = "ISO 639 language codes, names, and other associated information";
     homepage = "https://github.com/jacksonllee/iso639";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ dotlambda ];
   };
-}
+})

From 3cda8e0ac1bde697a408992fde68d63612ddd185 Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Sat, 25 Apr 2026 02:30:59 +0200
Subject: [PATCH 70/71] openvr: unbreak jsoncpp abi

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/by-name/op/openvr/package.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/op/openvr/package.nix b/pkgs/by-name/op/openvr/package.nix
index 65afa533f5b0..77f2baeaca4c 100644
--- a/pkgs/by-name/op/openvr/package.nix
+++ b/pkgs/by-name/op/openvr/package.nix
@@ -20,6 +20,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-xtCqro73fWQ6i0PiVmWYCK30DUSq1WeALoUolUjuWlE=";
   };
 
+  postUnpack = ''
+    # Move in-tree jsoncpp out to complement the patch above
+    # fetchpatch2 is not able to handle these renames
+    mkdir source/thirdparty
+    mv source/src/json source/thirdparty/jsoncpp
+  '';
+
   patches = [
     # https://github.com/ValveSoftware/openvr/pull/594
     (fetchpatch2 {
@@ -35,11 +42,10 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  postUnpack = ''
-    # Move in-tree jsoncpp out to complement the patch above
-    # fetchpatch2 is not able to handle these renames
-    mkdir source/thirdparty
-    mv source/src/json source/thirdparty/jsoncpp
+  postPatch = ''
+    # Fix jsoncpp ABI for downstream packages
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "-std=c++11" "-std=c++17"
   '';
 
   nativeBuildInputs = [

From fa95d7818af944768aa2fdab9e18eb4738aebc19 Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Fri, 24 Apr 2026 12:00:00 +0000
Subject: [PATCH 71/71] nix-du: 1.2.3 -> 1.2.4

---
 pkgs/by-name/ni/nix-du/package.nix            | 18 ++++++++----------
 pkgs/tools/package-management/lix/default.nix |  5 +++++
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ni/nix-du/package.nix b/pkgs/by-name/ni/nix-du/package.nix
index 94efdb5506d6..6032dbd53055 100644
--- a/pkgs/by-name/ni/nix-du/package.nix
+++ b/pkgs/by-name/ni/nix-du/package.nix
@@ -3,36 +3,34 @@
   fetchFromGitHub,
   rustPlatform,
   nixVersions,
-  nlohmann_json,
-  boost,
+  nix ? nixVersions.nix_2_34,
   graphviz,
   pkg-config,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nix-du";
-  version = "1.2.3";
+  version = "1.2.4";
 
   src = fetchFromGitHub {
     owner = "symphorien";
     repo = "nix-du";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/Afp0InA/0xXdombAzylYJF9wcv5WwYizVsP+fHTDrM=";
+    hash = "sha256-pqsBWdCdLEdkubcVMuZzF425oU2zgsMSPeDElM+zYBE=";
   };
 
-  cargoHash = "sha256-Q/woxGh1I6FpgJ5D0x7KovSwuRXfZzqjzwljaoKj0/Y=";
+  cargoHash = "sha256-xotbDCuWUeahVsRoOiBdZDC3JpK2a9osbSyVtUyaBrg=";
 
   doCheck = true;
   nativeCheckInputs = [
-    nixVersions.nix_2_28
+    nix
     graphviz
   ];
 
   buildInputs = [
-    boost
-    nixVersions.nix_2_28
-    nlohmann_json
-  ];
+    nix
+  ]
+  ++ nix.buildInputs;
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index 8ebcd187f4a3..1cd1b4420819 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -20,6 +20,7 @@
   nixpkgs-reviewFull,
   nil,
   nix-direnv,
+  nix-du,
   nix-fast-build,
   haskell,
   nix-serve-ng,
@@ -127,6 +128,10 @@ let
             nix = self.lix;
           };
 
+          nix-du = nix-du.override {
+            nix = self.lix;
+          };
+
           nix-eval-jobs = self.callPackage (callPackage ./common-nix-eval-jobs.nix nix-eval-jobs-args) {
             stdenv = lixStdenv;
           };