Merge staging-next into staging

2024-10-12 12:05:39 +00:00 · 2024-10-12 12:05:39 +00:00 · f201fe5883
commit f201fe5883
parent d363932842 4433a315bd
158 changed files with 854 additions and 1671 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -960,6 +960,12 @@
    githubId = 49609151;
    name = "Popa Ioan Alexandru";
  };
+  alexandru0-dev = {
+    email = "alexandru.italia32+nixpkgs@gmail.com";
+    github = "alexandru0-dev";
+    githubId = 45104896;
+    name = "Alexandru Nechita";
+  };
  alexarice = {
    email = "alexrice999@hotmail.co.uk";
    github = "alexarice";
@ -7669,6 +7675,12 @@
    githubId = 111183546;
    keys = [ { fingerprint = "58CE D4BE 6B10 149E DA80  A990 2F48 6356 A4CB 30F3"; } ];
  };
+  genga898 = {
+    email = "genga898@gmail.com";
+    github = "genga898";
+    githubId = 84174227;
+    name = "Emmanuel Genga";
+  };
  genofire = {
    name = "genofire";
    email = "geno+dev@fireorbit.de";
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@ -209,6 +209,10 @@

 - `deno` has been updated to v2 which has breaking changes. Upstream will be abandoning v1 soon but for now you can use `deno_1` if you are yet to migrate (will be removed prior to cutting a final 24.11 release).

+- `gogs` has been removed. Upstream development has stalled and it has several
+  [critical vulnerabilities](https://github.com/gogs/gogs/issues/7777) that weren't addressed
+  within a year. Consider migrating to `forgejo` or `gitea`.
+
 - `knot-dns` has been updated to version 3.4.x. Check the [migration guide](https://www.knot-dns.cz/docs/latest/html/migration.html#upgrade-3-3-x-to-3-4-x) for breaking changes.

 - `services.kubernetes.kubelet.clusterDns` now accepts a list of DNS resolvers rather than a single string, bringing the module more in line with the upstream Kubelet configuration schema.
@ -621,8 +625,6 @@

 - `nixosTests` now provide a working IPv6 setup for VLAN 1 by default.

- `services.dhcpcd` is now started with additional systemd sandbox/hardening options for better security. When using `networking.dhcpcd.runHook` these settings are not applied.
-
 - Kanidm can now be provisioned using the new [`services.kanidm.provision`] option, but requires using a patched version available via `pkgs.kanidm.withSecretProvisioning`.

 - Kanidm previously had an incorrect systemd service type, causing dependent units with an `after` and `requires` directive to start before `kanidm*` finished startup. The module has now been updated in line with upstream recommendations.
@ -703,6 +705,9 @@

 - ZFS now imports its pools in `postResumeCommands` rather than `postDeviceCommands`. If you had `postDeviceCommands` scripts that depended on ZFS pools being imported, those now need to be in `postResumeCommands`.

+- `services.automatic-timezoned.enable = true` will now set `time.timeZone = null`.
+  This is to avoid silently shadowing a user's explicitly defined timezone without recognition on the user's part.
+
 - `services.localtimed.enable = true` will now set `time.timeZone = null`.
  This is to avoid silently shadowing a user's explicitly defined timezone without recognition on the user's part.

--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@ -296,7 +296,7 @@ in
      sickbeard = 265;
      headphones = 266;
      # couchpotato = 267; # unused, removed 2022-01-01
-      gogs = 268;
+      # gogs = 268; # unused, removed in 2024-10-12
      #pdns-recursor = 269; # dynamically allocated as of 2020-20-18
      #kresd = 270; # switched to "knot-resolver" with dynamic ID
      rpc = 271;
@ -607,7 +607,7 @@ in
      sickbeard = 265;
      headphones = 266;
      # couchpotato = 267; # unused, removed 2022-01-01
-      gogs = 268;
+      # gogs = 268; # unused, removed in 2024-10-12
      #kresd = 270; # switched to "knot-resolver" with dynamic ID
      #rpc = 271; # unused
      #geoip = 272; # unused
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@ -759,7 +759,6 @@
  ./services/misc/gitlab.nix
  ./services/misc/gitolite.nix
  ./services/misc/gitweb.nix
-  ./services/misc/gogs.nix
  ./services/misc/gollum.nix
  ./services/misc/gotenberg.nix
  ./services/misc/gpsd.nix
--- a/nixos/modules/services/misc/gogs.nix
+++ b/nixos/modules/services/misc/gogs.nix
@ -1,271 +0,0 @@
-{ config, lib, options, pkgs, ... }:
-let
-  cfg = config.services.gogs;
-  opt = options.services.gogs;
-  configFile = pkgs.writeText "app.ini" ''
-    BRAND_NAME = ${cfg.appName}
-    RUN_USER = ${cfg.user}
-    RUN_MODE = prod
-
-    [database]
-    TYPE = ${cfg.database.type}
-    HOST = ${cfg.database.host}:${toString cfg.database.port}
-    NAME = ${cfg.database.name}
-    USER = ${cfg.database.user}
-    PASSWORD = #dbpass#
-    PATH = ${cfg.database.path}
-
-    [repository]
-    ROOT = ${cfg.repositoryRoot}
-
-    [server]
-    DOMAIN = ${cfg.domain}
-    HTTP_ADDR = ${cfg.httpAddress}
-    HTTP_PORT = ${toString cfg.httpPort}
-    EXTERNAL_URL = ${cfg.rootUrl}
-
-    [session]
-    COOKIE_NAME = session
-    COOKIE_SECURE = ${lib.boolToString cfg.cookieSecure}
-
-    [security]
-    SECRET_KEY = #secretkey#
-    INSTALL_LOCK = true
-
-    [log]
-    ROOT_PATH = ${cfg.stateDir}/log
-
-    ${cfg.extraConfig}
-  '';
-in
-
-{
-  options = {
-    services.gogs = {
-      enable = lib.mkOption {
-        default = false;
-        type = lib.types.bool;
-        description = "Enable Go Git Service.";
-      };
-
-      useWizard = lib.mkOption {
-        default = false;
-        type = lib.types.bool;
-        description = "Do not generate a configuration and use Gogs' installation wizard instead. The first registered user will be administrator.";
-      };
-
-      stateDir = lib.mkOption {
-        default = "/var/lib/gogs";
-        type = lib.types.str;
-        description = "Gogs data directory.";
-      };
-
-      user = lib.mkOption {
-        type = lib.types.str;
-        default = "gogs";
-        description = "User account under which Gogs runs.";
-      };
-
-      group = lib.mkOption {
-        type = lib.types.str;
-        default = "gogs";
-        description = "Group account under which Gogs runs.";
-      };
-
-      database = {
-        type = lib.mkOption {
-          type = lib.types.enum [ "sqlite3" "mysql" "postgres" ];
-          example = "mysql";
-          default = "sqlite3";
-          description = "Database engine to use.";
-        };
-
-        host = lib.mkOption {
-          type = lib.types.str;
-          default = "127.0.0.1";
-          description = "Database host address.";
-        };
-
-        port = lib.mkOption {
-          type = lib.types.port;
-          default = 3306;
-          description = "Database host port.";
-        };
-
-        name = lib.mkOption {
-          type = lib.types.str;
-          default = "gogs";
-          description = "Database name.";
-        };
-
-        user = lib.mkOption {
-          type = lib.types.str;
-          default = "gogs";
-          description = "Database user.";
-        };
-
-        password = lib.mkOption {
-          type = lib.types.str;
-          default = "";
-          description = ''
-            The password corresponding to {option}`database.user`.
-            Warning: this is stored in cleartext in the Nix store!
-            Use {option}`database.passwordFile` instead.
-          '';
-        };
-
-        passwordFile = lib.mkOption {
-          type = lib.types.nullOr lib.types.path;
-          default = null;
-          example = "/run/keys/gogs-dbpassword";
-          description = ''
-            A file containing the password corresponding to
-            {option}`database.user`.
-          '';
-        };
-
-        path = lib.mkOption {
-          type = lib.types.str;
-          default = "${cfg.stateDir}/data/gogs.db";
-          defaultText = lib.literalExpression ''"''${config.${opt.stateDir}}/data/gogs.db"'';
-          description = "Path to the sqlite3 database file.";
-        };
-      };
-
-      appName = lib.mkOption {
-        type = lib.types.str;
-        default = "Gogs: Go Git Service";
-        description = "Application name.";
-      };
-
-      repositoryRoot = lib.mkOption {
-        type = lib.types.str;
-        default = "${cfg.stateDir}/repositories";
-        defaultText = lib.literalExpression ''"''${config.${opt.stateDir}}/repositories"'';
-        description = "Path to the git repositories.";
-      };
-
-      domain = lib.mkOption {
-        type = lib.types.str;
-        default = "localhost";
-        description = "Domain name of your server.";
-      };
-
-      rootUrl = lib.mkOption {
-        type = lib.types.str;
-        default = "http://localhost:3000/";
-        description = "Full public URL of Gogs server.";
-      };
-
-      httpAddress = lib.mkOption {
-        type = lib.types.str;
-        default = "0.0.0.0";
-        description = "HTTP listen address.";
-      };
-
-      httpPort = lib.mkOption {
-        type = lib.types.port;
-        default = 3000;
-        description = "HTTP listen port.";
-      };
-
-      cookieSecure = lib.mkOption {
-        type = lib.types.bool;
-        default = false;
-        description = ''
-          Marks session cookies as "secure" as a hint for browsers to only send
-          them via HTTPS. This option is recommend, if Gogs is being served over HTTPS.
-        '';
-      };
-
-      extraConfig = lib.mkOption {
-        type = lib.types.str;
-        default = "";
-        description = "Configuration lines appended to the generated Gogs configuration file.";
-      };
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-
-    systemd.services.gogs = {
-      description = "Gogs (Go Git Service)";
-      after = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-      path = [ pkgs.gogs ];
-
-      preStart = let
-        runConfig = "${cfg.stateDir}/custom/conf/app.ini";
-        secretKey = "${cfg.stateDir}/custom/conf/secret_key";
-      in ''
-        mkdir -p ${cfg.stateDir}
-
-        # copy custom configuration and generate a random secret key if needed
-        ${lib.optionalString (cfg.useWizard == false) ''
-          mkdir -p ${cfg.stateDir}/custom/conf
-          cp -f ${configFile} ${runConfig}
-
-          if [ ! -e ${secretKey} ]; then
-              head -c 16 /dev/urandom | base64 > ${secretKey}
-          fi
-
-          KEY=$(head -n1 ${secretKey})
-          DBPASS=$(head -n1 ${cfg.database.passwordFile})
-          sed -e "s,#secretkey#,$KEY,g" \
-              -e "s,#dbpass#,$DBPASS,g" \
-              -i ${runConfig}
-        ''}
-
-        mkdir -p ${cfg.repositoryRoot}
-        # update all hooks' binary paths
-        HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 4 -type f -wholename "*git/hooks/*")
-        if [ "$HOOKS" ]
-        then
-          sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gogs,${pkgs.gogs}/bin/gogs,g' $HOOKS
-          sed -ri 's,/nix/store/[a-z0-9.-]+/bin/env,${pkgs.coreutils}/bin/env,g' $HOOKS
-          sed -ri 's,/nix/store/[a-z0-9.-]+/bin/bash,${pkgs.bash}/bin/bash,g' $HOOKS
-          sed -ri 's,/nix/store/[a-z0-9.-]+/bin/perl,${pkgs.perl}/bin/perl,g' $HOOKS
-        fi
-      '';
-
-      serviceConfig = {
-        Type = "simple";
-        User = cfg.user;
-        Group = cfg.group;
-        WorkingDirectory = cfg.stateDir;
-        ExecStart = "${pkgs.gogs}/bin/gogs web";
-        Restart = "always";
-        UMask = "0027";
-      };
-
-      environment = {
-        USER = cfg.user;
-        HOME = cfg.stateDir;
-        GOGS_WORK_DIR = cfg.stateDir;
-      };
-    };
-
-    users = lib.mkIf (cfg.user == "gogs") {
-      users.gogs = {
-        description = "Go Git Service";
-        uid = config.ids.uids.gogs;
-        group = "gogs";
-        home = cfg.stateDir;
-        createHome = true;
-        shell = pkgs.bash;
-      };
-      groups.gogs.gid = config.ids.gids.gogs;
-    };
-
-    warnings = lib.optional (cfg.database.password != "")
-      ''config.services.gogs.database.password will be stored as plaintext
-        in the Nix store. Use database.passwordFile instead.'';
-
-    # Create database passwordFile default when password is configured.
-    services.gogs.database.passwordFile =
-      (lib.mkDefault (toString (pkgs.writeTextFile {
-        name = "gogs-database-password";
-        text = cfg.database.password;
-      })));
-  };
-}
--- a/nixos/modules/services/system/automatic-timezoned.nix
+++ b/nixos/modules/services/system/automatic-timezoned.nix
@ -16,6 +16,11 @@ in
          timezone up-to-date based on the current location. It uses geoclue2 to
          determine the current location and systemd-timedated to actually set
          the timezone.
+
+          To avoid silent overriding by the service, if you have explicitly set a
+          timezone, either remove it or ensure that it is set with a lower priority
+          than the default value using `lib.mkDefault` or `lib.mkOverride`. This is
+          to make the choice deliberate. An error will be presented otherwise.
        '';
      };
      package = mkPackageOption pkgs "automatic-timezoned" { };
@ -23,6 +28,10 @@ in
  };

  config = mkIf cfg.enable {
+    # This will give users an error if they have set an explicit time
+    # zone, rather than having the service silently override it.
+    time.timeZone = null;
+
    security.polkit.extraConfig = ''
      polkit.addRule(function(action, subject) {
        if (action.id == "org.freedesktop.timedate1.set-timezone"
--- a/nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix
+++ b/nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix
@ -52,7 +52,7 @@ in

      ollamaUrl = lib.mkOption {
        type = lib.types.str;
-        default = "127.0.0.1:11434";
+        default = "http://127.0.0.1:11434";
        example = "https://ollama.example.org";
        description = ''
          The address (including host and port) under which we can access the Ollama backend server.
@ -79,6 +79,7 @@ in
        serviceConfig = {
          ExecStart = "${lib.getExe nextjs-ollama-llm-ui}";
          DynamicUser = true;
+          CacheDirectory = "nextjs-ollama-llm-ui";
        };
      };
    };
--- a/pkgs/applications/audio/bespokesynth/default.nix
+++ b/pkgs/applications/audio/bespokesynth/default.nix
@ -24,7 +24,7 @@
 , xcbutilkeysyms
 , xcb-util-cursor
 , gtk3
-, webkitgtk
+, webkitgtk_4_0
 , python3
 , curl
 , pcre
@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
    libXScrnSaver
    curl
    gtk3
-    webkitgtk
+    webkitgtk_4_0
    freetype
    libGL
    libusb1
--- a/pkgs/applications/audio/exaile/default.nix
+++ b/pkgs/applications/audio/exaile/default.nix
@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub
 , gobject-introspection, makeWrapper, wrapGAppsHook3
 , gtk3, gst_all_1, python3
-, gettext, adwaita-icon-theme, help2man, keybinder3, libnotify, librsvg, streamripper, udisks, webkitgtk
+, gettext, adwaita-icon-theme, help2man, keybinder3, libnotify, librsvg, streamripper, udisks, webkitgtk_4_0
 , iconTheme ? adwaita-icon-theme
 , deviceDetectionSupport ? true
 , documentationSupport ? true
@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
  ++ lib.optional multimediaKeySupport keybinder3
  ++ lib.optional (musicBrainzSupport || cdMetadataSupport) python3.pkgs.musicbrainzngs
  ++ lib.optional podcastSupport python3.pkgs.feedparser
-  ++ lib.optional wikipediaSupport webkitgtk;
+  ++ lib.optional wikipediaSupport webkitgtk_4_0;

  nativeCheckInputs = with python3.pkgs; [
    pytest
--- a/pkgs/applications/audio/plugdata/default.nix
+++ b/pkgs/applications/audio/plugdata/default.nix
@ -8,7 +8,7 @@
 , pkg-config
 , alsa-lib
 , freetype
-, webkitgtk
+, webkitgtk_4_0
 , zenity
 , curl
 , xorg
@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
    alsa-lib
    curl
    freetype
-    webkitgtk
+    webkitgtk_4_0
    xorg.libX11
    xorg.libXcursor
    xorg.libXext
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@ -21,7 +21,7 @@
  libmodplug,
  librsvg,
  libsoup,
-  webkitgtk,
+  webkitgtk_4_0,

  # optional features
  withDbusPython ? false,
@ -90,7 +90,7 @@ python3.pkgs.buildPythonApplication {
      libappindicator-gtk3
      libmodplug
      libsoup
-      webkitgtk
+      webkitgtk_4_0
    ]
    ++ lib.optionals (withXineBackend) [ xine-lib ]
    ++ lib.optionals (withGstreamerBackend) (
--- a/pkgs/applications/audio/rymcast/default.nix
+++ b/pkgs/applications/audio/rymcast/default.nix
@ -1,5 +1,5 @@
 { lib, stdenv, fetchzip, autoPatchelfHook, makeWrapper
-, alsa-lib, curl, gtk3, webkitgtk, zenity }:
+, alsa-lib, curl, gtk3, webkitgtk_4_0, zenity }:

 stdenv.mkDerivation rec {
  pname = "rymcast";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ autoPatchelfHook makeWrapper ];

-  buildInputs = [ alsa-lib curl gtk3 stdenv.cc.cc.lib webkitgtk zenity ];
+  buildInputs = [ alsa-lib curl gtk3 stdenv.cc.cc.lib webkitgtk_4_0 zenity ];

  installPhase = ''
    mkdir -p "$out/bin"
--- a/pkgs/applications/audio/sonobus/default.nix
+++ b/pkgs/applications/audio/sonobus/default.nix
@ -16,7 +16,7 @@
 , libopus
 , curl
 , gtk3
-, webkitgtk
+, webkitgtk_4_0
 }:

 stdenv.mkDerivation (finalAttrs: {
@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
    libopus
    curl
    gtk3
-    webkitgtk
+    webkitgtk_4_0
  ];

  runtimeDependencies = [
--- a/pkgs/applications/audio/tonelib-zoom/default.nix
+++ b/pkgs/applications/audio/tonelib-zoom/default.nix
@ -12,7 +12,7 @@
 , libXrandr
 , libXrender
 , libjack2
-, webkitgtk
+, webkitgtk_4_0
 }:

 stdenv.mkDerivation rec {
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
    alsa-lib
    freetype
    libglvnd
-    webkitgtk
+    webkitgtk_4_0
  ] ++ runtimeDependencies;

  runtimeDependencies = map lib.getLib [
--- a/pkgs/applications/audio/tunefish/default.nix
+++ b/pkgs/applications/audio/tunefish/default.nix
@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, pkg-config, python3
-, alsa-lib, curl, freetype, gtk3, libGL, libX11, libXext, libXinerama, webkitgtk
+, alsa-lib, curl, freetype, gtk3, libGL, libX11, libXext, libXinerama, webkitgtk_4_0
 }:

 stdenv.mkDerivation {
@ -15,7 +15,7 @@ stdenv.mkDerivation {
  };

  nativeBuildInputs = [ pkg-config python3 ];
-  buildInputs = [ alsa-lib curl freetype gtk3 libGL libX11 libXext libXinerama webkitgtk ];
+  buildInputs = [ alsa-lib curl freetype gtk3 libGL libX11 libXext libXinerama webkitgtk_4_0 ];

  postPatch = ''
    patchShebangs src/tunefish4/generate-lv2-ttl.py
--- a/pkgs/applications/audio/vocal/default.nix
+++ b/pkgs/applications/audio/vocal/default.nix
@ -12,7 +12,7 @@
 , glib
 , glib-networking
 , libxml2
-, webkitgtk
+, webkitgtk_4_0
 , clutter-gtk
 , clutter-gst
 , libunity
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
    libunity
    pantheon.granite
    sqlite
-    webkitgtk
+    webkitgtk_4_0
    glib-networking
  ];

--- a/pkgs/applications/blockchains/alfis/default.nix
+++ b/pkgs/applications/blockchains/alfis/default.nix
@ -5,7 +5,7 @@
  fetchFromGitHub,
  pkg-config,
  makeWrapper,
-  webkitgtk,
+  webkitgtk_4_0,
  zenity,
  Cocoa,
  Security,
@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
  ];
  buildInputs =
    lib.optional stdenv.hostPlatform.isDarwin Security
-    ++ lib.optional (withGui && stdenv.hostPlatform.isLinux) webkitgtk
+    ++ lib.optional (withGui && stdenv.hostPlatform.isLinux) webkitgtk_4_0
    ++ lib.optionals (withGui && stdenv.hostPlatform.isDarwin) [
      Cocoa
      WebKit
--- a/pkgs/applications/editors/eclipse/build-eclipse.nix
+++ b/pkgs/applications/editors/eclipse/build-eclipse.nix
@ -1,5 +1,5 @@
 { lib, stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender
-, zlib, jdk, glib, glib-networking, gtk, libXtst, libsecret, gsettings-desktop-schemas, webkitgtk
+, zlib, jdk, glib, glib-networking, gtk, libXtst, libsecret, gsettings-desktop-schemas, webkitgtk_4_0
 , makeWrapper, perl, ... }:

 { name, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description, productVersion }:
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
  buildInputs = [
    fontconfig freetype glib gsettings-desktop-schemas gtk jdk libX11
    libXrender libXtst libsecret zlib
-  ] ++ lib.optional (webkitgtk != null) webkitgtk;
+  ] ++ lib.optional (webkitgtk_4_0 != null) webkitgtk_4_0;

  buildCommand = ''
    # Unpack tarball.
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {

    makeWrapper $out/eclipse/eclipse $out/bin/eclipse \
      --prefix PATH : ${jdk}/bin \
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk libXtst libsecret ] ++ lib.optional (webkitgtk != null) webkitgtk)} \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk libXtst libsecret ] ++ lib.optional (webkitgtk_4_0 != null) webkitgtk_4_0)} \
      --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \
      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
      --add-flags "-configuration \$HOME/.eclipse/''${productId}_${productVersion}/configuration"
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, makeDesktopItem, makeWrapper
 , freetype, fontconfig, libX11, libXrender, zlib
 , glib, gtk3, gtk2, libXtst, jdk, jdk8, gsettings-desktop-schemas
-, webkitgtk ? null  # for internal web browser
+, webkitgtk_4_0 ? null  # for internal web browser
 , buildEnv, runCommand
 , callPackage
 }:
@ -29,7 +29,7 @@ in rec {
  # work around https://bugs.eclipse.org/bugs/show_bug.cgi?id=476075#c3
  buildEclipseUnversioned = callPackage ./build-eclipse.nix {
    inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib
-            jdk glib gtk libXtst gsettings-desktop-schemas webkitgtk
+            jdk glib gtk libXtst gsettings-desktop-schemas webkitgtk_4_0
            makeWrapper;
  };
  buildEclipse = eclipseData: buildEclipseUnversioned (eclipseData // { productVersion = "${platform_major}.${platform_minor}"; });
--- a/pkgs/applications/editors/emacs/make-emacs.nix
+++ b/pkgs/applications/editors/emacs/make-emacs.nix
@ -55,7 +55,7 @@
 , systemd
 , tree-sitter
 , texinfo
-, webkitgtk
+, webkitgtk_4_0
 , wrapGAppsHook3
 , zlib

@ -274,7 +274,7 @@ mkDerivation (finalAttrs: {
  ] ++ lib.optionals withXinput2 [
    libXi
  ] ++ lib.optionals withXwidgets [
-    webkitgtk
+    webkitgtk_4_0
  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
    sigtool
  ] ++ lib.optionals withNS [
--- a/pkgs/applications/editors/formiko/default.nix
+++ b/pkgs/applications/editors/formiko/default.nix
@ -9,7 +9,7 @@
 , gtkspell3
 , librsvg
 , pygobject3
-, webkitgtk
+, webkitgtk_4_0
 }:

 buildPythonApplication rec {
@ -36,7 +36,7 @@ buildPythonApplication rec {
    gtkspell3
    librsvg
    pygobject3
-    webkitgtk
+    webkitgtk_4_0
  ];

  # Needs a display
--- a/pkgs/applications/editors/gnome-inform7/default.nix
+++ b/pkgs/applications/editors/gnome-inform7/default.nix
@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, python3, perl, bison
 , texinfo, desktop-file-utils, wrapGAppsHook3, docbook2x, docbook-xsl-nons
 , inform7, gettext, libossp_uuid, gtk3, gobject-introspection, vala, gtk-doc
-, webkitgtk, gtksourceview3, gspell, libxml2, goocanvas2, libplist, glib
+, webkitgtk_4_0, gtksourceview3, gspell, libxml2, goocanvas2, libplist, glib
 , gst_all_1 }:

 # Neither gnome-inform7 nor its dependencies ratify and chimara have tagged releases in the GTK3 branch yet.
@ -92,7 +92,7 @@ in stdenv.mkDerivation {
    gtk3
    gtksourceview3
    gspell
-    webkitgtk
+    webkitgtk_4_0
    libxml2
    goocanvas2
    libplist
--- a/pkgs/applications/editors/rednotebook/default.nix
+++ b/pkgs/applications/editors/rednotebook/default.nix
@ -1,5 +1,5 @@
 { lib, buildPythonApplication, fetchFromGitHub
-, gdk-pixbuf, glib, gobject-introspection, gtk3, gtksourceview, pango, webkitgtk
+, gdk-pixbuf, glib, gobject-introspection, gtk3, gtksourceview, pango, webkitgtk_4_0
 , pygobject3, pyyaml, setuptools
 }:

@ -23,7 +23,7 @@ buildPythonApplication rec {
  build-system = [ setuptools ];

  propagatedBuildInputs = [
-    gdk-pixbuf glib gtk3 gtksourceview pango webkitgtk
+    gdk-pixbuf glib gtk3 gtksourceview pango webkitgtk_4_0
    pygobject3 pyyaml
  ];

--- a/pkgs/applications/file-managers/xplorer/default.nix
+++ b/pkgs/applications/file-managers/xplorer/default.nix
@ -13,7 +13,7 @@
 , openssl
 , pkg-config
 , rustPlatform
-, webkitgtk
+, webkitgtk_4_0
 }:

 let
@ -74,7 +74,7 @@ rustPlatform.buildRustPackage {
  '';

  nativeBuildInputs = [ cmake pkg-config ];
-  buildInputs = [ dbus openssl freetype libsoup gtk3 webkitgtk ];
+  buildInputs = [ dbus openssl freetype libsoup gtk3 webkitgtk_4_0 ];

  checkFlags = [
    # tries to mutate the parent directory
--- a/pkgs/applications/graphics/gthumb/default.nix
+++ b/pkgs/applications/graphics/gthumb/default.nix
@ -31,7 +31,7 @@
 , python3
 , desktop-file-utils
 , itstool
-, withWebservices ? true, webkitgtk
+, withWebservices ? true, webkitgtk_4_0
 }:

 stdenv.mkDerivation rec {
@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
    libtiff
    libwebp
    libX11
-  ] ++ lib.optional withWebservices webkitgtk;
+  ] ++ lib.optional withWebservices webkitgtk_4_0;

  mesonFlags = [
    "-Dlibchamplain=true"
--- a/pkgs/applications/graphics/komorebi/default.nix
+++ b/pkgs/applications/graphics/komorebi/default.nix
@ -7,7 +7,7 @@
 , glib
 , gtk3
 , libgee
-, webkitgtk
+, webkitgtk_4_0
 , clutter-gtk
 , clutter-gst
 , ninja
@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
    glib
    gtk3
    libgee
-    webkitgtk
+    webkitgtk_4_0
    clutter-gtk
    clutter-gst
  ];
--- a/pkgs/applications/misc/bambu-studio/default.nix
+++ b/pkgs/applications/misc/bambu-studio/default.nix
@ -39,7 +39,7 @@
  pcre,
  systemd,
  tbb_2021_11,
-  webkitgtk,
+  webkitgtk_4_0,
  wxGTK31,
  xorg,
  withSystemd ? stdenv.hostPlatform.isLinux,
@ -110,7 +110,7 @@ stdenv.mkDerivation rec {
    openvdb_tbb_2021_8
    pcre
    tbb_2021_11
-    webkitgtk
+    webkitgtk_4_0
    wxGTK31'
    xorg.libX11
  ] ++ lib.optionals withSystemd [ systemd ] ++ checkInputs;
--- a/pkgs/applications/misc/cheat/default.nix
+++ b/pkgs/applications/misc/cheat/default.nix
@ -16,6 +16,21 @@ buildGoModule rec {

  nativeBuildInputs = [ installShellFiles ];

+  patches = [
+    (builtins.toFile "fix-zsh-completion.patch" ''
+      diff --git a/scripts/cheat.zsh b/scripts/cheat.zsh
+      index befe1b2..675c9f8 100755
+      --- a/scripts/cheat.zsh
+      +++ b/scripts/cheat.zsh
+      @@ -62,4 +62,4 @@ _cheat() {
+         esac
+       }
+
+      -compdef _cheat cheat
+      +_cheat "$@"
+    '')
+  ];
+
  postInstall = ''
    installManPage doc/cheat.1
    installShellCompletion scripts/cheat.{bash,fish,zsh}
--- a/pkgs/applications/misc/holochain-launcher/default.nix
+++ b/pkgs/applications/misc/holochain-launcher/default.nix
@ -4,7 +4,7 @@
 , autoPatchelfHook
 , dpkg
 , openssl
-, webkitgtk
+, webkitgtk_4_0
 , libappindicator
 , wrapGAppsHook3
 , shared-mime-info
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {

  buildInputs = [
    openssl
-    webkitgtk
+    webkitgtk_4_0
    libappindicator

    glib-networking
--- a/pkgs/applications/misc/insulator2/default.nix
+++ b/pkgs/applications/misc/insulator2/default.nix
@ -7,7 +7,7 @@
 , freetype
 , libsoup
 , gtk3
-, webkitgtk
+, webkitgtk_4_0
 , perl
 , cyrus_sasl
 , stdenv
@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
    freetype
    libsoup
    gtk3
-    webkitgtk
+    webkitgtk_4_0
  ];

  meta = with lib; {
--- a/pkgs/applications/misc/lutris/default.nix
+++ b/pkgs/applications/misc/lutris/default.nix
@ -13,7 +13,7 @@
 , gtk3
 , libnotify
 , pango
-, webkitgtk
+, webkitgtk_4_0
 , wrapGAppsHook3

  # check inputs
@ -93,7 +93,7 @@ buildPythonApplication rec {
    gtk3
    libnotify
    pango
-    webkitgtk
+    webkitgtk_4_0
  ] ++ (with gst_all_1; [
    gst-libav
    gst-plugins-bad
--- a/pkgs/applications/misc/lutris/fhsenv.nix
+++ b/pkgs/applications/misc/lutris/fhsenv.nix
@ -7,7 +7,7 @@
 let

  qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ];
-  gnomeDeps = pkgs: with pkgs; [ zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk ];
+  gnomeDeps = pkgs: with pkgs; [ zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk_4_0 ];
  xorgDeps = pkgs: with pkgs.xorg; [
    libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp
    libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite
--- a/pkgs/applications/misc/minigalaxy/default.nix
+++ b/pkgs/applications/misc/minigalaxy/default.nix
@ -9,7 +9,7 @@
 , steam-run
 , substituteAll
 , unzip
-, webkitgtk
+, webkitgtk_4_0
 , wrapGAppsHook3
 }:

@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec {
  pythonPath = [
    python3Packages.pygobject3
    python3Packages.requests
-    webkitgtk
+    webkitgtk_4_0
  ];

  dontWrapGApps = true;
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub, cmake, pkg-config, vala, gtk3, libgee
 , poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, gobject-introspection, wrapGAppsHook3
-, qrencode, webkitgtk, discount, json-glib, fetchpatch }:
+, qrencode, webkitgtk_4_0, discount, json-glib, fetchpatch }:

 stdenv.mkDerivation rec {
  pname = "pdfpc";
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
    (gst-plugins-good.override { gtkSupport = true; })
    gst-libav
    qrencode
-    webkitgtk
+    webkitgtk_4_0
    discount
    json-glib
  ];
--- a/pkgs/applications/misc/pytrainer/default.nix
+++ b/pkgs/applications/misc/pytrainer/default.nix
@ -11,7 +11,7 @@
 , perl
 , sqlite
 , tzdata
-, webkitgtk
+, webkitgtk_4_0
 , wrapGAppsHook3
 , xvfb-run
 }:
@ -54,7 +54,7 @@ in python.pkgs.buildPythonApplication rec {
  buildInputs = [
    sqlite
    gtk3
-    webkitgtk
+    webkitgtk_4_0
    glib-networking
    adwaita-icon-theme
    gdk-pixbuf
--- a/pkgs/applications/misc/skytemple/default.nix
+++ b/pkgs/applications/misc/skytemple/default.nix
@ -3,7 +3,7 @@
 , gobject-introspection
 , gtk3
 , gtksourceview4
-, webkitgtk
+, webkitgtk_4_0
 , wrapGAppsHook3
 , python3Packages
 }:
@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {
    # webkitgtk is used for rendering interactive statistics graph which
    # can be seen by opening a ROM, entering Pokemon section, selecting
    # any Pokemon, and clicking Stats and Moves tab.
-    webkitgtk
+    webkitgtk_4_0
  ];

  nativeBuildInputs = [
--- a/pkgs/applications/misc/ulauncher/default.nix
+++ b/pkgs/applications/misc/ulauncher/default.nix
@ -8,7 +8,7 @@
 , gobject-introspection
 , gtk3
 , wrapGAppsHook3
-, webkitgtk
+, webkitgtk_4_0
 , libnotify
 , keybinder3
 , libappindicator
@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec {
    libappindicator
    libnotify
    librsvg
-    webkitgtk
+    webkitgtk_4_0
    wmctrl
  ];

--- a/pkgs/applications/networking/apache-directory-studio/default.nix
+++ b/pkgs/applications/networking/apache-directory-studio/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, jdk, makeWrapper, autoPatchelfHook, makeDesktopItem, glib, libsecret, webkitgtk }:
+{ lib, stdenv, fetchurl, jdk, makeWrapper, autoPatchelfHook, makeDesktopItem, glib, libsecret, webkitgtk_4_0 }:

 stdenv.mkDerivation rec {
  pname = "apache-directory-studio";
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
    makeWrapper "$dest/ApacheDirectoryStudio" \
        "$out/bin/ApacheDirectoryStudio" \
        --prefix PATH : "${jdk}/bin" \
-        --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ webkitgtk ])}
+        --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ webkitgtk_4_0 ])}
    install -D icon.xpm "$out/share/pixmaps/apache-directory-studio.xpm"
    install -D -t "$out/share/applications" ${desktopItem}/share/applications/*
  '';
--- a/pkgs/applications/networking/browsers/badwolf/default.nix
+++ b/pkgs/applications/networking/browsers/badwolf/default.nix
@ -5,7 +5,7 @@
 , pkg-config
 , ed
 , wrapGAppsHook3
-, webkitgtk
+, webkitgtk_4_0
 , libxml2
 , glib-networking
 , gettext
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    webkitgtk
+    webkitgtk_4_0
    libxml2
    gettext
    glib-networking
--- a/pkgs/applications/networking/browsers/eolie/default.nix
+++ b/pkgs/applications/networking/browsers/eolie/default.nix
@ -1,5 +1,5 @@
 { lib, fetchgit, meson, ninja, pkg-config, nix-update-script
-, python3, gtk3, libsecret, gst_all_1, webkitgtk, glib
+, python3, gtk3, libsecret, gst_all_1, webkitgtk_4_0, glib
 , glib-networking, gtkspell3, hunspell, desktop-file-utils
 , gobject-introspection, wrapGAppsHook3, gnome-settings-daemon }:

@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication rec {
    gtkspell3
    hunspell
    libsecret
-    webkitgtk
+    webkitgtk_4_0
    glib
  ];

--- a/pkgs/applications/networking/browsers/ephemeral/default.nix
+++ b/pkgs/applications/networking/browsers/ephemeral/default.nix
@ -13,7 +13,7 @@
 , pantheon
 , pkg-config
 , python3
-, webkitgtk
+, webkitgtk_4_0
 , wrapGAppsHook3
 , glib-networking
 }:
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
    libdazzle
    libgee
    pantheon.granite
-    webkitgtk
+    webkitgtk_4_0
  ];

  postPatch = ''
--- a/pkgs/applications/networking/browsers/luakit/default.nix
+++ b/pkgs/applications/networking/browsers/luakit/default.nix
@ -10,7 +10,7 @@
 , luafilesystem
 , luajit
 , sqlite
-, webkitgtk
+, webkitgtk_4_0
 }:

 stdenv.mkDerivation rec {
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
    luafilesystem
    luajit
    sqlite
-    webkitgtk
+    webkitgtk_4_0
  ] ++ ( with gst_all_1; [
    gstreamer
    gst-plugins-base
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@ -9,7 +9,7 @@
 , gcr
 , libpeas
 , gtk3
-, webkitgtk
+, webkitgtk_4_0
 , sqlite
 , gsettings-desktop-schemas
 , libsoup
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
    gtk3
    libpeas
    sqlite
-    webkitgtk
+    webkitgtk_4_0
    json-glib
    libarchive
  ];
--- a/pkgs/applications/networking/browsers/nyxt/default.nix
+++ b/pkgs/applications/networking/browsers/nyxt/default.nix
@ -15,7 +15,7 @@
 , gdk-pixbuf
 , cairo
 , pango
-, webkitgtk
+, webkitgtk_4_0
 , openssl
 , gstreamer
 , gst-libav
@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
    cairo
    pango
    gtk3
-    webkitgtk
+    webkitgtk_4_0
    openssl
    libfixposix
  ];
--- a/pkgs/applications/networking/browsers/surf/default.nix
+++ b/pkgs/applications/networking/browsers/surf/default.nix
@ -1,6 +1,6 @@
 { lib, stdenv, fetchgit
 , pkg-config, wrapGAppsHook3
-, glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk
+, glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk_4_0
 , xorg, dmenu, findutils, gnused, coreutils, gst_all_1
 , patches ? null
 }:
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
    gsettings-desktop-schemas
    gtk
    libsoup
-    webkitgtk
+    webkitgtk_4_0
  ] ++ (with gst_all_1; [
    # Audio & video support for webkitgtk WebView
    gstreamer
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
    '';
    homepage = "https://surf.suckless.org";
    license = licenses.mit;
-    platforms = webkitgtk.meta.platforms;
+    platforms = webkitgtk_4_0.meta.platforms;
    maintainers = with maintainers; [ joachifm ];
  };
 }
--- a/pkgs/applications/networking/browsers/vimb/default.nix
+++ b/pkgs/applications/networking/browsers/vimb/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, libsoup, webkitgtk, gtk3, glib-networking
+{ lib, stdenv, fetchFromGitHub, pkg-config, libsoup, webkitgtk_4_0, gtk3, glib-networking
 , gsettings-desktop-schemas, wrapGAppsHook3
 }:

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
  };

  nativeBuildInputs = [ wrapGAppsHook3 pkg-config ];
-  buildInputs = [ gtk3 libsoup webkitgtk glib-networking gsettings-desktop-schemas ];
+  buildInputs = [ gtk3 libsoup webkitgtk_4_0 glib-networking gsettings-desktop-schemas ];

  passthru = {
    inherit gtk3;
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@ -307,6 +307,15 @@
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-ZmOuk2uNnFQzXSfRp6Lz/1bplEm0AuB/M94+dRnqhHU="
  },
+  "deno": {
+    "hash": "sha256-7IvJrhXMeAmf8e21QBdYNSJyVMEzLpat4Tm4zHWglW8=",
+    "homepage": "https://registry.terraform.io/providers/denoland/deno",
+    "owner": "denoland",
+    "repo": "terraform-provider-deno",
+    "rev": "v0.1.0",
+    "spdx": "MPL-2.0",
+    "vendorHash": "sha256-mJXQVfCmW7ssFCrrRSiNb5Vg2QnS9NoBCgZlDDPMoEU="
+  },
  "dexidp": {
    "hash": "sha256-ommpazPlY4dMAOB1pgI7942aGH6YYPn6WtaowucQpZY=",
    "homepage": "https://registry.terraform.io/providers/marcofranssen/dexidp",
--- a/pkgs/applications/networking/feedreaders/newsflash/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix
@ -18,7 +18,7 @@
  libxml2,
  openssl,
  sqlite,
-  webkitgtk,
+  webkitgtk_6_0,
  glib-networking,
  librsvg,
  gst_all_1,
@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
      libxml2
      openssl
      sqlite
-      webkitgtk
+      webkitgtk_6_0

      # TLS support for loading external content in webkitgtk WebView
      glib-networking
--- a/pkgs/applications/networking/geph/default.nix
+++ b/pkgs/applications/networking/geph/default.nix
@ -11,7 +11,7 @@
  perl,
  pkg-config,
  glib,
-  webkitgtk,
+  webkitgtk_4_0,
  libayatana-appindicator,
  cairo,
  openssl,
@ -88,7 +88,7 @@ in

      buildInputs = [
        glib
-        webkitgtk
+        webkitgtk_4_0
        libayatana-appindicator
        cairo
        openssl
--- a/pkgs/applications/networking/giara/default.nix
+++ b/pkgs/applications/networking/giara/default.nix
@ -8,7 +8,7 @@
 , wrapGAppsHook4
 , gtk4
 , gdk-pixbuf
-, webkitgtk
+, webkitgtk_4_0
 , gtksourceview5
 , glib-networking
 , libadwaita
@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec {
  buildInputs = [
    gtk4
    gdk-pixbuf
-    webkitgtk
+    webkitgtk_4_0
    gtksourceview5
    glib-networking
    libadwaita
--- a/pkgs/applications/networking/instant-messengers/trillian-im/default.nix
+++ b/pkgs/applications/networking/instant-messengers/trillian-im/default.nix
@ -16,7 +16,7 @@
 , librsvg
 , libzip
 , openssl
-, webkitgtk
+, webkitgtk_4_0
 , libappindicator-gtk3
 }:

@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
    librsvg
    libzip
    openssl
-    webkitgtk
+    webkitgtk_4_0
    libappindicator-gtk3
  ];

--- a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix
@ -20,7 +20,7 @@
 , pcre
 , pcre2
 , pkg-config
-, webkitgtk
+, webkitgtk_4_0
 , wrapGAppsHook3
 , xorg
 }:
@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
    pcre
    pcre2
    sqlite
-    webkitgtk
+    webkitgtk_4_0
    xorg.libXdmcp
    xorg.libXtst
  ];
--- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
@ -2,22 +2,16 @@

 stdenv.mkDerivation rec {
  pname = "wee-slack";
-  version = "2.10.2";
+  version = "2.11.0";

  src = fetchFromGitHub {
    repo = "wee-slack";
    owner = "wee-slack";
    rev = "v${version}";
-    sha256 = "sha256-EtPhaNFYDxxSrSLXHHnY4ARpRycNNxbg5QPKtnPem04=";
+    sha256 = "sha256-xQO/yi4pJSnO/ldzVQkC7UhAfpy57xzO58NV7KZm4E8=";
  };

  patches = [
-    # Fix for https://github.com/wee-slack/wee-slack/issues/930
-    (fetchpatch {
-      url = "https://github.com/wee-slack/wee-slack/commit/e610b39aee2d9a49d080924d47d96c5d140f66ac.patch";
-      hash = "sha256-+yBZSx0LsoXmTmdN9d3VV2KNzpXfgfNVp4ZqfS4oKzg=";
-    })
-
    (substituteAll {
      src = ./libpath.patch;
      env = "${buildEnv {
--- a/pkgs/applications/networking/mailreaders/astroid/default.nix
+++ b/pkgs/applications/networking/mailreaders/astroid/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, adwaita-icon-theme, gmime3, webkitgtk, ronn
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, adwaita-icon-theme, gmime3, webkitgtk_4_0, ronn
 , libsass, notmuch, boost, wrapGAppsHook3, glib-networking, protobuf
 , gtkmm3, libpeas, gsettings-desktop-schemas, gobject-introspection, python3

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    gtkmm3 gmime3 webkitgtk libsass libpeas
+    gtkmm3 gmime3 webkitgtk_4_0 libsass libpeas
    python3
    notmuch boost gsettings-desktop-schemas adwaita-icon-theme
    glib-networking protobuf
--- a/pkgs/applications/networking/mailreaders/balsa/default.nix
+++ b/pkgs/applications/networking/mailreaders/balsa/default.nix
@ -18,7 +18,7 @@
 , openssl
 , pkg-config
 , sqlite
-, webkitgtk
+, webkitgtk_4_0
 , wrapGAppsHook3
 }:

@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
    libsecret
    openssl
    sqlite
-    webkitgtk
+    webkitgtk_4_0
  ];

  configureFlags = [
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@ -31,7 +31,7 @@
 , enablePluginBsfilter ? true
 , enablePluginClamd ? true
 , enablePluginDillo ? true
-, enablePluginFancy ? true, webkitgtk
+, enablePluginFancy ? true, webkitgtk_4_0
 , enablePluginFetchInfo ? true
 , enablePluginKeywordWarner ? true
 , enablePluginLibravatar ? enablePluginRavatar
@ -67,7 +67,7 @@ let
    { flags = [ "dbus" ]; enabled = enableDbus; deps = [ dbus dbus-glib ]; }
    { flags = [ "dillo-plugin" ]; enabled = enablePluginDillo; }
    { flags = [ "enchant" ]; enabled = enableEnchant; deps = [ enchant ]; }
-    { flags = [ "fancy-plugin" ]; enabled = enablePluginFancy; deps = [ webkitgtk ]; }
+    { flags = [ "fancy-plugin" ]; enabled = enablePluginFancy; deps = [ webkitgtk_4_0 ]; }
    { flags = [ "fetchinfo-plugin" ]; enabled = enablePluginFetchInfo; }
    { flags = [ "keyword_warner-plugin" ]; enabled = enablePluginKeywordWarner; }
    { flags = [ "gnutls" ]; enabled = enableGnuTLS; deps = [ gnutls ]; }
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@ -8,8 +8,8 @@
 , libxml2
 , libxslt
 , sqlite
-, libsoup
-, webkitgtk
+, libsoup_3
+, webkitgtk_4_1
 , json-glib
 , gst_all_1
 , libnotify
@ -42,11 +42,11 @@ stdenv.mkDerivation rec {
  buildInputs = [
    glib
    gtk3
-    webkitgtk
+    webkitgtk_4_1
    libxml2
    libxslt
    sqlite
-    libsoup
+    libsoup_3
    libpeas
    gsettings-desktop-schemas
    json-glib
--- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
@ -1,5 +1,5 @@
 { lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook3, which, more
-, file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk, gtk2-x11, gtk3
+, file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk_4_0, gtk2-x11, gtk3
 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2
 , gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2
 , libjpeg, libredirect, tzdata, cacert, systemd, libcxx, symlinkJoin
@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
    gdk-pixbuf
    gnome2.gtkglext
    glib-networking
-    webkitgtk
+    webkitgtk_4_0
    gtk2
    gtk2-x11
    gtk3
--- a/pkgs/applications/networking/weather/meteo/default.nix
+++ b/pkgs/applications/networking/weather/meteo/default.nix
@ -16,7 +16,7 @@
 , json-glib
 , libappindicator
 , libsoup
-, webkitgtk
+, webkitgtk_4_0
 }:

 stdenv.mkDerivation rec {
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
    json-glib
    libappindicator
    libsoup
-    webkitgtk
+    webkitgtk_4_0
  ];

  postPatch = ''
--- a/pkgs/applications/office/bookworm/default.nix
+++ b/pkgs/applications/office/bookworm/default.nix
@ -23,7 +23,7 @@
 , unar
 , unzip
 , vala
-, webkitgtk
+, webkitgtk_4_0
 , wrapGAppsHook3
 }:

@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
    poppler
    python3
    sqlite
-    webkitgtk
+    webkitgtk_4_0
  ];

  postPatch = ''
--- a/pkgs/applications/office/notes-up/default.nix
+++ b/pkgs/applications/office/notes-up/default.nix
@ -17,7 +17,7 @@
 , libgee
 , pantheon
 , sqlite
-, webkitgtk
+, webkitgtk_4_0
 }:

 stdenv.mkDerivation rec {
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
    libgee
    pantheon.granite
    sqlite
-    webkitgtk
+    webkitgtk_4_0
  ];

  postPatch = ''
--- a/pkgs/applications/office/osmo/default.nix
+++ b/pkgs/applications/office/osmo/default.nix
@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, pkg-config, gtk3, libxml2, gettext, libical, libnotify
-, libarchive, gspell, webkitgtk, libgringotts, wrapGAppsHook3 }:
+, libarchive, gspell, webkitgtk_4_0, libgringotts, wrapGAppsHook3 }:

 stdenv.mkDerivation rec {
  pname = "osmo";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ pkg-config gettext wrapGAppsHook3 ];
  buildInputs = [ gtk3 libxml2 libical libnotify libarchive
-    gspell webkitgtk libgringotts ];
+    gspell webkitgtk_4_0 libgringotts ];

  meta = with lib; {
    description = "Handy personal organizer";
--- a/pkgs/applications/science/math/nasc/default.nix
+++ b/pkgs/applications/science/math/nasc/default.nix
@ -11,7 +11,7 @@
 , gtksourceview
 , libgee
 , nix-update-script
-, webkitgtk
+, webkitgtk_4_0
 , libqalculate
 , intltool
 , gnuplot
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
    gtksourceview
    libgee
    pantheon.granite
-    webkitgtk
+    webkitgtk_4_0
    # We add libqalculate's runtime dependencies because nasc has it as a modified subproject.
  ] ++ libqalculate.buildInputs ++ libqalculate.propagatedBuildInputs;

--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@ -1,54 +0,0 @@
-{ lib, buildGoModule, fetchFromGitHub, makeWrapper
-, git, bash, gzip, openssh, pam
-, sqliteSupport ? true
-, pamSupport ? true
-}:
-
-buildGoModule rec {
-  pname = "gogs";
-  version = "0.13.0";
-
-  src = fetchFromGitHub {
-    owner = "gogs";
-    repo = "gogs";
-    rev = "v${version}";
-    sha256 = "sha256-UfxE+NaqDr3XUXpvlV989Iwjq/lsAwpMTDAPkcOmma8=";
-  };
-
-  vendorHash = "sha256-ISJOEJ1DWO4nnMpDuZ36Nq528LhgekDh3XUF8adlj2w=";
-
-  subPackages = [ "." ];
-
-  postPatch = ''
-    patchShebangs .
-  '';
-
-  nativeBuildInputs = [ makeWrapper openssh ];
-
-  buildInputs = lib.optional pamSupport pam;
-
-  tags =
-    (  lib.optional sqliteSupport "sqlite"
-    ++ lib.optional pamSupport "pam");
-
-  postInstall = ''
-
-    wrapProgram $out/bin/gogs \
-      --prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]}
-  '';
-
-  meta = with lib; {
-    description = "Painless self-hosted Git service";
-    homepage = "https://gogs.io";
-    license = licenses.mit;
-    maintainers = [ maintainers.schneefux ];
-    mainProgram = "gogs";
-    knownVulnerabilities = [ ''
-      Gogs has known unpatched vulnerabilities and upstream maintainers appears to be unresponsive.
-
-      More information can be found in forgejo's blogpost: https://forgejo.org/2023-11-release-v1-20-5-1/
-
-      You might want to consider migrating to Gitea or forgejo.
-    '' ];
-  };
-}
--- a/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix
@ -2,7 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , obs-studio
-, webkitgtk
+, webkitgtk_4_0
 , glib-networking
 , meson
 , cmake
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {

  buildInputs = [
    obs-studio
-    webkitgtk
+    webkitgtk_4_0
    glib-networking
  ];

--- a/pkgs/by-name/ae/aerospace/package.nix
+++ b/pkgs/by-name/ae/aerospace/package.nix
@ -0,0 +1,58 @@
+{
+  fetchzip,
+  gitUpdater,
+  installShellFiles,
+  lib,
+  stdenv,
+  versionCheckHook,
+}:
+
+let
+  appName = "AeroSpace.app";
+  version = "0.14.2-Beta";
+in
+stdenv.mkDerivation {
+  pname = "aerospace";
+
+  inherit version;
+
+  src = fetchzip {
+    url = "https://github.com/nikitabobko/AeroSpace/releases/download/v${version}/AeroSpace-v${version}.zip";
+    hash = "sha256-v2D/IV9Va0zbGHEwSGt6jvDqQYqha290Lm6u+nZTS3A=";
+  };
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/Applications
+    mv ${appName} $out/Applications
+    cp -R bin $out
+    mkdir -p $out/share
+    runHook postInstall
+  '';
+
+  postInstall = ''
+    installManPage manpage/*
+    installShellCompletion --bash shell-completion/bash/aerospace
+    installShellCompletion --fish shell-completion/fish/aerospace.fish
+    installShellCompletion --zsh  shell-completion/zsh/_aerospace
+  '';
+
+  passthru.tests.can-print-version = [ versionCheckHook ];
+
+  passthru.updateScript = gitUpdater {
+    url = "https://github.com/nikitabobko/AeroSpace.git";
+    rev-prefix = "v";
+  };
+
+  meta = {
+    license = lib.licenses.mit;
+    mainProgram = "aerospace";
+    homepage = "https://github.com/nikitabobko/AeroSpace";
+    description = "i3-like tiling window manager for macOS";
+    platforms = lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ alexandru0-dev ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+  };
+}
--- a/pkgs/by-name/ai/aider-chat/package.nix
+++ b/pkgs/by-name/ai/aider-chat/package.nix
@ -12,7 +12,7 @@ let
    self = python3;
    packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; };
  };
-  version = "0.57.0";
+  version = "0.59.0";
 in
 python3.pkgs.buildPythonApplication {
  pname = "aider-chat";
@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication {
    owner = "paul-gauthier";
    repo = "aider";
    rev = "refs/tags/v${version}";
-    hash = "sha256-ErDepSju8B4GochHKxL03aUfOLAiNfTaXBAllAZ144M=";
+    hash = "sha256-20LicYj1j5gGzhF+SxPUKu858nHZgwDF1JxXeHRtYe0=";
  };

  pythonRelaxDeps = true;
@ -68,6 +68,7 @@ python3.pkgs.buildPythonApplication {
      streamlit
      tokenizers
      watchdog
+      pydub
    ]
    ++ lib.optionals (!tensorflow.meta.broken) [
      llama-index-core
--- a/pkgs/by-name/am/am2rlauncher/package.nix
+++ b/pkgs/by-name/am/am2rlauncher/package.nix
@ -4,7 +4,7 @@
 , glibc
 , gtk3
 , libappindicator
-, webkitgtk
+, webkitgtk_4_0
 , e2fsprogs
 , libnotify
 , libgit2
@ -63,7 +63,7 @@ buildDotnetModule {
    glibc
    gtk3
    libappindicator
-    webkitgtk
+    webkitgtk_4_0
    e2fsprogs
    libnotify
    libgit2
--- a/pkgs/by-name/ap/apvlv/package.nix
+++ b/pkgs/by-name/ap/apvlv/package.nix
@ -20,7 +20,7 @@
  poppler,
  stdenv,
  testers,
-  webkitgtk,
+  webkitgtk_4_0,
  wrapGAppsHook3,
 }:

@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
    libxshmfence # otherwise warnings in compilation
    pcre
    poppler
-    webkitgtk
+    webkitgtk_4_0
  ];

  installPhase = ''
--- a/pkgs/by-name/ar/arti/package.nix
+++ b/pkgs/by-name/ar/arti/package.nix
@ -11,7 +11,7 @@

 rustPlatform.buildRustPackage rec {
  pname = "arti";
-  version = "1.2.7";
+  version = "1.2.8";

  src = fetchFromGitLab {
    domain = "gitlab.torproject.org";
@ -19,10 +19,10 @@ rustPlatform.buildRustPackage rec {
    owner = "core";
    repo = "arti";
    rev = "arti-v${version}";
-    hash = "sha256-lyko4xwTn03/Es8icOx8GIrjC4XDXvZPDYHYILw8Opo=";
+    hash = "sha256-vw/hebZ23Pk+hQx3YN9iXsKWq20fqpwp91E2tul8zmA=";
  };

-  cargoHash = "sha256-I45SaawWAK7iTZDFhJT4YVO439D/3NmWLp3FtFmhLC0=";
+  cargoHash = "sha256-4F+0KEVoeppNQ26QQ+a2CSIbrklE8NY3+OK11I5JstA=";

  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];

@ -47,8 +47,7 @@ rustPlatform.buildRustPackage rec {
  ];

  checkFlags = [
-    # problematic tests that were fixed after the release
-    "--skip=reload_cfg::test::watch_single_file"
+    # problematic test that hangs the build
    "--skip=reload_cfg::test::watch_multiple"
  ];

--- a/pkgs/by-name/aw/aws-workspaces/package.nix
+++ b/pkgs/by-name/aw/aws-workspaces/package.nix
@ -11,7 +11,7 @@
 , gtk3
 , openssl_1_1
 , icu70
-, webkitgtk
+, webkitgtk_4_0
 , librsvg
 , gdk-pixbuf
 , libsoup
@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
    gtk3
    openssl_1_1.out
    icu70
-    webkitgtk
+    webkitgtk_4_0
    librsvg
    gdk-pixbuf
    libsoup
--- a/pkgs/by-name/ca/cargo-tauri/package.nix
+++ b/pkgs/by-name/ca/cargo-tauri/package.nix
@ -9,7 +9,7 @@
  libsoup,
  openssl,
  pkg-config,
-  webkitgtk,
+  webkitgtk_4_0,
 }:

 rustPlatform.buildRustPackage rec {
@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
    ++ lib.optionals stdenv.hostPlatform.isLinux [
      gtk3
      libsoup
-      webkitgtk
+      webkitgtk_4_0
    ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin (
      with darwin.apple_sdk.frameworks;
--- a/pkgs/by-name/ca/cargo-tauri/test-app.nix
+++ b/pkgs/by-name/ca/cargo-tauri/test-app.nix
@ -8,7 +8,7 @@
  libsoup,
  openssl,
  pkg-config,
-  webkitgtk,
+  webkitgtk_4_0,
  wrapGAppsHook3,
 }:

@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
    ++ lib.optionals stdenv.isLinux [
      glib-networking
      libsoup
-      webkitgtk
+      webkitgtk_4_0
    ]
    ++ lib.optionals stdenv.isDarwin (
      with darwin.apple_sdk.frameworks;
--- a/pkgs/by-name/ca/catppuccinifier-gui/package.nix
+++ b/pkgs/by-name/ca/catppuccinifier-gui/package.nix
@ -11,7 +11,7 @@
  libsoup,
  fetchzip,
  openssl_3,
-  webkitgtk,
+  webkitgtk_4_0,
  gdk-pixbuf,
  pkg-config,
  makeDesktopItem,
@ -39,7 +39,7 @@ stdenv.mkDerivation {
  buildInputs = [
    curl
    wget
-    webkitgtk
+    webkitgtk_4_0
    gtk3
    cairo
    gdk-pixbuf
--- a/pkgs/by-name/ch/chow-kick/package.nix
+++ b/pkgs/by-name/ch/chow-kick/package.nix
@ -32,7 +32,7 @@
 , sqlite
 , stdenv
 , util-linuxMinimal
-, webkitgtk
+, webkitgtk_4_0
 }:

 stdenv.mkDerivation (finalAttrs: {
@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
    python3
    sqlite
    util-linuxMinimal
-    webkitgtk
+    webkitgtk_4_0
  ];

  cmakeFlags = [
--- a/pkgs/by-name/ch/chow-tape-model/package.nix
+++ b/pkgs/by-name/ch/chow-tape-model/package.nix
@ -32,7 +32,7 @@
 , python3
 , sqlite
 , gcc11Stdenv
-, webkitgtk
+, webkitgtk_4_0
 }:
 let
  # JUCE version in submodules is incompatible with GCC12
@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
    pcre2
    python3
    sqlite
-    webkitgtk
+    webkitgtk_4_0
  ];

  # Link-time-optimization fails without these
--- a/pkgs/by-name/ci/cinny-desktop/package.nix
+++ b/pkgs/by-name/ci/cinny-desktop/package.nix
@ -14,7 +14,7 @@
  glib,
  glib-networking,
  libayatana-appindicator,
-  webkitgtk,
+  webkitgtk_4_0,
 }:

 rustPlatform.buildRustPackage rec {
@ -84,7 +84,7 @@ rustPlatform.buildRustPackage rec {
    ++ lib.optionals stdenv.hostPlatform.isLinux [
      glib-networking
      libayatana-appindicator
-      webkitgtk
+      webkitgtk_4_0
    ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin [
      darwin.DarwinTools
--- a/pkgs/by-name/cl/clash-verge-rev/service.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/service.nix
@ -5,7 +5,7 @@
  pkg-config,
  openssl,
  pname,
-  webkitgtk,
+  webkitgtk_4_0,
  service-cargo-hash,
  meta,
 }:
@ -23,7 +23,7 @@ rustPlatform.buildRustPackage {

  buildInputs = [
    openssl
-    webkitgtk
+    webkitgtk_4_0
  ];

  env = {
--- a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
@ -9,7 +9,7 @@
  rustPlatform,
  makeDesktopItem,
  meta,
-  webkitgtk,
+  webkitgtk_4_0,
  openssl,
 }:
 rustPlatform.buildRustPackage {
@ -44,7 +44,7 @@ rustPlatform.buildRustPackage {

  buildInputs = [
    openssl
-    webkitgtk
+    webkitgtk_4_0
  ];

  postInstall = ''
--- a/pkgs/by-name/db/dbeaver-bin/package.nix
+++ b/pkgs/by-name/db/dbeaver-bin/package.nix
@ -11,7 +11,7 @@
  gtk3,
  swt,
  glib,
-  webkitgtk,
+  webkitgtk_4_0,
  glib-networking,
 }:

@ -72,7 +72,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
              swt
              gtk3
              glib
-              webkitgtk
+              webkitgtk_4_0
              glib-networking
            ]
          }"
--- a/pkgs/by-name/de/desktop-postflop/package.nix
+++ b/pkgs/by-name/de/desktop-postflop/package.nix
@ -7,7 +7,7 @@
 , pkg-config
 , gtk3
 , libsoup
-, webkitgtk
+, webkitgtk_4_0
 }:

 rustPlatform.buildRustPackage rec {
@ -58,7 +58,7 @@ rustPlatform.buildRustPackage rec {
  buildInputs = [
    gtk3
    libsoup
-    webkitgtk
+    webkitgtk_4_0
  ];

  postInstall = ''
--- a/pkgs/by-name/do/dorion/package.nix
+++ b/pkgs/by-name/do/dorion/package.nix
@ -7,7 +7,7 @@
 , gst_all_1
 , libappindicator
 , libayatana-appindicator
-, webkitgtk
+, webkitgtk_4_0
 , wrapGAppsHook3
 }:

@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
    gst_all_1.gst-plugins-bad
    gst_all_1.gst-plugins-base
    gst_all_1.gst-plugins-good
-    webkitgtk
+    webkitgtk_4_0
  ];

  installPhase = ''
--- a/pkgs/by-name/en/en-croissant/package.nix
+++ b/pkgs/by-name/en/en-croissant/package.nix
@ -14,7 +14,7 @@

  openssl,
  libsoup,
-  webkitgtk,
+  webkitgtk_4_0,
  gst_all_1,
  darwin,
 }:
@ -66,7 +66,7 @@ buildRustPackage rec {
    lib.optionals stdenv.hostPlatform.isLinux [
      openssl
      libsoup
-      webkitgtk
+      webkitgtk_4_0
      gst_all_1.gstreamer
      gst_all_1.gst-plugins-base
      gst_all_1.gst-plugins-bad
--- a/pkgs/by-name/en/ente-auth/package.nix
+++ b/pkgs/by-name/en/ente-auth/package.nix
@ -2,7 +2,7 @@
  lib,
  flutter324,
  fetchFromGitHub,
-  webkitgtk,
+  webkitgtk_4_0,
  sqlite,
  libayatana-appindicator,
  makeDesktopItem,
@ -52,7 +52,7 @@ flutter324.buildFlutterApplication rec {
  ];

  buildInputs = [
-    webkitgtk
+    webkitgtk_4_0
    sqlite
    libayatana-appindicator
  ];
--- a/pkgs/by-name/fo/font-manager/package.nix
+++ b/pkgs/by-name/fo/font-manager/package.nix
@ -20,7 +20,7 @@
 , wrapGAppsHook4
 , gobject-introspection
 # withWebkit enables the "webkit" feature, also known as Google Fonts
-, withWebkit ? true, glib-networking, libsoup, webkitgtk
+, withWebkit ? true, glib-networking, libsoup_3, webkitgtk_6_0
 }:

 stdenv.mkDerivation rec {
@ -58,8 +58,8 @@ stdenv.mkDerivation rec {
    adwaita-icon-theme
  ] ++ lib.optionals withWebkit [
    glib-networking # for SSL so that Google Fonts can load
-    libsoup
-    webkitgtk
+    libsoup_3
+    webkitgtk_6_0
  ];

  mesonFlags = [
--- a/pkgs/by-name/gi/gitbutler/package.nix
+++ b/pkgs/by-name/gi/gitbutler/package.nix
@ -19,7 +19,7 @@
  moreutils,
  openssl,
  rust,
-  webkitgtk,
+  webkitgtk_4_0,
  nix-update-script,
  cacert,
 }:
@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec {
    ++ lib.optionals stdenv.hostPlatform.isLinux [
      glib-networking
      libsoup
-      webkitgtk
+      webkitgtk_4_0
    ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin (
      with darwin.apple_sdk.frameworks;
--- a/pkgs/by-name/gn/gnome-notes/package.nix
+++ b/pkgs/by-name/gn/gnome-notes/package.nix
@ -19,7 +19,7 @@
  libuuid,
  curl,
  libhandy,
-  webkitgtk,
+  webkitgtk_4_0,
  gnome,
  adwaita-icon-theme,
  libxml2,
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
    libuuid
    curl
    libhandy
-    webkitgtk
+    webkitgtk_4_0
    tracker
    gnome-online-accounts
    gsettings-desktop-schemas
--- a/pkgs/by-name/gn/gnucash/package.nix
+++ b/pkgs/by-name/gn/gnucash/package.nix
@ -22,7 +22,7 @@
 , perlPackages
 , pkg-config
 , swig
-, webkitgtk
+, webkitgtk_4_0
 , wrapGAppsHook3
 }:

@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
    libxml2
    libxslt
    swig
-    webkitgtk
+    webkitgtk_4_0
  ]
  ++ (with perlPackages; [
    JSONParse
--- a/pkgs/by-name/go/gomanagedocker/package.nix
+++ b/pkgs/by-name/go/gomanagedocker/package.nix
@ -0,0 +1,41 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  stdenv,
+  darwin,
+  xorg,
+}:
+let
+  version = "1.4";
+in
+buildGoModule {
+  pname = "gomanagedocker";
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "ajayd-san";
+    repo = "gomanagedocker";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-oM0DCOHdVPJFWgmHF8yeGGo6XvuTCXar7NebM1obahg=";
+  };
+
+  vendorHash = "sha256-M/jfQWCBrv7hZm450yLBmcjWtNSCziKOpfipxI6U9ak=";
+
+  buildInputs =
+    lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]
+    ++ lib.optionals stdenv.isLinux [ xorg.libX11 ];
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  meta = {
+    description = "TUI tool to manage your docker images, containers and volumes";
+    homepage = "https://github.com/ajayd-san/gomanagedocker";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ genga898 ];
+    mainProgram = "gomanagedocker";
+  };
+}
--- a/pkgs/by-name/gp/gpauth/package.nix
+++ b/pkgs/by-name/gp/gpauth/package.nix
@ -6,7 +6,7 @@
  openssl,
  pkg-config,
  perl,
-  webkitgtk,
+  webkitgtk_4_0,
 }:

 rustPlatform.buildRustPackage rec {
@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
  buildInputs = [
    libsoup
    openssl
-    webkitgtk
+    webkitgtk_4_0
  ];

  meta = with lib; {
--- a/pkgs/by-name/he/headphones-toolbox/package.nix
+++ b/pkgs/by-name/he/headphones-toolbox/package.nix
@ -3,7 +3,7 @@
 , dpkg
 , fetchurl
 , autoPatchelfHook
-, webkitgtk
+, webkitgtk_4_0
 }:

 stdenv.mkDerivation (finalAttrs: {
@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  buildInputs = [
-    webkitgtk
+    webkitgtk_4_0
  ];

  installPhase = ''
--- a/pkgs/by-name/in/intune-portal/package.nix
+++ b/pkgs/by-name/in/intune-portal/package.nix
@ -7,7 +7,7 @@
 , curlMinimal
 , openssl
 , libsecret
-, webkitgtk
+, webkitgtk_4_0
 , libsoup
 , gtk3
 , atk
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
          curlMinimal
          openssl
          libsecret
-          webkitgtk
+          webkitgtk_4_0
          libsoup
          gtk3
          atk
--- a/pkgs/by-name/ki/kiwitalk/package.nix
+++ b/pkgs/by-name/ki/kiwitalk/package.nix
@ -8,7 +8,7 @@
 , desktop-file-utils
 , openssl
 , libayatana-appindicator
-, webkitgtk
+, webkitgtk_4_0
 , pkg-config
 , pnpm
 , nodejs
@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
  buildInputs = [
    openssl
    libayatana-appindicator
-    webkitgtk
+    webkitgtk_4_0
  ];

  postInstall = lib.optionalString stdenv.isLinux ''
--- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
+++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl }:

 let
-  version = "30+20230519-1ubuntu3"; # mantic 2023-08-26
+  version = "31+20240202-2ubuntu8"; # Oriole 2024-10-03

 in stdenv.mkDerivation {
  pname = "kmod-blacklist";
@ -9,7 +9,7 @@ in stdenv.mkDerivation {

  src = fetchurl {
    url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_${version}.debian.tar.xz";
-    hash = "sha256-VGw1/rUjl9/j6026ut0dvC0/8maAAz8umb0D3YGf8p4=";
+    hash = "sha256-i4XdCRedZIzMBbZL305enz8OAso3X14pdzNIITqK5hE=";
  };

  installPhase = ''
--- a/pkgs/by-name/lr/lrcget/package.nix
+++ b/pkgs/by-name/lr/lrcget/package.nix
@ -2,7 +2,7 @@
  dbus,
  openssl,
  gtk3,
-  webkitgtk,
+  webkitgtk_4_0,
  pkg-config,
  wrapGAppsHook3,
  fetchFromGitHub,
@ -70,7 +70,7 @@ rustPlatform.buildRustPackage rec {
      gtk3
    ]
    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      webkitgtk
+      webkitgtk_4_0
      alsa-lib
    ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin [
--- a/pkgs/by-name/me/metacubexd/package.nix
+++ b/pkgs/by-name/me/metacubexd/package.nix
@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "metacubexd";
-  version = "1.150.0";
+  version = "1.151.0";

  src = fetchFromGitHub {
    owner = "MetaCubeX";
    repo = "metacubexd";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-UItmZmrcCSO7705TzEO80IVGSsCrDjm9Apw17XAQ9jY=";
+    hash = "sha256-H6zMEicE9RT84NJmmcihw46TDOSE0HhUoIRIrpNxM+c=";
  };

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

  pnpmDeps = pnpm.fetchDeps {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-jIotwZmFzzv3jN4iXV4aonxnVDuIGzxNH8RGD0r7t0c=";
+    hash = "sha256-XwIcwvTcB4vO5tqJ/jdqgkTrkmN3H0e3q5eDNOvUrcA=";
  };

  buildPhase = ''
--- a/pkgs/by-name/mi/mihomo-party/package.nix
+++ b/pkgs/by-name/mi/mihomo-party/package.nix
@ -9,7 +9,7 @@
  nspr,
  alsa-lib,
  openssl,
-  webkitgtk,
+  webkitgtk_4_0,
  udev,
  libayatana-appindicator,
  libGL,
@ -36,7 +36,7 @@ stdenv.mkDerivation {
    nspr
    alsa-lib
    openssl
-    webkitgtk
+    webkitgtk_4_0
    stdenv.cc.cc.lib
  ];

--- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
+++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
@ -19,7 +19,7 @@
  nodejs,
  openssl,
  pkg-config,
-  webkitgtk,
+  webkitgtk_4_0,
 }:
 rustPlatform.buildRustPackage {
  pname = "modrinth-app-unwrapped";
@ -87,7 +87,7 @@ rustPlatform.buildRustPackage {
    [ openssl ]
    ++ lib.optionals stdenv.hostPlatform.isLinux [
      libsoup
-      webkitgtk
+      webkitgtk_4_0
    ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin (
      with darwin.apple_sdk.frameworks;
--- a/pkgs/by-name/mo/mouse-actions-gui/package.nix
+++ b/pkgs/by-name/mo/mouse-actions-gui/package.nix
@ -18,7 +18,7 @@
  libevdev,
  gtk3,
  libsoup,
-  webkitgtk,
+  webkitgtk_4_0,
 }:

 stdenv.mkDerivation (finalAttrs: {
@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
    # Tauri deps
    gtk3
    libsoup
-    webkitgtk
+    webkitgtk_4_0
  ];

  npmDeps = fetchNpmDeps {
--- a/pkgs/by-name/ne/nextjs-ollama-llm-ui/0001-update-nextjs.patch
+++ b/pkgs/by-name/ne/nextjs-ollama-llm-ui/0001-update-nextjs.patch
@ -1,879 +0,0 @@
-diff --git a/package-lock.json b/package-lock.json
-index 11dfbf6..b9470d0 100644
--- a/package-lock.json
-+++ b/package-lock.json
-@@ -30,7 +30,7 @@
-         "framer-motion": "^11.0.3",
-         "langchain": "^0.1.13",
-         "lucide-react": "^0.322.0",
-        "next": "14.1.0",
-+        "next": "^14.2.3",
-         "next-themes": "^0.2.1",
-         "react": "^18",
-         "react-code-blocks": "^0.1.6",
-@@ -40,6 +40,7 @@
-         "react-resizable-panels": "^2.0.3",
-         "react-textarea-autosize": "^8.5.3",
-         "remark-gfm": "^4.0.0",
-+        "sharp": "^0.33.4",
-         "sonner": "^1.4.0",
-         "tailwind-merge": "^2.2.1",
-         "tailwindcss-animate": "^1.0.7",
-@@ -139,6 +140,15 @@
-         "node": ">=6.9.0"
-       }
-     },
-+    "node_modules/@emnapi/runtime": {
-+      "version": "1.1.1",
-+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.1.1.tgz",
-+      "integrity": "sha512-3bfqkzuR1KLx57nZfjr2NLnFOobvyS0aTszaEGCGqmYMVDRaGvgIZbjGSV/MHSSmLgQ/b9JFHQ5xm5WRZYd+XQ==",
-+      "optional": true,
-+      "dependencies": {
-+        "tslib": "^2.4.0"
-+      }
-+    },
-     "node_modules/@emoji-mart/data": {
-       "version": "1.1.2",
-       "resolved": "https://registry.npmjs.org/@emoji-mart/data/-/data-1.1.2.tgz",
-@@ -304,6 +314,437 @@
-       "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==",
-       "dev": true
-     },
-+    "node_modules/@img/sharp-darwin-arm64": {
-+      "version": "0.33.4",
-+      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.4.tgz",
-+      "integrity": "sha512-p0suNqXufJs9t3RqLBO6vvrgr5OhgbWp76s5gTRvdmxmuv9E1rcaqGUsl3l4mKVmXPkTkTErXediAui4x+8PSA==",
-+      "cpu": [
-+        "arm64"
-+      ],
-+      "optional": true,
-+      "os": [
-+        "darwin"
-+      ],
-+      "engines": {
-+        "glibc": ">=2.26",
-+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
-+        "npm": ">=9.6.5",
-+        "pnpm": ">=7.1.0",
-+        "yarn": ">=3.2.0"
-+      },
-+      "funding": {
-+        "url": "https://opencollective.com/libvips"
-+      },
-+      "optionalDependencies": {
-+        "@img/sharp-libvips-darwin-arm64": "1.0.2"
-+      }
-+    },
-+    "node_modules/@img/sharp-darwin-x64": {
-+      "version": "0.33.4",
-+      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.4.tgz",
-+      "integrity": "sha512-0l7yRObwtTi82Z6ebVI2PnHT8EB2NxBgpK2MiKJZJ7cz32R4lxd001ecMhzzsZig3Yv9oclvqqdV93jo9hy+Dw==",
-+      "cpu": [
-+        "x64"
-+      ],
-+      "optional": true,
-+      "os": [
-+        "darwin"
-+      ],
-+      "engines": {
-+        "glibc": ">=2.26",
-+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
-+        "npm": ">=9.6.5",
-+        "pnpm": ">=7.1.0",
-+        "yarn": ">=3.2.0"
-+      },
-+      "funding": {
-+        "url": "https://opencollective.com/libvips"
-+      },
-+      "optionalDependencies": {
-+        "@img/sharp-libvips-darwin-x64": "1.0.2"
-+      }
-+    },
-+    "node_modules/@img/sharp-libvips-darwin-arm64": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.2.tgz",
-+      "integrity": "sha512-tcK/41Rq8IKlSaKRCCAuuY3lDJjQnYIW1UXU1kxcEKrfL8WR7N6+rzNoOxoQRJWTAECuKwgAHnPvqXGN8XfkHA==",
-+      "cpu": [
-+        "arm64"
-+      ],
-+      "optional": true,
-+      "os": [
-+        "darwin"
-+      ],
-+      "engines": {
-+        "macos": ">=11",
-+        "npm": ">=9.6.5",
-+        "pnpm": ">=7.1.0",
-+        "yarn": ">=3.2.0"
-+      },
-+      "funding": {
-+        "url": "https://opencollective.com/libvips"
-+      }
-+    },
-+    "node_modules/@img/sharp-libvips-darwin-x64": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.2.tgz",
-+      "integrity": "sha512-Ofw+7oaWa0HiiMiKWqqaZbaYV3/UGL2wAPeLuJTx+9cXpCRdvQhCLG0IH8YGwM0yGWGLpsF4Su9vM1o6aer+Fw==",
-+      "cpu": [
-+        "x64"
-+      ],
-+      "optional": true,
-+      "os": [
-+        "darwin"
-+      ],
-+      "engines": {
-+        "macos": ">=10.13",
-+        "npm": ">=9.6.5",
-+        "pnpm": ">=7.1.0",
-+        "yarn": ">=3.2.0"
-+      },
-+      "funding": {
-+        "url": "https://opencollective.com/libvips"
-+      }
-+    },
-+    "node_modules/@img/sharp-libvips-linux-arm": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.2.tgz",
-+      "integrity": "sha512-iLWCvrKgeFoglQxdEwzu1eQV04o8YeYGFXtfWU26Zr2wWT3q3MTzC+QTCO3ZQfWd3doKHT4Pm2kRmLbupT+sZw==",
-+      "cpu": [
-+        "arm"
-+      ],
-+      "optional": true,
-+      "os": [
-+        "linux"
-+      ],
-+      "engines": {
-+        "glibc": ">=2.28",
-+        "npm": ">=9.6.5",
-+        "pnpm": ">=7.1.0",
-+        "yarn": ">=3.2.0"
-+      },
-+      "funding": {
-+        "url": "https://opencollective.com/libvips"
-+      }
-+    },
-+    "node_modules/@img/sharp-libvips-linux-arm64": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.2.tgz",
-+      "integrity": "sha512-x7kCt3N00ofFmmkkdshwj3vGPCnmiDh7Gwnd4nUwZln2YjqPxV1NlTyZOvoDWdKQVDL911487HOueBvrpflagw==",
-+      "cpu": [
-+        "arm64"
-+      ],
-+      "optional": true,
-+      "os": [
-+        "linux"
-+      ],
-+      "engines": {
-+        "glibc": ">=2.26",
-+        "npm": ">=9.6.5",
-+        "pnpm": ">=7.1.0",
-+        "yarn": ">=3.2.0"
-+      },
-+      "funding": {
-+        "url": "https://opencollective.com/libvips"
-+      }
-+    },
-+    "node_modules/@img/sharp-libvips-linux-s390x": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.0.2.tgz",
-+      "integrity": "sha512-cmhQ1J4qVhfmS6szYW7RT+gLJq9dH2i4maq+qyXayUSn9/3iY2ZeWpbAgSpSVbV2E1JUL2Gg7pwnYQ1h8rQIog==",
-+      "cpu": [
-+        "s390x"
-+      ],
-+      "optional": true,
-+      "os": [
-+        "linux"
-+      ],
-+      "engines": {
-+        "glibc": ">=2.28",
-+        "npm": ">=9.6.5",
-+        "pnpm": ">=7.1.0",
-+        "yarn": ">=3.2.0"
-+      },
-+      "funding": {
-+        "url": "https://opencollective.com/libvips"
-+      }
-+    },
-+    "node_modules/@img/sharp-libvips-linux-x64": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.2.tgz",
-+      "integrity": "sha512-E441q4Qdb+7yuyiADVi5J+44x8ctlrqn8XgkDTwr4qPJzWkaHwD489iZ4nGDgcuya4iMN3ULV6NwbhRZJ9Z7SQ==",
-+      "cpu": [
-+        "x64"
-+      ],
-+      "optional": true,
-+      "os": [
-+        "linux"
-+      ],
-+      "engines": {
-+        "glibc": ">=2.26",
-+        "npm": ">=9.6.5",
-+        "pnpm": ">=7.1.0",
-+        "yarn": ">=3.2.0"
-+      },
-+      "funding": {
-+        "url": "https://opencollective.com/libvips"
-+      }
-+    },
-+    "node_modules/@img/sharp-libvips-linuxmusl-arm64": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.0.2.tgz",
-+      "integrity": "sha512-3CAkndNpYUrlDqkCM5qhksfE+qSIREVpyoeHIU6jd48SJZViAmznoQQLAv4hVXF7xyUB9zf+G++e2v1ABjCbEQ==",
-+      "cpu": [
-+        "arm64"
-+      ],
-+      "optional": true,
-+      "os": [
-+        "linux"
-+      ],
-+      "engines": {
-+        "musl": ">=1.2.2",
-+        "npm": ">=9.6.5",
-+        "pnpm": ">=7.1.0",
-+        "yarn": ">=3.2.0"
-+      },
-+      "funding": {
-+        "url": "https://opencollective.com/libvips"
-+      }
-+    },
-+    "node_modules/@img/sharp-libvips-linuxmusl-x64": {
-+      "version": "1.0.2",
-+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.2.tgz",
-+      "integrity": "sha512-VI94Q6khIHqHWNOh6LLdm9s2Ry4zdjWJwH56WoiJU7NTeDwyApdZZ8c+SADC8OH98KWNQXnE01UdJ9CSfZvwZw==",
-+      "cpu": [
-+        "x64"
-+      ],
-+      "optional": true,
-+      "os": [
-+        "linux"
-+      ],
-+      "engines": {
-+        "musl": ">=1.2.2",
-+        "npm": ">=9.6.5",
-+        "pnpm": ">=7.1.0",
-+        "yarn": ">=3.2.0"
-+      },
-+      "funding": {
-+        "url": "https://opencollective.com/libvips"
-+      }
-+    },
-+    "node_modules/@img/sharp-linux-arm": {
-+      "version": "0.33.4",
-+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.4.tgz",
-+      "integrity": "sha512-RUgBD1c0+gCYZGCCe6mMdTiOFS0Zc/XrN0fYd6hISIKcDUbAW5NtSQW9g/powkrXYm6Vzwd6y+fqmExDuCdHNQ==",
-+      "cpu": [
-+        "arm"
-+      ],
-+      "optional": true,
-+      "os": [
-+        "linux"
-+      ],
-+      "engines": {
-+        "glibc": ">=2.28",
-+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
-+        "npm": ">=9.6.5",
-+        "pnpm": ">=7.1.0",
-+        "yarn": ">=3.2.0"
-+      },
-+      "funding": {
-+        "url": "https://opencollective.com/libvips"
-+      },
-+      "optionalDependencies": {
-+        "@img/sharp-libvips-linux-arm": "1.0.2"
-+      }
-+    },
-+    "node_modules/@img/sharp-linux-arm64": {
-+      "version": "0.33.4",
-+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.4.tgz",
-+      "integrity": "sha512-2800clwVg1ZQtxwSoTlHvtm9ObgAax7V6MTAB/hDT945Tfyy3hVkmiHpeLPCKYqYR1Gcmv1uDZ3a4OFwkdBL7Q==",
-+      "cpu": [
-+        "arm64"
-+      ],
-+      "optional": true,
-+      "os": [
-+        "linux"
-+      ],
-+      "engines": {
-+        "glibc": ">=2.26",
-+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
-+        "npm": ">=9.6.5",
-+        "pnpm": ">=7.1.0",
-+        "yarn": ">=3.2.0"
-+      },
-+      "funding": {
-+        "url": "https://opencollective.com/libvips"
-+      },
-+      "optionalDependencies": {
-+        "@img/sharp-libvips-linux-arm64": "1.0.2"
-+      }
-+    },
-+    "node_modules/@img/sharp-linux-s390x": {
-+      "version": "0.33.4",
-+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.33.4.tgz",
-+      "integrity": "sha512-h3RAL3siQoyzSoH36tUeS0PDmb5wINKGYzcLB5C6DIiAn2F3udeFAum+gj8IbA/82+8RGCTn7XW8WTFnqag4tQ==",
-+      "cpu": [
-+        "s390x"
-+      ],
-+      "optional": true,
-+      "os": [
-+        "linux"
-+      ],
-+      "engines": {
-+        "glibc": ">=2.31",
-+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
-+        "npm": ">=9.6.5",
-+        "pnpm": ">=7.1.0",
-+        "yarn": ">=3.2.0"
-+      },
-+      "funding": {
-+        "url": "https://opencollective.com/libvips"
-+      },
-+      "optionalDependencies": {
-+        "@img/sharp-libvips-linux-s390x": "1.0.2"
-+      }
-+    },
-+    "node_modules/@img/sharp-linux-x64": {
-+      "version": "0.33.4",
-+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.4.tgz",
-+      "integrity": "sha512-GoR++s0XW9DGVi8SUGQ/U4AeIzLdNjHka6jidVwapQ/JebGVQIpi52OdyxCNVRE++n1FCLzjDovJNozif7w/Aw==",
-+      "cpu": [
-+        "x64"
-+      ],
-+      "optional": true,
-+      "os": [
-+        "linux"
-+      ],
-+      "engines": {
-+        "glibc": ">=2.26",
-+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
-+        "npm": ">=9.6.5",
-+        "pnpm": ">=7.1.0",
-+        "yarn": ">=3.2.0"
-+      },
-+      "funding": {
-+        "url": "https://opencollective.com/libvips"
-+      },
-+      "optionalDependencies": {
-+        "@img/sharp-libvips-linux-x64": "1.0.2"
-+      }
-+    },
-+    "node_modules/@img/sharp-linuxmusl-arm64": {
-+      "version": "0.33.4",
-+      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.4.tgz",
-+      "integrity": "sha512-nhr1yC3BlVrKDTl6cO12gTpXMl4ITBUZieehFvMntlCXFzH2bvKG76tBL2Y/OqhupZt81pR7R+Q5YhJxW0rGgQ==",
-+      "cpu": [
-+        "arm64"
-+      ],
-+      "optional": true,
-+      "os": [
-+        "linux"
-+      ],
-+      "engines": {
-+        "musl": ">=1.2.2",
-+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
-+        "npm": ">=9.6.5",
-+        "pnpm": ">=7.1.0",
-+        "yarn": ">=3.2.0"
-+      },
-+      "funding": {
-+        "url": "https://opencollective.com/libvips"
-+      },
-+      "optionalDependencies": {
-+        "@img/sharp-libvips-linuxmusl-arm64": "1.0.2"
-+      }
-+    },
-+    "node_modules/@img/sharp-linuxmusl-x64": {
-+      "version": "0.33.4",
-+      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.4.tgz",
-+      "integrity": "sha512-uCPTku0zwqDmZEOi4ILyGdmW76tH7dm8kKlOIV1XC5cLyJ71ENAAqarOHQh0RLfpIpbV5KOpXzdU6XkJtS0daw==",
-+      "cpu": [
-+        "x64"
-+      ],
-+      "optional": true,
-+      "os": [
-+        "linux"
-+      ],
-+      "engines": {
-+        "musl": ">=1.2.2",
-+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
-+        "npm": ">=9.6.5",
-+        "pnpm": ">=7.1.0",
-+        "yarn": ">=3.2.0"
-+      },
-+      "funding": {
-+        "url": "https://opencollective.com/libvips"
-+      },
-+      "optionalDependencies": {
-+        "@img/sharp-libvips-linuxmusl-x64": "1.0.2"
-+      }
-+    },
-+    "node_modules/@img/sharp-wasm32": {
-+      "version": "0.33.4",
-+      "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.33.4.tgz",
-+      "integrity": "sha512-Bmmauh4sXUsUqkleQahpdNXKvo+wa1V9KhT2pDA4VJGKwnKMJXiSTGphn0gnJrlooda0QxCtXc6RX1XAU6hMnQ==",
-+      "cpu": [
-+        "wasm32"
-+      ],
-+      "optional": true,
-+      "dependencies": {
-+        "@emnapi/runtime": "^1.1.1"
-+      },
-+      "engines": {
-+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
-+        "npm": ">=9.6.5",
-+        "pnpm": ">=7.1.0",
-+        "yarn": ">=3.2.0"
-+      },
-+      "funding": {
-+        "url": "https://opencollective.com/libvips"
-+      }
-+    },
-+    "node_modules/@img/sharp-win32-ia32": {
-+      "version": "0.33.4",
-+      "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.4.tgz",
-+      "integrity": "sha512-99SJ91XzUhYHbx7uhK3+9Lf7+LjwMGQZMDlO/E/YVJ7Nc3lyDFZPGhjwiYdctoH2BOzW9+TnfqcaMKt0jHLdqw==",
-+      "cpu": [
-+        "ia32"
-+      ],
-+      "optional": true,
-+      "os": [
-+        "win32"
-+      ],
-+      "engines": {
-+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
-+        "npm": ">=9.6.5",
-+        "pnpm": ">=7.1.0",
-+        "yarn": ">=3.2.0"
-+      },
-+      "funding": {
-+        "url": "https://opencollective.com/libvips"
-+      }
-+    },
-+    "node_modules/@img/sharp-win32-x64": {
-+      "version": "0.33.4",
-+      "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.4.tgz",
-+      "integrity": "sha512-3QLocdTRVIrFNye5YocZl+KKpYKP+fksi1QhmOArgx7GyhIbQp/WrJRu176jm8IxromS7RIkzMiMINVdBtC8Aw==",
-+      "cpu": [
-+        "x64"
-+      ],
-+      "optional": true,
-+      "os": [
-+        "win32"
-+      ],
-+      "engines": {
-+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
-+        "npm": ">=9.6.5",
-+        "pnpm": ">=7.1.0",
-+        "yarn": ">=3.2.0"
-+      },
-+      "funding": {
-+        "url": "https://opencollective.com/libvips"
-+      }
-+    },
-     "node_modules/@isaacs/cliui": {
-       "version": "8.0.2",
-       "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
-@@ -800,9 +1241,9 @@
-       }
-     },
-     "node_modules/@next/env": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-14.1.0.tgz",
-      "integrity": "sha512-Py8zIo+02ht82brwwhTg36iogzFqGLPXlRGKQw5s+qP/kMNc4MAyDeEwBKDijk6zTIbegEgu8Qy7C1LboslQAw=="
-+      "version": "14.2.3",
-+      "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.3.tgz",
-+      "integrity": "sha512-W7fd7IbkfmeeY2gXrzJYDx8D2lWKbVoTIj1o1ScPHNzvp30s1AuoEFSdr39bC5sjxJaxTtq3OTCZboNp0lNWHA=="
-     },
-     "node_modules/@next/eslint-plugin-next": {
-       "version": "14.1.0",
-@@ -814,9 +1255,9 @@
-       }
-     },
-     "node_modules/@next/swc-darwin-arm64": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.1.0.tgz",
-      "integrity": "sha512-nUDn7TOGcIeyQni6lZHfzNoo9S0euXnu0jhsbMOmMJUBfgsnESdjN97kM7cBqQxZa8L/bM9om/S5/1dzCrW6wQ==",
-+      "version": "14.2.3",
-+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.3.tgz",
-+      "integrity": "sha512-3pEYo/RaGqPP0YzwnlmPN2puaF2WMLM3apt5jLW2fFdXD9+pqcoTzRk+iZsf8ta7+quAe4Q6Ms0nR0SFGFdS1A==",
-       "cpu": [
-         "arm64"
-       ],
-@@ -829,9 +1270,9 @@
-       }
-     },
-     "node_modules/@next/swc-darwin-x64": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.1.0.tgz",
-      "integrity": "sha512-1jgudN5haWxiAl3O1ljUS2GfupPmcftu2RYJqZiMJmmbBT5M1XDffjUtRUzP4W3cBHsrvkfOFdQ71hAreNQP6g==",
-+      "version": "14.2.3",
-+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.3.tgz",
-+      "integrity": "sha512-6adp7waE6P1TYFSXpY366xwsOnEXM+y1kgRpjSRVI2CBDOcbRjsJ67Z6EgKIqWIue52d2q/Mx8g9MszARj8IEA==",
-       "cpu": [
-         "x64"
-       ],
-@@ -844,9 +1285,9 @@
-       }
-     },
-     "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.1.0.tgz",
-      "integrity": "sha512-RHo7Tcj+jllXUbK7xk2NyIDod3YcCPDZxj1WLIYxd709BQ7WuRYl3OWUNG+WUfqeQBds6kvZYlc42NJJTNi4tQ==",
-+      "version": "14.2.3",
-+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.3.tgz",
-+      "integrity": "sha512-cuzCE/1G0ZSnTAHJPUT1rPgQx1w5tzSX7POXSLaS7w2nIUJUD+e25QoXD/hMfxbsT9rslEXugWypJMILBj/QsA==",
-       "cpu": [
-         "arm64"
-       ],
-@@ -859,9 +1300,9 @@
-       }
-     },
-     "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.1.0.tgz",
-      "integrity": "sha512-v6kP8sHYxjO8RwHmWMJSq7VZP2nYCkRVQ0qolh2l6xroe9QjbgV8siTbduED4u0hlk0+tjS6/Tuy4n5XCp+l6g==",
-+      "version": "14.2.3",
-+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.3.tgz",
-+      "integrity": "sha512-0D4/oMM2Y9Ta3nGuCcQN8jjJjmDPYpHX9OJzqk42NZGJocU2MqhBq5tWkJrUQOQY9N+In9xOdymzapM09GeiZw==",
-       "cpu": [
-         "arm64"
-       ],
-@@ -874,9 +1315,9 @@
-       }
-     },
-     "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.1.0.tgz",
-      "integrity": "sha512-zJ2pnoFYB1F4vmEVlb/eSe+VH679zT1VdXlZKX+pE66grOgjmKJHKacf82g/sWE4MQ4Rk2FMBCRnX+l6/TVYzQ==",
-+      "version": "14.2.3",
-+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.3.tgz",
-+      "integrity": "sha512-ENPiNnBNDInBLyUU5ii8PMQh+4XLr4pG51tOp6aJ9xqFQ2iRI6IH0Ds2yJkAzNV1CfyagcyzPfROMViS2wOZ9w==",
-       "cpu": [
-         "x64"
-       ],
-@@ -889,9 +1330,9 @@
-       }
-     },
-     "node_modules/@next/swc-linux-x64-musl": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.1.0.tgz",
-      "integrity": "sha512-rbaIYFt2X9YZBSbH/CwGAjbBG2/MrACCVu2X0+kSykHzHnYH5FjHxwXLkcoJ10cX0aWCEynpu+rP76x0914atg==",
-+      "version": "14.2.3",
-+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.3.tgz",
-+      "integrity": "sha512-BTAbq0LnCbF5MtoM7I/9UeUu/8ZBY0i8SFjUMCbPDOLv+un67e2JgyN4pmgfXBwy/I+RHu8q+k+MCkDN6P9ViQ==",
-       "cpu": [
-         "x64"
-       ],
-@@ -904,9 +1345,9 @@
-       }
-     },
-     "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.1.0.tgz",
-      "integrity": "sha512-o1N5TsYc8f/HpGt39OUQpQ9AKIGApd3QLueu7hXk//2xq5Z9OxmV6sQfNp8C7qYmiOlHYODOGqNNa0e9jvchGQ==",
-+      "version": "14.2.3",
-+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.3.tgz",
-+      "integrity": "sha512-AEHIw/dhAMLNFJFJIJIyOFDzrzI5bAjI9J26gbO5xhAKHYTZ9Or04BesFPXiAYXDNdrwTP2dQceYA4dL1geu8A==",
-       "cpu": [
-         "arm64"
-       ],
-@@ -919,9 +1360,9 @@
-       }
-     },
-     "node_modules/@next/swc-win32-ia32-msvc": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.1.0.tgz",
-      "integrity": "sha512-XXIuB1DBRCFwNO6EEzCTMHT5pauwaSj4SWs7CYnME57eaReAKBXCnkUE80p/pAZcewm7hs+vGvNqDPacEXHVkw==",
-+      "version": "14.2.3",
-+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.3.tgz",
-+      "integrity": "sha512-vga40n1q6aYb0CLrM+eEmisfKCR45ixQYXuBXxOOmmoV8sYST9k7E3US32FsY+CkkF7NtzdcebiFT4CHuMSyZw==",
-       "cpu": [
-         "ia32"
-       ],
-@@ -934,9 +1375,9 @@
-       }
-     },
-     "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.1.0.tgz",
-      "integrity": "sha512-9WEbVRRAqJ3YFVqEZIxUqkiO8l1nool1LmNxygr5HWF8AcSYsEpneUDhmjUVJEzO2A04+oPtZdombzzPPkTtgg==",
-+      "version": "14.2.3",
-+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.3.tgz",
-+      "integrity": "sha512-Q1/zm43RWynxrO7lW4ehciQVj+5ePBhOK+/K2P7pLFX3JaJ/IZVC69SHidrmZSOkqz7ECIOhhy7XhAFG4JYyHA==",
-       "cpu": [
-         "x64"
-       ],
-@@ -1810,11 +2251,17 @@
-       "integrity": "sha512-RbhOOTCNoCrbfkRyoXODZp75MlpiHMgbE5MEBZAnnnLyQNgrigEj4p0lzsMDyc1zVsJDLrivB58tgg3emX0eEA==",
-       "dev": true
-     },
-+    "node_modules/@swc/counter": {
-+      "version": "0.1.3",
-+      "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz",
-+      "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ=="
-+    },
-     "node_modules/@swc/helpers": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.2.tgz",
-      "integrity": "sha512-E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw==",
-+      "version": "0.5.5",
-+      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.5.tgz",
-+      "integrity": "sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==",
-       "dependencies": {
-+        "@swc/counter": "^0.1.3",
-         "tslib": "^2.4.0"
-       }
-     },
-@@ -2930,6 +3377,18 @@
-         "periscopic": "^3.1.0"
-       }
-     },
-+    "node_modules/color": {
-+      "version": "4.2.3",
-+      "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",
-+      "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==",
-+      "dependencies": {
-+        "color-convert": "^2.0.1",
-+        "color-string": "^1.9.0"
-+      },
-+      "engines": {
-+        "node": ">=12.5.0"
-+      }
-+    },
-     "node_modules/color-convert": {
-       "version": "2.0.1",
-       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-@@ -2946,6 +3405,15 @@
-       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-     },
-+    "node_modules/color-string": {
-+      "version": "1.9.1",
-+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
-+      "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
-+      "dependencies": {
-+        "color-name": "^1.0.0",
-+        "simple-swizzle": "^0.2.2"
-+      }
-+    },
-     "node_modules/combined-stream": {
-       "version": "1.0.8",
-       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-@@ -3152,6 +3620,14 @@
-         "node": ">=6"
-       }
-     },
-+    "node_modules/detect-libc": {
-+      "version": "2.0.3",
-+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
-+      "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==",
-+      "engines": {
-+        "node": ">=8"
-+      }
-+    },
-     "node_modules/detect-node-es": {
-       "version": "1.1.0",
-       "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz",
-@@ -4677,6 +5153,11 @@
-         "url": "https://github.com/sponsors/ljharb"
-       }
-     },
-+    "node_modules/is-arrayish": {
-+      "version": "0.3.2",
-+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-+      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
-+    },
-     "node_modules/is-async-function": {
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz",
-@@ -6676,12 +7157,12 @@
-       "dev": true
-     },
-     "node_modules/next": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/next/-/next-14.1.0.tgz",
-      "integrity": "sha512-wlzrsbfeSU48YQBjZhDzOwhWhGsy+uQycR8bHAOt1LY1bn3zZEcDyHQOEoN3aWzQ8LHCAJ1nqrWCc9XF2+O45Q==",
-+      "version": "14.2.3",
-+      "resolved": "https://registry.npmjs.org/next/-/next-14.2.3.tgz",
-+      "integrity": "sha512-dowFkFTR8v79NPJO4QsBUtxv0g9BrS/phluVpMAt2ku7H+cbcBJlopXjkWlwxrk/xGqMemr7JkGPGemPrLLX7A==",
-       "dependencies": {
-        "@next/env": "14.1.0",
-        "@swc/helpers": "0.5.2",
-+        "@next/env": "14.2.3",
-+        "@swc/helpers": "0.5.5",
-         "busboy": "1.6.0",
-         "caniuse-lite": "^1.0.30001579",
-         "graceful-fs": "^4.2.11",
-@@ -6695,18 +7176,19 @@
-         "node": ">=18.17.0"
-       },
-       "optionalDependencies": {
-        "@next/swc-darwin-arm64": "14.1.0",
-        "@next/swc-darwin-x64": "14.1.0",
-        "@next/swc-linux-arm64-gnu": "14.1.0",
-        "@next/swc-linux-arm64-musl": "14.1.0",
-        "@next/swc-linux-x64-gnu": "14.1.0",
-        "@next/swc-linux-x64-musl": "14.1.0",
-        "@next/swc-win32-arm64-msvc": "14.1.0",
-        "@next/swc-win32-ia32-msvc": "14.1.0",
-        "@next/swc-win32-x64-msvc": "14.1.0"
-+        "@next/swc-darwin-arm64": "14.2.3",
-+        "@next/swc-darwin-x64": "14.2.3",
-+        "@next/swc-linux-arm64-gnu": "14.2.3",
-+        "@next/swc-linux-arm64-musl": "14.2.3",
-+        "@next/swc-linux-x64-gnu": "14.2.3",
-+        "@next/swc-linux-x64-musl": "14.2.3",
-+        "@next/swc-win32-arm64-msvc": "14.2.3",
-+        "@next/swc-win32-ia32-msvc": "14.2.3",
-+        "@next/swc-win32-x64-msvc": "14.2.3"
-       },
-       "peerDependencies": {
-         "@opentelemetry/api": "^1.1.0",
-+        "@playwright/test": "^1.41.2",
-         "react": "^18.2.0",
-         "react-dom": "^18.2.0",
-         "sass": "^1.3.0"
-@@ -6715,6 +7197,9 @@
-         "@opentelemetry/api": {
-           "optional": true
-         },
-+        "@playwright/test": {
-+          "optional": true
-+        },
-         "sass": {
-           "optional": true
-         }
-@@ -7928,13 +8413,9 @@
-       }
-     },
-     "node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-+      "version": "7.6.2",
-+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
-+      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
-       "bin": {
-         "semver": "bin/semver.js"
-       },
-@@ -7942,18 +8423,6 @@
-         "node": ">=10"
-       }
-     },
-    "node_modules/semver/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-     "node_modules/seroval": {
-       "version": "1.0.4",
-       "resolved": "https://registry.npmjs.org/seroval/-/seroval-1.0.4.tgz",
-@@ -8010,6 +8479,45 @@
-       "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
-       "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="
-     },
-+    "node_modules/sharp": {
-+      "version": "0.33.4",
-+      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.33.4.tgz",
-+      "integrity": "sha512-7i/dt5kGl7qR4gwPRD2biwD2/SvBn3O04J77XKFgL2OnZtQw+AG9wnuS/csmu80nPRHLYE9E41fyEiG8nhH6/Q==",
-+      "hasInstallScript": true,
-+      "dependencies": {
-+        "color": "^4.2.3",
-+        "detect-libc": "^2.0.3",
-+        "semver": "^7.6.0"
-+      },
-+      "engines": {
-+        "libvips": ">=8.15.2",
-+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-+      },
-+      "funding": {
-+        "url": "https://opencollective.com/libvips"
-+      },
-+      "optionalDependencies": {
-+        "@img/sharp-darwin-arm64": "0.33.4",
-+        "@img/sharp-darwin-x64": "0.33.4",
-+        "@img/sharp-libvips-darwin-arm64": "1.0.2",
-+        "@img/sharp-libvips-darwin-x64": "1.0.2",
-+        "@img/sharp-libvips-linux-arm": "1.0.2",
-+        "@img/sharp-libvips-linux-arm64": "1.0.2",
-+        "@img/sharp-libvips-linux-s390x": "1.0.2",
-+        "@img/sharp-libvips-linux-x64": "1.0.2",
-+        "@img/sharp-libvips-linuxmusl-arm64": "1.0.2",
-+        "@img/sharp-libvips-linuxmusl-x64": "1.0.2",
-+        "@img/sharp-linux-arm": "0.33.4",
-+        "@img/sharp-linux-arm64": "0.33.4",
-+        "@img/sharp-linux-s390x": "0.33.4",
-+        "@img/sharp-linux-x64": "0.33.4",
-+        "@img/sharp-linuxmusl-arm64": "0.33.4",
-+        "@img/sharp-linuxmusl-x64": "0.33.4",
-+        "@img/sharp-wasm32": "0.33.4",
-+        "@img/sharp-win32-ia32": "0.33.4",
-+        "@img/sharp-win32-x64": "0.33.4"
-+      }
-+    },
-     "node_modules/shebang-command": {
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-@@ -8054,6 +8562,14 @@
-         "url": "https://github.com/sponsors/isaacs"
-       }
-     },
-+    "node_modules/simple-swizzle": {
-+      "version": "0.2.2",
-+      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-+      "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
-+      "dependencies": {
-+        "is-arrayish": "^0.3.1"
-+      }
-+    },
-     "node_modules/slash": {
-       "version": "3.0.0",
-       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-@@ -9369,12 +9885,6 @@
-         "node": ">=0.4"
-       }
-     },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-     "node_modules/yaml": {
-       "version": "2.3.4",
-       "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz",
-diff --git a/package.json b/package.json
-index 4185096..4ab1c58 100644
--- a/package.json
-+++ b/package.json
-@@ -31,7 +31,7 @@
-     "framer-motion": "^11.0.3",
-     "langchain": "^0.1.13",
-     "lucide-react": "^0.322.0",
-    "next": "14.1.0",
-+    "next": "^14.2.3",
-     "next-themes": "^0.2.1",
-     "react": "^18",
-     "react-code-blocks": "^0.1.6",
-@@ -41,6 +41,7 @@
-     "react-resizable-panels": "^2.0.3",
-     "react-textarea-autosize": "^8.5.3",
-     "remark-gfm": "^4.0.0",
-+    "sharp": "^0.33.4",
-     "sonner": "^1.4.0",
-     "tailwind-merge": "^2.2.1",
-     "tailwindcss-animate": "^1.0.7",
-- 
-2.42.0
-
--- a/Show More
+++ b/Show More