Merge master into staging-next

2025-06-09 19:13:26 +03:00 · 2025-05-05 00:17:30 +00:00 · 2025-05-05 00:17:30 +00:00 · 94a9466a41
commit 94a9466a41
parent bad8eb7a8b 61f968627e
80 changed files with 2170 additions and 12503 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -10477,6 +10477,13 @@
    githubId = 36996706;
    name = "Philip Rying";
  };
+  ImSapphire = {
+    email = "imsapphire0@gmail.com";
+    github = "ImSapphire";
+    githubId = 48931512;
+    name = "Sapphire";
+    keys = [ { fingerprint = "D303 4473 1843 D27B 5D4E  2273 6429 11AA 4025 C8CC"; } ];
+  };
  imsick = {
    email = "lent-lather-excuse@duck.com";
    github = "dvishal485";
@ -12713,6 +12720,12 @@
    githubId = 8211181;
    name = "Kevin Kandlbinder";
  };
+  keysmashes = {
+    email = "x-89cjg9@keysmash.solutions";
+    github = "keysmashes";
+    githubId = 9433472;
+    name = "ash";
+  };
  kfollesdal = {
    email = "kfollesdal@gmail.com";
    github = "kfollesdal";
@ -22175,12 +22188,6 @@
    githubId = 56278796;
    name = "Sergio Ribera";
  };
-  sersorrel = {
-    email = "ash@sorrel.sh";
-    github = "sersorrel";
-    githubId = 9433472;
-    name = "ash";
-  };
  servalcatty = {
    email = "servalcat@pm.me";
    github = "servalcatty";
--- a/nixos/tests/openssh.nix
+++ b/nixos/tests/openssh.nix
@ -35,6 +35,38 @@ import ./make-test-python.nix (
          ];
        };

+      server-x11 =
+        { ... }:
+
+        {
+          environment.systemPackages = [ pkgs.xorg.xauth ];
+          services.openssh = {
+            enable = true;
+            settings.X11Forwarding = true;
+          };
+          users.users.root.openssh.authorizedKeys.keys = [
+            snakeOilPublicKey
+          ];
+        };
+
+      server-x11-disable =
+        { ... }:
+
+        {
+          environment.systemPackages = [ pkgs.xorg.xauth ];
+          services.openssh = {
+            enable = true;
+            settings = {
+              X11Forwarding = true;
+              # CVE-2025-32728: the following line is ineffectual
+              DisableForwarding = true;
+            };
+          };
+          users.users.root.openssh.authorizedKeys.keys = [
+            snakeOilPublicKey
+          ];
+        };
+
      server-allowed-users =
        { ... }:

@ -240,6 +272,8 @@ import ./make-test-python.nix (
      start_all()

      server.wait_for_unit("sshd", timeout=30)
+      server_x11.wait_for_unit("sshd", timeout=30)
+      server_x11_disable.wait_for_unit("sshd", timeout=30)
      server_allowed_users.wait_for_unit("sshd", timeout=30)
      server_localhost_only.wait_for_unit("sshd", timeout=30)
      server_match_rule.wait_for_unit("sshd", timeout=30)
@ -307,6 +341,16 @@ import ./make-test-python.nix (
              timeout=30
          )

+      with subtest("x11-forwarding"):
+          client.succeed(
+              "[ \"$(ssh -Y -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server-x11 'xauth list' | tee /dev/stderr | wc -l)\" -eq 1 ]",
+              timeout=30
+          )
+          client.succeed(
+              "[ \"$(ssh -Y -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server-x11-disable 'xauth list' | tee /dev/stderr | wc -l)\" -eq 0 ]",
+              timeout=30
+          )
+
      with subtest("localhost-only"):
          server_localhost_only.succeed("ss -nlt | grep '127.0.0.1:22'")
          server_localhost_only_lazy.succeed("ss -nlt | grep '127.0.0.1:22'")
--- a/pkgs/applications/audio/hushboard/default.nix
+++ b/pkgs/applications/audio/hushboard/default.nix
@ -70,6 +70,6 @@ buildPythonApplication {
    description = "Mute your microphone while typing";
    mainProgram = "hushboard";
    platforms = platforms.linux;
-    maintainers = with maintainers; [ sersorrel ];
+    maintainers = with maintainers; [ keysmashes ];
  };
 }
--- a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix
@ -39,6 +39,7 @@
 let
  gdbDefaultsTo = if gdbUseFixed then "${gdb}/bin/gdb" else "gdb";
  isx86Linux = stdenv.hostPlatform.system == "x86_64-linux";
+  isDarwin = stdenv.hostPlatform.isDarwin;
  supported = {
    x86_64-linux = {
      hash = "sha256-KWr+nfODCRoZq67qwswzbcPW5WMmf9kvRwNFKpjyt4k=";
@ -48,6 +49,10 @@ let
      hash = "sha256-a6PwlSo3q1hLVx0JDSTwPGfjfk7CtdYCuFccSpPg7U8=";
      arch = "linux-arm64";
    };
+    aarch64-darwin = {
+      hash = "sha256-B6Dmcbk8Z8qPr/0Xv9GfBxL6+7DaVmYNVRfBY9geCoY=";
+      arch = "darwin-arm64";
+    };
  };

  base =
@ -68,13 +73,12 @@ vscode-utils.buildVscodeMarketplaceExtension {

  buildInputs = [
    jq
-    lttng-ust
    libkrb5
    zlib
    (lib.getLib stdenv.cc.cc)
-  ];
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lttng-ust ];

-  dontAutoPatchelf = isx86Linux;
+  dontAutoPatchelf = isx86Linux || isDarwin;

  postPatch =
    ''
@ -97,10 +101,15 @@ vscode-utils.buildVscodeMarketplaceExtension {

      # Patching binaries
      chmod +x bin/cpptools bin/cpptools-srv bin/cpptools-wordexp debugAdapters/bin/OpenDebugAD7
+    ''
+    + lib.optionalString stdenv.hostPlatform.isLinux ''
      patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so.1 ./debugAdapters/bin/libcoreclrtraceptprovider.so
    ''
    + lib.optionalString isx86Linux ''
      chmod +x bin/libc.so
+    ''
+    + lib.optionalString isDarwin ''
+      chmod +x debugAdapters/lldb-mi/bin/lldb-mi
    '';

  # On aarch64 the binaries are statically linked
@ -128,6 +137,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
    platforms = [
      "x86_64-linux"
      "aarch64-linux"
+      "aarch64-darwin"
    ];
    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
  };
--- a/pkgs/applications/radio/sdrangel/default.nix
+++ b/pkgs/applications/radio/sdrangel/default.nix
@ -13,6 +13,7 @@
  dsdcc,
  faad2,
  fetchFromGitHub,
+  fetchpatch,
  fftwFloat,
  flac,
  glew,
@ -117,6 +118,14 @@ stdenv.mkDerivation (finalAttrs: {
    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_12 ]
    ++ lib.optionals withSDRplay [ sdrplay ];

+  patches = [
+    # https://github.com/f4exb/sdrangel/pull/2439
+    (fetchpatch {
+      url = "https://github.com/f4exb/sdrangel/commit/60869b74f96b26e8a173f3f215c2badeaef9a136.patch";
+      hash = "sha256-Lq9pyissNmLYavLCISga0EWbRwisGnKiz6UYhzxJatc=";
+    })
+  ];
+
  cmakeFlags = [
    "-DAPT_DIR=${aptdec}"
    "-DDAB_DIR=${dab_lib}"
--- a/pkgs/by-name/ac/actual-server/package.nix
+++ b/pkgs/by-name/ac/actual-server/package.nix
@ -13,13 +13,13 @@
  nix-update-script,
 }:
 let
-  version = "25.4.0";
+  version = "25.5.0";
  src = fetchFromGitHub {
    name = "actualbudget-actual-source";
    owner = "actualbudget";
    repo = "actual";
    tag = "v${version}";
-    hash = "sha256-+XYl4Bh0+8bs/FCqlig9egLg3SJCy2SRN2ovxWRE1Ok=";
+    hash = "sha256-NYAO1Yx3u0wm9F6zSwIolQkXBfFO1YkSKV5UMCBi8nw=";
  };
  translations = fetchFromGitHub {
    name = "actualbudget-translations-source";
@ -95,7 +95,7 @@ let

    outputHashAlgo = "sha256";
    outputHashMode = "recursive";
-    outputHash = "sha256-Tac2gOkdc2tzNKB3ARMfJad1MkOphudvN74gI8bGMtY=";
+    outputHash = "sha256-NPyFzklzAUIrTADTF/JBOieWMXOhL+X3pF3qXrfdyCs=";
  };

  webUi = stdenvNoCC.mkDerivation {
@ -168,7 +168,7 @@ stdenv.mkDerivation {
    runHook preInstall

    mkdir -p $out/{bin,lib,lib/actual/packages/sync-server,lib/actual/packages/desktop-client}
-    cp -r ./packages/sync-server/{app.js,src,migrations,package.json} $out/lib/actual/packages/sync-server
+    cp -r ./packages/sync-server/{app.js,src,migrations,package.json,bin} $out/lib/actual/packages/sync-server
    # sync-server uses package.json to determine path to web ui.
    cp ./packages/desktop-client/package.json $out/lib/actual/packages/desktop-client
    cp -r ${webUi} $out/lib/actual/packages/desktop-client/build
@ -189,7 +189,7 @@ stdenv.mkDerivation {
    cp -r ./node_modules $out/lib/actual/

    makeWrapper ${lib.getExe nodejs_20} "$out/bin/actual-server" \
-      --add-flags "$out/lib/actual/packages/sync-server/app.js" \
+      --add-flags "$out/lib/actual/packages/sync-server/bin/actual-server.js" \
      --set NODE_PATH "$out/actual/lib/node_modules"

    runHook postInstall
--- a/pkgs/by-name/ae/aerospace/package.nix
+++ b/pkgs/by-name/ae/aerospace/package.nix
@ -9,7 +9,7 @@

 let
  appName = "AeroSpace.app";
-  version = "0.18.4-Beta";
+  version = "0.18.5-Beta";
 in
 stdenv.mkDerivation {
  pname = "aerospace";
@ -18,7 +18,7 @@ stdenv.mkDerivation {

  src = fetchzip {
    url = "https://github.com/nikitabobko/AeroSpace/releases/download/v${version}/AeroSpace-v${version}.zip";
-    sha256 = "sha256-TjVxq1HS/gdGi32noj7i1P6e9lXKNtBoO373Cesnwks=";
+    sha256 = "sha256-rF4emnLNVE1fFlxExliN7clSBocBrPwQOwBqRtX9Q4o=";
  };

  nativeBuildInputs = [ installShellFiles ];
--- a/pkgs/by-name/ap/appflowy/package.nix
+++ b/pkgs/by-name/ap/appflowy/package.nix
@ -17,11 +17,11 @@ let
    rec {
      x86_64-linux = {
        urlSuffix = "linux-x86_64.tar.gz";
-        hash = "sha256-s3/975BJELl6J3u9reyVBEbismR32uJq6NXF7u/Dcp0=";
+        hash = "sha256-c6iawG2GqdF4HRfOhcJM0gPNo7I8DHP1SVQffDzW9wc=";
      };
      x86_64-darwin = {
        urlSuffix = "macos-universal.zip";
-        hash = "sha256-xMEyJxucnVuxSa0zwOYr91C7yUuMvKkRTYZhuioV1xc=";
+        hash = "sha256-5d/JkAuNT1OT0MOUQU7mhst/lOXv7T17rJVeIABMUKw=";
      };
      aarch64-darwin = x86_64-darwin;
    }
@ -30,7 +30,7 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "appflowy";
-  version = "0.8.9";
+  version = "0.9.1";

  src = fetchzip {
    url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}";
--- a/pkgs/by-name/bl/blender/package.nix
+++ b/pkgs/by-name/bl/blender/package.nix
@ -48,6 +48,7 @@
  llvmPackages,
  makeWrapper,
  mesa,
+  nix-update-script,
  openUsdSupport ? !stdenv.hostPlatform.isDarwin,
  openal,
  opencollada-blender,
@ -99,20 +100,21 @@ let
  });

  optix = fetchzip {
-    # URL from https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/commit/333add667b43255dcb011215a2d2af48281e83cf#9b9baac1eb9b72790eef5540a1685306fc43fd6c_30_30
-    url = "https://developer.download.nvidia.com/redist/optix/v7.3/OptiX-7.3.0-Include.zip";
-    hash = "sha256-aMrp0Uff4c3ICRn4S6zedf6Q4Mc0/duBhKwKgYgMXVU=";
+    # Look at upstream Blender BuildBot logs to determine the current version,
+    # see Git blame here for historical details
+    url = "https://developer.download.nvidia.com/redist/optix/v7.4/OptiX-7.4.0-Include.zip";
+    hash = "sha256-ca08XetwaUYC9foeP5bff9kcDfuFgEzopvjspn2s8RY=";
  };
 in

 stdenv'.mkDerivation (finalAttrs: {
  pname = "blender";
-  version = "4.4.1";
+  version = "4.4.3";

-  srcs = fetchzip {
+  src = fetchzip {
    name = "source";
    url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";
-    hash = "sha256-5MsJ7UFpwwtaq905CiTkas/qPYOaeiacSSl3qu9h5w0=";
+    hash = "sha256-vHDOKI7uqB5EbdRu711axBuYX1zM746E6GvK2Nl5hZg=";
  };

  patches = [ ] ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch;
@ -404,6 +406,12 @@ stdenv'.mkDerivation (finalAttrs: {
        }], check=True)  # noqa: E501
      '';
    };
+
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--url=https://projects.blender.org/blender/blender"
+      ];
+    };
  };

  meta = {
--- a/pkgs/by-name/bo/boogie/deps.json
+++ b/pkgs/by-name/bo/boogie/deps.json
--- a/pkgs/by-name/bo/boogie/package.nix
+++ b/pkgs/by-name/bo/boogie/package.nix
@ -4,20 +4,21 @@
  fetchFromGitHub,
  z3,
  dotnetCorePackages,
+  nix-update-script,
 }:

 buildDotnetModule rec {
  pname = "Boogie";
-  version = "3.4.2";
+  version = "3.5.1";

  src = fetchFromGitHub {
    owner = "boogie-org";
    repo = "boogie";
-    rev = "v${version}";
-    hash = "sha256-IWtYbb1IFB6DLIYYTP+q7q+h/0aqonxr/mWwf+83aRo=";
+    tag = "v${version}";
+    hash = "sha256-0YZy4TYff6iupSAwDw8qvR6vdkUh8PDXKoKARfEyEPQ=";
  };

-  dotnet-sdk = dotnetCorePackages.sdk_6_0-bin;
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
  projectFile = [ "Source/Boogie.sln" ];
  nugetDeps = ./deps.json;

@ -42,7 +43,6 @@ buildDotnetModule rec {

  postFixup = ''
    ln -s "$out/bin/BoogieDriver" "$out/bin/boogie"
-    rm -f $out/bin/{Microsoft,NUnit3,System}.* "$out/bin"/*Tests
  '';

  doInstallCheck = true;
@ -50,8 +50,11 @@ buildDotnetModule rec {
    $out/bin/boogie ${./install-check-file.bpl}
  '';

-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
    description = "Intermediate verification language";
+    changelog = "https://github.com/boogie-org/boogie/releases/tag/${src.tag}";
    homepage = "https://github.com/boogie-org/boogie";
    longDescription = ''
      Boogie is an intermediate verification language (IVL), intended as a
@ -59,8 +62,9 @@ buildDotnetModule rec {

      This derivation may be used as a vim plugin to provide syntax highlighting.
    '';
-    license = licenses.mspl;
-    maintainers = [ maintainers.taktoa ];
-    platforms = with platforms; (linux ++ darwin);
+    license = lib.licenses.mspl;
+    mainProgram = "boogie";
+    maintainers = with lib.maintainers; [ taktoa ];
+    platforms = with lib.platforms; linux ++ darwin;
  };
 }
--- a/pkgs/by-name/bu/budgie-systemmonitor-applet/install-schemas-to-datadir.patch
+++ b/pkgs/by-name/bu/budgie-systemmonitor-applet/install-schemas-to-datadir.patch
@ -0,0 +1,13 @@
+diff --git a/meson.build b/meson.build
+index f63bdec..2de3778 100644
+--- a/meson.build
+++ b/meson.build
+@@ -52,7 +52,7 @@ add_project_arguments(
+ LIB_INSTALL_DIR = join_paths(libdir, 'budgie-desktop', 'plugins', meson.project_name())
+ 
+ install_data('schema/com.prateekmedia.systemmonitor.gschema.xml',
+-    install_dir: '/usr/share/glib-2.0/schemas'
+    install_dir: join_paths(datadir, 'glib-2.0/schemas')
+ )
+ 
+ subdir('icons')
--- a/pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix
+++ b/pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix
@ -0,0 +1,63 @@
+{
+  lib,
+  stdenv,
+  budgie-desktop,
+  fetchFromGitHub,
+  glib,
+  gtk3,
+  libgee,
+  libgtop,
+  libpeas,
+  meson,
+  ninja,
+  nix-update-script,
+  pkg-config,
+  vala,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "budgie-systemmonitor-applet";
+  version = "0.2.1";
+
+  src = fetchFromGitHub {
+    owner = "prateekmedia";
+    repo = "budgie-systemmonitor-applet";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-OWGy2LokpMOW4ZR3K+Bym7i88xQAJqWO43Pu7SjxRSw=";
+  };
+
+  # Remove if/when https://github.com/prateekmedia/budgie-systemmonitor-applet/pull/3 is merged
+  patches = [ ./install-schemas-to-datadir.patch ];
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    glib # For `glib-compile-schemas`
+    meson
+    ninja
+    pkg-config
+    vala
+  ];
+
+  buildInputs = [
+    budgie-desktop
+    glib
+    gtk3
+    libgee
+    libgtop
+    libpeas
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Budgie applet to show cpu frequency, ram, swap, network and uptime";
+    homepage = "https://github.com/prateekmedia/budgie-systemmonitor-applet";
+    changelog = "https://github.com/prateekmedia/budgie-systemmonitor-applet/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.gpl3Only;
+    maintainers = lib.teams.budgie.members;
+    platforms = lib.platforms.linux;
+  };
+})
--- a/pkgs/by-name/ca/carto/package.nix
+++ b/pkgs/by-name/ca/carto/package.nix
@ -19,6 +19,11 @@ buildNpmPackage rec {

  dontNpmBuild = true;

+  postInstall = ''
+    # Remove broken symlinks
+    find "$out/lib/node_modules" -xtype l -delete
+  '';
+
  meta = {
    changelog = "https://github.com/mapbox/carto/blob/${src.rev}/CHANGELOG.md";
    description = "Mapnik stylesheet compiler";
--- a/pkgs/by-name/cl/clash-verge-rev/0001-core-validate-bin_path-to-prevent-RCE-in-start_clash.patch
+++ b/pkgs/by-name/cl/clash-verge-rev/0001-core-validate-bin_path-to-prevent-RCE-in-start_clash.patch
@ -0,0 +1,72 @@
+From fff6494e26edce6bf8a5b4c40d9535f820608cc3 Mon Sep 17 00:00:00 2001
+From: Moraxyc <i@qaq.li>
+Date: Mon, 28 Apr 2025 16:43:29 +0800
+Subject: [PATCH 1/2] core: validate bin_path to prevent RCE in start_clash
+
+Add a security check in CoreManager::start_clash to ensure that the provided
+binary path (`bin_path`) must be located under the current executable's
+directory. This prevents potential remote code execution (RCE) attacks
+caused by arbitrary binary path injection.
+---
+ src/service/core.rs | 21 ++++++++++++++++++---
+ 1 file changed, 18 insertions(+), 3 deletions(-)
+
+diff --git a/src/service/core.rs b/src/service/core.rs
+index 84407a5..51081ed 100644
+--- a/src/service/core.rs
+++ b/src/service/core.rs
+@@ -7,6 +7,7 @@ use once_cell::sync::Lazy;
+ use std::{
+     collections::HashMap,
+     sync::{atomic::Ordering, Arc, Mutex},
+    env,
+ };
+ 
+ impl CoreManager {
+@@ -227,7 +228,7 @@ impl CoreManager {
+             .unwrap()
+             .running_pid
+             .load(Ordering::Relaxed) as u32;
+-        
+
+         match process::find_processes("verge-mihomo") {
+             Ok(pids) => {
+                 // 直接在迭代过程中过滤和终止
+@@ -248,18 +249,32 @@ impl CoreManager {
+                     })
+                     .filter(|&success| success)
+                     .count();
+-                    
+
+                 println!("Successfully stopped {} verge-mihomo processes", kill_count);
+             }
+             Err(e) => {
+                 eprintln!("Error finding verge-mihomo processes: {}", e);
+             }
+         }
+-        
+
+         Ok(())
+     }
+ 
+     pub fn start_clash(&self, body: StartBody) -> Result<(), String> {
+        {
+            let bin_path = std::path::Path::new(body.bin_path.as_str());
+            let current_exe = std::env::current_exe()
+                .map_err(|e| format!("Failed to get current exe path: {}", e))?;
+            let current_dir = current_exe.parent()
+                .ok_or("Failed to get current directory")?;
+
+            if !bin_path.starts_with(current_dir) {
+                return Err(format!(
+                    "Invalid binary path for clash kernel. It must be under: {}",
+                    current_dir.display()
+                ));
+            }
+        }
+         {
+             // Check clash & stop if needed
+             let is_running_clash = self
+-- 
+2.49.0
+
--- a/pkgs/by-name/cl/clash-verge-rev/0002-core-prevent-overwriting-existing-file-by-validating.patch
+++ b/pkgs/by-name/cl/clash-verge-rev/0002-core-prevent-overwriting-existing-file-by-validating.patch
@ -0,0 +1,33 @@
+From b104778a608862789f2be400b9f13a92b1ec5b20 Mon Sep 17 00:00:00 2001
+From: Moraxyc <i@qaq.li>
+Date: Mon, 28 Apr 2025 21:38:02 +0800
+Subject: [PATCH 2/2] core: prevent overwriting existing file by validating its
+ existence
+
+Add a check to verify whether the specified `log_file` already exists before proceeding.
+If the file exists, return an error to prevent accidental or malicious overwriting of files.
+This enhances the security of log file handling by mitigating arbitrary file overwrite risks.
+---
+ src/service/core.rs | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/service/core.rs b/src/service/core.rs
+index 51081ed..a2c4f82 100644
+--- a/src/service/core.rs
+++ b/src/service/core.rs
+@@ -275,6 +275,12 @@ impl CoreManager {
+                 ));
+             }
+         }
+        {
+            let log_file = std::path::Path::new(body.log_file.as_str());
+            if log_file.exists() {
+                return Err(format!("Log file already exists: {}", log_file.display()));
+            }
+        }
+         {
+             // Check clash & stop if needed
+             let is_running_clash = self
+-- 
+2.49.0
+
--- a/pkgs/by-name/cl/clash-verge-rev/package.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/package.nix
@ -80,9 +80,6 @@ let
      bot-wxt1221
    ];
    platforms = lib.platforms.linux;
-    knownVulnerabilities = [
-      "https://github.com/clash-verge-rev/clash-verge-rev/issues/3428"
-    ];
  };
 in
 stdenv.mkDerivation {
@ -118,7 +115,7 @@ stdenv.mkDerivation {
    cp -r ${unwrapped}/share/* $out/share
    cp -r ${unwrapped}/bin/clash-verge $out/bin/clash-verge
    # This can't be symbol linked. It will find mihomo in its runtime path
-    ln -s ${service}/bin/clash-verge-service $out/bin/clash-verge-service
+    cp ${service}/bin/clash-verge-service $out/bin/clash-verge-service
    ln -s ${mihomo}/bin/mihomo $out/bin/verge-mihomo
    # people who want to use alpha build show override mihomo themselves. The alpha core entry was removed in clash-verge.
    ln -s ${v2ray-geoip}/share/v2ray/geoip.dat $out/lib/Clash\ Verge/resources/geoip.dat
--- a/pkgs/by-name/cl/clash-verge-rev/service.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/service.nix
@ -15,6 +15,19 @@ rustPlatform.buildRustPackage {
  src = src-service;
  sourceRoot = "${src-service.name}";

+  patches = [
+    # FIXME: remove until upstream fix these
+    # https://github.com/clash-verge-rev/clash-verge-rev/issues/3428
+
+    # Patch: Restrict bin_path in spawn_process to be under the clash-verge-service directory.
+    # This prevents arbitrary code execution by ensuring only trusted binaries from the Nix store are allowed to run.
+    ./0001-core-validate-bin_path-to-prevent-RCE-in-start_clash.patch
+
+    # Patch: Add validation to prevent overwriting existing files.
+    # This mitigates arbitrary file overwrite risks by ensuring a file does not already exist before writing.
+    ./0002-core-prevent-overwriting-existing-file-by-validating.patch
+  ];
+
  nativeBuildInputs = [
    pkg-config
  ];
--- a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
@ -47,6 +47,12 @@ rustPlatform.buildRustPackage {
    mv tauri.linux.conf.json.2 tauri.linux.conf.json
    chmod 777 ../.cargo
    rm ../.cargo/config.toml
+
+    # As a side effect of patching the service to fix the arbitrary file overwrite issue,
+    # we also need to update the timestamp format in the filename to the second level.
+    # This ensures that the Clash kernel can still be restarted within one minute without problems.
+    substituteInPlace src/utils/dirs.rs \
+      --replace-fail '%Y-%m-%d-%H%M' '%Y-%m-%d-%H%M%S'
  '';

  nativeBuildInputs = [
--- a/pkgs/by-name/d2/d2/package.nix
+++ b/pkgs/by-name/d2/d2/package.nix
@ -10,16 +10,16 @@

 buildGo123Module rec {
  pname = "d2";
-  version = "0.6.9";
+  version = "0.7.0";

  src = fetchFromGitHub {
    owner = "terrastruct";
    repo = pname;
    tag = "v${version}";
-    hash = "sha256-Z+RC3wXqplGxaECIpHDiV8giWItvE5KFh3N+mwVL6HU=";
+    hash = "sha256-RlQRf/ueYCbanXXA8tAftQ/9JKkH0QwT4+7Vlwtlnp8=";
  };

-  vendorHash = "sha256-ujyPfQx9FyMq5GBRquBHxcQ47R72RP6g2/rqLICDdWM=";
+  vendorHash = "sha256-STiIS0BRHypNujKNtNb77IXBDdeHVl/uGjVFubJrDc8=";

  excludedPackages = [ "./e2etests" ];

--- a/pkgs/by-name/ei/eiciel/package.nix
+++ b/pkgs/by-name/ei/eiciel/package.nix
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
    description = "Graphical editor for ACLs and extended attributes";
    homepage = "https://rofi.roger-ferrer.org/eiciel/";
    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ sersorrel ];
+    maintainers = with maintainers; [ keysmashes ];
    platforms = platforms.linux;
    mainProgram = "eiciel";
  };
--- a/pkgs/by-name/ev/evil-helix/package.nix
+++ b/pkgs/by-name/ev/evil-helix/package.nix
@ -3,18 +3,19 @@
  fetchFromGitHub,
  helix,
  installShellFiles,
+  nix-update-script,
  rustPlatform,
 }:

 rustPlatform.buildRustPackage rec {
  pname = "evil-helix";
-  version = "20250104";
+  version = "20250413";

  src = fetchFromGitHub {
    owner = "usagi-flow";
    repo = "evil-helix";
    rev = "release-${version}";
-    hash = "sha256-Otp68+SbW51/MqVejPrbYzeRu4wAiYsNkDQQTZScW1Q=";
+    hash = "sha256-0dXDAhnkkr5rh4UK0zkT3xYthk01VbNnRrYe5rD3oh4=";
  };

  useFetchCargoVendor = true;
@ -40,6 +41,8 @@ rustPlatform.buildRustPackage rec {
    cp contrib/helix.png $out/share/icons/hicolor/256x256/apps
  '';

+  passthru.updateScript = nix-update-script { };
+
  meta = {
    description = "Post-modern modal text editor, with vim keybindings";
    homepage = "https://github.com/usagi-flow/evil-helix";
--- a/pkgs/by-name/ff/fflogs/package.nix
+++ b/pkgs/by-name/ff/fflogs/package.nix
@ -32,7 +32,7 @@ appimageTools.wrapType2 {
    license = licenses.unfree; # no license listed
    mainProgram = "fflogs";
    platforms = platforms.linux;
-    maintainers = with maintainers; [ sersorrel ];
+    maintainers = with maintainers; [ keysmashes ];
    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
  };
 }
--- a/pkgs/by-name/fi/firezone-gateway/package.nix
+++ b/pkgs/by-name/fi/firezone-gateway/package.nix
@ -41,5 +41,6 @@ rustPlatform.buildRustPackage rec {
      patrickdag
    ];
    mainProgram = "firezone-gateway";
+    platforms = lib.platforms.linux;
  };
 }
--- a/pkgs/by-name/fi/firezone-gui-client/package.nix
+++ b/pkgs/by-name/fi/firezone-gui-client/package.nix
@ -162,5 +162,6 @@ rustPlatform.buildRustPackage rec {
      patrickdag
    ];
    mainProgram = "firezone-gui-client";
+    platforms = lib.platforms.linux;
  };
 }
--- a/pkgs/by-name/fi/firezone-headless-client/package.nix
+++ b/pkgs/by-name/fi/firezone-headless-client/package.nix
@ -46,5 +46,6 @@ rustPlatform.buildRustPackage rec {
      patrickdag
    ];
    mainProgram = "firezone-headless-client";
+    platforms = lib.platforms.linux;
  };
 }
--- a/pkgs/by-name/fi/firezone-relay/package.nix
+++ b/pkgs/by-name/fi/firezone-relay/package.nix
@ -33,5 +33,6 @@ rustPlatform.buildRustPackage rec {
      patrickdag
    ];
    mainProgram = "firezone-relay";
+    platforms = lib.platforms.linux;
  };
 }
--- a/pkgs/by-name/ga/gallery-dl/package.nix
+++ b/pkgs/by-name/ga/gallery-dl/package.nix
@ -8,7 +8,7 @@

 let
  pname = "gallery-dl";
-  version = "1.29.5";
+  version = "1.29.6";
 in
 python3Packages.buildPythonApplication {
  inherit pname version;
@ -18,7 +18,7 @@ python3Packages.buildPythonApplication {
    owner = "mikf";
    repo = "gallery-dl";
    tag = "v${version}";
-    hash = "sha256-pa+UZsqLU8u3gBG06iiI9yT+TpxUYKS1US2nQ9Ou9ko=";
+    hash = "sha256-D/HPAnIwCAfwzBrteGkZSMHFvXDPQLF4bHKDwppdkzc=";
  };

  build-system = [ python3Packages.setuptools ];
--- a/pkgs/by-name/gi/gildas/update.py
+++ b/pkgs/by-name/gi/gildas/update.py
@ -85,11 +85,14 @@ def get_hash(srcVersion):
    """

    url = f"http://www.iram.fr/~gildas/dist/gildas-src-{srcVersion}.tar.xz"
-    srcHash = (
-        subprocess.check_output(["nix-prefetch-url", url, "--unpack"]).decode().strip()
+    srcHash = subprocess.check_output(["nix-prefetch-url", url]).decode().strip()
+    # Convert to SRI representation
+    srcSRIHash = (
+        subprocess.check_output(["nix-hash", "--to-sri", "--type", "sha256", srcHash])
+        .decode()
+        .strip()
    )
-
-    return f"sha256:{srcHash}"
+    return srcSRIHash


 def get_package_attribute(attr):
--- a/pkgs/by-name/in/insync/package.nix
+++ b/pkgs/by-name/in/insync/package.nix
@ -13,24 +13,25 @@
  xkeyboard_config,
  libthai,
  libsForQt5,
+  xz,
 }:

 let
  pname = "insync";
  # Find a binary from https://www.insynchq.com/downloads/linux
-  version = "3.9.4.60020";
-  web-archive-id = "20241208213703"; # upload via https://web.archive.org/save/
-  ubuntu-dist = "trixie_amd64";
+  version = "3.9.6.60027";
+  web-archive-id = "20250502161201"; # upload via https://web.archive.org/save/
+  debian-dist = "trixie_amd64";
  insync-pkg = stdenvNoCC.mkDerivation {
    pname = "${pname}-pkg";
    inherit version;

    src = fetchurl rec {
      urls = [
-        "https://cdn.insynchq.com/builds/linux/${version}/insync_${version}-${ubuntu-dist}.deb"
+        "https://cdn.insynchq.com/builds/linux/${version}/insync_${version}-${debian-dist}.deb"
        "https://web.archive.org/web/${web-archive-id}/${builtins.elemAt urls 0}"
      ];
-      hash = "sha256-QauUzvtWQu8h41+wWIPhEZ3VVzXJwAh2bzj0gDYWnIw=";
+      hash = "sha256-q1s4hFQTXjS9VmA6XETpsvEEES79b84y8zCZwpy3gKo=";
    };

    nativeBuildInputs = [
@ -45,6 +46,7 @@ let
      lz4
      libgcrypt
      libthai
+      xz
    ] ++ (with libsForQt5; [ qt5.qtvirtualkeyboard ]);

    installPhase = ''
@ -100,11 +102,11 @@ buildFHSEnv {

  dieWithParent = true;

-  meta = with lib; {
+  meta = {
    platforms = [ "x86_64-linux" ];
    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
-    maintainers = with maintainers; [ hellwolf ];
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ hellwolf ];
    homepage = "https://www.insynchq.com";
    description = "Google Drive sync and backup with multiple account support";
    longDescription = ''
--- a/pkgs/by-name/le/legcord/package.nix
+++ b/pkgs/by-name/le/legcord/package.nix
@ -16,13 +16,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "legcord";
-  version = "1.1.1";
+  version = "1.1.3";

  src = fetchFromGitHub {
    owner = "Legcord";
    repo = "Legcord";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-0RbLvRCvy58HlOhHLcAoErRFgYxjWrKFQ6DPJD50c5Q=";
+    hash = "sha256-e8RhTx16y0hxXoOSztIs5pvI7Vzc9vKUsp1RRbt4Q78=";
  };

  nativeBuildInputs = [
@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {

  pnpmDeps = pnpm.fetchDeps {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-zAf3EGIt/BWSZ9BMHWWVPWo3m+whnl/p+SahmpdLoZ4=";
+    hash = "sha256-gLjpnpLKJCOOFidSR9r64cBVkMg38/slMsJ7KolScWI=";
  };

  buildPhase = ''
--- a/pkgs/by-name/li/libpinyin/package.nix
+++ b/pkgs/by-name/li/libpinyin/package.nix
@ -7,6 +7,7 @@
  glib,
  db,
  pkg-config,
+  nix-update-script,
 }:

 let
@ -15,15 +16,15 @@ let
    hash = "sha256-WcaOidQ/+F9aMJSJSZy83igtKwS9kYiHNIhLfe/LEVU=";
  };
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "libpinyin";
-  version = "2.10.0";
+  version = "2.10.1";

  src = fetchFromGitHub {
    owner = "libpinyin";
    repo = "libpinyin";
-    tag = version;
-    hash = "sha256-WUC1l+8q4TYDVbKwwk9lG5Wc5DM52BaZefcre0WQoBE=";
+    tag = finalAttrs.version;
+    hash = "sha256-bvPxbi/QwRQ5fFgVKC9kdqY/wbZApZaaIYXozQtHprY=";
  };

  postUnpack = ''
@ -42,6 +43,8 @@ stdenv.mkDerivation rec {
    db
  ];

+  passthru.updateScript = nix-update-script { };
+
  meta = {
    description = "Library for intelligent sentence-based Chinese pinyin input method";
    homepage = "https://github.com/libpinyin/libpinyin";
@ -52,4 +55,4 @@ stdenv.mkDerivation rec {
    ];
    platforms = lib.platforms.linux;
  };
-}
+})
--- a/pkgs/by-name/ma/mattermost/package.nix
+++ b/pkgs/by-name/ma/mattermost/package.nix
@ -19,9 +19,9 @@
    #
    # Ensure you also check ../mattermostLatest/package.nix.
    regex = "^v(10\\.5\\.[0-9]+)$";
-    version = "10.5.3";
-    srcHash = "sha256-/279OXGbznXSGD1UTozYf15Ezw88mNyosfDtr9pvbiY=";
-    vendorHash = "sha256-7jghoXFKA+WZ/ywOT0wWDMTfqAcBqp5gswOvpB7weL0=";
+    version = "10.5.4";
+    srcHash = "sha256-qf+OabB+QUaWRQTakuRy2dhUlmBv11Fdd8yh5QolVB0=";
+    vendorHash = "sha256-9Jl+lxvSoxUReziTqkDRyeNrijGWcBDbqoywJRIeD2k=";
    npmDepsHash = "sha256-tIeuDUZbqgqooDm5TRfViiTT5OIyN0BPwvJdI+wf7p0=";
    lockfileOverlay = ''
      unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react")
--- a/pkgs/by-name/n8/n8n/package.nix
+++ b/pkgs/by-name/n8/n8n/package.nix
@ -4,7 +4,7 @@
  nixosTests,
  fetchFromGitHub,
  nodejs,
-  pnpm_9,
+  pnpm_10,
  python3,
  node-gyp,
  cctools,
@ -17,23 +17,23 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "n8n";
-  version = "1.75.2";
+  version = "1.91.0";

  src = fetchFromGitHub {
    owner = "n8n-io";
    repo = "n8n";
    tag = "n8n@${finalAttrs.version}";
-    hash = "sha256-fIdwciI4QUNr2wNWiq7qT4c6aZeUnkaVhSkIgFO4Svw=";
+    hash = "sha256-YbN1i1c/AhLczpX5Zp3x+4mX0R6pwre47Pr5/YzzhYw=";
  };

-  pnpmDeps = pnpm_9.fetchDeps {
+  pnpmDeps = pnpm_10.fetchDeps {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-rtXTAHZUeitQFTa1Tw6l4el+xWD2hLT+2wu2LXW80cE=";
+    hash = "sha256-tYUbCAb2FI9NXyViDEYcpOST2LwZGx66Zwqy9sl2V1A=";
  };

  nativeBuildInputs =
    [
-      pnpm_9.configHook
+      pnpm_10.configHook
      python3 # required to build sqlite3 bindings
      node-gyp # required to build sqlite3 bindings
      makeWrapper
--- a/pkgs/by-name/ne/necesse-server/package.nix
+++ b/pkgs/by-name/ne/necesse-server/package.nix
@ -6,7 +6,7 @@
 }:

 let
-  version = "0.32.1-18204230";
+  version = "0.32.1-18336931";
  urlVersion = lib.replaceStrings [ "." ] [ "-" ] version;

 in
@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation {

  src = fetchzip {
    url = "https://necessegame.com/content/server/${urlVersion}/necesse-server-linux64-${urlVersion}.zip";
-    hash = "sha256-6xX5Fr3fGt7c/4jg8DBBG41QJH5PrxCVrC6w2ESNcLI=";
+    hash = "sha256-vvTbwEcfpzLIWSjbkUqKBOyAsT2fFk27v9UB9V+fTfw=";
  };

  # removing packaged jre since we use our own
--- a/pkgs/by-name/ni/nitrokey-udev-rules/package.nix
+++ b/pkgs/by-name/ni/nitrokey-udev-rules/package.nix
@ -1,20 +1,31 @@
 {
  lib,
-  stdenv,
+  stdenvNoCC,
  fetchFromGitHub,
+  python3,
 }:

-stdenv.mkDerivation (finalAttrs: {
+stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "nitrokey-udev-rules";
-  version = "1.0.0";
+  version = "1.1.0";

  src = fetchFromGitHub {
    owner = "Nitrokey";
    repo = "nitrokey-udev-rules";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-uq1+YQg+oe5UFphpy1AdxEYaPFyRle6ffYOPoU6Li28=";
+    hash = "sha256-LKpd6O9suAc2+FFgpuyTClEgL/JiZiokH3DV8P3C7Aw=";
  };

+  nativeBuildInputs = [ python3 ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    make generate
+
+    runHook postBuild
+  '';
+
  installPhase = ''
    install -D 41-nitrokey.rules -t $out/etc/udev/rules.d
  '';
--- a/pkgs/by-name/ot/otfcc/package.nix
+++ b/pkgs/by-name/ot/otfcc/package.nix
@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
  pname = "otfcc";
  version = "0.10.4";

+  # archived by the owner on Jun 3, 2022. No viable forks.
  src = fetchFromGitHub {
    owner = "caryll";
    repo = "otfcc";
@ -38,6 +39,11 @@ stdenv.mkDerivation rec {
    license = licenses.asl20;
    platforms = platforms.unix;
    maintainers = with maintainers; [ ttuegel ];
+    # Build fails on all platforms with
+    #        > configure flags: gmake
+    #   > ** Warning: action 'xcode4' sets 'os' field, which is deprecated, use 'targetos' instead.
+    #   > Error: invalid value 'StaticRuntime' for flags
+    broken = true;
  };

 }
--- a/pkgs/by-name/ot/otpauth/package.nix
+++ b/pkgs/by-name/ot/otpauth/package.nix
@ -6,16 +6,16 @@

 buildGo124Module rec {
  pname = "otpauth";
-  version = "0.5.4";
+  version = "0.6.0";

  src = fetchFromGitHub {
    owner = "dim13";
    repo = "otpauth";
    rev = "v${version}";
-    sha256 = "sha256-gxFhuFOSiyE7FLWqTZzKPZzXerwK2PWy7Z0zshAJ4Yg=";
+    sha256 = "sha256-QpQuMeldkZRXFi7I2yc7HS45gvsneZdPsSzkGWmnMX8=";
  };

-  vendorHash = "sha256-UXn+v8SAkEJ2tU3MudH2pDnLHBF4mzshHaovlzqm/fM=";
+  vendorHash = "sha256-Vx+nSSXidSJdEDoI2Bzx+5CQstNmW9dIOg8jEpAaguQ=";

  meta = with lib; {
    description = "Google Authenticator migration decoder";
--- a/pkgs/by-name/pi/pik/package.nix
+++ b/pkgs/by-name/pi/pik/package.nix
@ -8,17 +8,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "pik";
-  version = "0.20.0";
+  version = "0.21.0";

  src = fetchFromGitHub {
    owner = "jacek-kurlit";
    repo = "pik";
    rev = version;
-    hash = "sha256-ETDNaz23USQrH7TGJhdJvyt1NRr22TLFAdsWf1oV4uM=";
+    hash = "sha256-WEmDjHT3MHcHnQaElCD+dCMJPPp3x0svKLxoEoDm6XU=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-swm0+5OrCNy9w48BTBioUOdcAW4i38i2pKmee3VJbh8=";
+  cargoHash = "sha256-P4dU6daW1cHQ9ta93n/T9Ko+hxZ39lclBuXQk9qkwg4=";

  passthru.tests.version = testers.testVersion { package = pik; };

--- a/pkgs/by-name/pr/protols/package.nix
+++ b/pkgs/by-name/pr/protols/package.nix
@ -6,17 +6,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "protols";
-  version = "0.11.6";
+  version = "0.12.0";

  src = fetchFromGitHub {
    owner = "coder3101";
    repo = "protols";
    tag = version;
-    hash = "sha256-APGjh6+dNubxiyS5BI6pMXMBQ50ij6NnxSWZlbJ7FWk=";
+    hash = "sha256-v4ROQVoJmrukHFrxykr6EuBFXRuaBnPZ7f36ly7rPhg=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-L9nOVgfLoZDqKWsLBG9ph0TmlPej13S3KmgbLcumw8I=";
+  cargoHash = "sha256-fmsPkXwu8qy+SRyP5w940gqNmXg0V/p/vDSI7EIFrh0=";

  meta = {
    description = "Protocol Buffers language server written in Rust";
--- a/pkgs/by-name/ra/rauc/package.nix
+++ b/pkgs/by-name/ra/rauc/package.nix
@ -1,4 +1,5 @@
 {
+  composefs,
  curl,
  dbus,
  fetchFromGitHub,
@ -18,13 +19,13 @@

 stdenv.mkDerivation rec {
  pname = "rauc";
-  version = "1.13";
+  version = "1.14";

  src = fetchFromGitHub {
    owner = "rauc";
    repo = "rauc";
    rev = "v${version}";
-    sha256 = "sha256-Vq1dudB8OQveclAIVgiB8jbtp4o2Ga5v61Y6JUjOpbs=";
+    sha256 = "sha256-tpynDSCQ8E5DE82BvIJ2lEmwFQQpyYkV9UqjKKlArpw=";
  };

  passthru = {
@ -41,6 +42,7 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
+    composefs
    curl
    dbus
    glib
@ -53,6 +55,7 @@ stdenv.mkDerivation rec {

  mesonFlags = [
    "--buildtype=release"
+    (lib.mesonEnable "composefs" true)
    (lib.mesonOption "systemdunitdir" "${placeholder "out"}/lib/systemd/system")
    (lib.mesonOption "dbusinterfacesdir" "${placeholder "out"}/share/dbus-1/interfaces")
    (lib.mesonOption "dbuspolicydir" "${placeholder "out"}/share/dbus-1/system.d")
--- a/pkgs/by-name/re/readest/package.nix
+++ b/pkgs/by-name/re/readest/package.nix
@ -19,13 +19,13 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "readest";
-  version = "0.9.36";
+  version = "0.9.38";

  src = fetchFromGitHub {
    owner = "readest";
    repo = "readest";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-r/mpqeHKo6oQqNCnFByxHZf7RSWD5esZbweAEuda9ME=";
+    hash = "sha256-lr1bLNm68jeCjllVWpM07fkRy/PY1C3Ud8XMUQwIef4=";
    fetchSubmodules = true;
  };

@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: {

  useFetchCargoVendor = true;

-  cargoHash = "sha256-uMm/X4MKu71MxjofRN/HR5d1yzkJhmVt9W5kHDryEtc=";
+  cargoHash = "sha256-5mWnKjV9FBgO3trYZyOe+rWFMnJkp17NEbBz7gLg6tw=";

  cargoRoot = "../..";

--- a/pkgs/by-name/sw/swaynotificationcenter/package.nix
+++ b/pkgs/by-name/sw/swaynotificationcenter/package.nix
@ -26,6 +26,7 @@
  python3,
  scdoc,
  vala,
+  wayland-scanner,
  xvfb-run,
  sassc,
  pantheon,
@ -33,13 +34,13 @@

 stdenv.mkDerivation (finalAttrs: rec {
  pname = "SwayNotificationCenter";
-  version = "0.10.1";
+  version = "0.11.0";

  src = fetchFromGitHub {
    owner = "ErikReider";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-SR3FfEit50y4XSCLh3raUoigRNXpxh0mk4qLhQ/FozM=";
+    hash = "sha256-kRawYbBLVx0ie4t7tChkA8QJShS83fUcGrJSKkxBy8Q=";
  };

  # build pkg-config is required to locate the native `scdoc` input
@ -77,6 +78,7 @@ stdenv.mkDerivation (finalAttrs: rec {
    librsvg
    pantheon.granite
    # systemd # ends with broken permission
+    wayland-scanner
  ];

  postPatch = ''
--- a/pkgs/by-name/ta/tabby-agent/package.nix
+++ b/pkgs/by-name/ta/tabby-agent/package.nix
@ -64,6 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
    description = "Language server used to communicate with Tabby server";
    mainProgram = "tabby-agent";
    license = lib.licenses.asl20;
-    maintainers = [ lib.maintainers.khaneliman ];
+    maintainers = [ ];
  };
 })
--- a/pkgs/by-name/te/tetrio-plus/package.nix
+++ b/pkgs/by-name/te/tetrio-plus/package.nix
@ -13,14 +13,14 @@
 }:

 let
-  version = "0.27.5";
+  version = "0.27.7";
  tag = "electron-v${version}-tetrio-v${tetrio-desktop.version}";

  src = fetchFromGitLab {
    owner = "UniQMG";
    repo = "tetrio-plus";
    inherit tag;
-    hash = "sha256-hbHofrC2dJOh2kh3VLb/d0dHrcszyqTyID1PAaGApxY=";
+    hash = "sha256-AEn1TrC0hUVRgfL2QZ5TMN8pTOm36zpHr2b/LqQp5RY=";
  };

  offlineCache = fetchYarnDeps {
--- a/pkgs/by-name/un/unison-ucm/package.nix
+++ b/pkgs/by-name/un/unison-ucm/package.nix
@ -14,21 +14,21 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "unison-code-manager";
-  version = "0.5.37";
+  version = "0.5.39";

  src =
    {
      aarch64-darwin = fetchurl {
        url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-arm64.tar.gz";
-        hash = "sha256-cqsh1/H31ibyA8yr6pNdRAaH1nidobzt77oJq1N2icQ=";
+        hash = "sha256-0bMQ7z6fbfv8UV9Dqy+IYEAUXUC7FD9GnadtgzCi8GQ=";
      };
      x86_64-darwin = fetchurl {
        url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-x64.tar.gz";
-        hash = "sha256-9a8TJK6D5BU5TugQmYEcaFv5Hu9eeD463g23aSyKKQU=";
+        hash = "sha256-01h8yQrxOAbfrMT4UciDMRZSq/hfDzUUvNvVMIypRYg=";
      };
      x86_64-linux = fetchurl {
        url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux-x64.tar.gz";
-        hash = "sha256-eAqaE38M/spM3t0Ar/sJwGNPaNT/P9Lfn2ZIsW75kS8=";
+        hash = "sha256-mwV7iGaCvTEQBGCzyyHpZke4su3R5bIKT7dO78IOMdY=";
      };
    }
    .${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}");
--- a/pkgs/by-name/ve/velocity/deps.json
+++ b/pkgs/by-name/ve/velocity/deps.json
@ -598,72 +598,102 @@
  "io/netty#netty-bom/4.1.104.Final": {
   "pom": "sha256-WmXgahWdINO0gAYkpXDGRtvucQsrU5s0SaJoVYwonpw="
  },
-  "io/netty#netty-buffer/4.1.119.Final": {
-   "jar": "sha256-MiJiGNhUwuUdSTWn6+RmO3Lsua9NqIG4a/UY5hrtSNM=",
-   "pom": "sha256-ZxrAlb6wlY6qKsRVFJKWSVO3ZDD3VBbGa93g8++Qb0k="
+  "io/netty#netty-buffer/4.2.0.Final": {
+   "jar": "sha256-wBkmAXvg2WcRhFhSomRt5L8AqSVCsC7ZFfW+5Ugi/g0=",
+   "pom": "sha256-bBjzQVX17TipgvzKvnFjpPtKyIJT+mXMUO2UW5wqihA="
  },
-  "io/netty#netty-codec-haproxy/4.1.119.Final": {
-   "jar": "sha256-37y7TkXFgwaVU57Z6L3+EHQKorLM0Df3xsJXny5wq/4=",
-   "pom": "sha256-igsZt4CSwJwqUaAhzhIyeBTtF/L77u1WjeprreJlelo="
+  "io/netty#netty-codec-base/4.2.0.Final": {
+   "jar": "sha256-RrVqvXE66yfG9H1zo+SF6iHZbFUFQWJq0PYsoMrhGPQ=",
+   "pom": "sha256-NiGpDs4IdW0xajveLg3IBxhIc/j/CC92+klZeguCNbU="
  },
-  "io/netty#netty-codec-http/4.1.119.Final": {
-   "jar": "sha256-/0jbY+ROJz5neDLlLMKhziZw2nlvIq8SmovUw3hqLTQ=",
-   "pom": "sha256-vOiQ0Qr5A4IpExJ+naVAK73GZuDCUEOKeMkcwS4nKNA="
+  "io/netty#netty-codec-compression/4.2.0.Final": {
+   "jar": "sha256-tl3evCEZwECx5W+bZkfs3vjc29zSAOkdY63atOsauRw=",
+   "pom": "sha256-cuWm+0uQbKqiQxZebFNiyuAU4OAIE+11Hb5Y0B3p+eA="
  },
-  "io/netty#netty-codec/4.1.119.Final": {
-   "jar": "sha256-xJeTSgV0RLEmqG4G8rUJGI5IymxaXhTBgqAvHoyNX9s=",
-   "pom": "sha256-ZJYD0FaxmxgvbbDAyUVlNHgLtLpXV8/lRAYsIiTBb44="
+  "io/netty#netty-codec-haproxy/4.2.0.Final": {
+   "jar": "sha256-Cyah1KJ7DmzZGp6w21n71bBBmukrZdaSBGbIynWzSFo=",
+   "pom": "sha256-xlckSFjKcaOrz5xXjNN5eIl23x82aemjlo3U+TCggOg="
  },
-  "io/netty#netty-common/4.1.119.Final": {
-   "jar": "sha256-mRppsVlNytmSbiaOfpRTDP2qif7vQq8mkiowLT4ukhI=",
-   "pom": "sha256-PMa/2IxM0XguEknOg8O1TyruD8YVy32HoFU3i66XUyM="
+  "io/netty#netty-codec-http/4.2.0.Final": {
+   "jar": "sha256-iG0GBiC164CipVNL5wpH/FFsYKvQVVcPDvNMr28dYeI=",
+   "pom": "sha256-rI0zA731xoXJfFQQEzLGEqbrIc2KYI3mhtjfz1TFoJs="
  },
-  "io/netty#netty-handler/4.1.119.Final": {
-   "jar": "sha256-m0m+mONrt5ogJf+1FZrsh9onIM+lRfVt45w7wQhYexs=",
-   "pom": "sha256-thDmZTNdjjhqUojfU4o1bv+tZCNR4ZoVgzXqDSoASUs="
+  "io/netty#netty-codec-marshalling/4.2.0.Final": {
+   "jar": "sha256-vdBfpYoNkN4YJfHLFtUYuYNXGS3TA/f2u1QUFdCSi60=",
+   "pom": "sha256-7q2vroWVahx6stgVkzy22BudMpyo6O9u1ANne3Dt7hY="
  },
-  "io/netty#netty-parent/4.1.119.Final": {
-   "pom": "sha256-/zqMSVFYZZvdITF/YSVIv1jXFNswT87Gm4BJake2hgM="
+  "io/netty#netty-codec-protobuf/4.2.0.Final": {
+   "jar": "sha256-1hkWVKT52MRAv4VqAQxb1RhuwQAMEB03dUNSAESHjmU=",
+   "pom": "sha256-KUWxLJErMIvF3X7Sdeaol/hsaMuDoi9adJ2HN04NKlo="
  },
-  "io/netty#netty-resolver/4.1.119.Final": {
-   "jar": "sha256-O2yfn282B0chPRVJcd7B/IhSgg3BqY0FX/CdCWdviDY=",
-   "pom": "sha256-NmDAaSSYZKymorltz1va46qqJv8G7zHGgy8fRbPcfXc="
+  "io/netty#netty-codec/4.2.0.Final": {
+   "jar": "sha256-fbLwyPRKH7ZoZPPvqG0DqZigfNOB1s0Oh0YR9GSKkM0=",
+   "pom": "sha256-WhGKGtrJLpPpS63SMdxvMS0k2RkWEOo5O3X+1FDaYd8="
  },
-  "io/netty#netty-transport-classes-epoll/4.1.119.Final": {
-   "jar": "sha256-OO28600PPByHvI25+BLTFzQsnI6VpKBS+3lqL3itCY4=",
-   "pom": "sha256-b+EBjyF42dyvIbm0LVNPHT/2eLUS7Km+wORqr9KEGdU="
+  "io/netty#netty-common/4.2.0.Final": {
+   "jar": "sha256-UjcLbBMfU2tgybHmQ+mptuf/7PeH1dNFOxaJr72JSIY=",
+   "pom": "sha256-PPsQLAvAFyLCB/prp3iMnGkxbssK7NpZneT/rEw1nnM="
  },
-  "io/netty#netty-transport-classes-kqueue/4.1.119.Final": {
-   "jar": "sha256-r4T3GgvN6eTKLY8ct79qbU0kmSOnms4UqG/qgYqPkPc=",
-   "pom": "sha256-UD3mbIm3UTYOnfZkk8ME617x8T3IdwhZZrHV4mqnMHw="
+  "io/netty#netty-handler/4.2.0.Final": {
+   "jar": "sha256-ZBJAh4MnA68MxjSeCj442TkkrQj9X6RzB+r5qug5YdA=",
+   "pom": "sha256-VX4ITPkgVg6ZtVUKb8Vcy74jpTmtCURFdhVsAHmtSa8="
  },
-  "io/netty#netty-transport-native-epoll/4.1.119.Final": {
-   "jar": "sha256-lgYKW1oKODfqQmHpfPpCi9HXZFqIMsGFievNhokLXRg=",
-   "pom": "sha256-irxRuVvO8pFNK/HU9PpWny7DWG3qRT5wjJw0HtVe4ek="
+  "io/netty#netty-parent/4.2.0.Final": {
+   "pom": "sha256-r7Or46M80QKlWTbO40FwE4txcozZWEY78FDKE375qxw="
  },
-  "io/netty#netty-transport-native-epoll/4.1.119.Final/linux-aarch_64": {
-   "jar": "sha256-IlrvlWIYlmLgPJK9Xls+uFGlSZ2H75ArJky5JJiLGH0="
+  "io/netty#netty-resolver/4.2.0.Final": {
+   "jar": "sha256-ySpDpbHanOEWv3PvuyNkT+acHNM9037ZDcxXnvWt0Sg=",
+   "pom": "sha256-cGaHuj0B5olAF0hwSJ1Nt6R0Rj6UAv7p6QqySgnccK0="
  },
-  "io/netty#netty-transport-native-epoll/4.1.119.Final/linux-x86_64": {
-   "jar": "sha256-ElV5I6UGnnNqkwXHOoezA7qeibMto+yV3qaoVvP9Y5c="
+  "io/netty#netty-transport-classes-epoll/4.2.0.Final": {
+   "jar": "sha256-tyKjARA3ByL1AljVtKIZcMKvHO+zgQCAwe+zFhJ8ZCg=",
+   "pom": "sha256-TiF2aSsdI1maf2xsSAf7tBpHbGClxldxccW9WLxvftk="
  },
-  "io/netty#netty-transport-native-kqueue/4.1.119.Final": {
-   "jar": "sha256-F0Q4piU+ddPbVQ69CGJxq5bBHU5+jaPWpyr5xrSjhac=",
-   "pom": "sha256-sRoWwXL4F9pvCSo64FJjKP7oNU7GH9kdmQsEqsaPlA4="
+  "io/netty#netty-transport-classes-io_uring/4.2.0.Final": {
+   "jar": "sha256-Y1RIRQCPj9/wW4JcUOoiCWJQNMLPZfiFl/dvPKvH2O0=",
+   "pom": "sha256-tjAC7xoEeJ9zHMIF7voNJM5z4bZ9kX34wxvbSj4xkkM="
  },
-  "io/netty#netty-transport-native-kqueue/4.1.119.Final/osx-aarch_64": {
-   "jar": "sha256-UtgGg6dkTO9ClKcZ0oXNaJeagkMZCB4kDRScsuZcx1E="
+  "io/netty#netty-transport-classes-kqueue/4.2.0.Final": {
+   "jar": "sha256-4PX/BxGBO+ynWQ9ST9J3oe8WXy7pxRlrq41y10LdbCE=",
+   "pom": "sha256-KpL37GnxRY82aAnD1M99dRR23CxIuAZxdH0JWPk4sG0="
  },
-  "io/netty#netty-transport-native-kqueue/4.1.119.Final/osx-x86_64": {
-   "jar": "sha256-vDl3sM1Wo99hxhF6jfQd/Trv7oYuPFHKDUo4wzP/SqA="
+  "io/netty#netty-transport-native-epoll/4.2.0.Final": {
+   "jar": "sha256-VHWlUTe9NaqZ8iA6nzjqX2N08BS4jfcp7bmZ9KgYo80=",
+   "pom": "sha256-I0HScHWe5FI3f+gvtxRoHet1Wta4XdPnTrPSMi+HfB0="
  },
-  "io/netty#netty-transport-native-unix-common/4.1.119.Final": {
-   "jar": "sha256-iuVhj2kybm0Xt3sBQPnSdxGNvSOQbKB2OLwBNlcoxlA=",
-   "pom": "sha256-SqiNTykFV76vUGtoXKVeZH7LM0d2IYCID+Qiypddgko="
+  "io/netty#netty-transport-native-epoll/4.2.0.Final/linux-aarch_64": {
+   "jar": "sha256-o9xKVsE5jbEifUQcr0Ii2xaKXT9449X7tGu6lkmkOLU="
  },
-  "io/netty#netty-transport/4.1.119.Final": {
-   "jar": "sha256-wJIeoOecO5Ntqr4Iom6SZkKkrSSVHWEV+0M2LCHf6xA=",
-   "pom": "sha256-emUG02VfdKWneuAMaq/ZB70qt+0gAMNesqiObuTdA70="
+  "io/netty#netty-transport-native-epoll/4.2.0.Final/linux-x86_64": {
+   "jar": "sha256-EQc20zqQ7V3p/HSEpDuopaJ+YRz57Bzl83f6Fu3wk6I="
+  },
+  "io/netty#netty-transport-native-io_uring/4.2.0.Final": {
+   "jar": "sha256-oTzFZIYRhC4iEavTzG7QwHNqlF2OxgHE3Pa9kkPboGw=",
+   "pom": "sha256-f45+F28dIA4O6ojEIu8fOPIbh1kmSsTNLsY2oLVCHDk="
+  },
+  "io/netty#netty-transport-native-io_uring/4.2.0.Final/linux-aarch_64": {
+   "jar": "sha256-YavxiRa4SKO7bAO0UnUyRxVeVb4YNWtdcTtaE0TInvs="
+  },
+  "io/netty#netty-transport-native-io_uring/4.2.0.Final/linux-x86_64": {
+   "jar": "sha256-VjWAqkvFfpxORqWG90gz8LNKLL9M8z6CCIMgqodqtxY="
+  },
+  "io/netty#netty-transport-native-kqueue/4.2.0.Final": {
+   "jar": "sha256-izT+uqOG2dFXVzP28oJDgaJcslyFhpUY98VvriN1AJg=",
+   "pom": "sha256-sVEZGtkMTI/ScxJcB/2Z2nkYxIsW1TJ4EbeXhYd9Fr4="
+  },
+  "io/netty#netty-transport-native-kqueue/4.2.0.Final/osx-aarch_64": {
+   "jar": "sha256-B7vau9N0Ngx7tGDqF4iaNlvC9q+yKUO6u6/fdv+nSA8="
+  },
+  "io/netty#netty-transport-native-kqueue/4.2.0.Final/osx-x86_64": {
+   "jar": "sha256-sCYa4U6hX5dz4ayf8uu3oNlyF9HauW0HWVnFYEVMQw4="
+  },
+  "io/netty#netty-transport-native-unix-common/4.2.0.Final": {
+   "jar": "sha256-7qfwGHxAlNWTQbFQ1K0fxEyWOuZHcn1fM6hkR00g9VI=",
+   "pom": "sha256-kT7odeA5R97x91lJLS+ZNgKWAfE+6EET/zlCSd4NiSk="
+  },
+  "io/netty#netty-transport/4.2.0.Final": {
+   "jar": "sha256-LAurKGrjmt+MKikn2C5v2WTcGbPtH729TG9OIg8FKP8=",
+   "pom": "sha256-YNXY8UcYoSxfjYkUPjo2/7tWE72VAJLHyaol4sy+Urc="
  },
  "it/unimi/dsi#fastutil/8.5.15": {
   "jar": "sha256-z/62ZzvfHm5Dd9aE3y9VrDWc9c9t9hPgXmLe7qUAk2o=",
@ -694,24 +724,24 @@
   "jar": "sha256-Yq4oGH7SsGKBPaap1We/7nM8NBWCaZti3ZgCMHKaAxM=",
   "pom": "sha256-NYRJ1sc1OFhFCN2K5s/eVrr0o0t2e3HZzEZE8PH0IRo="
  },
-  "net/kyori#adventure-api/4.19.0": {
-   "jar": "sha256-WYIOnHz1S59nitY/VDta9kUltZPClxu2ujw7C1nd9v8=",
-   "module": "sha256-8JZ+QQNS2qP8qQWTX3g8VOpwG13hGAcVVOEwiBzXfb8=",
-   "pom": "sha256-lV69XjpLUNJ3cR2S3LdROCb8GRBn6u7l6ctDsr/1Sws="
+  "net/kyori#adventure-api/4.21.0": {
+   "jar": "sha256-ZKdldgQB541DOofb1M2lcBazA4U8b9Hclwh7WjqmgTM=",
+   "module": "sha256-+lKIKqUdj68bqml6drFHBnQUmNTKOkGg2MSrkTr6mV8=",
+   "pom": "sha256-dRFiV0Q3x90YtMgLxL5lBOtRCVVTL6YGhO8xU5LhQCc="
  },
-  "net/kyori#adventure-bom/4.19.0": {
-   "module": "sha256-VbTxTZkdxIaGX8zClEu4dASgS63yfUUjvvMDFcBMKrE=",
-   "pom": "sha256-ZUAHrgk+ph5coMKWnY2y7byiBIRCiIJqWndTrNbW4Ao="
+  "net/kyori#adventure-bom/4.21.0": {
+   "module": "sha256-6oUg3iIrlad0iW1bqJtFbKHQs7+RZbPsyOwvLXZhKPM=",
+   "pom": "sha256-fpuPxF10yGMnby42w0azTt+R2UJGxGgjRxv4w1hlenQ="
  },
-  "net/kyori#adventure-key/4.19.0": {
-   "jar": "sha256-GsZBwbobRBxJZSYyjpJ2jITS13Je3ZxFFFKfL/E7DPc=",
-   "module": "sha256-28bDKTs1bt81Tz8eX7ZVWObG6tF1hYXaw8veopN2ph4=",
-   "pom": "sha256-4o2gejddhOAtTeEbFbp7TFx2KAt2zjE2e5mDsO7kP1Q="
+  "net/kyori#adventure-key/4.21.0": {
+   "jar": "sha256-apOYydQCCJ+doGCla0XK59WMvxmTcabY7Bom2PlMxrs=",
+   "module": "sha256-aepciDIN/bFf/lUqRKf0G8gBQqu6Kuds6nG3g4uF4Ho=",
+   "pom": "sha256-BERAvYv/A9TmYDNK3F5V8/bPlLf/ddBzS4DEHjqCgJc="
  },
-  "net/kyori#adventure-nbt/4.19.0": {
-   "jar": "sha256-uB/+eVyjSBrKwMQProzG/NPjW9Viy6AeMJIL0/9hO8k=",
-   "module": "sha256-SvJGrxsR/JnjDOAOgF4QPmDPG5s3/7BP8Ke5prHHCuU=",
-   "pom": "sha256-4UQRdGf45nwVyZ4pfksjLTQEUqAOU3dasu1skQ1IcUo="
+  "net/kyori#adventure-nbt/4.21.0": {
+   "jar": "sha256-r27AXxaClKLmiLs8UhGxI70NTXh5HiS7fxE5rZi16zU=",
+   "module": "sha256-AGs77o7gGbcDYQ2MfBgzRW5OQ7nhEJO5yFF6Ck0M+B0=",
+   "pom": "sha256-0DAw5LnLm+QZSU42YB/opYAbt0nfH4pY8Xhn4SBwRzE="
  },
  "net/kyori#adventure-platform-api/4.3.4": {
   "jar": "sha256-7GBGKMK3wWXqdMH8s6LQ8DNZwsd6FJYOOgvC43lnCsI=",
@ -723,45 +753,50 @@
   "module": "sha256-VYXzbUzK6MaYbW4tmAjZs5ywl28CLK8sANPP5v1HTQQ=",
   "pom": "sha256-wP6w6syf5B8iL5iXsS4lrDw0Ub3VYWwUhclppgBO2eE="
  },
-  "net/kyori#adventure-text-logger-slf4j/4.19.0": {
-   "jar": "sha256-rPVYdaGXso8VqtF49fD+cj92I6D+GYob0Lyp0Ri7kEM=",
-   "module": "sha256-h9kOx6lt2kSbwAJvw0ns9OsoeuZI5UtKwpnXV7owtZ4=",
-   "pom": "sha256-8Dt8W/AgOtlrs+Fik7WK41How3oJD1Bv2nIyhw+FkOc="
+  "net/kyori#adventure-text-logger-slf4j/4.21.0": {
+   "jar": "sha256-RyStz+/740AsjoMhhGkGArN0uxZuvRfm7ACMRFxTeTU=",
+   "module": "sha256-5WCx5qig2rD9wE+mseKirWZ3EkMJiyolz7A76DFNxtU=",
+   "pom": "sha256-7V/qFBbC6VjJcntV4fEaRoDmyM52WLE8FVt7UrEKPso="
  },
-  "net/kyori#adventure-text-minimessage/4.19.0": {
-   "jar": "sha256-Ur8zHlzz4/FiPReXl3mDS2UJ/u0C9HE2fFlPK40EkAM=",
-   "module": "sha256-H61A67t3+hPhBu6iFgGfe7qTysos4wpNZO65pc/IB5s=",
-   "pom": "sha256-7XBjLxNp3dwUai1jpgvn/zmMb4WP6hJKTeQJ8flfCg8="
+  "net/kyori#adventure-text-minimessage/4.21.0": {
+   "jar": "sha256-UctIeIUbcmM76h0bWyTo3jRhS8koroodupa2OOmk6MQ=",
+   "module": "sha256-c/i/PZOmL76h8kLHmSq0qLNhuml92HWZCku22tY3qCs=",
+   "pom": "sha256-zwtZrXXi99pqoHZ0wlrwAKD4UNXmceXSs8aKgtTeVxA="
  },
-  "net/kyori#adventure-text-serializer-ansi/4.19.0": {
-   "jar": "sha256-4FADDha8o98IqSdTKW9ZTM0DxhSoKpxVN3GzJYJc+lw=",
-   "module": "sha256-wz3JY/1s6c/JuSv5WqNFxkx5oooGtIZa8BNWWrHtlSc=",
-   "pom": "sha256-/iuvsoLfqeqW6VuGy+k7lReG3VaNBm03inrGu2JBXwQ="
+  "net/kyori#adventure-text-serializer-ansi/4.21.0": {
+   "jar": "sha256-LwrIh56+RgbvZhviUgAzqVEo6TDK0wr1vAxpy1kSmcU=",
+   "module": "sha256-V+Qm8xoIWTqA1aZvxnr/Y1y9Cqh8x8RWicmTpqoGwU0=",
+   "pom": "sha256-+cXbfm4x6DLrME+ZtgqP8AbTZ39XZOSqH1muT0KgDUU="
  },
-  "net/kyori#adventure-text-serializer-gson/4.19.0": {
-   "jar": "sha256-Z6mZgHH1A/gWHTfXchIBND0Y6FvMHpw4cvIVSAYjMak=",
-   "module": "sha256-K8DaajmTCvil6OUCKtTcolbM9ONEPb6NmZudKfFscqM=",
-   "pom": "sha256-hl1NmguHwh7eh4rhCfebKGTVJqx+XNUqGYLhX8UA9Fs="
+  "net/kyori#adventure-text-serializer-commons/4.21.0": {
+   "jar": "sha256-LusmYFxyOlfltj0kwt1kGCFToUhsqOnzC8ukLSB/LCo=",
+   "module": "sha256-2SyvdO7dl496C1Q9dH4bNGD2+incUK9KAJEXKyyYJqM=",
+   "pom": "sha256-iSySW39EOPgDnk93KciCbI84LICMDDTIhoOtNqEN3PI="
  },
-  "net/kyori#adventure-text-serializer-json-legacy-impl/4.19.0": {
-   "jar": "sha256-jCc+wSoy1KJPfvcutsoXgnI20HN3/Sw00a2YruGk1JY=",
-   "module": "sha256-iN90DyLxs420gv/D2AZvFxsef7OKwPkDaZKQpCORvEU=",
-   "pom": "sha256-OVVdX3z4aEOKTs49HY4RNbokZbt0G7Fsik9HSN0NLJ0="
+  "net/kyori#adventure-text-serializer-gson/4.21.0": {
+   "jar": "sha256-ObUc+poE324dL0MdJqaX7WGWI2ls3rHAChr9NHxc4IQ=",
+   "module": "sha256-xSvs+73VcbpmWXy7iHfbGxeBYfCNA44zYIv9P54aD28=",
+   "pom": "sha256-aEx9Da6SK8h5u+4lweWm/L6vCdnbDhijb9IuUZlqWsM="
  },
-  "net/kyori#adventure-text-serializer-json/4.19.0": {
-   "jar": "sha256-Na/GB6tPCsEEcGCGWpXYDxmVDQJoztodmQrI08kLMOE=",
-   "module": "sha256-yFSFbtKZciyb1p/BTzDQPdkaO/XflLFz+X0VtQl9jVQ=",
-   "pom": "sha256-HbcQwOOhGoS4L9d00bKSIFSYK+sNHFUBFLoIB6crENk="
+  "net/kyori#adventure-text-serializer-json-legacy-impl/4.21.0": {
+   "jar": "sha256-zMCsXIBSo1C/yrpnyk03xyFL5aH42Syq44wcrWz4v1U=",
+   "module": "sha256-b4OuzShhdN3x79WpDiGuHB2uI3dxU71gx5C0BM8mgAQ=",
+   "pom": "sha256-ix6svUQKhS+N0V5SekEvDIU+uAaJc72krT+6K+Eq/QQ="
  },
-  "net/kyori#adventure-text-serializer-legacy/4.19.0": {
-   "jar": "sha256-hCkvU4/pyPeIXBQSXzq4vAFHt5SvazT84rCMBr3xmHg=",
-   "module": "sha256-pLhTnhajp6wXCcolTZgc5dhYNIe88PzcFgX1S6PiksE=",
-   "pom": "sha256-QdzUZVpfEFN8S+rVQ6QxQM105i+Bf5q3IvTKj/dqDxo="
+  "net/kyori#adventure-text-serializer-json/4.21.0": {
+   "jar": "sha256-kocXstx2RathZhfAvVXoCpwDWHYrWQoNPAu+MCsuVIE=",
+   "module": "sha256-wTimiDaAyLv+TCvGCGU/AKxhu/QGqbXYHSityPXo3Q0=",
+   "pom": "sha256-XAMhaDcf2h9er2XKH0YsCV/ci8qGlyxL15T9CsaVLtg="
  },
-  "net/kyori#adventure-text-serializer-plain/4.19.0": {
-   "jar": "sha256-AbCOQiGv7zyNN3NO7axhnA5k4T3Mu6uknPxkmR2WihQ=",
-   "module": "sha256-yP6RIud0PDNL2hziel3DKLOtOsTtPBoBu2sRORDeemw=",
-   "pom": "sha256-9LPEmbFsK4SEQckhiC8+qOq0h5V6u88wHWntn8YJbxc="
+  "net/kyori#adventure-text-serializer-legacy/4.21.0": {
+   "jar": "sha256-msG5n4KEWOGQCPZ1eBoOjIUXzfoiofxbuHp79pVUw1w=",
+   "module": "sha256-mJvCjUI2jqtsZERpc3oocvgf+BTCp+wWGwUqHRgkQQg=",
+   "pom": "sha256-KpOkDYdQEqmRPf4z6W5LXIUlRwDqVDSndkjHNLDFAhk="
+  },
+  "net/kyori#adventure-text-serializer-plain/4.21.0": {
+   "jar": "sha256-Ep1piIu5P+lvUS8eWBodNvAog2G4Xo7IBP1u7LzvMS4=",
+   "module": "sha256-qtwvfOI85wiFn3c/Bti6y6r1fWsGfG1vtSwx40gCrt4=",
+   "pom": "sha256-kqv+DaajY+E0gwjXNMuwTfyZkzjKq5zqVV4/JN9WLD0="
  },
  "net/kyori#ansi/1.1.1": {
   "jar": "sha256-tsVp4aCSW57rNJ4S2zXiI3VWEH4zNmV+Cy694mHYr9c=",
@ -778,10 +813,10 @@
   "module": "sha256-qfpHivwqQ0b4pb4JH14UZmhgGS3YZbHj2FkilmRsdP4=",
   "pom": "sha256-XuAEEIIvNukBnZR2LOAbzWA5VpdlNRvvBmCUXNT5pW4="
  },
-  "net/kyori#option/1.0.0": {
-   "jar": "sha256-K95aei1z+hFmoPFmOiLDr30naP/E/qMxd0w8D2IiXRE=",
-   "module": "sha256-YXzjwBN6oKMvvZDUWRTGL+OGpeFGM6PKQSmXH9fVcq8=",
-   "pom": "sha256-2YZ98Ipo4JPUCc9aTuHeAWJPSZJJ0Yh2SwbKQaOQ6Sk="
+  "net/kyori#option/1.1.0": {
+   "jar": "sha256-l7abSxff4CIXyRMa00JWTLya69BMdetoljm194/UsRw=",
+   "module": "sha256-Ntn51ZofzGCTZ6rMqiSTGWA+Ukf2qP4RK3O6uSGscNg=",
+   "pom": "sha256-HzMYoc7mPoCFCWJCzwYZpEuFdva1bCORoAzF4SdYR7Y="
  },
  "net/minecrell#terminalconsoleappender/1.3.0": {
   "jar": "sha256-Gv6hvKCVBo9/RIPwYf7tlHU740Iz3bDfnsOA/BTVqYU=",
@ -1204,10 +1239,14 @@
   "pom": "sha256-hHjnmqIupq95eWRD+O0w//pdxkfrPS0YYLrC4j800pc="
  },
  "org/jspecify#jspecify/0.3.0": {
-   "jar": "sha256-4cfhgytglfz8vldIVwDHMw1T1OV+LFu/nHGBmwLpeL4=",
   "module": "sha256-M7jCLyQkwpAyQaf+olj8QasMTWiJd2V2xRkEdWLuQ6U=",
   "pom": "sha256-9LGyrWHKF/KNBjxWEJ0+g5g5oQswG8lzSVQ+zu5X8xY="
  },
+  "org/jspecify#jspecify/1.0.0": {
+   "jar": "sha256-H61ua+dVd4Hk0zcp1Jrhzcj92m/kd7sMxozjUer9+6s=",
+   "module": "sha256-0wfKd6VOGKwe8artTlu+AUvS9J8p4dL4E+R8J4KDGVs=",
+   "pom": "sha256-zauSmjuVIR9D0gkMXi0N/oRllg43i8MrNYQdqzJEM6Y="
+  },
  "org/junit#junit-bom/5.10.1": {
   "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=",
   "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I="
--- a/pkgs/by-name/ve/velocity/package.nix
+++ b/pkgs/by-name/ve/velocity/package.nix
@ -35,13 +35,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "velocity";
-  version = "3.4.0-unstable-2025-04-03";
+  version = "3.4.0-unstable-2025-04-30";

  src = fetchFromGitHub {
    owner = "PaperMC";
    repo = "Velocity";
-    rev = "c72a3eefdeee26d39d5382c30435f9ce1819153e";
-    hash = "sha256-mBVNZAuAarBBQRD4H7XR/Hp+VmO+yoOwrkj/tQeEOWA=";
+    rev = "b411a0fa09f76aec062921b77642828408f0099f";
+    hash = "sha256-R61N4OxS5r4vtZC9IRGX1aizj6J5JB6nVP09+q1pyUo=";
  };

  nativeBuildInputs =
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@ -15,13 +15,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "vencord";
-  version = "1.11.9";
+  version = "1.12.0";

  src = fetchFromGitHub {
    owner = "Vendicated";
    repo = "Vencord";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-/CJt4CZ9R1xB72Zwc76te51Fb3q4KHuzDxP3jWGzW8E=";
+    hash = "sha256-sGRR3nHPQttiBIIaA2yYFyRezEq+2Ds+mgCpy6TYueU=";
  };

  pnpmDeps = pnpm_10.fetchDeps {
--- a/pkgs/by-name/vi/visp/package.nix
+++ b/pkgs/by-name/vi/visp/package.nix
@ -54,6 +54,13 @@ stdenv.mkDerivation (finalAttrs: {
      url = "https://github.com/lagadic/visp/pull/1310/commits/9ed0300507e13dddd83fd62a799f5039025ea44e.patch";
      hash = "sha256-xrJ7B/8mEfi9dM/ToMr6vCAwX/FMw+GA/W0zFYgT32s=";
    })
+
+    # fix error: unsupported option '-mfpu=' on darwin
+    # this was merged upstream, and can be removed on next release
+    (fetchpatch {
+      url = "https://github.com/lagadic/visp/commit/8c1461661f99a5db31c89ede9946d2b0244f8123.patch";
+      hash = "sha256-MER5KDrFxKs+Y5G9UcEIAh95Zilmv1Vp4xq+isRMM/U=";
+    })
  ];

  nativeBuildInputs = [
@ -93,6 +100,8 @@ stdenv.mkDerivation (finalAttrs: {

  meta = {
    description = "Open Source Visual Servoing Platform";
+    # ref. https://github.com/lagadic/visp/pull/1658
+    broken = stdenv.hostPlatform.system == "x86_64-darwin";
    homepage = "https://visp.inria.fr";
    changelog = "https://github.com/lagadic/visp/blob/v${finalAttrs.version}/ChangeLog.txt";
    license = lib.licenses.gpl2Plus;
--- a/pkgs/by-name/vr/vrcx/deps.json
+++ b/pkgs/by-name/vr/vrcx/deps.json
@ -0,0 +1,912 @@
+[
+  {
+    "pname": "DiscordRichPresence",
+    "version": "1.2.1.24",
+    "hash": "sha256-oRNrlF1/yK0QvrW2+48RsmSg9h9/pDIfA56/bpoHXFU="
+  },
+  {
+    "pname": "EntityFramework",
+    "version": "6.4.4",
+    "hash": "sha256-CmA8ZDT3ZmBAbzIQRT0gH+JSG2rodWAfaPSxOrkhLdw="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Analyzers",
+    "version": "3.3.3",
+    "hash": "sha256-pkZiggwLw8k+CVSXKTzsVGsT+K49LxXUS3VH5PNlpCY="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Analyzers",
+    "version": "3.3.4",
+    "hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Common",
+    "version": "4.1.0",
+    "hash": "sha256-g3RLyeHfdOOF6H89VLJi06/k8/eJ6j2dgNYZ/MBdfNU="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.CSharp",
+    "version": "4.1.0",
+    "hash": "sha256-pM9WXvxZI3SS89CGVjxqtAyZyfyiZQzW0UnNCDiQrQA="
+  },
+  {
+    "pname": "Microsoft.CSharp",
+    "version": "4.7.0",
+    "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "8.0.0",
+    "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "8.0.0",
+    "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="
+  },
+  {
+    "pname": "Microsoft.IO.RecyclableMemoryStream",
+    "version": "3.0.0",
+    "hash": "sha256-WBXkqxC5g4tJ481sa1uft39LqA/5hx5yOfiTfMRMg/4="
+  },
+  {
+    "pname": "Microsoft.JavaScript.NodeApi",
+    "version": "0.9.5",
+    "hash": "sha256-IJjCix/X0rh+3Fc7eVxKyk0P/Ex5ItlAM4ugTG7OYo4="
+  },
+  {
+    "pname": "Microsoft.JavaScript.NodeApi.Generator",
+    "version": "0.9.5",
+    "hash": "sha256-Me3fsW0tc00O8bCcItEjLvm2Tik6Xbc7FPBddaLim8w="
+  },
+  {
+    "pname": "Microsoft.NETCore.Platforms",
+    "version": "1.1.0",
+    "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
+  },
+  {
+    "pname": "Microsoft.NETCore.Platforms",
+    "version": "1.1.1",
+    "hash": "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg="
+  },
+  {
+    "pname": "Microsoft.NETCore.Platforms",
+    "version": "2.0.0",
+    "hash": "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="
+  },
+  {
+    "pname": "Microsoft.NETCore.Platforms",
+    "version": "2.1.2",
+    "hash": "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="
+  },
+  {
+    "pname": "Microsoft.NETCore.Platforms",
+    "version": "3.1.0",
+    "hash": "sha256-cnygditsEaU86bnYtIthNMymAHqaT/sf9Gjykhzqgb0="
+  },
+  {
+    "pname": "Microsoft.NETCore.Targets",
+    "version": "1.1.0",
+    "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
+  },
+  {
+    "pname": "Microsoft.NETCore.Targets",
+    "version": "1.1.3",
+    "hash": "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc="
+  },
+  {
+    "pname": "Microsoft.Toolkit.Uwp.Notifications",
+    "version": "7.1.3",
+    "hash": "sha256-sygTmtEBzLgQ6dh0Hpq/Cz9x+dcDl73+9maOvZvNbF4="
+  },
+  {
+    "pname": "Microsoft.Win32.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="
+  },
+  {
+    "pname": "Microsoft.Win32.Registry",
+    "version": "4.5.0",
+    "hash": "sha256-WMBXsIb0DgPFPaFkNVxY9b9vcMxPqtgFgijKYMJfV/0="
+  },
+  {
+    "pname": "Microsoft.Win32.Registry",
+    "version": "4.7.0",
+    "hash": "sha256-+jWCwRqU/J/jLdQKDFm93WfIDrDMXMJ984UevaQMoi8="
+  },
+  {
+    "pname": "Microsoft.Win32.SystemEvents",
+    "version": "9.0.2",
+    "hash": "sha256-WXgu8y2LT8OtQSVRojumtlTkJVjfvXeZ8N9iRKIW/lI="
+  },
+  {
+    "pname": "NETStandard.Library",
+    "version": "1.6.1",
+    "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="
+  },
+  {
+    "pname": "Newtonsoft.Json",
+    "version": "13.0.1",
+    "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="
+  },
+  {
+    "pname": "Newtonsoft.Json",
+    "version": "13.0.3",
+    "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
+  },
+  {
+    "pname": "NLog",
+    "version": "5.4.0",
+    "hash": "sha256-l2R0UHHCL02KPMC96e62AL2ONFD0PAty619y9UnD25A="
+  },
+  {
+    "pname": "runtime.any.System.Collections",
+    "version": "4.3.0",
+    "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="
+  },
+  {
+    "pname": "runtime.any.System.Diagnostics.Tools",
+    "version": "4.3.0",
+    "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="
+  },
+  {
+    "pname": "runtime.any.System.Diagnostics.Tracing",
+    "version": "4.3.0",
+    "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="
+  },
+  {
+    "pname": "runtime.any.System.Globalization",
+    "version": "4.3.0",
+    "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="
+  },
+  {
+    "pname": "runtime.any.System.Globalization.Calendars",
+    "version": "4.3.0",
+    "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="
+  },
+  {
+    "pname": "runtime.any.System.IO",
+    "version": "4.3.0",
+    "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="
+  },
+  {
+    "pname": "runtime.any.System.Reflection",
+    "version": "4.3.0",
+    "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="
+  },
+  {
+    "pname": "runtime.any.System.Reflection.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="
+  },
+  {
+    "pname": "runtime.any.System.Reflection.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="
+  },
+  {
+    "pname": "runtime.any.System.Resources.ResourceManager",
+    "version": "4.3.0",
+    "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="
+  },
+  {
+    "pname": "runtime.any.System.Runtime",
+    "version": "4.3.0",
+    "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="
+  },
+  {
+    "pname": "runtime.any.System.Runtime.Handles",
+    "version": "4.3.0",
+    "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="
+  },
+  {
+    "pname": "runtime.any.System.Runtime.InteropServices",
+    "version": "4.3.0",
+    "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="
+  },
+  {
+    "pname": "runtime.any.System.Text.Encoding",
+    "version": "4.3.0",
+    "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="
+  },
+  {
+    "pname": "runtime.any.System.Text.Encoding.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="
+  },
+  {
+    "pname": "runtime.any.System.Threading.Tasks",
+    "version": "4.3.0",
+    "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="
+  },
+  {
+    "pname": "runtime.any.System.Threading.Timer",
+    "version": "4.3.0",
+    "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs="
+  },
+  {
+    "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.2",
+    "hash": "sha256-EbnOqPOrAgI9eNheXLR++VnY4pHzMsEKw1dFPJ/Fl2c="
+  },
+  {
+    "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.2",
+    "hash": "sha256-mVg02TNvJc1BuHU03q3fH3M6cMgkKaQPBxraSHl/Btg="
+  },
+  {
+    "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.2",
+    "hash": "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA="
+  },
+  {
+    "pname": "runtime.native.System",
+    "version": "4.3.0",
+    "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="
+  },
+  {
+    "pname": "runtime.native.System.Data.SqlClient.sni",
+    "version": "4.7.0",
+    "hash": "sha256-cj0+BpmoibwOWj2wNXwONJeTGosmFwhD349zPjNaBK0="
+  },
+  {
+    "pname": "runtime.native.System.IO.Compression",
+    "version": "4.3.0",
+    "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="
+  },
+  {
+    "pname": "runtime.native.System.Net.Http",
+    "version": "4.3.0",
+    "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="
+  },
+  {
+    "pname": "runtime.native.System.Security.Cryptography.Apple",
+    "version": "4.3.0",
+    "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="
+  },
+  {
+    "pname": "runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="
+  },
+  {
+    "pname": "runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.2",
+    "hash": "sha256-xqF6LbbtpzNC9n1Ua16PnYgXHU0LvblEROTfK4vIxX8="
+  },
+  {
+    "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.2",
+    "hash": "sha256-aJBu6Frcg6webvzVcKNoUP1b462OAqReF2giTSyBzCQ="
+  },
+  {
+    "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.2",
+    "hash": "sha256-Mpt7KN2Kq51QYOEVesEjhWcCGTqWckuPf8HlQ110qLY="
+  },
+  {
+    "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple",
+    "version": "4.3.0",
+    "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="
+  },
+  {
+    "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.2",
+    "hash": "sha256-JvMltmfVC53mCZtKDHE69G3RT6Id28hnskntP9MMP9U="
+  },
+  {
+    "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.2",
+    "hash": "sha256-QfFxWTVRNBhN4Dm1XRbCf+soNQpy81PsZed3x6op/bI="
+  },
+  {
+    "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.2",
+    "hash": "sha256-EaJHVc9aDZ6F7ltM2JwlIuiJvqM67CKRq682iVSo+pU="
+  },
+  {
+    "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.2",
+    "hash": "sha256-PHR0+6rIjJswn89eoiWYY1DuU8u6xRJLrtjykAMuFmA="
+  },
+  {
+    "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.2",
+    "hash": "sha256-LFkh7ua7R4rI5w2KGjcHlGXLecsncCy6kDXLuy4qD/Q="
+  },
+  {
+    "pname": "runtime.unix.Microsoft.Win32.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="
+  },
+  {
+    "pname": "runtime.unix.System.Console",
+    "version": "4.3.1",
+    "hash": "sha256-dxyn/1Px4FKLZ2QMUrkFpW619Y1lhPeTiGLWYM6IbpY="
+  },
+  {
+    "pname": "runtime.unix.System.Diagnostics.Debug",
+    "version": "4.3.0",
+    "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="
+  },
+  {
+    "pname": "runtime.unix.System.IO.FileSystem",
+    "version": "4.3.0",
+    "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="
+  },
+  {
+    "pname": "runtime.unix.System.Net.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="
+  },
+  {
+    "pname": "runtime.unix.System.Net.Sockets",
+    "version": "4.3.0",
+    "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="
+  },
+  {
+    "pname": "runtime.unix.System.Private.Uri",
+    "version": "4.3.0",
+    "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="
+  },
+  {
+    "pname": "runtime.unix.System.Runtime.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="
+  },
+  {
+    "pname": "runtime.win-arm64.runtime.native.System.Data.SqlClient.sni",
+    "version": "4.4.0",
+    "hash": "sha256-8xGiqk5g4kM79//SirozmDtDpqwVXH3CmvIs7GNwfh0="
+  },
+  {
+    "pname": "runtime.win-x64.runtime.native.System.Data.SqlClient.sni",
+    "version": "4.4.0",
+    "hash": "sha256-HoXKGBkue0RJT1SZxAliVmT5rbfU3xD8mH8hfCvRxwQ="
+  },
+  {
+    "pname": "runtime.win-x86.runtime.native.System.Data.SqlClient.sni",
+    "version": "4.4.0",
+    "hash": "sha256-jPnWzDcbufO51GLGjynWHy0b+5PBqNxM+VKmSrObeUw="
+  },
+  {
+    "pname": "SharpDX",
+    "version": "4.2.0",
+    "hash": "sha256-EXEmBAIA+qoRjxMSrVpbHn0GfJCr9ucm8YttFjUhb8M="
+  },
+  {
+    "pname": "SharpDX.Direct3D11",
+    "version": "4.2.0",
+    "hash": "sha256-Id7c+LHdtQ6j/4H2HUVRGux51yfRW9qa5FwF1QWO4hk="
+  },
+  {
+    "pname": "SharpDX.DXGI",
+    "version": "4.2.0",
+    "hash": "sha256-y0oxvQE37IhFsjRiGmkOWrK0WDC94KPSfKq8W87V/Jc="
+  },
+  {
+    "pname": "SharpDX.Mathematics",
+    "version": "4.2.0",
+    "hash": "sha256-yxB/K3PHmCoxp/ndLnTBwmL3t56LQDRAU6IvKtjx1ZQ="
+  },
+  {
+    "pname": "SixLabors.Fonts",
+    "version": "2.0.8",
+    "hash": "sha256-ujiUYbg/uHYjJsLuljwK0kdaQHzrceZ+W6jgjCpv5LE="
+  },
+  {
+    "pname": "SixLabors.ImageSharp",
+    "version": "3.1.6",
+    "hash": "sha256-FQjLyC4158F1GyhlKjzjGo6TxAu698rYWTY9lkko/fA="
+  },
+  {
+    "pname": "SixLabors.ImageSharp.Drawing",
+    "version": "2.1.5",
+    "hash": "sha256-n54bDQpp5i2V4LgMXuuq/bHHs6/7PyK8eSx0vJ2NHbA="
+  },
+  {
+    "pname": "sqlite-net-pcl",
+    "version": "1.9.172",
+    "hash": "sha256-0PTcOwm4k8bMeLm5+z0iWjy379KYdQXjqkaBGBR20cc="
+  },
+  {
+    "pname": "SQLitePCLRaw.bundle_green",
+    "version": "2.1.2",
+    "hash": "sha256-7858BCblsCoALR11Q7ejjPKHk7johTjWxgndHwUYNws="
+  },
+  {
+    "pname": "SQLitePCLRaw.core",
+    "version": "2.1.2",
+    "hash": "sha256-bbymML2TTQJDKZbYXoiyYJnF6mh/PjKrzDkqWhLaHaY="
+  },
+  {
+    "pname": "SQLitePCLRaw.lib.e_sqlite3",
+    "version": "2.1.2",
+    "hash": "sha256-34lJgnGvODwrjn9WTkkBIg2jzYph/ARi1QSiKedCyUo="
+  },
+  {
+    "pname": "SQLitePCLRaw.provider.e_sqlite3",
+    "version": "2.1.2",
+    "hash": "sha256-e56+FgxEHqV3SGQx0ZAqzlscPxNUPXJ8Ls9rtqET1S4="
+  },
+  {
+    "pname": "Stub.System.Data.SQLite.Core.NetStandard",
+    "version": "1.0.119",
+    "hash": "sha256-e7MHfrWsJpg/IW8A8LRm410yIwoevZsVXa8uRvPEKDs="
+  },
+  {
+    "pname": "System.AppContext",
+    "version": "4.3.0",
+    "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="
+  },
+  {
+    "pname": "System.Buffers",
+    "version": "4.3.0",
+    "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="
+  },
+  {
+    "pname": "System.CodeDom",
+    "version": "4.7.0",
+    "hash": "sha256-4lO4CQyyqvwSG/EtNsRTQsbwyiY5pr225kAQXvlDkNE="
+  },
+  {
+    "pname": "System.CodeDom",
+    "version": "9.0.2",
+    "hash": "sha256-hNhCSyuD9/teTgFuX4zrBn/LWlijczwrMqv+r3/yfHI="
+  },
+  {
+    "pname": "System.Collections",
+    "version": "4.3.0",
+    "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="
+  },
+  {
+    "pname": "System.Collections.Concurrent",
+    "version": "4.3.0",
+    "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="
+  },
+  {
+    "pname": "System.Collections.Immutable",
+    "version": "5.0.0",
+    "hash": "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="
+  },
+  {
+    "pname": "System.Collections.Immutable",
+    "version": "6.0.0",
+    "hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs="
+  },
+  {
+    "pname": "System.ComponentModel.Annotations",
+    "version": "4.7.0",
+    "hash": "sha256-PxG9lvf2v/IAIs7LhO4Ur+EpX/L5nYbEs0D21gypoRs="
+  },
+  {
+    "pname": "System.Configuration.ConfigurationManager",
+    "version": "4.7.0",
+    "hash": "sha256-rYjp/UmagI4ZULU1ocia/AiXxLNL8uhMV8LBF4QFW10="
+  },
+  {
+    "pname": "System.Console",
+    "version": "4.3.0",
+    "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="
+  },
+  {
+    "pname": "System.Data.SqlClient",
+    "version": "4.8.1",
+    "hash": "sha256-SrhZIjgbS7XpFHsydxRBs8zu0qbgGLkdtvP0PBORv6A="
+  },
+  {
+    "pname": "System.Data.SQLite",
+    "version": "1.0.119",
+    "hash": "sha256-gPziL5rGBwktacKY9UPIxiystVPhQXgr+NVD+ZTFuAE="
+  },
+  {
+    "pname": "System.Data.SQLite.Core",
+    "version": "1.0.119",
+    "hash": "sha256-IQax/eN49q67S+TGNmuWN4Dz1ADjY4jqRPetytsgwIk="
+  },
+  {
+    "pname": "System.Data.SQLite.EF6",
+    "version": "1.0.119",
+    "hash": "sha256-upgcZ/YGVNT7kl+oZ/4fsLVourVef/8xpLQjk+J9+7w="
+  },
+  {
+    "pname": "System.Diagnostics.Debug",
+    "version": "4.3.0",
+    "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="
+  },
+  {
+    "pname": "System.Diagnostics.DiagnosticSource",
+    "version": "4.3.0",
+    "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="
+  },
+  {
+    "pname": "System.Diagnostics.Tools",
+    "version": "4.3.0",
+    "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="
+  },
+  {
+    "pname": "System.Diagnostics.Tracing",
+    "version": "4.3.0",
+    "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="
+  },
+  {
+    "pname": "System.Drawing.Common",
+    "version": "4.7.0",
+    "hash": "sha256-D3qG+xAe78lZHvlco9gHK2TEAM370k09c6+SQi873Hk="
+  },
+  {
+    "pname": "System.Drawing.Common",
+    "version": "9.0.2",
+    "hash": "sha256-S7IMV4R/nWbZs/YCwI9UwwLHDP57NkfSEIaoYNbRq54="
+  },
+  {
+    "pname": "System.Globalization",
+    "version": "4.3.0",
+    "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="
+  },
+  {
+    "pname": "System.Globalization.Calendars",
+    "version": "4.3.0",
+    "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="
+  },
+  {
+    "pname": "System.Globalization.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="
+  },
+  {
+    "pname": "System.IO",
+    "version": "4.3.0",
+    "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="
+  },
+  {
+    "pname": "System.IO.Compression",
+    "version": "4.3.0",
+    "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="
+  },
+  {
+    "pname": "System.IO.Compression.ZipFile",
+    "version": "4.3.0",
+    "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="
+  },
+  {
+    "pname": "System.IO.FileSystem",
+    "version": "4.3.0",
+    "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="
+  },
+  {
+    "pname": "System.IO.FileSystem.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="
+  },
+  {
+    "pname": "System.Linq",
+    "version": "4.3.0",
+    "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="
+  },
+  {
+    "pname": "System.Linq.Expressions",
+    "version": "4.3.0",
+    "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="
+  },
+  {
+    "pname": "System.Management",
+    "version": "9.0.2",
+    "hash": "sha256-7FhGnAYgoJnPcHy+HbVdK/fD8ICSLAttLtueTLBoWZc="
+  },
+  {
+    "pname": "System.Memory",
+    "version": "4.5.3",
+    "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="
+  },
+  {
+    "pname": "System.Memory",
+    "version": "4.5.4",
+    "hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="
+  },
+  {
+    "pname": "System.Net.Http",
+    "version": "4.3.0",
+    "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="
+  },
+  {
+    "pname": "System.Net.Http",
+    "version": "4.3.4",
+    "hash": "sha256-FMoU0K7nlPLxoDju0NL21Wjlga9GpnAoQjsFhFYYt00="
+  },
+  {
+    "pname": "System.Net.NameResolution",
+    "version": "4.3.0",
+    "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="
+  },
+  {
+    "pname": "System.Net.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="
+  },
+  {
+    "pname": "System.Net.Sockets",
+    "version": "4.3.0",
+    "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="
+  },
+  {
+    "pname": "System.ObjectModel",
+    "version": "4.3.0",
+    "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="
+  },
+  {
+    "pname": "System.Private.Uri",
+    "version": "4.3.0",
+    "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="
+  },
+  {
+    "pname": "System.Reactive",
+    "version": "6.0.0",
+    "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y="
+  },
+  {
+    "pname": "System.Reflection",
+    "version": "4.3.0",
+    "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="
+  },
+  {
+    "pname": "System.Reflection.Emit",
+    "version": "4.3.0",
+    "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="
+  },
+  {
+    "pname": "System.Reflection.Emit.ILGeneration",
+    "version": "4.3.0",
+    "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="
+  },
+  {
+    "pname": "System.Reflection.Emit.Lightweight",
+    "version": "4.3.0",
+    "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="
+  },
+  {
+    "pname": "System.Reflection.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="
+  },
+  {
+    "pname": "System.Reflection.Metadata",
+    "version": "5.0.0",
+    "hash": "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="
+  },
+  {
+    "pname": "System.Reflection.Metadata",
+    "version": "6.0.0",
+    "hash": "sha256-VJHXPjP05w6RE/Swu8wa2hilEWuji3g9bl/6lBMSC/Q="
+  },
+  {
+    "pname": "System.Reflection.MetadataLoadContext",
+    "version": "6.0.0",
+    "hash": "sha256-82aeU8c4rnYPLL3ba1ho1fxfpYQt5qrSK5e6ES+OTsY="
+  },
+  {
+    "pname": "System.Reflection.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="
+  },
+  {
+    "pname": "System.Reflection.TypeExtensions",
+    "version": "4.3.0",
+    "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="
+  },
+  {
+    "pname": "System.Resources.ResourceManager",
+    "version": "4.3.0",
+    "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="
+  },
+  {
+    "pname": "System.Runtime",
+    "version": "4.3.0",
+    "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
+  },
+  {
+    "pname": "System.Runtime",
+    "version": "4.3.1",
+    "hash": "sha256-R9T68AzS1PJJ7v6ARz9vo88pKL1dWqLOANg4pkQjkA0="
+  },
+  {
+    "pname": "System.Runtime.CompilerServices.Unsafe",
+    "version": "4.5.2",
+    "hash": "sha256-8eUXXGWO2LL7uATMZye2iCpQOETn2jCcjUhG6coR5O8="
+  },
+  {
+    "pname": "System.Runtime.CompilerServices.Unsafe",
+    "version": "5.0.0",
+    "hash": "sha256-neARSpLPUzPxEKhJRwoBzhPxK+cKIitLx7WBYncsYgo="
+  },
+  {
+    "pname": "System.Runtime.CompilerServices.Unsafe",
+    "version": "6.0.0",
+    "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
+  },
+  {
+    "pname": "System.Runtime.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="
+  },
+  {
+    "pname": "System.Runtime.Handles",
+    "version": "4.3.0",
+    "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="
+  },
+  {
+    "pname": "System.Runtime.InteropServices",
+    "version": "4.3.0",
+    "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="
+  },
+  {
+    "pname": "System.Runtime.InteropServices.RuntimeInformation",
+    "version": "4.3.0",
+    "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="
+  },
+  {
+    "pname": "System.Runtime.Numerics",
+    "version": "4.3.0",
+    "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="
+  },
+  {
+    "pname": "System.Security.AccessControl",
+    "version": "4.5.0",
+    "hash": "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM="
+  },
+  {
+    "pname": "System.Security.AccessControl",
+    "version": "4.7.0",
+    "hash": "sha256-/9ZCPIHLdhzq7OW4UKqTsR0O93jjHd6BRG1SRwgHE1g="
+  },
+  {
+    "pname": "System.Security.Cryptography.Algorithms",
+    "version": "4.3.0",
+    "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="
+  },
+  {
+    "pname": "System.Security.Cryptography.Cng",
+    "version": "4.3.0",
+    "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="
+  },
+  {
+    "pname": "System.Security.Cryptography.Csp",
+    "version": "4.3.0",
+    "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="
+  },
+  {
+    "pname": "System.Security.Cryptography.Encoding",
+    "version": "4.3.0",
+    "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="
+  },
+  {
+    "pname": "System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="
+  },
+  {
+    "pname": "System.Security.Cryptography.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="
+  },
+  {
+    "pname": "System.Security.Cryptography.ProtectedData",
+    "version": "4.7.0",
+    "hash": "sha256-dZfs5q3Ij1W1eJCfYjxI2o+41aSiFpaAugpoECaCOug="
+  },
+  {
+    "pname": "System.Security.Cryptography.X509Certificates",
+    "version": "4.3.0",
+    "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="
+  },
+  {
+    "pname": "System.Security.Permissions",
+    "version": "4.7.0",
+    "hash": "sha256-BGgXMLUi5rxVmmChjIhcXUxisJjvlNToXlyaIbUxw40="
+  },
+  {
+    "pname": "System.Security.Principal.Windows",
+    "version": "4.3.0",
+    "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="
+  },
+  {
+    "pname": "System.Security.Principal.Windows",
+    "version": "4.5.0",
+    "hash": "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY="
+  },
+  {
+    "pname": "System.Security.Principal.Windows",
+    "version": "4.7.0",
+    "hash": "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg="
+  },
+  {
+    "pname": "System.Text.Encoding",
+    "version": "4.3.0",
+    "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="
+  },
+  {
+    "pname": "System.Text.Encoding.CodePages",
+    "version": "4.5.1",
+    "hash": "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="
+  },
+  {
+    "pname": "System.Text.Encoding.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="
+  },
+  {
+    "pname": "System.Text.Json",
+    "version": "9.0.2",
+    "hash": "sha256-kftKUuGgZtF4APmp77U79ws76mEIi+R9+DSVGikA5y8="
+  },
+  {
+    "pname": "System.Text.RegularExpressions",
+    "version": "4.3.0",
+    "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="
+  },
+  {
+    "pname": "System.Text.RegularExpressions",
+    "version": "4.3.1",
+    "hash": "sha256-DxsEZ0nnPozyC1W164yrMUXwnAdHShS9En7ImD/GJMM="
+  },
+  {
+    "pname": "System.Threading",
+    "version": "4.3.0",
+    "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="
+  },
+  {
+    "pname": "System.Threading.Channels",
+    "version": "8.0.0",
+    "hash": "sha256-c5TYoLNXDLroLIPnlfyMHk7nZ70QAckc/c7V199YChg="
+  },
+  {
+    "pname": "System.Threading.Tasks",
+    "version": "4.3.0",
+    "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="
+  },
+  {
+    "pname": "System.Threading.Tasks.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="
+  },
+  {
+    "pname": "System.Threading.Tasks.Extensions",
+    "version": "4.5.4",
+    "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="
+  },
+  {
+    "pname": "System.Threading.ThreadPool",
+    "version": "4.3.0",
+    "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="
+  },
+  {
+    "pname": "System.Threading.Timer",
+    "version": "4.3.0",
+    "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="
+  },
+  {
+    "pname": "System.ValueTuple",
+    "version": "4.5.0",
+    "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="
+  },
+  {
+    "pname": "System.Windows.Extensions",
+    "version": "4.7.0",
+    "hash": "sha256-yW+GvQranReaqPw5ZFv+mSjByQ5y1pRLl05JIEf3tYU="
+  },
+  {
+    "pname": "System.Xml.ReaderWriter",
+    "version": "4.3.0",
+    "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="
+  },
+  {
+    "pname": "System.Xml.XDocument",
+    "version": "4.3.0",
+    "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="
+  },
+  {
+    "pname": "Websocket.Client",
+    "version": "5.1.2",
+    "hash": "sha256-T0uXa9hAr3+9cvpJ/FVwtqNmE7QvSJxXsIoWV624cHs="
+  }
+]
--- a/pkgs/by-name/vr/vrcx/package.nix
+++ b/pkgs/by-name/vr/vrcx/package.nix
@ -1,35 +1,112 @@
 {
  lib,
-  fetchurl,
-  appimageTools,
-  dotnet-runtime_9,
+  fetchFromGitHub,
+  buildDotnetModule,
+  dotnetCorePackages,
+  buildNpmPackage,
+  electron_34,
+  makeWrapper,
+  copyDesktopItems,
+  makeDesktopItem,
+  stdenv,
 }:
 let
  pname = "vrcx";
  version = "2025.03.01";
-  filename = builtins.replaceStrings [ "." ] [ "" ] version;
-  src = fetchurl {
-    hash = "sha256-d+sqebPDZC0GWtd+5/R1KXIKUbpZ0k9YFupsf29IHCs=";
-    url = "https://github.com/vrcx-team/VRCX/releases/download/v${version}/VRCX_${filename}.AppImage";
+  dotnet = dotnetCorePackages.dotnet_9;
+  electron = electron_34;
+
+  src = fetchFromGitHub {
+    owner = "vrcx-team";
+    repo = "VRCX";
+    # v2025.03.01 tag is actually behind a few commits, namely the one that bumps the version (so it complains about not being up-to-date)
+    #tag = "v${version}";
+    rev = "1980eeb4cccebfcf33826d44b7833a9aa6f5a955";
+    hash = "sha256-HiFcHnytynWYbeUd+KsG38dLU1FhDu0VD3JPT3kUO6s=";
  };
-  appimageContents = appimageTools.extract {
-    inherit pname src version;
+
+  backend = buildDotnetModule {
+    inherit version src;
+    pname = "${pname}-backend";
+
+    dotnet-sdk = dotnet.sdk;
+    dotnet-runtime = dotnet.runtime;
+    projectFile = "Dotnet/VRCX-Electron.csproj";
+
+    nugetDeps = ./deps.json;
+
+    installPhase = ''
+      runHook preInstall
+
+      cp -r build/Electron $out
+
+      runHook postInstall
+    '';
  };
 in
-appimageTools.wrapType2 rec {
+buildNpmPackage {
  inherit pname version src;
-  extraPkgs = pkgs: [ dotnet-runtime_9 ];
-  extraInstallCommands = ''
-    install -m 444 -D ${appimageContents}/vrcx.desktop \
-      $out/share/applications/VRCX.desktop
-    install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/256x256/apps/vrcx.png \
-      $out/share/icons/hicolor/256x256/apps/VRCX.png

-    substituteInPlace $out/share/applications/VRCX.desktop \
-      --replace-fail 'Exec=AppRun' 'Exec=${pname} --no-install --ozone-platform-hint=auto'
-    substituteInPlace $out/share/applications/VRCX.desktop \
-      --replace-fail 'Icon=VRCX' "Icon=$out/share/icons/hicolor/256x256/apps/VRCX.png"
+  npmDepsHash = "sha256-2ZU+9NPPx3GbU75XfjVroZCpjXr7IK2HtEIqLJLOjyw=";
+  npmFlags = [ "--ignore-scripts" ];
+  makeCacheWritable = true;
+
+  nativeBuildInputs = [
+    makeWrapper
+    copyDesktopItems
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    env PLATFORM=linux npm exec webpack -- --config webpack.config.js --mode production
+    node src-electron/patch-package-version.js
+    npm exec electron-builder -- --dir \
+      -c.electronDist=${electron.dist} \
+      -c.electronVersion=${electron.version}
+    node src-electron/patch-node-api-dotnet.js
+
+    runHook postBuild
  '';
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/share/vrcx"
+    cp -r build/*-unpacked/resources "$out/share/vrcx/"
+    mkdir -p $out/share/vrcx/resources/app.asar.unpacked/build
+    cp -r ${backend} "$out/share/vrcx/resources/app.asar.unpacked/build/Electron"
+
+    makeWrapper '${electron}/bin/electron' "$out/bin/vrcx"  \
+      --add-flags "--ozone-platform-hint=auto"              \
+      --add-flags "$out/share/vrcx/resources/app.asar"      \
+      --set NODE_ENV production                             \
+      --set DOTNET_ROOT ${dotnet.runtime}/share/dotnet      \
+      --prefix PATH : ${lib.makeBinPath [ dotnet.runtime ]}
+
+    install -Dm644 VRCX.png "$out/share/icons/hicolor/256x256/apps/vrcx.png"
+
+    runHook postInstall
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "vrcx";
+      desktopName = "VRCX";
+      comment = "Friendship management tool for VRChat";
+      icon = "vrcx";
+      exec = "vrcx";
+      terminal = false;
+      categories = [
+        "Utility"
+        "Application"
+      ];
+      mimeTypes = [ "x-scheme-handler/vrcx" ];
+    })
+  ];
+
+  passthru = {
+    inherit backend;
+  };

  meta = {
    description = "Friendship management tool for VRChat";
@ -40,8 +117,11 @@ appimageTools.wrapType2 rec {
    license = lib.licenses.mit;
    homepage = "https://github.com/vrcx-team/VRCX";
    downloadPage = "https://github.com/vrcx-team/VRCX/releases";
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    maintainers = with lib.maintainers; [ ShyAssassin ];
+    maintainers = with lib.maintainers; [
+      ShyAssassin
+      ImSapphire
+    ];
    platforms = lib.platforms.linux;
+    broken = !stdenv.hostPlatform.isx86_64;
  };
 }
--- a/pkgs/by-name/we/weblate/package.nix
+++ b/pkgs/by-name/we/weblate/package.nix
@ -26,7 +26,7 @@ let
 in
 python.pkgs.buildPythonApplication rec {
  pname = "weblate";
-  version = "5.11.1";
+  version = "5.11.3";

  pyproject = true;

@ -39,7 +39,7 @@ python.pkgs.buildPythonApplication rec {
    owner = "WeblateOrg";
    repo = "weblate";
    tag = "weblate-${version}";
-    hash = "sha256-RUyJ/QbSbxl1A7Z+sFMSz9GwTDoV3fA5w27NCJO7bRI=";
+    hash = "sha256-FdiM6pvJhJHxJUDy17qb122fA4g0ffk6NEdvzLjKBeA=";
  };

  patches = [
@ -174,7 +174,7 @@ python.pkgs.buildPythonApplication rec {
  meta = {
    description = "Web based translation tool with tight version control integration";
    homepage = "https://weblate.org/";
-    changelog = "https://github.com/WeblateOrg/weblate/releases/tag/weblate-${version}";
+    changelog = "https://github.com/WeblateOrg/weblate/releases/tag/${src.tag}";
    license = with lib.licenses; [
      gpl3Plus
      mit
--- a/pkgs/by-name/wr/wrkflw/package.nix
+++ b/pkgs/by-name/wr/wrkflw/package.nix
@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "wrkflw";
-  version = "0.3.0";
+  version = "0.4.0";

  src = fetchFromGitHub {
    owner = "bahdotsh";
    repo = "wrkflw";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-ErzlAVRyDyRo/AAbTjuBhuQtveRttB0ArUugIGuYMiY=";
+    hash = "sha256-b2g6sY+YBZfD5D+fmbpz+hKZvKKwjCCuygxk2pyYaR8=";
  };

-  cargoHash = "sha256-SbX0jWaihabl90L7KfRfFakvTDIpJcDjsfOr36T8+Xg=";
+  cargoHash = "sha256-iCagvOIc1Gsox6yQDfOrSTXaM30Q93CwHZdDZOi4kK0=";

  nativeBuildInputs = [ pkg-config ];
  buildInputs = [
--- a/pkgs/by-name/xi/xivlauncher/package.nix
+++ b/pkgs/by-name/xi/xivlauncher/package.nix
@ -116,7 +116,7 @@ buildDotnetModule rec {
    homepage = "https://github.com/goatcorp/XIVLauncher.Core";
    license = licenses.gpl3;
    maintainers = with maintainers; [
-      sersorrel
+      keysmashes
      witchof0x20
    ];
    platforms = [ "x86_64-linux" ];
--- a/pkgs/development/compilers/llvm/21/llvm/gnu-install-dirs.patch
+++ b/pkgs/development/compilers/llvm/21/llvm/gnu-install-dirs.patch
@ -0,0 +1,140 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 73c4fc14f031..42284703a52c 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -1153,9 +1153,9 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "")
+   add_subdirectory(${TENSORFLOW_AOT_PATH}/xla_aot_runtime_src
+     ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/tf_runtime)
+   install(TARGETS tf_xla_runtime EXPORT LLVMExports
+-    ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)
+   install(TARGETS tf_xla_runtime EXPORT LLVMDevelopmentExports
+-    ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)
+   set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS tf_xla_runtime)
+   # Once we add more modules, we should handle this more automatically.
+   if (DEFINED LLVM_OVERRIDE_MODEL_HEADER_INLINERSIZEMODEL)
+diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake
+index 52bf7ca0906a..ba2f4be17f08 100644
+--- a/cmake/modules/AddLLVM.cmake
+++ b/cmake/modules/AddLLVM.cmake
+@@ -974,8 +974,8 @@ macro(add_llvm_library name)
+       endif()
+       install(TARGETS ${name}
+               ${export_to_llvmexports}
+-              LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name}
+-              ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name}
+              LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT ${name}
+              ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT ${name}
+               RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name})
+ 
+       if (NOT LLVM_ENABLE_IDE)
+@@ -2258,7 +2258,7 @@ function(llvm_install_library_symlink name dest type)
+     set(LLVM_LINK_OR_COPY copy)
+   endif()
+ 
+-  set(output_dir lib${LLVM_LIBDIR_SUFFIX})
+  set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
+   if((WIN32 OR CYGWIN) AND "${type}" STREQUAL "SHARED")
+     set(output_dir "${CMAKE_INSTALL_BINDIR}")
+   endif()
+@@ -2534,16 +2534,37 @@ function(llvm_setup_rpath name)
+ 
+   if (APPLE)
+     set(_install_name_dir INSTALL_NAME_DIR "@rpath")
+-    set(_install_rpath "@loader_path/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
+    set(_install_rpath ${extra_libdir})
+   elseif(${CMAKE_SYSTEM_NAME} MATCHES "AIX" AND BUILD_SHARED_LIBS)
+     # $ORIGIN is not interpreted at link time by aix ld.
+     # Since BUILD_SHARED_LIBS is only recommended for use by developers,
+     # hardcode the rpath to build/install lib dir first in this mode.
+     # FIXME: update this when there is better solution.
+-    set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
+    set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
+   elseif(UNIX)
+    # Note that we add `extra_libdir` (aka `LLVM_LIBRARY_DIR` in our case) back
+    # to `_install_rpath` here.
+    #
+    # In nixpkgs we do not build and install LLVM alongside rdeps of LLVM (i.e.
+    # clang); instead LLVM is its own package and thus lands at its own nix
+    # store path. This makes it so that the default relative rpath (`../lib/`)
+    # does not point at the LLVM shared objects.
+    #
+    # More discussion here:
+    #   - https://github.com/NixOS/nixpkgs/pull/235624#discussion_r1220150329
+    #   - https://reviews.llvm.org/D146918 (16.0.5+)
+    #
+    # Note that we leave `extra_libdir` in `_build_rpath`: without FHS there is
+    # no potential that this will result in us pulling in the "wrong" LLVM.
+    # Adding this to the build rpath means we aren't forced to use
+    # `installCheckPhase` instead of `checkPhase` (i.e. binaries in the build
+    # dir, pre-install, will have the right rpath for LLVM).
+    #
+    # As noted in the differential above, an alternative solution is to have
+    # all rdeps of nixpkgs' LLVM (that use the AddLLVM.cmake machinery) set
+    # `CMAKE_INSTALL_RPATH`.
+     set(_build_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
+-    set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}")
+    set(_install_rpath ${extra_libdir})
+     if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)")
+       set_property(TARGET ${name} APPEND_STRING PROPERTY
+                    LINK_FLAGS " -Wl,-z,origin ")
+diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake
+index 2d9116b08a52..2dd7cad4ec66 100644
+--- a/cmake/modules/AddOCaml.cmake
+++ b/cmake/modules/AddOCaml.cmake
+@@ -147,9 +147,9 @@ function(add_ocaml_library name)
+   endforeach()
+ 
+   if( APPLE )
+-    set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}")
+    set(ocaml_rpath ${LLVM_LIBRARY_DIR})
+   elseif( UNIX )
+-    set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}")
+    set(ocaml_rpath ${LLVM_LIBRARY_DIR})
+   endif()
+   list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}")
+ 
+diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt
+index ef4cfa3acdb5..7478e157a7c2 100644
+--- a/cmake/modules/CMakeLists.txt
+++ b/cmake/modules/CMakeLists.txt
+@@ -130,7 +130,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS
+   )
+ list(REMOVE_DUPLICATES LLVM_CONFIG_INCLUDE_DIRS)
+ 
+-extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "lib\${LLVM_LIBDIR_SUFFIX}")
+extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}")
+ set(LLVM_CONFIG_LIBRARY_DIRS
+   "${LLVM_CONFIG_LIBRARY_DIR}"
+   # FIXME: Should there be other entries here?
+diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in
+index e4e1d449bf4d..3aab6ea7bf8b 100644
+--- a/tools/llvm-config/BuildVariables.inc.in
+++ b/tools/llvm-config/BuildVariables.inc.in
+@@ -23,6 +23,7 @@
+ #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@"
+ #define LLVM_BUILDMODE "@LLVM_BUILDMODE@"
+ #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@"
+#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@"
+ #define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@"
+ #define LLVM_INSTALL_PACKAGE_DIR "@LLVM_INSTALL_PACKAGE_DIR@"
+ #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@"
+diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
+index 49df8fdcb7f7..c7cb05b82821 100644
+--- a/tools/llvm-config/llvm-config.cpp
+++ b/tools/llvm-config/llvm-config.cpp
+@@ -365,7 +365,11 @@ int main(int argc, char **argv) {
+       sys::fs::make_absolute(ActivePrefix, Path);
+       ActiveBinDir = std::string(Path);
+     }
+-    ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX;
+    {
+      SmallString<256> Path(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX);
+      sys::fs::make_absolute(ActivePrefix, Path);
+      ActiveLibDir = std::string(Path);
+    }
+     {
+       SmallString<256> Path(LLVM_INSTALL_PACKAGE_DIR);
+       sys::fs::make_absolute(ActivePrefix, Path);
+
--- a/pkgs/development/compilers/llvm/common/patches.nix
+++ b/pkgs/development/compilers/llvm/common/patches.nix
@ -48,8 +48,13 @@
    }
  ];
  "llvm/gnu-install-dirs.patch" = [
+    {
+      after = "21";
+      path = ../21;
+    }
    {
      after = "20";
+      before = "21";
      path = ../20;
    }
    {
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@ -33,9 +33,9 @@ let
    "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
    "20.1.3".officialRelease.sha256 = "sha256-sOl90iRBlD+DGJs72JrP9cJz6XmWs/5PL+uW4nt6LA0=";
    "21.0.0-git".gitRelease = {
-      rev = "ebba554a3211b0b98d3ae33ba70f9d6ceaab6ad4";
-      rev-version = "21.0.0-unstable-2025-04-13";
-      sha256 = "sha256-8LcHMrbt9qlwqbHrv1rwYI3ZC1Y5POHzx5HgyciTPuY=";
+      rev = "ed95624e208e5bf7c3eeadfccee0fb6060a4ca98";
+      rev-version = "21.0.0-unstable-2025-04-27";
+      sha256 = "sha256-L7H/+V+rdhddNLPEbn9h4cRy+ioxUYxuMMhvORB5Q6s=";
    };
  } // llvmVersions;

--- a/pkgs/development/libraries/itk/5.2.x.nix
+++ b/pkgs/development/libraries/itk/5.2.x.nix
@ -1,5 +1,5 @@
 import ./generic.nix rec {
  version = "5.2.1";
-  rev = "v${version}";
+  tag = "v${version}";
  sourceSha256 = "sha256-KaVe9FMGm4ZVMpwAT12fA67T0qZS3ZueiI8z85+xSwE=";
 }
--- a/pkgs/development/libraries/itk/5.x.nix
+++ b/pkgs/development/libraries/itk/5.x.nix
@ -1,5 +1,5 @@
 import ./generic.nix rec {
-  version = "5.4.2";
-  rev = "refs/tags/v${version}";
-  sourceSha256 = "sha256-aQAqh0Z01JqKm78cmxkpC/+gbdx6wTJQh34c1lN+DR0=";
+  version = "5.4.3";
+  tag = "v${version}";
+  sourceSha256 = "sha256-Ve9AzgzePYb6mJ6OZ6C4YeiggCd4WBxB4Xu3ju5HhAg=";
 }
--- a/pkgs/development/libraries/itk/generic.nix
+++ b/pkgs/development/libraries/itk/generic.nix
@ -1,6 +1,6 @@
 {
  version,
-  rev,
+  tag,
  sourceSha256,
 }:

@ -74,7 +74,7 @@ stdenv.mkDerivation {
  src = fetchFromGitHub {
    owner = "InsightSoftwareConsortium";
    repo = "ITK";
-    inherit rev;
+    inherit tag;
    sha256 = sourceSha256;
  };

--- a/pkgs/development/python-modules/biothings-client/default.nix
+++ b/pkgs/development/python-modules/biothings-client/default.nix
@ -3,8 +3,9 @@
  buildPythonPackage,
  fetchFromGitHub,
  setuptools,
+  httpx,
  pytestCheckHook,
-  requests,
+  pytest-asyncio,
 }:
 buildPythonPackage rec {
  pname = "biothings-client";
@ -19,15 +20,24 @@ buildPythonPackage rec {
  };

  build-system = [ setuptools ];
-  dependencies = [ requests ];
+  dependencies = [ httpx ];
  pythonImportsCheck = [ "biothings_client" ];
-  nativeCheckInputs = [ pytestCheckHook ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-asyncio
+  ];

  pytestFlagsArray = [
    # All other tests make network requests to exercise the API
-    "tests/gene.py::TestGeneClient::test_http"
-    "tests/test.py::TestBiothingsClient::test_generate_settings_from_url"
-    "tests/variant.py::TestVariantClient::test_format_hgvs"
+    "tests/test_async.py::test_generate_async_settings"
+    "tests/test_async.py::test_url_protocol"
+    "tests/test_async.py::test_async_client_proxy_discovery"
+    "tests/test_async_variant.py::test_format_hgvs"
+    "tests/test_sync.py::test_generate_settings"
+    "tests/test_sync.py::test_url_protocol"
+    "tests/test_sync.py::test_client_proxy_discovery"
+    "tests/test_variant.py::test_format_hgvs"
  ];

  meta = {
--- a/pkgs/development/python-modules/flask-security/default.nix
+++ b/pkgs/development/python-modules/flask-security/default.nix
@ -52,7 +52,7 @@

 buildPythonPackage rec {
  pname = "flask-security";
-  version = "5.5.2";
+  version = "5.6.1";
  pyproject = true;

  disabled = pythonOlder "3.9";
@ -61,19 +61,11 @@ buildPythonPackage rec {
    owner = "pallets-eco";
    repo = "flask-security";
    tag = version;
-    hash = "sha256-RGRwgrDFe+0v8NYyajMikdoi1DQf1I+B5y8KJyF+cZs=";
+    hash = "sha256-sAO8wQd/YgPbi5+nQmkmmcTg7DJPYdUoT/EOMUpzr/M=";
  };

-  patches = [
-    # https://github.com/pallets-eco/flask-security/pull/1040
-    ./fix_test_basic.patch
-  ];
-
  build-system = [ flit-core ];

-  # flask-login>=0.6.2 not satisfied by version 0.7.0.dev0
-  pythonRelaxDeps = [ "flask-login" ];
-
  dependencies = [
    email-validator
    flask
--- a/pkgs/development/python-modules/flask-security/fix_test_basic.patch
+++ b/pkgs/development/python-modules/flask-security/fix_test_basic.patch
@ -1,13 +0,0 @@
-diff --git a/tests/test_basic.py b/tests/test_basic.py
-index d52be429..09dfa8e4 100644
--- a/tests/test_basic.py
-+++ b/tests/test_basic.py
-@@ -157,6 +157,8 @@ def test_authenticate_with_subdomain_next(app, client, get_message):
- 
- @pytest.mark.settings(subdomain="auth")
- def test_authenticate_with_root_domain_next(app, client, get_message):
-+    # As of Flask 3.1 this must be explicitly set.
-+    app.subdomain_matching = True
-     app.config["SERVER_NAME"] = "lp.com"
-     app.config["SECURITY_REDIRECT_ALLOW_SUBDOMAINS"] = True
-     data = dict(email="matt@lp.com", password="password")
--- a/pkgs/development/python-modules/fnllm/default.nix
+++ b/pkgs/development/python-modules/fnllm/default.nix
@ -9,8 +9,10 @@
  httpx,
  json-repair,
  openai,
+  polyfactory,
  pydantic,
  pytest-asyncio,
+  pytest-cov-stub,
  pytestCheckHook,
  pythonOlder,
  tenacity,
@ -51,7 +53,9 @@ buildPythonPackage rec {
  };

  nativeCheckInputs = [
+    polyfactory
    pytest-asyncio
+    pytest-cov-stub
    pytestCheckHook
  ] ++ lib.flatten (builtins.attrValues optional-dependencies);

@ -65,10 +69,13 @@ buildPythonPackage rec {
    "test_default_operations"
    "test_estimate_request_tokens"
    "test_replace_value"
-  ];
-
-  disabledTestPaths = [
-    "tests/unit/caching/test_blob.py"
+    "test_text_service_encode_decode"
+    "test_count_tokens"
+    "trim_to_max_tokens"
+    "test_split"
+    "test_clear"
+    "test_handles_common_errors"
+    "test_children"
  ];

  meta = {
--- a/pkgs/development/python-modules/mpl-scatter-density/default.nix
+++ b/pkgs/development/python-modules/mpl-scatter-density/default.nix
@ -1,10 +1,9 @@
 {
  lib,
+  stdenv,
  buildPythonPackage,
  pytestCheckHook,
  fetchFromGitHub,
-  fetchpatch,
-  pythonOlder,
  setuptools-scm,
  setuptools,
  fast-histogram,
@ -12,38 +11,28 @@
  numpy,
  wheel,
  pytest-mpl,
+  writableTmpDirAsHomeHook,
 }:

 buildPythonPackage rec {
  pname = "mpl-scatter-density";
  version = "0.8";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.6";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "astrofrog";
    repo = pname;
    tag = "v${version}";
-    sha256 = "sha256-pDiKJAN/4WFf5icNU/ZGOvw0jqN3eGZHgilm2oolpbE=";
+    hash = "sha256-pDiKJAN/4WFf5icNU/ZGOvw0jqN3eGZHgilm2oolpbE=";
  };

-  patches = [
-    # https://github.com/astrofrog/mpl-scatter-density/pull/37
-    (fetchpatch {
-      name = "distutils-removal.patch";
-      url = "https://github.com/ifurther/mpl-scatter-density/commit/6feedabe1e82da67d8eec46a80eb370d9f334251.patch";
-      sha256 = "sha256-JqWlSm8mIwqjRPa+kMEaKipJyzGEO+gJK+Q045N1MXA=";
-    })
-  ];
-
-  nativeBuildInputs = [
+  build-system = [
    setuptools
    setuptools-scm
    wheel
  ];

-  propagatedBuildInputs = [
+  dependencies = [
    matplotlib
    numpy
    fast-histogram
@ -52,8 +41,13 @@ buildPythonPackage rec {
  nativeCheckInputs = [
    pytestCheckHook
    pytest-mpl
+    writableTmpDirAsHomeHook
  ];

+  # Need to set MPLBACKEND=agg for headless `matplotlib` on darwin.
+  # https://github.com/matplotlib/matplotlib/issues/26292
+  env.MPLBACKEND = lib.optionalString stdenv.hostPlatform.isDarwin "agg";
+
  disabledTests = [
    # AssertionError: (240, 240) != (216, 216)
    # Erroneous pinning of figure DPI, sensitive to runtime environment
--- a/pkgs/development/python-modules/pyfdt/default.nix
+++ b/pkgs/development/python-modules/pyfdt/default.nix
@ -0,0 +1,27 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+}:
+
+buildPythonPackage rec {
+  pname = "pyfdt";
+  version = "0.3";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "pyfdt";
+    hash = "sha256:1w7lp421pssfgv901103521qigwb12i6sk68lqjllfgz0lh1qq31";
+  };
+
+  doCheck = false; # tests do not compile, see https://github.com/superna9999/pyfdt/issues/21
+
+  pythonImportsCheck = [ "pyfdt" ];
+
+  meta = {
+    homepage = "https://github.com/superna9999/pyfdt";
+    description = "Flattened device tree parser";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ralismark ];
+  };
+}
--- a/pkgs/development/python-modules/pyrfxtrx/default.nix
+++ b/pkgs/development/python-modules/pyrfxtrx/default.nix
@ -9,14 +9,14 @@

 buildPythonPackage rec {
  pname = "pyrfxtrx";
-  version = "0.31.1";
+  version = "0.32.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "Danielhiversen";
    repo = "pyRFXtrx";
    tag = version;
-    hash = "sha256-Y9UVJZxm5G5ywNLW8nm162cZTs3/mFeI+ZEUGoc9eAs=";
+    hash = "sha256-6gD6ch7DyaD9nCY/VfyJHmV4gEDPsDfVKjNaNedmVVE=";
  };

  build-system = [ setuptools ];
@ -28,7 +28,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Library to communicate with the RFXtrx family of devices";
    homepage = "https://github.com/Danielhiversen/pyRFXtrx";
-    changelog = "https://github.com/Danielhiversen/pyRFXtrx/releases/tag/${version}";
+    changelog = "https://github.com/Danielhiversen/pyRFXtrx/releases/tag/${src.tag}";
    license = licenses.lgpl3Plus;
    maintainers = with maintainers; [ dotlambda ];
  };
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@ -16,16 +16,16 @@ let
  variants = {
    # ./update-zen.py zen
    zen = {
-      version = "6.14.4"; # zen
+      version = "6.14.5"; # zen
      suffix = "zen1"; # zen
-      sha256 = "186rrmsi5y1nwhrd0f1bxjmkr5bhlagr0ih6pfdp5ks25is721ca"; # zen
+      sha256 = "12ikiicar6agap4i7qpzlxabqrgqdc69im3ly9m6rrydhb5ig2an"; # zen
      isLqx = false;
    };
    # ./update-zen.py lqx
    lqx = {
-      version = "6.14.4"; # lqx
+      version = "6.14.5"; # lqx
      suffix = "lqx1"; # lqx
-      sha256 = "1j255qi5r2y2n3dks50b2kna2qdm43skggjrgi362yjhb11psvw6"; # lqx
+      sha256 = "18h9qxd1ljkqff4nh96nviqzhss2jzaia3h0wijwa6r7d5w4nk2z"; # lqx
      isLqx = true;
    };
  };
--- a/pkgs/servers/http/jetty/11.x.nix
+++ b/pkgs/servers/http/jetty/11.x.nix
@ -1,4 +0,0 @@
-import ./common.nix {
-  version = "11.0.24";
-  hash = "sha256-Z+XvaUed7gtyHc9YjHG5e1H5QR6yP9UUWvxQGR5hojk=";
-}
--- a/pkgs/servers/http/jetty/12.x.nix
+++ b/pkgs/servers/http/jetty/12.x.nix
@ -1,4 +0,0 @@
-import ./common.nix {
-  version = "12.0.14";
-  hash = "sha256-Ps8pVq377QLFyQZg6AoyEr1G9PonFaVxOCD69/VTGEY=";
-}
--- a/pkgs/servers/http/jetty/common.nix
+++ b/pkgs/servers/http/jetty/common.nix
@ -1,49 +0,0 @@
-{ version, hash }:
-
-{
-  lib,
-  stdenvNoCC,
-  fetchurl,
-  gitUpdater,
-}:
-
-stdenvNoCC.mkDerivation rec {
-  pname = "jetty";
-
-  inherit version;
-
-  src = fetchurl {
-    url = "mirror://maven/org/eclipse/jetty/jetty-home/${version}/jetty-home-${version}.tar.gz";
-    inherit hash;
-  };
-
-  dontBuild = true;
-
-  installPhase = ''
-    mkdir -p $out
-    mv etc lib modules start.jar $out
-  '';
-
-  passthru.updateScript = gitUpdater {
-    url = "https://github.com/jetty/jetty.project.git";
-    allowedVersions = "^${lib.versions.major version}\\.";
-    ignoredVersions = "(alpha|beta).*";
-    rev-prefix = "jetty-";
-  };
-
-  meta = with lib; {
-    changelog = "https://github.com/jetty/jetty.project/releases/tag/jetty-${version}";
-    description = "Web server and javax.servlet container";
-    homepage = "https://jetty.org/";
-    platforms = platforms.all;
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    license = with licenses; [
-      asl20
-      epl10
-    ];
-    maintainers = with maintainers; [
-      emmanuelrosa
-      anthonyroussel
-    ];
-  };
-}
--- a/pkgs/servers/http/jetty/default.nix
+++ b/pkgs/servers/http/jetty/default.nix
@ -0,0 +1,63 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  gitUpdater,
+}:
+
+let
+  common =
+    { version, hash }:
+    stdenvNoCC.mkDerivation rec {
+      pname = "jetty";
+
+      inherit version;
+
+      src = fetchurl {
+        url = "mirror://maven/org/eclipse/jetty/jetty-home/${version}/jetty-home-${version}.tar.gz";
+        inherit hash;
+      };
+
+      dontBuild = true;
+
+      installPhase = ''
+        mkdir -p $out
+        mv etc lib modules start.jar $out
+      '';
+
+      passthru.updateScript = gitUpdater {
+        url = "https://github.com/jetty/jetty.project.git";
+        allowedVersions = "^${lib.versions.major version}\\.";
+        ignoredVersions = "(alpha|beta).*";
+        rev-prefix = "jetty-";
+      };
+
+      meta = with lib; {
+        changelog = "https://github.com/jetty/jetty.project/releases/tag/jetty-${version}";
+        description = "Web server and javax.servlet container";
+        homepage = "https://jetty.org/";
+        platforms = platforms.all;
+        sourceProvenance = with sourceTypes; [ binaryBytecode ];
+        license = with licenses; [
+          asl20
+          epl10
+        ];
+        maintainers = with maintainers; [
+          emmanuelrosa
+          anthonyroussel
+        ];
+      };
+    };
+
+in
+{
+  jetty_11 = common {
+    version = "11.0.25";
+    hash = "sha256-KaceKN/iu0QCv9hVmoXYvN7TxK9DwhiCcbjEnqcKSzs=";
+  };
+
+  jetty_12 = common {
+    version = "12.0.19";
+    hash = "sha256-rURjebDGDVNILjrim8zBTp5SvIFkWKxpC+oi8b5FTj8=";
+  };
+}
--- a/pkgs/tools/admin/pgadmin/default.nix
+++ b/pkgs/tools/admin/pgadmin/default.nix
@ -2,14 +2,18 @@
  lib,
  python3,
  fetchFromGitHub,
-  fetchYarnDeps,
  zlib,
  nixosTests,
  postgresqlTestHook,
  postgresql,
-  yarn,
-  fixup-yarn-lock,
+  yarn-berry_3,
  nodejs,
+  autoconf,
+  automake,
+  libtool,
+  libpng,
+  nasm,
+  pkg-config,
  stdenv,
  server-mode ? true,
 }:
@ -17,7 +21,7 @@
 let
  pname = "pgadmin";
  version = "9.2";
-  yarnHash = "sha256-nFYzaMRASkorEJC5UgLZjDY99ptwPqOMxOomhY/CY5k=";
+  yarnHash = "sha256-I7Eua6MkZR7l4Ks1Cyz0AAXLuayuzZHuk+xtn8Zu8UI=";

  src = fetchFromGitHub {
    owner = "pgadmin-org";
@ -30,11 +34,6 @@ let
  # this also makes potential future overrides easier
  pythonPackages = python3.pkgs.overrideScope (final: prev: { });

-  offlineCache = fetchYarnDeps {
-    yarnLock = ./yarn.lock;
-    hash = yarnHash;
-  };
-
  # don't bother to test kerberos authentication
  # skip tests on macOS which fail due to an error in keyring, see https://github.com/NixOS/nixpkgs/issues/281214
  skippedTests = builtins.concatStringsSep "," (
@ -51,6 +50,11 @@ in
 pythonPackages.buildPythonApplication rec {
  inherit pname version src;

+  offlineCache = yarn-berry_3.fetchYarnBerryDeps {
+    src = src + "/web";
+    hash = yarnHash;
+  };
+
  # from Dockerfile
  CPPFLAGS = "-DPNG_ARM_NEON_OPT=0";

@ -76,9 +80,6 @@ pythonPackages.buildPythonApplication rec {
    sed 's|==|>=|g' -i requirements.txt
    # fix extra_require error with "*" in match
    sed 's|*|0|g' -i requirements.txt
-    # remove packageManager from package.json so we can work without corepack
-    substituteInPlace web/package.json \
-      --replace-fail "\"packageManager\": \"yarn@3.8.7\"" "\"\": \"\""
    substituteInPlace pkg/pip/setup_pip.py \
      --replace-fail "req = req.replace('psycopg[c]', 'psycopg[binary]')" "req = req"
    ${lib.optionalString (!server-mode) ''
@ -87,6 +88,8 @@ pythonPackages.buildPythonApplication rec {
    ''}
  '';

+  dontYarnBerryInstallDeps = true;
+
  preBuild = ''
    # Adapted from pkg/pip/build.sh
    echo Creating required directories...
@ -108,18 +111,12 @@ pythonPackages.buildPythonApplication rec {
    done
    cd ../

-    # mkYarnModules and mkYarnPackage have problems running the webpacker
    echo Building the web frontend...
    cd web
-    export HOME="$TMPDIR"
-    yarn config --offline set yarn-offline-mirror "${offlineCache}"
-    # replace with converted yarn.lock file
-    rm yarn.lock
-    cp ${./yarn.lock} yarn.lock
-    chmod +w yarn.lock
-    fixup-yarn-lock yarn.lock
-    yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
-    patchShebangs node_modules/
+    (
+    export LD=$CC # https://github.com/imagemin/optipng-bin/issues/108
+    yarnBerryConfigHook
+    )
    yarn webpacker
    cp -r * ../pip-build/pgadmin4
    # save some disk space
@ -145,13 +142,23 @@ pythonPackages.buildPythonApplication rec {
    cython
    pip
    sphinx
-    yarn
-    fixup-yarn-lock
+    yarn-berry_3
+    yarn-berry_3.yarnBerryConfigHook
    nodejs
+
+    # for building mozjpeg2
+    autoconf
+    automake
+    libtool
+    nasm
+    pkg-config
  ];
+
  buildInputs = [
    zlib
    pythonPackages.wheel
+    # for mozjpeg2
+    libpng
  ];

  propagatedBuildInputs = with pythonPackages; [
@ -242,7 +249,6 @@ pythonPackages.buildPythonApplication rec {
    python regression/runtests.py --pkg browser --exclude ${skippedTests}

    ## Reverse engineered SQL test ##
-
    python regression/runtests.py --pkg resql

    runHook postCheck
--- a/pkgs/tools/admin/pgadmin/update.sh
+++ b/pkgs/tools/admin/pgadmin/update.sh
@ -1,20 +1,10 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl wget jq yq common-updater-scripts prefetch-yarn-deps yarn-lock-converter
+#!nix-shell -i bash -p curl wget jq common-updater-scripts yarn-berry_3 yarn-berry_3.yarn-berry-fetcher

 set -eu -o pipefail

 TMPDIR=/tmp/pgadmin-update-script

-################################################################
-#         This script will update pgadmin4 in nixpkgs          #
-# Due to recent changes upstream, we will need to convert the  #
-#             `yarn.lock` file back to version 1.              #
-#   This isn't trivially done and relies on 3rd party tools    #
-#       and a hand-written converter (in this script).         #
-# Also, the converter cannot check for `github` repos in the   #
-#   `yarn.lock` file, which this script will add automatically #
-################################################################
-
 cleanup() {
  if [ -e $TMPDIR/.done ]
  then
@ -52,55 +42,24 @@ wget -c $url
 tar -xzf "pgadmin4-$newest_version.tar.gz"
 cd "pgadmin4-$newest_version/web"

-printf "Will now convert the v2 lockfile. This will download the npm packages to get the metadata.\n"
-printf "Please note: This will take some time! For details, see the logfile ${TMPDIR}/update.log\n"
-yarn-lock-converter -i yarn.lock -o yarn_v1.lock --cache .cache > $TMPDIR/update.log
-printf "Conversion done\n"
-
-printf "Will now do some regex substitution post-processing\n"
-sed -i -E "s|(.), |\1\", \"|g" yarn_v1.lock
-sed -i -E "s|npm:||g" yarn_v1.lock
-printf "Substituion done\n"
-
-printf "Will now add missing github packages back to the v1 yarn.lock file\n"
-# remove header
-tail +8 yarn.lock > yarn_mod.lock
-LENGTH=$(yq '. | with_entries(select(.value.resolution | contains("github"))) | keys | length' yarn_mod.lock)
-for i in $(seq 0 $(($LENGTH-1)));
-do
-  ENTRY=$(yq ". | with_entries(select(.value.resolution | contains(\"github\"))) | keys | .[$i]" yarn_mod.lock)
-  URL=$(echo $ENTRY | cut -d "@" -f 2)
-  VERSION=$(yq ".$ENTRY.version" yarn_mod.lock)
-  LENGTH_DEP=$(yq ".$ENTRY.dependencies | keys | length" yarn_mod.lock)
-  echo "$ENTRY:" >> adendum.lock
-  echo "  version $VERSION" >> adendum.lock
-  echo "  resolved \"$URL" >> adendum.lock
-  echo "  dependencies:" >> adendum.lock
-
-  for j in $(seq 0 $(($LENGTH_DEP-1)));
-  do
-    DEPENDENCY_KEY=$(yq ".$ENTRY.dependencies | keys | .[$j]" yarn_mod.lock)
-    DEPENDENCY_VALUE=$(yq ".$ENTRY.dependencies.$DEPENDENCY_KEY" yarn_mod.lock)
-    # remove '"'
-    DEPENDENCY_KEY=${DEPENDENCY_KEY//\"}
-    echo "    \"$DEPENDENCY_KEY\" $DEPENDENCY_VALUE" >> adendum.lock
-  done
-done
-
-echo "" >> yarn_v1.lock
-cat adendum.lock >> yarn_v1.lock
-printf "Done\n"
-
-rm yarn.lock
-mv yarn_v1.lock yarn.lock
-
 printf "Will now generate the hash. This will download the packages to the nix store and also take some time\n"
-YARN_HASH=$(prefetch-yarn-deps yarn.lock)
-YARN_HASH=$(nix hash to-sri --type sha256 "$YARN_HASH")
+yarn-berry-fetcher missing-hashes yarn.lock
+if [[ -f missing-hashes.json ]]; then
+  YARN_HASH=$(yarn-berry-fetcher prefetch yarn.lock missing-hashes.json)
+else
+  YARN_HASH=$(yarn-berry-fetcher prefetch yarn.lock)
+fi
 printf "Done\n"

-printf "Copy files to nixpkgs\n"
-cp yarn.lock "$nixpkgs/pkgs/tools/admin/pgadmin/"
+if [[ -f missing-hashes.json ]]; then
+  if [[ ! -f "$nixpkgs/pkgs/tools/admin/pgadmin/missing-hashes.json" ]]; then
+    printf "PLEASE NOTE: FIRST TIME OF FINDING MISSING HASHES!"
+    printf "Please add \"missingHashes = ./missing-hashes.json\" to pgadmin derivation"
+  fi
+  printf "Copy files to nixpkgs\n"
+  cp missing-hashes.json "$nixpkgs/pkgs/tools/admin/pgadmin/"
+fi
+
 printf "Done\n"
 popd

--- a/pkgs/tools/admin/pgadmin/yarn.lock
+++ b/pkgs/tools/admin/pgadmin/yarn.lock
--- a/pkgs/tools/misc/graylog/6.1.nix
+++ b/pkgs/tools/misc/graylog/6.1.nix
@ -0,0 +1,10 @@
+{ callPackage, lib, ... }:
+let
+  buildGraylog = callPackage ./graylog.nix { };
+in
+buildGraylog {
+  version = "6.1.8";
+  hash = "sha256-omyV4BSY9SWDFyLcQCr0+LcjRecw9C1HtvsnCJrZX1U=";
+  maintainers = with lib.maintainers; [ bbenno ];
+  license = lib.licenses.sspl;
+}
--- a/pkgs/tools/system/btop/default.nix
+++ b/pkgs/tools/system/btop/default.nix
@ -1,5 +1,6 @@
 {
  lib,
+  fetchpatch,
  config,
  stdenv,
  fetchFromGitHub,
@ -15,13 +16,13 @@

 stdenv.mkDerivation rec {
  pname = "btop";
-  version = "1.4.1";
+  version = "1.4.2";

  src = fetchFromGitHub {
    owner = "aristocratos";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-bCcgTi9jG2gM9ZCq4Xc7urOIoSsMwwztEDqKwPB65CE=";
+    hash = "sha256-qXdIk5Mp4Cxy0//e3SwevreK8VcJwz2vUGSX7nrFvxI=";
  };

  nativeBuildInputs =
@ -38,6 +39,14 @@ stdenv.mkDerivation rec {

  installFlags = [ "PREFIX=$(out)" ];

+  patches = [
+    # https://github.com/aristocratos/btop/issues/1138
+    (fetchpatch {
+      url = "https://github.com/aristocratos/btop/commit/c3b225f536a263eb6d35708b1057dd4a6f1524a5.patch";
+      sha256 = "sha256-I05stm1mkiBpdNIUzL7cwG3kwcKJSHB7FEtnXxKyazQ=";
+    })
+  ];
+
  postInstall = ''
    ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/bin/btop)
  '';
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -3383,6 +3383,13 @@ with pkgs;

  graylog-6_0 = callPackage ../tools/misc/graylog/6.0.nix { };

+  inherit
+    ({
+      graylog-6_1 = callPackage ../tools/misc/graylog/6.1.nix { };
+    })
+    graylog-6_1
+    ;
+
  graylogPlugins = recurseIntoAttrs (
    callPackage ../tools/misc/graylog/plugins.nix { graylogPackage = graylog-6_0; }
  );
@ -10998,9 +11005,12 @@ with pkgs;

  inspircdMinimal = inspircd.override { extraModules = [ ]; };

+  inherit (callPackages ../servers/http/jetty { })
+    jetty_11
+    jetty_12
+    ;
+
  jetty = jetty_12;
-  jetty_12 = callPackage ../servers/http/jetty/12.x.nix { };
-  jetty_11 = callPackage ../servers/http/jetty/11.x.nix { };

  kanidm_1_4 = callPackage ../by-name/ka/kanidm/1_4.nix { kanidm = kanidm_1_4; };
  kanidm_1_5 = callPackage ../by-name/ka/kanidm/1_5.nix { kanidm = kanidm_1_5; };
@ -15322,18 +15332,18 @@ with pkgs;

  kodi = callPackage ../applications/video/kodi {
    ffmpeg = ffmpeg_6;
-    jre_headless = jdk11_headless;
+    jre_headless = buildPackages.jdk11_headless;
  };

  kodi-wayland = callPackage ../applications/video/kodi {
    ffmpeg = ffmpeg_6;
-    jre_headless = jdk11_headless;
+    jre_headless = buildPackages.jdk11_headless;
    waylandSupport = true;
  };

  kodi-gbm = callPackage ../applications/video/kodi {
    ffmpeg = ffmpeg_6;
-    jre_headless = jdk11_headless;
+    jre_headless = buildPackages.jdk11_headless;
    gbmSupport = true;
  };

--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -12280,6 +12280,8 @@ self: super: with self; {

  pyfcm = callPackage ../development/python-modules/pyfcm { };

+  pyfdt = callPackage ../development/python-modules/pyfdt { };
+
  pyfibaro = callPackage ../development/python-modules/pyfibaro { };

  pyfido = callPackage ../development/python-modules/pyfido { };