diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 54df38a31a9f7..7b0e36de4a3c2 100644
--- 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";
diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 4a66c34947eb6..c9f5b2de67c20 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -207,6 +207,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.
@@ -695,6 +699,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.
 
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index ed016b552edc7..8b0127dc29f74 100644
--- 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
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 6910458baf401..6f5357382dc56 100644
--- 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
diff --git a/nixos/modules/services/misc/gogs.nix b/nixos/modules/services/misc/gogs.nix
deleted file mode 100644
index a2c1ad0779e15..0000000000000
--- a/nixos/modules/services/misc/gogs.nix
+++ /dev/null
@@ -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;
-      })));
-  };
-}
diff --git a/nixos/modules/services/system/automatic-timezoned.nix b/nixos/modules/services/system/automatic-timezoned.nix
index 6150aa22cfbdf..50f84f39af7d2 100644
--- 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"
diff --git a/nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix b/nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix
index 9bd2cf310c0af..cbb0ce813a348 100644
--- 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";
         };
       };
     };
diff --git a/pkgs/applications/audio/bespokesynth/default.nix b/pkgs/applications/audio/bespokesynth/default.nix
index 83c5af0a53fce..01b98999ce25f 100644
--- 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
diff --git a/pkgs/applications/audio/exaile/default.nix b/pkgs/applications/audio/exaile/default.nix
index 9d5c69858aef9..5387069072f5f 100644
--- 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
diff --git a/pkgs/applications/audio/plugdata/default.nix b/pkgs/applications/audio/plugdata/default.nix
index e58e5aabcd81a..6998cb00eaebb 100644
--- 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
diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index a47b01b8cf585..7a0063238d492 100644
--- 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) (
diff --git a/pkgs/applications/audio/rymcast/default.nix b/pkgs/applications/audio/rymcast/default.nix
index 06e711941a637..4fecaf3737260 100644
--- 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"
diff --git a/pkgs/applications/audio/sonobus/default.nix b/pkgs/applications/audio/sonobus/default.nix
index d8a69ecd9a0b7..bbf52c11b9903 100644
--- 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 = [
diff --git a/pkgs/applications/audio/tonelib-zoom/default.nix b/pkgs/applications/audio/tonelib-zoom/default.nix
index e5adc356b6973..af5dd750c50a7 100644
--- 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 [
diff --git a/pkgs/applications/audio/tunefish/default.nix b/pkgs/applications/audio/tunefish/default.nix
index df7564abcf02b..8c2855d732828 100644
--- 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
diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix
index ee97a92ac3283..7633ab22e26a7 100644
--- 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
   ];
 
diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix
index 7e9981cc39ec2..50a100254e999 100644
--- 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
diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix
index 46642d6755f76..dfb2fd38b9978 100644
--- 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"
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 9c1963554c3fa..2e1501d635cd9 100644
--- 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}"; });
diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix
index 8c53805978340..e7fe2ccac6585 100644
--- 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 [
diff --git a/pkgs/applications/editors/formiko/default.nix b/pkgs/applications/editors/formiko/default.nix
index 40c7fba0be82e..1fa92679f651d 100644
--- 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
diff --git a/pkgs/applications/editors/gnome-inform7/default.nix b/pkgs/applications/editors/gnome-inform7/default.nix
index df1baa997a217..e4cc850579285 100644
--- 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
diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix
index 679cde8b50377..e977ae20687ab 100644
--- 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
   ];
 
diff --git a/pkgs/applications/file-managers/xplorer/default.nix b/pkgs/applications/file-managers/xplorer/default.nix
index 9c3a04e8dde3b..6af5e5da6cf1d 100644
--- 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
diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix
index 5b56ce7585614..f2666b3ee1076 100644
--- 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"
diff --git a/pkgs/applications/graphics/komorebi/default.nix b/pkgs/applications/graphics/komorebi/default.nix
index f98549cb14ffb..91e4ad570ef83 100644
--- 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
   ];
diff --git a/pkgs/applications/misc/bambu-studio/default.nix b/pkgs/applications/misc/bambu-studio/default.nix
index b1ff6eb0a2f58..4084734aa58e8 100644
--- 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;
diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix
index ef8780f1e88b5..07b4eaa398262 100644
--- 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}
diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix
index b438f6c6d5dfc..85109890fb8ee 100644
--- 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
diff --git a/pkgs/applications/misc/insulator2/default.nix b/pkgs/applications/misc/insulator2/default.nix
index 2fb8b15e3e947..423a773026846 100644
--- 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; {
diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix
index 2583663fb6f86..f01be485ae05c 100644
--- 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
diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix
index 0f2f1e9c08602..683b45ccbf210 100644
--- 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
diff --git a/pkgs/applications/misc/minigalaxy/default.nix b/pkgs/applications/misc/minigalaxy/default.nix
index d98ecb21daafb..a20ed2d48b841 100644
--- 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;
diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
index cae71f785978d..f7fa1223a34c6 100644
--- 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
   ];
diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix
index d2340b15f1b71..5f226752ccd31 100644
--- 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
diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix
index c510e88537083..903839049d0d6 100644
--- 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 = [
diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix
index cf3a6a46f9dec..bcad8be29b584 100644
--- 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
   ];
 
diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix
index 596ba95b7450b..7a051db5363e1 100644
--- 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/*
   '';
diff --git a/pkgs/applications/networking/browsers/badwolf/default.nix b/pkgs/applications/networking/browsers/badwolf/default.nix
index dabbdf8981923..1c56fedfbdf0e 100644
--- 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
diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix
index 1c82fa7d8612e..6b68cbb4a0272 100644
--- 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
   ];
 
diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix
index 0cd58bbd25a2f..5036f0c6265e1 100644
--- 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 = ''
diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix
index 6011755e3892e..95b6958cd51cb 100644
--- 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
diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index f937f690b5820..3a2a670353285 100644
--- 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
   ];
diff --git a/pkgs/applications/networking/browsers/nyxt/default.nix b/pkgs/applications/networking/browsers/nyxt/default.nix
index 16231815c426a..b8d17500db27d 100644
--- 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
   ];
diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix
index ec31a8d1a39c6..990036a8045e6 100644
--- 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 ];
   };
 }
diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix
index e76b79f9d09ff..e02e07419ea16 100644
--- 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;
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 35ba84a27c26a..801d71935ced2 100644
--- 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",
diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix
index f751c13329176..6f75e836ab0ed 100644
--- 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
diff --git a/pkgs/applications/networking/geph/default.nix b/pkgs/applications/networking/geph/default.nix
index 43761b659b82f..1a8fa7d547aba 100644
--- 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
diff --git a/pkgs/applications/networking/giara/default.nix b/pkgs/applications/networking/giara/default.nix
index 872c869f1691d..110d5c04767a3 100644
--- 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
diff --git a/pkgs/applications/networking/instant-messengers/trillian-im/default.nix b/pkgs/applications/networking/instant-messengers/trillian-im/default.nix
index 0d4a6299adfce..a31adac9568f3 100644
--- 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
   ];
 
diff --git a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix
index 0925bae8a6956..47b1ccfd49e1e 100644
--- 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
   ];
diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
index 65b5bbd5d6682..88a3656011460 100644
--- 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 {
diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix
index a1e6177f72783..559c17bd7467b 100644
--- 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
diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix
index e6453e377d935..acec1b5cf0fae 100644
--- 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 = [
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index d0345f946600b..523d6971dfdb5 100644
--- 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 ]; }
diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index 9713389954a7e..e117549d57563 100644
--- 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
diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
index b59a82f720dce..dd4a8113cc290 100644
--- 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
diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix
index 92ccc8f46ed20..e62d4edfe97fe 100644
--- 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 = ''
diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix
index f35a0e515897a..48ad4ce47244e 100644
--- 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 = ''
diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix
index 4bc6060cfa6b2..4541f77dc3d5a 100644
--- 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 = ''
diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix
index c49d9bc2c4259..de1086f1f53d1 100644
--- 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";
diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix
index b544d5fc6b145..cd96b1d669a10 100644
--- 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;
 
diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
deleted file mode 100644
index 5b7a986cf2069..0000000000000
--- a/pkgs/applications/version-management/gogs/default.nix
+++ /dev/null
@@ -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.
-    '' ];
-  };
-}
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix b/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix
index 41b33b528a9fc..51fcb7468b03e 100644
--- 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
   ];
 
diff --git a/pkgs/by-name/ae/aerospace/package.nix b/pkgs/by-name/ae/aerospace/package.nix
new file mode 100644
index 0000000000000..f62116273a633
--- /dev/null
+++ 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 ];
+  };
+}
diff --git a/pkgs/by-name/ai/aider-chat/package.nix b/pkgs/by-name/ai/aider-chat/package.nix
index d1ed4c6f936b4..d8d42d73c4e8b 100644
--- 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
diff --git a/pkgs/by-name/am/am2rlauncher/package.nix b/pkgs/by-name/am/am2rlauncher/package.nix
index 33dde993cd8f8..cf2f5ebc71676 100644
--- 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
diff --git a/pkgs/by-name/ap/apvlv/package.nix b/pkgs/by-name/ap/apvlv/package.nix
index 0e5b60fd4a857..29be062652088 100644
--- 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 = ''
diff --git a/pkgs/by-name/ar/arti/package.nix b/pkgs/by-name/ar/arti/package.nix
index 6185ec1c683ff..0fdb1f50115ea 100644
--- 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"
   ];
 
diff --git a/pkgs/by-name/aw/aws-workspaces/package.nix b/pkgs/by-name/aw/aws-workspaces/package.nix
index bffc25ca48292..fad93e74d47f6 100644
--- 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
diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix
index 867dff3b7c4f4..1746042b42876 100644
--- 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;
diff --git a/pkgs/by-name/ca/cargo-tauri/test-app.nix b/pkgs/by-name/ca/cargo-tauri/test-app.nix
index d9304e38910d0..1cfa3eee9c38e 100644
--- 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;
diff --git a/pkgs/by-name/ca/catppuccinifier-gui/package.nix b/pkgs/by-name/ca/catppuccinifier-gui/package.nix
index d4dbc5b39094e..101ba9bb74ceb 100644
--- 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
diff --git a/pkgs/by-name/ch/chow-kick/package.nix b/pkgs/by-name/ch/chow-kick/package.nix
index 25eae2931c034..435b8e0c9b0b9 100644
--- 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 = [
diff --git a/pkgs/by-name/ch/chow-tape-model/package.nix b/pkgs/by-name/ch/chow-tape-model/package.nix
index e080ee6c05b83..9e9e3ae6b3417 100644
--- 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
diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix
index e333f1cda4237..0db5ab04ae635 100644
--- 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
diff --git a/pkgs/by-name/cl/clash-verge-rev/service.nix b/pkgs/by-name/cl/clash-verge-rev/service.nix
index 21baad40d3f73..3c8575f5b1e10 100644
--- 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 = {
diff --git a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
index 64386c552dceb..966efa763d190 100644
--- 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 = ''
diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix
index 9b5bf26200fb7..d8f5a5362c36e 100644
--- 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
             ]
           }"
diff --git a/pkgs/by-name/de/desktop-postflop/package.nix b/pkgs/by-name/de/desktop-postflop/package.nix
index 4f81bfa4943fb..0eb643a44b041 100644
--- 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 = ''
diff --git a/pkgs/by-name/do/dorion/package.nix b/pkgs/by-name/do/dorion/package.nix
index a60a03c393677..859d509b25b67 100644
--- 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 = ''
diff --git a/pkgs/by-name/en/en-croissant/package.nix b/pkgs/by-name/en/en-croissant/package.nix
index 81489925d19f8..71b2de66590cb 100644
--- 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
diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix
index e39d908668133..268ffdf2b5075 100644
--- 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
   ];
diff --git a/pkgs/by-name/fo/font-manager/package.nix b/pkgs/by-name/fo/font-manager/package.nix
index aff880f06d2d5..dc9b27fdd3af5 100644
--- 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 = [
diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix
index 68679cfcfea4d..af81f5021fca7 100644
--- 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;
diff --git a/pkgs/by-name/gn/gnome-notes/package.nix b/pkgs/by-name/gn/gnome-notes/package.nix
index 0f4c8dbfc5dc2..888f5285938e1 100644
--- 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
diff --git a/pkgs/by-name/gn/gnucash/package.nix b/pkgs/by-name/gn/gnucash/package.nix
index 9f7ca7364604b..c7d7e6c51380e 100644
--- 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
diff --git a/pkgs/by-name/go/gomanagedocker/package.nix b/pkgs/by-name/go/gomanagedocker/package.nix
new file mode 100644
index 0000000000000..d31d435a7aa40
--- /dev/null
+++ 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";
+  };
+}
diff --git a/pkgs/by-name/gp/gpauth/package.nix b/pkgs/by-name/gp/gpauth/package.nix
index e1199c9ed372b..c54be41b2f06e 100644
--- 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; {
diff --git a/pkgs/by-name/he/headphones-toolbox/package.nix b/pkgs/by-name/he/headphones-toolbox/package.nix
index 2b71ad126eff0..2eb5257fee250 100644
--- 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 = ''
diff --git a/pkgs/by-name/in/intune-portal/package.nix b/pkgs/by-name/in/intune-portal/package.nix
index 8fa8aa976e345..f9ff4b6119ca3 100644
--- 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
diff --git a/pkgs/by-name/ki/kiwitalk/package.nix b/pkgs/by-name/ki/kiwitalk/package.nix
index b700b198bc372..74639a6fbb509 100644
--- 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 ''
diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/by-name/km/kmod-blacklist-ubuntu/package.nix
similarity index 90%
rename from pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
rename to pkgs/by-name/km/kmod-blacklist-ubuntu/package.nix
index 464b77ce969ea..b127caff4e532 100644
--- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
+++ b/pkgs/by-name/km/kmod-blacklist-ubuntu/package.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 = ''
diff --git a/pkgs/by-name/lr/lrcget/package.nix b/pkgs/by-name/lr/lrcget/package.nix
index 0d77c2d09f226..8ec4bfc21e21f 100644
--- 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 [
diff --git a/pkgs/by-name/me/metacubexd/package.nix b/pkgs/by-name/me/metacubexd/package.nix
index 6b5b6c7e8fe75..5986155ee0f48 100644
--- 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 = ''
diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix
index 66584bcbfa693..80df07cd6cb17 100644
--- 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
   ];
 
diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
index c53296c3b0270..3d43797b9b1b1 100644
--- 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;
diff --git a/pkgs/by-name/mo/mouse-actions-gui/package.nix b/pkgs/by-name/mo/mouse-actions-gui/package.nix
index 01478b8015b19..5fcb4126cf87b 100644
--- 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 {
diff --git 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
deleted file mode 100644
index d904f04f73447..0000000000000
--- a/pkgs/by-name/ne/nextjs-ollama-llm-ui/0001-update-nextjs.patch
+++ /dev/null
@@ -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
-
diff --git a/pkgs/by-name/ne/nextjs-ollama-llm-ui/0003-add-standalone-output.patch b/pkgs/by-name/ne/nextjs-ollama-llm-ui/0003-add-standalone-output.patch
deleted file mode 100644
index 50d1611148960..0000000000000
--- a/pkgs/by-name/ne/nextjs-ollama-llm-ui/0003-add-standalone-output.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/next.config.mjs b/next.config.mjs
-index dc34f1a..f6f90c4 100644
---- a/next.config.mjs
-+++ b/next.config.mjs
-@@ -1,6 +1,7 @@
- /** @type {import('next').NextConfig} */
- const nextConfig = {
--    webpack: (config, { isServer }) => {
-+  output: 'standalone',
-+  webpack: (config, { isServer }) => {
-         // Fixes npm packages that depend on `fs` module
-         if (!isServer) {
-           config.resolve.fallback = {
--- 
-2.42.0
-
diff --git a/pkgs/by-name/ne/nextjs-ollama-llm-ui/package.nix b/pkgs/by-name/ne/nextjs-ollama-llm-ui/package.nix
index aad1420f8b659..866f9b5babfed 100644
--- a/pkgs/by-name/ne/nextjs-ollama-llm-ui/package.nix
+++ b/pkgs/by-name/ne/nextjs-ollama-llm-ui/package.nix
@@ -14,7 +14,7 @@
 }:
 
 let
-  version = "1.0.1";
+  version = "1.1.0";
 in
 buildNpmPackage {
   pname = "nextjs-ollama-llm-ui";
@@ -24,20 +24,14 @@ buildNpmPackage {
     owner = "jakobhoeg";
     repo = "nextjs-ollama-llm-ui";
     rev = "v${version}";
-    hash = "sha256-pZJgiopm0VGwaZxsNcyRawevvzEcK1j5WhngX1Pn6YE=";
+    hash = "sha256-IA7g96u5QY8cOuTbJEWw7+U+hSFBzIQVk4Kv3qHKAdM=";
   };
-  npmDepsHash = "sha256-wtHOW0CyEOszgiZwDkF2/cSxbw6WFRLbhDnd2FlY70E=";
+  npmDepsHash = "sha256-3M0BZ9KZZ0ONwvTLycfMR8skMQf8mzjeqYCwJY4l040=";
 
   patches = [
-    # Update to a newer nextjs version that buildNpmPackage is able to build.
-    # Remove at nextjs update.
-    ./0001-update-nextjs.patch
     # nextjs tries to download google fonts from the internet during buildPhase and fails in Nix sandbox.
     # We patch the code to expect a local font from src/app/Inter.ttf that we load from Nixpkgs in preBuild phase.
     ./0002-use-local-google-fonts.patch
-    # Modify next.config.js to produce a production "standalone" output at .next/standalone.
-    # This output is easy to package with Nix and run with "node .next/standalone/server.js" later.
-    ./0003-add-standalone-output.patch
   ];
 
   # Adjust buildNpmPackage phases with nextjs quirk workarounds.
@@ -70,6 +64,9 @@ buildNpmPackage {
     mkdir -p $out/share/homepage/.next
     cp -r .next/static $out/share/homepage/.next/static
 
+    # https://github.com/vercel/next.js/discussions/58864
+    ln -s /var/cache/nextjs-ollama-llm-ui $out/share/homepage/.next/cache
+
     chmod +x $out/share/homepage/server.js
 
     # we set a default port to support "nix run ..."
diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix
index 3748f3dbf819c..c41c04dd5dd8e 100644
--- a/pkgs/by-name/ni/niri/package.nix
+++ b/pkgs/by-name/ni/niri/package.nix
@@ -1,22 +1,26 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, nix-update-script
-, pkg-config
-, libdisplay-info
-, libxkbcommon
-, pango
-, pipewire
-, seatd
-, stdenv
-, wayland
-, systemd
-, libinput
-, mesa
-, fontconfig
-, libglvnd
-, autoPatchelfHook
-, clang
+{
+  lib,
+  clang,
+  dbus,
+  eudev,
+  fetchFromGitHub,
+  libdisplay-info,
+  libglvnd,
+  libinput,
+  libxkbcommon,
+  mesa,
+  nix-update-script,
+  pango,
+  pipewire,
+  pkg-config,
+  rustPlatform,
+  seatd,
+  systemd,
+  wayland,
+  withDbus ? true,
+  withDinit ? false,
+  withScreencastSupport ? true,
+  withSystemd ? true,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -26,10 +30,16 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "YaLTeR";
     repo = "niri";
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
     hash = "sha256-4YDrKMwXGVOBkeaISbxqf24rLuHvO98TnqxWYfgiSeg=";
   };
 
+  postPatch = ''
+    patchShebangs resources/niri-session
+    substituteInPlace resources/niri.service \
+      --replace-fail '/usr/bin' "$out/bin"
+  '';
+
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
@@ -38,56 +48,79 @@ rustPlatform.buildRustPackage rec {
     };
   };
 
+  strictDeps = true;
+
   nativeBuildInputs = [
+    clang
     pkg-config
     rustPlatform.bindgenHook
-    autoPatchelfHook
-    clang
-  ];
-
-  buildInputs = [
-    wayland
-    systemd # For libudev
-    seatd # For libseat
-    libdisplay-info
-    libxkbcommon
-    libinput
-    mesa # For libgbm
-    fontconfig
-    stdenv.cc.cc.lib
-    pipewire
-    pango
   ];
 
-  runtimeDependencies = [
-    wayland
-    mesa
-    libglvnd # For libEGL
-  ];
+  buildInputs =
+    [
+      libdisplay-info
+      libglvnd # For libEGL
+      libinput
+      libxkbcommon
+      mesa # For libgbm
+      pango
+      seatd
+      wayland # For libwayland-client
+    ]
+    ++ lib.optional (withDbus || withScreencastSupport || withSystemd) dbus
+    ++ lib.optional withScreencastSupport pipewire
+    ++ lib.optional withSystemd systemd # Includes libudev
+    ++ lib.optional (!withSystemd) eudev; # Use an alternative libudev implementation when building w/o systemd
 
-  passthru.providedSessions = [ "niri" ];
+  buildFeatures =
+    lib.optional withDbus "dbus"
+    ++ lib.optional withDinit "dinit"
+    ++ lib.optional withScreencastSupport "xdp-gnome-screencast"
+    ++ lib.optional withSystemd "systemd";
+  buildNoDefaultFeatures = true;
 
-  postPatch = ''
-    patchShebangs ./resources/niri-session
-    substituteInPlace ./resources/niri.service \
-      --replace-fail '/usr/bin' "$out/bin"
-  '';
+  postInstall =
+    ''
+      install -Dm0644 resources/niri.desktop -t $out/share/wayland-sessions
+    ''
+    + lib.optionalString withDbus ''
+      install -Dm0644 resources/niri-portals.conf -t $out/share/xdg-desktop-portal
+    ''
+    + lib.optionalString withSystemd ''
+      install -Dm0755 resources/niri-session -t $out/bin
+      install -Dm0644 resources/niri{-shutdown.target,.service} -t $out/share/systemd/user
+    '';
 
-  postInstall = ''
-    install -Dm0755 ./resources/niri-session -t $out/bin
-    install -Dm0644 resources/niri.desktop -t $out/share/wayland-sessions
-    install -Dm0644 resources/niri-portals.conf -t $out/share/xdg-desktop-portal
-    install -Dm0644 resources/niri{-shutdown.target,.service} -t $out/share/systemd/user
-  '';
+  env = {
+    # Force linking with libEGL and libwayland-client
+    # so they can be discovered by `dlopen()`
+    RUSTFLAGS = toString (
+      map (arg: "-C link-arg=" + arg) [
+        "-Wl,--push-state,--no-as-needed"
+        "-lEGL"
+        "-lwayland-client"
+        "-Wl,--pop-state"
+      ]
+    );
+  };
 
-  passthru.updateScript = nix-update-script { };
+  passthru = {
+    providedSessions = [ "niri" ];
+    updateScript = nix-update-script { };
+  };
 
-  meta = with lib; {
+  meta = {
     description = "Scrollable-tiling Wayland compositor";
     homepage = "https://github.com/YaLTeR/niri";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ iogamaster foo-dogsquared sodiboo ];
+    changelog = "https://github.com/YaLTeR/niri/releases/tag/v${version}";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
+      iogamaster
+      foo-dogsquared
+      sodiboo
+      getchoo
+    ];
     mainProgram = "niri";
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/oi/oidc-agent/package.nix b/pkgs/by-name/oi/oidc-agent/package.nix
index bfcc2accc9add..60d0c2b972a76 100644
--- a/pkgs/by-name/oi/oidc-agent/package.nix
+++ b/pkgs/by-name/oi/oidc-agent/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   curl,
-  webkitgtk,
+  webkitgtk_4_0,
   libmicrohttpd,
   libsecret,
   qrencode,
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     curl
-    webkitgtk
+    webkitgtk_4_0
     libmicrohttpd
     libsecret
     qrencode
diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix
index 6425ebe7eb748..3cecd70c66c48 100644
--- a/pkgs/by-name/os/osu-lazer-bin/package.nix
+++ b/pkgs/by-name/os/osu-lazer-bin/package.nix
@@ -25,7 +25,7 @@ let
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
-        hash = "sha256-PAbLw/IVJHe/y7YSyrTK9wJVcN3VIZYhrgDoHzYtjS8=";
+        hash = "sha256-2H2SPcUm/H/0D9BqBiTFvaCwd0c14/r+oWhyeZdNpoU=";
       };
     }
     .${stdenv.system} or (throw "osu-lazer-bin: ${stdenv.system} is unsupported.");
diff --git a/pkgs/by-name/ov/overlayed/package.nix b/pkgs/by-name/ov/overlayed/package.nix
index 19452d768d5b3..215b205d78eac 100644
--- a/pkgs/by-name/ov/overlayed/package.nix
+++ b/pkgs/by-name/ov/overlayed/package.nix
@@ -5,7 +5,7 @@
   pkg-config,
   openssl,
   libsoup,
-  webkitgtk,
+  webkitgtk_4_0,
   fetchFromGitHub,
   libayatana-appindicator,
 }:
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [
     openssl
-    webkitgtk
+    webkitgtk_4_0
     libsoup
   ];
 
diff --git a/pkgs/by-name/po/portfolio/package.nix b/pkgs/by-name/po/portfolio/package.nix
index 468d56e8d418e..c73b6985f341b 100644
--- a/pkgs/by-name/po/portfolio/package.nix
+++ b/pkgs/by-name/po/portfolio/package.nix
@@ -10,7 +10,7 @@
   openjdk17,
   stdenvNoCC,
   swt,
-  webkitgtk,
+  webkitgtk_4_0,
   wrapGAppsHook3,
   gitUpdater,
 }:
@@ -30,7 +30,7 @@ let
     gtk3
     libsecret
     swt
-    webkitgtk
+    webkitgtk_4_0
   ];
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
diff --git a/pkgs/by-name/po/pot/package.nix b/pkgs/by-name/po/pot/package.nix
index 72f6dd5e28896..bd1c7c4974726 100644
--- a/pkgs/by-name/po/pot/package.nix
+++ b/pkgs/by-name/po/pot/package.nix
@@ -14,7 +14,7 @@
   buildGoModule,
   libayatana-appindicator,
   gtk3,
-  webkitgtk,
+  webkitgtk_4_0,
   libsoup,
   openssl,
   xdotool,
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
     libsoup
     libayatana-appindicator
     openssl
-    webkitgtk
+    webkitgtk_4_0
     xdotool
   ];
 
diff --git a/pkgs/by-name/sn/snippetexpandergui/package.nix b/pkgs/by-name/sn/snippetexpandergui/package.nix
index 8434f86723051..5e5e6a60cda7e 100644
--- a/pkgs/by-name/sn/snippetexpandergui/package.nix
+++ b/pkgs/by-name/sn/snippetexpandergui/package.nix
@@ -6,7 +6,7 @@
 , installShellFiles
 , xorg
 , gtk3
-, webkitgtk
+, webkitgtk_4_0
 , snippetexpanderd
 , snippetexpanderx
 }:
@@ -32,7 +32,7 @@ buildGoModule rec {
   buildInputs = [
     xorg.libX11
     gtk3
-    webkitgtk
+    webkitgtk_4_0
     snippetexpanderd
     snippetexpanderx
   ];
diff --git a/pkgs/by-name/sq/squirreldisk/package.nix b/pkgs/by-name/sq/squirreldisk/package.nix
index f394cce79ada7..4ed9647730635 100644
--- a/pkgs/by-name/sq/squirreldisk/package.nix
+++ b/pkgs/by-name/sq/squirreldisk/package.nix
@@ -4,7 +4,7 @@
   freetype,
   libsoup,
   gtk3,
-  webkitgtk,
+  webkitgtk_4_0,
   pkg-config,
   wrapGAppsHook3,
   parallel-disk-usage,
@@ -66,7 +66,7 @@ in
     '';
 
     nativeBuildInputs = [pkg-config wrapGAppsHook3 copyDesktopItems];
-    buildInputs = [dbus openssl freetype libsoup gtk3 webkitgtk];
+    buildInputs = [dbus openssl freetype libsoup gtk3 webkitgtk_4_0];
 
     # Disable checkPhase, since the project doesn't contain tests
     doCheck = false;
diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix
index cb98c85bf45bf..d2fac70039691 100644
--- a/pkgs/by-name/te/telegraf/package.nix
+++ b/pkgs/by-name/te/telegraf/package.nix
@@ -9,7 +9,7 @@
 
 buildGo123Module rec {
   pname = "telegraf";
-  version = "1.32.0";
+  version = "1.32.1";
 
   subPackages = [ "cmd/telegraf" ];
 
@@ -17,10 +17,10 @@ buildGo123Module rec {
     owner = "influxdata";
     repo = "telegraf";
     rev = "v${version}";
-    hash = "sha256-ITTlHsoWPXHbGtmNOE0x1sCbeADWi4liOEqXXKQUeGU=";
+    hash = "sha256-CtfPREsU2LU7Ptn3FzEDlPeWVWP/OdtIITdUL7qKbgI=";
   };
 
-  vendorHash = "sha256-wKl6Rutt2QrF4nLxB5Ic6QlekrPUfHwdFZyTTdbK0HU=";
+  vendorHash = "sha256-WQbgGsGfyUGcgjXWjuyyCapeKgujoZD6HpKoFiIA//M=";
   proxyVendor = true;
 
   ldflags = [
diff --git a/pkgs/by-name/tr/treedome/package.nix b/pkgs/by-name/tr/treedome/package.nix
index 045823a5836e6..67023591b2b7f 100644
--- a/pkgs/by-name/tr/treedome/package.nix
+++ b/pkgs/by-name/tr/treedome/package.nix
@@ -15,7 +15,7 @@
 , openssl
 , pkg-config
 , rustPlatform
-, webkitgtk
+, webkitgtk_4_0
 , wrapGAppsHook3
 , sqlite
 }:
@@ -97,7 +97,7 @@ rustPlatform.buildRustPackage {
     freetype
     libsoup
     gtk3
-    webkitgtk
+    webkitgtk_4_0
     gsettings-desktop-schemas
     sqlite
   ];
diff --git a/pkgs/by-name/us/userborn/package.nix b/pkgs/by-name/us/userborn/package.nix
index 233a1ebb1264d..5290fd0543386 100644
--- a/pkgs/by-name/us/userborn/package.nix
+++ b/pkgs/by-name/us/userborn/package.nix
@@ -2,36 +2,29 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  makeBinaryWrapper,
-  mkpasswd,
+  libxcrypt,
   nixosTests,
   nix-update-script,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "userborn";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "nikstur";
     repo = "userborn";
     rev = version;
-    hash = "sha256-LEKdgmw1inBOi0sriG8laCrtx0ycqR5ftdnmszadx3U=";
+    hash = "sha256-ABePye1zuGDH74BL6AP05rR9eBOYu1SoVpd2TcZQMW8=";
   };
 
   sourceRoot = "${src.name}/rust/userborn";
 
-  cargoHash = "sha256-Pjzu6db2WomNsC+jNK1fr1u7koZwUvWPIY5JHMo1gkA=";
+  cargoHash = "sha256-/S2rkZyXHN5NiW9TFhKguqtf/udFcDOTfV2jYRMV14s=";
 
-  nativeBuildInputs = [ makeBinaryWrapper ];
+  nativeBuildInputs = [ rustPlatform.bindgenHook ];
 
-  buildInputs = [ mkpasswd ];
-
-  nativeCheckInputs = [ mkpasswd ];
-
-  postInstall = ''
-    wrapProgram $out/bin/userborn --prefix PATH : ${lib.makeBinPath [ mkpasswd ]}
-  '';
+  buildInputs = [ libxcrypt ];
 
   stripAllList = [ "bin" ];
 
@@ -51,8 +44,9 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     homepage = "https://github.com/nikstur/userborn";
     description = "Declaratively bear (manage) Linux users and groups";
+    changelog = "https://github.com/nikstur/userborn/blob/${version}/CHANGELOG.md";
     license = licenses.mit;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with lib.maintainers; [ nikstur ];
     mainProgram = "userborn";
   };
diff --git a/pkgs/by-name/xi/xiphos/package.nix b/pkgs/by-name/xi/xiphos/package.nix
index d3aaa70fc9af1..b6b01ae0770f6 100644
--- a/pkgs/by-name/xi/xiphos/package.nix
+++ b/pkgs/by-name/xi/xiphos/package.nix
@@ -22,7 +22,7 @@
 , minizip
 , pkg-config
 , sword
-, webkitgtk
+, webkitgtk_4_0
 , wrapGAppsHook3
 , yelp-tools
 , zip
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
     libuuid
     minizip
     sword
-    webkitgtk
+    webkitgtk_4_0
   ];
 
   cmakeFlags = [
diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix
index 0f9c89140a9a2..ec465aa8d7834 100644
--- a/pkgs/development/compilers/chicken/5/overrides.nix
+++ b/pkgs/development/compilers/chicken/5/overrides.nix
@@ -139,7 +139,7 @@ in
       addToNativeBuildInputs pkgs.taglib old
     );
   uuid-lib = addToBuildInputs pkgs.libuuid;
-  webview = addToBuildInputsWithPkgConfig pkgs.webkitgtk;
+  webview = addToBuildInputsWithPkgConfig pkgs.webkitgtk_4_0;
   ws-client = addToBuildInputs pkgs.zlib;
   xlib = addToPropagatedBuildInputs pkgs.xorg.libX11;
   yaml = addToBuildInputs pkgs.libyaml;
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 01f448cc732c7..ac803a8792110 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -461,31 +461,33 @@ self: super: {
 
   # Manually maintained
   cachix-api = overrideCabal (drv: {
-    version = "1.7.4";
+    version = "1.7.5";
     src = pkgs.fetchFromGitHub {
       owner = "cachix";
       repo = "cachix";
-      rev = "v1.7.4";
-      sha256 = "sha256-lHy5kgx6J8uD+16SO47dPrbob98sh+W1tf4ceSqPVK4=";
+      rev = "v1.7.5";
+      sha256 = "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs=";
     };
     postUnpack = "sourceRoot=$sourceRoot/cachix-api";
   }) super.cachix-api;
   cachix = (overrideCabal (drv: {
-    version = "1.7.4";
+    version = "1.7.5";
     src = pkgs.fetchFromGitHub {
       owner = "cachix";
       repo = "cachix";
-      rev = "v1.7.4";
-      sha256 = "sha256-lHy5kgx6J8uD+16SO47dPrbob98sh+W1tf4ceSqPVK4=";
+      rev = "v1.7.5";
+      sha256 = "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs=";
     };
     postUnpack = "sourceRoot=$sourceRoot/cachix";
   }) (lib.pipe
         (super.cachix.override {
           nix = self.hercules-ci-cnix-store.nixPackage;
+          hnix-store-core = self.hnix-store-core_0_8_0_0;
         })
         [
          (addBuildTool self.hercules-ci-cnix-store.nixPackage)
          (addBuildTool pkgs.buildPackages.pkg-config)
+         (addBuildDepend self.hnix-store-nar)
         ]
   ));
 
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 5502eb1703785..885e78c922d2f 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -124113,7 +124113,7 @@ self: {
   "gi-javascriptcore" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
-     , text, transformers, webkitgtk
+     , text, transformers, webkitgtk_4_0
      }:
      mkDerivation {
        pname = "gi-javascriptcore";
@@ -124124,11 +124124,11 @@ self: {
          base bytestring containers gi-glib gi-gobject haskell-gi
          haskell-gi-base haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ webkitgtk ];
+       libraryPkgconfigDepends = [ webkitgtk_4_0 ];
        description = "JavaScriptCore bindings";
        license = lib.licenses.lgpl21Only;
        badPlatforms = lib.platforms.darwin;
-     }) {inherit (pkgs) webkitgtk;};
+     }) {inherit (pkgs) webkitgtk_4_0;};
 
   "gi-javascriptcore_6_0_4" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
@@ -124469,7 +124469,7 @@ self: {
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk
      , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base
-     , haskell-gi-overloading, text, transformers, webkitgtk
+     , haskell-gi-overloading, text, transformers, webkitgtk_4_0
      }:
      mkDerivation {
        pname = "gi-webkit";
@@ -124484,17 +124484,17 @@ self: {
          gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi
          haskell-gi-base haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ webkitgtk ];
+       libraryPkgconfigDepends = [ webkitgtk_4_0 ];
        description = "WebKit bindings";
        license = lib.licenses.lgpl21Only;
        hydraPlatforms = lib.platforms.none;
-     }) {inherit (pkgs) webkitgtk;};
+     }) {inherit (pkgs) webkitgtk_4_0;};
 
   "gi-webkit2" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk
      , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base
-     , haskell-gi-overloading, text, transformers, webkitgtk
+     , haskell-gi-overloading, text, transformers, webkitgtk_4_0
      }:
      mkDerivation {
        pname = "gi-webkit2";
@@ -124509,17 +124509,17 @@ self: {
          gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi
          haskell-gi-base haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ webkitgtk ];
+       libraryPkgconfigDepends = [ webkitgtk_4_0 ];
        description = "WebKit2 bindings";
        license = lib.licenses.lgpl21Only;
        badPlatforms = lib.platforms.darwin;
-     }) {inherit (pkgs) webkitgtk;};
+     }) {inherit (pkgs) webkitgtk_4_0;};
 
   "gi-webkit2webextension" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk
      , gi-gio, gi-gobject, gi-gtk, gi-javascriptcore, gi-soup
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
-     , transformers, webkitgtk
+     , transformers, webkitgtk_4_0
      }:
      mkDerivation {
        pname = "gi-webkit2webextension";
@@ -124534,13 +124534,13 @@ self: {
          gi-javascriptcore gi-soup haskell-gi haskell-gi-base
          haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ webkitgtk ];
+       libraryPkgconfigDepends = [ webkitgtk_4_0 ];
        description = "WebKit2-WebExtension bindings";
        license = lib.licenses.lgpl21Only;
        badPlatforms = lib.platforms.darwin;
        hydraPlatforms = lib.platforms.none;
        broken = true;
-     }) {inherit (pkgs) webkitgtk;};
+     }) {inherit (pkgs) webkitgtk_4_0;};
 
   "gi-webkitwebprocessextension" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk
@@ -309518,7 +309518,7 @@ self: {
      , gi-gtk, gi-webkit2, gtk3, haskell-gi-base, http-types, lens
      , mime-types, mtl, network, process, random, scientific, split
      , tasty, tasty-quickcheck, text, transformers, unordered-containers
-     , utf8-string, vector, webkitgtk, xdg-basedir, xmonad
+     , utf8-string, vector, webkitgtk_4_0, xdg-basedir, xmonad
      , xmonad-contrib
      }:
      mkDerivation {
@@ -309537,7 +309537,7 @@ self: {
          mime-types mtl network process random scientific split text
          transformers unordered-containers utf8-string vector xdg-basedir
        ];
-       executablePkgconfigDepends = [ gtk3 webkitgtk ];
+       executablePkgconfigDepends = [ gtk3 webkitgtk_4_0 ];
        testHaskellDepends = [
          aeson base bytestring containers dbus directory filepath gi-gdk
          gi-gio gi-glib gi-gtk gi-webkit2 haskell-gi-base http-types lens
@@ -309550,7 +309550,7 @@ self: {
        hydraPlatforms = lib.platforms.none;
        mainProgram = "tianbar";
        broken = true;
-     }) {inherit (pkgs) gtk3; inherit (pkgs) webkitgtk;};
+     }) {inherit (pkgs) gtk3; inherit (pkgs) webkitgtk_4_0;};
 
   "tibetan-utils" = callPackage
     ({ mkDerivation, base, composition-prelude, hspec, hspec-megaparsec
@@ -332056,30 +332056,30 @@ self: {
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base ];
        libraryPkgconfigDepends = [ webkit ];
-       description = "JavaScriptCore FFI from webkitgtk";
+       description = "JavaScriptCore FFI from webkitgtk_4_0";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {webkit = null;};
 
   "webkit2gtk3-javascriptcore" = callPackage
-    ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }:
+    ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk_4_0 }:
      mkDerivation {
        pname = "webkit2gtk3-javascriptcore";
        version = "0.14.4.6";
        sha256 = "06g9ik2pzv761bj5kas17jxh6wxks3dd4vvrimliybs5s5b61b24";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base ];
-       libraryPkgconfigDepends = [ webkitgtk ];
-       description = "JavaScriptCore FFI from webkitgtk";
+       libraryPkgconfigDepends = [ webkitgtk_4_0 ];
+       description = "JavaScriptCore FFI from webkitgtk_4_0";
        license = lib.licenses.bsd3;
        badPlatforms = lib.platforms.darwin;
-     }) {inherit (pkgs) webkitgtk;};
+     }) {inherit (pkgs) webkitgtk_4_0;};
 
   "webkitgtk3" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, glib
      , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers
-     , webkitgtk
+     , webkitgtk_4_0
      }:
      mkDerivation {
        pname = "webkitgtk3";
@@ -332090,27 +332090,27 @@ self: {
        libraryHaskellDepends = [
          base bytestring cairo glib gtk3 mtl pango text transformers
        ];
-       libraryPkgconfigDepends = [ webkitgtk ];
+       libraryPkgconfigDepends = [ webkitgtk_4_0 ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the Webkit library";
        license = lib.licenses.lgpl21Only;
        hydraPlatforms = lib.platforms.none;
        broken = true;
-     }) {inherit (pkgs) webkitgtk;};
+     }) {inherit (pkgs) webkitgtk_4_0;};
 
   "webkitgtk3-javascriptcore" = callPackage
-    ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }:
+    ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk_4_0 }:
      mkDerivation {
        pname = "webkitgtk3-javascriptcore";
        version = "0.14.2.1";
        sha256 = "0kcjrka0c9ifq3zfhmkv05wy3xb7v0cyznfxldp2gjcn1haq084j";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base ];
-       libraryPkgconfigDepends = [ webkitgtk ];
-       description = "JavaScriptCore FFI from webkitgtk";
+       libraryPkgconfigDepends = [ webkitgtk_4_0 ];
+       description = "JavaScriptCore FFI from webkitgtk_4_0";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
-     }) {inherit (pkgs) webkitgtk;};
+     }) {inherit (pkgs) webkitgtk_4_0;};
 
   "webmention" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, either
diff --git a/pkgs/development/libraries/rnnoise-plugin/default.nix b/pkgs/development/libraries/rnnoise-plugin/default.nix
index 13107bfcb13be..4cf983add42b0 100644
--- a/pkgs/development/libraries/rnnoise-plugin/default.nix
+++ b/pkgs/development/libraries/rnnoise-plugin/default.nix
@@ -6,7 +6,7 @@
 , gtk3-x11
 , pcre
 , pkg-config
-, webkitgtk
+, webkitgtk_4_0
 , xorg
 , WebKit
 , MetalKit
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
       xorg.libX11
       xorg.libXrandr
     ] ++ lib.optionals stdenv.hostPlatform.isLinux [
-      webkitgtk
+      webkitgtk_4_0
     ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
       WebKit
       MetalKit
diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix
index 21333afe5e8ee..1379a15801e6c 100644
--- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix
+++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix
@@ -20,7 +20,7 @@
 , withEGL ? true
 , withMesa ? !stdenv.hostPlatform.isDarwin
 , withWebKit ? stdenv.hostPlatform.isDarwin
-, webkitgtk
+, webkitgtk_4_0
 , setfile
 , AGL
 , Carbon
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optional withCurl curl
   ++ lib.optional withMesa libGLU
-  ++ lib.optional (withWebKit && !stdenv.hostPlatform.isDarwin) webkitgtk
+  ++ lib.optional (withWebKit && !stdenv.hostPlatform.isDarwin) webkitgtk_4_0
   ++ lib.optional (withWebKit && stdenv.hostPlatform.isDarwin) WebKit
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     setfile
diff --git a/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/pkgs/development/libraries/wxwidgets/wxGTK32.nix
index 055000cfa68c7..fed9c53306108 100644
--- a/pkgs/development/libraries/wxwidgets/wxGTK32.nix
+++ b/pkgs/development/libraries/wxwidgets/wxGTK32.nix
@@ -22,7 +22,7 @@
 , unicode ? true
 , withMesa ? !stdenv.hostPlatform.isDarwin
 , withWebKit ? true
-, webkitgtk
+, webkitgtk_4_0
 , setfile
 , AGL
 , Carbon
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
     xorgproto
   ]
   ++ lib.optional withMesa libGLU
-  ++ lib.optional (withWebKit && stdenv.hostPlatform.isLinux) webkitgtk
+  ++ lib.optional (withWebKit && stdenv.hostPlatform.isLinux) webkitgtk_4_0
   ++ lib.optional (withWebKit && stdenv.hostPlatform.isDarwin) WebKit
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     expat
diff --git a/pkgs/development/lisp-modules/ql.nix b/pkgs/development/lisp-modules/ql.nix
index af6334671230e..9ce7655903a70 100644
--- a/pkgs/development/lisp-modules/ql.nix
+++ b/pkgs/development/lisp-modules/ql.nix
@@ -65,7 +65,7 @@ let
       nativeLibs = [ pkgs.sqlite ];
     });
     cl-webkit2 = super.cl-webkit2.overrideLispAttrs (o: {
-      nativeLibs = [ pkgs.webkitgtk ];
+      nativeLibs = [ pkgs.webkitgtk_4_0 ];
     });
     dbd-mysql = super.dbd-mysql.overrideLispAttrs (o: {
       nativeLibs = [ pkgs.mariadb.client ];
diff --git a/pkgs/development/misc/juce/default.nix b/pkgs/development/misc/juce/default.nix
index cbb5411314f01..610434dfe624b 100644
--- a/pkgs/development/misc/juce/default.nix
+++ b/pkgs/development/misc/juce/default.nix
@@ -13,7 +13,7 @@
 , freetype
 , curl
 , libglvnd
-, webkitgtk
+, webkitgtk_4_0
 , pcre
 , darwin
 }:
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib # libasound.so
     libglvnd # libGL.so
-    webkitgtk # webkit2gtk-4.0
+    webkitgtk_4_0 # webkit2gtk-4.0
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
     darwin.apple_sdk.frameworks.Cocoa
     darwin.apple_sdk.frameworks.MetalKit
diff --git a/pkgs/development/python-modules/asn1tools/default.nix b/pkgs/development/python-modules/asn1tools/default.nix
index cd0b3a0895bbf..8ca21fece1476 100644
--- a/pkgs/development/python-modules/asn1tools/default.nix
+++ b/pkgs/development/python-modules/asn1tools/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "asn1tools";
-  version = "0.166.0";
+  version = "0.167.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,17 +23,17 @@ buildPythonPackage rec {
     owner = "eerimoq";
     repo = "asn1tools";
     rev = "refs/tags/${version}";
-    hash = "sha256-TWAOML6nsLX3TYqoQ9fcSjrUmC4byXOfczfkmSaSa0k=";
+    hash = "sha256-86bdBYlAVJfd3EY8s0t6ZDRA/qZVWuHD4Jxa1n1Ke5E=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     bitstruct
     pyparsing
   ];
 
-  passthru.optional-depdendencies = {
+  optional-dependencies = {
     shell = [ prompt-toolkit ];
     cache = [ diskcache ];
   };
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytest-xdist
     pytestCheckHook
-  ] ++ lib.flatten (builtins.attrValues passthru.optional-depdendencies);
+  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "asn1tools" ];
 
@@ -53,10 +53,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "ASN.1 parsing, encoding and decoding";
-    mainProgram = "asn1tools";
     homepage = "https://github.com/eerimoq/asn1tools";
     changelog = "https://github.com/eerimoq/asn1tools/releases/tag/${version}";
     license = licenses.mit;
     maintainers = [ ];
+    mainProgram = "asn1tools";
   };
 }
diff --git a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix
index 0795b7aaee8e6..ef8e70ef1305b 100644
--- a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix
+++ b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix
@@ -5,6 +5,8 @@
   dissect-util,
   fetchFromGitHub,
   flow-record,
+  hatch-vcs,
+  hatchling,
   httpx,
   lark,
   pycryptodome,
@@ -13,13 +15,11 @@
   pytestCheckHook,
   pythonOlder,
   rich,
-  setuptools,
-  setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "dissect-cobaltstrike";
-  version = "1.0.0";
+  version = "1.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -28,12 +28,12 @@ buildPythonPackage rec {
     owner = "fox-it";
     repo = "dissect.cobaltstrike";
     rev = "refs/tags/v${version}";
-    hash = "sha256-CS50c3r7sdxp3CRS6XJ4QUmUFtmhFg6rSdKfYzJSOV4=";
+    hash = "sha256-GMpMTsI4mepaOGhw7/cSymkcxzn4mlNS1ZKYGYut+LM=";
   };
 
   build-system = [
-    setuptools
-    setuptools-scm
+    hatch-vcs
+    hatchling
   ];
 
   dependencies = [
@@ -78,8 +78,5 @@ buildPythonPackage rec {
     changelog = "https://github.com/fox-it/dissect.cobaltstrike/releases/tag/${version}";
     license = licenses.agpl3Only;
     maintainers = with maintainers; [ fab ];
-    # Compatibility with dissect.struct 4.x
-    # https://github.com/fox-it/dissect.cobaltstrike/issues/53
-    broken = versionAtLeast dissect-cstruct.version "4";
   };
 }
diff --git a/pkgs/development/python-modules/dvc-task/default.nix b/pkgs/development/python-modules/dvc-task/default.nix
index 76ad62960875a..6c4ea111ce533 100644
--- a/pkgs/development/python-modules/dvc-task/default.nix
+++ b/pkgs/development/python-modules/dvc-task/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "dvc-task";
-  version = "0.40.1";
+  version = "0.40.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = "dvc-task";
     rev = "refs/tags/${version}";
-    hash = "sha256-r5rBY4g4S4VaifGCK3bGx6arjPoGZI9th2T9LDC5wfI=";
+    hash = "sha256-bRQJLncxCigYPEtlvKjUtKqhcBkB7erEtoJQ30yGamE=";
   };
 
   build-system = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/pylitejet/default.nix b/pkgs/development/python-modules/pylitejet/default.nix
new file mode 100644
index 0000000000000..b55bf38bd513f
--- /dev/null
+++ b/pkgs/development/python-modules/pylitejet/default.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pyserial,
+  pythonOlder,
+  setuptools-scm,
+}:
+
+buildPythonPackage rec {
+  pname = "pylitejet";
+  version = "0.6.3";
+  pyproject = true;
+
+  disabled = pythonOlder "3.10";
+
+  src = fetchFromGitHub {
+    owner = "joncar";
+    repo = "pylitejet";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-LHNMKU7aMDtSi4K+pZqRF9vAL3EKOFRFFNXKsQJVP2Y=";
+  };
+
+  build-system = [ setuptools-scm ];
+
+  dependencies = [ pyserial ];
+
+  # Only custom tests which uses the CLi are available
+  doCheck = false;
+
+  pythonImportsCheck = [ "pylitejet" ];
+
+  meta = {
+    description = "Library for interfacing with the LiteJet lighting system";
+    homepage = "https://github.com/joncar/pylitejet";
+    changelog = "https://github.com/joncar/pylitejet/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/development/python-modules/pynmeagps/default.nix b/pkgs/development/python-modules/pynmeagps/default.nix
index 99964e420c00a..417b80b29779c 100644
--- a/pkgs/development/python-modules/pynmeagps/default.nix
+++ b/pkgs/development/python-modules/pynmeagps/default.nix
@@ -3,32 +3,31 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
+  pytest-cov-stub,
   pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pynmeagps";
-  version = "1.0.42";
+  version = "1.0.43";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "semuconsulting";
     repo = "pynmeagps";
     rev = "refs/tags/v${version}";
-    hash = "sha256-hlGqc4vZ/C98vQwJewK0cfC3zP9xyO0oXXtlyNUDg0Y=";
+    hash = "sha256-U5AI6iQiMvlCfL0SMAl0PkwC/orCr57royWvHKvWpAI=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "--cov --cov-report html --cov-fail-under 98" ""
-  '';
-
   build-system = [ setuptools ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-cov-stub
+  ];
 
   pythonImportsCheck = [ "pynmeagps" ];
 
diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix
index dd82fbca2cb46..729d98a9e0ceb 100644
--- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix
+++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix
@@ -2,46 +2,54 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pytestCheckHook,
   mock,
-  pytest-cov,
-  coverage,
-  future,
+  pytest-cov-stub,
+  pytestCheckHook,
+  pythonOlder,
+  setuptools,
   ujson,
+  versioneer,
 }:
 
 buildPythonPackage rec {
   pname = "python-jsonrpc-server";
   version = "0.4.0";
-  format = "setuptools";
+  pyproject = true;
+
+  disabled = pythonOlder "3.11";
 
   src = fetchFromGitHub {
     owner = "palantir";
     repo = "python-jsonrpc-server";
-    rev = version;
-    sha256 = "0pcf50qvcxqnz3db58whqd8z89cdph19pfs1whgfm0zmwbwk0lw6";
+    rev = "refs/tags/${version}";
+    hash = "sha256-hlMw+eL1g+oe5EG7mwK8jSX0UcOQo7La+BZ3tjEojl0=";
   };
 
   postPatch = ''
-    sed -i "s/version=versioneer.get_version(),/version=\"$version\",/g" setup.py
+    # Remove vendorized versioneer.py
+    rm versioneer.py
   '';
 
+  build-system = [
+    setuptools
+    versioneer
+  ];
+
+  dependencies = [ ujson ];
+
   nativeCheckInputs = [
-    pytestCheckHook
     mock
-    pytest-cov
-    coverage
+    pytest-cov-stub
+    pytestCheckHook
   ];
 
-  propagatedBuildInputs = [
-    future
-    ujson
-  ];
+  pythonImportsCheck = [ "pyls_jsonrpc" ];
 
   meta = with lib; {
+    description = "Module for erver implementation of the JSON RPC 2.0 protocol";
     homepage = "https://github.com/palantir/python-jsonrpc-server";
-    description = "Python 2 and 3 asynchronous JSON RPC server";
+    changelog = "https://github.com/palantir/python-jsonrpc-server/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = [ maintainers.mic92 ];
+    maintainers = with maintainers; [ mic92 ];
   };
 }
diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix
index 572a4417ccad3..a0b7767fd1bb1 100644
--- a/pkgs/development/python-modules/reflex/default.nix
+++ b/pkgs/development/python-modules/reflex/default.nix
@@ -47,7 +47,7 @@
 
 buildPythonPackage rec {
   pname = "reflex";
-  version = "0.6.1";
+  version = "0.6.2.post1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -56,7 +56,7 @@ buildPythonPackage rec {
     owner = "reflex-dev";
     repo = "reflex";
     rev = "refs/tags/v${version}";
-    hash = "sha256-p7o7e/OBX8P5QKsHNInKKQO1jklTr61SXuGk+ceakJU=";
+    hash = "sha256-JW1hebcoBMMEirJkJ5Cquh23p9Gv3RU5AxPbXUcwPK4=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/wxpython/4.2.nix b/pkgs/development/python-modules/wxpython/4.2.nix
index be3a181da9aaf..89eac63a4a7e6 100644
--- a/pkgs/development/python-modules/wxpython/4.2.nix
+++ b/pkgs/development/python-modules/wxpython/4.2.nix
@@ -30,7 +30,7 @@
   mesa,
   pango,
   SDL,
-  webkitgtk,
+  webkitgtk_4_0,
   wxGTK,
   xorgproto,
 
@@ -93,7 +93,7 @@ buildPythonPackage rec {
       libXxf86vm
       libglvnd
       mesa
-      webkitgtk
+      webkitgtk_4_0
       xorgproto
     ];
 
diff --git a/pkgs/development/tools/devpod/default.nix b/pkgs/development/tools/devpod/default.nix
index 057c0d1e9df57..2236d27be2b36 100644
--- a/pkgs/development/tools/devpod/default.nix
+++ b/pkgs/development/tools/devpod/default.nix
@@ -18,7 +18,7 @@
 , rustPlatform
 , stdenv
 , testers
-, webkitgtk
+, webkitgtk_4_0
 }:
 
 let
@@ -146,7 +146,7 @@ rec {
       ] ++ lib.optionals stdenv.hostPlatform.isLinux [
         gtk3
         libayatana-appindicator
-        webkitgtk
+        webkitgtk_4_0
       ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
         darwin.apple_sdk.frameworks.Carbon
         darwin.apple_sdk.frameworks.Cocoa
diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/development/tools/eclipse-mat/default.nix
index 5aea91699a22e..6c698c3a517f7 100644
--- a/pkgs/development/tools/eclipse-mat/default.nix
+++ b/pkgs/development/tools/eclipse-mat/default.nix
@@ -14,7 +14,7 @@
 , shared-mime-info
 , stdenv
 , unzip
-, webkitgtk
+, webkitgtk_4_0
 , zlib
 }:
 
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
     # Create wrapper script.  Pass -configuration to store settings in ~/.eclipse-mat/<version>
     makeWrapper $out/mat/MemoryAnalyzer $out/bin/eclipse-mat \
       --prefix PATH : ${jdk}/bin \
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk ])} \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk_4_0 ])} \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
       --add-flags "-configuration \$HOME/.eclipse-mat/''${version}/configuration"
 
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
     libXtst
     zlib
     shared-mime-info
-    webkitgtk
+    webkitgtk_4_0
   ];
 
   dontBuild = true;
diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix
index de73c6b637641..4ae5a8bd63a57 100644
--- a/pkgs/development/tools/wails/default.nix
+++ b/pkgs/development/tools/wails/default.nix
@@ -9,7 +9,7 @@
 , zlib
   # Linux specific dependencies
 , gtk3
-, webkitgtk
+, webkitgtk_4_0
 }:
 
 buildGoModule rec {
@@ -48,7 +48,7 @@ buildGoModule rec {
     nodejs
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [
     gtk3
-    webkitgtk
+    webkitgtk_4_0
   ];
 
   ldflags = [
@@ -60,7 +60,7 @@ buildGoModule rec {
   postFixup = ''
     wrapProgram $out/bin/wails \
       --prefix PATH : ${lib.makeBinPath [ pkg-config go stdenv.cc nodejs ]} \
-      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath (lib.optionals stdenv.hostPlatform.isLinux [ gtk3 webkitgtk ])}" \
+      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath (lib.optionals stdenv.hostPlatform.isLinux [ gtk3 webkitgtk_4_0 ])}" \
       --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH" \
       --set CGO_LDFLAGS "-L${lib.makeLibraryPath [ zlib ]}"
   '';
diff --git a/pkgs/development/web/cog/default.nix b/pkgs/development/web/cog/default.nix
index e9352822b3bb8..7de90857c06e9 100644
--- a/pkgs/development/web/cog/default.nix
+++ b/pkgs/development/web/cog/default.nix
@@ -8,7 +8,7 @@
 , libwpe
 , libwpe-fdo
 , glib-networking
-, webkitgtk
+, webkitgtk_4_0
 , makeWrapper
 , wrapGAppsHook3
 , adwaita-icon-theme
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     wayland
     libwpe
     libwpe-fdo
-    webkitgtk
+    webkitgtk_4_0
     glib-networking
     gdk-pixbuf
     adwaita-icon-theme
diff --git a/pkgs/games/gamehub/default.nix b/pkgs/games/gamehub/default.nix
index 3bfbe71c3c0e8..4367de30f5d95 100644
--- a/pkgs/games/gamehub/default.nix
+++ b/pkgs/games/gamehub/default.nix
@@ -13,7 +13,7 @@
 , libsoup
 , json-glib
 , sqlite
-, webkitgtk
+, webkitgtk_4_0
 , libmanette
 , libXtst
 , wrapGAppsHook3
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     libsoup
     libXtst
     sqlite
-    webkitgtk
+    webkitgtk_4_0
   ];
 
   meta = with lib; {
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 3f54c8c7f0b3b..58dbbd5cc0a17 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2414,7 +2414,8 @@
     "lirc" = ps: with ps; [
     ]; # missing inputs: python-lirc
     "litejet" = ps: with ps; [
-    ]; # missing inputs: pylitejet
+      pylitejet
+    ];
     "litterrobot" = ps: with ps; [
       pylitterbot
     ];
@@ -5404,6 +5405,7 @@
     "light"
     "linear_garage_door"
     "linkplay"
+    "litejet"
     "litterrobot"
     "livisi"
     "local_calendar"
diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix
index 82f9eca8d88d8..53a5601c5171b 100644
--- a/pkgs/servers/nfs-ganesha/default.nix
+++ b/pkgs/servers/nfs-ganesha/default.nix
@@ -1,18 +1,38 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
-, krb5, xfsprogs, jemalloc, dbus, libcap
-, ntirpc, liburcu, bison, flex, nfs-utils, acl
-} :
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  sphinx,
+  krb5,
+  xfsprogs,
+  jemalloc,
+  dbus,
+  libcap,
+  ntirpc,
+  liburcu,
+  bison,
+  flex,
+  nfs-utils,
+  acl,
+}:
 
 stdenv.mkDerivation rec {
   pname = "nfs-ganesha";
   version = "6.1";
-  outputs = [ "out" "tools" ];
+
+  outputs = [
+    "out"
+    "man"
+    "tools"
+  ];
 
   src = fetchFromGitHub {
     owner = "nfs-ganesha";
     repo = "nfs-ganesha";
     rev = "V${version}";
-    sha256 = "sha256-XQpbQ7NXVGVbm99d1ZEh1ckR5fd81xwZw8HorXHaeBk=";
+    hash = "sha256-XQpbQ7NXVGVbm99d1ZEh1ckR5fd81xwZw8HorXHaeBk=";
   };
 
   preConfigure = "cd src";
@@ -23,6 +43,7 @@ stdenv.mkDerivation rec {
     "-DENABLE_VFS_POSIX_ACL=ON"
     "-DUSE_ACL_MAPPING=ON"
     "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON"
+    "-DUSE_MAN_PAGE=ON"
   ];
 
   nativeBuildInputs = [
@@ -30,6 +51,7 @@ stdenv.mkDerivation rec {
     pkg-config
     bison
     flex
+    sphinx
   ];
 
   buildInputs = [
@@ -63,6 +85,10 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     license = licenses.lgpl3Plus;
     mainProgram = "ganesha.nfsd";
-    outputsToInstall = [ "out" "tools" ];
+    outputsToInstall = [
+      "out"
+      "man"
+      "tools"
+    ];
   };
 }
diff --git a/pkgs/tools/misc/archi/default.nix b/pkgs/tools/misc/archi/default.nix
index 7afbce58c1066..9f3edad29a3b0 100644
--- a/pkgs/tools/misc/archi/default.nix
+++ b/pkgs/tools/misc/archi/default.nix
@@ -4,7 +4,7 @@
 , makeWrapper
 , jdk
 , libsecret
-, webkitgtk
+, webkitgtk_4_0
 , wrapGAppsHook3
 , _7zz
 , nixosTests
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
 
         install -D -m755 Archi $out/libexec/Archi
         makeWrapper $out/libexec/Archi $out/bin/Archi \
-          --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ webkitgtk ])} \
+          --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ webkitgtk_4_0 ])} \
           --set WEBKIT_DISABLE_DMABUF_RENDERER 1 \
           --prefix PATH : ${jdk}/bin
       ''
diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix
index 7b92c9e3e86b1..866d56b156ea0 100644
--- a/pkgs/tools/misc/birdfont/default.nix
+++ b/pkgs/tools/misc/birdfont/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, pkg-config, python3, xmlbird,
-cairo, gdk-pixbuf, libgee, glib, gtk3, webkitgtk, libnotify, sqlite, vala,
+cairo, gdk-pixbuf, libgee, glib, gtk3, webkitgtk_4_0, libnotify, sqlite, vala,
 gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook3, autoPatchelfHook }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ python3 pkg-config vala gobject-introspection wrapGAppsHook3 autoPatchelfHook ];
-  buildInputs = [ xmlbird libgee cairo gdk-pixbuf glib gtk3 webkitgtk libnotify sqlite gsettings-desktop-schemas ];
+  buildInputs = [ xmlbird libgee cairo gdk-pixbuf glib gtk3 webkitgtk_4_0 libnotify sqlite gsettings-desktop-schemas ];
 
   postPatch = ''
     substituteInPlace install.py \
diff --git a/pkgs/tools/misc/panoply/default.nix b/pkgs/tools/misc/panoply/default.nix
index 94ff8e10bb7ee..78bd166a5f6ff 100644
--- a/pkgs/tools/misc/panoply/default.nix
+++ b/pkgs/tools/misc/panoply/default.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "panoply";
-  version = "5.5.2";
+  version = "5.5.3";
 
   src = fetchurl {
     url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz";
-    hash = "sha256-ff7O3pW8/2CDXrd6CU+ygFeyNoGNCeTHIH7cdm+k8TE=";
+    hash = "sha256-TCuCLWMVp7t0JpHA6TbwUdURj/aBggzLa9I7llRY0TU=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix
index 8bf1f080f2320..0880780eb65b8 100644
--- a/pkgs/tools/networking/burpsuite/default.nix
+++ b/pkgs/tools/networking/burpsuite/default.nix
@@ -9,20 +9,20 @@
 }:
 
 let
-  version = "2024.8.2";
+  version = "2024.8.4";
 
   product =
     if proEdition then
       {
         productName = "pro";
         productDesktop = "Burp Suite Professional Edition";
-        hash = "sha256-8CCe/x++0djfLPc/hgDl4hkKexpIcf1tVU7c+kKXdBo=";
+        hash = "sha256-JWG0iNnQJgMqNsMSZIzFCmss6JhvZ9r7lFHuX46+3Mg=";
       }
     else
       {
         productName = "community";
         productDesktop = "Burp Suite Community Edition";
-        hash = "sha256-amaDDHIsdX+8j8ELbFu/etaXWS04XsrHGslJeg04uKU=";
+        hash = "sha256-a+TozSXpwyBlxPztASb4fqGZGn8Asg2/GxKzhIpEuyE=";
       };
 
   src = fetchurl {
diff --git a/pkgs/tools/networking/gp-saml-gui/default.nix b/pkgs/tools/networking/gp-saml-gui/default.nix
index f28306880f629..1426d13ed22b2 100644
--- a/pkgs/tools/networking/gp-saml-gui/default.nix
+++ b/pkgs/tools/networking/gp-saml-gui/default.nix
@@ -2,7 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , buildPythonPackage
-, webkitgtk
+, webkitgtk_4_0
 , wrapGAppsHook3
 , glib-networking
 , gobject-introspection
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     requests
     pygobject3
     openconnect
-  ] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk;
+  ] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_0;
 
   preFixup = ''
     gappsWrapperArgs+=(
diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile
index 4f192e3a6c104..6a412fbea7bea 100644
--- a/pkgs/tools/security/metasploit/Gemfile
+++ b/pkgs/tools/security/metasploit/Gemfile
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 source "https://rubygems.org"
 
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.29"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.30"
diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock
index 74f56fe453df9..aecfc060bfbf4 100644
--- a/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/rapid7/metasploit-framework
-  revision: 6f37955454995e39746353a01aeb6d9d58221d1c
-  ref: refs/tags/6.4.29
+  revision: 8207579ba1f213b890b0125f4cb185672dec1d2c
+  ref: refs/tags/6.4.30
   specs:
-    metasploit-framework (6.4.29)
+    metasploit-framework (6.4.30)
       aarch64
       abbrev
       actionpack (~> 7.0.0)
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index 880cf0eb08ce7..d412fe12d939c 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -15,13 +15,13 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "metasploit-framework";
-  version = "6.4.29";
+  version = "6.4.30";
 
   src = fetchFromGitHub {
     owner = "rapid7";
     repo = "metasploit-framework";
     rev = "refs/tags/${version}";
-    hash = "sha256-qu5zK/QC9/DapYanw3lvMLdRso8PAndKSJukQaazoZs=";
+    hash = "sha256-iLL6ssEfms+AfHA2VMjm4jaKxLlrYmb4QmNAB1HWNc0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix
index 92ed07649dd65..2f299e7476aeb 100644
--- a/pkgs/tools/security/metasploit/gemset.nix
+++ b/pkgs/tools/security/metasploit/gemset.nix
@@ -724,12 +724,12 @@
     platforms = [];
     source = {
       fetchSubmodules = false;
-      rev = "6f37955454995e39746353a01aeb6d9d58221d1c";
-      sha256 = "16x1nfk4394v9157f0hgiyr53drhdxww79w6lpdg1xq2yhmp7vma";
+      rev = "8207579ba1f213b890b0125f4cb185672dec1d2c";
+      sha256 = "1k9msr8hfh338bw6cqkbp728ldp2wv458dkhgj0cz6hzq6rgmcl8";
       type = "git";
       url = "https://github.com/rapid7/metasploit-framework";
     };
-    version = "6.4.29";
+    version = "6.4.30";
   };
   metasploit-model = {
     groups = ["default"];
diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix
index 94a24211f9a39..4981ec2a7a0ce 100644
--- a/pkgs/tools/typesetting/fop/default.nix
+++ b/pkgs/tools/typesetting/fop/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchurl
+, fetchpatch
 , ant
 , jdk
 , jre
@@ -17,6 +18,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-b7Av17wu6Ar/npKOiwYqzlvBFSIuXTpqTacM1sxtBvc=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2024-28168.patch";
+      url = "https://github.com/apache/xmlgraphics-fop/commit/d96ba9a11710d02716b6f4f6107ebfa9ccec7134.patch";
+      hash = "sha256-zmUA1Tq6iZtvNECCiXebXodp6AikBn10NTZnVHpPMlw=";
+    })
+  ];
+
   nativeBuildInputs = [
     ant
     jdk
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f354ad83bb314..93cc6462b1013 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -561,6 +561,12 @@ mapAliases {
   gmtp = throw "'gmtp' has been removed due to lack of maintenance upstream. Consider using 'gnome-music' instead"; # Added 2024-09-14
   gnome-latex = throw "'gnome-latex' has been superseded by 'enter-tex'"; # Added 2024-09-18
   gnu-cobol = gnucobol; # Added 2024-09-17
+  gogs = throw ''
+    Gogs development has stalled. Also, it has several unpatched, critical vulnerabilities that
+    weren't addressed within a year: https://github.com/gogs/gogs/issues/7777
+
+    Consider migrating to forgejo or gitea.
+  ''; # Added 2024-10-12
   go-dependency-manager = throw "'go-dependency-manager' is unmaintained and the go community now uses 'go.mod' mostly instead"; # Added 2023-10-04
   gotktrix = throw "'gotktrix' has been removed, as it was broken and unmaintained"; # Added 2023-12-06
   git-backup = throw "git-backup has been removed, as it has been abandoned upstream. Consider using git-backup-go instead.";
@@ -1698,6 +1704,7 @@ mapAliases {
   waypoint = throw "waypoint has been removed from nixpkgs as the upstream project was archived"; # Added 2024-04-24
   wcm = throw "'wcm' has been renamed to/replaced by 'wayfirePlugins.wcm'"; # Add 2023-07-29
   webkitgtk_5_0 = throw "'webkitgtk_5_0' has been superseded by 'webkitgtk_6_0'"; # Added 2023-02-25
+  webkitgtk = lib.warn "Explicitly set the ABI version of 'webkitgtk'" webkitgtk_4_0;
   wineWayland = wine-wayland;
   win-qemu = throw "'win-qemu' has been replaced by 'virtio-win'"; # Added 2023-08-16
   win-virtio = virtio-win; # Added 2023-10-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c71f23b614ab..514724106a30a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7887,8 +7887,6 @@ with pkgs;
 
   gitqlient = libsForQt5.callPackage ../applications/version-management/gitqlient { };
 
-  gogs = callPackage ../applications/version-management/gogs { };
-
   git-latexdiff = callPackage ../tools/typesetting/git-latexdiff { };
 
   gokart = callPackage ../development/tools/gokart { };
@@ -23508,17 +23506,17 @@ with pkgs;
 
   wcslib = callPackage ../development/libraries/science/astronomy/wcslib { };
 
-  webkitgtk = callPackage ../development/libraries/webkitgtk {
+  webkitgtk_4_0 = callPackage ../development/libraries/webkitgtk {
     harfbuzz = harfbuzzFull;
     inherit (gst_all_1) gst-plugins-base gst-plugins-bad;
     inherit (darwin) apple_sdk;
   };
 
-  webkitgtk_4_1 = webkitgtk.override {
+  webkitgtk_4_1 = webkitgtk_4_0.override {
     libsoup = libsoup_3;
   };
 
-  webkitgtk_6_0 = webkitgtk.override {
+  webkitgtk_6_0 = webkitgtk_4_0.override {
     libsoup = libsoup_3;
     gtk3 = gtk4;
   };
@@ -25968,8 +25966,6 @@ with pkgs;
 
   kmod = callPackage ../os-specific/linux/kmod { };
 
-  kmod-blacklist-ubuntu = callPackage ../os-specific/linux/kmod-blacklist-ubuntu { };
-
   kmod-debian-aliases = callPackage ../os-specific/linux/kmod-debian-aliases { };
 
   libcap = callPackage ../os-specific/linux/libcap { };
@@ -29129,11 +29125,6 @@ with pkgs;
 
   foliate = callPackage ../applications/office/foliate { };
 
-  font-manager = callPackage ../by-name/fo/font-manager/package.nix {
-    libsoup = libsoup_3;
-    webkitgtk = webkitgtk_6_0;
-  };
-
   fontfinder = callPackage ../applications/misc/fontfinder { };
 
   fontpreview = callPackage ../applications/misc/fontpreview { };
@@ -30723,10 +30714,7 @@ with pkgs;
 
   lifelines = callPackage ../applications/misc/lifelines { };
 
-  liferea = callPackage ../applications/networking/newsreaders/liferea {
-    libsoup = libsoup_3;
-    webkitgtk = webkitgtk_4_1;
-  };
+  liferea = callPackage ../applications/networking/newsreaders/liferea { };
 
   lightworks = callPackage ../applications/video/lightworks { };
 
@@ -31281,9 +31269,7 @@ with pkgs;
   netmaker = callPackage ../applications/networking/netmaker {subPackages = ["."];};
   netmaker-full = callPackage ../applications/networking/netmaker { };
 
-  newsflash = callPackage ../applications/networking/feedreaders/newsflash {
-    webkitgtk = webkitgtk_6_0;
-  };
+  newsflash = callPackage ../applications/networking/feedreaders/newsflash { };
 
   nice-dcv-client = callPackage ../applications/networking/remote/nice-dcv-client { };
 
@@ -32150,7 +32136,7 @@ with pkgs;
   };
 
   quodlibet-full = quodlibet.override {
-    inherit gtksourceview webkitgtk;
+    inherit gtksourceview webkitgtk_4_0;
     kakasi = kakasi;
     keybinder3 = keybinder3;
     libappindicator-gtk3 = libappindicator-gtk3;
@@ -38154,7 +38140,9 @@ with pkgs;
 
   wcalc = callPackage ../applications/misc/wcalc { };
 
-  webkit2-sharp = callPackage ../development/libraries/webkit2-sharp {  };
+  webkit2-sharp = callPackage ../development/libraries/webkit2-sharp {
+    webkitgtk = webkitgtk_4_0;
+  };
 
   websocketd = callPackage ../applications/networking/websocketd { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b2c46711de0f9..39226815b2e2e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11617,6 +11617,8 @@ self: super: with self; {
 
   pylion = callPackage ../development/python-modules/pylion { };
 
+  pylitejet = callPackage ../development/python-modules/pylitejet { };
+
   pylitterbot = callPackage ../development/python-modules/pylitterbot { };
 
   py-libzfs = callPackage ../development/python-modules/py-libzfs { };
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 57c07c1bde4cc..d2a1f8a25887e 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -143,7 +143,7 @@ in
   util-linux = linux;
   util-linuxMinimal = linux;
   w3m = all;
-  webkitgtk = linux;
+  webkitgtk_4_0 = linux;
   wget = all;
   which = all;
   wirelesstools = linux;