diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md
index 35330305f189..f776ca8d8dab 100644
--- a/doc/stdenv/stdenv.chapter.md
+++ b/doc/stdenv/stdenv.chapter.md
@@ -580,7 +580,7 @@ After unpacking all of `src` and `srcs`, if neither of `sourceRoot` and `setSour
 If `unpackPhase` produces multiple source directories, you should set `sourceRoot` to the name of the intended directory.
 You can also set `sourceRoot = ".";` if you want to control it yourself in a later phase.
 
-For example, if your want your build to start in a sub-directory inside your sources, and you are using `fetchzip`-derived `src` (like `fetchFromGitHub` or similar), you need to set `sourceRoot = "${src.name}/my-sub-directory"`.
+For example, if you want your build to start in a sub-directory inside your sources, and you are using `fetchzip`-derived `src` (like `fetchFromGitHub` or similar), you need to set `sourceRoot = "${src.name}/my-sub-directory"`.
 
 ##### `setSourceRoot` {#var-stdenv-setSourceRoot}
 
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index bfe5e59b86dd..7734b2259f70 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3190,6 +3190,15 @@
       { fingerprint = "208A 2A66 8A2F CDE7 B5D3  8F64 CDDC 792F 6552 51ED"; }
     ];
   };
+  cageyv = {
+    email = "pingme@cageyv.dev";
+    github = "cageyv";
+    githubId = 51059484;
+    name = "Vladmir Samoylov";
+    keys = [
+      { fingerprint = "8916 F727 734E 77AB 437F  A33A 19AB 76F5 CEE1 1392"; }
+    ];
+  };
   CaitlinDavitt = {
     email = "CaitlinDavitt@gmail.com";
     github = "CaitlinDavitt";
@@ -5792,6 +5801,14 @@
     githubId = 119483;
     name = "Matthew Brown";
   };
+  edgar-vincent = {
+    name = "Edgar Vincent";
+    email = "e-v@posteo.net";
+    matrix = "@edgar.vincent:matrix.org";
+    github = "edgar-vincent";
+    githubId = 63352906;
+    keys = [ { fingerprint = "922F CA48 5FDB 20B1 ED1B  A61F 284D 11D3 33C4 D21B"; } ];
+  };
   edlimerkaj = {
     name = "Edli Merkaj";
     email = "edli.merkaj@identinet.io";
@@ -12015,13 +12032,6 @@
     githubId = 4969294;
     name = "Louis Tim Larsen";
   };
-  loveisgrief = {
-    name = "LoveIsGrief";
-    email = "loveisgrief@tuta.io";
-    github = "LoveIsGrief";
-    githubId = 2829538;
-    keys = [ { fingerprint = "9847 4F48 18C6 4E0A F0C5  3529 E96D 1EDF A053 45EB"; } ];
-  };
   lovek323 = {
     email = "jason@oconal.id.au";
     github = "lovek323";
diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 3693cfb23962..def8d25347ad 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -337,10 +337,6 @@
 - `zx` was updated to v8, which introduces several breaking changes.
   See the [v8 changelog](https://github.com/google/zx/releases/tag/8.0.0) for more information.
 
-- `system.stateVersion` is now validated. If you never changed this yourself, you don't need to do anything. If your `stateVersion` is not a valid NixOS release version (e.g. "24.11" is valid),
-  your system was already at risk of experiencing silent incompatible state updates. If your previous value is a well-formed version but not a valid release (e.g. "23.12"),
-  round down to the nearest actual release. If it wasn't a well-formed version (e.g. "nixos-unstable"), set it to the version of NixOS that you originally installed.
-
 - The `portunus` package and service do not support weak password hashes anymore.
   If you installed Portunus on NixOS 23.11 or earlier, upgrade to NixOS 24.05 first to get support for strong password hashing.
   Then, follow the instructions on the [upstream release notes](https://github.com/majewsky/portunus/releases/tag/v2.0.0) to upgrade all existing user accounts to strong password hashes.
@@ -410,6 +406,8 @@
 - The `services.syncplay` module now exposes all currently available command-line arguments for `syncplay-server` as options, as well as a `useACMEHost` option for easy TLS setup.
   The systemd service now uses `DynamicUser`/`StateDirectory` and the `user` and `group` options have been deprecated.
 
+- The `openlens` package got removed, suggested replacment `lens-desktop`
+
 ## Other Notable Changes {#sec-release-24.11-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 169c58614a2e..db917f73a064 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -44,49 +44,6 @@ let
   };
   initrdRelease = pkgs.writeText "initrd-release" (attrsToText initrdReleaseContents);
 
-  checkRelease = version:
-    let
-      parts = lib.versions.splitVersion version;
-      isVersion = lib.length parts == 2 && lib.all (p: lib.stringLength p == 2) parts;
-      majorVersion = lib.toIntBase10 (lib.elemAt parts 0);
-      minorVersion = lib.elemAt parts 1;
-
-      versionPatterns = [
-        # only 13.10
-        { fromMajor = 13; minor = [ "10" ]; }
-        # 14.04 and 14.12
-        { fromMajor = 14; minor = [ "04" "12" ]; }
-        # only 15.09
-        { fromMajor = 15; minor = [ "09" ]; }
-        # 16.03 to 20.09
-        { fromMajor = 16; minor = [ "03" "09" ]; }
-        # from 21.05
-        { fromMajor = 21; minor = [ "05" "11" ]; }
-      ];
-
-      # find the versioning pattern that applies by looking for the first
-      # major version newer than `majorVersion`, and picking the previous pattern
-      patternIndex = lib.lists.findFirstIndex
-        ({ fromMajor, ... }: fromMajor > majorVersion)
-        (lib.length versionPatterns)
-        versionPatterns;
-
-      validMinorVersions =
-        if patternIndex == 0
-        then []
-        else (lib.elemAt versionPatterns (patternIndex - 1)).minor;
-
-      correctMinorVersion = lib.elem minorVersion validMinorVersions;
-      notNewerThanNixpkgs = lib.versionAtLeast trivial.release version;
-    in isVersion && correctMinorVersion && notNewerThanNixpkgs;
-
-  releaseType = types.addCheck
-    (types.strMatching "[[:digit:]]{2}\\.[[:digit:]]{2}")
-    checkRelease // {
-      name = "nixosRelease";
-      description = "NixOS release version, e.g. \"${trivial.release}\"";
-      descriptionClass = "nonRestrictiveClause";
-    };
 in
 {
   imports = [
@@ -113,7 +70,7 @@ in
 
       release = mkOption {
         readOnly = true;
-        type = releaseType;
+        type = types.str;
         default = trivial.release;
         description = "The NixOS release (e.g. `16.03`).";
       };
@@ -194,7 +151,7 @@ in
     };
 
     stateVersion = mkOption {
-      type = releaseType;
+      type = types.str;
       # TODO Remove this and drop the default of the option so people are forced to set it.
       # Doing this also means fixing the comment in nixos/modules/testing/test-instrumentation.nix
       apply = v:
diff --git a/nixos/modules/services/x11/desktop-managers/deepin.nix b/nixos/modules/services/x11/desktop-managers/deepin.nix
index a202e153231b..70149bcf4ae0 100644
--- a/nixos/modules/services/x11/desktop-managers/deepin.nix
+++ b/nixos/modules/services/x11/desktop-managers/deepin.nix
@@ -155,8 +155,6 @@ in
             deepin-desktop-base
 
             startdde
-            # TODO: should remove dde-dock, but dde-shell still need it's dconfig
-            dde-dock
             dde-shell
             dde-launchpad
             dde-session-ui
@@ -177,6 +175,8 @@ in
             dde-application-manager
             deepin-service-manager
             dde-grand-search
+            dde-api-proxy
+            dde-tray-loader
           ];
           optionalPackages = [
             onboard # dde-dock plugin
@@ -216,6 +216,7 @@ in
         dde-application-manager
         deepin-service-manager
         dde-grand-search
+        dde-api-proxy
       ];
 
       systemd.packages = with pkgs.deepin; [
@@ -230,6 +231,7 @@ in
         dde-session
         dde-application-manager
         deepin-service-manager
+        dde-api-proxy
       ];
     };
 }
diff --git a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix
index 001e7e60f822..d9ab51bb6955 100644
--- a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix
@@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "mongodb-vscode";
     publisher = "mongodb";
-    version = "1.8.0";
-    hash = "sha256-KtpXhDRf9vFS0iSQCJzywmIlRMhWLOlSuK7DPc0ddnw=";
+    version = "1.8.1";
+    hash = "sha256-dHvYl3bg5OB/HYBoHQnUODhAob/ZylFNGLAuUQByvdM=";
   };
 
   meta = {
diff --git a/pkgs/applications/networking/cluster/openlens/default.nix b/pkgs/applications/networking/cluster/openlens/default.nix
deleted file mode 100644
index 4581aef00e2d..000000000000
--- a/pkgs/applications/networking/cluster/openlens/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib, fetchurl, appimageTools }:
-
-let
-  pname = "openlens";
-  version = "6.5.2-366";
-
-  src = fetchurl {
-    url = "https://github.com/MuhammedKalkan/OpenLens/releases/download/v${version}/OpenLens-${version}.x86_64.AppImage";
-    sha256 = "sha256-ZAltAS/U/xh4kCT7vQ+NHAzWV7z0uE5GMQICHKSdj8k=";
-  };
-
-  appimageContents = appimageTools.extractType2 {
-    inherit pname version src;
-  };
-
-in
-appimageTools.wrapType2 {
-  inherit pname version src;
-  unshareIpc = false;
-
-  extraInstallCommands = ''
-    install -m 444 -D ${appimageContents}/open-lens.desktop $out/share/applications/${pname}.desktop
-    install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/open-lens.png \
-       $out/share/icons/hicolor/512x512/apps/${pname}.png
-
-    substituteInPlace $out/share/applications/${pname}.desktop \
-      --replace 'Icon=open-lens' 'Icon=${pname}' \
-      --replace 'Exec=AppRun' 'Exec=${pname}'
-  '';
-
-  meta = with lib; {
-    description = "Kubernetes IDE";
-    homepage = "https://github.com/MuhammedKalkan/OpenLens";
-    license = licenses.mit;
-    maintainers = with maintainers; [ benwbooth sebtm ];
-    mainProgram = "openlens";
-    platforms = [ "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/applications/networking/cluster/opentofu/default.nix b/pkgs/applications/networking/cluster/opentofu/default.nix
index 74d5fd9b30f2..d37167b37c60 100644
--- a/pkgs/applications/networking/cluster/opentofu/default.nix
+++ b/pkgs/applications/networking/cluster/opentofu/default.nix
@@ -14,13 +14,13 @@
 let
   package =  buildGoModule rec {
     pname = "opentofu";
-    version = "1.8.1";
+    version = "1.8.2";
 
     src = fetchFromGitHub {
       owner = "opentofu";
       repo = "opentofu";
       rev = "v${version}";
-      hash = "sha256-mMp3X2jXBQi/lRbqdiBa1UMYPKXl4jEvTHXxbPji5D8=";
+      hash = "sha256-kBI3Jgi4fDOx5bknTMlcI2K3LxKj6Q4dunbG9N33Ps0=";
     };
 
     vendorHash = "sha256-cM2DSP2ss3vleUhPBIdyxKeWJxtHpdjL5b5HVS/iC6o=";
diff --git a/pkgs/applications/window-managers/jay/default.nix b/pkgs/applications/window-managers/jay/default.nix
index 88ea73105a56..9eff972a0c60 100644
--- a/pkgs/applications/window-managers/jay/default.nix
+++ b/pkgs/applications/window-managers/jay/default.nix
@@ -15,16 +15,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "jay";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "mahkoh";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-iZTdhWHlorTAJTd3p2ZJbD5LRYkUmDAFjSEIR5E0JDI=";
+    sha256 = "sha256-cuXFkG2YwS0w4xzr7jpjr0QmVA5UJfk5SpjIQKxN/LY=";
   };
 
-  cargoHash = "sha256-SEL7hpHcW+p49vFRedC1hDRZ/Vq9zMzMAACyyBXHwZM=";
+  cargoHash = "sha256-w3ARwQlehJq9uNSQmbUjiWik4a2W3Ax/6/BIsdDUfKM=";
 
   SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib";
 
diff --git a/pkgs/by-name/au/autotools-language-server/package.nix b/pkgs/by-name/au/autotools-language-server/package.nix
index 9cd9c57ba463..68439d57dcf0 100644
--- a/pkgs/by-name/au/autotools-language-server/package.nix
+++ b/pkgs/by-name/au/autotools-language-server/package.nix
@@ -7,7 +7,12 @@
 let
   python3 = python311.override {
     self = python3;
-    packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; };
+    packageOverrides = _: super: {
+      tree-sitter = super.tree-sitter_0_21;
+      lsp-tree-sitter = super.lsp-tree-sitter.overridePythonAttrs(__: {
+        pythonRelaxDeps = [ "tree-sitter" ];
+      });
+    };
   };
 in
 python3.pkgs.buildPythonApplication rec {
diff --git a/pkgs/by-name/av/av1an/package.nix b/pkgs/by-name/av/av1an/package.nix
index 5595a72fb9bf..7f7418f793d3 100644
--- a/pkgs/by-name/av/av1an/package.nix
+++ b/pkgs/by-name/av/av1an/package.nix
@@ -4,7 +4,7 @@
   makeBinaryWrapper,
   av1an-unwrapped,
   ffmpeg,
-  python3Packages,
+  python3,
   libaom,
   svt-av1,
   rav1e,
@@ -12,6 +12,8 @@
   x264,
   x265,
   libvmaf,
+  vapoursynth,
+  mkvtoolnix-cli,
   withAom ? true, # AV1 reference encoder
   withSvtav1 ? false, # AV1 encoder/decoder (focused on speed and correctness)
   withRav1e ? false, # AV1 encoder (focused on speed and safety)
@@ -19,6 +21,7 @@
   withX264 ? true, # H.264/AVC encoder
   withX265 ? true, # H.265/HEVC encoder
   withVmaf ? false, # Perceptual video quality assessment algorithm
+  withMkvtoolnix ? true, # mkv editor, recommended concatenation method
 }:
 
 # av1an requires at least one encoder
@@ -41,19 +44,24 @@ symlinkJoin {
   postBuild =
     let
       runtimePrograms =
-        [ (ffmpeg.override { inherit withVmaf; }) ]
+        [
+          vapoursynth
+          (ffmpeg.override { inherit withVmaf; })
+        ]
         ++ lib.optional withAom libaom
         ++ lib.optional withSvtav1 svt-av1
         ++ lib.optional withRav1e rav1e
         ++ lib.optional withVpx libvpx
         ++ lib.optional withX264 x264
         ++ lib.optional withX265 x265
-        ++ lib.optional withVmaf libvmaf;
+        ++ lib.optional withVmaf libvmaf
+        ++ lib.optional withMkvtoolnix mkvtoolnix-cli;
     in
     ''
       wrapProgram $out/bin/av1an \
+        --prefix LD_LIBRARY_PATH : ${vapoursynth}/lib \
         --prefix PATH : ${lib.makeBinPath runtimePrograms} \
-        --prefix PYTHONPATH : ${python3Packages.makePythonPath [ python3Packages.vapoursynth ]}
+        --prefix PYTHONPATH : ${vapoursynth}/${python3.sitePackages}
     '';
 
   passthru = {
diff --git a/pkgs/by-name/co/codux/package.nix b/pkgs/by-name/co/codux/package.nix
index fb56f3e86573..a73dad8a8984 100644
--- a/pkgs/by-name/co/codux/package.nix
+++ b/pkgs/by-name/co/codux/package.nix
@@ -5,11 +5,11 @@
 
 let
   pname = "codux";
-  version = "15.33.0";
+  version = "15.34.0";
 
   src = fetchurl {
     url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage";
-    sha256 = "sha256-Fdy/Ovx8VCBe+pO/87VHVEnafJ9Ms8Pop0DOLYOHuQY=";
+    sha256 = "sha256-/e5tz3/XD/aaxLc/SUrTmWWfqI2Gw/xBTTTSmv5uZEQ=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
diff --git a/pkgs/by-name/co/commafeed/package.nix b/pkgs/by-name/co/commafeed/package.nix
index 61cad3e9682e..297d36ddb179 100644
--- a/pkgs/by-name/co/commafeed/package.nix
+++ b/pkgs/by-name/co/commafeed/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  biome,
   buildNpmPackage,
   fetchFromGitHub,
   jre,
@@ -9,13 +10,13 @@
   writeText,
 }:
 let
-  version = "4.3.3";
+  version = "4.6.0";
 
   src = fetchFromGitHub {
     owner = "Athou";
     repo = "commafeed";
     rev = version;
-    hash = "sha256-y0gTmtlDg7sdunG1ne/3WkFx2KQkTGRlfYpXBHFFh2o=";
+    hash = "sha256-Qc2l/CSVK+8k7b3RZA8hQsGTq29OvkDMbMzHcnPm/yE=";
   };
 
   frontend = buildNpmPackage {
@@ -25,7 +26,9 @@ let
 
     sourceRoot = "${src.name}/commafeed-client";
 
-    npmDepsHash = "sha256-fye7MPWXUeFCMgcnesspd1giGG/ZldiOv00fjtXZSb4=";
+    npmDepsHash = "sha256-bQShz6dmE9IZ9to5Z2DScncc/WVJnX1tRCm8XQJNmiU=";
+
+    nativeBuildInputs = [ biome ];
 
     installPhase = ''
       runHook preInstall
@@ -49,7 +52,7 @@ maven.buildMavenPackage {
 
   pname = "commafeed";
 
-  mvnHash = "sha256-LDZv3CBc/FpVMKmZ+kqfBdkTbqZcJMRqeXN35t4rwJI=";
+  mvnHash = "sha256-7nm8Cz05Qa44TMC0ioklvKAXQnE9J2wUDZFXLQt2A1w=";
 
   mvnParameters = lib.escapeShellArgs [
     "-Dskip.installnodenpm"
diff --git a/pkgs/by-name/ei/eiquadprog/package.nix b/pkgs/by-name/ei/eiquadprog/package.nix
new file mode 100644
index 000000000000..9380e7f9d2bf
--- /dev/null
+++ b/pkgs/by-name/ei/eiquadprog/package.nix
@@ -0,0 +1,38 @@
+{
+  boost,
+  cmake,
+  eigen,
+  fetchFromGitHub,
+  jrl-cmakemodules,
+  lib,
+  stdenv,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "eiquadprog";
+  version = "1.2.9";
+
+  src = fetchFromGitHub {
+    owner = "stack-of-tasks";
+    repo = "eiquadprog";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-VqRx06sCCZrnB+NWm6Z9OMKzjKQIydGgKQU6fMY7phk=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    jrl-cmakemodules
+  ];
+  propagatedBuildInputs = [ eigen ];
+  checkInputs = [ boost ];
+
+  doCheck = true;
+
+  meta = {
+    description = "C++ reimplementation of eiquadprog";
+    homepage = "https://github.com/stack-of-tasks/eiquadprog";
+    changelog = "https://github.com/stack-of-tasks/eiquadprog/blob/v${finalAttrs.version}/CHANGELOG.md";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ nim65s ];
+  };
+})
diff --git a/pkgs/by-name/lp/lprobe/package.nix b/pkgs/by-name/lp/lprobe/package.nix
new file mode 100644
index 000000000000..e0f24d96a718
--- /dev/null
+++ b/pkgs/by-name/lp/lprobe/package.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  libpcap,
+}:
+
+buildGoModule rec {
+  pname = "lprobe";
+  version = "0.1.3";
+
+  src = fetchFromGitHub {
+    owner = "fivexl";
+    repo = "lprobe";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-q7lH0aLgQNM4jrrrq2ua+pt4/VknxlzKzDH5J4MwjfA=";
+  };
+
+  vendorHash = "sha256-B3lcE33Ny+XE7nK/QlVcV8yYgzYWNBfoecuL+AcavSk=";
+
+  buildInputs = [
+    libpcap
+  ];
+
+  meta = {
+    description = "A command-line tool to perform Local Health Check Probes inside Container Images (ECS, Docker)";
+    homepage = "https://github.com/fivexl/lprobe";
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ cageyv ];
+    mainProgram = "lprobe";
+  };
+}
diff --git a/pkgs/by-name/lu/lutgen/package.nix b/pkgs/by-name/lu/lutgen/package.nix
index beac59da3af4..e415d0c8a14c 100644
--- a/pkgs/by-name/lu/lutgen/package.nix
+++ b/pkgs/by-name/lu/lutgen/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "Blazingly fast interpolated LUT generator and applicator for arbitrary and popular color palettes";
     homepage = "https://github.com/ozwaldorf/lutgen-rs";
-    maintainers = with maintainers; [ zzzsy donovanglover ];
+    maintainers = with maintainers; [ ozwaldorf zzzsy donovanglover ];
     mainProgram = "lutgen";
     license = licenses.mit;
   };
diff --git a/pkgs/by-name/me/melodeon/package.nix b/pkgs/by-name/me/melodeon/package.nix
new file mode 100644
index 000000000000..b7df31cebf79
--- /dev/null
+++ b/pkgs/by-name/me/melodeon/package.nix
@@ -0,0 +1,42 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  qt6,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "melodeon";
+  version = "0.4.1";
+
+  src = fetchFromGitHub {
+    owner = "CDrummond";
+    repo = "melodeon";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-k74iJ3tmkMGUh4f538tjD7cv4ZXxm3x6M/d5HU25yPQ=";
+    fetchSubmodules = true;
+  };
+
+  buildInputs = [
+    qt6.qtbase
+    qt6.qtwebengine
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    qt6.wrapQtAppsHook
+  ];
+
+  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
+
+  meta = {
+    description = "QWebEngine wrapper for MaterialSkin on Lyrion Music Server (formerly Logitech Media Server)";
+    mainProgram = "melodeon";
+    homepage = "https://github.com/CDrummond/melodeon";
+    changelog = "https://github.com/CDrummond/melodeon/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ edgar-vincent ];
+  };
+})
diff --git a/pkgs/by-name/oi/oidc-agent/package.nix b/pkgs/by-name/oi/oidc-agent/package.nix
index b84b9184262d..2be9a24f7db6 100644
--- a/pkgs/by-name/oi/oidc-agent/package.nix
+++ b/pkgs/by-name/oi/oidc-agent/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "oidc-agent";
-  version = "5.2.0";
+  version = "5.2.1";
 
   src = fetchFromGitHub {
     owner = "indigo-dc";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Nwna8VbhhXtmEbAxgo/E9QgfuglGuyFK2DwHOZL4WXQ=";
+    sha256 = "sha256-SjpCD/x93kYB5759e/D0btLO48d6g4SkEUAX7PYfm2w=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/os/osqp-eigen/package.nix b/pkgs/by-name/os/osqp-eigen/package.nix
new file mode 100644
index 000000000000..935bb0bfa659
--- /dev/null
+++ b/pkgs/by-name/os/osqp-eigen/package.nix
@@ -0,0 +1,44 @@
+{
+  catch2,
+  cmake,
+  eigen,
+  fetchFromGitHub,
+  lib,
+  osqp,
+  stdenv,
+  valgrind,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "osqp-eigen";
+  version = "0.8.1";
+
+  src = fetchFromGitHub {
+    owner = "robotology";
+    repo = "osqp-eigen";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-mN9oU+qXm+Kob8M4rtxv4qNSbXlFCqpN+s8dHedU8Mo=";
+  };
+
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_TESTING" true)
+    (lib.cmakeBool "OSQPEIGEN_RUN_Valgrind_tests" stdenv.isLinux)
+  ];
+
+  nativeBuildInputs = [ cmake ];
+  propagatedBuildInputs = [
+    eigen
+    osqp
+  ];
+  checkInputs = [ catch2 ];
+  nativeCheckInputs = lib.optional stdenv.isLinux valgrind;
+
+  doCheck = true;
+
+  meta = {
+    description = "Simple Eigen-C++ wrapper for OSQP library";
+    homepage = "https://github.com/robotology/osqp-eigen";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ nim65s ];
+  };
+})
diff --git a/pkgs/by-name/pa/paup/package.nix b/pkgs/by-name/pa/paup/package.nix
new file mode 100644
index 000000000000..62bb5206587a
--- /dev/null
+++ b/pkgs/by-name/pa/paup/package.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  autoPatchelfHook,
+  curl,
+  gfortran,
+  zlib,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "paup";
+  version = "4.0a168";
+
+  src = fetchurl {
+    url = "http://phylosolutions.com/paup-test/paup4a168_centos64.gz";
+    hash = "sha256-41dZswlrIQ05f1zJzId78DKmPf0QH1SfrexzvCAUxq8=";
+  };
+
+  unpackPhase = ''
+    runHook preUnpack
+
+    gunzip -c $src > paup
+
+    runHook postUnpack
+  '';
+
+  nativeBuildInputs = [ autoPatchelfHook ];
+  buildInputs = [
+    curl
+    gfortran
+    zlib
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 paup -t $out/bin
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "A software package for inferring evolutionary trees";
+    homepage = "http://phylosolutions.com/paup-test/";
+    license = lib.licenses.unfree;
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    maintainers = with lib.maintainers; [ pandapip1 ];
+    mainProgram = "paup";
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/development/libraries/SDL/find-headers.patch b/pkgs/by-name/sd/SDL1/find-headers.patch
similarity index 100%
rename from pkgs/development/libraries/SDL/find-headers.patch
rename to pkgs/by-name/sd/SDL1/find-headers.patch
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/by-name/sd/SDL1/package.nix
similarity index 80%
rename from pkgs/development/libraries/SDL/default.nix
rename to pkgs/by-name/sd/SDL1/package.nix
index 8038407090b4..94b7e03f6e24 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/by-name/sd/SDL1/package.nix
@@ -1,34 +1,50 @@
-{ lib, stdenv, config, fetchurl, fetchpatch, pkg-config, audiofile, libcap, libiconv
+{ lib
+, alsa-lib
+, audiofile
+, config
+, darwin
+, fetchpatch
+, fetchurl
+, libGL
+, libGLU
+, libICE
+, libXext
+, libXrandr
+, libcap
+, libiconv
+, libpulseaudio
+, pkg-config
+, stdenv
+# Boolean flags
+, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid
 , libGLSupported ? lib.meta.availableOn stdenv.hostPlatform libGL
-, openglSupport ? libGLSupported, libGL, libGLU
-, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsa-lib
+, openglSupport ? libGLSupported
+, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid && lib.meta.availableOn stdenv.hostPlatform libpulseaudio
 , x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid
-, libXext, libICE, libXrandr
-, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid && lib.meta.availableOn stdenv.hostPlatform libpulseaudio, libpulseaudio
-, OpenGL, GLUT, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa
 }:
 
 # NOTE: When editing this expression see if the same change applies to
 # SDL2 expression too
 
 let
+  inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa GLUT;
   extraPropagatedBuildInputs = [ ]
     ++ lib.optionals x11Support [ libXext libICE libXrandr ]
-    ++ lib.optionals (openglSupport && stdenv.isLinux) [ libGL libGLU ]
+    ++ lib.optionals (openglSupport && stdenv.isLinux) [ libGL ]
+    # libGLU doesn’t work with Android's SDL
+    ++ lib.optionals (openglSupport && stdenv.isLinux && (!stdenv.hostPlatform.isAndroid)) [ libGLU ]
     ++ lib.optionals (openglSupport && stdenv.isDarwin) [ OpenGL GLUT ]
     ++ lib.optional alsaSupport alsa-lib
     ++ lib.optional pulseaudioSupport libpulseaudio
     ++ lib.optional stdenv.isDarwin Cocoa;
-  rpath = lib.makeLibraryPath extraPropagatedBuildInputs;
 in
-
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "SDL";
   version = "1.2.15";
 
   src = fetchurl {
-    url    = "https://www.libsdl.org/release/${pname}-${version}.tar.gz";
-    sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn";
+    url = "https://www.libsdl.org/release/SDL-${finalAttrs.version}.tar.gz";
+    hash = "sha256-1tMWp5Pl40gVXw3ZO5eXmJM/uYqh7evMEIgp1kdKrQA=";
   };
 
   outputs = [ "out" "dev" ];
@@ -39,8 +55,9 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ libiconv ] ++ extraPropagatedBuildInputs;
 
-  buildInputs = [ ]
-    ++ lib.optional (!stdenv.hostPlatform.isMinGW && alsaSupport) audiofile
+  buildInputs =
+    [ ]
+    ++ lib.optionals (!stdenv.hostPlatform.isMinGW && alsaSupport) [ audiofile ]
     ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ];
 
   configureFlags = [
@@ -106,12 +123,16 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  enableParallelBuilding = true;
+
   postInstall = ''
     moveToOutput share/aclocal "$dev"
   '';
 
   # See the same place in the expression for SDL2
-  postFixup = ''
+  postFixup = let
+    rpath = lib.makeLibraryPath extraPropagatedBuildInputs;
+  in ''
     for lib in $out/lib/*.so* ; do
       if [[ -L "$lib" ]]; then
         patchelf --set-rpath "$(patchelf --print-rpath $lib):${rpath}" "$lib"
@@ -123,14 +144,12 @@ stdenv.mkDerivation rec {
 
   passthru = { inherit openglSupport; };
 
-  enableParallelBuilding = true;
-
-  meta = with lib; {
+  meta = {
+    homepage = "http://www.libsdl.org/";
     description = "Cross-platform multimedia library";
+    license = lib.licenses.lgpl21;
     mainProgram = "sdl-config";
-    homepage    = "http://www.libsdl.org/";
-    maintainers = with maintainers; [ lovek323 ];
-    platforms   = platforms.unix;
-    license     = licenses.lgpl21;
+    maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ lovek323 ]);
+    platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/development/libraries/SDL/setup-hook.sh b/pkgs/by-name/sd/SDL1/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/SDL/setup-hook.sh
rename to pkgs/by-name/sd/SDL1/setup-hook.sh
diff --git a/pkgs/development/libraries/SDL_compat/default.nix b/pkgs/by-name/sd/SDL_compat/package.nix
similarity index 58%
rename from pkgs/development/libraries/SDL_compat/default.nix
rename to pkgs/by-name/sd/SDL_compat/package.nix
index 4a5d54df0e3d..a2ac5f6d2887 100644
--- a/pkgs/development/libraries/SDL_compat/default.nix
+++ b/pkgs/by-name/sd/SDL_compat/package.nix
@@ -1,62 +1,62 @@
 { lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, pkg-config
 , SDL2
+, cmake
+, darwin
+, fetchFromGitHub
+, libGLU
 , libiconv
-, Cocoa
-, autoSignDarwinBinariesHook
 , mesa
+, pkg-config
+, stdenv
+# Boolean flags
 , libGLSupported ? lib.elem stdenv.hostPlatform.system mesa.meta.platforms
 , openglSupport ? libGLSupported
-, libGLU
 }:
 
 let
-  inherit (lib) optionals makeLibraryPath;
-
+  inherit (darwin.apple_sdk.frameworks) Cocoa;
+  inherit (darwin) autoSignDarwinBinariesHook;
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "SDL_compat";
   version = "1.2.68";
 
   src = fetchFromGitHub {
     owner = "libsdl-org";
     repo = "sdl12-compat";
-    rev = "release-" + version;
+    rev = "release-" + finalAttrs.version;
     hash = "sha256-f2dl3L7/qoYNl4sjik1npcW/W09zsEumiV9jHuKnUmM=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ]
-    ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ];
+    ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ];
 
   propagatedBuildInputs = [ SDL2 ]
-    ++ optionals stdenv.hostPlatform.isDarwin [ libiconv Cocoa ]
-    ++ optionals openglSupport [ libGLU ];
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Cocoa ]
+    ++ lib.optionals openglSupport [ libGLU ];
 
   enableParallelBuilding = true;
 
-  setupHook = ../SDL/setup-hook.sh;
+  setupHook = ./setup-hook.sh;
 
   postFixup = ''
     for lib in $out/lib/*${stdenv.hostPlatform.extensions.sharedLibrary}* ; do
       if [[ -L "$lib" ]]; then
         ${if stdenv.hostPlatform.isDarwin then ''
-          install_name_tool ${lib.strings.concatMapStrings (x: " -add_rpath ${makeLibraryPath [x]} ") propagatedBuildInputs} "$lib"
+          install_name_tool ${lib.strings.concatMapStrings (x: " -add_rpath ${lib.makeLibraryPath [x]} ") finalAttrs.propagatedBuildInputs} "$lib"
         '' else ''
-          patchelf --set-rpath "$(patchelf --print-rpath $lib):${makeLibraryPath propagatedBuildInputs}" "$lib"
+          patchelf --set-rpath "$(patchelf --print-rpath $lib):${lib.makeLibraryPath finalAttrs.propagatedBuildInputs}" "$lib"
         ''}
       fi
     done
   '';
 
-  meta = with lib; {
-    description = "Cross-platform multimedia library - build SDL 1.2 applications against 2.0";
-    mainProgram = "sdl-config";
+  meta = {
     homepage = "https://www.libsdl.org/";
-    license = licenses.zlib;
-    maintainers = with maintainers; [ peterhoeg ];
-    platforms = platforms.all;
+    description = "Cross-platform multimedia library - build SDL 1.2 applications against 2.0";
+    license = lib.licenses.zlib;
+    mainProgram = "sdl-config";
+    maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ peterhoeg ]);
+    platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/sd/SDL_compat/setup-hook.sh b/pkgs/by-name/sd/SDL_compat/setup-hook.sh
new file mode 100644
index 000000000000..54a9b3e8bfab
--- /dev/null
+++ b/pkgs/by-name/sd/SDL_compat/setup-hook.sh
@@ -0,0 +1,16 @@
+addSDLPath () {
+  if [ -e "$1/include/SDL" ]; then
+    export SDL_PATH="${SDL_PATH-}${SDL_PATH:+ }$1/include/SDL"
+    # NB this doesn’t work with split dev packages because different packages
+    # will contain "include/SDL/" and "lib/" directories.
+    #
+    # However the SDL_LIB_PATH is consumed by SDL itself and serves to locate
+    # libraries like SDL_mixer, SDL_image, etc which are not split-package
+    # so the check above will only trigger on them.
+    if [ -e "$1/lib" ]; then
+      export SDL_LIB_PATH="${SDL_LIB_PATH-}${SDL_LIB_PATH:+ }-L$1/lib"
+    fi
+  fi
+}
+
+addEnvHooks "$hostOffset" addSDLPath
diff --git a/pkgs/by-name/te/techmino/ccloader.nix b/pkgs/by-name/te/techmino/ccloader.nix
index 3fe632a93785..38a4b32c821a 100644
--- a/pkgs/by-name/te/techmino/ccloader.nix
+++ b/pkgs/by-name/te/techmino/ccloader.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
     owner = "26F-Studio";
     repo = "cold_clear_ai_love2d_wrapper";
     rev = version;
-    hash = "sha256-zfTSMWqjFrAKW5m+9q3K2Je8bbSyhC6pC/vPAWDGCNg=";
+    fetchSubmodules = true;
+    hash = "sha256-sguV+Dw+etZH43tXZYL46NAdsI/qvyvGWCPUiTEjhy4=";
   };
 
   buildInputs = [ libcoldclear luajit ];
diff --git a/pkgs/by-name/te/techmino/libcoldclear.nix b/pkgs/by-name/te/techmino/libcoldclear.nix
index 4160e0bdcb87..516f5c4dd9cd 100644
--- a/pkgs/by-name/te/techmino/libcoldclear.nix
+++ b/pkgs/by-name/te/techmino/libcoldclear.nix
@@ -1,6 +1,7 @@
 { lib
 , rustPlatform
 , fetchFromGitHub
+, ccloader
 }:
 
 let
@@ -17,12 +18,7 @@ rustPlatform.buildRustPackage {
   pname = "libcoldclear";
   version = "0.1.0";
 
-  src = fetchFromGitHub {
-    owner = "26F-Studio";
-    repo = "cold-clear";
-    rev = "1564ce9ad14aa60f32bf9a5120594933b3501548";
-    hash = "sha256-6fZpKHEJ0dsOTp755GLnxa/befCUJhjqA3Zna5UkKVo=";
-  };
+  src = "${ccloader.src}/cold-clear";
 
   # remove workspace cargo.toml so we don't load all of workspace's deps
   postPatch = ''
diff --git a/pkgs/by-name/te/techmino/package.nix b/pkgs/by-name/te/techmino/package.nix
index 8b49abd69340..3d15feeb49fd 100644
--- a/pkgs/by-name/te/techmino/package.nix
+++ b/pkgs/by-name/te/techmino/package.nix
@@ -6,7 +6,9 @@
 , makeDesktopItem
 , love
 , luajit
-, libcoldclear ? callPackage ./libcoldclear.nix { }
+, writeShellScript
+, nix-update
+, libcoldclear ? callPackage ./libcoldclear.nix { inherit ccloader; }
 , ccloader ? callPackage ./ccloader.nix { inherit libcoldclear luajit; }
 }:
 
@@ -31,15 +33,14 @@ in
 
 stdenv.mkDerivation rec {
   inherit pname;
-  version = "0.17.17";
+  version = "0.17.21";
 
   src = fetchurl {
     url = "https://github.com/26F-Studio/Techmino/releases/download/v${version}/Techmino_Bare.love";
-    hash = "sha256-ExVdS2QXSRVMlRhrjD/Plo7fhQ3uUBHlwv6y91/S3uA=";
+    hash = "sha256-8gMIyNP1FS52LnbpQ+G9XNtK3rQruzkMDRz7Gk9LZcQ=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ love ccloader ];
 
   dontUnpack = true;
 
@@ -62,6 +63,11 @@ stdenv.mkDerivation rec {
 
   passthru = {
     inherit ccloader libcoldclear;
+    updateScript = writeShellScript "update-script.sh" ''
+      if ${lib.getExe nix-update} techmino | grep "Packages updated"; then
+        ${lib.getExe nix-update} techmino.ccloader
+      fi
+    '';
   };
 
   meta = with lib; {
diff --git a/pkgs/by-name/ts/tsid/package.nix b/pkgs/by-name/ts/tsid/package.nix
new file mode 100644
index 000000000000..054857f8b222
--- /dev/null
+++ b/pkgs/by-name/ts/tsid/package.nix
@@ -0,0 +1,66 @@
+{
+  cmake,
+  doxygen,
+  eiquadprog,
+  fetchFromGitHub,
+  lib,
+  osqp-eigen,
+  pkg-config,
+  pinocchio,
+  proxsuite,
+  stdenv,
+  pythonSupport ? false,
+  python3Packages,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "tsid";
+  version = "1.7.1";
+
+  src = fetchFromGitHub {
+    owner = "stack-of-tasks";
+    repo = "tsid";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-id6OCOX01o41Z5kqzwvjYa5uoQZtzhRaFBuOBhbLcTA=";
+  };
+
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport)
+    (lib.cmakeBool "BUILD_WITH_OSQP" true)
+    (lib.cmakeBool "BUILD_WITH_PROXQP" true)
+    (lib.cmakeBool "INSTALL_DOCUMENTATION" true)
+  ];
+
+  outputs = [
+    "doc"
+    "out"
+  ];
+
+  nativeBuildInputs = [
+    doxygen
+    cmake
+    pkg-config
+  ] ++ lib.optional pythonSupport python3Packages.python;
+
+  propagatedBuildInputs =
+    [
+      eiquadprog
+      osqp-eigen
+      proxsuite
+    ]
+    ++ lib.optional (!pythonSupport) pinocchio ++ lib.optional pythonSupport python3Packages.pinocchio;
+
+  doCheck = true;
+  # pythonImportsCheck, but in stdenv.mkDerivation
+  postInstall = lib.optionalString pythonSupport ''
+    PYTHONPATH=$out/${python3Packages.python.sitePackages}:$PYTHONPATH
+    python -c "import tsid"
+  '';
+
+  meta = {
+    description = "Efficient Task Space Inverse Dynamics (TSID) based on Pinocchio";
+    homepage = "https://github.com/stack-of-tasks/tsid";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ nim65s ];
+  };
+})
diff --git a/pkgs/desktops/deepin/apps/deepin-editor/default.nix b/pkgs/desktops/deepin/apps/deepin-editor/default.nix
index a3b1a15b6697..9af8a60088d6 100644
--- a/pkgs/desktops/deepin/apps/deepin-editor/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-editor/default.nix
@@ -17,18 +17,17 @@
   libchardet,
   libuchardet,
   libiconv,
-  gitUpdater,
 }:
 
 stdenv.mkDerivation rec {
   pname = "deepin-editor";
-  version = "6.0.16";
+  version = "6.5.0";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-55hRXHP02MJWt+JUDCDKv4Boq0IwNW1itGw9rtCZrao=";
+    hash = "sha256-f6CJlSgsKU311ziXmm7Ado8tH+3dNRpWB1e4TewVf/8=";
   };
 
   nativeBuildInputs = [
@@ -56,13 +55,11 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DVERSION=${version}" ];
 
-  passthru.updateScript = gitUpdater { };
-
-  meta = with lib; {
+  meta = {
     description = "Desktop text editor that supports common text editing features";
     homepage = "https://github.com/linuxdeepin/deepin-editor";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = teams.deepin.members;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = lib.teams.deepin.members;
   };
 }
diff --git a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix
index f37fb2dc6c25..a0af0f680634 100644
--- a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix
@@ -14,7 +14,7 @@
   qtsvg,
   qtx11extras,
   dde-qt-dbus-factory,
-  dde-dock,
+  dde-tray-loader,
   gsettings-qt,
   polkit-qt,
   procps,
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation rec {
   pname = "deepin-system-monitor";
-  version = "6.0.23";
+  version = "6.5.0";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-LcXc8yI81YslVjof74TvOm6eWiN4UaHgUFU+HSCNZxQ=";
+    hash = "sha256-UOF0/RBceuRX6AtI1p5qqHhbRDAhA7i0+seOrkAFFgI=";
   };
 
   postPatch = ''
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     qtsvg
     qtx11extras
     dde-qt-dbus-factory
-    dde-dock
+    dde-tray-loader
     gsettings-qt
     polkit-qt
     procps
diff --git a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix
index 2ff8cb984351..2f15e0f1f195 100644
--- a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix
+++ b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "deepin-icon-theme";
-  version = "2024.07.19";
+  version = "2024.07.31";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-eUL0V9pGYzvAdVZpnrWXDO/YeCBETCOGvcMqDTwTgoU=";
+    hash = "sha256-Vt2rYZthGelXVUp8/L57ZlDsVEjjZhCv+kSGeU6nC2s=";
   };
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
diff --git a/pkgs/desktops/deepin/core/dde-api-proxy/default.nix b/pkgs/desktops/deepin/core/dde-api-proxy/default.nix
new file mode 100644
index 000000000000..a46ead0f6e7c
--- /dev/null
+++ b/pkgs/desktops/deepin/core/dde-api-proxy/default.nix
@@ -0,0 +1,50 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  libsForQt5,
+  dtkcore,
+  coreutils,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "dde-api-proxy";
+  version = "1.0.16";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = "dde-api-proxy";
+    rev = version;
+    hash = "sha256-kWodNftOPLIiQNPHAIC9p3VHFAis8FAI7vLJTqahAtU=";
+  };
+
+  postPatch = ''
+    for file in $(grep -rl "/usr/bin/false"); do
+      substituteInPlace $file --replace-fail "/usr/bin/false" "${coreutils}/bin/false"
+    done
+    for file in $(grep -rl "/usr/lib/dde-api-proxy"); do
+      substituteInPlace $file --replace-fail "/usr/lib/dde-api-proxy" "$out/lib/dde-api-proxy"
+    done
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    libsForQt5.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    dtkcore
+    libsForQt5.qtbase
+  ];
+
+  meta = {
+    description = "Proxy service for dde";
+    homepage = "https://github.com/linuxdeepin/dde-api-proxy";
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = lib.teams.deepin.members;
+  };
+}
diff --git a/pkgs/desktops/deepin/core/dde-calendar/default.nix b/pkgs/desktops/deepin/core/dde-calendar/default.nix
index 6eecb85c1b60..71069e96ea96 100644
--- a/pkgs/desktops/deepin/core/dde-calendar/default.nix
+++ b/pkgs/desktops/deepin/core/dde-calendar/default.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dde-calendar";
-  version = "5.14.1";
+  version = "5.14.4";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-08xkdiP0/haHY3jdHSoA1zXRxMi2t+qxLxbcRc7EO6Q=";
+    hash = "sha256-bZxNOBtLjop0eYxpMeoomaWYvPcMyDfQfgGPK9m+ARo=";
   };
 
   patches = [ ./fix-wrapped-name-not-in-whitelist.diff ];
diff --git a/pkgs/desktops/deepin/core/dde-dock/default.nix b/pkgs/desktops/deepin/core/dde-dock/default.nix
deleted file mode 100644
index db3a4a052334..000000000000
--- a/pkgs/desktops/deepin/core/dde-dock/default.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  extra-cmake-modules,
-  qttools,
-  pkg-config,
-  wrapQtAppsHook,
-  wrapGAppsHook3,
-  qtbase,
-  dtkwidget,
-  qt5integration,
-  qt5platform-plugins,
-  dwayland,
-  qtx11extras,
-  gsettings-qt,
-  libdbusmenu,
-  xorg,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dde-dock";
-  version = "6.0.37";
-
-  src = fetchFromGitHub {
-    owner = "linuxdeepin";
-    repo = pname;
-    rev = version;
-    hash = "sha256-5VowwQ0NoV6jV6DwnoxPKnRi6n28Teh/UQZwRc3URWY=";
-  };
-
-  postPatch = ''
-    substituteInPlace plugins/pluginmanager/pluginmanager.cpp frame/controller/quicksettingcontroller.cpp  \
-      --replace "/usr/lib/dde-dock" "/run/current-system/sw/lib/dde-dock"
-
-    substituteInPlace configs/com.deepin.dde.dock.json frame/util/common.h \
-    --replace "/usr" "/run/current-system/sw"
-
-    for file in $(grep -rl "/usr/lib/deepin-daemon"); do
-      substituteInPlace $file --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon"
-    done
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-    qttools
-    pkg-config
-    wrapQtAppsHook
-    wrapGAppsHook3
-  ];
-  dontWrapGApps = true;
-
-  buildInputs = [
-    qtbase
-    dtkwidget
-    qt5platform-plugins
-    dwayland
-    qtx11extras
-    gsettings-qt
-    libdbusmenu
-    xorg.libXcursor
-    xorg.libXtst
-    xorg.libXdmcp
-    xorg.libXres
-  ];
-
-  outputs = [
-    "out"
-    "dev"
-  ];
-
-  cmakeFlags = [ "-DVERSION=${version}" ];
-
-  # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
-  qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ];
-
-  preFixup = ''
-    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
-  '';
-
-  meta = with lib; {
-    description = "Deepin desktop-environment - dock module";
-    mainProgram = "dde-dock";
-    homepage = "https://github.com/linuxdeepin/dde-dock";
-    platforms = platforms.linux;
-    license = licenses.lgpl3Plus;
-    maintainers = teams.deepin.members;
-  };
-}
diff --git a/pkgs/desktops/deepin/core/dde-file-manager/default.nix b/pkgs/desktops/deepin/core/dde-file-manager/default.nix
index 7e77c7f083ff..5e4c8c4f7823 100644
--- a/pkgs/desktops/deepin/core/dde-file-manager/default.nix
+++ b/pkgs/desktops/deepin/core/dde-file-manager/default.nix
@@ -2,13 +2,14 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  fetchpatch,
   runtimeShell,
   dtkwidget,
   qt5integration,
   qt5platform-plugins,
   dde-qt-dbus-factory,
   docparser,
-  dde-dock,
+  dde-tray-loader,
   cmake,
   qttools,
   qtx11extras,
@@ -44,13 +45,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dde-file-manager";
-  version = "6.0.51";
+  version = "6.0.57";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-MvrOhdejQPK693wFlqkERuwYM88ALtFNnbyu7H3TI4Q=";
+    hash = "sha256-laM6PgNdUNbsqbzKFGWk7DPuAWR+XHo0eXKG0CDuc9c=";
   };
 
   nativeBuildInputs = [
@@ -62,10 +63,25 @@ stdenv.mkDerivation rec {
   ];
   dontWrapGApps = true;
 
-  patches = [ ./patch_check_v23_interface.diff ];
+  patches = [
+    ./patch_check_v23_interface.diff
+    (fetchpatch {
+      name = "fix-permission-to-execute-dde-file-manager.patch";
+      url = "https://github.com/linuxdeepin/dde-file-manager/commit/b78cc4bd08dd487f67c5a332a2a2f4d20b3798c7.patch";
+      hash = "sha256-Tw3iu6sU0rrsM78WGMBpBgvA9YdRTM1ObjCxyM928F4=";
+    })
+  ];
 
   postPatch = ''
-    patchShebangs .
+    patchShebangs tests/*.sh \
+                  assets/scripts \
+                  src/*.sh \
+                  src/plugins/daemon/daemonplugin-accesscontrol/help.sh \
+                  src/apps/dde-file-manager/dde-property-dialog \
+                  src/apps/dde-desktop/data/applications/dfm-open.sh
+
+    substituteInPlace assets/scripts/file-manager.sh \
+      --replace-fail "/usr/libexec/dde-file-manager" "$out/libexec/dde-file-manager"
 
     substituteInPlace src/plugins/filemanager/dfmplugin-vault/utils/vaultdefine.h \
       --replace-fail "/usr/bin/deepin-compressor" "deepin-compressor"
@@ -99,7 +115,7 @@ stdenv.mkDerivation rec {
     dde-qt-dbus-factory
     glibmm
     docparser
-    dde-dock
+    dde-tray-loader
     qtx11extras
     qtmultimedia
     kcodecs
diff --git a/pkgs/desktops/deepin/core/dde-grand-search/default.nix b/pkgs/desktops/deepin/core/dde-grand-search/default.nix
index 2d07a478fec3..11f2d4d403f4 100644
--- a/pkgs/desktops/deepin/core/dde-grand-search/default.nix
+++ b/pkgs/desktops/deepin/core/dde-grand-search/default.nix
@@ -8,7 +8,7 @@
   wrapQtAppsHook,
   dtkwidget,
   dde-qt-dbus-factory,
-  dde-dock,
+  dde-tray-loader,
   deepin-pdfium,
   qt5integration,
   qt5platform-plugins,
@@ -16,18 +16,20 @@
   ffmpeg,
   ffmpegthumbnailer,
   pcre,
+  lucenepp,
+  boost,
   dbus,
 }:
 
 stdenv.mkDerivation rec {
   pname = "dde-grand-search";
-  version = "5.4.9";
+  version = "5.5.2";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-WybwV1QIuV7O1SSgQU1ABsMf5QW9KJ95YyIa8Tz8pJ0=";
+    hash = "sha256-6s6M0cL8gjq1B5tuIRGPi8D69p4T8hPJv5QvBIvsO1w=";
   };
 
   nativeBuildInputs = [
@@ -39,7 +41,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     dtkwidget
-    dde-dock
+    dde-tray-loader
     dde-qt-dbus-factory
     deepin-pdfium
     qt5integration
@@ -48,13 +50,14 @@ stdenv.mkDerivation rec {
     ffmpeg
     ffmpegthumbnailer
     pcre
+    lucenepp
+    boost
   ];
 
   patches = [
     # This patch revert the commit e6735e7
     # FIXME: why StartManager can't work, is dde-api-proxy still required?
     ./fix-dbus-path-for-daemon.diff
-    ./patch-check-v23-interface.diff
   ];
 
   postPatch = ''
@@ -69,10 +72,7 @@ stdenv.mkDerivation rec {
     substituteAllInPlace src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service
   '';
 
-  cmakeFlags = [
-    "-DVERSION=${version}"
-    "-DNIX_DEEPIN_VERSION=23"
-  ];
+  cmakeFlags = [ "-DVERSION=${version}" ];
 
   meta = {
     description = "System-wide desktop search for DDE";
diff --git a/pkgs/desktops/deepin/core/dde-grand-search/patch-check-v23-interface.diff b/pkgs/desktops/deepin/core/dde-grand-search/patch-check-v23-interface.diff
deleted file mode 100644
index bcb9f2b6c0c2..000000000000
--- a/pkgs/desktops/deepin/core/dde-grand-search/patch-check-v23-interface.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 76dac13..f43600e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,7 +24,7 @@ endif()
- 
- #Indentify the version
- find_package(DtkCMake REQUIRED)
--if (${DEEPIN_OS_VERSION} MATCHES "23")
-+if (${NIX_DEEPIN_VERSION} MATCHES "23")
-     add_definitions(-DCOMPILE_ON_V23)
-     set(COMPLIE_ON_V23 TRUE)
-     message("COMPILE ON v23")
diff --git a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix
index bdbd5e1b136b..0581339c254f 100644
--- a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix
+++ b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix
@@ -7,6 +7,7 @@
   startdde,
   dde-session-shell,
   dde-file-manager,
+  dde-tray-loader,
   deepin-desktop-schemas,
   deepin-movie-reborn,
   deepin-system-monitor,
@@ -21,6 +22,7 @@ let
     startdde
     dde-session-shell
     dde-file-manager
+    dde-tray-loader
     deepin-desktop-schemas
     deepin-movie-reborn
     deepin-system-monitor
diff --git a/pkgs/desktops/deepin/core/dde-launchpad/default.nix b/pkgs/desktops/deepin/core/dde-launchpad/default.nix
index d1474b5bea97..44d46a0c9fae 100644
--- a/pkgs/desktops/deepin/core/dde-launchpad/default.nix
+++ b/pkgs/desktops/deepin/core/dde-launchpad/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dde-launchpad";
-  version = "0.7.0";
+  version = "0.8.4";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-nT89cUx7Bxf+d+fgqvXZ9U0i/qf1oP2alUB90UXpNcM=";
+    hash = "sha256-MPOzKAgwhJa7pMO6EZ6vYyYgZSD/SbU/L0L1dkN9/po=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/deepin/core/dde-network-core/default.nix b/pkgs/desktops/deepin/core/dde-network-core/default.nix
index 518fd99548f0..422b239edf18 100644
--- a/pkgs/desktops/deepin/core/dde-network-core/default.nix
+++ b/pkgs/desktops/deepin/core/dde-network-core/default.nix
@@ -9,7 +9,6 @@
   qtbase,
   qtsvg,
   dtkwidget,
-  dde-dock,
   dde-control-center,
   dde-session-shell,
   networkmanager-qt,
@@ -19,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dde-network-core";
-  version = "2.0.31";
+  version = "2.0.32";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-vTcADZElqNZMzWKDCEFtH3oXNyW8i4wxAwnaBnyz6X8=";
+    hash = "sha256-dXLvBCNitlV07dH/rPatsbP6DFf8SZQ7hcDUYtqt2FA=";
   };
 
   nativeBuildInputs = [
@@ -39,7 +38,6 @@ stdenv.mkDerivation rec {
     qtbase
     qtsvg
     dtkwidget
-    dde-dock
     dde-control-center
     dde-session-shell
     networkmanager-qt
diff --git a/pkgs/desktops/deepin/core/dde-session-ui/default.nix b/pkgs/desktops/deepin/core/dde-session-ui/default.nix
index a2ce7f009021..4a7e5cf9b016 100644
--- a/pkgs/desktops/deepin/core/dde-session-ui/default.nix
+++ b/pkgs/desktops/deepin/core/dde-session-ui/default.nix
@@ -10,7 +10,7 @@
   dtkwidget,
   qt5integration,
   qt5platform-plugins,
-  dde-dock,
+  dde-tray-loader,
   gsettings-qt,
   qtx11extras,
   gtest,
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     qtbase
     dtkwidget
     qt5platform-plugins
-    dde-dock
+    dde-tray-loader
     gsettings-qt
     qtx11extras
     gtest
diff --git a/pkgs/desktops/deepin/core/dde-shell/default.nix b/pkgs/desktops/deepin/core/dde-shell/default.nix
index 72696ba35214..4f4a3f0f71e6 100644
--- a/pkgs/desktops/deepin/core/dde-shell/default.nix
+++ b/pkgs/desktops/deepin/core/dde-shell/default.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   extra-cmake-modules,
   pkg-config,
@@ -13,7 +14,7 @@
   qt6Packages,
   qt6integration,
   qt6platform-plugins,
-  kdePackages,
+  dde-tray-loader,
   wayland,
   wayland-protocols,
   yaml-cpp,
@@ -22,24 +23,27 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dde-shell";
-  version = "0.0.23-unstable-2024-06-11";
+  version = "0.0.43";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "dde-shell";
-    rev = "d68cc64ad2cd6978af2f34deb3ef48f991d54fc3";
-    hash = "sha256-hVrdfbtcL3EJitiDghNSuGr5MX/VVT1J3tuY6wjwYcw=";
+    rev = finalAttrs.version;
+    hash = "sha256-wSk1gEJbTxKUPZ6DiTeVw2qyX+CwANA37ZP0tXnz0J0=";
   };
 
   patches = [
-    ./disable-plugins-use-qt5.diff
     ./fix-path-for-nixos.diff
-    ./only-use-qt6.diff # remove in next release
+    (fetchpatch {
+      name = "fix-libdock-plugin_so-contains-a-forbidden-reference.diff";
+      url = "https://github.com/linuxdeepin/dde-shell/commit/bf9a0472bc44748a3c389d796d144dad6b13617b.patch";
+      hash = "sha256-cP5zMsfPyi4FIR1OIbVSnn+Z+KqRuIK7a214VjVb/7w=";
+    })
   ];
 
   postPatch = ''
-    for file in $(grep -rl "/usr/lib/dde-dock/tmp"); do
-      substituteInPlace $file --replace-fail "/usr/lib/dde-dock/tmp" "/run/current-system/sw/lib/dde-dock/tmp"
+    for file in $(grep -rl "/usr/lib/dde-dock"); do
+      substituteInPlace $file --replace-fail "/usr/lib/dde-dock" "/run/current-system/sw/lib/dde-dock"
     done
 
     for file in $(grep -rl "/usr/lib/deepin-daemon"); do
@@ -57,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    dde-tray-loader
     dtk6declarative
     dtk6widget
     dde-qt-dbus-factory
@@ -64,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
     qt6Packages.qtwayland
     qt6Packages.qtsvg
     qt6platform-plugins
-    kdePackages.networkmanager-qt
+    qt6integration
     wayland
     wayland-protocols
     yaml-cpp
@@ -77,8 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [ "-DQML_INSTALL_DIR=${placeholder "out"}/${qt6Packages.qtbase.qtQmlPrefix}" ];
 
   qtWrapperArgs = [
-    # qt6integration must be placed before qtsvg in QT_PLUGIN_PATH
-    "--prefix QT_PLUGIN_PATH : ${qt6integration}/${qt6Packages.qtbase.qtPluginPrefix}"
+    "--prefix TRAY_LOADER_EXECUTE_PATH : ${dde-tray-loader}/libexec/trayplugin-loader"
     "--suffix DDE_SHELL_PLUGIN_PATH : /run/current-system/sw/lib/dde-shell"
     "--suffix DDE_SHELL_PACKAGE_PATH : /run/current-system/sw/share/dde-shell"
   ];
diff --git a/pkgs/desktops/deepin/core/dde-shell/disable-plugins-use-qt5.diff b/pkgs/desktops/deepin/core/dde-shell/disable-plugins-use-qt5.diff
deleted file mode 100644
index 0e1107abc7dc..000000000000
--- a/pkgs/desktops/deepin/core/dde-shell/disable-plugins-use-qt5.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/panels/dock/CMakeLists.txt b/panels/dock/CMakeLists.txt
-index 1a20179..83c5ff2 100644
---- a/panels/dock/CMakeLists.txt
-+++ b/panels/dock/CMakeLists.txt
-@@ -85,11 +85,11 @@ add_subdirectory(searchitem)
- add_subdirectory(launcherItem)
- add_subdirectory(showdesktop)
- add_subdirectory(taskmanager)
--add_subdirectory(tray)
-+ add_subdirectory(tray)
- add_subdirectory(multitaskview)
- 
- # dock plugin load program
--add_subdirectory(dockplugin)
-+#add_subdirectory(dockplugin)
- 
- # dock qml element(include Dock.xx defines and DockCompositor)
- file(
diff --git a/pkgs/desktops/deepin/core/dde-shell/only-use-qt6.diff b/pkgs/desktops/deepin/core/dde-shell/only-use-qt6.diff
deleted file mode 100644
index cdfad415403e..000000000000
--- a/pkgs/desktops/deepin/core/dde-shell/only-use-qt6.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/panels/dock/tray/CMakeLists.txt b/panels/dock/tray/CMakeLists.txt
-index ed6da31..1a33d06 100644
---- a/panels/dock/tray/CMakeLists.txt
-+++ b/panels/dock/tray/CMakeLists.txt
-@@ -10,7 +10,7 @@ endif()
- 
- # project(dde-dock)
- 
--find_package(DtkTools REQUIRED)
-+find_package(Dtk6Tools REQUIRED)
- 
- set(CMAKE_THREAD_LIBS_INIT "-lpthread")
- set(CMAKE_HAVE_THREADS_LIBRARY 1)
-diff --git a/panels/dock/tray/frame/CMakeLists.txt b/panels/dock/tray/frame/CMakeLists.txt
-index b55aa48..0a397cb 100644
---- a/panels/dock/tray/frame/CMakeLists.txt
-+++ b/panels/dock/tray/frame/CMakeLists.txt
-@@ -22,7 +22,7 @@ find_package(Qt6WaylandClient REQUIRED)
- find_package(Dtk6Gui REQUIRED)
- find_package(Dtk6Core REQUIRED)
- find_package(Dtk6Widget REQUIRED)
--find_package(DtkCMake REQUIRED)
-+find_package(Dtk6CMake REQUIRED)
- # find_package(dbusmenu-qt6 REQUIRED)
- find_package(ECM REQUIRED NO_MODULE)
- set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
diff --git a/pkgs/desktops/deepin/core/dde-tray-loader/default.nix b/pkgs/desktops/deepin/core/dde-tray-loader/default.nix
new file mode 100644
index 000000000000..c1e2fde90e85
--- /dev/null
+++ b/pkgs/desktops/deepin/core/dde-tray-loader/default.nix
@@ -0,0 +1,69 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  fetchpatch,
+  cmake,
+  extra-cmake-modules,
+  pkg-config,
+  dtkwidget,
+  dde-qt-dbus-factory,
+  qt5integration,
+  qt5platform-plugins,
+  wayland,
+  wayland-scanner,
+  xorg,
+  libsForQt5,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "dde-tray-loader";
+  version = "0.0.11";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = "dde-tray-loader";
+    rev = finalAttrs.version;
+    hash = "sha256-kz8+essf6O3ckeY5/5a/Z6539qNcfOnGbGTqSo5swhc=";
+  };
+
+  patches = [
+    (fetchpatch {
+      name = "set-version-for-dde-dock_pc.patch";
+      url = "https://github.com/linuxdeepin/dde-tray-loader/commit/0f9b90a9aa8096a92c21c8f01d29b4785aaf04e5.patch";
+      hash = "sha256-A6k8XjyIDbA+XuUxYWd5yxFJ8yOWMOtUH5Vg10o//YM=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    extra-cmake-modules
+    pkg-config
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qttools
+    wayland-scanner
+  ];
+
+  buildInputs = [
+    dtkwidget
+    dde-qt-dbus-factory
+    qt5integration
+    qt5platform-plugins
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
+    libsForQt5.qtwayland
+    libsForQt5.networkmanager-qt
+    libsForQt5.libdbusmenu
+    wayland
+    xorg.libXcursor
+    xorg.libXtst
+  ];
+
+  meta = {
+    description = "Tray plugins that integrated into task bar";
+    homepage = "https://github.com/linuxdeepin/dde-tray-loader";
+    license = with lib.licenses; [ gpl3Plus ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ rewine ];
+  };
+})
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 4280b290a3e6..d65299696e04 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -48,7 +48,6 @@ let
       dde-control-center = callPackage ./core/dde-control-center { };
       dde-calendar = callPackage ./core/dde-calendar { };
       dde-clipboard = callPackage ./core/dde-clipboard { };
-      dde-dock = callPackage ./core/dde-dock { };
       dde-file-manager = callPackage ./core/dde-file-manager { };
       dde-launchpad = callPackage ./core/dde-launchpad { };
       dde-network-core = callPackage ./core/dde-network-core { };
@@ -62,6 +61,8 @@ let
       dde-widgets = callPackage ./core/dde-widgets { };
       dde-shell = callPackage ./core/dde-shell { };
       dde-grand-search = callPackage ./core/dde-grand-search { };
+      dde-tray-loader = callPackage ./core/dde-tray-loader { };
+      dde-api-proxy = callPackage ./core/dde-api-proxy { };
 
       #### Dtk Application
       deepin-album = callPackage ./apps/deepin-album { };
@@ -109,6 +110,7 @@ let
     // lib.optionalAttrs config.allowAliases {
       dde-kwin = throw "The 'deepin.dde-kwin' package was removed as it is outdated and no longer relevant."; # added 2023-09-27
       dde-launcher = throw "The 'deepin.dde-launcher' is no longer maintained. Please use 'deepin.dde-launchpad' instead."; # added 2023-11-23
+      dde-dock = throw "The 'deepin.dde-dock' is no longer maintained. Please use 'deepin.dde-tray-loader' instead."; # added 2024-08-28
       deepin-clone = throw "The 'deepin.deepin-clone' package was removed as it is broken and unmaintained."; # added 2024-08-23
       go-lib = throw "Then 'deepin.go-lib' package was removed, use 'go mod' to manage it"; # added 2024-05-31
       go-gir-generator = throw "Then 'deepin.go-gir-generator' package was removed, use 'go mod' to manage it"; # added 2024-05-31
diff --git a/pkgs/desktops/deepin/library/docparser/default.nix b/pkgs/desktops/deepin/library/docparser/default.nix
index a283ac1098a9..e909169a0854 100644
--- a/pkgs/desktops/deepin/library/docparser/default.nix
+++ b/pkgs/desktops/deepin/library/docparser/default.nix
@@ -7,17 +7,21 @@
   qttools,
   wrapQtAppsHook,
   poppler,
+  pugixml,
+  libzip,
+  libuuid,
+  tinyxml-2,
 }:
 
 stdenv.mkDerivation rec {
   pname = "docparser";
-  version = "1.0.3";
+  version = "1.0.11";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    sha256 = "sha256-iWRWSu8fALTTLLWdQGbpunN/1tpvKxuN/ZWJg34x0mU=";
+    hash = "sha256-shZXhs9ncgm6rECvCWrLi26RO1WAc1gRowoYmeKesfk=";
   };
 
   nativeBuildInputs = [
@@ -27,15 +31,21 @@ stdenv.mkDerivation rec {
     wrapQtAppsHook
   ];
 
-  buildInputs = [ poppler ];
+  buildInputs = [
+    poppler
+    pugixml
+    libzip
+    libuuid
+    tinyxml-2
+  ];
 
   qmakeFlags = [ "VERSION=${version}" ];
 
-  meta = with lib; {
+  meta = {
     description = "Document parser library ported from document2html";
     homepage = "https://github.com/linuxdeepin/docparser";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = teams.deepin.members;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = lib.teams.deepin.members;
   };
 }
diff --git a/pkgs/desktops/deepin/library/dtk6gui/default.nix b/pkgs/desktops/deepin/library/dtk6gui/default.nix
index 53ca9621bb26..524a4bbb1c28 100644
--- a/pkgs/desktops/deepin/library/dtk6gui/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6gui/default.nix
@@ -26,6 +26,11 @@ stdenv.mkDerivation (finalAttrs: {
     ./fix-pri-path.patch
   ];
 
+  postPatch = ''
+    substituteInPlace src/util/dsvgrenderer.cpp \
+      --replace-fail 'QLibrary("rsvg-2", "2")' 'QLibrary("${lib.getLib librsvg}/lib/librsvg-2.so")'
+  '';
+
   nativeBuildInputs = [
     cmake
     pkg-config
diff --git a/pkgs/desktops/deepin/library/dtkgui/default.nix b/pkgs/desktops/deepin/library/dtkgui/default.nix
index 1b8c91265366..449a9d4156a1 100644
--- a/pkgs/desktops/deepin/library/dtkgui/default.nix
+++ b/pkgs/desktops/deepin/library/dtkgui/default.nix
@@ -27,6 +27,11 @@ stdenv.mkDerivation rec {
     ./fix-pri-path.patch
   ];
 
+  postPatch = ''
+    substituteInPlace src/util/dsvgrenderer.cpp \
+      --replace-fail 'QLibrary("rsvg-2", "2")' 'QLibrary("${lib.getLib librsvg}/lib/librsvg-2.so")'
+  '';
+
   nativeBuildInputs = [
     cmake
     doxygen
diff --git a/pkgs/desktops/deepin/library/util-dfm/default.nix b/pkgs/desktops/deepin/library/util-dfm/default.nix
index 140b28fc7327..b7c2071a3868 100644
--- a/pkgs/desktops/deepin/library/util-dfm/default.nix
+++ b/pkgs/desktops/deepin/library/util-dfm/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "util-dfm";
-  version = "1.2.24";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-7MuQVkb+xRMtcbB5PQBv6Au/i3ONA0c1whnZ9bMrA/8=";
+    hash = "sha256-ngDjjdwuYqvyhaUcMNV5PRmGKC3lmY/nJQGOQgRMIQE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix
index 7f4c433914c2..197928a86407 100644
--- a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix
+++ b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix
@@ -6,13 +6,13 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "deepin-desktop-base";
-  version = "2024.01.03";
+  version = "2024.07.24";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-45qR1LCnA8ZSrWykqNvvm7Dxbi5pQnAuFy6nZJrzyi0=";
+    hash = "sha256-JOC8nQ/YgUpY93FcniO2uypAfsL/SNU+KfTrthoZfQo=";
   };
 
   makeFlags = [ "DESTDIR=${placeholder "out"}" ];
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 944babf1d284..6bb0ad7398db 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -67041,118 +67041,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  eslint = nodeEnv.buildNodePackage {
-    name = "eslint";
-    packageName = "eslint";
-    version = "9.7.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-9.7.0.tgz";
-      sha512 = "FzJ9D/0nGiCGBf8UXO/IGLTgLVzIxze1zpfA8Ton2mjLovXdAPlYDv+MQDcqj3TmrhAGYfOpz9RfR+ent0AgAw==";
-    };
-    dependencies = [
-      (sources."@eslint-community/eslint-utils-4.4.0" // {
-        dependencies = [
-          sources."eslint-visitor-keys-3.4.3"
-        ];
-      })
-      sources."@eslint-community/regexpp-4.11.0"
-      sources."@eslint/config-array-0.17.1"
-      sources."@eslint/eslintrc-3.1.0"
-      sources."@eslint/js-9.7.0"
-      sources."@eslint/object-schema-2.1.4"
-      sources."@humanwhocodes/module-importer-1.0.1"
-      sources."@humanwhocodes/retry-0.3.0"
-      sources."@nodelib/fs.scandir-2.1.5"
-      sources."@nodelib/fs.stat-2.0.5"
-      sources."@nodelib/fs.walk-1.2.8"
-      sources."acorn-8.12.1"
-      sources."acorn-jsx-5.3.2"
-      sources."ajv-6.12.6"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-4.3.0"
-      sources."argparse-2.0.1"
-      sources."balanced-match-1.0.2"
-      sources."brace-expansion-1.1.11"
-      sources."callsites-3.1.0"
-      sources."chalk-4.1.2"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."concat-map-0.0.1"
-      sources."cross-spawn-7.0.3"
-      sources."debug-4.3.5"
-      sources."deep-is-0.1.4"
-      sources."escape-string-regexp-4.0.0"
-      sources."eslint-9.7.0"
-      sources."eslint-scope-8.0.2"
-      sources."eslint-visitor-keys-4.0.0"
-      sources."espree-10.1.0"
-      sources."esquery-1.6.0"
-      sources."esrecurse-4.3.0"
-      sources."estraverse-5.3.0"
-      sources."esutils-2.0.3"
-      sources."fast-deep-equal-3.1.3"
-      sources."fast-json-stable-stringify-2.1.0"
-      sources."fast-levenshtein-2.0.6"
-      sources."fastq-1.17.1"
-      sources."file-entry-cache-8.0.0"
-      sources."find-up-5.0.0"
-      sources."flat-cache-4.0.1"
-      sources."flatted-3.3.1"
-      sources."glob-parent-6.0.2"
-      sources."globals-14.0.0"
-      sources."has-flag-4.0.0"
-      sources."ignore-5.3.1"
-      sources."import-fresh-3.3.0"
-      sources."imurmurhash-0.1.4"
-      sources."is-extglob-2.1.1"
-      sources."is-glob-4.0.3"
-      sources."is-path-inside-3.0.3"
-      sources."isexe-2.0.0"
-      sources."js-yaml-4.1.0"
-      sources."json-buffer-3.0.1"
-      sources."json-schema-traverse-0.4.1"
-      sources."json-stable-stringify-without-jsonify-1.0.1"
-      sources."keyv-4.5.4"
-      sources."levn-0.4.1"
-      sources."locate-path-6.0.0"
-      sources."lodash.merge-4.6.2"
-      sources."minimatch-3.1.2"
-      sources."ms-2.1.2"
-      sources."natural-compare-1.4.0"
-      sources."optionator-0.9.4"
-      sources."p-limit-3.1.0"
-      sources."p-locate-5.0.0"
-      sources."parent-module-1.0.1"
-      sources."path-exists-4.0.0"
-      sources."path-key-3.1.1"
-      sources."prelude-ls-1.2.1"
-      sources."punycode-2.3.1"
-      sources."queue-microtask-1.2.3"
-      sources."resolve-from-4.0.0"
-      sources."reusify-1.0.4"
-      sources."run-parallel-1.2.0"
-      sources."shebang-command-2.0.0"
-      sources."shebang-regex-3.0.0"
-      sources."strip-ansi-6.0.1"
-      sources."strip-json-comments-3.1.1"
-      sources."supports-color-7.2.0"
-      sources."text-table-0.2.0"
-      sources."type-check-0.4.0"
-      sources."uri-js-4.4.1"
-      sources."which-2.0.2"
-      sources."word-wrap-1.2.5"
-      sources."yocto-queue-0.1.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "An AST-based pattern checker for JavaScript.";
-      homepage = "https://eslint.org";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   esy = nodeEnv.buildNodePackage {
     name = "esy";
     packageName = "esy";
diff --git a/pkgs/development/python-modules/ansible-builder/default.nix b/pkgs/development/python-modules/ansible-builder/default.nix
index f5a67d28eddb..064de3b127ad 100644
--- a/pkgs/development/python-modules/ansible-builder/default.nix
+++ b/pkgs/development/python-modules/ansible-builder/default.nix
@@ -1,11 +1,16 @@
 {
   lib,
-  python3Packages,
+  setuptools,
+  setuptools-scm,
+  jsonschema,
+  requirements-parser,
+  pyyaml,
   podman,
   fetchPypi,
   bindep,
+  buildPythonPackage,
 }:
-python3Packages.buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "ansible-builder";
   version = "3.0.1";
   format = "pyproject";
@@ -15,14 +20,14 @@ python3Packages.buildPythonPackage rec {
     hash = "sha256-rxyhgj9Cad751tPAptCTLCtXQLUXaRYv39bkoFzzjOk=";
   };
 
-  nativeBuildInputs = with python3Packages; [
+  nativeBuildInputs = [
     setuptools
     setuptools-scm
   ];
 
   buildInputs = [ bindep ];
 
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = [
     podman
     jsonschema
     requirements-parser
diff --git a/pkgs/development/python-modules/bindep/default.nix b/pkgs/development/python-modules/bindep/default.nix
index 8acd7ecf7cf0..8153354843a4 100644
--- a/pkgs/development/python-modules/bindep/default.nix
+++ b/pkgs/development/python-modules/bindep/default.nix
@@ -1,9 +1,14 @@
 {
   lib,
-  python3Packages,
   fetchPypi,
+  buildPythonPackage,
+  distro,
+  pbr,
+  setuptools,
+  packaging,
+  parsley,
 }:
-python3Packages.buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "bindep";
   version = "2.11.0";
   format = "pyproject";
@@ -13,13 +18,13 @@ python3Packages.buildPythonPackage rec {
     hash = "sha256-rLLyWbzh/RUIhzR5YJu95bmq5Qg3hHamjWtqGQAufi8=";
   };
 
-  buildInputs = with python3Packages; [
+  buildInputs = [
     distro
     pbr
     setuptools
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = [
     parsley
     pbr
     packaging
diff --git a/pkgs/development/python-modules/chainstream/default.nix b/pkgs/development/python-modules/chainstream/default.nix
index d5ee7775ac82..8d247e234d2d 100644
--- a/pkgs/development/python-modules/chainstream/default.nix
+++ b/pkgs/development/python-modules/chainstream/default.nix
@@ -1,16 +1,17 @@
 {
   lib,
   fetchPypi,
-  python3Packages,
+  buildPythonPackage,
+  setuptools,
 }:
 
-python3Packages.buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "chainstream";
   version = "1.0.1";
 
   pyproject = true;
 
-  nativeBuildInputs = [ python3Packages.setuptools ];
+  nativeBuildInputs = [ setuptools ];
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/cli-ui/default.nix b/pkgs/development/python-modules/cli-ui/default.nix
index ecd30ce3fc07..3b93c3eb7be8 100644
--- a/pkgs/development/python-modules/cli-ui/default.nix
+++ b/pkgs/development/python-modules/cli-ui/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  python3Packages,
   fetchPypi,
   pytestCheckHook,
   pythonOlder,
@@ -8,8 +7,9 @@
   colorama,
   tabulate,
   unidecode,
+  buildPythonPackage,
 }:
-python3Packages.buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "cli-ui";
   version = "0.17.2";
   pyproject = true;
diff --git a/pkgs/development/python-modules/controku/default.nix b/pkgs/development/python-modules/controku/default.nix
index e41e38b8ccd4..9aff50bfc087 100644
--- a/pkgs/development/python-modules/controku/default.nix
+++ b/pkgs/development/python-modules/controku/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  python3Packages,
   fetchFromGitHub,
   setuptools,
   requests,
@@ -10,10 +9,11 @@
   gobject-introspection,
   gtk3,
   wrapGAppsHook3,
+  buildPythonPackage,
   buildApplication ? false,
 }:
 
-python3Packages.buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "controku";
   version = "1.1.0";
   format = "pyproject";
diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix
index 20d45f74723c..1f06cf0faf12 100644
--- a/pkgs/development/python-modules/dbt-core/default.nix
+++ b/pkgs/development/python-modules/dbt-core/default.nix
@@ -17,7 +17,7 @@
   packaging,
   pathspec,
   protobuf,
-  python,
+  callPackage,
   pythonOlder,
   pytz,
   pyyaml,
@@ -85,7 +85,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   passthru = {
-    withAdapters = python.pkgs.callPackage ./with-adapters.nix { };
+    withAdapters = callPackage ./with-adapters.nix { };
   };
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/dendropy/default.nix b/pkgs/development/python-modules/dendropy/default.nix
index f17acbdc4b95..8cc15b7210c7 100644
--- a/pkgs/development/python-modules/dendropy/default.nix
+++ b/pkgs/development/python-modules/dendropy/default.nix
@@ -1,45 +1,54 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
   pythonOlder,
+  nix-update-script,
+  setuptools,
+  paup,
+  paupIntegration ? false,
 }:
 
+let
+  paupPath = if paupIntegration then lib.getExe paup else "NONE";
+in
 buildPythonPackage rec {
   pname = "dendropy";
-  version = "4.5.1";
-  format = "setuptools";
+  version = "5.0.2";
 
-  disabled = pythonOlder "3.7";
+  pyproject = true;
+  build-system = [ setuptools ];
 
   src = fetchFromGitHub {
     owner = "jeetsukumaran";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-FP0+fJkkFtSysPxoHXjyMgF8pPin7aRyzmHe9bH8LlM=";
+    repo = "dendropy";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-OiFei/6226FDtL4w1XrXL2OVn3/hfQwnIhTzM4OneKc=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace '["pytest-runner"],' '[],'
+
+    substituteInPlace src/dendropy/interop/paup.py \
+      --replace 'PAUP_PATH = os.environ.get(metavar.DENDROPY_PAUP_PATH_ENVAR, "paup")' 'PAUP_PATH = os.environ.get(metavar.DENDROPY_PAUP_PATH_ENVAR, "${paupPath}")'
+  '';
+
   nativeCheckInputs = [ pytestCheckHook ];
 
-  disabledTests = [
-    # FileNotFoundError: [Errno 2] No such file or directory: 'paup'
-    "test_basic_split_count_with_incorrect_rootings_raises_error"
-    "test_basic_split_count_with_incorrect_weight_treatment_raises_error"
-    "test_basic_split_counting_under_different_rootings"
-    "test_group1"
-    # AssertionError: 6 != 5
-    "test_by_num_lineages"
-    # AttributeError: module 'collections' has no attribute 'Iterable'
-    "test_findall_multiple"
-  ];
-
   pythonImportsCheck = [ "dendropy" ];
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "Python library for phylogenetic computing";
-    homepage = "https://dendropy.org/";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ unode ];
+    homepage = "https://jeetsukumaran.github.io/DendroPy/";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
+      unode
+      pandapip1
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/dnf4/wrapper.nix b/pkgs/development/python-modules/dnf4/wrapper.nix
index b84584f52fad..c8cd1c1c261d 100644
--- a/pkgs/development/python-modules/dnf4/wrapper.nix
+++ b/pkgs/development/python-modules/dnf4/wrapper.nix
@@ -1,15 +1,16 @@
 {
   lib,
   wrapPython,
-  python3,
+  python,
   stdenv,
+  dnf4,
   dnf-plugins-core,
   plugins ? [ dnf-plugins-core ],
 }:
 let
-  pluginPaths = map (p: "${p}/${python3.sitePackages}/dnf-plugins") plugins;
+  pluginPaths = map (p: "${p}/${python.sitePackages}/dnf-plugins") plugins;
 
-  dnf4-unwrapped = python3.pkgs.dnf4;
+  dnf4-unwrapped = dnf4;
 in
 
 stdenv.mkDerivation {
diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix
index f1df16ed5933..401fbba09893 100644
--- a/pkgs/development/python-modules/etils/default.nix
+++ b/pkgs/development/python-modules/etils/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "etils";
-  version = "1.9.2";
+  version = "1.9.3";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-FdzTWsDAzCQEtGrAhGrzzE6Hb9PYDzb1eVHifoudY3k=";
+    hash = "sha256-qjt6hF3jwbabMMoHBG6MT9LoXsvmBKpL8Y6pPnsxhPA=";
   };
 
   nativeBuildInputs = [ flit-core ];
diff --git a/pkgs/development/python-modules/exiv2/default.nix b/pkgs/development/python-modules/exiv2/default.nix
index d533e4f58c6f..c1c9715f5a3f 100644
--- a/pkgs/development/python-modules/exiv2/default.nix
+++ b/pkgs/development/python-modules/exiv2/default.nix
@@ -3,11 +3,14 @@
   pkg-config,
   exiv2,
   gettext,
-  python3Packages,
   fetchFromGitHub,
   gitUpdater,
+  buildPythonPackage,
+  setuptools,
+  toml,
+  unittestCheckHook,
 }:
-python3Packages.buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "exiv2";
   version = "0.17.0";
   pyproject = true;
@@ -30,7 +33,7 @@ python3Packages.buildPythonPackage rec {
         def test_localisation(self):"
   '';
 
-  build-system = with python3Packages; [
+  build-system = [
     setuptools
     toml
   ];
@@ -42,7 +45,7 @@ python3Packages.buildPythonPackage rec {
   ];
 
   pythonImportsCheck = [ "exiv2" ];
-  nativeCheckInputs = with python3Packages; [ unittestCheckHook ];
+  nativeCheckInputs = [ unittestCheckHook ];
   unittestFlagsArray = [
     "-s"
     "tests"
diff --git a/pkgs/development/python-modules/invisible-watermark/tests/cli.nix b/pkgs/development/python-modules/invisible-watermark/tests/cli.nix
index 89de1174384a..a1563d67c716 100644
--- a/pkgs/development/python-modules/invisible-watermark/tests/cli.nix
+++ b/pkgs/development/python-modules/invisible-watermark/tests/cli.nix
@@ -1,7 +1,7 @@
 {
   image,
   method,
-  python3Packages,
+  invisible-watermark,
   runCommand,
   testName,
   withOnnx,
@@ -25,7 +25,7 @@ let
     else
       "fnörd1";
   length = (builtins.stringLength message) * 8;
-  invisible-watermark' = python3Packages.invisible-watermark.override { inherit withOnnx; };
+  invisible-watermark' = invisible-watermark.override { inherit withOnnx; };
   expected-exit-code = if method == "rivaGan" && !withOnnx then "1" else "0";
 in
 runCommand "invisible-watermark-test-${testName}" { nativeBuildInputs = [ invisible-watermark' ]; }
diff --git a/pkgs/development/python-modules/invisible-watermark/tests/python/default.nix b/pkgs/development/python-modules/invisible-watermark/tests/python/default.nix
index e713f9bfe20c..617dd0bb13cb 100644
--- a/pkgs/development/python-modules/invisible-watermark/tests/python/default.nix
+++ b/pkgs/development/python-modules/invisible-watermark/tests/python/default.nix
@@ -2,7 +2,7 @@
   image,
   invisible-watermark,
   opencv4,
-  python3,
+  python,
   runCommand,
   stdenvNoCC,
 }:
@@ -13,12 +13,10 @@ let
   message = "fnörd1";
   method = "dwtDct";
 
-  pythonWithPackages = python3.withPackages (
-    pp: with pp; [
-      invisible-watermark
-      opencv4
-    ]
-  );
+  pythonWithPackages = python.withPackages (_: [
+    invisible-watermark
+    opencv4
+  ]);
   pythonInterpreter = pythonWithPackages.interpreter;
 
   encode = stdenvNoCC.mkDerivation {
diff --git a/pkgs/development/python-modules/lsp-tree-sitter/default.nix b/pkgs/development/python-modules/lsp-tree-sitter/default.nix
index a0530544a938..b4bba5724077 100644
--- a/pkgs/development/python-modules/lsp-tree-sitter/default.nix
+++ b/pkgs/development/python-modules/lsp-tree-sitter/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "lsp-tree-sitter";
-  version = "0.0.15";
+  version = "0.0.16";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "neomutt";
     repo = "lsp-tree-sitter";
-    rev = version;
-    hash = "sha256-yzScgix3BtSCBzlDoE1kMYGtVzkup/+ZK9L1C7VA3do=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-nRzyVZFgb08M0I+xmhuX1LDwPsghlBLdZ2Ou8stKzk0=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/manuf/default.nix b/pkgs/development/python-modules/manuf/default.nix
index 20961a139682..2210f4a40fae 100644
--- a/pkgs/development/python-modules/manuf/default.nix
+++ b/pkgs/development/python-modules/manuf/default.nix
@@ -3,9 +3,9 @@
   buildPythonPackage,
   fetchFromGitHub,
   runCommand,
-  python3,
   wireshark-cli,
   pytestCheckHook,
+  manuf, # remove when buildPythonPackage supports finalAttrs
 }:
 
 buildPythonPackage rec {
@@ -42,7 +42,7 @@ buildPythonPackage rec {
 
   passthru.tests = {
     testMacAddress = runCommand "${pname}-test" { } ''
-      ${python3.pkgs.manuf}/bin/manuf BC:EE:7B:00:00:00 > $out
+      ${lib.getExe manuf} BC:EE:7B:00:00:00 > $out
       [ "$(cat $out | tr -d '\n')" = "Vendor(manuf='ASUSTekC', manuf_long='ASUSTek COMPUTER INC.', comment=None)" ]
     '';
   };
diff --git a/pkgs/development/python-modules/minari/default.nix b/pkgs/development/python-modules/minari/default.nix
index fdf38918ff33..dd6373a58c56 100644
--- a/pkgs/development/python-modules/minari/default.nix
+++ b/pkgs/development/python-modules/minari/default.nix
@@ -3,28 +3,34 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
+
+  # build-system
   setuptools,
-  wheel,
-  google-cloud-storage,
+
+  # dependencies
   gymnasium,
-  h5py,
   numpy,
   packaging,
-  portion,
-  rich,
-  tqdm,
   typer,
   typing-extensions,
-  imageio,
-  nbmake,
+
+  # optional-dependencies
+  pyarrow,
+  jax,
+  google-cloud-storage,
+  tqdm,
+  h5py,
+  mktestdocs,
   pytest,
-  pytest-markdown-docs,
+
+  # tests
+  jaxlib,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "minari";
-  version = "0.4.3";
+  version = "0.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -33,40 +39,52 @@ buildPythonPackage rec {
     owner = "Farama-Foundation";
     repo = "Minari";
     rev = "refs/tags/v${version}";
-    hash = "sha256-DwuANo0PCb2pPTVST8EwuJHe5HKRV8JIpFBpSqoJNh8=";
+    hash = "sha256-SVt93d0GbCxeZXhh5vMPvnsBAeJAfGWNceFi0W9RgeM=";
   };
 
   build-system = [
     setuptools
-    wheel
   ];
 
   dependencies = [
-    google-cloud-storage
     gymnasium
-    h5py
     numpy
     packaging
-    portion
-    rich
-    tqdm
     typer
     typing-extensions
   ];
 
-  passthru.optional-dependencies = {
+  optional-dependencies = {
+    arrow = [ pyarrow ];
+    create = [ jax ];
+    gcs = [
+      google-cloud-storage
+      tqdm
+    ];
+    hdf5 = [ h5py ];
     testing = [
       # gymnasium-robotics
-      imageio
-      nbmake
+      mktestdocs
       pytest
-      pytest-markdown-docs
     ];
   };
 
   pythonImportsCheck = [ "minari" ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    jaxlib
+    pytestCheckHook
+  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+
+  disabledTests = [
+    # Require internet access
+    "test_download_namespace_dataset"
+    "test_download_namespace_metadata"
+    "test_markdown"
+
+    # Attempts at installing minari using pip (impossible in the sandbox)
+    "test_readme"
+  ];
 
   disabledTestPaths = [
     # Require internet access
@@ -74,15 +92,15 @@ buildPythonPackage rec {
     "tests/test_cli.py"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Standard format for offline reinforcement learning datasets, with popular reference datasets and related utilities";
     homepage = "https://github.com/Farama-Foundation/Minari";
     changelog = "https://github.com/Farama-Foundation/Minari/releases/tag/v${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    maintainers = with maintainers; [ GaetanLepage ];
+    maintainers = with lib.maintainers; [ GaetanLepage ];
     mainProgram = "minari";
   };
 }
diff --git a/pkgs/development/python-modules/mktestdocs/default.nix b/pkgs/development/python-modules/mktestdocs/default.nix
new file mode 100644
index 000000000000..94ecadee5fcb
--- /dev/null
+++ b/pkgs/development/python-modules/mktestdocs/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "mktestdocs";
+  version = "0.2.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "koaning";
+    repo = "mktestdocs";
+    rev = "refs/tags/${version}";
+    hash = "sha256-snlt6SDiDYr04b2b2NgBC/1IBffpei034vFx3fnYUOc=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "mktestdocs" ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  meta = {
+    description = "Run pytest against markdown files/docstrings";
+    homepage = "https://github.com/koaning/mktestdocs";
+    changelog = "https://github.com/koaning/mktestdocs/releases/tag/${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix
index 2084b8c19f75..614aed274ba0 100644
--- a/pkgs/development/python-modules/mlx/default.nix
+++ b/pkgs/development/python-modules/mlx/default.nix
@@ -2,13 +2,13 @@
   lib,
   fetchFromGitHub,
   buildPythonPackage,
-  python3Packages,
   pybind11,
   cmake,
   xcbuild,
   zsh,
   blas,
   lapack,
+  setuptools,
 }:
 
 let
@@ -69,7 +69,8 @@ buildPythonPackage rec {
     zsh
     gguf-tools
     nlohmann_json
-  ] ++ (with python3Packages; [ setuptools ]);
+    setuptools
+  ];
 
   buildInputs = [
     blas
diff --git a/pkgs/development/python-modules/onigurumacffi/default.nix b/pkgs/development/python-modules/onigurumacffi/default.nix
index 09be23993652..2d2faef572fd 100644
--- a/pkgs/development/python-modules/onigurumacffi/default.nix
+++ b/pkgs/development/python-modules/onigurumacffi/default.nix
@@ -1,10 +1,12 @@
 {
   lib,
-  python3Packages,
+  buildPythonPackage,
   fetchPypi,
   oniguruma,
+  setuptools,
+  cffi,
 }:
-python3Packages.buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "onigurumacffi";
   version = "1.3.0";
   format = "pyproject";
@@ -14,7 +16,7 @@ python3Packages.buildPythonPackage rec {
     hash = "sha256-d0XNxWCWrOyIofOwhmCiKwnGWe040/WdtsHK12qXa+8=";
   };
 
-  buildInputs = with python3Packages; [
+  buildInputs = [
     oniguruma
     setuptools
     cffi
diff --git a/pkgs/development/python-modules/orgparse/default.nix b/pkgs/development/python-modules/orgparse/default.nix
index 488a0e6e4d98..0ad3b30aaeba 100644
--- a/pkgs/development/python-modules/orgparse/default.nix
+++ b/pkgs/development/python-modules/orgparse/default.nix
@@ -1,10 +1,11 @@
 {
   lib,
-  python3Packages,
+  setuptools-scm,
   fetchPypi,
+  buildPythonPackage,
 }:
 
-python3Packages.buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "orgparse";
   version = "0.4.20231004";
 
@@ -13,7 +14,7 @@ python3Packages.buildPythonPackage rec {
     hash = "sha256-pOOK6tq/mYiw9npmrNCCedGCILy8QioSkGDCiQu6kaA=";
   };
 
-  nativeBuildInputs = [ python3Packages.setuptools-scm ];
+  nativeBuildInputs = [ setuptools-scm ];
 
   pyproject = true;
 
diff --git a/pkgs/development/python-modules/pylsp-mypy/default.nix b/pkgs/development/python-modules/pylsp-mypy/default.nix
index 17f9c244e702..42baae0b0659 100644
--- a/pkgs/development/python-modules/pylsp-mypy/default.nix
+++ b/pkgs/development/python-modules/pylsp-mypy/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pylsp-mypy";
-  version = "0.6.8";
+  version = "0.6.9";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "python-lsp";
     repo = "pylsp-mypy";
     rev = "refs/tags/${version}";
-    hash = "sha256-oEWUXkE8U7/ye6puJZRSkQFi10BPGuc8XZQbHwqOPEI=";
+    hash = "sha256-MP9a8dI5ggM+XEJYB6O4nYDYIXbtxi2TK5b+JQgViZQ=";
   };
 
   build-system = [ setuptools ];
@@ -33,8 +33,7 @@ buildPythonPackage rec {
   dependencies = [
     mypy
     python-lsp-server
-    tomli
-  ];
+  ] ++ lib.optional (pythonOlder "3.11") tomli;
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/python-magnumclient/default.nix b/pkgs/development/python-modules/python-magnumclient/default.nix
new file mode 100644
index 000000000000..06866a59ce84
--- /dev/null
+++ b/pkgs/development/python-modules/python-magnumclient/default.nix
@@ -0,0 +1,97 @@
+{
+  lib,
+  buildPythonPackage,
+  cryptography,
+  decorator,
+  fetchFromGitHub,
+  fixtures,
+  keystoneauth1,
+  openstackdocstheme,
+  os-client-config,
+  osc-lib,
+  oslo-i18n,
+  oslo-log,
+  oslo-serialization,
+  oslo-utils,
+  oslotest,
+  osprofiler,
+  pbr,
+  prettytable,
+  python-openstackclient,
+  pythonOlder,
+  requests-mock,
+  requests,
+  setuptools,
+  sphinxHook,
+  stestr,
+  testtools,
+}:
+
+buildPythonPackage rec {
+  pname = "python-magnumclient";
+  version = "4.7.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "openstack";
+    repo = "python-magnumclient";
+    rev = "refs/tags/${version}";
+    hash = "sha256-2JHI3CB/DSZZ4LXzL3PCUSmubTciUXtZkc5jpeEc4kk=";
+  };
+
+  env.PBR_VERSION = version;
+
+  nativeBuildInputs = [
+    openstackdocstheme
+    sphinxHook
+  ];
+
+  sphinxBuilders = [ "man" ];
+
+  build-system = [
+    pbr
+    setuptools
+  ];
+
+  dependencies = [
+    cryptography
+    decorator
+    keystoneauth1
+    os-client-config
+    osc-lib
+    oslo-i18n
+    oslo-log
+    oslo-serialization
+    oslo-utils
+    prettytable
+    requests
+  ];
+
+  nativeCheckInputs = [
+    fixtures
+    python-openstackclient
+    osprofiler
+    oslotest
+    requests-mock
+    stestr
+    testtools
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+    stestr run
+    runHook postCheck
+  '';
+
+  pythonImportsCheck = [ "magnumclient" ];
+
+  meta = {
+    homepage = "https://github.com/openstack/python-magnumclient";
+    description = "Client library for OpenStack Magnum API";
+    license = lib.licenses.asl20;
+    mainProgram = "magnum";
+    maintainers = lib.teams.openstack.members;
+  };
+}
diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix
index 3f3989283f74..dcc7464297e8 100644
--- a/pkgs/development/python-modules/python-openstackclient/default.nix
+++ b/pkgs/development/python-modules/python-openstackclient/default.nix
@@ -12,6 +12,7 @@
   python-heatclient,
   python-ironicclient,
   python-keystoneclient,
+  python-magnumclient,
   python-manilaclient,
   python-mistralclient,
   python-neutronclient,
@@ -74,6 +75,7 @@ buildPythonPackage rec {
         python-designateclient
         python-heatclient
         python-ironicclient
+        python-magnumclient
         python-manilaclient
         python-mistralclient
         python-neutronclient
diff --git a/pkgs/games/rott/default.nix b/pkgs/games/rott/default.nix
index 534f14bcb289..e678994e47f0 100644
--- a/pkgs/games/rott/default.nix
+++ b/pkgs/games/rott/default.nix
@@ -40,8 +40,8 @@ stdenv.mkDerivation rec {
     "SHAREWARE=${if buildShareware then "1" else "0"}"
   ];
 
-  # when using SDL_compat instead of SDL_classic, SDL_mixer isn't correctly
-  # detected, but there is no harm just specifying it
+  # when using SDL_compat instead of SDL1, SDL_mixer isn't correctly detected,
+  # but there is no harm just specifying it
   env.NIX_CFLAGS_COMPILE = toString [
     "-I${lib.getDev SDL_mixer}/include/SDL"
   ];
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix
index 6ca71440690b..9a03f71e8041 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix
@@ -5,16 +5,16 @@
 
 buildNpmPackage rec {
   pname = "mushroom";
-  version = "4.0.6";
+  version = "4.0.7";
 
   src = fetchFromGitHub {
     owner = "piitaya";
     repo = "lovelace-mushroom";
     rev = "v${version}";
-    hash = "sha256-3zTavmuLrL/JPQE3axhGONxMhOMq0L0QvSj2pCKukmI=";
+    hash = "sha256-97FW4kNPaoP501xD0W/PjmykwhLbLz7yHVNZiwl/clE=";
   };
 
-  npmDepsHash = "sha256-mzFgk5cGjFBnrVHbB6QQzf1QRAeLMl/6WS3I8jbheu8=";
+  npmDepsHash = "sha256-Gpt17teEbBMHU8teiH66fjZmgq+6v/XovTVxNfHFTg4=";
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix
index 5e7a0ab48200..fe0f8af3de2d 100644
--- a/pkgs/servers/home-assistant/stubs.nix
+++ b/pkgs/servers/home-assistant/stubs.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "homeassistant-stubs";
-  version = "2024.8.3";
+  version = "2024.9.0";
   pyproject = true;
 
   disabled = python.version != home-assistant.python.version;
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "KapJI";
     repo = "homeassistant-stubs";
     rev = "refs/tags/${version}";
-    hash = "sha256-cpOxBdqrbN/YmtbxTLyarYdDhdlbnLoFfsBvnAdsWks=";
+    hash = "sha256-8t8r0CjiMvu73A+NtwF6/KMm+LkvMc/k4d1YPgWzWt8=";
   };
 
   build-system = [
diff --git a/pkgs/tools/misc/sheldon/default.nix b/pkgs/tools/misc/sheldon/default.nix
index a11692f5d935..cf48868097b5 100644
--- a/pkgs/tools/misc/sheldon/default.nix
+++ b/pkgs/tools/misc/sheldon/default.nix
@@ -61,7 +61,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/rossmacarthur/sheldon";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ seqizz ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     mainProgram = "sheldon";
   };
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index dd4bc389b81e..b43d6b13df8e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1132,6 +1132,7 @@ mapAliases ({
   openjfx19 = throw "OpenJFX 19 was removed as it has reached its end of life"; # Added 2024-08-01
   openjfx20 = throw "OpenJFX 20 was removed as it has reached its end of life"; # Added 2024-08-01
   openjpeg_2 = openjpeg; # Added 2021-01-25
+  openlens = throw "Lens Closed its source code, package obsolete/stale - consider lens as replacement"; # Added 2024-09-04
   openlp = throw "openlp has been removed for now because the outdated version depended on insecure and removed packages and it needs help to upgrade and maintain it; see https://github.com/NixOS/nixpkgs/pull/314882"; # Added 2024-07-29
   openmpt123 = libopenmpt; # Added 2021-09-05
   openssl_3_0 = openssl_3; # Added 2022-06-27
@@ -1371,6 +1372,7 @@ mapAliases ({
 
   ### S ###
 
+  SDL_classic = SDL1; # Added 2024-09-03
   s2n = s2n-tls; # Added 2021-03-03
   sandboxfs = throw "'sandboxfs' has been removed due to being unmaintained, consider using linux namespaces for sandboxing instead"; # Added 2024-06-06
   sane-backends-git = sane-backends; # Added 2021-02-19
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4cfaecb6d26..e1771af24426 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22939,6 +22939,7 @@ with pkgs;
   glanceclient = with python311Packages; toPythonApplication python-glanceclient;
   heatclient = with python311Packages; toPythonApplication python-heatclient;
   ironicclient = with python311Packages; toPythonApplication python-ironicclient;
+  magnumclient = with python311Packages; toPythonApplication python-magnumclient;
   manilaclient = with python311Packages; toPythonApplication python-manilaclient;
   mistralclient = with python311Packages; toPythonApplication python-mistralclient;
   swiftclient = with python311Packages; toPythonApplication python-swiftclient;
@@ -23437,19 +23438,7 @@ with pkgs;
 
   scope-lite = callPackage ../development/libraries/scope-lite { };
 
-  SDL_classic = callPackage ../development/libraries/SDL ({
-    inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa GLUT;
-  } // lib.optionalAttrs stdenv.hostPlatform.isAndroid {
-    # libGLU doesn’t work with Android’s SDL
-    libGLU = null;
-  });
-
-  SDL_compat = callPackage ../development/libraries/SDL_compat {
-    inherit (darwin.apple_sdk.frameworks) Cocoa;
-    inherit (darwin) autoSignDarwinBinariesHook;
-  };
-
-  SDL = SDL_classic;
+  SDL = SDL1;
 
   SDL2 = callPackage ../development/libraries/SDL2 {
     inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL;
@@ -31379,8 +31368,6 @@ with pkgs;
 
   lens = callPackage ../applications/networking/cluster/lens { };
 
-  openlens = callPackage ../applications/networking/cluster/openlens { };
-
   leo-editor = libsForQt5.callPackage ../applications/editors/leo-editor { };
 
   libkiwix = callPackage ../applications/misc/kiwix/lib.nix { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1397631cf3b9..88504c16e663 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7935,6 +7935,8 @@ self: super: with self; {
 
   mkl-service = callPackage ../development/python-modules/mkl-service { };
 
+  mktestdocs = callPackage ../development/python-modules/mktestdocs { };
+
   ml-collections = callPackage ../development/python-modules/ml-collections { };
 
   ml-dtypes = callPackage ../development/python-modules/ml-dtypes { };
@@ -12649,6 +12651,8 @@ self: super: with self; {
 
   python-magic = callPackage ../development/python-modules/python-magic { };
 
+  python-magnumclient = callPackage ../development/python-modules/python-magnumclient { };
+
   python-manilaclient = callPackage ../development/python-modules/python-manilaclient { };
 
   python-mapnik = callPackage ../development/python-modules/python-mapnik rec {
@@ -15758,6 +15762,11 @@ self: super: with self; {
 
   tsfresh = callPackage ../development/python-modules/tsfresh { };
 
+  tsid = toPythonModule (pkgs.tsid.override {
+    pythonSupport = true;
+    python3Packages = self;
+  });
+
   tskit = callPackage ../development/python-modules/tskit { };
 
   ttach = callPackage ../development/python-modules/ttach { };