diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ba876ecec8ba..71b77206588d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -12419,6 +12419,11 @@
     githubId = 26470037;
     name = "Markus Kowalewski";
   };
+  markusscherer = {
+    github = "markusscherer";
+    githubId = 1913876;
+    name = "Markus Scherer";
+  };
   marmolak = {
     email = "hack.robin@gmail.com";
     github = "marmolak";
@@ -20860,6 +20865,13 @@
     githubId = 1607770;
     name = "Ulrik Strid";
   };
+  ulysseszhan = {
+    email = "ulysseszhan@gmail.com";
+    github = "UlyssesZh";
+    githubId = 26196187;
+    matrix = "@ulysseszhan:matrix.org";
+    name = "Ulysses Zhan";
+  };
   umlx5h = {
     github = "umlx5h";
     githubId = 20206121;
diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix
index 9274779088a6..cd42b18fe503 100644
--- a/nixos/modules/services/cluster/k3s/default.nix
+++ b/nixos/modules/services/cluster/k3s/default.nix
@@ -206,9 +206,12 @@ in
 
     extraFlags = mkOption {
       description = "Extra flags to pass to the k3s command.";
-      type = types.str;
-      default = "";
-      example = "--no-deploy traefik --cluster-cidr 10.24.0.0/16";
+      type = with types; either str (listOf str);
+      default = [ ];
+      example = [
+        "--no-deploy traefik"
+        "--cluster-cidr 10.24.0.0/16"
+      ];
     };
 
     disableAgent = mkOption {
@@ -427,7 +430,7 @@ in
           ++ (optional (cfg.token != "") "--token ${cfg.token}")
           ++ (optional (cfg.tokenFile != null) "--token-file ${cfg.tokenFile}")
           ++ (optional (cfg.configPath != null) "--config ${cfg.configPath}")
-          ++ [ cfg.extraFlags ]
+          ++ (lib.flatten cfg.extraFlags)
         );
       };
     };
diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix
index 25982022c068..caeac16815f4 100644
--- a/nixos/modules/services/logging/graylog.nix
+++ b/nixos/modules/services/logging/graylog.nix
@@ -15,6 +15,7 @@ let
     message_journal_dir = ${cfg.messageJournalDir}
     mongodb_uri = ${cfg.mongodbUri}
     plugin_dir = /var/lib/graylog/plugins
+    data_dir = ${cfg.dataDir}
 
     ${cfg.extraConfig}
   '';
@@ -93,6 +94,12 @@ in
         description = "List of valid URIs of the http ports of your elastic nodes. If one or more of your elasticsearch hosts require authentication, include the credentials in each node URI that requires authentication";
       };
 
+      dataDir = mkOption {
+        type = types.str;
+        default = "/var/lib/graylog/data";
+        description = "Directory used to store Graylog server state.";
+      };
+
       messageJournalDir = mkOption {
         type = types.str;
         default = "/var/lib/graylog/data/journal";
diff --git a/nixos/modules/virtualisation/proxmox-lxc.nix b/nixos/modules/virtualisation/proxmox-lxc.nix
index ff1c0972166c..751e09c43a9e 100644
--- a/nixos/modules/virtualisation/proxmox-lxc.nix
+++ b/nixos/modules/virtualisation/proxmox-lxc.nix
@@ -4,6 +4,11 @@ with lib;
 
 {
   options.proxmoxLXC = {
+    enable = mkOption {
+      default = true;
+      type = types.bool;
+      description = lib.mdDoc "Whether to enable the Proxmox VE LXC module.";
+    };
     privileged = mkOption {
       type = types.bool;
       default = false;
@@ -35,7 +40,7 @@ with lib;
     let
       cfg = config.proxmoxLXC;
     in
-    {
+    mkIf cfg.enable {
       system.build.tarball = pkgs.callPackage ../../lib/make-system-tarball.nix {
         storeContents = [{
           object = config.system.build.toplevel;
diff --git a/nixos/tests/k3s/auto-deploy.nix b/nixos/tests/k3s/auto-deploy.nix
index 11eed4aef95f..c25503ac1087 100644
--- a/nixos/tests/k3s/auto-deploy.nix
+++ b/nixos/tests/k3s/auto-deploy.nix
@@ -49,7 +49,7 @@ import ../make-test-python.nix (
         services.k3s.role = "server";
         services.k3s.package = k3s;
         # Slightly reduce resource usage
-        services.k3s.extraFlags = builtins.toString [
+        services.k3s.extraFlags = [
           "--disable coredns"
           "--disable local-storage"
           "--disable metrics-server"
diff --git a/nixos/tests/k3s/etcd.nix b/nixos/tests/k3s/etcd.nix
index 149185d551d7..2616ab02a609 100644
--- a/nixos/tests/k3s/etcd.nix
+++ b/nixos/tests/k3s/etcd.nix
@@ -50,20 +50,14 @@ import ../make-test-python.nix (
           services.k3s = {
             enable = true;
             role = "server";
-            extraFlags = builtins.toString [
+            extraFlags = [
               "--datastore-endpoint=\"http://192.168.1.1:2379\""
-              "--disable"
-              "coredns"
-              "--disable"
-              "local-storage"
-              "--disable"
-              "metrics-server"
-              "--disable"
-              "servicelb"
-              "--disable"
-              "traefik"
-              "--node-ip"
-              "192.168.1.2"
+              "--disable coredns"
+              "--disable local-storage"
+              "--disable metrics-server"
+              "--disable servicelb"
+              "--disable traefik"
+              "--node-ip 192.168.1.2"
             ];
           };
 
diff --git a/nixos/tests/k3s/multi-node.nix b/nixos/tests/k3s/multi-node.nix
index 361f4946660d..5fe106453f30 100644
--- a/nixos/tests/k3s/multi-node.nix
+++ b/nixos/tests/k3s/multi-node.nix
@@ -76,21 +76,14 @@ import ../make-test-python.nix (
             role = "server";
             package = k3s;
             clusterInit = true;
-            extraFlags = builtins.toString [
-              "--disable"
-              "coredns"
-              "--disable"
-              "local-storage"
-              "--disable"
-              "metrics-server"
-              "--disable"
-              "servicelb"
-              "--disable"
-              "traefik"
-              "--node-ip"
-              "192.168.1.1"
-              "--pause-image"
-              "test.local/pause:local"
+            extraFlags = [
+              "--disable coredns"
+              "--disable local-storage"
+              "--disable metrics-server"
+              "--disable servicelb"
+              "--disable traefik"
+              "--node-ip 192.168.1.1"
+              "--pause-image test.local/pause:local"
             ];
           };
           networking.firewall.allowedTCPPorts = [
diff --git a/nixos/tests/k3s/single-node.nix b/nixos/tests/k3s/single-node.nix
index e0bc80e8614f..145bce324299 100644
--- a/nixos/tests/k3s/single-node.nix
+++ b/nixos/tests/k3s/single-node.nix
@@ -58,19 +58,13 @@ import ../make-test-python.nix (
         services.k3s.role = "server";
         services.k3s.package = k3s;
         # Slightly reduce resource usage
-        services.k3s.extraFlags = builtins.toString [
-          "--disable"
-          "coredns"
-          "--disable"
-          "local-storage"
-          "--disable"
-          "metrics-server"
-          "--disable"
-          "servicelb"
-          "--disable"
-          "traefik"
-          "--pause-image"
-          "test.local/pause:local"
+        services.k3s.extraFlags = [
+          "--disable coredns"
+          "--disable local-storage"
+          "--disable metrics-server"
+          "--disable servicelb"
+          "--disable traefik"
+          "--pause-image test.local/pause:local"
         ];
 
         users.users = {
diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix
index d9373db18935..c6b398ad2997 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix
@@ -101,4 +101,4 @@ self: let
 
   in elpaDevelPackages // { inherit elpaBuild; });
 
-in (generateElpa { }) // { __attrsFailEvaluation = true; }
+in generateElpa { }
diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
index 22b71e5c03e4..aba33d0f13bf 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
@@ -190,4 +190,5 @@ self: let
 
   in elpaPackages // { inherit elpaBuild; });
 
-in (generateElpa { }) // { __attrsFailEvaluation = true; }
+in
+generateElpa { }
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
index 182f2567b834..a7c888de1eda 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
@@ -121,6 +121,4 @@ in
   emacsSessionManagement = self.session-management-for-emacs;
   rectMark = self.rect-mark;
   sunriseCommander = self.sunrise-commander;
-
-  __attrsFailEvaluation = true;
 }
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/default.nix
index 02fec5ef7f72..4938f2d98be1 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/default.nix
@@ -1,14 +1,10 @@
-{ trivialBuild
-, llvmPackages
-}:
+{ melpaBuild, llvmPackages }:
 
-trivialBuild {
+melpaBuild {
   pname = "llvm-mode";
-  inherit (llvmPackages.llvm) src version;
+  inherit (llvmPackages.llvm) version;
 
-  postUnpack = ''
-    sourceRoot="$sourceRoot/llvm/utils/emacs"
-  '';
+  src = "${llvmPackages.llvm.src}/llvm/utils/emacs";
 
   meta = {
     inherit (llvmPackages.llvm.meta) homepage license;
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/default.nix
index efc422d601f0..23fa618283b0 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/default.nix
@@ -1,11 +1,12 @@
-{ lib
-, trivialBuild
-, fetchFromGitHub
-, emacs
+{
+  lib,
+  melpaBuild,
+  fetchFromGitHub,
 }:
 
-trivialBuild {
+melpaBuild {
   pname = "sunrise-commander";
+  ename = "sunrise";
   version = "0-unstable-2021-09-27";
 
   src = fetchFromGitHub {
@@ -15,10 +16,6 @@ trivialBuild {
     hash = "sha256-D36qiRi5OTZrBtJ/bD/javAWizZ8NLlC/YP4rdLCSsw=";
   };
 
-  buildInputs = [
-    emacs
-  ];
-
   meta = {
     homepage = "https://github.com/sunrise-commander/sunrise-commander/";
     description = "Orthodox (two-pane) file manager for Emacs";
diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
index 00646b6d81b3..d580b0dfdb71 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@@ -755,5 +755,4 @@ let
     in lib.mapAttrs (n: v: if lib.hasAttr n overrides then overrides.${n} else v) super);
 
 in
-(generateMelpa { })
-// { __attrsFailEvaluation = true; }
+generateMelpa { }
diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix
index beca93ea4c35..cd32a8bd3975 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix
@@ -20,12 +20,12 @@ self: let
     generated ? ./nongnu-generated.nix
   }: let
 
-    imported = (import generated {
+    imported = import generated {
       callPackage = pkgs: args: self.callPackage pkgs (args // {
         # Use custom elpa url fetcher with fallback/uncompress
         fetchurl = buildPackages.callPackage ./fetchelpa.nix { };
       });
-    }) // { __attrsFailEvaluation = true; };
+    };
 
     super = imported;
 
diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix
index 2e7189dc484b..cb6033fa4b62 100644
--- a/pkgs/applications/misc/visidata/default.nix
+++ b/pkgs/applications/misc/visidata/default.nix
@@ -2,7 +2,8 @@
 , lib
 , buildPythonApplication
 , fetchFromGitHub
-# python requirements
+, fetchpatch
+  # python requirements
 , beautifulsoup4
 , boto3
 , faker
@@ -54,6 +55,20 @@ buildPythonApplication rec {
     hash = "sha256-gplrkrFTIP6TLvk1YazD5roDzsPvDtOXLlTOmTio52s=";
   };
 
+  patches = [
+    # Drop when next release is out
+    (fetchpatch {
+      name = "drop-support-for-python-37.patch";
+      url = "https://github.com/saulpw/visidata/commit/738bb8b43814c14b1b8a1f1f60397c1520c5ef4a.patch";
+      hash = "sha256-5jDAzKMuW3s7BCGpWyLcS4Lw8GUbjNxVhF5mUKbR1YY=";
+    })
+    (fetchpatch {
+      name = "update-tests-for-python-312.patch";
+      url = "https://github.com/saulpw/visidata/commit/627f6f126cdd49bcdda0bbc16fab42eb5bd42103.patch";
+      hash = "sha256-3FHgjLrzMHObEheJoRY8VlnDUtDZ68FqCqAyhP7333E=";
+    })
+  ];
+
   propagatedBuildInputs = [
     # from visidata/requirements.txt
     # packages not (yet) present in nixpkgs are commented
diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix
index 5b843f3a2583..53f5cfa9c15c 100644
--- a/pkgs/applications/radio/urh/default.nix
+++ b/pkgs/applications/radio/urh/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, python3Packages
+{ stdenv, lib, fetchFromGitHub, python3Packages
 , hackrf, rtl-sdr, airspy, limesuite, libiio
 , libbladeRF
 , qt5
@@ -16,8 +16,9 @@ python3Packages.buildPythonApplication rec {
   };
 
   nativeBuildInputs = [ qt5.wrapQtAppsHook ];
-  buildInputs = [ hackrf rtl-sdr airspy limesuite libiio libbladeRF qt5.qtwayland ]
-    ++ lib.optional USRPSupport uhd;
+  buildInputs = [ hackrf rtl-sdr airspy limesuite libiio libbladeRF ]
+    ++ lib.optional USRPSupport uhd
+    ++ lib.optional stdenv.hostPlatform.isLinux qt5.qtwayland;
 
   propagatedBuildInputs = with python3Packages; [
     pyqt5 numpy psutil cython pyzmq pyaudio setuptools
diff --git a/pkgs/applications/science/electronics/nvc/default.nix b/pkgs/applications/science/electronics/nvc/default.nix
index 62b62ff15faa..6f8fbc6d6db3 100644
--- a/pkgs/applications/science/electronics/nvc/default.nix
+++ b/pkgs/applications/science/electronics/nvc/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nvc";
-  version = "1.12.2";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "nickg";
     repo = "nvc";
     rev = "r${version}";
-    hash = "sha256-9nqho+iDqy8oQLSxBppXoafzEuS6AkcUuqEY3xxfFs4=";
+    hash = "sha256-mM2TkNXZSTr6fo8FxqDYbRlKw4dsADddS+VUEeeH3h8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index e46f414f83d6..1c22d6f1c966 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,15 +1,15 @@
 {
-  "version": "17.1.1",
-  "repo_hash": "1ivaicgz4lgl6l06fnr9wfpn71b88yd22ryi3qn2r40rg3vjl1vf",
+  "version": "17.1.2",
+  "repo_hash": "08nd4194wyb1rs47crcq7vci9b5a6izda23bkjavc0iwdsibf0c3",
   "yarn_hash": "1xyc3c3hhfp5lgrpacj4gsfbql3wn0brdp16ivnqg4n0csjlizq7",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v17.1.1-ee",
+  "rev": "v17.1.2-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "17.1.1",
-    "GITLAB_PAGES_VERSION": "17.1.1",
+    "GITALY_SERVER_VERSION": "17.1.2",
+    "GITLAB_PAGES_VERSION": "17.1.2",
     "GITLAB_SHELL_VERSION": "14.36.0",
     "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.0.0",
-    "GITLAB_WORKHORSE_VERSION": "17.1.1"
+    "GITLAB_WORKHORSE_VERSION": "17.1.2"
   }
 }
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index eb7499058674..953dd4b2aefa 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "17.1.1";
+  version = "17.1.2";
   package_version = "v${lib.versions.major version}";
   gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
 
@@ -17,7 +17,7 @@ let
       owner = "gitlab-org";
       repo = "gitaly";
       rev = "v${version}";
-      hash = "sha256-c9gLVVRNSkl4RI7LN0UZc6CAzcLIbWGIvsjoiaPdUKY=";
+      hash = "sha256-KL6BL5iSOUV0iu0omDGc7upl45p0yet92DiP4DesB+Q=";
     };
 
     vendorHash = "sha256-yOm0cPC8v6L3gkekUMpf5U86XzpnmeoLTgZSFBb02BA=";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix
index d84947908c72..b13c9a12706d 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "gitlab-container-registry";
-  version = "4.5.0";
+  version = "4.6.0";
   rev = "v${version}-gitlab";
 
   # nixpkgs-update: no auto update
@@ -10,10 +10,10 @@ buildGoModule rec {
     owner = "gitlab-org";
     repo = "container-registry";
     inherit rev;
-    hash = "sha256-dCDybwIfzC79Mobejz/5XbEMQXkPuO8HejjannA6k/M=";
+    hash = "sha256-rFojpy8xUXhlzBFBYFW3+AjDI5efaNWh+Vi3wsqVebI=";
   };
 
-  vendorHash = "sha256-sybppXCoTrc196xLBW1+sUg9Y5uA0GAptlJ7RjhzuGc=";
+  vendorHash = "sha256-xhy0WSqdlri5bckIeS6CSeyZGf3pBNpLElkvsMm6N48=";
 
   postPatch = ''
     # Disable flaky inmemory storage driver test
diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
index 655bfe02ca0e..bc523c69d665 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
@@ -2,14 +2,14 @@
 
 buildGoModule rec {
   pname = "gitlab-pages";
-  version = "17.1.1";
+  version = "17.1.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-pages";
     rev = "v${version}";
-    hash = "sha256-cwFqzKXDWuIESdDjuPYos73Ly+zd+J20aJJi0RiRdus=";
+    hash = "sha256-QnB5VH8iPWdMCK690REepws6hvX0e++6DNX2vE9t2JM=";
   };
 
   vendorHash = "sha256-uVpkCl5rSAtg6gDnL3d11AaOlGNpS2xaPtJrthUNbfE=";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index 2b1677e1b8dc..a82b5b476ff1 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -5,7 +5,7 @@ in
 buildGoModule rec {
   pname = "gitlab-workhorse";
 
-  version = "17.1.1";
+  version = "17.1.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
index d8f93f9280b1..8c0d4817df19 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
@@ -255,7 +255,7 @@ gem 'state_machines-activerecord', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeat
 gem 'acts-as-taggable-on', '~> 10.0' # rubocop:todo Gemfile/MissingFeatureCategory
 
 # Background jobs
-gem 'sidekiq', path: 'vendor/gems/sidekiq-7.1.6', require: 'sidekiq', feature_category: :scalability
+gem 'sidekiq', '~> 7.1.6', feature_category: :scalability
 gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability
 gem 'gitlab-sidekiq-fetcher',
   path: 'vendor/gems/sidekiq-reliable-fetch',
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
index aa9a829983a8..505810671d0a 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
@@ -173,15 +173,6 @@ PATH
       nokogiri (>= 1.4.4)
       omniauth (~> 2.0)
 
-PATH
-  remote: vendor/gems/sidekiq-7.1.6
-  specs:
-    sidekiq (7.1.6)
-      concurrent-ruby (< 2)
-      connection_pool (>= 2.3.0)
-      rack (>= 2.2.4)
-      redis-client (>= 0.14.0)
-
 PATH
   remote: vendor/gems/sidekiq-reliable-fetch
   specs:
@@ -1668,6 +1659,11 @@ GEM
     shellany (0.0.1)
     shoulda-matchers (5.1.0)
       activesupport (>= 5.2.0)
+    sidekiq (7.1.6)
+      concurrent-ruby (< 2)
+      connection_pool (>= 2.3.0)
+      rack (>= 2.2.4)
+      redis-client (>= 0.14.0)
     sidekiq-cron (1.12.0)
       fugit (~> 1.8)
       globalid (>= 1.0.1)
@@ -1691,7 +1687,8 @@ GEM
     simplecov_json_formatter (0.1.4)
     singleton (0.1.1)
     sixarm_ruby_unaccent (1.2.0)
-    slack-messenger (2.3.4)
+    slack-messenger (2.3.5)
+      re2 (= 2.7.0)
     snaky_hash (2.0.0)
       hashie
       version_gem (~> 1.1)
@@ -2212,7 +2209,7 @@ DEPENDENCIES
   sentry-ruby (~> 5.17.3)
   sentry-sidekiq (~> 5.17.3)
   shoulda-matchers (~> 5.1.0)
-  sidekiq!
+  sidekiq (~> 7.1.6)
   sidekiq-cron (~> 1.12.0)
   sigdump (~> 0.2.4)
   simple_po_parser (~> 1.1.6)
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
index f64d8b7daba9..db70f0c50830 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
@@ -6175,8 +6175,9 @@ src:
     groups = ["default"];
     platforms = [];
     source = {
-      path = "${src}/vendor/gems/sidekiq-7.1.6";
-      type = "path";
+      remotes = ["https://rubygems.org"];
+      sha256 = "18j3g31ps6ga9nzza0z0d00qjrn810fhkhx2pqi3rvxwsmkdlnbq";
+      type = "gem";
     };
     version = "7.1.6";
   };
@@ -6295,14 +6296,15 @@ src:
     version = "1.2.0";
   };
   slack-messenger = {
+    dependencies = ["re2"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1h89asinyyyq88v89fdc3nw0g74vq2f7p59s18jrq3svpv913ij9";
+      sha256 = "1kb3dhp38wllw8f54qcik05zw0w4v0a5171cqmgjqp6c63mb0q63";
       type = "gem";
     };
-    version = "2.3.4";
+    version = "2.3.5";
   };
   snaky_hash = {
     dependencies = ["hashie" "version_gem"];
diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py
index bb46af27c690..5c5aacda3d92 100755
--- a/pkgs/applications/version-management/gitlab/update.py
+++ b/pkgs/applications/version-management/gitlab/update.py
@@ -180,6 +180,21 @@ def update_rubyenv():
         cwd=rubyenv_dir,
     )
 
+    # Un-vendor sidekiq
+    #
+    # The sidekiq dependency was vendored to maintain compatibility with Redis 6.0 (as
+    # stated in this [comment]) but unfortunately, it seems to cause a crash in the
+    # application, as noted in this [upstream issue].
+    #
+    # We can safely swap out the dependency, as our Redis release in nixpkgs is >= 7.0.
+    #
+    # [comment]: https://gitlab.com/gitlab-org/gitlab/-/issues/468435#note_1979750600
+    # [upstream issue]: https://gitlab.com/gitlab-org/gitlab/-/issues/468435
+    subprocess.check_output(
+        ["sed", "-i", "s|gem 'sidekiq', path: 'vendor/gems/sidekiq-7.1.6', require: 'sidekiq'|gem 'sidekiq', '~> 7.1.6'|g", "Gemfile"],
+        cwd=rubyenv_dir,
+    )
+
     # Fetch vendored dependencies temporarily in order to build the gemset.nix
     subprocess.check_output(["mkdir", "-p", "vendor/gems", "gems"], cwd=rubyenv_dir)
     subprocess.check_output(
@@ -194,7 +209,7 @@ def update_rubyenv():
         [
             "sh",
             "-c",
-            f"curl -L https://gitlab.com/gitlab-org/gitlab/-/archive/v{version}-ee/gitlab-v{version}-ee.tar.bz2?path=gems | tar -xj --strip-components=3",
+            f"curl -L https://gitlab.com/gitlab-org/gitlab/-/archive/v{version}-ee/gitlab-v{version}-ee.tar.bz2?path=gems | tar -xj --strip-components=2",
         ],
         cwd=f"{rubyenv_dir}/gems",
     )
diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix
deleted file mode 100644
index 66450eec6c32..000000000000
--- a/pkgs/applications/window-managers/i3/pystatus.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ lib
-, fetchFromGitHub
-, libpulseaudio
-, libnotify
-, gobject-introspection
-, python3Packages
-, extraLibs ? [] }:
-
-python3Packages.buildPythonApplication rec {
-  # i3pystatus moved to rolling release:
-  # https://github.com/enkore/i3pystatus/issues/584
-  version = "unstable-2020-06-12";
-  pname = "i3pystatus";
-
-  src = fetchFromGitHub {
-    owner = "enkore";
-    repo = "i3pystatus";
-    rev = "dad5eb0c5c8a2ecd20c37ade4732586c6e53f44b";
-    sha256 = "18ygvkl92yr69kxsym57k1mc90asdxpz4b943i61qr0s4fc5n4mq";
-  };
-
-  nativeBuildInputs = [
-    gobject-introspection
-  ];
-
-  buildInputs = [ libpulseaudio libnotify ];
-
-  propagatedBuildInputs = with python3Packages; [
-    keyring colour netifaces psutil basiciw pygobject3
-  ] ++ extraLibs;
-
-  makeWrapperArgs = [
-    # LC_TIME != C results in locale.Error: unsupported locale setting
-    "--set" "LC_TIME" "C"
-    "--suffix" "LD_LIBRARY_PATH" ":" "${lib.makeLibraryPath [ libpulseaudio ]}"
-  ];
-
-  postPatch = ''
-    makeWrapperArgs+=(--set GI_TYPELIB_PATH "$GI_TYPELIB_PATH")
-  '';
-
-  postInstall = ''
-    makeWrapper ${python3Packages.python.interpreter} $out/bin/${pname}-python-interpreter \
-      --prefix PYTHONPATH : "$PYTHONPATH" \
-      ''${makeWrapperArgs[@]}
-  '';
-
-  # no tests in tarball
-  doCheck = false;
-
-  meta = with lib; {
-    homepage = "https://github.com/enkore/i3pystatus";
-    description = "Complete replacement for i3status";
-    longDescription = ''
-      i3pystatus is a growing collection of python scripts for status output compatible
-      to i3status / i3bar of the i3 window manager.
-    '';
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.igsha ];
-  };
-}
diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix
index 9dd36b03fc48..4bb9432b1cb3 100644
--- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix
+++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix
@@ -227,8 +227,8 @@ stdenvNoCC.mkDerivation (args // {
         else
           ''$(mktemp -t "${pname}-deps-XXXXXX.nix")'';
       storeSrc = srcOnly args;
-      projectFileStr = lib.escapeShellArg projectFiles;
-      testProjectFileStr = lib.escapeShellArg testProjectFiles;
+      projectFileStr = lib.escapeShellArgs projectFiles;
+      testProjectFileStr = lib.escapeShellArgs testProjectFiles;
       path = lib.makeBinPath [
         coreutils
         runtimeShellPackage
diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
index 3935884c5273..4c24010bfb52 100644
--- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
+++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "ananicy-rules-cachyos";
-  version = "0-unstable-2024-07-03";
+  version = "0-unstable-2024-07-11";
 
   src = fetchFromGitHub {
     owner = "CachyOS";
     repo = "ananicy-rules";
-    rev = "3f76b3f497e590c4b6a4f9316b212c627631399b";
-    hash = "sha256-qwyqOgv4djIrJn9MlHO/I8zC741b4ORxDMgYZ+Da2eM=";
+    rev = "d0cfc437783a2ca2bb0f071419df753a98981614";
+    hash = "sha256-FMZok6rW3UbkotPPG1xmdlMPfHB2JBqJZ1oTg8eUux8=";
   };
 
   dontConfigure = true;
diff --git a/pkgs/by-name/ch/chance/package.nix b/pkgs/by-name/ch/chance/package.nix
new file mode 100644
index 000000000000..80d50b7eb750
--- /dev/null
+++ b/pkgs/by-name/ch/chance/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  blueprint-compiler,
+  cargo,
+  desktop-file-utils,
+  fetchFromGitLab,
+  libadwaita,
+  meson,
+  ninja,
+  nix-update-script,
+  pkg-config,
+  rustPlatform,
+  rustc,
+  stdenv,
+  wrapGAppsHook4,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "chance";
+  version = "4.0.0";
+
+  src = fetchFromGitLab {
+    owner = "zelikos";
+    repo = "rollit";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-2lZ7iMHMFE1wTSlJj0mIUV62jO0NundYiOC8rdUJGkQ=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-Q4CfDQxlhspjg7Et+0zHwZ/iSnp0CnwwpW/gT7htlL8=";
+  };
+
+  nativeBuildInputs = [
+    blueprint-compiler
+    cargo
+    desktop-file-utils
+    meson
+    ninja
+    pkg-config
+    rustPlatform.cargoSetupHook
+    rustc
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    libadwaita
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Dice roller built using GTK4 and libadwaita";
+    homepage = "https://gitlab.com/zelikos/rollit";
+    changelog = "https://gitlab.com/zelikos/rollit/-/releases/${finalAttrs.version}";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ Guanran928 ];
+    mainProgram = "rollit";
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/by-name/em/empty-epsilon/package.nix
similarity index 74%
rename from pkgs/games/empty-epsilon/default.nix
rename to pkgs/by-name/em/empty-epsilon/package.nix
index 9e2d8ab4216f..3a9a38992f9e 100644
--- a/pkgs/games/empty-epsilon/default.nix
+++ b/pkgs/by-name/em/empty-epsilon/package.nix
@@ -1,21 +1,17 @@
-{ lib, stdenv, fetchFromGitHub, cmake, sfml, libX11, glew, python3, glm, meshoptimizer, SDL2, ninja}:
+{ lib, stdenv, fetchFromGitHub, cmake, sfml, libX11, glew, python3, glm, meshoptimizer, SDL2, ninja }:
 
 let
-
-  major = "2024";
-  minor = "05";
-  patch.seriousproton = "16";
-  patch.emptyepsilon = "16";
-
-  version.seriousproton = "${major}.${minor}.${patch.seriousproton}";
-  version.emptyepsilon = "${major}.${minor}.${patch.emptyepsilon}";
-  version.basis-universal = "v1_15_update2";
+  version = {
+    seriousproton = "2024.06.20";
+    emptyepsilon = "2024.06.20";
+    basis-universal = "v1_15_update2";
+  };
 
   basis-universal = fetchFromGitHub {
     owner = "BinomialLLC";
     repo = "basis_universal";
     rev = version.basis-universal;
-    sha256 = "sha256-2snzq/SnhWHIgSbUUgh24B6tka7EfkGO+nwKEObRkU4=";
+    hash = "sha256-2snzq/SnhWHIgSbUUgh24B6tka7EfkGO+nwKEObRkU4=";
   };
 
   serious-proton = stdenv.mkDerivation {
@@ -26,7 +22,7 @@ let
       owner = "daid";
       repo = "SeriousProton";
       rev = "EE-${version.seriousproton}";
-      sha256 = "sha256-0gCwWvx7ceJG3VmVVufRkwreuHn41pl7jHsJXzNwqaE=";
+      hash = "sha256-byLk4ukpj+s74+3K+1wzRTXhe4pKkH0pOSYeVs94muc=";
     };
 
     nativeBuildInputs = [ cmake ];
@@ -48,7 +44,6 @@ let
 
 in
 
-
 stdenv.mkDerivation {
   pname = "empty-epsilon";
   version = version.emptyepsilon;
@@ -57,7 +52,7 @@ stdenv.mkDerivation {
     owner = "daid";
     repo = "EmptyEpsilon";
     rev = "EE-${version.emptyepsilon}";
-    sha256 = "sha256-pLnyzahGEPb2cEwH89RE5Jq8UHIoDWXatmDWdeZ+rqo=";
+    hash = "sha256-YTZliu1o3LFab43DqmSk/cifxRWZMPxdV4gNoNy8LEk=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -66,9 +61,9 @@ stdenv.mkDerivation {
   cmakeFlags = [
     (lib.cmakeFeature "SERIOUS_PROTON_DIR" "${serious-proton.src}")
     (lib.cmakeFeature "CPACK_PACKAGE_VERSION" "${version.emptyepsilon}")
-    (lib.cmakeFeature "CPACK_PACKAGE_VERSION_MAJOR" "${major}")
-    (lib.cmakeFeature "CPACK_PACKAGE_VERSION_MINOR" "${minor}")
-    (lib.cmakeFeature "CPACK_PACKAGE_VERSION_PATCH" "${patch.emptyepsilon}")
+    (lib.cmakeFeature "CPACK_PACKAGE_VERSION_MAJOR" "${lib.versions.major version.emptyepsilon}")
+    (lib.cmakeFeature "CPACK_PACKAGE_VERSION_MINOR" "${lib.versions.minor version.emptyepsilon}")
+    (lib.cmakeFeature "CPACK_PACKAGE_VERSION_PATCH" "${lib.versions.patch version.emptyepsilon}")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_BASIS" "${basis-universal}")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MESHOPTIMIZER" "${meshoptimizer.src}")
     (lib.cmakeFeature "CMAKE_AR" "${stdenv.cc.cc}/bin/gcc-ar")
diff --git a/pkgs/by-name/ev/everest-mons/package.nix b/pkgs/by-name/ev/everest-mons/package.nix
new file mode 100644
index 000000000000..82054c21cb2c
--- /dev/null
+++ b/pkgs/by-name/ev/everest-mons/package.nix
@@ -0,0 +1,47 @@
+{ lib
+, fetchPypi
+, python3Packages
+} :
+
+python3Packages.buildPythonApplication rec {
+  pname = "everest-mons";
+  version = "2.0.0";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "mons";
+    hash = "sha256-E1yBTwZ4T2C3sXoLGz0kAcvas0q8tO6Aaiz3SHrT4ZE=";
+  };
+
+  build-system = with python3Packages; [
+    setuptools
+    setuptools-scm
+  ];
+  pyproject = true;
+  dependencies = with python3Packages; [
+    dnfile
+    pefile
+    click
+    tqdm
+    xxhash
+    pyyaml
+    urllib3
+    platformdirs
+  ];
+
+  pythonImportsCheck = [ "mons" ];
+  nativeCheckInputs = with python3Packages; [
+    pytestCheckHook
+  ];
+  preCheck = ''
+    export HOME=$TMPDIR
+  '';
+
+  meta = with lib; {
+    homepage = "https://mons.coloursofnoise.ca/";
+    description = "A commandline Everest installer and mod manager for Celeste";
+    license = licenses.mit;
+    maintainers = with lib.maintainers; [ ulysseszhan ];
+    mainProgram = "mons";
+  };
+}
diff --git a/pkgs/by-name/go/got/package.nix b/pkgs/by-name/go/got/package.nix
index 69ef68a8f609..0f1432d4cc21 100644
--- a/pkgs/by-name/go/got/package.nix
+++ b/pkgs/by-name/go/got/package.nix
@@ -14,18 +14,24 @@
 , autoPatchelfHook
 , testers
 , signify
+, overrideSDK
 , withSsh ? true, openssh
 # Default editor to use when neither VISUAL nor EDITOR are defined
 , defaultEditor ? null
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+let
+  stdenv' = if stdenv.isDarwin && stdenv.isx86_64
+    then overrideSDK stdenv "11.0"
+    else stdenv;
+in
+stdenv'.mkDerivation (finalAttrs: {
   pname = "got";
-  version = "0.100";
+  version = "0.101";
 
   src = fetchurl {
     url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz";
-    hash = "sha256-/DqKIGf/aZ09aL/rB7te+AauHmJ+mOTrVEbkqT9WUBI=";
+    hash = "sha256-JQZBgscxoMv4Dki77s8tYo4r5BBG+ErsDYnY5/am3MA=";
   };
 
   nativeBuildInputs = [ pkg-config bison ]
diff --git a/pkgs/by-name/i3/i3pystatus/package.nix b/pkgs/by-name/i3/i3pystatus/package.nix
new file mode 100644
index 000000000000..b06de1abe984
--- /dev/null
+++ b/pkgs/by-name/i3/i3pystatus/package.nix
@@ -0,0 +1,98 @@
+{
+  lib,
+  fetchFromGitHub,
+  libpulseaudio,
+  libnotify,
+  gobject-introspection,
+  python3Packages,
+  unstableGitUpdater,
+  fetchpatch2,
+  extraLibs ? [ ],
+}:
+
+python3Packages.buildPythonApplication rec {
+  # i3pystatus moved to rolling release:
+  # https://github.com/enkore/i3pystatus/issues/584
+  version = "3.35-unstable-2024-06-13";
+  pname = "i3pystatus";
+  pyproject = true;
+  build-system = [ python3Packages.setuptools ];
+
+  src = fetchFromGitHub {
+    owner = "enkore";
+    repo = "i3pystatus";
+    rev = "f3c539ad78ad1c54fc36e8439bf3905a784ccb34";
+    sha256 = "3AGREY+elHQk8kaoFp8AHEzk2jNC/ICGYPh2hXo2G/w=";
+  };
+
+  patches = [
+    # absolutifies the path to the test data in buds test so it can be run from anywhere
+    (fetchpatch2 {
+      # https://github.com/enkore/i3pystatus/pull/869
+      url = "https://github.com/enkore/i3pystatus/commit/7a39c3527566411eb1b3e4f79191839ac4b0424e.patch";
+      hash = "sha256-kSf2Nrypw8CCHC7acDkQXI27178HA3NJlyRWkHyYOGs=";
+    })
+  ];
+
+  nativeBuildInputs = [ gobject-introspection ];
+
+  buildInputs = [
+    libpulseaudio
+    libnotify
+  ];
+
+  nativeCheckInputs = [ python3Packages.pytestCheckHook ];
+
+  checkInputs = [ python3Packages.requests ];
+
+  propagatedBuildInputs =
+    with python3Packages;
+    [
+      keyring
+      colour
+      netifaces
+      psutil
+      basiciw
+      pygobject3
+    ]
+    ++ extraLibs;
+
+  makeWrapperArgs = [
+    # LC_TIME != C results in locale.Error: unsupported locale setting
+    "--set"
+    "LC_TIME"
+    "C"
+    "--suffix"
+    "LD_LIBRARY_PATH"
+    ":"
+    "${lib.makeLibraryPath [ libpulseaudio ]}"
+  ];
+
+  postPatch = ''
+    makeWrapperArgs+=(--set GI_TYPELIB_PATH "$GI_TYPELIB_PATH")
+  '';
+
+  postInstall = ''
+    makeWrapper ${python3Packages.python.interpreter} $out/bin/${pname}-python-interpreter \
+      --prefix PYTHONPATH : "$PYTHONPATH" \
+      ''${makeWrapperArgs[@]}
+  '';
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    mainProgram = "i3pystatus";
+    homepage = "https://github.com/enkore/i3pystatus";
+    description = "Complete replacement for i3status";
+    longDescription = ''
+      i3pystatus is a growing collection of python scripts for status output compatible
+      to i3status / i3bar of the i3 window manager.
+    '';
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      igsha
+      lucasew
+    ];
+  };
+}
diff --git a/pkgs/by-name/ni/nixfmt-rfc-style/date.txt b/pkgs/by-name/ni/nixfmt-rfc-style/date.txt
index c934f09efc35..c471a757cea5 100644
--- a/pkgs/by-name/ni/nixfmt-rfc-style/date.txt
+++ b/pkgs/by-name/ni/nixfmt-rfc-style/date.txt
@@ -1 +1 @@
-2024-07-03
+2024-07-12
diff --git a/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix b/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix
index 70179792da8c..2a52509d1f16 100644
--- a/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix
+++ b/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix
@@ -8,8 +8,8 @@ mkDerivation {
   pname = "nixfmt";
   version = "0.6.0";
   src = fetchzip {
-    url = "https://github.com/nixos/nixfmt/archive/698954723ecec3f91770460ecae762ce590f2d9e.tar.gz";
-    sha256 = "1k057nxj58ghid15gd4xi19whaavqgspypk69r0qshb5bhl74nm5";
+    url = "https://github.com/nixos/nixfmt/archive/83de1eceaae8a891ae52a3a2b82226540207309e.tar.gz";
+    sha256 = "0lnl9vlbyrfplmq3hpmpjlmhjdwwbgk900wgi25ib27v0mlgpnxp";
   };
   isLibrary = true;
   isExecutable = true;
@@ -22,7 +22,7 @@ mkDerivation {
   ];
   jailbreak = true;
   homepage = "https://github.com/NixOS/nixfmt";
-  description = "The official formatter for Nix code";
+  description = "Official formatter for Nix code";
   license = lib.licenses.mpl20;
   mainProgram = "nixfmt";
 }
diff --git a/pkgs/by-name/pa/paperlib/package.nix b/pkgs/by-name/pa/paperlib/package.nix
new file mode 100644
index 000000000000..c03f0434b3d8
--- /dev/null
+++ b/pkgs/by-name/pa/paperlib/package.nix
@@ -0,0 +1,72 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  appimageTools,
+  undmg,
+}:
+let
+  pname = "paperlib";
+  version = "3.1.6";
+  src =
+    fetchurl
+      {
+        x86_64-darwin = {
+          url = "https://github.com/Future-Scholars/peperlib/releases/download/release-electron-${version}/Paperlib_${version}.dmg";
+          hash = "sha256-d9vEFx59K15PO7DJYJQ2fjiagqa8oJLtoawILDF9IKc=";
+        };
+        x86_64-linux = {
+          url = "https://github.com/Future-Scholars/paperlib/releases/download/release-electron-${version}/Paperlib_${version}.AppImage";
+          hash = "sha256-2xbn9UWlcf37n9jZdZKyyevzsag6SW9YuQH/bYCRmLQ=";
+        };
+      }
+      .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
+
+  passthru = {
+    inherit pname version src;
+  };
+
+  meta = {
+    homepage = "https://github.com/Future-Scholars/paperlib?";
+    description = "Open-source academic paper management tool";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ ByteSudoer ];
+    platforms = [
+      "x86_64-darwin"
+      "x86_64-linux"
+    ];
+    mainProgram = "paperlib";
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+in
+if stdenv.isDarwin then
+  stdenv.mkDerivation {
+    inherit
+      pname
+      version
+      src
+      meta
+      passthru
+      ;
+
+    nativeBuildInputs = [ undmg ];
+
+    installPhase = ''
+      runHook preInstall
+      mkdir -p "$out/Applications"
+      mv Paperlib.app $out/Applications/
+      runHook postInstall
+    '';
+  }
+else
+  appimageTools.wrapType2 {
+    inherit
+      pname
+      version
+      src
+      meta
+      passthru
+      ;
+
+    extraPkgs = pkgs: [ pkgs.libsecret ];
+  }
diff --git a/pkgs/by-name/qb/qbittorrent-enhanced/package.nix b/pkgs/by-name/qb/qbittorrent-enhanced/package.nix
new file mode 100644
index 000000000000..a86b62968423
--- /dev/null
+++ b/pkgs/by-name/qb/qbittorrent-enhanced/package.nix
@@ -0,0 +1,48 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+, boost
+, libtorrent-rasterbar
+, openssl
+, qt5
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+  pname = "qbittorrent-enhanced";
+  version = "4.6.5.10";
+
+  src = fetchFromGitHub {
+    owner = "c0re100";
+    repo = "qBittorrent-Enhanced-Edition";
+    rev = "release-${version}";
+    hash = "sha256-Yy0DUTz1lWkseh9x1xnHJCI89BKqi/D7zUn/S+qC+kM=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+    qt5.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    openssl.dev
+    boost
+    zlib
+    libtorrent-rasterbar
+    qt5.qtbase
+    qt5.qttools
+  ];
+
+  meta = {
+    description = "Unofficial enhanced version of qBittorrent, a BitTorrent client";
+    homepage = "https://github.com/c0re100/qBittorrent-Enhanced-Edition";
+    changelog = "https://github.com/c0re100/qBittorrent-Enhanced-Edition/blob/${src.rev}/Changelog";
+    license = with lib.licenses; [ gpl2Only gpl3Only ];
+    maintainers = with lib.maintainers; [ ByteSudoer ];
+    mainProgram = "qBittorrent-enhanced";
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/re/realm-studio/package.nix b/pkgs/by-name/re/realm-studio/package.nix
new file mode 100644
index 000000000000..99ab1e990288
--- /dev/null
+++ b/pkgs/by-name/re/realm-studio/package.nix
@@ -0,0 +1,36 @@
+{
+  stdenvNoCC,
+  lib,
+  fetchurl,
+  unzip,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "realm-studio";
+  version = "15.2.1";
+
+  src = fetchurl {
+    url = "https://static.realm.io/downloads/realm-studio/Realm%20Studio-${finalAttrs.version}-mac.zip";
+    hash = "sha256-Vvc432P7VQxCVcS7i7JwOx7ByhX+Ea0Oz7ogvAH8Xoo=";
+  };
+
+  sourceRoot = ".";
+
+  nativeBuildInputs = [ unzip ];
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/Applications
+    cp -r "Realm Studio.app" $out/Applications/
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Visual tool to view, edit, and model Realm databases.";
+    homepage = "https://www.mongodb.com/docs/atlas/device-sdks/studio/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ matteopacini ];
+    platforms = lib.platforms.darwin;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+})
diff --git a/pkgs/by-name/un/unhide/package.nix b/pkgs/by-name/un/unhide/package.nix
new file mode 100755
index 000000000000..e6dd2c8ec8aa
--- /dev/null
+++ b/pkgs/by-name/un/unhide/package.nix
@@ -0,0 +1,64 @@
+{
+  cmake,
+  fetchFromGitHub,
+  fetchurl,
+  iproute2,
+  lib,
+  lsof,
+  nettools,
+  pkg-config,
+  procps,
+  psmisc,
+  stdenv,
+}:
+
+let
+  makefile = fetchurl {
+    url = "https://gitlab.archlinux.org/archlinux/packaging/packages/unhide/-/raw/27c25ad5e1c6123e89f1f35423a0d50742ae69e9/Makefile";
+    hash = "sha256-bSo3EzpcsFmVvwyPgjCCDOJLbzNpxJ6Eptp2hNK7ZXk=";
+  };
+in
+stdenv.mkDerivation rec {
+  pname = "unhide";
+  version = "20220611";
+
+  src = fetchFromGitHub {
+    owner = "YJesus";
+    repo = "Unhide";
+    rev = "v${version}";
+    hash = "sha256-v4otbDhKKRLywH6aP+mbMR0olHbW+jk4TXTBY+iaxdo=";
+  };
+
+  postPatch = ''
+    cp ${makefile} Makefile
+  '';
+
+  dontConfigure = true;
+
+  makeFlags = [ "PREFIX=${placeholder "out"}" ];
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    iproute2
+    lsof
+    nettools
+    procps
+    psmisc
+  ];
+
+  meta = {
+    description = "Forensic tool to find hidden processes and TCP/UDP ports by rootkits/LKMs";
+    homepage = "https://github.com/YJesus/Unhide";
+    changelog = "https://github.com/YJesus/Unhide/blob/${src.rev}/NEWS";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ tochiaha ];
+    mainProgram = "unhide";
+    platforms = lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix
index dd6c11120e4d..b851ac2c1403 100644
--- a/pkgs/development/compilers/souffle/default.nix
+++ b/pkgs/development/compilers/souffle/default.nix
@@ -1,12 +1,12 @@
 { lib, stdenv, fetchFromGitHub
 , bash-completion, perl, ncurses, zlib, sqlite, libffi
 , mcpp, cmake, bison, flex, doxygen, graphviz
-, makeWrapper
+, makeWrapper, python3, callPackage
 }:
 
 
 let
-  toolsPath = lib.makeBinPath [ mcpp ];
+  toolsPath = lib.makeBinPath [ mcpp python3 ];
 in
 stdenv.mkDerivation rec {
   pname = "souffle";
@@ -21,12 +21,13 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./threads.patch
+    ./includes.patch
   ];
 
   hardeningDisable = lib.optionals stdenv.isDarwin [ "strictoverflow" ];
 
   nativeBuildInputs = [ bison cmake flex mcpp doxygen graphviz makeWrapper perl ];
-  buildInputs = [ bash-completion ncurses zlib sqlite libffi ];
+  buildInputs = [ bash-completion ncurses zlib sqlite libffi python3 ];
   # these propagated inputs are needed for the compiled Souffle mode to work,
   # since generated compiler code uses them. TODO: maybe write a g++ wrapper
   # that adds these so we can keep the propagated inputs clean?
@@ -42,13 +43,21 @@ stdenv.mkDerivation rec {
     wrapProgram "$out/bin/souffle" --prefix PATH : "${toolsPath}"
   '';
 
+  postFixup = ''
+    substituteInPlace "$out/bin/souffle-compile.py" \
+        --replace "-IPLACEHOLDER_FOR_INCLUDES_THAT_ARE_SET_BY_NIXPKGS" \
+                  "-I${ncurses.dev}/include -I${zlib.dev}/include -I${sqlite.dev}/include -I${libffi.dev}/include -I$out/include"
+  '';
+
   outputs = [ "out" ];
 
+  passthru.tests = callPackage ./tests.nix { };
+
   meta = with lib; {
     description = "Translator of declarative Datalog programs into the C++ language";
     homepage    = "https://souffle-lang.github.io/";
     platforms   = platforms.unix;
-    maintainers = with maintainers; [ thoughtpolice copumpkin wchresta ];
+    maintainers = with maintainers; [ thoughtpolice copumpkin wchresta markusscherer ];
     license     = licenses.upl;
   };
 }
diff --git a/pkgs/development/compilers/souffle/includes.patch b/pkgs/development/compilers/souffle/includes.patch
new file mode 100644
index 000000000000..3e37641a6cab
--- /dev/null
+++ b/pkgs/development/compilers/souffle/includes.patch
@@ -0,0 +1,13 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 946a1f8..bc60339 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -428,7 +428,7 @@ set(SOUFFLE_COMPILED_RELEASE_CXX_FLAGS ${CMAKE_CXX_FLAGS_RELEASE})
+ set(SOUFFLE_COMPILED_DEBUG_CXX_FLAGS ${CMAKE_CXX_FLAGS_DEBUG})
+ get_target_property(SOUFFLE_COMPILED_DEFS compiled COMPILE_DEFINITIONS)
+ get_target_property(SOUFFLE_COMPILED_OPTS compiled COMPILE_OPTIONS)
+-get_target_property(SOUFFLE_COMPILED_INCS compiled INCLUDE_DIRECTORIES)
++set(SOUFFLE_COMPILED_INCS PLACEHOLDER_FOR_INCLUDES_THAT_ARE_SET_BY_NIXPKGS)
+ 
+ set(SOUFFLE_COMPILED_LIBS "")
+ set(SOUFFLE_COMPILED_RPATHS "")
diff --git a/pkgs/development/compilers/souffle/tests.nix b/pkgs/development/compilers/souffle/tests.nix
new file mode 100644
index 000000000000..82b4fa489dae
--- /dev/null
+++ b/pkgs/development/compilers/souffle/tests.nix
@@ -0,0 +1,36 @@
+{ stdenv, lib, souffle, runCommand }:
+let
+  simpleTest = { name, commands }:
+    stdenv.mkDerivation {
+      inherit name;
+      meta.timeout = 60;
+      buildCommand = ''
+        echo -e '.decl A(X: number)\n.output A\nA(1).' > A.dl
+        ${commands}
+        [ "$(cat A.csv)" = "1" ]
+        touch $out
+      '';
+    };
+in {
+  interpret = simpleTest {
+    name = "souffle-test-interpret";
+    commands = "${souffle}/bin/souffle A.dl";
+  };
+
+  compile-in-one-step = simpleTest {
+    name = "souffle-test-compile-in-one-step";
+    commands = ''
+      ${souffle}/bin/souffle -o A A.dl
+      ./A
+    '';
+  };
+
+  compile-in-two-steps = simpleTest {
+    name = "souffle-test-compile-in-two-steps";
+    commands = ''
+      ${souffle}/bin/souffle -g A.cpp A.dl
+      ${souffle}/bin/souffle-compile.py A.cpp -o A
+      ./A
+    '';
+  };
+}
diff --git a/pkgs/development/libraries/botan/2.0.nix b/pkgs/development/libraries/botan/2.0.nix
index c9a45218dfb4..c14fdb4cef1f 100644
--- a/pkgs/development/libraries/botan/2.0.nix
+++ b/pkgs/development/libraries/botan/2.0.nix
@@ -2,6 +2,6 @@
 
 callPackage ./generic.nix (args // {
   baseVersion = "2.19";
-  revision = "4";
-  hash = "sha256-WjqI72Qz6XvKsO+h7WDGGX5K2p2dMLwcR0N7+JuX8nY=";
+  revision = "5";
+  hash = "sha256-3+6g4KbybWckxK8B2pp7iEh62y2Bunxy/K9S21IsmtQ=";
 })
diff --git a/pkgs/development/libraries/botan/3.0.nix b/pkgs/development/libraries/botan/3.0.nix
index d3cd0ece00df..0cffb67104c6 100644
--- a/pkgs/development/libraries/botan/3.0.nix
+++ b/pkgs/development/libraries/botan/3.0.nix
@@ -1,9 +1,9 @@
 { callPackage, stdenv, lib, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  baseVersion = "3.4";
+  baseVersion = "3.5";
   revision = "0";
-  hash = "sha256-cYQ6/MCixYX48z+jBPC1iuS5xdgwb4lGZ7N0YEQndVc=";
+  hash = "sha256-Z+ja4cokaNkN5OYByH1fMf9JKzjoq4vL0C3fcQTtip8=";
   # this patch fixes build errors on MacOS with SDK 10.12, recheck to remove this again
   extraPatches = lib.optionals stdenv.hostPlatform.isDarwin [ ./botan3-macos.patch ];
 })
diff --git a/pkgs/development/libraries/science/math/mkl/test/default.nix b/pkgs/development/libraries/science/math/mkl/test/default.nix
index cb3355260d12..1717e11e43d8 100644
--- a/pkgs/development/libraries/science/math/mkl/test/default.nix
+++ b/pkgs/development/libraries/science/math/mkl/test/default.nix
@@ -12,7 +12,9 @@ in stdenv.mkDerivation {
   pname = "mkl-test";
   version = mkl.version;
 
-  src = ./.;
+  unpackPhase = ''
+    cp ${./test.c} test.c
+  '';
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 045a127d9818..0bc7ec6c36b7 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -96,6 +96,7 @@ mapAliases {
   inherit (pkgs) get-graphql-schema; # added 2024-06-26
   inherit (pkgs) gqlint; # added 2023-08-19
   inherit (pkgs) gramma; # added 2024-06-26
+  grammarly-languageserver = throw "grammarly-languageserver was removed because it requires EOL Node.js 16"; # added 2024-07-15
   inherit (pkgs) graphite-cli; # added 2024-01-25
   inherit (pkgs) graphqurl; # added 2023-08-19
   gtop = pkgs.gtop; # added 2023-07-31
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index b5b5e9c4549b..89836eaf6aca 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -107,7 +107,6 @@
 , "ganache"
 , "gatsby-cli"
 , "@gitbeaker/cli"
-, "grammarly-languageserver"
 , "graphql"
 , "graphql-cli"
 , "graphql-language-service-cli"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 6e8749f751f5..e56caa76df7c 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -71874,50 +71874,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  grammarly-languageserver = nodeEnv.buildNodePackage {
-    name = "grammarly-languageserver";
-    packageName = "grammarly-languageserver";
-    version = "0.0.4";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/grammarly-languageserver/-/grammarly-languageserver-0.0.4.tgz";
-      sha512 = "+PbI/pMgAeoa0jbFI65JWRj3RjomHjvigrKZybXCYM3jlvTDKUyg7NWPug554ukKLaGIURQ1YGOptmfrYOMzQw==";
-    };
-    dependencies = [
-      sources."@grammarly/sdk-1.11.0"
-      sources."dom-serializer-2.0.0"
-      sources."domelementtype-2.3.0"
-      sources."domhandler-5.0.3"
-      sources."domutils-3.1.0"
-      sources."encoding-0.1.13"
-      sources."entities-4.5.0"
-      sources."grammarly-richtext-encoder-0.0.0"
-      sources."htmlparser2-8.0.2"
-      sources."iconv-lite-0.6.3"
-      sources."idb-keyval-6.2.1"
-      sources."inversify-6.0.2"
-      sources."node-fetch-2.7.0"
-      sources."reflect-metadata-0.1.14"
-      sources."safer-buffer-2.1.2"
-      sources."tr46-0.0.3"
-      sources."vscode-jsonrpc-6.0.0"
-      sources."vscode-languageserver-7.0.0"
-      sources."vscode-languageserver-protocol-3.16.0"
-      sources."vscode-languageserver-textdocument-1.0.11"
-      sources."vscode-languageserver-types-3.16.0"
-      sources."web-tree-sitter-0.20.5"
-      sources."webidl-conversions-3.0.1"
-      sources."whatwg-url-5.0.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "LSP server implementation for Grammarly";
-      homepage = "https://github.com/znck/grammarly#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   graphql = nodeEnv.buildNodePackage {
     name = "graphql";
     packageName = "graphql";
diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix
index d84adb870adb..9e8d268f1cf6 100644
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@@ -61,14 +61,6 @@ final: prev: {
     '';
   };
 
-  grammarly-languageserver = prev.grammarly-languageserver.override (old: {
-    meta = old.meta // {
-      # requires EOL Node.js 16
-      # https://github.com/znck/grammarly/issues/334
-      broken = true;
-    };
-  });
-
   graphql-language-service-cli = prev.graphql-language-service-cli.override {
     nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
     postInstall = ''
@@ -129,6 +121,11 @@ final: prev: {
         };
       }
     ] ++ oldAttrs.dependencies;
+
+    meta = oldAttrs.meta // {
+      # ModuleNotFoundError: No module named 'distutils'
+      broken = true;
+    };
   });
 
   jsonplaceholder = prev.jsonplaceholder.override {
diff --git a/pkgs/development/python-modules/altgraph/default.nix b/pkgs/development/python-modules/altgraph/default.nix
index 5e638c4aa9b0..932896f1beea 100644
--- a/pkgs/development/python-modules/altgraph/default.nix
+++ b/pkgs/development/python-modules/altgraph/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools
 }:
 
 buildPythonPackage rec {
@@ -15,6 +16,12 @@ buildPythonPackage rec {
     hash = "sha256-G1r7uY9sTcrbLirmq5+plLu4wddfT6ltNA+UN65FRAY=";
   };
 
+  dependencies = [
+    # setuptools in dependencies is intentional
+    # https://github.com/ronaldoussoren/altgraph/issues/21
+    setuptools
+  ];
+
   pythonImportsCheck = [ "altgraph" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix
index aa1575e2f247..57ab3af10d3f 100644
--- a/pkgs/development/python-modules/clarifai-grpc/default.nix
+++ b/pkgs/development/python-modules/clarifai-grpc/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "clarifai-grpc";
-  version = "10.5.4";
+  version = "10.6.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "Clarifai";
     repo = "clarifai-python-grpc";
     rev = "refs/tags/${version}";
-    hash = "sha256-iwL77pt313rroaJw7Pn6n41aSzLyKLiUR32yai91jWE=";
+    hash = "sha256-CeBTcIs+WjqpwKUAy4Ws+27jcO5pkopMXhPwrpzdWnA=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/colored-traceback/default.nix b/pkgs/development/python-modules/colored-traceback/default.nix
index b0447c66bc12..8fc51701bf24 100644
--- a/pkgs/development/python-modules/colored-traceback/default.nix
+++ b/pkgs/development/python-modules/colored-traceback/default.nix
@@ -2,20 +2,23 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   pygments,
 }:
 
 buildPythonPackage rec {
   pname = "colored-traceback";
-  version = "0.3.0";
-  format = "setuptools";
+  version = "0.4.2";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-bafOKx2oafa7VMkntBW5VyfEu22ahMRhXqd9mHKRGwU=";
+    hash = "sha256-7LyOQfBxLqgZMdfNQ2uL658+/xWV0kmPGD4O9ptW/oQ=";
   };
 
-  buildInputs = [ pygments ];
+  build-system = [ setuptools ];
+
+  dependencies = [ pygments ];
 
   # No setuptools tests for the package.
   doCheck = false;
diff --git a/pkgs/development/python-modules/corner/default.nix b/pkgs/development/python-modules/corner/default.nix
new file mode 100644
index 000000000000..c69bf902d556
--- /dev/null
+++ b/pkgs/development/python-modules/corner/default.nix
@@ -0,0 +1,106 @@
+{
+  lib,
+  buildPythonPackage,
+  pythonOlder,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+  setuptools-scm,
+
+  # dependencies
+  matplotlib,
+
+  # optional-dependencies
+  arviz,
+  ipython,
+  myst-nb,
+  pandoc,
+  sphinx,
+  sphinx-book-theme,
+  pytest,
+  scipy,
+
+  # checks
+  pytestCheckHook,
+  corner,
+}:
+
+buildPythonPackage rec {
+  pname = "corner";
+  version = "2.2.2";
+  pyproject = true;
+
+  disable = pythonOlder "3.9";
+
+  src = fetchFromGitHub {
+    owner = "dfm";
+    repo = "corner.py";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-MYos01YCSUwivymSE2hbjV7eKXfaMqG89koD2CWZjcQ=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [ matplotlib ];
+
+  optional-dependencies = {
+    arviz = [ arviz ];
+    docs = [
+      arviz
+      ipython
+      myst-nb
+      pandoc
+      sphinx
+      sphinx-book-theme
+    ];
+    test = [
+      arviz
+      pytest
+      scipy
+    ];
+  };
+
+  pythonImportsCheck = [ "corner" ];
+
+  nativeCheckInputs = [ pytestCheckHook ] ++ corner.passthru.optional-dependencies.test;
+
+  # matplotlib.testing.exceptions.ImageComparisonFailure: images not close
+  disabledTests = [
+    "test_arviz"
+    "test_basic"
+    "test_bins"
+    "test_bins_log"
+    "test_color"
+    "test_color_filled"
+    "test_extended_overplotting"
+    "test_hist_bin_factor"
+    "test_labels"
+    "test_lowNfilled"
+    "test_no_fill_contours"
+    "test_overplot_log"
+    "test_pandas"
+    "test_quantiles"
+    "test_range_fig_arg"
+    "test_reverse_overplotting"
+    "test_tight"
+    "test_title_quantiles"
+    "test_title_quantiles_default"
+    "test_title_quantiles_raises"
+    "test_titles1"
+    "test_titles2"
+    "test_top_ticks"
+    "test_truths"
+  ];
+
+  meta = {
+    description = "Make some beautiful corner plots";
+    homepage = "https://github.com/dfm/corner.py";
+    changelog = "https://github.com/dfm/corner.py/releases/tag/v${version}";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/development/python-modules/django-haystack/default.nix b/pkgs/development/python-modules/django-haystack/default.nix
index 8b49b0014b92..122df1713ddc 100644
--- a/pkgs/development/python-modules/django-haystack/default.nix
+++ b/pkgs/development/python-modules/django-haystack/default.nix
@@ -10,6 +10,7 @@
 
   # dependencies
   django,
+  packaging,
 
   # tests
   elasticsearch,
@@ -39,6 +40,7 @@ buildPythonPackage rec {
   ];
 
   buildInputs = [ django ];
+  propagatedBuildInputs = [ packaging ];
 
   optional-dependencies = {
     elasticsearch = [ elasticsearch ];
diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix
index fc9f0964259f..7feb6338397b 100644
--- a/pkgs/development/python-modules/django-picklefield/default.nix
+++ b/pkgs/development/python-modules/django-picklefield/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "django-picklefield";
-  version = "3.0.1";
+  version = "3.2.0";
   format = "setuptools";
 
   # The PyPi source doesn't contain tests
@@ -18,15 +18,11 @@ buildPythonPackage rec {
     owner = "gintas";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0ni7bc86k0ra4pc8zv451pzlpkhs1nyil1sq9jdb4m2mib87b5fk";
+    sha256 = "sha256-UMMbJoSHWcdumZOFPhKNUjThGzU/8nhP2J8YsDjgbHo=";
   };
 
   propagatedBuildInputs = [ django ];
 
-  # Tests are failing with Django 3.2
-  # https://github.com/gintas/django-picklefield/issues/58
-  doCheck = false;
-
   checkPhase = ''
     runHook preCheck
     ${python.interpreter} -m django test --settings=tests.settings
diff --git a/pkgs/development/python-modules/dohq-artifactory/default.nix b/pkgs/development/python-modules/dohq-artifactory/default.nix
new file mode 100644
index 000000000000..839bfd2f38f3
--- /dev/null
+++ b/pkgs/development/python-modules/dohq-artifactory/default.nix
@@ -0,0 +1,57 @@
+{
+  lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonAtLeast
+, setuptools
+, requests
+, python-dateutil
+, pyjwt
+, pytestCheckHook
+, responses
+, nix-update-script
+}:
+
+buildPythonPackage rec {
+  pname = "dohq-artifactory";
+  version = "0.10.0";
+
+  src = fetchFromGitHub {
+    owner = "devopshq";
+    repo = "artifactory";
+    rev = version;
+    hash = "sha256-gccVwshGBgbhTSX4o0vANIRct1isqDj+gWeZZxExj9Q=";
+  };
+
+  # https://github.com/devopshq/artifactory/issues/430
+  disabled = pythonAtLeast "3.12";
+
+  pyproject = true;
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    requests
+    python-dateutil
+    pyjwt
+  ];
+
+  pythonImportsCheck = [ "artifactory" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    responses
+  ];
+
+  pytestFlagsArray = [ "tests/unit" ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = with lib; {
+    description = "Python interface library for JFrog Artifactory";
+    homepage = "https://devopshq.github.io/artifactory/";
+    changelog = "https://github.com/devopshq/artifactory/releases/tag/${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ h7x4 ];
+  };
+}
diff --git a/pkgs/development/python-modules/evosax/default.nix b/pkgs/development/python-modules/evosax/default.nix
new file mode 100644
index 000000000000..08771810c948
--- /dev/null
+++ b/pkgs/development/python-modules/evosax/default.nix
@@ -0,0 +1,84 @@
+{
+  lib,
+  buildPythonPackage,
+  pythonOlder,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  chex,
+  dotmap,
+  flax,
+  jax,
+  jaxlib,
+  matplotlib,
+  numpy,
+  pyyaml,
+
+  # checks
+  # brax, (unpackaged)
+  # gymnax, (unpackaged)
+  pytestCheckHook,
+  torch,
+  torchvision,
+}:
+
+buildPythonPackage rec {
+  pname = "evosax";
+  version = "0.1.6";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "RobertTLange";
+    repo = "evosax";
+    rev = "refs/tags/v.${version}";
+    hash = "sha256-v8wRiWZlJPF9pIXocQ6/caHl1W4QBNjkmuImJ6MAueo=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    chex
+    dotmap
+    flax
+    jax
+    jaxlib
+    matplotlib
+    numpy
+    pyyaml
+  ];
+
+  pythonImportsCheck = [ "evosax" ];
+
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
+
+  nativeCheckInputs = [
+    # brax
+    # gymnax
+    pytestCheckHook
+    torch
+    torchvision
+  ];
+
+  disabledTests = [
+    # Requires unpackaged gymnax
+    "test_env_ffw_rollout"
+
+    # Tries to download a data set from the internet
+    "test_vision_fitness"
+  ];
+
+  meta = {
+    description = "Evolution Strategies in JAX";
+    homepage = "https://github.com/RobertTLange/evosax";
+    changelog = "https://github.com/RobertTLange/evosax/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/development/python-modules/flowmc/default.nix b/pkgs/development/python-modules/flowmc/default.nix
new file mode 100644
index 000000000000..27127b93b578
--- /dev/null
+++ b/pkgs/development/python-modules/flowmc/default.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  buildPythonPackage,
+  pythonOlder,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  corner,
+  equinox,
+  evosax,
+  jax,
+  jaxlib,
+  optax,
+  tqdm,
+
+  # checks
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "flowmc";
+  version = "0.3.4";
+  pyproject = true;
+
+  disabled = pythonOlder "3.10";
+
+  src = fetchFromGitHub {
+    owner = "kazewong";
+    repo = "flowMC";
+    rev = "refs/tags/flowMC-${version}";
+    hash = "sha256-unvbNs0AOzW4OI+9y6KxoBC5yEjEz+q0PZblQLXCC/Y=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    corner
+    equinox
+    evosax
+    jax
+    jaxlib
+    optax
+    tqdm
+  ];
+
+  pythonImportsCheck = [ "flowMC" ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  meta = {
+    description = "Normalizing-flow enhanced sampling package for probabilistic inference in Jax";
+    homepage = "https://github.com/kazewong/flowMC";
+    changelog = "https://github.com/kazewong/flowMC/releases/tag/flowMC-${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix
index 0f09ffe98a4e..7a01170a8ba6 100644
--- a/pkgs/development/python-modules/huggingface-hub/default.nix
+++ b/pkgs/development/python-modules/huggingface-hub/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "huggingface-hub";
-  version = "0.23.4";
+  version = "0.23.5";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "huggingface";
     repo = "huggingface_hub";
     rev = "refs/tags/v${version}";
-    hash = "sha256-6UAuNKeltaclhnQ7J2X0EziGitROMKmOlIWGw87y66E=";
+    hash = "sha256-Nncyi9u72aq1142wBpz3M/ji2GlCbdEqCZ9+kRRnMT4=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix
index 081c08582b6e..3bfb1d4ae8c6 100644
--- a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix
+++ b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "pydata-sphinx-theme";
-  version = "0.15.3";
+  version = "0.15.4";
 
   format = "wheel";
 
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     dist = "py3";
     python = "py3";
     pname = "pydata_sphinx_theme";
-    hash = "sha256-pI7gSdybD3Bk27j3Bksc865Iqhk/qv4Uq9QDobcQKBA=";
+    hash = "sha256-ITatDpUA0JSflhZ+Y/PimGIAQK6o+cdGIZWe2l1M+OY=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix
new file mode 100644
index 000000000000..59622dd05159
--- /dev/null
+++ b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix
@@ -0,0 +1,45 @@
+{
+  lib
+, buildPythonPackage
+, fetchPypi
+, setuptools
+}:
+
+buildPythonPackage rec {
+  pname = "pyinstaller-hooks-contrib";
+  version = "2024.7";
+
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "pyinstaller_hooks_contrib";
+    inherit version;
+    hash = "sha256-/V833Pmb7OGE5AZCr4i+Fqm4lhPsuViovRE2Y0/J+sU=";
+  };
+
+  build-system = [ setuptools ];
+
+  # There are tests for every hook, which means that
+  # new updates are going to require changes to test inputs
+  # and building tests creates a very big closure.
+  doCheck = false;
+
+  meta = {
+    description = "Community maintained hooks for PyInstaller";
+    longDescription = ''
+      A "hook" file extends PyInstaller to adapt it to the special needs and methods used by a Python package.
+      The word "hook" is used for two kinds of files. A runtime hook helps the bootloader to launch an app,
+      setting up the environment. A package hook (there are several types of those) tells PyInstaller
+      what to include in the final app - such as the data files and (hidden) imports mentioned above.
+      This repository is a collection of hooks for many packages, and allows PyInstaller to work with these packages seamlessly.
+    '';
+    homepage = "https://github.com/pyinstaller/pyinstaller-hooks-contrib";
+    # See https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/761
+    changelog = "https://github.com/pyinstaller/pyinstaller-hooks-contrib/blob/master/CHANGELOG.rst";
+    license = with lib.licenses; [
+      gpl2Plus
+      asl20
+    ];
+    maintainers = with lib.maintainers; [ h7x4 ];
+  };
+}
diff --git a/pkgs/development/python-modules/pyinstaller/default.nix b/pkgs/development/python-modules/pyinstaller/default.nix
new file mode 100644
index 000000000000..2c8fc65ebd28
--- /dev/null
+++ b/pkgs/development/python-modules/pyinstaller/default.nix
@@ -0,0 +1,67 @@
+{
+  lib
+, buildPythonPackage
+, fetchPypi
+, setuptools
+, zlib
+, altgraph
+, packaging
+, pyinstaller-hooks-contrib
+, testers
+, pyinstaller
+, glibc
+, binutils
+, installShellFiles
+}:
+
+buildPythonPackage rec {
+  pname = "pyinstaller";
+  version = "6.8.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-P0tlIPRCP+GbzC/WOrcjiFGuK9y8mPJbxdL5fMYgEuk=";
+  };
+
+
+  build-system = [ setuptools ];
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  buildInputs = [ zlib.dev ];
+
+  dependencies = [
+    altgraph
+    packaging
+    pyinstaller-hooks-contrib
+  ];
+
+  makeWrapperArgs = [
+    "--prefix" "PATH" ":"  (lib.makeBinPath [ glibc binutils ])
+  ];
+
+  postInstall = ''
+    installManPage doc/pyinstaller.1 doc/pyi-makespec.1
+  '';
+
+  pythonImportsCheck = [ "PyInstaller" ];
+
+  passthru.tests.version = testers.testVersion {
+    package = pyinstaller;
+  };
+
+  meta = {
+    description = "A tool to bundle a python application with dependencies into a single package";
+    homepage = "https://pyinstaller.org/";
+    changelog = "https://pyinstaller.org/en/v${version}/CHANGES.html";
+    downloadPage = "https://pypi.org/project/pyinstaller/";
+    license = with lib.licenses; [
+      mit
+      asl20
+      gpl2Plus
+    ];
+    maintainers = with lib.maintainers; [ h7x4 ];
+    mainProgram = "pyinstaller";
+  };
+}
diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix
index 171f71dfbe8b..8bdbd027a7c8 100644
--- a/pkgs/development/python-modules/pytensor/default.nix
+++ b/pkgs/development/python-modules/pytensor/default.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "pytensor";
-  version = "2.25.1";
+  version = "2.25.2";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -37,14 +37,9 @@ buildPythonPackage rec {
     owner = "pymc-devs";
     repo = "pytensor";
     rev = "refs/tags/rel-${version}";
-    hash = "sha256-Z0PQtuADqXiVnDcLoy+R5Mrg6KMGWILbLdMM5fNBqaM=";
+    hash = "sha256-+82zQtC20Q2u3/ujnt8UfmK4oYCpH6Eo2TTlk2g3z+s=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace "versioneer[toml]==0.28" "versioneer[toml]"
-  '';
-
   pythonRelaxDeps = [
     "scipy"
   ];
diff --git a/pkgs/development/python-modules/python-lsp-ruff/default.nix b/pkgs/development/python-modules/python-lsp-ruff/default.nix
index 9b10cc6eb8e6..b16c1e03100a 100644
--- a/pkgs/development/python-modules/python-lsp-ruff/default.nix
+++ b/pkgs/development/python-modules/python-lsp-ruff/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "python-lsp-ruff";
-  version = "2.2.1";
+  version = "2.2.2";
   pyproject = true;
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit version;
     pname = "python_lsp_ruff";
-    hash = "sha256-C7OiJ7wTboq4xm6Rcz8mc9wV329/yeuZ1CZ9CZGzJ6U=";
+    hash = "sha256-P4C9sLSo7iRiRZahz/YLKMw3dxdzcw+b99lG3f+fDKw=";
   };
 
   postPatch = ''
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     sed -i -e "s|workspace.root_path|'/tmp/'|g" tests/*.py
   '';
 
-  propagatedBuildInputs = [
+  dependencies = [
     cattrs
     lsprotocol
     python-lsp-server
@@ -40,11 +40,11 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/python-lsp/python-lsp-ruff";
     description = "Ruff linting plugin for pylsp";
     changelog = "https://github.com/python-lsp/python-lsp-ruff/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ linsui ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ linsui ];
   };
 }
diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix
index f755014155dd..6f276f104f9e 100644
--- a/pkgs/development/python-modules/pytools/default.nix
+++ b/pkgs/development/python-modules/pytools/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "pytools";
-  version = "2024.1.5";
+  version = "2024.1.6";
   format = "setuptools";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-jDd7sf/ctRAzAbjn6U8By+Nlc6AeAgQ0/qlikbHxrBk=";
+    hash = "sha256-u9t1BrCWakShd8XlVWdb7OHmXhW7sRFPNwsiPgaTIrk=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix
index e7db25836e8f..74629872dce7 100644
--- a/pkgs/development/python-modules/types-protobuf/default.nix
+++ b/pkgs/development/python-modules/types-protobuf/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "types-protobuf";
-  version = "5.26.0.20240422";
+  version = "5.27.0.20240626";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-5gdBeBCfl+/p8LIKA1umHXw7A+hn60fSVNKyq2qAXjY=";
+    hash = "sha256-aDuhQEO63meF4/k3p0mPJDs3iBqRrI2BuSAuz4sZHpw=";
   };
 
   propagatedBuildInputs = [ types-futures ];
diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix
index 7680bb1d1ff7..59200d18b259 100644
--- a/pkgs/development/tools/devbox/default.nix
+++ b/pkgs/development/tools/devbox/default.nix
@@ -5,13 +5,13 @@
 }:
 buildGoModule rec {
   pname = "devbox";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "jetpack-io";
     repo = pname;
     rev = version;
-    hash = "sha256-v2EBN9zp6ssY0hWJQnhsIlRU3L7oOad46bvDUILGIv0=";
+    hash = "sha256-+bnFaopmK8Yz2XSkN3wPiipoO5TsRD0IuAKUlx1KvKM=";
   };
 
   ldflags = [
@@ -23,7 +23,7 @@ buildGoModule rec {
   # integration tests want file system access
   doCheck = false;
 
-  vendorHash = "sha256-efXYFVs+W6jkShWrU21WCiQqfaNX/9HLD8CxesbkR0s=";
+  vendorHash = "sha256-fuLKo6m/n06W4jyCc4Ki0GLlSIYZNdGFOhpasTd95x0=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/development/tools/goperf/default.nix b/pkgs/development/tools/goperf/default.nix
index f49859dd0db2..9342cf8a41ab 100644
--- a/pkgs/development/tools/goperf/default.nix
+++ b/pkgs/development/tools/goperf/default.nix
@@ -8,15 +8,15 @@
 
 buildGoModule rec {
   pname = "goperf";
-  version = "0-unstable-2024-06-04";
+  version = "0-unstable-2024-07-07";
 
   src = fetchgit {
     url = "https://go.googlesource.com/perf";
-    rev = "3b48cf0e01640b30e676c2d0ffe23b85992be961";
-    hash = "sha256-QOTTBc0pxVU2wf1BJt2GiTs28AuMlrjJ50J47EmQt+U=";
+    rev = "dc66afd55b77cd4e555203ff2c0d3e4d219a1410";
+    hash = "sha256-necbttrRRVcbe4JOFBFNvAl2CPOXe8bC7qPLb8qXJSE=";
   };
 
-  vendorHash = "sha256-O1FxOtRcg4zM2X1YcVFBsy1OsRMZXmAT0ZmGWmCn81g=";
+  vendorHash = "sha256-LJ8eNjOufTvLj1939nYkQOi84ZlT8zSGnTztcEKigfY=";
 
   passthru.updateScript = writeShellScript "update-goperf" ''
     export UPDATE_NIX_ATTR_PATH=goperf
diff --git a/pkgs/development/tools/mysql-shell/default.nix b/pkgs/development/tools/mysql-shell/8.nix
similarity index 61%
rename from pkgs/development/tools/mysql-shell/default.nix
rename to pkgs/development/tools/mysql-shell/8.nix
index d2de80d432c4..2f8983572f29 100644
--- a/pkgs/development/tools/mysql-shell/default.nix
+++ b/pkgs/development/tools/mysql-shell/8.nix
@@ -16,7 +16,6 @@
 , libssh
 , zstd
 , lz4
-, boost
 , readline
 , libtirpc
 , rpcsvc-proto
@@ -34,33 +33,42 @@
 
 let
   pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ];
+
+  mysqlShellVersion = "8.4.1";
+  mysqlServerVersion = "8.4.1";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mysql-shell";
-  version = "8.0.37";
+  version = mysqlShellVersion;
 
   srcs = [
     (fetchurl {
-      url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz";
-      hash = "sha256-4GOgkazZ7EC7BfLATfZPiZan5OJuiDu2UChJ1fa0pho=";
+      url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz";
+      hash = "sha256-20Hxl9cXDFTX7cDQyaJzDCJfSvBeztD2S+z5u2wRAT4=";
     })
     (fetchurl {
       url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz";
-      hash = "sha256-UtZ7/Ip5h9CXKy3lkSt8/TXJgbPPUO73rMSIFPfX0Is=";
+      hash = "sha256-wTwoaoaCrTQqaqgE35Sg8zn8HqjsjQowbtgMZTpkYQU=";
     })
   ];
 
   sourceRoot = "mysql-shell-${finalAttrs.version}-src";
 
   postUnpack = ''
-    mv mysql-${finalAttrs.version} mysql
+    mv mysql-${mysqlServerVersion} mysql
   '';
 
-  postPatch = ''
-    substituteInPlace ../mysql/cmake/libutils.cmake --replace /usr/bin/libtool libtool
-    substituteInPlace ../mysql/cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool
+  patches = [
+    # No openssl bundling on macOS. It's not working.
+    # See https://github.com/mysql/mysql-shell/blob/5b84e0be59fc0e027ef3f4920df15f7be97624c1/cmake/ssl.cmake#L53
+    ./no-openssl-bundling.patch
+  ];
 
-    substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool
+  postPatch = ''
+    substituteInPlace ../mysql/cmake/libutils.cmake --replace-fail /usr/bin/libtool libtool
+    substituteInPlace ../mysql/cmake/os/Darwin.cmake --replace-fail /usr/bin/libtool libtool
+
+    substituteInPlace cmake/libutils.cmake --replace-fail /usr/bin/libtool libtool
   '';
 
   nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ]
@@ -68,7 +76,6 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optionals stdenv.isDarwin [ cctools DarwinTools ];
 
   buildInputs = [
-    boost
     curl
     libedit
     libssh
@@ -95,22 +102,22 @@ stdenv.mkDerivation (finalAttrs: {
     # Build MySQL
     echo "Building mysqlclient mysqlxclient"
 
-    cmake -DWITH_SYSTEM_LIBS=ON -DWITH_BOOST=system -DWITH_FIDO=system -DWITH_ROUTER=OFF -DWITH_UNIT_TESTS=OFF \
+    cmake -DWITH_SYSTEM_LIBS=ON -DWITH_FIDO=system -DWITH_ROUTER=OFF -DWITH_UNIT_TESTS=OFF \
       -DFORCE_UNSUPPORTED_COMPILER=1 -S ../mysql -B ../mysql/build
 
     cmake --build ../mysql/build --parallel ''${NIX_BUILD_CORES:-1} --target mysqlclient mysqlxclient
-  '';
 
-  cmakeFlags = [
-    "-DMYSQL_SOURCE_DIR=../mysql"
-    "-DMYSQL_BUILD_DIR=../mysql/build"
-    "-DMYSQL_CONFIG_EXECUTABLE=../../mysql/build/scripts/mysql_config"
-    "-DWITH_ZSTD=system"
-    "-DWITH_LZ4=system"
-    "-DWITH_ZLIB=system"
-    "-DWITH_PROTOBUF=${protobuf}"
-    "-DHAVE_PYTHON=1"
-  ];
+    cmakeFlagsArray+=(
+      "-DMYSQL_SOURCE_DIR=''${NIX_BUILD_TOP}/mysql"
+      "-DMYSQL_BUILD_DIR=''${NIX_BUILD_TOP}/mysql/build"
+      "-DMYSQL_CONFIG_EXECUTABLE=''${NIX_BUILD_TOP}/mysql/build/scripts/mysql_config"
+      "-DWITH_ZSTD=system"
+      "-DWITH_LZ4=system"
+      "-DWITH_ZLIB=system"
+      "-DWITH_PROTOBUF=system"
+      "-DHAVE_PYTHON=1"
+    )
+  '';
 
   postFixup = ''
     wrapProgram $out/bin/mysqlsh --set PYTHONPATH "${lib.makeSearchPath python3.sitePackages pythonDeps}"
diff --git a/pkgs/development/tools/mysql-shell/innovation.nix b/pkgs/development/tools/mysql-shell/innovation.nix
index efd74f3fc717..aecfc3f06a0c 100644
--- a/pkgs/development/tools/mysql-shell/innovation.nix
+++ b/pkgs/development/tools/mysql-shell/innovation.nix
@@ -34,8 +34,8 @@
 let
   pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ];
 
-  mysqlShellVersion = "8.4.0";
-  mysqlServerVersion = "8.4.0";
+  mysqlShellVersion = "9.0.0";
+  mysqlServerVersion = "9.0.0";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mysql-shell-innovation";
@@ -44,11 +44,11 @@ stdenv.mkDerivation (finalAttrs: {
   srcs = [
     (fetchurl {
       url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz";
-      hash = "sha256-R6VDP83WOduDa5nhtUWcK4E8va0j/ytd1K0n95K6kY4=";
+      hash = "sha256-Eadqo0BGFcacgv/FKL4GnzPWwXvjsCaz01YYFBAUCy0=";
     })
     (fetchurl {
       url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz";
-      hash = "sha256-QT30FNogn7JR/dQ3V86QaAZaMREMKvTocRTUaNLGVlg=";
+      hash = "sha256-0b+QUVp6D1a8ed1HG7u+s4PZ8rGfM6uCOcpq/T8FPjs=";
     })
   ];
 
@@ -58,11 +58,17 @@ stdenv.mkDerivation (finalAttrs: {
     mv mysql-${mysqlServerVersion} mysql
   '';
 
-  postPatch = ''
-    substituteInPlace ../mysql/cmake/libutils.cmake --replace-quiet /usr/bin/libtool libtool
-    substituteInPlace ../mysql/cmake/os/Darwin.cmake --replace-quiet /usr/bin/libtool libtool
+  patches = [
+    # No openssl bundling on macOS. It's not working.
+    # See https://github.com/mysql/mysql-shell/blob/5b84e0be59fc0e027ef3f4920df15f7be97624c1/cmake/ssl.cmake#L53
+    ./no-openssl-bundling.patch
+  ];
 
-    substituteInPlace cmake/libutils.cmake --replace-quiet /usr/bin/libtool libtool
+  postPatch = ''
+    substituteInPlace ../mysql/cmake/libutils.cmake --replace-fail /usr/bin/libtool libtool
+    substituteInPlace ../mysql/cmake/os/Darwin.cmake --replace-fail /usr/bin/libtool libtool
+
+    substituteInPlace cmake/libutils.cmake --replace-fail /usr/bin/libtool libtool
   '';
 
   nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ]
diff --git a/pkgs/development/tools/mysql-shell/no-openssl-bundling.patch b/pkgs/development/tools/mysql-shell/no-openssl-bundling.patch
new file mode 100644
index 000000000000..d959e923ad4e
--- /dev/null
+++ b/pkgs/development/tools/mysql-shell/no-openssl-bundling.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 33931e02a..59f613a9d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -901,7 +901,6 @@ endif()
+ ### Bundling of OpenSSL libraries (if needed)
+ # macro MYSQL_CHECK_SSL_DLLS() adapted for Shell
+ IF (WITH_SSL_PATH AND (APPLE OR WIN32 OR LINUX_STANDALONE))
+-  SET(BUNDLED_OPENSSL 1)
+   MESSAGE(STATUS "WITH_SSL_PATH ${WITH_SSL_PATH}")
+ 
+   # In MySQL Server 8.0.4 and up, OpenSSL is linked dynamically and
diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix
index ec2638912d3a..ec34ba2f17fc 100644
--- a/pkgs/development/tools/ocaml/opam/default.nix
+++ b/pkgs/development/tools/ocaml/opam/default.nix
@@ -2,82 +2,16 @@
   ocaml, unzip, ncurses, curl, bubblewrap, Foundation
 }:
 
-assert lib.versionAtLeast ocaml.version "4.02.3";
+assert lib.versionAtLeast ocaml.version "4.08.0";
 
-let
-  srcs = {
-    "0install-solver" = fetchurl {
-      url = "https://github.com/0install/0install/releases/download/v2.17/0install-v2.17.tbz";
-      sha256 = "08q95mzmf9pyyqs68ff52422f834hi313cxmypwrxmxsabcfa10p";
-    };
-    "base64" = fetchurl {
-      url = "https://github.com/mirage/ocaml-base64/releases/download/v3.5.0/base64-v3.5.0.tbz";
-      sha256 = "19735bvb3k263hzcvdhn4d5lfv2qscc9ib4q85wgxsvq0p0fk7aq";
-    };
-    "cmdliner" = fetchurl {
-      url = "http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.4.tbz";
-      sha256 = "1h04q0zkasd0mw64ggh4y58lgzkhg6yhzy60lab8k8zq9ba96ajw";
-    };
-    "cppo" = fetchurl {
-      url = "https://github.com/ocaml-community/cppo/archive/v1.6.8.tar.gz";
-      sha256 = "0lxy4xkkkwgs1cj6d9lyzsqi9f6fc9r6cir5imi7yjqrpd86s1by";
-    };
-    "cudf" = fetchurl {
-      url = "https://gitlab.com/irill/cudf/-/archive/v0.10/cudf-v0.10.tar.gz";
-      sha256 = "0l7vzvlrk4x4vw1lkd1wzarxz3h82r3835singcay8m8zj8777bv";
-    };
-    "dose3" = fetchurl {
-      url = "https://gitlab.com/irill/dose3/-/archive/7.0.0/dose3-7.0.0.tar.gz";
-      sha256 = "0ab0llqdmy82ljh8xdf57y00c9jvf1vnxiq9hczli0r6vc263nq2";
-    };
-    "dune-local" = fetchurl {
-      url = "https://github.com/ocaml/dune/releases/download/3.5.0/dune-3.5.0.tbz";
-      sha256 = "041n16sn41wwj6fgi7l10hvbl5x5swygqv33d4csx7rm0iklrgbp";
-    };
-    "extlib" = fetchurl {
-      url = "https://github.com/ygrek/ocaml-extlib/releases/download/1.7.9/extlib-1.7.9.tar.gz";
-      sha256 = "1jydzw2n84cfiz9y6lk4gih4wbr8jybanmiryfs01svd07g4vpjq";
-    };
-    "mccs" = fetchurl {
-      url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+13.tar.gz";
-      sha256 = "05nnji9h8mss3hzjr5faid2v3xfr7rcv2ywmpcxxp28y6h2kv9gv";
-    };
-    "ocamlgraph" = fetchurl {
-      url = "https://github.com/backtracking/ocamlgraph/releases/download/2.0.0/ocamlgraph-2.0.0.tbz";
-      sha256 = "029692bvdz3hxpva9a2jg5w5381fkcw55ysdi8424lyyjxvjdzi0";
-    };
-    "opam-0install-cudf" = fetchurl {
-      url = "https://github.com/ocaml-opam/opam-0install-solver/releases/download/v0.4.2/opam-0install-cudf-v0.4.2.tbz";
-      sha256 = "10wma4hh9l8hk49rl8nql6ixsvlz3163gcxspay5fwrpbg51fmxr";
-    };
-    "opam-file-format" = fetchurl {
-      url = "https://github.com/ocaml/opam-file-format/archive/2.1.4.tar.gz";
-      sha256 = "0xbdlpxb0348pbwijna2x6nbi8fcxdh63cwrznn4q4zzbv9zsy02";
-    };
-    "re" = fetchurl {
-      url = "https://github.com/ocaml/ocaml-re/releases/download/1.10.3/re-1.10.3.tbz";
-      sha256 = "1fqfg609996bgxr14yyfxhvl6hm9c1j0mm2xjdjigqrzgyb4crc4";
-    };
-    "result" = fetchurl {
-      url = "https://github.com/janestreet/result/releases/download/1.5/result-1.5.tbz";
-      sha256 = "0cpfp35fdwnv3p30a06wd0py3805qxmq3jmcynjc3x2qhlimwfkw";
-    };
-    "seq" = fetchurl {
-      url = "https://github.com/c-cube/seq/archive/0.2.2.tar.gz";
-      sha256 = "1ck15v3pg8bacdg6d6iyp2jc3kgrzxk5jsgzx3287x2ycb897j53";
-    };
-    "stdlib-shims" = fetchurl {
-      url = "https://github.com/ocaml/stdlib-shims/releases/download/0.3.0/stdlib-shims-0.3.0.tbz";
-      sha256 = "0jnqsv6pqp5b5g7lcjwgd75zqqvcwcl5a32zi03zg1kvj79p5gxs";
-    };
-    opam = fetchurl {
-      url = "https://github.com/ocaml/opam/archive/2.1.5.zip";
-      sha256 = "0s8r5gfs2zsyfn3jzqnvns3g0rkik3pw628n0dik55fwq3zjgg4a";
-    };
-  };
-in stdenv.mkDerivation {
+stdenv.mkDerivation {
   pname = "opam";
-  version = "2.1.5";
+  version = "2.2.0";
+
+  src = fetchurl {
+    url = "https://github.com/ocaml/opam/releases/download/2.2.0/opam-full-2.2.0-2.tar.gz";
+    sha256 = "459ed64e6643f05c677563a000e3baa05c76ce528064e9cb9ce6db49fff37c97";
+  };
 
   strictDeps = true;
 
@@ -86,35 +20,13 @@ in stdenv.mkDerivation {
     ++ lib.optionals stdenv.isLinux [ bubblewrap ]
     ++ lib.optionals stdenv.isDarwin [ Foundation ];
 
-  src = srcs.opam;
-
-  postUnpack = ''
-    ln -sv ${srcs."0install-solver"} $sourceRoot/src_ext/0install-solver.tbz
-    ln -sv ${srcs."base64"} $sourceRoot/src_ext/base64.tbz
-    ln -sv ${srcs."cmdliner"} $sourceRoot/src_ext/cmdliner.tbz
-    ln -sv ${srcs."cppo"} $sourceRoot/src_ext/cppo.tar.gz
-    ln -sv ${srcs."cudf"} $sourceRoot/src_ext/cudf.tar.gz
-    ln -sv ${srcs."dose3"} $sourceRoot/src_ext/dose3.tar.gz
-    ln -sv ${srcs."dune-local"} $sourceRoot/src_ext/dune-local.tbz
-    ln -sv ${srcs."extlib"} $sourceRoot/src_ext/extlib.tar.gz
-    ln -sv ${srcs."mccs"} $sourceRoot/src_ext/mccs.tar.gz
-    ln -sv ${srcs."ocamlgraph"} $sourceRoot/src_ext/ocamlgraph.tbz
-    ln -sv ${srcs."opam-0install-cudf"} $sourceRoot/src_ext/opam-0install-cudf.tbz
-    ln -sv ${srcs."opam-file-format"} $sourceRoot/src_ext/opam-file-format.tar.gz
-    ln -sv ${srcs."re"} $sourceRoot/src_ext/re.tbz
-    ln -sv ${srcs."result"} $sourceRoot/src_ext/result.tbz
-    ln -sv ${srcs."seq"} $sourceRoot/src_ext/seq.tar.gz
-    ln -sv ${srcs."stdlib-shims"} $sourceRoot/src_ext/stdlib-shims.tbz
-  '';
-
   patches = [ ./opam-shebangs.patch ];
 
   preConfigure = ''
-    substituteInPlace ./src_ext/Makefile --replace "%.stamp: %.download" "%.stamp:"
     patchShebangs src/state/shellscripts
   '';
 
-  postConfigure = "make lib-ext";
+  configureFlags = [ "--with-vendored-deps" "--with-mccs" ];
 
   # Dirty, but apparently ocp-build requires a TERM
   makeFlags = ["TERM=screen"];
@@ -144,4 +56,3 @@ in stdenv.mkDerivation {
     platforms = platforms.all;
   };
 }
-# Generated by: ./opam.nix.pl -v 2.1.5 -p opam-shebangs.patch
diff --git a/pkgs/development/tools/ocaml/opam/opam-shebangs.patch b/pkgs/development/tools/ocaml/opam/opam-shebangs.patch
index 72efec0a9105..12b66d1ebb86 100644
--- a/pkgs/development/tools/ocaml/opam/opam-shebangs.patch
+++ b/pkgs/development/tools/ocaml/opam/opam-shebangs.patch
@@ -2,7 +2,7 @@ diff --git a/src/client/opamInitDefaults.ml b/src/client/opamInitDefaults.ml
 index eca13a7c..1fd66f43 100644
 --- a/src/client/opamInitDefaults.ml
 +++ b/src/client/opamInitDefaults.ml
-@@ -35,14 +35,18 @@ let eval_variables = [
+@@ -42,16 +42,20 @@ let eval_variables = [
  let os_filter os =
    FOp (FIdent ([], OpamVariable.of_string "os", None), `Eq, FString os)
  
@@ -13,17 +13,21 @@ index eca13a7c..1fd66f43 100644
  let macos_filter = os_filter "macos"
  let openbsd_filter = os_filter "openbsd"
  let freebsd_filter = os_filter "freebsd"
+ let netbsd_filter = os_filter "netbsd"
+ let dragonflybsd_filter = os_filter "dragonfly"
  let not_open_free_bsd_filter =
    FNot (FOr (openbsd_filter,  freebsd_filter))
  let win32_filter = os_filter "win32"
+ let not_win32_filter =
+   FOp (FIdent ([], OpamVariable.of_string "os", None), `Neq, FString "win32")
  let sandbox_filter = FOr (linux_filter, macos_filter)
 +let nixos_filter = os_distribution_filter "nixos"
  
- let gpatch_filter = FOr (openbsd_filter, freebsd_filter)
+ let gpatch_filter =
+   FOr (FOr (openbsd_filter, netbsd_filter),
+        FOr (freebsd_filter, dragonflybsd_filter))
  let patch_filter = FNot gpatch_filter
-@@ -50,6 +54,11 @@ let wrappers ~sandboxing () =
-     CString t, None;
-   ] in
+@@ -79,4 +81,9 @@ let wrappers ~sandboxing () =
    let w = OpamFile.Wrappers.empty in
 +  let w = { w with
 +            OpamFile.Wrappers.
@@ -31,8 +35,8 @@ index eca13a7c..1fd66f43 100644
 +          }
 +  in
    if sandboxing then
-     { w with
-       OpamFile.Wrappers.
+     List.fold_left OpamFile.Wrappers.(fun w -> function
+         | `build wrap_build -> { w with wrap_build }
 @@ -113,6 +122,7 @@ let required_tools ~sandboxing () =
  let init_scripts () = [
    ("sandbox.sh", OpamScript.bwrap), Some bwrap_filter;
diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl
deleted file mode 100755
index a3f1bc9219cd..000000000000
--- a/pkgs/development/tools/ocaml/opam/opam.nix.pl
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings qw<all>;
-use Getopt::Std;
-
-my $gencmd = "# Generated by: " . join(" ", $0, @ARGV) . "\n";
-
-our $opt_v;
-our $opt_p;
-our $opt_r;
-our $opt_t;
-getopts "v:p:t:r:";
-
-my $OPAM_RELEASE = $opt_v // "2.0.0";
-my $OPAM_TAG = $opt_t // $OPAM_RELEASE;
-my $OPAM_GITHUB_REPO = $opt_r // "ocaml/opam";
-my $OPAM_RELEASE_URL = "https://github.com/$OPAM_GITHUB_REPO/archive/$OPAM_TAG.zip";
-my $OPAM_RELEASE_SHA256 = `nix-prefetch-url \Q$OPAM_RELEASE_URL\E`;
-chomp $OPAM_RELEASE_SHA256;
-
-my $OPAM_BASE_URL = "https://raw.githubusercontent.com/$OPAM_GITHUB_REPO/$OPAM_TAG";
-my $OPAM_OPAM = `curl -L --url \Q$OPAM_BASE_URL\E/opam-devel.opam`;
-my($OCAML_MIN_VERSION) = $OPAM_OPAM =~ /^  "ocaml" \{>= "(.*)"}$/m
-  or die "could not parse ocaml version bound\n";
-
-print <<"EOF";
-{ stdenv, lib, fetchurl, makeWrapper, getconf,
-  ocaml, unzip, ncurses, curl, bubblewrap, Foundation
-}:
-
-assert lib.versionAtLeast ocaml.version "$OCAML_MIN_VERSION";
-
-let
-  srcs = {
-EOF
-
-my %urls = ();
-my %md5s = ();
-
-open(SOURCES, "-|", "curl", "-L", "--url", "$OPAM_BASE_URL/src_ext/Makefile.sources");
-while (<SOURCES>) {
-  if (/^URL_(?!PKG_)([-\w]+)\s*=\s*(\S+)$/) {
-    $urls{$1} = $2;
-  } elsif (/^MD5_(?!PKG_)([-\w]+)\s*=\s*(\S+)$/) {
-    $md5s{$1} = $2;
-  }
-}
-for my $src (sort keys %urls) {
-  my ($sha256,$store_path) = split /\n/, `nix-prefetch-url --print-path \Q$urls{$src}\E`;
-  system "echo \Q$md5s{$src}\E' *'\Q$store_path\E | md5sum -c 1>&2";
-  die "md5 check failed for $urls{$src}\n" if $?;
-  print <<"EOF";
-    "$src" = fetchurl {
-      url = "$urls{$src}";
-      sha256 = "$sha256";
-    };
-EOF
-}
-
-print <<"EOF";
-    opam = fetchurl {
-      url = "$OPAM_RELEASE_URL";
-      sha256 = "$OPAM_RELEASE_SHA256";
-    };
-  };
-in stdenv.mkDerivation {
-  pname = "opam";
-  version = "$OPAM_RELEASE";
-
-  strictDeps = true;
-
-  nativeBuildInputs = [ makeWrapper unzip ocaml curl ];
-  buildInputs = [ ncurses getconf ]
-    ++ lib.optionals stdenv.isLinux [ bubblewrap ]
-    ++ lib.optionals stdenv.isDarwin [ Foundation ];
-
-  src = srcs.opam;
-
-  postUnpack = ''
-EOF
-for my $src (sort keys %urls) {
-  my($ext) = $urls{$src} =~ /(\.(?:t(?:ar\.|)|)(?:gz|bz2?))$/
-    or die "could not find extension for $urls{$src}\n";
-  print <<"EOF";
-    ln -sv \${srcs."$src"} \$sourceRoot/src_ext/$src$ext
-EOF
-}
-print <<'EOF';
-  '';
-
-EOF
-if (defined $opt_p) {
-  print "  patches = [ ";
-  for my $patch (split /[, ]/, $opt_p) {
-    $patch =~ s/^(?=[^\/]*$)/.\//;
-    print "$patch ";
-  }
-  print "];\n\n";
-}
-print <<'EOF';
-  preConfigure = ''
-    substituteInPlace ./src_ext/Makefile --replace "%.stamp: %.download" "%.stamp:"
-    patchShebangs src/state/shellscripts
-  '';
-
-  postConfigure = "make lib-ext";
-
-  # Dirty, but apparently ocp-build requires a TERM
-  makeFlags = ["TERM=screen"];
-
-  outputs = [ "out" "installer" ];
-  setOutputFlags = false;
-
-  # change argv0 to "opam" as a workaround for
-  # https://github.com/ocaml/opam/issues/2142
-  postInstall = ''
-    mv $out/bin/opam $out/bin/.opam-wrapped
-    makeWrapper $out/bin/.opam-wrapped $out/bin/opam \
-      --argv0 "opam" \
-      --suffix PATH : ${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \
-      --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/
-    $out/bin/opam-installer --prefix=$installer opam-installer.install
-  '';
-
-  doCheck = false;
-
-  meta = with lib; {
-    description = "A package manager for OCaml";
-    homepage = "https://opam.ocaml.org/";
-    changelog = "https://github.com/ocaml/opam/raw/${version}/CHANGES";
-    maintainers = [ ];
-    license = licenses.lgpl21Only;
-    platforms = platforms.all;
-  };
-}
-EOF
-print $gencmd;
diff --git a/pkgs/games/papermc/versions.json b/pkgs/games/papermc/versions.json
index 51bdf49551f7..fcd5f382018a 100644
--- a/pkgs/games/papermc/versions.json
+++ b/pkgs/games/papermc/versions.json
@@ -56,7 +56,7 @@
         "version": "1.20.6-148"
     },
     "1.21": {
-        "hash": "sha256-7gHWhy/nlRc1I5LGN1grIAPaVxT8xJST2+I86xSGSc8=",
-        "version": "1.21-40"
+        "hash": "sha256-rODj39/o2jGuZ92533ewLlCBbwy35s/r+biHS6fxDTU=",
+        "version": "1.21-62"
     }
 }
diff --git a/pkgs/kde/frameworks/kirigami/default.nix b/pkgs/kde/frameworks/kirigami/default.nix
index ee33f2e7b81c..cf82923596a0 100644
--- a/pkgs/kde/frameworks/kirigami/default.nix
+++ b/pkgs/kde/frameworks/kirigami/default.nix
@@ -1,14 +1,34 @@
 {
+  stdenv,
   mkKdeDerivation,
   qtsvg,
   qttools,
   qtdeclarative,
   qt5compat,
+  qqc2-desktop-style,
 }:
-mkKdeDerivation {
-  pname = "kirigami";
+# Kirigami has a runtime dependency on qqc2-desktop-style,
+# which has a build time dependency on Kirigami.
+# So, build qqc2-desktop-style against unwrapped Kirigami,
+# and replace all the other Kirigami with a wrapper that
+# propagates both Kirigami and qqc2-desktop-style.
+# This is a hack, but what can you do.
+let
+  unwrapped = mkKdeDerivation {
+    pname = "kirigami";
 
-  extraNativeBuildInputs = [qtsvg qttools];
-  extraBuildInputs = [qtdeclarative];
-  extraPropagatedBuildInputs = [qt5compat];
+    extraNativeBuildInputs = [qtsvg qttools];
+    extraBuildInputs = [qtdeclarative];
+    extraPropagatedBuildInputs = [qt5compat];
+  };
+in stdenv.mkDerivation {
+  pname = "kirigami-wrapped";
+  inherit (unwrapped) version;
+
+  propagatedBuildInputs = [ unwrapped qqc2-desktop-style ];
+
+  dontUnpack = true;
+  dontWrapQtApps = true;
+
+  passthru = { inherit unwrapped; };
 }
diff --git a/pkgs/kde/frameworks/qqc2-desktop-style/default.nix b/pkgs/kde/frameworks/qqc2-desktop-style/default.nix
index 3c756d9b9353..5ceb41012d66 100644
--- a/pkgs/kde/frameworks/qqc2-desktop-style/default.nix
+++ b/pkgs/kde/frameworks/qqc2-desktop-style/default.nix
@@ -2,10 +2,13 @@
   mkKdeDerivation,
   qtdeclarative,
   qttools,
+  kirigami,
 }:
 mkKdeDerivation {
   pname = "qqc2-desktop-style";
 
   extraNativeBuildInputs = [qttools];
-  extraBuildInputs = [qtdeclarative];
+  extraBuildInputs = [qtdeclarative kirigami.unwrapped];
+
+  excludeDependencies = ["kirigami"];
 }
diff --git a/pkgs/kde/gear/filelight/default.nix b/pkgs/kde/gear/filelight/default.nix
index fa80c1ea2ab3..499fcfccfd37 100644
--- a/pkgs/kde/gear/filelight/default.nix
+++ b/pkgs/kde/gear/filelight/default.nix
@@ -2,7 +2,6 @@
   mkKdeDerivation,
   kirigami,
   kquickcharts,
-  qqc2-desktop-style,
 }:
 mkKdeDerivation {
   pname = "filelight";
@@ -10,7 +9,6 @@ mkKdeDerivation {
   extraBuildInputs = [
     kirigami
     kquickcharts
-    qqc2-desktop-style
   ];
   meta.mainProgram = "filelight";
 }
diff --git a/pkgs/kde/gear/kalk/default.nix b/pkgs/kde/gear/kalk/default.nix
index bc2afd2425bf..511b0bdf0654 100644
--- a/pkgs/kde/gear/kalk/default.nix
+++ b/pkgs/kde/gear/kalk/default.nix
@@ -1,7 +1,6 @@
 {
   mkKdeDerivation,
   qtdeclarative,
-  qqc2-desktop-style,
   kirigami-addons,
   pkg-config,
   bison,
@@ -16,7 +15,6 @@ mkKdeDerivation {
   extraNativeBuildInputs = [pkg-config bison flex];
   extraBuildInputs = [
     qtdeclarative
-    qqc2-desktop-style
     kirigami-addons
     gmp
     mpfr
diff --git a/pkgs/kde/gear/kweather/default.nix b/pkgs/kde/gear/kweather/default.nix
index 561a646f0261..53e122c98fe6 100644
--- a/pkgs/kde/gear/kweather/default.nix
+++ b/pkgs/kde/gear/kweather/default.nix
@@ -2,12 +2,11 @@
   mkKdeDerivation,
   qtsvg,
   qtcharts,
-  qqc2-desktop-style,
   kholidays,
 }:
 mkKdeDerivation {
   pname = "kweather";
 
-  extraBuildInputs = [qtsvg qtcharts qqc2-desktop-style kholidays];
+  extraBuildInputs = [qtsvg qtcharts kholidays];
   meta.mainProgram = "kweather";
 }
diff --git a/pkgs/kde/gear/kwordquiz/default.nix b/pkgs/kde/gear/kwordquiz/default.nix
index 010fd80cacca..ad57c8e2d71b 100644
--- a/pkgs/kde/gear/kwordquiz/default.nix
+++ b/pkgs/kde/gear/kwordquiz/default.nix
@@ -2,7 +2,6 @@
   mkKdeDerivation,
   qtsvg,
   qtmultimedia,
-  qqc2-desktop-style,
 }:
 mkKdeDerivation {
   pname = "kwordquiz";
@@ -10,7 +9,6 @@ mkKdeDerivation {
   extraBuildInputs = [
     qtsvg
     qtmultimedia
-    qqc2-desktop-style
   ];
   meta.mainProgram = "kwordquiz";
 }
diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json
index 1da25c36b372..6989de35d6e0 100644
--- a/pkgs/kde/generated/sources/plasma.json
+++ b/pkgs/kde/generated/sources/plasma.json
@@ -1,322 +1,322 @@
 {
   "bluedevil": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/bluedevil-6.1.2.tar.xz",
-    "hash": "sha256-K/nrgT5Ol9WedgENLiuhRVJd5Ogm155YZNInfHPrQes="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/bluedevil-6.1.3.tar.xz",
+    "hash": "sha256-uaKIDTYaGWe9jenlCIfM1jtenKm7k14ZSPa2GaJoKzk="
   },
   "breeze": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/breeze-6.1.2.tar.xz",
-    "hash": "sha256-1FbcUNlBxJQCCemqUBHV6SAt719lutx+qMbUsqxHfc8="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/breeze-6.1.3.tar.xz",
+    "hash": "sha256-8Vu6jd7QdZVTRlbeerDbrJsM3uhGLVOqqjCbPPLVdtE="
   },
   "breeze-grub": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/breeze-grub-6.1.2.tar.xz",
-    "hash": "sha256-SAT/QJspSGlkxeRyjpswAdL8Zq0xls+Uwc5U9sVELA4="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/breeze-grub-6.1.3.tar.xz",
+    "hash": "sha256-7INKgZa/CokwRl5cOJcUfickR7NHy91eHiWYSBSvPKE="
   },
   "breeze-gtk": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/breeze-gtk-6.1.2.tar.xz",
-    "hash": "sha256-W5/RcOtvnpQ4hopexgd4igCo8PqY8+XHxHqUVdzK7BE="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/breeze-gtk-6.1.3.tar.xz",
+    "hash": "sha256-pSf00cR8y2hE3ukYHrHnaeBNrLvAHB0dP11UZFKaxds="
   },
   "breeze-plymouth": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/breeze-plymouth-6.1.2.tar.xz",
-    "hash": "sha256-VrbRrRKJao5sfqP50CpK5WhNl3IW9oYmCxlq4KMO0Oo="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/breeze-plymouth-6.1.3.tar.xz",
+    "hash": "sha256-6hrTm0KNg11J9P1t5e+dDh3V3fpXDZ3+BgFC/ILVQus="
   },
   "discover": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/discover-6.1.2.tar.xz",
-    "hash": "sha256-bqi0troUNV/+Br6QNlhqKcwB/GpHUhxvHj+dgYXaXJk="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/discover-6.1.3.tar.xz",
+    "hash": "sha256-RaKX38uQcKq8jdoLvnjamjALJwc7MXVuik6BpfmIUYM="
   },
   "drkonqi": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/drkonqi-6.1.2.tar.xz",
-    "hash": "sha256-qgBb8y5ZDSy6KNS9qrs733VFAuq5aqvUrI4aUCMrJqU="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/drkonqi-6.1.3.tar.xz",
+    "hash": "sha256-e6GpnkRP4N3nPjxgTZTmxwxJzy0/k6Ct4+y70oWoIK0="
   },
   "flatpak-kcm": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/flatpak-kcm-6.1.2.tar.xz",
-    "hash": "sha256-fu3Za0Cq8aquQK7fduX4ZM+zyylas4D2c9x2gZZ1N2g="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/flatpak-kcm-6.1.3.tar.xz",
+    "hash": "sha256-x+bInKwBbLMjJaYgxt/pxaKjfm5AUBBgvA8Gejy6VIE="
   },
   "kactivitymanagerd": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/kactivitymanagerd-6.1.2.tar.xz",
-    "hash": "sha256-CKLPz/A0MiSSRfhheLS4Umi//3J9iwq10CBjULjCyv0="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/kactivitymanagerd-6.1.3.tar.xz",
+    "hash": "sha256-QMSY5lr+cDnEZM+6pEKp46VhQMvUW2O2lXJnJgxTdGA="
   },
   "kde-cli-tools": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/kde-cli-tools-6.1.2.tar.xz",
-    "hash": "sha256-cYFywGbalVmRkh/ovgOKlzgnOexlPrXQSrK1zIHRdRs="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/kde-cli-tools-6.1.3.tar.xz",
+    "hash": "sha256-2WkFHigyym6wDrwiI0g05GovPL/Gw9TuipYgWLFLyHo="
   },
   "kdecoration": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/kdecoration-6.1.2.tar.xz",
-    "hash": "sha256-gehd0ni8/uPJDxtfkI7oXyie7mr60dZJZPmQ+cbtvr4="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/kdecoration-6.1.3.tar.xz",
+    "hash": "sha256-Fd1Hn0LrSrZ1JpTTEpqkIWSuyZVNtb4Et8O7fIEbDfs="
   },
   "kde-gtk-config": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/kde-gtk-config-6.1.2.tar.xz",
-    "hash": "sha256-6n/NJQPyudrFdv+R83YUSw6qcnRx0NcjqjJH7H0jNiU="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/kde-gtk-config-6.1.3.tar.xz",
+    "hash": "sha256-D6T5VVepPYrW1FSmd/4/12kPeuBaZ4hSTEJXZhhATkY="
   },
   "kdeplasma-addons": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/kdeplasma-addons-6.1.2.tar.xz",
-    "hash": "sha256-bAzj5OosXmunSXnzrQ3C1Gcp8yNzL5BnW0fqtJKEEuE="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/kdeplasma-addons-6.1.3.tar.xz",
+    "hash": "sha256-nfd6Jaa8hqAtKp8/YaqGKa3sTBfVTcULdkv8VG+DBd4="
   },
   "kgamma": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/kgamma-6.1.2.tar.xz",
-    "hash": "sha256-yz2OcBsaunvYKGsNGWA/uTsN1fHgb1Lej+EooWZmJmM="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/kgamma-6.1.3.tar.xz",
+    "hash": "sha256-re1ChFLwgRQWE/RnSLVskHhQqjBVc7BpKfupTqDeU1s="
   },
   "kglobalacceld": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/kglobalacceld-6.1.2.tar.xz",
-    "hash": "sha256-J7OeZ0prZroFs04YG4s57QhIU72HoHLzMzzkxCOmaNw="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/kglobalacceld-6.1.3.tar.xz",
+    "hash": "sha256-NZFV80VJSPJxeuZ4XtHm3C3IwoHmUmywaFLPSqGioGI="
   },
   "kinfocenter": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/kinfocenter-6.1.2.tar.xz",
-    "hash": "sha256-YcAro0UeMyTb9UrzFM78TzibCcnT4K1mYT/sI5/esDw="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/kinfocenter-6.1.3.tar.xz",
+    "hash": "sha256-acS+v5fFqYDD2lfe7f/2KCVPA7fAlMyo10L1N7/EVzg="
   },
   "kmenuedit": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/kmenuedit-6.1.2.tar.xz",
-    "hash": "sha256-lFS0eEAcDrb8TZDzmcrZpRalqgNmPQiiiRbZYgSv13M="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/kmenuedit-6.1.3.tar.xz",
+    "hash": "sha256-kAb7DlXK0PrUj522YsgUX4nkVQ8QiqdO+ydGcyj8TYU="
   },
   "kpipewire": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/kpipewire-6.1.2.tar.xz",
-    "hash": "sha256-JQ9QXXI/tx/fta9fieT4ePYyxTT7KwG6C7s6wZFw1XE="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/kpipewire-6.1.3.tar.xz",
+    "hash": "sha256-6yIXAk4786R3dUi5oL2ojKC5eRLSAzawP1lCsosbrvk="
   },
   "krdp": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/krdp-6.1.2.tar.xz",
-    "hash": "sha256-D7Gt2cy4YNumaqgNPk1cl6R5asboGZ89+4lfF0r84XY="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/krdp-6.1.3.tar.xz",
+    "hash": "sha256-l5e5+pznb0jHLZMnK91Hx3jnYNSm2UwfY5IidbNG0+o="
   },
   "kscreen": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/kscreen-6.1.2.tar.xz",
-    "hash": "sha256-f4VKaWqsWuAcRFbHzhiDfhubDB8W3w0VBfHoPgI5vVw="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/kscreen-6.1.3.tar.xz",
+    "hash": "sha256-MAkZMFp58dQlFB6NNo3jsONei0/0xfpA5N8HAXrmBWs="
   },
   "kscreenlocker": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/kscreenlocker-6.1.2.tar.xz",
-    "hash": "sha256-urMbZw1LsIJ2AyF5c4x1k6xCkOgdx+wchEJYEpccYto="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/kscreenlocker-6.1.3.tar.xz",
+    "hash": "sha256-wpwPCYZBEakzy6dU4NsvlU/lFdE8OQSWdwrcnuwM5lM="
   },
   "ksshaskpass": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/ksshaskpass-6.1.2.tar.xz",
-    "hash": "sha256-SfkMfFiWyqEs5UlHReAIQYUZF+2xecHnemizh6Labo4="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/ksshaskpass-6.1.3.tar.xz",
+    "hash": "sha256-8alT3TLBqWiPR6x+QVhkRumsx86U1HjkT/RTA+EkXmk="
   },
   "ksystemstats": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/ksystemstats-6.1.2.tar.xz",
-    "hash": "sha256-MdTU957UUsnMY2JyLBtiGQfM+VJCJA5tVAIbOYA1aTs="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/ksystemstats-6.1.3.tar.xz",
+    "hash": "sha256-yf21zEfMTz9m2SpsSSyoElsD8DR1UW3s+0yIe7sDToU="
   },
   "kwallet-pam": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/kwallet-pam-6.1.2.tar.xz",
-    "hash": "sha256-51QbihAofWrtMCD/S5KHSSVR+JeXI3m+pIrqmEUK67Q="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/kwallet-pam-6.1.3.tar.xz",
+    "hash": "sha256-a4Bx2DjIEPqYIffapn2Sn7bWPHZvdGzFrIVfd4wHQNo="
   },
   "kwayland": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/kwayland-6.1.2.tar.xz",
-    "hash": "sha256-xqIz7GvMZALzQ5hWQjHvKC/BAbTGlzQBCAxLBTFbtZU="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/kwayland-6.1.3.tar.xz",
+    "hash": "sha256-aWdKZlbQQtlqOhOrHXB2qwVRxAvDh60z1pOk0Hfqmrw="
   },
   "kwayland-integration": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/kwayland-integration-6.1.2.tar.xz",
-    "hash": "sha256-CiVhu8T4KzUb5lOr9fRsm0amjzFJVGWqIqWuvpW2lJs="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/kwayland-integration-6.1.3.tar.xz",
+    "hash": "sha256-tEGDxOWWD2ZO8fDjnQxOSLMjM6NOPp0mCZ50JFCJE80="
   },
   "kwin": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/kwin-6.1.2.tar.xz",
-    "hash": "sha256-gsWCyDsB1CrI3Wyl+8S42u6hkrVN0chZcD5vAzRVwA8="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/kwin-6.1.3.tar.xz",
+    "hash": "sha256-+yO50IU4G6lFXNPzrKGEsTenZTlRyp97ePnnRt0Mxr8="
   },
   "kwrited": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/kwrited-6.1.2.tar.xz",
-    "hash": "sha256-hWSKR2h5yi9tVfoZEYZvL8dRUh0h1UWyMVOeI6CUFsE="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/kwrited-6.1.3.tar.xz",
+    "hash": "sha256-NEjWfgqZKBPlL5MMuNHDzCDqKwwYG2fVV9an2tlYoCM="
   },
   "layer-shell-qt": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/layer-shell-qt-6.1.2.tar.xz",
-    "hash": "sha256-F+hmjMeDlpoC/gh8HbaF4K8p1yDqpYw51g82+fd29Qk="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/layer-shell-qt-6.1.3.tar.xz",
+    "hash": "sha256-ogG9PIZxMOlsrnXc/sB/gq903C6AdNjRvZsK4mRb+AI="
   },
   "libkscreen": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/libkscreen-6.1.2.tar.xz",
-    "hash": "sha256-NtwBufQwiuwbcJlM8VVNryp3+VDbFc0oX87YtBJYl7g="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/libkscreen-6.1.3.tar.xz",
+    "hash": "sha256-mYjzc27D2Rf3uL8XWcEcFVqOxX/P14dkIOS7lxizspM="
   },
   "libksysguard": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/libksysguard-6.1.2.tar.xz",
-    "hash": "sha256-gF1o0qFH4Uknd2yaMZj6bofmLQRTO++6dQd2n2LxLtA="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/libksysguard-6.1.3.tar.xz",
+    "hash": "sha256-auhjE6pj0z1fvn+LkUgCzmxu913ujACf4a5NX1tb/6Q="
   },
   "libplasma": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/libplasma-6.1.2.tar.xz",
-    "hash": "sha256-gGFBZOT4wO8AXl0xV7ykp/Qhkl0Wo2oepoQcZlFjIUo="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/libplasma-6.1.3.tar.xz",
+    "hash": "sha256-WitrfFObbRcanCt0PVVKdNzz5XUSoEI7RvzpL6KlRd4="
   },
   "milou": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/milou-6.1.2.tar.xz",
-    "hash": "sha256-lYqQuHWFL7jnDA4yXtFbzsWiRzbuawD3CUYqYzQ5eZc="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/milou-6.1.3.tar.xz",
+    "hash": "sha256-3mmK3FbSl/M2t1bcweMR1VuEw0M8ItGzbe1+xZ4J64g="
   },
   "ocean-sound-theme": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/ocean-sound-theme-6.1.2.tar.xz",
-    "hash": "sha256-y/qE2OhwMG5rIxPzCxYOcUYA8V/lt57Hdk/a8tbpT3s="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/ocean-sound-theme-6.1.3.tar.xz",
+    "hash": "sha256-BvlrEUhxYCsrXS182QYb5QHhJ4n/v4BCQUmoN3Qlmhg="
   },
   "oxygen": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/oxygen-6.1.2.tar.xz",
-    "hash": "sha256-DF3FnL8VLc0/G9oEW3jVP3AucDJDehYssg7qvIfkaLA="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/oxygen-6.1.3.tar.xz",
+    "hash": "sha256-sueB9dxPER4XSFo0KZcA9I/mv2aElLOgCFe4QrjK7aE="
   },
   "oxygen-sounds": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/oxygen-sounds-6.1.2.tar.xz",
-    "hash": "sha256-TtL+lCkFX85k2/EAVyRN11Jv7m6BQmOa2JD6ZWk93ws="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/oxygen-sounds-6.1.3.tar.xz",
+    "hash": "sha256-fydxab5p7JnWuSNTajM1IkpxwbJ9RBBieqyxFzujutQ="
   },
   "plasma5support": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/plasma5support-6.1.2.tar.xz",
-    "hash": "sha256-8s9zL+9NHwPfh+71qlVsDeRjD9/1DNZNWe/97CNonJ0="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/plasma5support-6.1.3.tar.xz",
+    "hash": "sha256-N9h193+PDUY7QJzDHilsWB2+c+dawBTbOuETcqUf920="
   },
   "plasma-activities": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/plasma-activities-6.1.2.tar.xz",
-    "hash": "sha256-PgL8CL23PWVGEFskgZm4amXynWQJBTocYcAVRIcZpts="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/plasma-activities-6.1.3.tar.xz",
+    "hash": "sha256-ZVMwdtu/P4BaUniR1wQTT5E0riKwIDxhkppgiO/d65A="
   },
   "plasma-activities-stats": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/plasma-activities-stats-6.1.2.tar.xz",
-    "hash": "sha256-OJbDZPA9a3fcfc2t7JQlMPLBjqm7J+DtGHTDgpYfink="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/plasma-activities-stats-6.1.3.tar.xz",
+    "hash": "sha256-++IjXZEfb3EvXMMS2AeZnMKNhKJG1Gd4GtUolWuJ1mk="
   },
   "plasma-browser-integration": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/plasma-browser-integration-6.1.2.tar.xz",
-    "hash": "sha256-AC2epQsIiSoGLOQ+ReSQKpJt5uv3BzIUlGmWcgdemh8="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/plasma-browser-integration-6.1.3.tar.xz",
+    "hash": "sha256-nvNqT954ZT2UtgIcmyTP9N+i2CS0or99UsM6u+23acA="
   },
   "plasma-desktop": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/plasma-desktop-6.1.2.tar.xz",
-    "hash": "sha256-KeQEfEknSt5pliQGlcvavnjBhBgXCAeUBN6/ba2H4tg="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/plasma-desktop-6.1.3.tar.xz",
+    "hash": "sha256-Ni9k+hrxwpXX/a3hRr9XURdiVsGf1B3RhQ//NgPCH60="
   },
   "plasma-disks": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/plasma-disks-6.1.2.tar.xz",
-    "hash": "sha256-HxYhy4yrHOTS1dn41NhYUgzwJ+3iz3Sie1v460wZaOY="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/plasma-disks-6.1.3.tar.xz",
+    "hash": "sha256-EW7esxGyiHxH/afrIEDgI4zsMJkK6Sj5bis1x4x/88Y="
   },
   "plasma-firewall": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/plasma-firewall-6.1.2.tar.xz",
-    "hash": "sha256-9uoJIH1GPdHGDaMYQLsmeFBmwUVa56oAtl3zWDhyWUw="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/plasma-firewall-6.1.3.tar.xz",
+    "hash": "sha256-8qCnTgGWljDNIaDwNpepJOoz1tovkrCNkA0ouXhDz5M="
   },
   "plasma-integration": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/plasma-integration-6.1.2.tar.xz",
-    "hash": "sha256-4VojKSishXLaoFQE0mtNERLPGJoFHKy99gQ1Lt2/CAQ="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/plasma-integration-6.1.3.tar.xz",
+    "hash": "sha256-o+9zeVtffU1LPFYmRcD9wxwwNEmcxq1hzUjM+z/j5Vs="
   },
   "plasma-mobile": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/plasma-mobile-6.1.2.tar.xz",
-    "hash": "sha256-1UCfsslKYSjgDkA2zPLPPJtGoHXuJXTq5mH6ld+SUDk="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/plasma-mobile-6.1.3.tar.xz",
+    "hash": "sha256-4A5dYJFDh6eMDq+JBuSfjFwOaF3u/ZR7YB4mKWuovAI="
   },
   "plasma-nano": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/plasma-nano-6.1.2.tar.xz",
-    "hash": "sha256-Y95FHM8YL12cUAUwx3F0WwE87tc/n971EVqMpka5yrc="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/plasma-nano-6.1.3.tar.xz",
+    "hash": "sha256-I2xd3ctRoisUIkISV4Xt+4bFpLGsqby11XvqS1ISiJg="
   },
   "plasma-nm": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/plasma-nm-6.1.2.tar.xz",
-    "hash": "sha256-+YbC+NKF4JzS2j0dWLCla6Z77ZmDiR4xmIwdcApGJAg="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/plasma-nm-6.1.3.tar.xz",
+    "hash": "sha256-W1ECrXyAjrL6SwNu9IXWWG0ldfB4kHbe3vwTAKuQEXw="
   },
   "plasma-pa": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/plasma-pa-6.1.2.tar.xz",
-    "hash": "sha256-/YTgM2v9zBP63ukVgvoKhY3DahVfPh5Wkd3G/5xrRGY="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/plasma-pa-6.1.3.tar.xz",
+    "hash": "sha256-QhGwXwNtgORVpMKjIYQmYBf+Xc0B+3UydgrIHYhqrfc="
   },
   "plasma-sdk": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/plasma-sdk-6.1.2.tar.xz",
-    "hash": "sha256-CbN17UlLm4a8MNbEYj4hJdhVqAd2DDrCT6wS3Zzcs94="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/plasma-sdk-6.1.3.tar.xz",
+    "hash": "sha256-WvX+d07UC0cOFUj+Q7ziudyEL08BAkXD9YMqh2iVND8="
   },
   "plasma-systemmonitor": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/plasma-systemmonitor-6.1.2.tar.xz",
-    "hash": "sha256-uofW9/TDye38s3V00SN5hJUhoihrzRbXXFhKkB1MYuw="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/plasma-systemmonitor-6.1.3.tar.xz",
+    "hash": "sha256-/4Li/XqETT0sZSU3p4PgCfPEKGl3ZxRSDUOYFfyy2Pk="
   },
   "plasma-thunderbolt": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/plasma-thunderbolt-6.1.2.tar.xz",
-    "hash": "sha256-RL+x+fM9XyPqhONcMQRb7D+gbDk4ojuXU+laARr2xCI="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/plasma-thunderbolt-6.1.3.tar.xz",
+    "hash": "sha256-e8vd70aJge9Tb1C+aOUCPVCpNthIbbjGwJSjj4bywt4="
   },
   "plasma-vault": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/plasma-vault-6.1.2.tar.xz",
-    "hash": "sha256-lqltYEE+IffjTu3Z2CXsWgUymsH6wd5b8A8F8IwVDvk="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/plasma-vault-6.1.3.tar.xz",
+    "hash": "sha256-0BTyDwLObGKJ9UEttoWZbDzPpwSh5seyLls0LqBEG3A="
   },
   "plasma-welcome": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/plasma-welcome-6.1.2.tar.xz",
-    "hash": "sha256-YqxdxK/krd9IBNnsTqTM9pWzroWIJNTSvlKmp224oKU="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/plasma-welcome-6.1.3.tar.xz",
+    "hash": "sha256-QW01aN6uKfRBNddU37o5+RKyQ1tJTe0g6P+fO5A0tBw="
   },
   "plasma-workspace": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/plasma-workspace-6.1.2.tar.xz",
-    "hash": "sha256-R/AZuS3Kho5l5VB/+oPQ2XSt8Y6JXKoTYlYQjMAqZZo="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/plasma-workspace-6.1.3.tar.xz",
+    "hash": "sha256-eZze+1KFbbcnO7SaIFxuBXFl53uuxITHxiLuaILE1co="
   },
   "plasma-workspace-wallpapers": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/plasma-workspace-wallpapers-6.1.2.tar.xz",
-    "hash": "sha256-lhn3pNyAsE92gVk4HaMBPmDyFepz+Fdo64th1+DZom4="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/plasma-workspace-wallpapers-6.1.3.tar.xz",
+    "hash": "sha256-IUtAcRwLZ3gZtrMKUe5hky7uWuK0Rv0zByMYZ5HYdjE="
   },
   "plymouth-kcm": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/plymouth-kcm-6.1.2.tar.xz",
-    "hash": "sha256-L5GzV+Ufh2bOZYtLUPq9y44eFotqRhW7znkHDTCJ3KU="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/plymouth-kcm-6.1.3.tar.xz",
+    "hash": "sha256-av1sfAERo9jiUB1ZE8ZKtT03e1F/lZDocQ1vIlTj+rc="
   },
   "polkit-kde-agent-1": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/polkit-kde-agent-1-6.1.2.tar.xz",
-    "hash": "sha256-iJFt6obdUo/jZZ6cxzwlLkoPxYoueHCzriK1bWt1INc="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/polkit-kde-agent-1-6.1.3.tar.xz",
+    "hash": "sha256-J7naZQVrHQeso7YGQfyP+kHp3QP/0eE4GD9kFhPyOW8="
   },
   "powerdevil": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/powerdevil-6.1.2.tar.xz",
-    "hash": "sha256-1Ki4VTb2niI2l70cer0dw/woOnHFtcwJqRokfYXYUBQ="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/powerdevil-6.1.3.tar.xz",
+    "hash": "sha256-Yk+MlJgFbTxwZbtypho4H6ICHcNvWh8yxzVDWyOZGPM="
   },
   "print-manager": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/print-manager-6.1.2.tar.xz",
-    "hash": "sha256-FBYVYc7UAP5uCmUnE+C4a0NLWlC69VMgwulJjkjD9aU="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/print-manager-6.1.3.tar.xz",
+    "hash": "sha256-lQVGnobiA2Pkvt3GlI2dngeoNzrtt6+Zkoy5gQHduwQ="
   },
   "qqc2-breeze-style": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/qqc2-breeze-style-6.1.2.tar.xz",
-    "hash": "sha256-MkA66uAwdLz8b2/z0L7D//e5pOhj3Hpo354Vu33EHtk="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/qqc2-breeze-style-6.1.3.tar.xz",
+    "hash": "sha256-SUcxLh5ygpI9+r/mxttg6Qw89MMpCSy30Hf3GEVRvmg="
   },
   "sddm-kcm": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/sddm-kcm-6.1.2.tar.xz",
-    "hash": "sha256-bHiyAkIOPS1ZeiK5j24kAjU50PgG9c4J99zIPv50gNc="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/sddm-kcm-6.1.3.tar.xz",
+    "hash": "sha256-DPFM4SVP+2l1AqktfiISXm1EuwjnXmH/31hCZevCrO0="
   },
   "systemsettings": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/systemsettings-6.1.2.tar.xz",
-    "hash": "sha256-kHrd7AuvQCbXdBoNszgNOI9c9pmE2sB8D6BeEQWLRrY="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/systemsettings-6.1.3.tar.xz",
+    "hash": "sha256-ZboE8iq02/64yaBrVAsuqdVv5+m6KVNEpcfmtj8YITE="
   },
   "wacomtablet": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/wacomtablet-6.1.2.tar.xz",
-    "hash": "sha256-fe4qU5mAqBCw7uXNjYO2/iuaKpDDa6cA0WuTj+zXVHE="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/wacomtablet-6.1.3.tar.xz",
+    "hash": "sha256-EyUCUdeg1MGq+d0XhDM31W2OMLdgDziSVXaRAkgBj58="
   },
   "xdg-desktop-portal-kde": {
-    "version": "6.1.2",
-    "url": "mirror://kde/stable/plasma/6.1.2/xdg-desktop-portal-kde-6.1.2.tar.xz",
-    "hash": "sha256-udt1PIUwQ7GXaWRKqZ3qQTrR/2v8ao5osulwon+ZejY="
+    "version": "6.1.3",
+    "url": "mirror://kde/stable/plasma/6.1.3/xdg-desktop-portal-kde-6.1.3.tar.xz",
+    "hash": "sha256-gkz+ewZXhb5/gCqBJpLVCbghPWSphNl+gwRI9wqhPMY="
   }
 }
\ No newline at end of file
diff --git a/pkgs/kde/misc/marknote/default.nix b/pkgs/kde/misc/marknote/default.nix
index 0f676c6fb07e..86c1d72bfbc4 100644
--- a/pkgs/kde/misc/marknote/default.nix
+++ b/pkgs/kde/misc/marknote/default.nix
@@ -5,7 +5,6 @@
   qtdeclarative,
   qtsvg,
   qtwayland,
-  qqc2-desktop-style
 }:
 mkKdeDerivation rec {
   pname = "marknote";
@@ -20,7 +19,6 @@ mkKdeDerivation rec {
     qtdeclarative
     qtsvg
     qtwayland
-    qqc2-desktop-style
   ];
 
   meta.license = [ lib.licenses.gpl2Plus ];
diff --git a/pkgs/kde/plasma/kpipewire/default.nix b/pkgs/kde/plasma/kpipewire/default.nix
index 4f88f95289a3..c79bfc792d51 100644
--- a/pkgs/kde/plasma/kpipewire/default.nix
+++ b/pkgs/kde/plasma/kpipewire/default.nix
@@ -6,20 +6,10 @@
   ffmpeg,
   mesa,
   libva,
-  fetchpatch,
 }:
 mkKdeDerivation {
   pname = "kpipewire";
 
   extraNativeBuildInputs = [pkg-config];
   extraBuildInputs = [qtquick3d pipewire ffmpeg mesa libva];
-
-  patches = [
-    # Fix for 489434: spectacle crash/freeze on finishing recording with PW 1.2+
-    # https://bugs.kde.org/show_bug.cgi?id=489434
-    (fetchpatch {
-      url = "https://invent.kde.org/plasma/kpipewire/-/commit/1977da38ed25aa15347eb9027cb1fde3d66b075f.diff";
-      sha256 = "sha256-qAcd1C1AWddn5i0KAq85Ae+pU7ohfdAjOR7jKaNTYSo=";
-    })
-  ];
 }
diff --git a/pkgs/servers/http/tomcat/axis2/builder.sh b/pkgs/servers/http/tomcat/axis2/builder.sh
deleted file mode 100644
index de8e225456b4..000000000000
--- a/pkgs/servers/http/tomcat/axis2/builder.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
-unzip $src
-cd axis2-*
-mkdir -p $out
-cp -av * $out
-cd webapp
-ant
-cd ..
-mkdir -p $out/webapps
-cp dist/axis2.war $out/webapps
-cd $out/webapps
-mkdir axis2
-cd axis2
-unzip ../axis2.war
diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix
index f31841e28a03..771a38376fa9 100644
--- a/pkgs/servers/http/tomcat/axis2/default.nix
+++ b/pkgs/servers/http/tomcat/axis2/default.nix
@@ -1,25 +1,56 @@
-{ lib, stdenvNoCC, fetchurl, apacheAnt, jdk, unzip }:
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  ant,
+  jdk,
+  stripJavaArchivesHook,
+  unzip,
+  nixosTests,
+}:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "axis2";
   version = "1.8.2";
 
   src = fetchurl {
-    url = "mirror://apache/axis/axis2/java/core/${version}/${pname}-${version}-bin.zip";
+    url = "mirror://apache/axis/axis2/java/core/${finalAttrs.version}/axis2-${finalAttrs.version}-bin.zip";
     hash = "sha256-oilPVFFpl3F61nVDxcYx/bc81FopS5fzoIdXzeP8brk=";
   };
 
-  nativeBuildInputs = [ unzip ];
-  buildInputs = [ apacheAnt jdk ];
-  builder = ./builder.sh;
+  nativeBuildInputs = [
+    ant
+    jdk
+    stripJavaArchivesHook
+    unzip
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+    ant -f webapp
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 dist/axis2.war -t $out/webapps
+    unzip $out/webapps/axis2.war -d $out/webapps/axis2
+
+    runHook postInstall
+  '';
+
+  passthru.tests = {
+    inherit (nixosTests) tomcat;
+  };
 
   meta = {
     description = "Web Services / SOAP / WSDL engine, the successor to the widely used Apache Axis SOAP stack";
     homepage = "https://axis.apache.org/axis2/java/core/";
-    changelog = "https://axis.apache.org/axis2/java/core/release-notes/${version}.html";
+    changelog = "https://axis.apache.org/axis2/java/core/release-notes/${finalAttrs.version}.html";
     maintainers = [ lib.maintainers.anthonyroussel ];
     platforms = lib.platforms.unix;
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     license = lib.licenses.asl20;
   };
-}
+})
diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json
index 0fe78286dc5e..80739890d253 100644
--- a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json
+++ b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-hookshot",
-  "version": "5.3.0",
+  "version": "5.4.1",
   "description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.",
   "main": "lib/app.js",
   "repository": "https://github.com/matrix-org/matrix-hookshot",
@@ -48,8 +48,8 @@
     "@octokit/rest": "^20.0.2",
     "@octokit/webhooks": "^12.0.10",
     "@sentry/node": "^7.52.1",
-    "@vector-im/compound-design-tokens": "^0.1.0",
-    "@vector-im/compound-web": "^0.9.4",
+    "@vector-im/compound-design-tokens": "^1.3.0",
+    "@vector-im/compound-web": "^4.8.0",
     "ajv": "^8.11.0",
     "axios": "^1.6.3",
     "cors": "^2.8.5",
@@ -86,6 +86,7 @@
     "@rollup/plugin-alias": "^5.1.0",
     "@tsconfig/node18": "^18.2.2",
     "@types/ajv": "^1.0.0",
+    "@types/busboy": "^1.5.4",
     "@types/chai": "^4.2.22",
     "@types/cors": "^2.8.12",
     "@types/express": "^4.17.14",
@@ -100,6 +101,7 @@
     "@typescript-eslint/eslint-plugin": "^6.17.0",
     "@typescript-eslint/parser": "^6.17.0",
     "@uiw/react-codemirror": "^4.12.3",
+    "busboy": "^1.6.0",
     "chai": "^4.3.4",
     "eslint": "^8.49.0",
     "eslint-config-preact": "^1.3.0",
@@ -116,5 +118,6 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.3.3",
     "vite": "^5.0.13"
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }
diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json
index 5ab03440fc91..d6480bcc7a49 100644
--- a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json
+++ b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json
@@ -1,6 +1,6 @@
 {
-  "version": "5.3.0",
-  "srcHash": "sha256-saniKtauX+9lZxPZOtGLlk4//ht0njgWfnOIJsdQlOQ=",
-  "yarnHash": "1a52j61mb5hq62wd681zqpw7fkjhabqicdyvmam4jdd2qz2vh0w1",
-  "cargoHash": "sha256-ffjAsYOML+mDBToaVVuxjLUUEpGmBzWB0nN4jzOO098="
+  "version": "5.4.1",
+  "srcHash": "sha256-SZRMPnX4B7CHIp3aH3hh4NFgkOitpDB2w4jZLtLf4nY=",
+  "yarnHash": "1rscx9w63hpypwyj5ccnb49iwn581971ajzhfsyz1kmaf87f7hm9",
+  "cargoHash": "sha256-slH/EcFvJ3gcCsRX3rkelQDlt0elpbXOT/0/oiXN6qg="
 }
diff --git a/pkgs/tools/misc/graylog/6.0.nix b/pkgs/tools/misc/graylog/6.0.nix
new file mode 100644
index 000000000000..ea8d2cddeb4f
--- /dev/null
+++ b/pkgs/tools/misc/graylog/6.0.nix
@@ -0,0 +1,9 @@
+{ callPackage, lib, ...}:
+let
+  buildGraylog = callPackage ./graylog.nix {};
+in buildGraylog {
+  version = "6.0.4";
+  sha256 = "sha256-PU7AepIRwx7FibBkZaQUWUy3v2MeM7cS77FH28aj8I8=";
+  maintainers = with lib.maintainers; [ bbenno ];
+  license = lib.licenses.sspl;
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 7f6024730f1e..ac53c03a218f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -404,6 +404,7 @@ mapAliases ({
   emacsWithPackages = emacs.pkgs.withPackages; # Added 2020-12-18
 
   empathy = throw "empathy was removed as it is unmaintained and no longer launches due to libsoup3 migration"; # Added 2023-01-20
+  EmptyEpsilon = empty-epsilon; # Added 2024-07-14
   enchant1 = throw "enchant1 has been removed from nixpkgs, as it was unmaintained"; # Added 2023-01-18
   enyo-doom = enyo-launcher; # Added 2022-09-09
   epoxy = libepoxy; # Added 2021-11-11
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33a0d44c6c5f..d47fb36ffddd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1051,14 +1051,19 @@ with pkgs;
 
   mya = callPackage ../applications/misc/mya { };
 
-  mysql-shell = callPackage ../development/tools/mysql-shell {
-    inherit (darwin) cctools DarwinTools;
-    inherit (darwin.apple_sdk.frameworks) CoreServices;
-    antlr = antlr4_10;
-    boost = boost177; # Configure checks for specific version.
-    icu =  icu73;
-    protobuf = protobuf_24;
-  };
+  mysql-shell = mysql-shell_8;
+
+  inherit ({
+    mysql-shell_8 = callPackage ../development/tools/mysql-shell/8.nix {
+      inherit (darwin) cctools DarwinTools;
+      inherit (darwin.apple_sdk.frameworks) CoreServices;
+      antlr = antlr4_10;
+      icu =  icu73;
+      protobuf = protobuf_24;
+    };
+  })
+  mysql-shell_8
+  ;
 
   mysql-shell-innovation = callPackage ../development/tools/mysql-shell/innovation.nix {
     inherit (darwin) cctools DarwinTools;
@@ -8499,6 +8504,8 @@ with pkgs;
 
   graylog-5_2 = callPackage ../tools/misc/graylog/5.2.nix { };
 
+  graylog-6_0 = callPackage ../tools/misc/graylog/6.0.nix { };
+
   graylogPlugins = recurseIntoAttrs (
     callPackage ../tools/misc/graylog/plugins.nix { }
   );
@@ -25543,7 +25550,11 @@ with pkgs;
 
   mackerel-agent = callPackage ../servers/monitoring/mackerel-agent { };
 
-  mailmanPackages = callPackage ../servers/mail/mailman { };
+  mailmanPackages = callPackage ../servers/mail/mailman {
+    # Hyperkitty test fails with 3.12:
+    # https://gitlab.com/mailman/hyperkitty/-/issues/514
+    python3 = python311;
+  };
   inherit (mailmanPackages) mailman mailman-hyperkitty;
   mailman-web = mailmanPackages.web;
 
@@ -31388,8 +31399,6 @@ with pkgs;
 
   i3nator = callPackage ../tools/misc/i3nator { };
 
-  i3pystatus = callPackage ../applications/window-managers/i3/pystatus.nix { };
-
   i3status = callPackage ../applications/window-managers/i3/status.nix { };
 
   i3status-rust = callPackage ../applications/window-managers/i3/status-rust.nix { };
@@ -36123,8 +36132,6 @@ with pkgs;
 
   eidolon = callPackage ../games/eidolon { };
 
-  EmptyEpsilon = callPackage ../games/empty-epsilon { };
-
   endgame-singularity = callPackage ../games/endgame-singularity { };
 
   endless-sky = callPackage ../games/endless-sky { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 86942d5f16a1..a9449b6b5e3e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2523,6 +2523,8 @@ self: super: with self; {
 
   coreschema = callPackage ../development/python-modules/coreschema { };
 
+  corner = callPackage ../development/python-modules/corner { };
+
   cornice = callPackage ../development/python-modules/cornice { };
 
   corsair-scan = callPackage ../development/python-modules/corsair-scan { };
@@ -3559,6 +3561,8 @@ self: super: with self; {
 
   dogtail = callPackage ../development/python-modules/dogtail { };
 
+  dohq-artifactory = callPackage ../development/python-modules/dohq-artifactory { };
+
   doit = callPackage ../development/python-modules/doit { };
 
   doit-py = callPackage ../development/python-modules/doit-py { };
@@ -4024,6 +4028,8 @@ self: super: with self; {
 
   evohome-async = callPackage ../development/python-modules/evohome-async { };
 
+  evosax = callPackage ../development/python-modules/evosax { };
+
   evtx = callPackage ../development/python-modules/evtx { };
 
   ewmh = callPackage ../development/python-modules/ewmh { };
@@ -4502,6 +4508,8 @@ self: super: with self; {
 
   flowlogs-reader = callPackage ../development/python-modules/flowlogs-reader { };
 
+  flowmc = callPackage ../development/python-modules/flowmc { };
+
   fluent-logger = callPackage ../development/python-modules/fluent-logger { };
 
   flufl-bounce = callPackage ../development/python-modules/flufl/bounce.nix { };
@@ -10176,6 +10184,10 @@ self: super: with self; {
 
   pyindego = callPackage ../development/python-modules/pyindego { };
 
+  pyinstaller = callPackage ../development/python-modules/pyinstaller { };
+
+  pyinstaller-hooks-contrib = callPackage ../development/python-modules/pyinstaller-hooks-contrib { };
+
   pyinstaller-versionfile = callPackage ../development/python-modules/pyinstaller-versionfile { };
 
   pyisemail = callPackage ../development/python-modules/pyisemail { };