Merge master into staging-nixos

2026-04-18 12:13:55 +00:00
parent 7fadce2f9e 7df5250274
commit 420db8944e
40 changed files with 721 additions and 108 deletions
@@ -5478,6 +5478,16 @@
    githubId = 32609395;
    name = "B YI";
  };
+  coolGi = {
+    email = "me@coolgi.dev";
+    github = "coolGi69";
+    githubId = 57488297;
+    name = "coolGi";
+    matrix = "@me:coolgi.dev";
+    keys = [
+      { fingerprint = "1E3E C960 F2C0 9128 5398  A4A9 28B0 7544 198A DB06"; }
+    ];
+  };
  corbanr = {
    email = "corban@raunco.co";
    github = "CorbanR";
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
  core = "stella2014";
-  version = "0-unstable-2024-10-21";
+  version = "0-unstable-2026-04-12";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "stella2014-libretro";
-    rev = "3cc89f0d316d6c924a5e3f4011d17421df58e615";
-    hash = "sha256-2gnFWau7F45SdzoqDUlqYXfXVE1EUPozHZv7BhyRRIA=";
+    rev = "eed47e154d1bbda3305e9ef2d486b6710c8973f4";
+    hash = "sha256-QpPjVnFCkn6xlB7LxpE6bsNfYe3HSsEKUjqmEf2yTvA=";
  };

  makefile = "Makefile";
@@ -10,16 +10,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "asak";
-  version = "0.3.7";
+  version = "0.4.0";

  src = fetchFromGitHub {
    owner = "chaosprint";
    repo = "asak";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-/c7E8q7Kx6BewzJoB+nvktX1yzybH+HGSOMgdOk8GVA=";
+    hash = "sha256-MLc4OYsArdOWmoAqh2XTi3yQjI1uE7VwvTQ5D0Z1rfI=";
  };

-  cargoHash = "sha256-vj88bErQ3STrY4nN8XoC2QMISW1Qt5963QqIYhwCIKM=";
+  cargoHash = "sha256-sWyMJLyRFYPjnnaKWidVRwgNFlJbhcTBkciwF53e758=";

  nativeBuildInputs = [
    pkg-config
@@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cargo-deny";
-  version = "0.19.1";
+  version = "0.19.4";

  src = fetchFromGitHub {
    owner = "EmbarkStudios";
    repo = "cargo-deny";
    tag = finalAttrs.version;
-    hash = "sha256-iS0MDeQhUCP/JBT9Lyos3s+zCeL5qe83lvsMGz7Hndg=";
+    hash = "sha256-faONVJNllTyWWdyNaOUgphZkCXOwXQ5521Nll+yw+qE=";
  };

-  cargoHash = "sha256-LuUlPBLcThaN36ZAUbjAZ4+M/526WJBGUlUAfmNVKvs=";
+  cargoHash = "sha256-NjGGe5K0fpS9EDfuSOmBi9BGiObh8XITHQoSb7iktWc=";

  nativeBuildInputs = [
    pkg-config
@@ -8,11 +8,11 @@

 buildGraalvmNativeImage (finalAttrs: {
  pname = "cljfmt";
-  version = "0.16.3";
+  version = "0.16.4";

  src = fetchurl {
    url = "https://github.com/weavejester/cljfmt/releases/download/${finalAttrs.version}/cljfmt-${finalAttrs.version}-standalone.jar";
-    hash = "sha256-V9fPLD2fbeaKLbGrVEk6hqCkHf/L49pxm6CmX/EnTno=";
+    hash = "sha256-6GTK/QH0z7Qox5JFGWu4hacGiLvBVmJQHvw0K2sMMAw=";
  };

  extraNativeImageBuildArgs = [
@@ -9,13 +9,13 @@

 stdenvNoCC.mkDerivation rec {
  pname = "cloudlog";
-  version = "2.8.10";
+  version = "2.8.12";

  src = fetchFromGitHub {
    owner = "magicbug";
    repo = "Cloudlog";
    rev = version;
-    hash = "sha256-i/0GNVLvF0jHF83Ee9GCo80xeHoQb18OLmSZL++OTEo=";
+    hash = "sha256-9NC9hon+okj4jmOY0TMoDUPELDObJiermqSfgmf0gyY=";
  };

  postPatch = ''
@@ -1,22 +1,22 @@
 {
-  "version": "3.0.16",
+  "version": "3.1.15",
  "vscodeVersion": "1.105.1",
  "sources": {
    "x86_64-linux": {
-      "url": "https://downloads.cursor.com/production/475871d112608994deb2e3065dfb7c6b0baa0c54/linux/x64/Cursor-3.0.16-x86_64.AppImage",
-      "hash": "sha256-dN8tFSppIpO/P0Thst5uaNzlmfWZDh0Y81Lx1BuSYt0="
+      "url": "https://downloads.cursor.com/production/3a67af7b780e0bfc8d32aefa96b8ff1cb8817f88/linux/x64/Cursor-3.1.15-x86_64.AppImage",
+      "hash": "sha256-7Lgrb0SAkkm8+LZInhXLrQHoDLJa63+KvGStp03jepc="
    },
    "aarch64-linux": {
-      "url": "https://downloads.cursor.com/production/475871d112608994deb2e3065dfb7c6b0baa0c54/linux/arm64/Cursor-3.0.16-aarch64.AppImage",
-      "hash": "sha256-AJwCzST0fj8fjSVeK15uE50XWGIOLOwn4gRRB733eLg="
+      "url": "https://downloads.cursor.com/production/3a67af7b780e0bfc8d32aefa96b8ff1cb8817f88/linux/arm64/Cursor-3.1.15-aarch64.AppImage",
+      "hash": "sha256-kZf4qmOdtp3HFe/L6yehZ0cg5DklJwg+Lmnlhn6KBRM="
    },
    "x86_64-darwin": {
-      "url": "https://downloads.cursor.com/production/475871d112608994deb2e3065dfb7c6b0baa0c54/darwin/x64/Cursor-darwin-x64.dmg",
-      "hash": "sha256-8pGWntBuY6hwIuQ3x5yF93j0++3gB+wg/KsVfIVWUgI="
+      "url": "https://downloads.cursor.com/production/3a67af7b780e0bfc8d32aefa96b8ff1cb8817f88/darwin/x64/Cursor-darwin-x64.dmg",
+      "hash": "sha256-GIBT7DU+J/hQ/qbDUdgRrO24z66JASQlfRpVFBsCiw0="
    },
    "aarch64-darwin": {
-      "url": "https://downloads.cursor.com/production/475871d112608994deb2e3065dfb7c6b0baa0c54/darwin/arm64/Cursor-darwin-arm64.dmg",
-      "hash": "sha256-HHd3CpSlGpuRUjakSCBRp3q3RYhiOapBKqblRNiQaZI="
+      "url": "https://downloads.cursor.com/production/3a67af7b780e0bfc8d32aefa96b8ff1cb8817f88/darwin/arm64/Cursor-darwin-arm64.dmg",
+      "hash": "sha256-NouEzXpKO2A3/y8FCNTXspm+Rim6a5Yi1yS1kLeevi8="
    }
  }
 }
@@ -16,18 +16,18 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "devcontainer";
-  version = "0.85.0";
+  version = "0.86.0";

  src = fetchFromGitHub {
    owner = "devcontainers";
    repo = "cli";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-NYRnc6yXMDspb9bXMlxDUqYaH6Dp/Kmo6VgAQ0kDh+c=";
+    hash = "sha256-LVvd6BirKwGUWqTG50U7tnXjPwyUVgxVkAoAdCyiQfk=";
  };

  yarnOfflineCache = fetchYarnDeps {
    yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-py5ArB/mqWCu2bKWJB83kT+my6nn/FU9FPOSjbxwbL4=";
+    hash = "sha256-h13YptkTbORwB8XRDGmmcnFSjZO7icwlqRC3U4qlJ2g=";
  };

  nativeBuildInputs = [
@@ -7,37 +7,43 @@
  python3,
 }:

-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
  pname = "dmtcp";
-  version = "unstable-2022-02-28";
+  version = "4.1.0";

  src = fetchFromGitHub {
    owner = "dmtcp";
    repo = "dmtcp";
-    rev = "133687764c6742906006a1d247e3b83cd860fa1d";
-    hash = "sha256-9Vr8IhoeATCfyt7Lp7kYe/7e87mFX9KMNGTqxJgIztE=";
+    tag = finalAttrs.version;
+    hash = "sha256-5laifZ/8oYJrNO5JOggCbPKmA9XiHEC79C/hk+0TdeQ=";
  };

  dontDisableStatic = true;

+  nativeCheckInputs = [
+    perl
+    python3
+  ];
+  env.HAS_PYTHON3 = "yes";
+
  patches = [ ./ld-linux-so-buffer-size.patch ];

  postPatch = ''
    patchShebangs .

    substituteInPlace configure \
-      --replace '#define ELF_INTERPRETER "$interp"' \
-                "#define ELF_INTERPRETER \"$(cat $NIX_CC/nix-support/dynamic-linker)\""
+      --replace-fail '#define ELF_INTERPRETER \"$interp\"' \
+                "#define ELF_INTERPRETER \\\"$(cat $NIX_CC/nix-support/dynamic-linker)\\\""
    substituteInPlace src/restartscript.cpp \
-      --replace /bin/bash ${stdenv.shell}
+      --replace-fail /bin/bash ${stdenv.shell}
    substituteInPlace util/dmtcp_restart_wrapper.sh \
-      --replace /bin/bash ${stdenv.shell}
+      --replace-fail /bin/bash ${stdenv.shell}
    substituteInPlace test/autotest.py \
-      --replace /bin/bash ${bash}/bin/bash \
-      --replace /usr/bin/perl ${perl}/bin/perl \
-      --replace /usr/bin/python ${python3.interpreter} \
-      --replace "os.environ['USER']" "\"nixbld1\"" \
-      --replace "os.getenv('USER')" "\"nixbld1\""
+      --replace-fail /bin/bash ${bash}/bin/bash \
+      --replace-fail /usr/bin/perl ${perl}/bin/perl \
+      --replace-fail '/usr/bin/env python3' ${python3.interpreter} \
+      --replace-fail "os.environ['USER']" "\"nixbld1\"" \
+      --replace-fail "os.getenv('USER')" "\"nixbld1\""
  '';

  meta = {
@@ -48,8 +54,10 @@ stdenv.mkDerivation {
      programs spread across many machines and connected by sockets. It does
      not modify the user's program or the operating system.
    '';
-    homepage = "http://dmtcp.sourceforge.net/";
+    homepage = "http://dmtcp.github.io/";
    license = lib.licenses.lgpl3Plus; # most files seem this or LGPL-2.1+
-    platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86; # broken on ARM and Darwin
+    platforms = lib.intersectLists lib.platforms.linux (
+      lib.platforms.x86 ++ lib.platforms.aarch ++ lib.platforms.riscv
+    );
  };
-}
+})
@@ -24,7 +24,7 @@ let
 in
 buildGo126Module (finalAttrs: {
  pname = "gotenberg";
-  version = "8.30.1";
+  version = "8.31.0";

  outputs = [
    "out"
@@ -35,10 +35,10 @@ buildGo126Module (finalAttrs: {
    owner = "gotenberg";
    repo = "gotenberg";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-kK+l1v+G8G7oBR8DVsROD3Z7lymiFZrJY3K0W9G9npI=";
+    hash = "sha256-+OTQwby2tTXGDGsuI0CW7B6RKKBvtoa/AlCyf6fdPO4=";
  };

-  vendorHash = "sha256-XhKf0Kucp6bGjw3UXXV86gsyaDyk5nS2acc4PgVs9yw=";
+  vendorHash = "sha256-s9lv2HzFxNh8ij3h2doQkjozpUqKEvVHnpXneEvK0/Y=";

  postPatch = ''
    find ./pkg -name '*_test.go' -exec sed -i -e 's#/tests#${finalAttrs.src}#g' {} \;
@@ -0,0 +1,30 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "mdterm";
+  version = "2.0.0";
+
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "bahdotsh";
+    repo = "mdterm";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-a4Ba5QdrLuLgfB/QVpUYEpQ6rRSqTdz8zXcLwOGzjJM=";
+  };
+
+  cargoHash = "sha256-YUPKUFfbzL/1peXEAX5EDehWq4hFwxJLkP2DBDkY23E=";
+
+  meta = {
+    description = "A terminal-based Markdown browser";
+    homepage = "https://github.com/bahdotsh/mdterm";
+    changelog = "https://github.com/bahdotsh/mdterm/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    mainProgram = "mdterm";
+    maintainers = with lib.maintainers; [ pborzenkov ];
+  };
+})
@@ -7,16 +7,16 @@

 buildGoModule (finalAttrs: {
  pname = "nuclei";
-  version = "3.7.1";
+  version = "3.8.0";

  src = fetchFromGitHub {
    owner = "projectdiscovery";
    repo = "nuclei";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-PiuFlEIEQNsVLLwHVDi+b/ABPyrp4+hnO6JjLGHxWc0=";
+    hash = "sha256-jzXV9QBpeH26nrViHdKR6Id7Dkdl0Ob1r71RhorCJvM=";
  };

-  vendorHash = "sha256-eevywU57QoA2K/Fl4XQZwaiyGCiGDrkvAdco6khcInc=";
+  vendorHash = "sha256-dxyyaletTVud6p81QzOsitw7m4yAZG3r1ZoEb2vQqOY=";

  proxyVendor = true; # hash mismatch between Linux and Darwin

@@ -3,7 +3,7 @@
  fetchurl,
  lib,
  makeWrapper,
-  electron,
+  electron_39, # as in upstream bundle, see https://github.com/NixOS/nixpkgs/pull/510075
  makeDesktopItem,
  imagemagick,
  autoPatchelfHook,
@@ -26,6 +26,7 @@ let
      zaninime
      kashw2
      w-lfchen
+      prince213
    ];

    platforms = [
@@ -79,7 +80,7 @@ let
    installPhase = ''
      runHook preInstall
      mkdir -p $out/bin
-      makeWrapper ${electron}/bin/electron $out/bin/obsidian \
+      makeWrapper ${electron_39}/bin/electron $out/bin/obsidian \
        --add-flags $out/share/obsidian/app.asar \
        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-wayland-ime=true --wayland-text-input-version=3}}" \
        --add-flags ${lib.escapeShellArg commandLineArgs}
@@ -0,0 +1,44 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  nix-update-script,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "pdf-oxide";
+  version = "0.3.32";
+
+  src = fetchFromGitHub {
+    owner = "yfedoseev";
+    repo = "pdf_oxide";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-z6dc+GWOovF31yhZIJsg/0FWmSHizk+BpipdrJmoxwI=";
+  };
+
+  cargoHash = "sha256-0GCBraW4m7/3xUbt8wLrEle/9vn1nOtyNqIwfn19vN8=";
+  __structuredAttrs = true;
+
+  cargoBuildFlags = [
+    "--package=pdf_oxide_cli"
+    "--package=pdf_oxide_mcp"
+  ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Fastest PDF library for text extraction, image extraction, and markdown conversion";
+    homepage = "https://github.com/yfedoseev/pdf_oxide";
+    changelog = "https://github.com/yfedoseev/pdf_oxide/releases/tag/${finalAttrs.src.tag}";
+    license = with lib.licenses; [
+      mit
+      asl20
+    ];
+    mainProgram = "pdf-oxide";
+    maintainers = with lib.maintainers; [ daspk04 ];
+  };
+})
@@ -7,13 +7,13 @@

 stdenvNoCC.mkDerivation {
  pname = "retroarch-assets";
-  version = "1.22.0-unstable-2026-04-09";
+  version = "1.22.0-unstable-2026-04-11";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "retroarch-assets";
-    rev = "9ba4071d04cbd00404a52b5c6c41cf9d3cf218fb";
-    hash = "sha256-K3EtqRStUSJwRxX0OeFPtnjuX0aV5DHcr/d4YvZgb1c=";
+    rev = "cd17f64cff4eaff187a0702d17520ccb9a760fe3";
+    hash = "sha256-v+zHGv7hMZ0Esq36hb+CvfnxEUtDjCAWwrRxmtLiiGY=";
  };

  makeFlags = [
@@ -20,20 +20,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "seerr";
-  version = "3.1.1";
+  version = "3.2.0";

  src = fetchFromGitHub {
    owner = "seerr-team";
    repo = "seerr";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-D9rkOG2a9k/Rq4fwXiCYvcecTDf5Yn3+hEmcY1XDZpk=";
+    hash = "sha256-rZ4o0ccfQjZBzWItEEFfxVi/cNO3HWnoDeNGpQ94H6E=";
  };

  pnpmDeps = fetchPnpmDeps {
    inherit (finalAttrs) pname version src;
    inherit pnpm;
    fetcherVersion = 3;
-    hash = "sha256-i6yWJ6iFIdfTKUkMsHEtoii0WkieTLBn5EG8dGdIyDM=";
+    hash = "sha256-j/qMS792IFr0Cn/cFUargHSOTw4vz79kr58XhJVikBQ=";
  };

  buildInputs = [ sqlite ];
@@ -9,16 +9,16 @@

 buildGoModule rec {
  pname = "src-cli";
-  version = "7.0.3";
+  version = "7.1.0";

  src = fetchFromGitHub {
    owner = "sourcegraph";
    repo = "src-cli";
    rev = version;
-    hash = "sha256-B0ESsPbB4rWRLpOnU/ugVakUaduAGCs7n+XEDIYwUxs=";
+    hash = "sha256-OC2ElMud6UBDAzCHILb2fd2pO5yy8JsDziTNvSZybIU=";
  };

-  vendorHash = "sha256-WB7lXLnWsQLLfzlAyFbEbfsaTY2wbRyqsQ0PdRF1/tk=";
+  vendorHash = "sha256-oPHDdWDbVuqWeutzHCv7rL9/FrbGkbLQezpZDUFVNfY=";

  subPackages = [
    "cmd/src"
@@ -8,13 +8,13 @@

 buildGoModule (finalAttrs: {
  pname = "threatest";
-  version = "1.2.6";
+  version = "1.3.0";

  src = fetchFromGitHub {
    owner = "DataDog";
    repo = "threatest";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-ieOfCOgEdhfFJbv3wIfC1/QyTrDkq1k6ypbmcgXOpVE=";
+    hash = "sha256-BMx+6InL5FF2MH83C6UJ50CSm0Zd69Fs6uwFnunvmqs=";
  };

  proxyVendor = true;
@@ -0,0 +1,352 @@
+[
+  {
+    "pname": "AsyncImageLoader.Avalonia",
+    "version": "3.5.0",
+    "hash": "sha256-KBn0YY8RFE5SXwPdla1+ux/rC+DFTYllOkuGtR1iQZ8="
+  },
+  {
+    "pname": "Avalonia",
+    "version": "11.3.11",
+    "hash": "sha256-FSMuXVA5q5L5evwos5bIsuT81suO8FbCjEF3OvAL9p0="
+  },
+  {
+    "pname": "Avalonia.Angle.Windows.Natives",
+    "version": "2.1.25547.20250602",
+    "hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M="
+  },
+  {
+    "pname": "Avalonia.BuildServices",
+    "version": "11.3.2",
+    "hash": "sha256-6wx06tjSKWQOlX2czdp6Wh0nuwVapx5qf/s8Qj5we40="
+  },
+  {
+    "pname": "Avalonia.Controls.ColorPicker",
+    "version": "11.3.11",
+    "hash": "sha256-Ki6O9HYbseQPV3DsvwmJ+ERimi/WmvzelNJDKP6loo0="
+  },
+  {
+    "pname": "Avalonia.Controls.DataGrid",
+    "version": "11.3.11",
+    "hash": "sha256-xCRjXSd7ocHxuEzBhLokSHRrgtt4akJ7LUIC2oQ43io="
+  },
+  {
+    "pname": "Avalonia.Desktop",
+    "version": "11.3.11",
+    "hash": "sha256-oFivO8/0rir4BwQsTeWs3bSnb7RmldwxYmI77j5pt8k="
+  },
+  {
+    "pname": "Avalonia.Diagnostics",
+    "version": "11.3.11",
+    "hash": "sha256-p38+O0VDqZ8u5VOzImP21/U5wyP1BUp2UrLLc9HSfwE="
+  },
+  {
+    "pname": "Avalonia.Fonts.Inter",
+    "version": "11.3.11",
+    "hash": "sha256-S0DWwcZHulVUIckiv2HM1Vbqno64c/Xt+mPhZp1tfsA="
+  },
+  {
+    "pname": "Avalonia.FreeDesktop",
+    "version": "11.3.11",
+    "hash": "sha256-UE2/w9cw3YDzsw3HuhI2sTPy8reH9C71ufmHOpzvlSQ="
+  },
+  {
+    "pname": "Avalonia.Native",
+    "version": "11.3.11",
+    "hash": "sha256-vw67lp/oOt+2lqdJ5PK2FY93jqPTcgZqOAXLtSXlJ8s="
+  },
+  {
+    "pname": "Avalonia.Remote.Protocol",
+    "version": "11.3.11",
+    "hash": "sha256-l1f3rVygtI268llwbN0NvTDSfXwZE3CyRw8w5tbHBC4="
+  },
+  {
+    "pname": "Avalonia.Skia",
+    "version": "11.3.11",
+    "hash": "sha256-89TGu50JfEVFo+QZgyOR0uOagC/xoJvqfnrHep3W/cc="
+  },
+  {
+    "pname": "Avalonia.Themes.Fluent",
+    "version": "11.3.11",
+    "hash": "sha256-tiJ0xAFf0UVSH7LASPtg/7ils7+vZjw2UKBMydyUR3Q="
+  },
+  {
+    "pname": "Avalonia.Themes.Simple",
+    "version": "11.3.11",
+    "hash": "sha256-AJS5Ls0tJ6PCr2mnr1PpxGWX4sII8mpe2R+VCFYRg44="
+  },
+  {
+    "pname": "Avalonia.Win32",
+    "version": "11.3.11",
+    "hash": "sha256-6/NG4OrB/4YisXzJ51GPuq3uDn8oEUWyJRAqejyMCQw="
+  },
+  {
+    "pname": "Avalonia.X11",
+    "version": "11.3.11",
+    "hash": "sha256-2fiQvKxU/r71UOAQgy0zwSHVCM2uG2sdEUhObd5TrQQ="
+  },
+  {
+    "pname": "CodingSeb.Localization",
+    "version": "1.4.0",
+    "hash": "sha256-+GdBrmIyOHoN6dJQie7lNZ4IO0uCI20Qzz/Ka4dUFsA="
+  },
+  {
+    "pname": "CodingSeb.Localization.Avalonia",
+    "version": "1.4.1",
+    "hash": "sha256-nYSkSpBvPUBr1zI78IeR4hQ2GaxfcNjuphS2XaV+uu4="
+  },
+  {
+    "pname": "CommunityToolkit.Mvvm",
+    "version": "8.4.0",
+    "hash": "sha256-a0D550q+ffreU9Z+kQPdzJYPNaj1UjgyPofLzUg02ZI="
+  },
+  {
+    "pname": "EmbedIO",
+    "version": "3.5.2",
+    "hash": "sha256-e6GfVHXxYeUw3ntCrHokNoAS6mXArO7+vdMeUFnsSo8="
+  },
+  {
+    "pname": "HarfBuzzSharp",
+    "version": "8.3.1.1",
+    "hash": "sha256-614yv6bK9ynhdUnvW4wIkgpBe2sqTh28U9cDZzdhPc0="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Linux",
+    "version": "8.3.1.1",
+    "hash": "sha256-sBbez6fc9axVcsBbIHbpQh/MM5NHlMJgSu6FyuZzVyU="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.macOS",
+    "version": "8.3.1.1",
+    "hash": "sha256-hK20KbX2OpewIO5qG5gWw5Ih6GoLcIDgFOqCJIjXR/Q="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
+    "version": "8.3.1.1",
+    "hash": "sha256-mLKoLqI47ZHXqTMLwP1UCm7faDptUfQukNvdq6w/xxw="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Win32",
+    "version": "8.3.1.1",
+    "hash": "sha256-Um4iwLdz9XtaDSAsthNZdev6dMiy7OBoHOrorMrMYyo="
+  },
+  {
+    "pname": "Material.Icons",
+    "version": "2.4.1",
+    "hash": "sha256-+LTHyF3f7QqkfVQM2pjIA7GpT5Gj5/BoLDSjZKhBl1M="
+  },
+  {
+    "pname": "Material.Icons.Avalonia",
+    "version": "2.4.1",
+    "hash": "sha256-gONbczMJ3THUicrnoCGtBLaYuNDfge/qVF+0ASAGGd8="
+  },
+  {
+    "pname": "MicroCom.Runtime",
+    "version": "0.11.0",
+    "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="
+  },
+  {
+    "pname": "Microsoft.Data.Sqlite.Core",
+    "version": "10.0.2",
+    "hash": "sha256-gpArXkjFSk62NA88ZYwWc0m4/2UsJyd9/8TCAsI8u4w="
+  },
+  {
+    "pname": "Microsoft.EntityFrameworkCore",
+    "version": "10.0.2",
+    "hash": "sha256-FS6T8EnaWCMtj4PnZhh+oF8mcM44VlM3wkTSMlpte9A="
+  },
+  {
+    "pname": "Microsoft.EntityFrameworkCore.Abstractions",
+    "version": "10.0.2",
+    "hash": "sha256-qkDfIJpcPO2kk4n5OE/13hI/0mUygpTofInn95XjRZI="
+  },
+  {
+    "pname": "Microsoft.EntityFrameworkCore.Analyzers",
+    "version": "10.0.2",
+    "hash": "sha256-yOv78rgAACBz1zjitpcZbQQ3zx8huJongZTHkhN4PQ0="
+  },
+  {
+    "pname": "Microsoft.EntityFrameworkCore.Relational",
+    "version": "10.0.2",
+    "hash": "sha256-Y4jPpoYhKizg5wF6QfkBX4sYlE2FU1bYhfoDN3xkhKM="
+  },
+  {
+    "pname": "Microsoft.EntityFrameworkCore.Sqlite",
+    "version": "10.0.2",
+    "hash": "sha256-s/bwWC9SdFKr93Oz57pImCB6hf/FYa+sCxtMYC7w+vQ="
+  },
+  {
+    "pname": "Microsoft.EntityFrameworkCore.Sqlite.Core",
+    "version": "10.0.2",
+    "hash": "sha256-oIw6neqiY9JUyYg1lNi92ddDq6pWVOsn7DIBlGPOh+A="
+  },
+  {
+    "pname": "Microsoft.Extensions.Caching.Abstractions",
+    "version": "10.0.2",
+    "hash": "sha256-nKmQuZTt1g5/8gBajo7wdCV64kdCucdiQR8JTt7ZZb0="
+  },
+  {
+    "pname": "Microsoft.Extensions.Caching.Memory",
+    "version": "10.0.2",
+    "hash": "sha256-sRUF7DM0s1yzZnfjM/hF9A/IysE6Er23gZ6jST+RWh0="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Abstractions",
+    "version": "10.0.2",
+    "hash": "sha256-P+0kaDGO+xB9KxF9eWHDJ4hzi05sUGM/uMNEX5NdBTE="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection",
+    "version": "10.0.2",
+    "hash": "sha256-/9UWQRAI2eoocnJWWf1ktnAx/1Gt65c16fc0Xqr9+CQ="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "10.0.2",
+    "hash": "sha256-UF9T13V5SQxJy2msfLmyovLmitZrjJayf8gHH+uK2eg="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyModel",
+    "version": "10.0.2",
+    "hash": "sha256-w/dGIjtZiGH+KW3969BPOdQpQEV+WB7RPTa2MK2DavE="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging",
+    "version": "10.0.2",
+    "hash": "sha256-9+gfQwK32JMYscW1YvyCWEzc9mRZOjCACoD9U1vVaJI="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "10.0.2",
+    "hash": "sha256-ndKGzq8+2J/hvaIULwBui0L/jDyMQTAY24j+ohX5VX8="
+  },
+  {
+    "pname": "Microsoft.Extensions.Options",
+    "version": "10.0.2",
+    "hash": "sha256-12AfUEDdta/pmZUyEyqSUfOk0YoA7JOfGmIYnZQ//qk="
+  },
+  {
+    "pname": "Microsoft.Extensions.Primitives",
+    "version": "10.0.2",
+    "hash": "sha256-8Ccrjjv9cFVf9RyCc7GS/Byt8+DXdSNea0UX3A5BEdA="
+  },
+  {
+    "pname": "Microsoft.Extensions.Primitives",
+    "version": "5.0.1",
+    "hash": "sha256-e4uoLnUSmON4If9qJh78+4z14IzW9qCu5YkqLdQqWQU="
+  },
+  {
+    "pname": "Newtonsoft.Json",
+    "version": "13.0.4",
+    "hash": "sha256-8JCB1FdAW681qXP6DFDWvycu1oPyVoxaYgpJ2pUvZSk="
+  },
+  {
+    "pname": "securifybv.PropertyStore",
+    "version": "0.1.0",
+    "hash": "sha256-jTPT9E2LyElgJq4HMavkdwT8tA9uklnJv00mlIx66+g="
+  },
+  {
+    "pname": "securifybv.ShellLink",
+    "version": "0.1.0",
+    "hash": "sha256-Am+ZednCVJUDgB7TePyY3CTxKDQ6Lr8M8KiCVAJoouw="
+  },
+  {
+    "pname": "Semver",
+    "version": "3.0.0",
+    "hash": "sha256-nX5ka27GY6pz9S73H6sLSQCrnAyyI9xDVdzrtlMp4BQ="
+  },
+  {
+    "pname": "Sentry",
+    "version": "6.1.0",
+    "hash": "sha256-5sntMrMha03xtWdKLJnOT/W2fK5lwzaLiNOYFRqBURQ="
+  },
+  {
+    "pname": "Sentry.Serilog",
+    "version": "6.1.0",
+    "hash": "sha256-V5Th0L9xNZP27nqGiLrIJXlqEF+iCcATb5yWgJ4h/IE="
+  },
+  {
+    "pname": "Serilog",
+    "version": "4.3.1",
+    "hash": "sha256-TY+GaQYnyDfOGl0gi67xDyUMOuV/mjz8BU66/UsmStI="
+  },
+  {
+    "pname": "Serilog.Expressions",
+    "version": "5.0.0",
+    "hash": "sha256-xpAT8U0pzTvRGa/qBd2M3YOQDD1xgAHCMVN9NEz0L4E="
+  },
+  {
+    "pname": "Serilog.Sinks.Console",
+    "version": "6.1.1",
+    "hash": "sha256-CfIg4Us4kSMQAn6rU2rsAeE22g6MpFiZdhoZWySpZeY="
+  },
+  {
+    "pname": "Serilog.Sinks.File",
+    "version": "7.0.0",
+    "hash": "sha256-LxZYUoUPkCjIIVarJilnXnqQiMrFNJtoRilmzTNtUjo="
+  },
+  {
+    "pname": "SharpCompress",
+    "version": "0.44.5",
+    "hash": "sha256-aukmJzrgVS2hugVUNH+FHJuaC2VomBNFy6g8furI3tE="
+  },
+  {
+    "pname": "SkiaSharp",
+    "version": "2.88.9",
+    "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Linux",
+    "version": "2.88.9",
+    "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.macOS",
+    "version": "2.88.9",
+    "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.WebAssembly",
+    "version": "2.88.9",
+    "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Win32",
+    "version": "2.88.9",
+    "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
+  },
+  {
+    "pname": "SQLitePCLRaw.bundle_e_sqlite3",
+    "version": "2.1.11",
+    "hash": "sha256-kWRapMTVEfcc0DxnI9Ai1+RwAAcR2+HUu+WF+OeLJCs="
+  },
+  {
+    "pname": "SQLitePCLRaw.core",
+    "version": "2.1.11",
+    "hash": "sha256-s/fxEoYlNf9c2C4HZueMzPCBvpiViDVlSpg7epB0GXY="
+  },
+  {
+    "pname": "SQLitePCLRaw.lib.e_sqlite3",
+    "version": "2.1.11",
+    "hash": "sha256-ZmffbHNgnLUdsPbikilEAihxXl1MedIBQ1Xzt9226Bw="
+  },
+  {
+    "pname": "SQLitePCLRaw.provider.e_sqlite3",
+    "version": "2.1.11",
+    "hash": "sha256-LdfV325AmYgBOwmwP7MNZxMJZkNO6bwrHvB6C5SyItA="
+  },
+  {
+    "pname": "Tmds.DBus.Protocol",
+    "version": "0.21.3",
+    "hash": "sha256-HVEIHSeSe29ergHxsNvWYu3o7Ai8VZKo09yFn+miTnI="
+  },
+  {
+    "pname": "Unosquare.Swan.Lite",
+    "version": "3.1.0",
+    "hash": "sha256-PL8N3CqIz/wku8/mkRMC3X868Byv47C20/rBLBhkS3o="
+  },
+  {
+    "pname": "ValveKeyValue",
+    "version": "0.20.0.417",
+    "hash": "sha256-CmnexfgjFT4aLeSXargNyIJlRDFh6lyPW4Kx+m68nzk="
+  }
+]
@@ -0,0 +1,86 @@
+{
+  buildDotnetModule,
+  dotnetCorePackages,
+  fetchFromGitHub,
+  lib,
+  nix-update-script,
+  copyDesktopItems,
+  makeDesktopItem,
+  icoutils,
+
+  ffmpeg,
+  yt-dlp,
+  deno,
+}:
+buildDotnetModule (finalAttrs: {
+  pname = "vrcvideocacher";
+  version = "2026.4.4";
+
+  src = fetchFromGitHub {
+    owner = "EllyVR";
+    repo = "VRCVideoCacher";
+    tag = finalAttrs.version;
+    hash = "sha256-VollU7um18HYeIyXC8PzqcNbBYM3gd2JzxSql4VSFWw=";
+  };
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  dotnet-sdk = dotnetCorePackages.sdk_10_0;
+  dotnet-runtime = dotnetCorePackages.runtime_10_0;
+
+  projectFile = "VRCVideoCacher/VRCVideoCacher.csproj";
+  nugetDeps = ./deps.json;
+
+  executables = [ "VRCVideoCacher" ];
+  selfContainedBuild = true;
+
+  nativeBuildInputs = [
+    copyDesktopItems
+    icoutils
+  ];
+
+  makeWrapperArgs = [
+    "--add-flags"
+    "--global-path"
+
+    "--prefix"
+    "PATH"
+    ":"
+    (lib.makeBinPath [
+      ffmpeg
+      yt-dlp
+      deno
+    ])
+  ];
+  postInstall = ''
+    icotool --icon -x $src/VRCVideoCacher/Assets/icon.ico
+
+    for i in 16 32 48 64 128 256; do
+      size=''${i}x''${i}
+      install -Dm444 *_''${size}x*.png $out/share/icons/hicolor/$size/apps/vrcvideocacher.png
+    done
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "vrcvideocacher";
+      desktopName = "VRCVideoCacher";
+      exec = finalAttrs.meta.mainProgram;
+      comment = finalAttrs.meta.description;
+      icon = "vrcvideocacher";
+      categories = [ "Utility" ];
+    })
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Cache VRChat videos locally and fix YouTube videos that fail to load";
+    homepage = "https://github.com/EllyVR/VRCVideoCacher";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ coolGi ];
+    mainProgram = "VRCVideoCacher";
+    platforms = [ "x86_64-linux" ];
+  };
+})
@@ -6,20 +6,20 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "wasm-tools";
-  version = "1.246.2";
+  version = "1.247.0";

  src = fetchFromGitHub {
    owner = "bytecodealliance";
    repo = "wasm-tools";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-8HY11HNUm3GACNEr1OA438GSv9rVlgj4lsKiJVI31Dw=";
+    hash = "sha256-whUI6nUD/ibuaqt3hEGG4tLU4U84nFWHYMZ/3HxPM7U=";
    fetchSubmodules = true;
  };

  # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
  auditable = false;

-  cargoHash = "sha256-DcIwKKzwzQvjToOTw9vQMuJbNCo9I7BwUigpJOa3Dm0=";
+  cargoHash = "sha256-mERF+ls0lrBasVFdjcFJS3v7KH6B/Zm2uW0N1EHTHew=";
  cargoBuildFlags = [
    "--package"
    "wasm-tools"
@@ -0,0 +1,47 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  fetchpatch2,
+  openssl,
+  pkg-config,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "wtcat";
+  version = "0.1.3";
+
+  src = fetchFromGitHub {
+    owner = "pervrosen";
+    repo = "wtcat";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-jmI5XA8DfsLOKbxsfCE3jSYXP9e2m5Ax4pUYCBDprKw=";
+  };
+
+  cargoPatches = [
+    # https://github.com/pervrosen/wtcat/pull/1
+    (fetchpatch2 {
+      url = "https://github.com/pervrosen/wtcat/commit/b7e2d319147842dfe7246a512a7a2a6aade6d192.patch";
+      hash = "sha256-5XFKgL7+xSs3entwEJMpaa3EgQefPAmkHs5zGDBFasM=";
+    })
+  ];
+
+  __structuredAttrs = true;
+
+  strictDeps = true;
+
+  cargoHash = "sha256-DNy1Hz0g0HKDdnXjiLSmDGKaI6sONaxkNXy/zoXErlk=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ openssl ];
+
+  meta = {
+    description = "WebTransport CLI";
+    homepage = "https://github.com/pervrosen/wtcat";
+    changelog = "https://github.com/pervrosen/wtcat/releases/tag/v${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "wtcat";
+  };
+})
@@ -7,6 +7,7 @@
  ninja,
  pkg-config,
  vala,
+  json-glib,
  libadwaita,
  libgee,
  libgtop,
@@ -51,6 +52,7 @@ stdenv.mkDerivation rec {
    fwupd
    granite7
    gtk4
+    json-glib
    libadwaita
    libgee
    libgtop
@@ -20,13 +20,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "binaryen";
-  version = "126";
+  version = "129";

  src = fetchFromGitHub {
    owner = "WebAssembly";
    repo = "binaryen";
    rev = "version_${version}";
-    hash = "sha256-6KnPVIEtguuMHopm2vf6s+KZ3Ymf2rjFE/aXy1Kbn5E=";
+    hash = "sha256-rmCNBrKHVozjzyWPAD4pZw0uViMMRRQsZALm4jbYIJk=";
  };

  nativeBuildInputs = [
@@ -22,7 +22,7 @@ in

 stdenv.mkDerivation rec {
  pname = "emscripten";
-  version = "5.0.0";
+  version = "5.0.6";

  llvmEnv = symlinkJoin {
    name = "emscripten-llvm-${version}";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
    name = "emscripten-node-modules-${version}";
    inherit pname version src;

-    npmDepsHash = "sha256-0erImaY5NixdzgazKI6JQ3mofGU+ZwMxMWh0zIcWdhY=";
+    npmDepsHash = "sha256-QW8wnNBBJs8nHsNuczZZevm6ELqtljsDdL21qtFo6pM=";

    dontBuild = true;

@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "emscripten-core";
    repo = "emscripten";
-    hash = "sha256-Ff1SJ+zaKb77Qa2D9Yn0f1KGKNNF8DpslfNF2fFlrXw=";
+    hash = "sha256-1lsM/qyNS1rRj0D45mSTtTz7ba+OZggdE0t9N4SHLBU=";
    rev = version;
  };

@@ -13,13 +13,13 @@

 stdenv.mkDerivation rec {
  pname = "ngtcp2";
-  version = "1.22.0";
+  version = "1.22.1";

  src = fetchFromGitHub {
    owner = "ngtcp2";
    repo = "ngtcp2";
    rev = "v${version}";
-    hash = "sha256-t747KntEWLNVnDgE/qj916fHsZzKa08oRDBqS9OQMQg=";
+    hash = "sha256-QVxDBVOUVwqMuJZo+RbwIbVxWJSPQpbjbHvuCVPfYUs=";
  };

  outputs = [
@@ -378,6 +378,9 @@ let

      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

+      strictDeps = lib.versionAtLeast version "4.0";
+      __structuredAttrs = lib.versionAtLeast version "4.0";
+
      meta = {
        homepage = "https://www.openssl.org/";
        changelog = "https://github.com/openssl/openssl/blob/openssl-${version}/CHANGES.md";
@@ -536,4 +539,33 @@ in
      license = lib.licenses.asl20;
    };
  };
+
+  openssl_4_0 = common {
+    version = "4.0.0";
+    hash = "sha256-wyz0mpWcTzRflgaYLdNufSj3xYsZwuJddWJNKz0veaw=";
+
+    patches = [
+      # Support for NIX_SSL_CERT_FILE, motivation:
+      # https://github.com/NixOS/nixpkgs/commit/942dbf89c6120cb5b52fb2ab456855d1fbf2994e
+      ./3.0/nix-ssl-cert-file.patch
+
+      # openssl will only compile in KTLS if the current kernel supports it.
+      # This patch disables build-time detection.
+      ./3.0/openssl-disable-kernel-detection.patch
+
+      # Look up SSL certificates in /etc rather than the immutable installation directory
+      (
+        if stdenv.hostPlatform.isDarwin then
+          ./3.5/use-etc-ssl-certs-darwin.patch
+        else
+          ./3.5/use-etc-ssl-certs.patch
+      )
+    ];
+
+    withDocs = true;
+
+    extraMeta = {
+      license = lib.licenses.asl20;
+    };
+  };
 }
@@ -358,13 +358,13 @@

 buildPythonPackage (finalAttrs: {
  pname = "boto3-stubs";
-  version = "1.42.90";
+  version = "1.42.91";
  pyproject = true;

  src = fetchPypi {
    pname = "boto3_stubs";
    inherit (finalAttrs) version;
-    hash = "sha256-0OpLwTUrpe+PrhPPsv71EfNyET7eA4i1DN0ZgR05zgE=";
+    hash = "sha256-J3424exTCrajFkdSPf70DgfQsGVDG+blQ2OiQ/eL+rs=";
  };

  build-system = [ setuptools ];
@@ -16,7 +16,7 @@

 buildPythonPackage (finalAttrs: {
  pname = "homematicip";
-  version = "2.7.0";
+  version = "2.8.0";
  pyproject = true;

  disabled = pythonOlder "3.12";
@@ -25,7 +25,7 @@ buildPythonPackage (finalAttrs: {
    owner = "hahn-th";
    repo = "homematicip-rest-api";
    tag = finalAttrs.version;
-    hash = "sha256-UB/zyQZj3aWu3aeR9zJSLOrWKNOWTdTjjQ4y0FjQ8pU=";
+    hash = "sha256-IDeI95ylSiNqnwCfiIBUBVCBkffcIVvpRfbBUVYxEQ4=";
  };

  build-system = [
@@ -8,14 +8,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "iamdata";
-  version = "0.1.202604171";
+  version = "0.1.202604181";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "cloud-copilot";
    repo = "iam-data-python";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-MOxuoLkPFWcpJ5rrpp9eBikZvg9l9s3GbND2DGjFV+A=";
+    hash = "sha256-QtdDm4ZKbk1/gyY6X/yRBt2Eklvs1BAgrbkCt5BsaZc=";
  };

  __darwinAllowLocalNetworking = true;
@@ -29,14 +29,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "langchain-aws";
-  version = "1.4.3";
+  version = "1.4.4";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "langchain-ai";
    repo = "langchain-aws";
    tag = "langchain-aws==${finalAttrs.version}";
-    hash = "sha256-Iya2xWuArROGgEPbYDCFqzuVP5UupemyU2wF/mNNLXo=";
+    hash = "sha256-QXWODYzyQTVAAIHL4h2cgEqSBl4lBByoT1+DWMatYWE=";
  };

  postPatch = ''
@@ -8,7 +8,7 @@
 }:

 let
-  version = "3.1.0";
+  version = "3.1.1";
 in
 buildPythonPackage {
  pname = "mfusepy";
@@ -19,7 +19,7 @@ buildPythonPackage {
    owner = "mxmlnkn";
    repo = "mfusepy";
    tag = "v${version}";
-    hash = "sha256-HOibpS6lbrIwhdnbML9nLK9XUo8ILDqAp8ZjGiMKYMQ=";
+    hash = "sha256-k7CxATpFTIZfQxnz8aYuyeooFY64JZl7Z8jfH2CtehM=";
  };

  # If fuse library path cannot be found, use fuse library path in nixpkgs
@@ -207,8 +207,8 @@ in
      "sha256-Yj+PL5SHeMuiC3kougQa6zahznlD32+1NQWqoD8xdEg=";

  mypy-boto3-cleanrooms =
-    buildMypyBoto3Package "cleanrooms" "1.42.52"
-      "sha256-YSYDtUF4SNy6b1PuEvBFrRLjCzOnGd0UbN8Xe7GSDh8=";
+    buildMypyBoto3Package "cleanrooms" "1.42.91"
+      "sha256-Pl1Ov1IHCe/zKO7eiGbJVeF8+aYXoeNZtMPhZQX63Qk=";

  mypy-boto3-cloud9 =
    buildMypyBoto3Package "cloud9" "1.42.3"
@@ -335,8 +335,8 @@ in
      "sha256-UNxmIK9UD6AVmT4nyQzunNAKjp2YmV1wQ5oloHOwcXw=";

  mypy-boto3-connect =
-    buildMypyBoto3Package "connect" "1.42.90"
-      "sha256-xhu3Sw8xDO9Wv5pA/Uug0Hn444+v9Uf1bKuml+BsmQo=";
+    buildMypyBoto3Package "connect" "1.42.91"
+      "sha256-d/xCgnFZIqqBBq4XbOFjpRCxqdpH8FIgm8msv4V8hZQ=";

  mypy-boto3-connect-contact-lens =
    buildMypyBoto3Package "connect-contact-lens" "1.42.3"
@@ -586,8 +586,8 @@ in
      "sha256-w3vOm8K/2rToF1CFWtAobCzswkv2d/gm1bzy6XiOFVA=";

  mypy-boto3-groundstation =
-    buildMypyBoto3Package "groundstation" "1.42.35"
-      "sha256-UIxD9R+oQjVmR90OfD8Dp7GW3E73zny6LFTkxrSdmNU=";
+    buildMypyBoto3Package "groundstation" "1.42.91"
+      "sha256-mzSkLSIQyrcPyU+LhrlRJtjWbkpLXM8/iOpAH0lA6zA=";

  mypy-boto3-guardduty =
    buildMypyBoto3Package "guardduty" "1.42.84"
@@ -610,8 +610,8 @@ in
      "sha256-rb8qotqFW+ZcesRS0TUl+NMsrOS7CTQosZ633jSE38k=";

  mypy-boto3-imagebuilder =
-    buildMypyBoto3Package "imagebuilder" "1.42.88"
-      "sha256-DJeab+CYHHX6ATvYo/u9zaR6ftrh8Tc8fq/vQ0Sc9lI=";
+    buildMypyBoto3Package "imagebuilder" "1.42.91"
+      "sha256-+e/fx5ApGKHgCOcwwzbf8uFtnwN5RgN5/hSEBmmS9rA=";

  mypy-boto3-importexport =
    buildMypyBoto3Package "importexport" "1.42.3"
@@ -938,8 +938,8 @@ in
      "sha256-BkxJ1ilQTVsOqdq63kNtKyKqxrKrEXUkg3v6EN73HR8=";

  mypy-boto3-neptune =
-    buildMypyBoto3Package "neptune" "1.42.57"
-      "sha256-9oNjBSEUUy4OzQqYVCgujl86TOMyXCT2QMLDG3WU1Kc=";
+    buildMypyBoto3Package "neptune" "1.42.91"
+      "sha256-Z7ZROhIbvx2O33MbWUtkCii9V5DaXLuCEP3uX3JJ23c=";

  mypy-boto3-neptunedata =
    buildMypyBoto3Package "neptunedata" "1.42.78"
@@ -1070,8 +1070,8 @@ in
      "sha256-YrrEKl3aGz//5Z5JGapHhWtk6hBXQ4cuRQmLqGYztzg=";

  mypy-boto3-quicksight =
-    buildMypyBoto3Package "quicksight" "1.42.80"
-      "sha256-NcAsy8yu3+gZSILA1Ren+T88kafkwN47+Ubbg1+o3YM=";
+    buildMypyBoto3Package "quicksight" "1.42.91"
+      "sha256-1IfgDzLDaDkL0ZeDVoC4TrMvRGJ3ai0LhG7F/ixx6ks=";

  mypy-boto3-ram =
    buildMypyBoto3Package "ram" "1.42.59"
@@ -1170,8 +1170,8 @@ in
      "sha256-juVfwdjPDNPaT5tvyXpzDtomugqxeu++AERLkVtFIxw=";

  mypy-boto3-sagemaker =
-    buildMypyBoto3Package "sagemaker" "1.42.88"
-      "sha256-u2KphNpF7yCNtbShS99SakEbg2FANAmMHi0Zr5EvORs=";
+    buildMypyBoto3Package "sagemaker" "1.42.91"
+      "sha256-M3Mbmu5fJdyl5UHS+wIklJ1UlFRzTxxQ2Rz057k0Auc=";

  mypy-boto3-sagemaker-a2i-runtime =
    buildMypyBoto3Package "sagemaker-a2i-runtime" "1.42.3"
@@ -1326,8 +1326,8 @@ in
      "sha256-92jALXRmjt/8Ji99jF3304T/xKW+gV1Ix3/N+fmodJc=";

  mypy-boto3-sts =
-    buildMypyBoto3Package "sts" "1.42.3"
-      "sha256-OFfFuj86XAQX7cR/WtTkWJHjurwy1WxrJ8XUFn+fW6c=";
+    buildMypyBoto3Package "sts" "1.42.91"
+      "sha256-8i2gqRwZNEGSSqXiTFdKvnymyyExqQyut0JW+hSgaHg=";

  mypy-boto3-support =
    buildMypyBoto3Package "support" "1.42.3"
@@ -16,12 +16,12 @@

 buildPythonPackage (finalAttrs: {
  pname = "nbdev";
-  version = "3.0.12";
+  version = "3.0.15";
  pyproject = true;

  src = fetchPypi {
    inherit (finalAttrs) pname version;
-    hash = "sha256-N7R3EIqcfYB8S9w06kLpcXyUSz1OErx6UgeHH6Ha46U=";
+    hash = "sha256-CSpEJr8IYUFa54VGdPy0p8erNh5qKrGBTsfNYvE3uIo=";
  };

  pythonRelaxDeps = [ "ipywidgets" ];
@@ -10,14 +10,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "py-netgear-plus";
-  version = "0.5.1";
+  version = "0.6.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "foxey";
    repo = "py-netgear-plus";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-8cFaNDgOrsoDkOb6m5dJmd+vzUe11RyTOhd49JOygkA=";
+    hash = "sha256-WXNhKpOoOYRwB1OYLFxVXy230MzG4vAZYZ0YUp5W/R8=";
  };

  build-system = [ hatchling ];
@@ -22,14 +22,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "pyenphase";
-  version = "2.4.7";
+  version = "2.4.8";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "pyenphase";
    repo = "pyenphase";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-byNbyOBPQ2yXVOSXoYVbUr6wUf9EeqyjM9tOjUCqaF8=";
+    hash = "sha256-wYPw+qLaKa7tk2mz/lKgLKmvVuS3tNOej2r86UJWnTU=";
  };

  pythonRelaxDeps = [ "tenacity" ];
@@ -25,14 +25,14 @@

 buildPythonPackage rec {
  pname = "python-benedict";
-  version = "0.35.0";
+  version = "0.36.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "fabiocaccamo";
    repo = "python-benedict";
    tag = version;
-    hash = "sha256-b9tAK500Hr2flYI82weNMCM88d6b5+Oz9HgvBDaqNZw=";
+    hash = "sha256-FIajPROnyuMhM2YzlqJm5A5eRp6v39VHb8RJZjmXqxQ=";
  };

  pythonRelaxDeps = [ "boto3" ];
@@ -11,13 +11,13 @@
 buildHomeAssistantComponent rec {
  owner = "BottlecapDave";
  domain = "octopus_energy";
-  version = "18.1.2";
+  version = "18.2.1";

  src = fetchFromGitHub {
    inherit owner;
    repo = "HomeAssistant-OctopusEnergy";
    tag = "v${version}";
-    hash = "sha256-+aMMloqNsDMHt5zSfv9EA9QoGG8VCJv5Aw0ctoWcs5Q=";
+    hash = "sha256-wEVD1Ixriv4C6TbG+IrQoEl9f+tIfV/OysXRytVQ8FE=";
  };

  dependencies = [ pydantic ];
@@ -35,7 +35,7 @@ let
 in
 postgresqlBuildExtension (finalAttrs: {
  pname = "postgis";
-  version = "3.6.2";
+  version = "3.6.3";

  outputs = [
    "out"
@@ -46,7 +46,7 @@ postgresqlBuildExtension (finalAttrs: {
    owner = "postgis";
    repo = "postgis";
    tag = finalAttrs.version;
-    hash = "sha256-zdwfk2cWUF3l6Rao3kzXdMWFs12F5545Dxkjd/DyPcQ=";
+    hash = "sha256-pCkn3ocRBD70apCdfYTmdUKrcGP28D5VM77S79m5e/0=";
  };

  buildInputs = [
@@ -7120,6 +7120,7 @@ with pkgs;
    openssl_3
    openssl_3_5
    openssl_3_6
+    openssl_4_0
    ;

  pcre = callPackage ../development/libraries/pcre { };