diff --git a/pkgs/applications/graphics/unigine-superposition/default.nix b/pkgs/applications/graphics/unigine-superposition/default.nix
index 3398b7eee553..8510096d8d20 100644
--- a/pkgs/applications/graphics/unigine-superposition/default.nix
+++ b/pkgs/applications/graphics/unigine-superposition/default.nix
@@ -87,7 +87,7 @@ let
 
   desktopItem = makeDesktopItem {
     name = "Superposition";
-    exec = "superposition";
+    exec = "unigine-superposition";
     genericName = "A GPU Stress test tool from the UNIGINE";
     icon = "Superposition";
     desktopName = "Superposition Benchmark";
@@ -145,6 +145,6 @@ buildFHSEnv {
     license = lib.licenses.unfree;
     maintainers = [ lib.maintainers.BarinovMaxim ];
     platforms = [ "x86_64-linux" ];
-    mainProgram = "Superposition";
+    mainProgram = "unigine-superposition";
   };
 }
diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
index 35f7f893a8d3..f0210e97a8ab 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
@@ -5,57 +5,59 @@
   makeWrapper,
   autoPatchelfHook,
   wrapGAppsHook3,
-  which,
-  more,
-  file,
-  atk,
   alsa-lib,
+  atk,
+  cacert,
   cairo,
+  dconf,
+  fetchurl,
+  file,
   fontconfig,
+  freetype,
   gdk-pixbuf,
   glib,
-  webkitgtk_4_0,
+  glib-networking,
+  gnome2,
+  gtk2,
   gtk2-x11,
   gtk3,
+  gtk_engines,
   heimdal,
   krb5,
+  libGL,
+  libappindicator-gtk3,
+  libcanberra-gtk3,
+  libcap,
+  libcxx,
+  libfaketime,
+  libgbm,
+  libinput,
+  libjpeg,
+  libjson,
+  libpng12,
+  libpulseaudio,
+  libredirect,
+  libsecret,
   libsoup_2_4,
   libvorbis,
-  speex,
-  openssl,
-  zlib,
-  xorg,
-  pango,
-  gtk2,
-  gnome2,
-  libgbm,
-  nss,
-  nspr,
-  gtk_engines,
-  freetype,
-  dconf,
-  libpng12,
   libxml2,
-  libjpeg,
-  libredirect,
-  tzdata,
-  cacert,
-  systemd,
-  libcxx,
-  symlinkJoin,
-  libpulseaudio,
-  pcsclite,
-  glib-networking,
   llvmPackages,
+  more,
+  nspr,
+  nss,
   opencv4,
-  libfaketime,
-  libinput,
-  libcap,
-  libjson,
-  libsecret,
-  libcanberra-gtk3,
+  openssl,
+  pango,
+  pcsclite,
   sane-backends,
-  fetchurl,
+  speex,
+  symlinkJoin,
+  systemd,
+  tzdata,
+  webkitgtk_4_0,
+  which,
+  xorg,
+  zlib,
 
   homepage,
   version,
@@ -131,11 +133,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoPatchelfHook
     file
+    libfaketime
     makeWrapper
     more
     which
     wrapGAppsHook3
-    libfaketime
   ];
 
   buildInputs = [
@@ -146,18 +148,19 @@ stdenv.mkDerivation rec {
     fontconfig
     freetype
     gdk-pixbuf
-    gnome2.gtkglext
     glib-networking
-    webkitgtk_4_0
+    gnome2.gtkglext
     gtk2
     gtk2-x11
     gtk3
     gtk_engines
     heimdal
     krb5
-    libcap
+    libGL
     libcanberra-gtk3
+    libcap
     libcxx
+    libgbm
     libinput
     libjpeg
     libjson
@@ -168,27 +171,29 @@ stdenv.mkDerivation rec {
     libvorbis
     libxml2'
     llvmPackages.libunwind
-    libgbm
     nspr
     nss
     opencv4'
     openssl'
     pango
     pcsclite
+    sane-backends
     speex
-    (lib.getLib systemd)
     stdenv.cc.cc
+    (lib.getLib systemd)
+    webkitgtk_4_0
+    xorg.libXScrnSaver
     xorg.libXaw
     xorg.libXmu
-    xorg.libXScrnSaver
     xorg.libXtst
     zlib
-    sane-backends
   ];
 
   runtimeDependencies = [
     glib
     glib-networking
+    libappindicator-gtk3
+    libGL
     pcsclite
 
     xorg.libX11
@@ -200,8 +205,8 @@ stdenv.mkDerivation rec {
     xorg.libXrender
     xorg.libXtst
     xorg.libxcb
-    xorg.xprop
     xorg.xdpyinfo
+    xorg.xprop
   ];
 
   installPhase =
@@ -218,6 +223,7 @@ stdenv.mkDerivation rec {
         wrapProgram $out/opt/citrix-icaclient/${program} \
           ${lib.optionalString (icaFlag program != null) ''--add-flags "${icaFlag program} $ICAInstDir"''} \
           --set ICAROOT "$ICAInstDir" \
+          --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \
           --prefix LD_LIBRARY_PATH : "$ICAInstDir:$ICAInstDir/lib" \
           --set LD_PRELOAD "${libredirect}/lib/libredirect.so ${lib.getLib pcsclite}/lib/libpcsclite.so" \
           --set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone"
diff --git a/pkgs/by-name/cr/crowdin-cli/package.nix b/pkgs/by-name/cr/crowdin-cli/package.nix
index 1133887b2671..70626e0c2a46 100644
--- a/pkgs/by-name/cr/crowdin-cli/package.nix
+++ b/pkgs/by-name/cr/crowdin-cli/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "crowdin-cli";
-  version = "4.7.1";
+  version = "4.8.0";
 
   src = fetchurl {
     url = "https://github.com/crowdin/crowdin-cli/releases/download/${finalAttrs.version}/crowdin-cli.zip";
-    hash = "sha256-Go1/oz0FF8BhjADkjqjfcoQX5wRBS/9Z9m//pBvTJz8=";
+    hash = "sha256-4+D1O+/32aYbZs1aKAEPuKq3IDmZho7oX+zERRrGMpw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fw/fwupd/add-option-for-installation-sysconfdir.patch b/pkgs/by-name/fw/fwupd/add-option-for-installation-sysconfdir.patch
index 8846d06f5e5f..99799f10e717 100644
--- a/pkgs/by-name/fw/fwupd/add-option-for-installation-sysconfdir.patch
+++ b/pkgs/by-name/fw/fwupd/add-option-for-installation-sysconfdir.patch
@@ -207,8 +207,3 @@ index 2dfc4d2f0..e5ac73edd 100644
    )
  endif
  
-@@ -146,4 +146,3 @@ summary({
-   'capsule splash': get_option('plugin_uefi_capsule_splash'),
- }, section:'uefi capsule options')
- endif
--
diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix
index e90970e10460..4707f56cca7b 100644
--- a/pkgs/by-name/fw/fwupd/package.nix
+++ b/pkgs/by-name/fw/fwupd/package.nix
@@ -26,6 +26,7 @@
   gobject-introspection,
   meson,
   ninja,
+  protobuf,
   protobufc,
   shared-mime-info,
   vala,
@@ -49,6 +50,7 @@
   libqmi,
   libuuid,
   libxmlb,
+  libxml2,
   modemmanager,
   pango,
   polkit,
@@ -74,6 +76,8 @@
   efibootmgr,
   tpm2-tools,
 
+  fetchpatch2,
+
   # passthru
   nixosTests,
   nix-update-script,
@@ -131,7 +135,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "fwupd";
-  version = "2.0.9";
+  version = "2.0.12";
 
   # libfwupd goes to lib
   # daemon, plug-ins and libfwupdplugin go to out
@@ -149,7 +153,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "fwupd";
     repo = "fwupd";
     tag = finalAttrs.version;
-    hash = "sha256-Izh6PHMgUsOeez9uWSLoA2GhvawYQlEZo480vovxn38=";
+    hash = "sha256-AYPrQzk28CS4Yhj2+KARt3b1SC02YifEftsSF+fKJ+Y=";
   };
 
   patches = [
@@ -170,14 +174,21 @@ stdenv.mkDerivation (finalAttrs: {
 
     # EFI capsule is located in fwupd-efi now.
     ./efi-app-path.patch
+
+    (fetchpatch2 {
+      url = "https://github.com/fwupd/fwupd/pull/8959.diff?full_index=1";
+      hash = "sha256-w4uf1CXSyy1pqqM4lzMZoOFhDxadcU3Tdnz0dJgLW7w=";
+    })
   ];
 
   postPatch =
     ''
       patchShebangs \
-        contrib/generate-version-script.py \
-        contrib/generate-man.py \
-        po/test-deps
+        generate-build/generate-version-script.py \
+        generate-build/generate-man.py \
+        po/test-deps \
+        plugins/uefi-capsule/tests/grub2-mkconfig \
+        plugins/uefi-capsule/tests/grub2-reboot
     ''
     # in nixos test tries to chmod 0777 $out/share/installed-tests/fwupd/tests/redfish.conf
     + ''
@@ -202,10 +213,12 @@ stdenv.mkDerivation (finalAttrs: {
       gettext
       gi-docgen
       gobject-introspection
+      libxml2
       meson
       ninja
       pkg-config
-      protobufc # for protoc
+      protobuf # for protoc
+      protobufc # for protoc-gen-c
       shared-mime-info
       vala
       wrapGAppsNoGuiHook
diff --git a/pkgs/by-name/ga/gaphor/package.nix b/pkgs/by-name/ga/gaphor/package.nix
new file mode 100644
index 000000000000..65e7db2b43b6
--- /dev/null
+++ b/pkgs/by-name/ga/gaphor/package.nix
@@ -0,0 +1,107 @@
+{
+  lib,
+  fetchFromGitHub,
+  glib,
+  gobject-introspection,
+  wrapGAppsHook4,
+  gtksourceview5,
+  libadwaita,
+  python3Packages,
+  nix-update-script,
+}:
+python3Packages.buildPythonApplication rec {
+  pname = "gaphor";
+  version = "3.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "gaphor";
+    repo = "gaphor";
+    tag = version;
+    hash = "sha256-0xivimpYM1gwOO2QrovYiJPNUfuGclr+F/WyHLNl+jw=";
+  };
+
+  pythonRelaxDeps = [
+    "pydot"
+    "pygobject"
+  ];
+
+  nativeBuildInputs = [
+    glib
+    gobject-introspection
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    gtksourceview5
+    libadwaita
+  ];
+
+  build-system = [ python3Packages.poetry-core ];
+
+  dependencies = with python3Packages; [
+    babel
+    better-exceptions
+    defusedxml
+    dulwich
+    gaphas
+    generic
+    jedi
+    pillow
+    pycairo
+    pydot
+    pygobject3
+    tinycss2
+  ];
+
+  postInstall = ''
+    install -Dm644 data/org.gaphor.Gaphor.appdata.xml -t $out/share/metainfo/
+    install -Dm644 data/org.gaphor.Gaphor.desktop -t $out/share/applications/
+    install -Dm644 data/org.gaphor.Gaphor.xml -t $out/share/mime/packages/
+    install -Dm644 data/logos/org.gaphor.Gaphor.svg -t $out/share/icons/hicolor/scalable/apps/
+    install -Dm644 data/logos/org.gaphor.Gaphor-symbolic.svg -t $out/share/icons/hicolor/symbolic/apps/
+
+    install -Dm644 data/logos/gaphor-24x24.png $out/share/icons/hicolor/24x24/apps/org.gaphor.Gaphor.png
+    install -Dm644 data/logos/gaphor-48x48.png $out/share/icons/hicolor/48x48/apps/org.gaphor.Gaphor.png
+
+    install -Dm644 gaphor/ui/installschemas/org.gaphor.Gaphor.gschema.xml -t $out/share/glib-2.0/schemas/
+    glib-compile-schemas $out/share/glib-2.0/schemas/
+
+    install -Dm644 data/org.gaphor.Gaphor.service -t $out/share/dbus-1/services/
+    substituteInPlace $out/share/dbus-1/services/org.gaphor.Gaphor.service \
+                      --replace-fail "Exec=/usr/bin/gaphor" "Exec=$out/bin/gaphor"
+  '';
+
+  # Prevent double wrapping
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "UML and SysML modeling tool";
+    longDescription = ''
+      Gaphor is a UML, SysML, RAAML, and C4 modeling application. It
+      is designed to be easy to use, while still being powerful.
+      Gaphor implements a fully-compliant UML 2 data model, so it is
+      much more than a picture drawing tool. You can use Gaphor to
+      quickly visualize different aspects of a system as well as
+      create complete, highly complex models.
+
+      Gaphor provides four modeling languages: UML, SysML, RAAML and C4 and
+      makes them accessible to beginners.
+    '';
+    homepage = "https://gaphor.org/";
+    changelog = "https://github.com/gaphor/gaphor/releases/tag/${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ normalcea ];
+    teams = [ lib.teams.gnome-circle ];
+    mainProgram = "gaphor";
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/in/intel-compute-runtime/package.nix b/pkgs/by-name/in/intel-compute-runtime/package.nix
index 6bc5b5ef524c..c0fe30683db0 100644
--- a/pkgs/by-name/in/intel-compute-runtime/package.nix
+++ b/pkgs/by-name/in/intel-compute-runtime/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-compute-runtime";
-  version = "25.18.33578.6";
+  version = "25.22.33944.8";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "compute-runtime";
     tag = version;
-    hash = "sha256-6HJUwoMzd8T9o0dohLiXz2xwtqnUmkFuftIUPqKpy5s=";
+    hash = "sha256-Sz9ELQkSq6CQOfoTlzJoUzj/GuHwQMgtUjmC0P2uzro=";
   };
 
   nativeBuildInputs = [
@@ -39,6 +39,9 @@ stdenv.mkDerivation rec {
     (lib.cmakeFeature "OCL_ICD_VENDORDIR" "${placeholder "out"}/etc/OpenCL/vendors")
     # The install script assumes this path is relative to CMAKE_INSTALL_PREFIX
     (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
+    # disable spectre mitigations (already mitigated in the kernel)
+    # https://bugs.launchpad.net/ubuntu/+source/intel-compute-runtime/+bug/2110131
+    (lib.cmakeBool "NEO_DISABLE_MITIGATIONS" true)
   ];
 
   outputs = [
diff --git a/pkgs/by-name/ir/irrd/package.nix b/pkgs/by-name/ir/irrd/package.nix
index 4db3072fd18e..44165dfa4518 100644
--- a/pkgs/by-name/ir/irrd/package.nix
+++ b/pkgs/by-name/ir/irrd/package.nix
@@ -15,29 +15,17 @@ let
   py = python3.override {
     self = py;
     packageOverrides = final: prev: {
-      # sqlalchemy 1.4.x or 2.x are not supported
-      sqlalchemy = prev.sqlalchemy_1_4.overridePythonAttrs (oldAttrs: rec {
-        version = "1.3.24";
-        src = fetchPypi {
-          pname = "SQLAlchemy";
-          inherit version;
-          hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk=";
-        };
-        postPatch = ''
-          sed -i '/tag_build = dev/d' setup.cfg
-        '';
-        doCheck = false;
-      });
-      alembic = prev.alembic.overridePythonAttrs (
-        lib.const {
-          doCheck = false;
-        }
-      );
+      # sqlalchemy 2.0 is not supported
+      sqlalchemy = prev.sqlalchemy_1_4;
+
+      # checkInputs do not work wiht sqlalchemy < 2.0
       factory-boy = prev.factory-boy.overridePythonAttrs (
         lib.const {
           doCheck = false;
         }
       );
+
+      # https://github.com/irrdnet/irrd/blob/22fe77e46ef1b4e43e346257795e171e7ee70d44/pyproject.toml#L30
       beautifultable = prev.beautifultable.overridePythonAttrs (oldAttrs: rec {
         version = "0.8.0";
         src = fetchPypi {
@@ -53,34 +41,19 @@ in
 
 py.pkgs.buildPythonPackage rec {
   pname = "irrd";
-  version = "4.4.4";
+  version = "4.5.0b1";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "irrdnet";
     repo = "irrd";
     rev = "v${version}";
-    hash = "sha256-UIOKXU92JEOeVdpYLNmDBtLn0u3LMdKItcn9bFd9u8g=";
+    hash = "sha256-Hr/PbC4N/yrYeQ7bTfqIchDFmaL3c4afxV1XS7FR1F8=";
   };
 
-  patches = [
-    # starlette 0.37.2 reverted the behaviour change which this adjusted to
-    (fetchpatch {
-      url = "https://github.com/irrdnet/irrd/commit/43e26647e18f8ff3459bbf89ffbff329a0f1eed5.patch";
-      revert = true;
-      hash = "sha256-G216rHfWMZIl9GuXBz6mjHCIm3zrfDDLSmHQK/HkkzQ=";
-    })
-    # Backport build fix for webauthn 2.1
-    (fetchpatch {
-      url = "https://github.com/irrdnet/irrd/commit/20b771e1ee564f38e739fdb0a2a79c10319f638f.patch";
-      hash = "sha256-PtNdhSoFPT1kt71kFsySp/VnUpUdO23Gu9FKknHLph8=";
-      includes = [ "irrd/webui/auth/endpoints_mfa.py" ];
-    })
-  ];
-
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail psycopg2-binary psycopg2
+      --replace-fail py-radix py-radix-sr
   '';
   pythonRelaxDeps = true;
 
@@ -131,7 +104,7 @@ py.pkgs.buildPythonPackage rec {
       pydantic
       typing-extensions
       py-radix-sr
-      psycopg2
+      psycopg2-binary
       sqlalchemy
       alembic
       ujson
@@ -149,12 +122,14 @@ py.pkgs.buildPythonPackage rec {
       wtforms-bootstrap5
       email-validator
       jinja2
+      joserfc
+      time-machine
     ]
     ++ py.pkgs.uvicorn.optional-dependencies.standard;
 
   preCheck = ''
     export SMTPD_HOST=127.0.0.1
-    export IRRD_DATABASE_URL="postgres:///$PGDATABASE"
+    export IRRD_DATABASE_URL="postgresql:///$PGDATABASE"
     export IRRD_REDIS_URL="redis://localhost/1"
   '';
 
diff --git a/pkgs/by-name/je/jetbrains-mono/package.nix b/pkgs/by-name/je/jetbrains-mono/package.nix
index f7179b460a09..4461ab2bafef 100644
--- a/pkgs/by-name/je/jetbrains-mono/package.nix
+++ b/pkgs/by-name/je/jetbrains-mono/package.nix
@@ -1,29 +1,39 @@
 {
   lib,
   stdenvNoCC,
-  fetchzip,
+  fetchFromGitHub,
+  python3Packages,
 }:
 
 stdenvNoCC.mkDerivation rec {
   pname = "jetbrains-mono";
   version = "2.304";
 
-  src = fetchzip {
-    url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip";
-    sha256 = "sha256-rv5A3F1zdcUJkmw09st1YxmEIkIoYJaMYGyZjic8jfc=";
-    stripRoot = false;
+  src = fetchFromGitHub {
+    owner = "jetbrains";
+    repo = "jetbrainsmono";
+    rev = "v${version}";
+    hash = "sha256-SW9d5yVud2BWUJpDOlqYn1E1cqicIHdSZjbXjqOAQGw=";
   };
 
-  dontPatch = true;
-  dontConfigure = true;
-  dontBuild = true;
-  doCheck = false;
-  dontFixup = true;
+  env."PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION" = "python";
+
+  nativeBuildInputs = [
+    python3Packages.gftools
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+    gftools builder sources/config.yaml
+    runHook postBuild
+  '';
 
   installPhase = ''
     runHook preInstall
-    install -Dm644 -t $out/share/fonts/truetype/ fonts/ttf/*.ttf
-    install -Dm644 -t $out/share/fonts/truetype/ fonts/variable/*.ttf
+    install -Dm644 -t "$out/share/fonts/opentype/" fonts/otf/*.otf
+    install -Dm644 -t "$out/share/fonts/truetype/" fonts/ttf/*.ttf
+    install -Dm644 -t "$out/share/fonts/truetype/" fonts/variable/*.ttf
+    install -Dm644 -t "$out/share/fonts/WOFF2/" fonts/webfonts/*.woff2
     runHook postInstall
   '';
 
diff --git a/pkgs/by-name/ku/kubelogin-oidc/package.nix b/pkgs/by-name/ku/kubelogin-oidc/package.nix
index d368963d7e1d..da853ad32715 100644
--- a/pkgs/by-name/ku/kubelogin-oidc/package.nix
+++ b/pkgs/by-name/ku/kubelogin-oidc/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "kubelogin";
-  version = "1.32.4";
+  version = "1.33.0";
 
   src = fetchFromGitHub {
     owner = "int128";
     repo = "kubelogin";
     tag = "v${version}";
-    hash = "sha256-zdUtLjILildwSOA5CV1SNzVtMj+Tz1KkHB2MH1SZ8wk=";
+    hash = "sha256-H/mHC2BwDoHVZ104NNJejhDTihaP3uIcsZokw4yKoz0=";
   };
 
   subPackages = [ "." ];
@@ -22,7 +22,7 @@ buildGoModule rec {
     "-X main.version=v${version}"
   ];
 
-  vendorHash = "sha256-5NiGgZLSf/STr888JPsZZqaqXUI+g+26OEKRXp7xS4E=";
+  vendorHash = "sha256-9yofq5B4Lv/WqD7uwiiR2C88o/q8sTjgph3efYRyKYE=";
 
   # test all packages
   preCheck = ''
diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix
index 84ccfaa25b97..735de09707e5 100644
--- a/pkgs/by-name/li/live555/package.nix
+++ b/pkgs/by-name/li/live555/package.nix
@@ -8,6 +8,10 @@
   openssl,
   runCommand,
   stdenv,
+  writeScript,
+
+  # tests
+  vlc,
 }:
 let
   isStatic = stdenv.hostPlatform.isStatic;
@@ -128,8 +132,20 @@ stdenv.mkDerivation (finalAttrs: {
           touch $out
         fi
       '';
+
+      inherit vlc;
     };
 
+  passthru.updateScript = writeScript "update-live555" ''
+    #!/usr/bin/env nix-shell
+    #!nix-shell -i bash -p curl common-updater-scripts
+
+    # Expect the text in format of '2025.05.24:'
+    new_version="$(curl -s http://www.live555.com/liveMedia/public/changelog.txt |
+      head -n1 | tr -d ':')"
+    update-source-version live555 "$new_version"
+  '';
+
   meta = {
     homepage = "http://www.live555.com/liveMedia/";
     description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)";
diff --git a/pkgs/by-name/lx/lx-music-desktop/package.nix b/pkgs/by-name/lx/lx-music-desktop/package.nix
index 1c7805b92fcb..ae39cd70fe3d 100644
--- a/pkgs/by-name/lx/lx-music-desktop/package.nix
+++ b/pkgs/by-name/lx/lx-music-desktop/package.nix
@@ -8,13 +8,12 @@
 
   makeWrapper,
 
-  electron_34,
+  electron_36,
   commandLineArgs ? "",
 }:
 
 let
-  # if we want to use later electron, we'll need to bump the `node-abi` npm package version
-  electron = electron_34;
+  electron = electron_36;
 in
 buildNpmPackage rec {
   pname = "lx-music-desktop";
diff --git a/pkgs/by-name/mi/miniflux/package.nix b/pkgs/by-name/mi/miniflux/package.nix
index 3b8b68c3d549..de3e053a1596 100644
--- a/pkgs/by-name/mi/miniflux/package.nix
+++ b/pkgs/by-name/mi/miniflux/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "miniflux";
-  version = "2.2.9";
+  version = "2.2.10";
 
   src = fetchFromGitHub {
     owner = "miniflux";
     repo = "v2";
     tag = version;
-    hash = "sha256-pp+QaofbU6Vkh2ifQLpUq+dbQTx/jX2JgM/9uji13tU=";
+    hash = "sha256-hCRtopJ+PN9bjnImPXKuQRq2Sk62By2+T6z17yISfds=";
   };
 
-  vendorHash = "sha256-6tgZdwr9g/VCnLUEmwAl8vzOzQu6SEGV9PhTp47eXds=";
+  vendorHash = "sha256-jKtlIDPOElp37NlOIbT6IXn2s59NqNTRNK0LbTlxWsM=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/pr/pretalx/plugins/llm.nix b/pkgs/by-name/pr/pretalx/plugins/llm.nix
new file mode 100644
index 000000000000..bb043355a8e9
--- /dev/null
+++ b/pkgs/by-name/pr/pretalx/plugins/llm.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  numpy,
+  ollama,
+  openai,
+  python-redis-lock,
+  umap-learn,
+}:
+
+buildPythonPackage rec {
+  pname = "pretalx-llm";
+  version = "0.5.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "why2025-datenzone";
+    repo = "pretalx-llm";
+    rev = "v${version}";
+    hash = "sha256-Ga6Itvc+yL+p6K7w6WYTeNfxahaohDidDWnt0GtcWEM=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    numpy
+    ollama
+    openai
+    python-redis-lock
+    umap-learn
+  ];
+
+  doCheck = false; # no tests
+
+  pythonImportsCheck = [
+    "pretalx_llm"
+  ];
+
+  meta = {
+    description = "LLM support for Pretalx";
+    homepage = "https://github.com/why2025-datenzone/pretalx-llm";
+    changelog = "https://github.com/why2025-datenzone/pretalx-llm/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/by-name/pr/pretalx/plugins/openmetrics.nix b/pkgs/by-name/pr/pretalx/plugins/openmetrics.nix
new file mode 100644
index 000000000000..ebf021068bd1
--- /dev/null
+++ b/pkgs/by-name/pr/pretalx/plugins/openmetrics.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  unstableGitUpdater,
+}:
+
+buildPythonPackage {
+  pname = "pretalx-openmetrics";
+  version = "unstable-2025-05-25";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "why2025-datenzone";
+    repo = "pretalx-openmetrics";
+    rev = "1121a5d430c403bc9aedb7ae8b1aa81219c8a58f";
+    hash = "sha256-reQA61JFZsYWE/CAL28Oe60CmGANt0phXLzz9YGtDYQ=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  doCheck = false; # no tests
+
+  pythonImportsCheck = [
+    "pretalx_openmetrics"
+  ];
+
+  # no tagged release yet
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "OpenMetrics instrumentation plugin";
+    homepage = "https://github.com/why2025-datenzone/pretalx-openmetrics";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/by-name/pr/pretalx/plugins/zammad.nix b/pkgs/by-name/pr/pretalx/plugins/zammad.nix
new file mode 100644
index 000000000000..72f7ff9e6c4c
--- /dev/null
+++ b/pkgs/by-name/pr/pretalx/plugins/zammad.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  zammad-py,
+}:
+
+buildPythonPackage rec {
+  pname = "pretalx-zammad";
+  version = "2025.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "badbadc0ffee";
+    repo = "pretalx-zammad";
+    tag = "v${version}";
+    hash = "sha256-YIKZO04vaKPGhUrTFiE4F+KjuBrYm0KsxUua5+Hm7gg=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    zammad-py
+  ];
+
+  doCheck = false; # no tests
+
+  pythonImportsCheck = [
+    "pretalx_zammad"
+  ];
+
+  meta = {
+    description = "Pretalx plugin for Zammad issue tracker";
+    homepage = "https://github.com/badbadc0ffee/pretalx-zammad";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/by-name/re/responsively-app/package.nix b/pkgs/by-name/re/responsively-app/package.nix
deleted file mode 100644
index f7fbe7c8dc9c..000000000000
--- a/pkgs/by-name/re/responsively-app/package.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  lib,
-  fetchurl,
-  appimageTools,
-}:
-
-appimageTools.wrapType2 rec {
-  pname = "responsively-app";
-  version = "1.16.0";
-
-  src = fetchurl {
-    url = "https://github.com/responsively-org/responsively-app-releases/releases/download/v${version}/ResponsivelyApp-${version}.AppImage";
-    hash = "sha256-r0wznN+7zZXKNFNFUV4hm2e4gd84M6hVcun4OfNEeSw=";
-  };
-
-  appimageContents = appimageTools.extract {
-    inherit pname version src;
-  };
-
-  extraInstallCommands = ''
-    install -m 444 -D ${appimageContents}/responsivelyapp.desktop $out/share/applications/responsivelyapp.desktop
-    install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/responsivelyapp.png \
-      $out/share/icons/hicolor/512x512/apps/responsivelyapp.png
-    substituteInPlace $out/share/applications/responsivelyapp.desktop \
-      --replace-fail 'Exec=AppRun' 'Exec=${pname}'
-  '';
-
-  meta = {
-    description = "Modified web browser that helps in responsive web development";
-    mainProgram = "responsively-desktop";
-    homepage = "https://responsively.app/";
-    changelog = "https://github.com/responsively-org/responsively-app/releases/tag/v${version}";
-    license = lib.licenses.agpl3Plus;
-    maintainers = with lib.maintainers; [ kashw2 ];
-    platforms = [ "x86_64-linux" ];
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-  };
-}
diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix
index a66994216397..8893db7f6332 100644
--- a/pkgs/by-name/s7/s7/package.nix
+++ b/pkgs/by-name/s7/s7/package.nix
@@ -19,14 +19,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "s7";
-  version = "11.5-unstable-2025-06-15";
+  version = "11.5-unstable-2025-06-25";
 
   src = fetchFromGitLab {
     domain = "cm-gitlab.stanford.edu";
     owner = "bil";
     repo = "s7";
-    rev = "9ab3baa97bd90b1fb3d8d7cef1e0adc31f89c6e2";
-    hash = "sha256-ZhhaRdk6hf+tu2THGFnnpTB/0VE8h87RxLDT46MuiLc=";
+    rev = "0030b5a1e968bc0d6d3cdfd083703c9f5dcf93aa";
+    hash = "sha256-SqRzPSzahZeWxbWhQIUyXzRBq0x6gxb6Sd7oVqTIaF4=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix
index 9abe7d2c715a..1d50a3759917 100644
--- a/pkgs/by-name/ty/ty/package.nix
+++ b/pkgs/by-name/ty/ty/package.nix
@@ -14,14 +14,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ty";
-  version = "0.0.1-alpha.11";
+  version = "0.0.1-alpha.12";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ty";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-ns78SUbCRGWl7fr+acN8yjrx3/odIYFqO/sOL/5ayLw=";
+    hash = "sha256-eVOwamhs9ETwqiYMA/smDtmu/c8TRzEZoKy/o/OCKnA=";
   };
 
   # For Darwin platforms, remove the integration test for file notifications,
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoBuildFlags = [ "--package=ty" ];
 
-  cargoHash = "sha256-GNBQ522FX7Yly963/msRfiYKybpk+XDmn1rujfbO22A=";
+  cargoHash = "sha256-T2JQqFRoMU0xbD8D4tqXdxTN1RxcK6u5DYR9uO876xs=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/wa/wavebox/package.nix b/pkgs/by-name/wa/wavebox/package.nix
deleted file mode 100644
index 22f49638e404..000000000000
--- a/pkgs/by-name/wa/wavebox/package.nix
+++ /dev/null
@@ -1,247 +0,0 @@
-{
-  lib,
-  stdenv,
-  patchelf,
-  makeWrapper,
-  fetchurl,
-  writeScript,
-
-  # Libraries
-  glib,
-  fontconfig,
-  freetype,
-  pango,
-  cairo,
-  libX11,
-  libXi,
-  atk,
-  nss,
-  nspr,
-  libXcursor,
-  libXext,
-  libXfixes,
-  libXrender,
-  libXScrnSaver,
-  libXcomposite,
-  libxcb,
-  alsa-lib,
-  libXdamage,
-  libXtst,
-  libXrandr,
-  libxshmfence,
-  expat,
-  cups,
-  dbus,
-  gtk3,
-  gtk4,
-  gdk-pixbuf,
-  gcc-unwrapped,
-  at-spi2-atk,
-  at-spi2-core,
-  libkrb5,
-  libdrm,
-  libglvnd,
-  libgbm,
-  libxkbcommon,
-  pipewire,
-  wayland,
-
-  coreutils,
-
-  # command line arguments which are always set e.g "--disable-gpu"
-  commandLineArgs ? "",
-
-  systemd,
-
-  # Loaded at runtime.
-  libexif,
-  pciutils,
-
-  liberation_ttf,
-  curl,
-  util-linux,
-  xdg-utils,
-  wget,
-  flac,
-  harfbuzz,
-  icu,
-  libpng,
-  libopus,
-  snappy,
-  speechd,
-  bzip2,
-  libcap,
-
-  # Necessary for USB audio devices.
-  pulseSupport ? true,
-  libpulseaudio,
-
-  gsettings-desktop-schemas,
-
-  # Allow video acceleration via VA-API to be disabled on systems where is doesn't
-  # work reliably (--enable-features=VaapiVideoDecoder)
-  libvaSupport ? true,
-  libva,
-
-  # For Vulkan support (--enable-features=Vulkan)
-  addDriverRunpath,
-}:
-
-let
-  opusWithCustomModes = libopus.override { withCustomModes = true; };
-
-  deps =
-    [
-      glib
-      fontconfig
-      freetype
-      pango
-      cairo
-      libX11
-      libXi
-      atk
-      nss
-      nspr
-      libXcursor
-      libXext
-      libXfixes
-      libXrender
-      libXScrnSaver
-      libXcomposite
-      libxcb
-      alsa-lib
-      libXdamage
-      libXtst
-      libXrandr
-      libxshmfence
-      expat
-      cups
-      dbus
-      gdk-pixbuf
-      gcc-unwrapped.lib
-      systemd
-      libexif
-      pciutils
-      liberation_ttf
-      curl
-      util-linux
-      wget
-      flac
-      harfbuzz
-      icu
-      libpng
-      opusWithCustomModes
-      snappy
-      speechd
-      bzip2
-      libcap
-      at-spi2-atk
-      at-spi2-core
-      libkrb5
-      libdrm
-      libglvnd
-      libgbm
-      coreutils
-      libxkbcommon
-      pipewire
-      wayland
-    ]
-    ++ lib.optional pulseSupport libpulseaudio
-    ++ lib.optional libvaSupport libva
-    ++ [
-      gtk3
-      gtk4
-    ];
-
-in
-stdenv.mkDerivation (finalAttrs: {
-  pname = "wavebox";
-  version = "10.137.11-2";
-
-  src = fetchurl {
-    url = "https://download.wavebox.app/stable/linux/deb/amd64/wavebox_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-sdkpTGhpBfMgczUuyIlhYw7bB91uLW1DzMLUht54eK4=";
-  };
-
-  nativeBuildInputs = [
-    patchelf
-    makeWrapper
-  ];
-  buildInputs = [
-    gsettings-desktop-schemas # needed for GSETTINGS_SCHEMAS_PATH
-    glib
-    gtk3
-  ];
-
-  unpackPhase = ''
-    ar x $src
-    tar xf data.tar.xz
-  '';
-
-  rpath = lib.makeLibraryPath deps + ":" + lib.makeSearchPathOutput "lib" "lib64" deps;
-
-  installPhase = ''
-    runHook preInstall
-
-    exe=$out/bin/wavebox
-
-    mkdir -p $out/bin $out/share
-
-    cp -a opt/* $out/share
-    cp -a usr/share/* $out/share
-
-
-    substituteInPlace $out/share/wavebox.io/wavebox/wavebox-launcher \
-      --replace-fail 'CHROME_WRAPPER' 'WRAPPER'
-    substituteInPlace $out/share/applications/wavebox.desktop \
-      --replace-fail /opt/wavebox.io/wavebox/wavebox-launcher $exe
-    substituteInPlace $out/share/menu/wavebox.menu \
-      --replace-fail /opt $out/share \
-      --replace-fail $out/share/wavebox.io/wavebox/wavebox $exe
-
-    for icon_file in $out/share/wavebox.io/wavebox/product_logo_[0-9]*.png; do
-      num_and_suffix="''${icon_file##*logo_}"
-      icon_size="''${num_and_suffix%.*}"
-      logo_output_prefix="$out/share/icons/hicolor"
-      logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps"
-      mkdir -p "$logo_output_path"
-      mv "$icon_file" "$logo_output_path/wavebox.png"
-    done
-
-    makeWrapper "$out/share/wavebox.io/wavebox/wavebox" "$exe" \
-      --prefix LD_LIBRARY_PATH : "$rpath" \
-      --prefix PATH            : "${lib.makeBinPath deps}" \
-      --suffix PATH            : "${lib.makeBinPath [ xdg-utils ]}" \
-      --prefix XDG_DATA_DIRS   : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \
-      --set CHROME_WRAPPER "wavebox" \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
-      --add-flags ${lib.escapeShellArg commandLineArgs}
-
-    for elf in $out/share/wavebox.io/wavebox/{wavebox,chrome-sandbox,chrome_crashpad_handler}; do
-      patchelf --set-rpath $rpath $elf
-      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf
-    done
-
-    runHook postInstall
-  '';
-
-  passthru = {
-    updateScript = writeScript "update-wavebox.sh" ''
-      #!/usr/bin/env nix-shell
-      #!nix-shell -i bash -p nix-update curl jq
-
-      version=$(curl "https://download.wavebox.app/stable/linux/latest.json" | jq --raw-output '.["urls"]["deb"] | match("https://download.wavebox.app/stable/linux/deb/amd64/wavebox_(.+)_amd64.deb").captures[0]["string"]')
-      nix-update wavebox --version "$version"
-    '';
-  };
-
-  meta = {
-    description = "Wavebox Productivity Browser";
-    homepage = "https://wavebox.io";
-    license = lib.licenses.unfree;
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    maintainers = with lib.maintainers; [ flexiondotorg ];
-    platforms = [ "x86_64-linux" ];
-    mainProgram = "wavebox";
-  };
-})
diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index 8de21e69876c..be430278963a 100644
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@@ -26,7 +26,7 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-files";
-  version = "7.1.3";
+  version = "7.1.4";
 
   outputs = [
     "out"
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = "files";
     rev = version;
-    hash = "sha256-GeHaDZGOdvc7dXA3AE4Gt9u3RVgkU7d3FxAC3uXsgUs=";
+    hash = "sha256-z7LkQ/lc2pv73VBdKRKWUKWemTbX6xMtCmrgqK5QIZw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix
index 803e1093af7c..15e911e2e342 100644
--- a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix
+++ b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xdg-desktop-portal-pantheon";
-  version = "8.0.3";
+  version = "8.0.4";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "portals";
     rev = version;
-    sha256 = "sha256-UGQ5kteX/W3ncKzTXXmVL/aI0WC3eqpl5prdmj7lBD8=";
+    sha256 = "sha256-I0GsdpaH4SoOVPLLZa0da8+rwmJs1HtLrhkglNmYtrQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/cleanlab/default.nix b/pkgs/development/python-modules/cleanlab/default.nix
index f88e85a9e336..9cd1d44d90da 100644
--- a/pkgs/development/python-modules/cleanlab/default.nix
+++ b/pkgs/development/python-modules/cleanlab/default.nix
@@ -81,6 +81,9 @@ buildPythonPackage rec {
 
   disabledTests =
     [
+      # Incorrect snapshots (AssertionError)
+      "test_color_sentence"
+
       # Requires the datasets we prevent from downloading
       "test_create_imagelab"
 
diff --git a/pkgs/development/python-modules/kokoro/default.nix b/pkgs/development/python-modules/kokoro/default.nix
new file mode 100644
index 000000000000..eb9b658152c7
--- /dev/null
+++ b/pkgs/development/python-modules/kokoro/default.nix
@@ -0,0 +1,59 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  fetchPypi,
+  hatchling,
+  huggingface-hub,
+  lib,
+  loguru,
+  misaki,
+  numpy,
+  pytestCheckHook,
+  torch,
+  transformers,
+}:
+
+buildPythonPackage {
+  pname = "kokoro";
+  version = "0-unstable-2025-06-16";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "hexgrad";
+    repo = "kokoro";
+    rev = "2668b2e279d0f94977995230e523b0183763f30e";
+    hash = "sha256-slXbn0W1632Hak6Z0ofF0gyavxRLoxS4fyPQLHSapjA=";
+  };
+
+  build-system = [
+    hatchling
+  ];
+
+  dependencies = [
+    huggingface-hub
+    loguru
+    misaki
+    numpy
+    torch
+    transformers
+  ] ++ misaki.optional-dependencies.en; # kokoro depends on misaki[en]
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  disabledTests = [
+    # See https://github.com/hexgrad/kokoro/issues/225
+    "test_different_window_sizes"
+    "test_stft_reconstruction"
+  ];
+
+  pythonImportsCheck = [
+    "kokoro"
+  ];
+
+  meta = {
+    description = "Open-weight TTS model with 82 million parameters";
+    homepage = "https://github.com/hexgrad/kokoro";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ samuela ];
+  };
+}
diff --git a/pkgs/development/python-modules/misaki/default.nix b/pkgs/development/python-modules/misaki/default.nix
new file mode 100644
index 000000000000..d4a65f30e26b
--- /dev/null
+++ b/pkgs/development/python-modules/misaki/default.nix
@@ -0,0 +1,118 @@
+{
+  addict,
+  buildPythonPackage,
+  espeak-ng,
+  fetchFromGitHub,
+  fetchpatch2,
+  fugashi,
+  hatchling,
+  jaconv,
+  jamo,
+  jieba,
+  lib,
+  nltk,
+  num2words,
+  ordered-set,
+  phonemizer,
+  pip,
+  pypinyin,
+  pythonOlder,
+  regex,
+  replaceVars,
+  spacy-curated-transformers,
+  spacy,
+  pytestCheckHook,
+  stdenv,
+  torch,
+  transformers,
+  unidic,
+}:
+
+buildPythonPackage {
+  pname = "misaki";
+  version = "0-unstable-2025-06-16";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "hexgrad";
+    repo = "misaki";
+    rev = "49ddead831fc1a46beab3f9cb6064d93fd3f6347";
+    hash = "sha256-XkmCG0Vkw/iyLNmwhaW5gp6sg8ieHFeK6fBJ3Jb+J8Q=";
+  };
+
+  patches = [
+    (fetchpatch2 {
+      name = "pr82-remove-pip-dependency.patch";
+      url = "https://github.com/hexgrad/misaki/commit/7d2fdff9fe046dd52b638bbb1b243fb789f4cb31.patch?full_index=1";
+      hash = "sha256-N796YWrGe51FYVdxbQ8omJxeGdvOAiKEUKhhm10TQO8=";
+    })
+    (replaceVars ./set-espeak-paths.patch {
+      espeak-library-path = "${lib.getLib espeak-ng}/lib/libespeak-ng${stdenv.hostPlatform.extensions.sharedLibrary}";
+      espeak-data-path = "${lib.getLib espeak-ng}/share/espeak-ng-data";
+    })
+  ];
+
+  build-system = [
+    hatchling
+  ];
+
+  dependencies = [
+    addict
+    regex
+  ];
+
+  # See https://github.com/hexgrad/misaki/blob/main/pyproject.toml#L26
+  passthru.optional-dependencies = {
+    en = [
+      num2words
+      spacy
+      spacy-curated-transformers
+      phonemizer
+      # phonemizer-fork -- we already patch phonemizer in nixpkgs, no need for the "-fork" version
+      # espeakng-loader -- ./set-espeak-paths.patch obviates the need for this
+      torch
+      transformers
+    ];
+    ja = [
+      fugashi
+      jaconv
+      # mojimoji -- not packaged as of 2025-06-16
+      unidic
+      # pyopenjtalk -- not packaged as of 2025-06-16
+    ];
+    ko = [
+      jamo
+      nltk
+    ];
+    zh = [
+      jieba
+      ordered-set
+      pypinyin
+      # cn2an -- not packaged as of 2025-06-16
+      # pypinyin-dict -- not packaged as of 2025-06-16
+    ];
+    vi = [
+      num2words
+      spacy
+      spacy-curated-transformers
+      # underthesea -- not packaged as of 2025-06-16
+    ];
+    # he = [ mishkal-hebrew ]; -- not packaged as of 2025-06-16
+  };
+
+  # Package does not have tests as of 2025-06-16, but phonemizer is required for
+  # pythonImportsCheck.
+  nativeCheckInputs = [ phonemizer ];
+
+  pythonImportsCheck = [
+    "misaki"
+    "misaki.espeak"
+  ];
+
+  meta = {
+    description = "G2P engine for TTS";
+    homepage = "https://github.com/hexgrad/misaki";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ samuela ];
+  };
+}
diff --git a/pkgs/development/python-modules/misaki/set-espeak-paths.patch b/pkgs/development/python-modules/misaki/set-espeak-paths.patch
new file mode 100644
index 000000000000..9e3b34542f2f
--- /dev/null
+++ b/pkgs/development/python-modules/misaki/set-espeak-paths.patch
@@ -0,0 +1,20 @@
+diff --git a/misaki/espeak.py b/misaki/espeak.py
+index e5d880c..42c2596 100644
+--- a/misaki/espeak.py
++++ b/misaki/espeak.py
+@@ -1,13 +1,12 @@
+ from phonemizer.backend.espeak.wrapper import EspeakWrapper
+ from typing import Tuple
+-import espeakng_loader
+ import phonemizer
+ import re
+ 
+ # Set espeak-ng library path and espeak-ng-data
+-EspeakWrapper.set_library(espeakng_loader.get_library_path())
++EspeakWrapper.set_library("@espeak-library-path@")
+ # Change data_path as needed when editing espeak-ng phonemes
+-EspeakWrapper.set_data_path(espeakng_loader.get_data_path())
++EspeakWrapper.set_data_path("@espeak-data-path@")
+ 
+ # EspeakFallback is used as a last resort for English
+ class EspeakFallback:
diff --git a/pkgs/development/python-modules/phonemizer/default.nix b/pkgs/development/python-modules/phonemizer/default.nix
index 9b4a69a67876..383251a9befd 100644
--- a/pkgs/development/python-modules/phonemizer/default.nix
+++ b/pkgs/development/python-modules/phonemizer/default.nix
@@ -4,6 +4,7 @@
   replaceVars,
   buildPythonPackage,
   fetchPypi,
+  fetchpatch2,
   joblib,
   segments,
   attrs,
@@ -31,6 +32,13 @@ buildPythonPackage rec {
       libespeak = "${lib.getLib espeak-ng}/lib/libespeak-ng${stdenv.hostPlatform.extensions.sharedLibrary}";
       # FIXME package festival
     })
+    # This patch is needed for python3Packages.misaki. See https://github.com/thewh1teagle/espeakng-loader?tab=readme-ov-file#usage-with-phonemizer
+    # and https://github.com/bootphon/phonemizer/pull/191.
+    (fetchpatch2 {
+      name = "pr191-add-option-to-use-custom-espeak-data-path.patch";
+      url = "https://github.com/bootphon/phonemizer/commit/cc1db4bfaf688fdfb8275fd83d218f06411455e6.patch?full_index=1";
+      hash = "sha256-PMeX7A9BBVLS3Sk/Lum85GpJzKXM5tULTWSURq3MD8E=";
+    })
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix
index c0b78aee6ccf..819f7f87a54c 100644
--- a/pkgs/development/python-modules/plotnine/default.nix
+++ b/pkgs/development/python-modules/plotnine/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "plotnine";
-  version = "0.14.5";
+  version = "0.14.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "has2k1";
     repo = "plotnine";
     tag = "v${version}";
-    hash = "sha256-3ImNLmZ8RhhqRGv/FtdjbHmdOtgQC7hjUsViEQYE8Ao=";
+    hash = "sha256-nTMu0zx13XepqQyrJrAvBCjjHdY02tlXlFk2kITHZfI=";
   };
 
   build-system = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock
index 2de3dc148e71..4abf8ce1e64d 100644
--- a/pkgs/development/python-modules/pycrdt/Cargo.lock
+++ b/pkgs/development/python-modules/pycrdt/Cargo.lock
@@ -32,9 +32,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "bitflags"
@@ -44,9 +44,9 @@ checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
 
 [[package]]
 name = "bumpalo"
-version = "3.18.1"
+version = "3.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
 [[package]]
 name = "cfg-if"
@@ -162,9 +162,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.173"
+version = "0.2.174"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8cfeafaffdbc32176b64fb251369d52ea9f0a8fbc6f8759edffef7b525d64bb"
+checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
 
 [[package]]
 name = "lock_api"
@@ -245,7 +245,7 @@ dependencies = [
 
 [[package]]
 name = "pycrdt"
-version = "0.12.21"
+version = "0.12.22"
 dependencies = [
  "pyo3",
  "yrs",
@@ -392,9 +392,9 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "syn"
-version = "2.0.103"
+version = "2.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4307e30089d6fd6aff212f2da3a1f9e32f3223b1f010fb09b7c95f90f3ca1e8"
+checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -568,9 +568,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "yrs"
-version = "0.23.4"
+version = "0.23.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb1d740a98b12112352f05ddfc06c1505b66fca116601f9388b84be45d21f84d"
+checksum = "197c2b4b298f35c3ba4d549884ac872a961112095b29f173ab45e3d5cf609018"
 dependencies = [
  "arc-swap",
  "async-lock",
diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix
index 3e34bcefa961..1957229251e1 100644
--- a/pkgs/development/python-modules/pycrdt/default.nix
+++ b/pkgs/development/python-modules/pycrdt/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "pycrdt";
-  version = "0.12.21";
+  version = "0.12.22";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "y-crdt";
     repo = "pycrdt";
     tag = version;
-    hash = "sha256-QfgBq/jL/dFOr1YAC4y0s0tpdIC4bwxknPd1wJ/Z1lo=";
+    hash = "sha256-1RTH6u+B+u4+ILvQufHgKCRW1Pj3Tyz5PFOBP/bDWD4=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/zammad-py/default.nix b/pkgs/development/python-modules/zammad-py/default.nix
new file mode 100644
index 000000000000..656c153ac682
--- /dev/null
+++ b/pkgs/development/python-modules/zammad-py/default.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  requests,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "zammad-py";
+  version = "3.2.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "joeirimpan";
+    repo = "zammad_py";
+    tag = "v${version}";
+    hash = "sha256-gU5OA5m8X03GM7ImXZZVLkEyoAXRCoFskfop8oXJFH0=";
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  dependencies = [
+    requests
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # requires a local zammad instance
+    "test_users"
+    "test_tickets"
+    "test_groups"
+    "test_pagination"
+  ];
+
+  pythonImportsCheck = [
+    "zammad_py"
+  ];
+
+  meta = {
+    changelog = "https://github.com/joeirimpan/zammad_py/blob/${src.tag}/HISTORY.rst";
+    description = "Python API client for accessing zammad REST API";
+    homepage = "https://github.com/joeirimpan/zammad_py";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/development/tcl-modules/by-name/ze/zesty/package.nix b/pkgs/development/tcl-modules/by-name/ze/zesty/package.nix
new file mode 100644
index 000000000000..05418d6d342c
--- /dev/null
+++ b/pkgs/development/tcl-modules/by-name/ze/zesty/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  mkTclDerivation,
+  fetchFromGitHub,
+  tcllib,
+  nix-update-script,
+}:
+
+mkTclDerivation rec {
+  pname = "zesty";
+  version = "0.1";
+
+  src = fetchFromGitHub {
+    owner = "nico-robert";
+    repo = "zesty";
+    tag = "v${version}";
+    hash = "sha256-XJdgS1Lf5B5VjGq2gztc5p3E7TLiibaYfU9f8r1wKOc=";
+  };
+
+  propagatedBuildInputs = [
+    tcllib
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 -t $out/lib/zesty/ *.tcl
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Tcl library for rich terminal output";
+    homepage = "https://github.com/nico-robert/zesty";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fgaz ];
+    platforms = lib.platforms.all;
+  };
+}
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix
index ae5254e64dbf..4246e5a90a80 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "sankey-chart";
-  version = "3.9.0";
+  version = "3.9.3";
 
   src = fetchFromGitHub {
     owner = "MindFreeze";
     repo = "ha-sankey-chart";
     rev = "v${version}";
-    hash = "sha256-5ojqL0AYkF/VnvaQsn8CJn4y9srZUWUtyz+zauqGAkA=";
+    hash = "sha256-qOUzMi2anKc5sQqy9xvA/ISg0NPuPXQqzjqaPbyiYvY=";
   };
 
-  npmDepsHash = "sha256-/29XdA+y4ppbK0II1sy+IDFGYUQuPFUq3MMooqA6cBo=";
+  npmDepsHash = "sha256-mz682Ine+YQHxS/Hni6namkohOsGhVhFZi7lsKMHOnc=";
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/tools/misc/gaphor/default.nix b/pkgs/tools/misc/gaphor/default.nix
deleted file mode 100644
index 725fa2a1305b..000000000000
--- a/pkgs/tools/misc/gaphor/default.nix
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-  lib,
-  buildPythonApplication,
-  fetchPypi,
-  copyDesktopItems,
-  gobject-introspection,
-  poetry-core,
-  wrapGAppsHook4,
-  gtksourceview5,
-  libadwaita,
-  pango,
-  gaphas,
-  generic,
-  jedi,
-  pycairo,
-  pillow,
-  dulwich,
-  pydot,
-  defusedxml,
-  better-exceptions,
-  babel,
-  pygobject3,
-  tinycss2,
-  gtk4,
-  librsvg,
-  makeDesktopItem,
-  python,
-  nix-update-script,
-}:
-
-buildPythonApplication rec {
-  pname = "gaphor";
-  version = "3.0.0";
-  pyproject = true;
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-I5n0XeZLQw4qje6gwh2aMu5Zo5tuXgESHhkR0xegaYM=";
-  };
-
-  pythonRelaxDeps = [
-    "defusedxml"
-    "gaphas"
-  ];
-
-  nativeBuildInputs = [
-    copyDesktopItems
-    gobject-introspection
-    wrapGAppsHook4
-  ];
-
-  buildInputs = [
-    gtksourceview5
-    pango
-    libadwaita
-  ];
-
-  build-system = [ poetry-core ];
-
-  dependencies = [
-    babel
-    better-exceptions
-    defusedxml
-    dulwich
-    gaphas
-    generic
-    jedi
-    pillow
-    pycairo
-    pydot
-    pygobject3
-    tinycss2
-  ];
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = pname;
-      exec = "gaphor";
-      icon = "gaphor";
-      comment = meta.description;
-      desktopName = "Gaphor";
-    })
-  ];
-
-  # Disable automatic wrapGAppsHook4 to prevent double wrapping
-  dontWrapGApps = true;
-
-  postInstall = ''
-    install -Dm644 $out/${python.sitePackages}/gaphor/ui/icons/hicolor/scalable/apps/org.gaphor.Gaphor.svg $out/share/pixmaps/gaphor.svg
-  '';
-
-  preFixup = ''
-    makeWrapperArgs+=(
-      "''${gappsWrapperArgs[@]}" \
-      --prefix XDG_DATA_DIRS : "${gtk4}/share/gsettings-schemas/${gtk4.name}/" \
-      --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
-    )
-  '';
-
-  passthru = {
-    updateScript = nix-update-script { };
-  };
-
-  meta = {
-    description = "Simple modeling tool written in Python";
-    homepage = "https://github.com/gaphor/gaphor";
-    changelog = "https://github.com/gaphor/gaphor/releases/tag/${version}";
-    license = lib.licenses.asl20;
-    teams = [ lib.teams.gnome-circle ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix
index 6cd3934d8360..d963d43c13b7 100644
--- a/pkgs/tools/networking/openssh/common.nix
+++ b/pkgs/tools/networking/openssh/common.nix
@@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
       "--sbindir=\${out}/bin"
       "--localstatedir=/var"
       "--with-pid-dir=/run"
-      "--with-mantype=man"
+      "--with-mantype=doc"
       "--with-libedit=yes"
       "--disable-strip"
       (lib.withFeature withPAM "pam")
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a70d79737632..110ec721e296 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1713,6 +1713,7 @@ mapAliases {
   retroarchBare = retroarch-bare; # Added 2024-11-23
   retroarchFull = retroarch-full; # Added 2024-11-23
   retroshare06 = retroshare;
+  responsively-app = throw "'responsively-app' has been removed due to lack of maintainance upstream."; # Added 2025-06-25
   rftg = throw "'rftg' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
   rigsofrods = rigsofrods-bin; # Added 2023-03-22
   ring-daemon = throw "'ring-daemon' has been renamed to/replaced by 'jami-daemon'"; # Converted to throw 2024-10-17
@@ -2078,6 +2079,7 @@ mapAliases {
   wakatime = wakatime-cli; # 2024-05-30
   wal_e = throw "wal_e was removed as it is unmaintained upstream and depends on the removed boto package; upstream recommends using wal-g or pgbackrest"; # Added 2024-09-22
   wapp = tclPackages.wapp; # Added 2024-10-02
+  wavebox = throw "'wavebox' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-24
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_100;
   watershot = throw "'watershot' has been removed as it is unmaintained upstream and no longer works"; # Added 2025-06-01
   wayfireApplications-unwrapped = throw ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cf3a5dafc825..ba7ccac4a017 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3021,8 +3021,6 @@ with pkgs;
 
   gandi-cli = python3Packages.callPackage ../tools/networking/gandi-cli { };
 
-  gaphor = python3Packages.callPackage ../tools/misc/gaphor { };
-
   inherit (callPackages ../tools/filesystems/garage { })
     garage
     garage_0_8
@@ -10566,10 +10564,6 @@ with pkgs;
   mssql_jdbc = callPackage ../servers/sql/mssql/jdbc { };
   jtds_jdbc = callPackage ../servers/sql/mssql/jdbc/jtds.nix { };
 
-  miniflux = callPackage ../by-name/mi/miniflux/package.nix {
-    buildGoModule = buildGo123Module;
-  };
-
   inherit (callPackage ../servers/mir { })
     mir
     mir_2_15
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eff2bbc43632..102b9969f383 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7655,6 +7655,8 @@ self: super: with self; {
 
   knx-frontend = callPackage ../development/python-modules/knx-frontend { };
 
+  kokoro = callPackage ../development/python-modules/kokoro { };
+
   kombu = callPackage ../development/python-modules/kombu { };
 
   konnected = callPackage ../development/python-modules/konnected { };
@@ -9107,6 +9109,8 @@ self: super: with self; {
 
   misaka = callPackage ../development/python-modules/misaka { };
 
+  misaki = callPackage ../development/python-modules/misaki { };
+
   misoc = callPackage ../development/python-modules/misoc { };
 
   miss-hit = callPackage ../development/python-modules/miss-hit { };
@@ -19737,6 +19741,8 @@ self: super: with self; {
 
   zamg = callPackage ../development/python-modules/zamg { };
 
+  zammad-py = callPackage ../development/python-modules/zammad-py { };
+
   zarr = callPackage ../development/python-modules/zarr { };
 
   zc-buildout = callPackage ../development/python-modules/zc-buildout { };