diff --git a/.github/workflows/eval-lib-tests.yml b/.github/workflows/eval-lib-tests.yml
index 065fe8fdb282..f0f5fbf376c2 100644
--- a/.github/workflows/eval-lib-tests.yml
+++ b/.github/workflows/eval-lib-tests.yml
@@ -4,6 +4,7 @@ on:
   pull_request_target:
     paths:
       - 'lib/**'
+      - 'maintainers/**'
 
 permissions: {}
 
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 195207a11aa9..476fcf87a802 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -19590,6 +19590,12 @@
     githubId = 93167100;
     keys = [ { fingerprint = "9075 CEF8 9850 D261 6599  641A A2C9 36D5 B88C 139C"; } ];
   };
+  renpenguin = {
+    email = "redpenguin777@yahoo.com";
+    github = "renpenguin";
+    githubId = 79577742;
+    name = "ren";
+  };
   renzo = {
     email = "renzocarbonara@gmail.com";
     github = "k0001";
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 34e91f370179..76153bce2d9c 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -203,9 +203,8 @@ in
       description = ''
         This option effectively allows adding setuid/setgid bits, capabilities,
         changing file ownership and permissions of a program without directly
-        modifying it. This works by creating a wrapper program under the
-        {option}`security.wrapperDir` directory, which is then added to
-        the shell `PATH`.
+        modifying it. This works by creating a wrapper program in a directory
+        (not configurable), which is then added to the shell `PATH`.
       '';
     };
 
diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix
index 33dc1c35ebeb..7a2e6df8a1be 100644
--- a/nixos/modules/services/backup/mysql-backup.nix
+++ b/nixos/modules/services/backup/mysql-backup.nix
@@ -8,6 +8,18 @@ let
   cfg = config.services.mysqlBackup;
   defaultUser = "mysqlbackup";
 
+  # Newer mariadb versions warn of the usage of 'mysqldump' and recommend 'mariadb-dump' (https://mariadb.com/kb/en/mysqldump/)
+  dumpBinary =
+    if
+      (
+        lib.getName config.services.mysql.package == lib.getName pkgs.mariadb
+        && lib.versionAtLeast config.services.mysql.package.version "11.0.0"
+      )
+    then
+      "${config.services.mysql.package}/bin/mariadb-dump"
+    else
+      "${config.services.mysql.package}/bin/mysqldump";
+
   compressionAlgs = {
     gzip = rec {
       pkg = pkgs.gzip;
@@ -39,6 +51,13 @@ let
   selectedAlg = compressionAlgs.${cfg.compressionAlg};
   compressionCmd = selectedAlg.cmd compressionLevelFlag;
 
+  shouldUseSingleTransaction =
+    db:
+    if lib.isBool cfg.singleTransaction then
+      cfg.singleTransaction
+    else
+      lib.elem db cfg.singleTransaction;
+
   backupScript = ''
     set -o pipefail
     failed=""
@@ -51,7 +70,7 @@ let
 
   backupDatabaseScript = db: ''
     dest="${cfg.location}/${db}${selectedAlg.ext}"
-    if ${pkgs.mariadb}/bin/mysqldump ${lib.optionalString cfg.singleTransaction "--single-transaction"} ${db} | ${compressionCmd} > $dest.tmp; then
+    if ${dumpBinary} ${lib.optionalString (shouldUseSingleTransaction db) "--single-transaction"} ${db} | ${compressionCmd} > $dest.tmp; then
       mv $dest.tmp $dest
       echo "Backed up to $dest"
     else
@@ -126,9 +145,13 @@ in
 
       singleTransaction = lib.mkOption {
         default = false;
-        type = lib.types.bool;
+        type = lib.types.oneOf [
+          lib.types.bool
+          (lib.types.listOf lib.types.str)
+        ];
         description = ''
-          Whether to create database dump in a single transaction
+          Whether to create database dump in a single transaction.
+          Can be either a boolean for all databases or a list of database names.
         '';
       };
 
@@ -153,6 +176,12 @@ in
           || selectedAlg.minLevel <= cfg.compressionLevel && cfg.compressionLevel <= selectedAlg.maxLevel;
         message = "${cfg.compressionAlg} compression level must be between ${toString selectedAlg.minLevel} and ${toString selectedAlg.maxLevel}";
       }
+      {
+        assertion =
+          !(lib.isList cfg.singleTransaction)
+          || lib.all (db: lib.elem db cfg.databases) cfg.singleTransaction;
+        message = "All databases in singleTransaction must be included in the databases option";
+      }
     ];
 
     # ensure unix user to be used to perform backup exist.
diff --git a/pkgs/applications/audio/sonic-lineup/default.nix b/pkgs/applications/audio/sonic-lineup/default.nix
index e464c4a00f46..6d41c1cb7abb 100644
--- a/pkgs/applications/audio/sonic-lineup/default.nix
+++ b/pkgs/applications/audio/sonic-lineup/default.nix
@@ -72,10 +72,13 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
+    capnproto # capnp
     pkg-config
     wrapQtAppsHook
   ];
 
+  strictDeps = true;
+
   enableParallelBuilding = true;
 
   # comment out the tests
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index 4df8046de30f..858a38cf5ee7 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
   replaceVars,
   cmake,
-  boost,
+  boost186,
   zlib,
   openssl,
   R,
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [
-      boost
+      boost186
       zlib
       openssl
       R
diff --git a/pkgs/by-name/ap/api-linter/package.nix b/pkgs/by-name/ap/api-linter/package.nix
index 6e77539b60cc..86c08979d205 100644
--- a/pkgs/by-name/ap/api-linter/package.nix
+++ b/pkgs/by-name/ap/api-linter/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "api-linter";
-  version = "1.68.0";
+  version = "1.69.0";
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "api-linter";
     rev = "v${version}";
-    hash = "sha256-pYzdI7bcAPP47K4EKjsAV7UY2RLGX9m3tksYRZeGdTQ=";
+    hash = "sha256-a+TBI4rm/6JzDH6PZyYfX6ThZuA6FW7H6ml5K9lorG4=";
   };
 
-  vendorHash = "sha256-vdoEMMlFwS+BBd0EsrahVL3ZZE4PHQJP4CNwsqIo5Y8=";
+  vendorHash = "sha256-wQQGQHz7Z8iSaDbfGWR/MazCo27uLycN0rKerRqzCDc=";
 
   subPackages = [ "cmd/api-linter" ];
 
diff --git a/pkgs/by-name/cr/criterion/tests/001-version.nix b/pkgs/by-name/cr/criterion/tests/001-version.nix
index 25a98b5a0c30..e9cf7278a370 100644
--- a/pkgs/by-name/cr/criterion/tests/001-version.nix
+++ b/pkgs/by-name/cr/criterion/tests/001-version.nix
@@ -5,7 +5,7 @@
 }:
 stdenv.mkDerivation rec {
   name = "version-tester";
-  version = "v${criterion.version}";
+  inherit (criterion) version;
   src = ./test_dummy.c;
 
   dontUnpack = true;
diff --git a/pkgs/by-name/di/display3d/package.nix b/pkgs/by-name/di/display3d/package.nix
new file mode 100644
index 000000000000..74efa2eedc3b
--- /dev/null
+++ b/pkgs/by-name/di/display3d/package.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "display3d";
+  version = "0.2.1";
+
+  src = fetchFromGitHub {
+    owner = "renpenguin";
+    repo = "display3d";
+    tag = "v${version}";
+    hash = "sha256-WGcocX3WYtTleh2f3F0yi3KBAMo1/dtlfVy1pQVhWgw=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-E4Ncg9OPlYGra794pPS9u9oyqep+k3Ser5ZxfV+uSRM=";
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
+
+  passthru.updateScript = nix-update-script {};
+
+  meta = {
+    description = "CLI for rendering and animating 3D objects";
+    homepage = "https://github.com/renpenguin/display3d";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ renpenguin ];
+    mainProgram = "display3d";
+  };
+}
diff --git a/pkgs/by-name/do/docker-init/package.nix b/pkgs/by-name/do/docker-init/package.nix
index 46b951515d91..279f533da8ab 100644
--- a/pkgs/by-name/do/docker-init/package.nix
+++ b/pkgs/by-name/do/docker-init/package.nix
@@ -6,7 +6,8 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "docker-init";
-  version = "v1.4.0";
+  version = "1.4.0";
+
   tag = "175267";
 
   src = fetchurl {
diff --git a/pkgs/by-name/gi/git-together/package.nix b/pkgs/by-name/gi/git-together/package.nix
index 2ecb8afd8129..8b56b68280a0 100644
--- a/pkgs/by-name/gi/git-together/package.nix
+++ b/pkgs/by-name/gi/git-together/package.nix
@@ -10,12 +10,12 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "git-together";
-  version = "v0.1.0-alpha.26";
+  version = "0.1.0-alpha.26";
 
   src = fetchFromGitHub {
     owner = "kejadlen";
     repo = "git-together";
-    rev = version;
+    tag = "v${version}";
     hash = "sha256-2HgOaqlX0mmmvRlALHm90NAdIhby/jWUJO63bQFqc+4=";
   };
 
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-5LKKjHzIlXw0bUmF7GDCVW0cptCxohq6CNPIrMZKorM=";
 
   meta = with lib; {
-    changelog = "https://github.com/kejadlen/git-together/releases/tag/${src.rev}";
+    changelog = "https://github.com/kejadlen/git-together/releases/tag/v${version}";
     description = "Better commit attribution while pairing without messing with your git workflow";
     homepage = "https://github.com/kejadlen/git-together";
     license = licenses.mit;
diff --git a/pkgs/by-name/hu/hullcaster/package.nix b/pkgs/by-name/hu/hullcaster/package.nix
index 268556d544bb..1fe9c515b884 100644
--- a/pkgs/by-name/hu/hullcaster/package.nix
+++ b/pkgs/by-name/hu/hullcaster/package.nix
@@ -6,12 +6,12 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "hullcaster";
-  version = "v0.1.2";
+  version = "0.1.2";
 
   src = fetchFromGitHub {
     owner = "gilcu3";
     repo = "hullcaster";
-    rev = version;
+    tag = "v${version}";
     hash = "sha256-TaELX/xMxm7OTmVnvkgEmdhnVrIlxSNqlE73+I5qxCc=";
   };
 
diff --git a/pkgs/by-name/jw/jwasm/package.nix b/pkgs/by-name/jw/jwasm/package.nix
index a069cbda51d6..42808118b645 100644
--- a/pkgs/by-name/jw/jwasm/package.nix
+++ b/pkgs/by-name/jw/jwasm/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jwasm";
-  version = "2.18";
+  version = "2.19";
 
   src = fetchFromGitHub {
     owner = "Baron-von-Riedesel";
     repo = "JWasm";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-xbiyGBTzIkAfUy45JdAl77gbvArzVUQNPOxa+H2uGFo=";
+    hash = "sha256-rWn/PhdOkA8aKDPx5GlfM6RuHcy1Hhudh1auVfaNtdI=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/lo/lora/package.nix b/pkgs/by-name/lo/lora/package.nix
index a062c11e04d0..590d32405d66 100644
--- a/pkgs/by-name/lo/lora/package.nix
+++ b/pkgs/by-name/lo/lora/package.nix
@@ -5,14 +5,14 @@
   nix-update-script,
 }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "lora";
-  version = "v3.005";
+  version = "3.005";
 
   src = fetchFromGitHub {
     owner = "cyrealtype";
     repo = "lora";
-    rev = version;
+    tag = "v${finalAttrs.version}";
     hash = "sha256-EHa8DUPFRvdYBdCY41gfjKGtTHwGIXCwD9Qc+Npmt1s=";
   };
 
@@ -30,11 +30,11 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Lora is a well-balanced contemporary serif with roots in calligraphy";
     homepage = "https://github.com/cyrealtype/lora";
-    license = licenses.ofl;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ ofalvai ];
+    license = lib.licenses.ofl;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ ofalvai ];
   };
-}
+})
diff --git a/pkgs/by-name/lx/lxqt-panel-profiles/package.nix b/pkgs/by-name/lx/lxqt-panel-profiles/package.nix
index d87630bddf16..0587b72220cf 100644
--- a/pkgs/by-name/lx/lxqt-panel-profiles/package.nix
+++ b/pkgs/by-name/lx/lxqt-panel-profiles/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
     substituteInPlace usr/bin/lxqt-panel-profiles \
     --replace-fail "/bin/bash" "${bash}/bin/bash" \
-    --replace-fail "/usr/share/" "$out/usr/share/" \
+    --replace-fail "/usr/share/" "$out/share/" \
     --replace-fail "python3" "${pythonWithPyqt6}/bin/python"
 
     substituteInPlace usr/share/lxqt-panel-profiles/lxqt-panel-profiles.py \
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir $out
-    mv usr $out/usr
+    mv usr/* $out
   '';
 
   meta = {
diff --git a/pkgs/by-name/mb/mbuffer/package.nix b/pkgs/by-name/mb/mbuffer/package.nix
index 25b5f00be30f..d20292c5269c 100644
--- a/pkgs/by-name/mb/mbuffer/package.nix
+++ b/pkgs/by-name/mb/mbuffer/package.nix
@@ -25,8 +25,12 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     which
   ];
+  nativeCheckInputs = [
+    openssl
+  ];
 
   doCheck = true;
+  strictDeps = true;
 
   meta = {
     description = "Tool for buffering data streams with a large set of unique features";
diff --git a/pkgs/by-name/ms/msgraph-cli/package.nix b/pkgs/by-name/ms/msgraph-cli/package.nix
index e874a2706c7b..b2e3711a189e 100644
--- a/pkgs/by-name/ms/msgraph-cli/package.nix
+++ b/pkgs/by-name/ms/msgraph-cli/package.nix
@@ -7,12 +7,12 @@
 }:
 buildDotnetModule rec {
   pname = "msgraph-cli";
-  version = "v1.9.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "microsoftgraph";
     repo = "msgraph-cli";
-    rev = version;
+    tag = "v${version}";
     hash = "sha256-bpdxzVlQWQLNYTZHN25S6qa3NKHhDc+xV6NvzSNMVnQ=";
   };
 
diff --git a/pkgs/by-name/nc/ncps/package.nix b/pkgs/by-name/nc/ncps/package.nix
index b66c1d3ae1f2..be29560ce1a9 100644
--- a/pkgs/by-name/nc/ncps/package.nix
+++ b/pkgs/by-name/nc/ncps/package.nix
@@ -8,17 +8,17 @@
 let
   finalAttrs = {
     pname = "ncps";
-    version = "v0.1.1";
+    version = "0.1.1";
 
     src = fetchFromGitHub {
       owner = "kalbasit";
       repo = "ncps";
-      rev = finalAttrs.version;
+      tag = "v${finalAttrs.version}";
       hash = "sha256-Vr/thppCABdZDl1LEc7l7c7Ih55U/EFwJInWSUWoLJA";
     };
 
     ldflags = [
-      "-X github.com/kalbasit/ncps/cmd.Version=${finalAttrs.version}"
+      "-X github.com/kalbasit/ncps/cmd.Version=v${finalAttrs.version}"
     ];
 
     subPackages = [ "." ];
diff --git a/pkgs/by-name/nd/ndpi/package.nix b/pkgs/by-name/nd/ndpi/package.nix
index ffade02b5b4a..134487ef4e96 100644
--- a/pkgs/by-name/nd/ndpi/package.nix
+++ b/pkgs/by-name/nd/ndpi/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ndpi";
-  version = "4.10";
+  version = "4.12";
 
   src = fetchFromGitHub {
     owner = "ntop";
     repo = "nDPI";
     tag = finalAttrs.version;
-    hash = "sha256-iXqvDMJsOXcg9YkqKFgInLLfH6j/HEp4bEaIl6dpVtc=";
+    hash = "sha256-jdyKvM/Tb9pRWQPxpB/UQOOKamWrTS24Ofc3M5M1Zso=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pi/pineflash/package.nix b/pkgs/by-name/pi/pineflash/package.nix
index d5c422fb9000..b68594035764 100644
--- a/pkgs/by-name/pi/pineflash/package.nix
+++ b/pkgs/by-name/pi/pineflash/package.nix
@@ -15,6 +15,7 @@
   libGL,
   libxkbcommon,
   nix-update-script,
+  wayland,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "pineflash";
@@ -47,6 +48,7 @@ rustPlatform.buildRustPackage rec {
   runtimeDependencies = [
     libGL
     libxkbcommon
+    wayland
   ];
 
   postPatch =
diff --git a/pkgs/by-name/re/redict/package.nix b/pkgs/by-name/re/redict/package.nix
index 5cc3d0f42615..cbda55fa8b01 100644
--- a/pkgs/by-name/re/redict/package.nix
+++ b/pkgs/by-name/re/redict/package.nix
@@ -6,7 +6,6 @@
   lua,
   jemalloc,
   pkg-config,
-  nixosTests,
   tcl,
   which,
   ps,
@@ -104,8 +103,6 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postCheck
   '';
 
-  passthru.tests.redict = nixosTests.redict;
-
   meta = {
     homepage = "https://redict.io";
     description = "Distributed key/value store";
diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix
index 004dee8aa8d1..6f7f818984aa 100644
--- a/pkgs/by-name/sd/sdl3/package.nix
+++ b/pkgs/by-name/sd/sdl3/package.nix
@@ -51,6 +51,10 @@
   x11Support ? !stdenv.hostPlatform.isAndroid && !stdenv.hostPlatform.isWindows,
 }:
 
+assert lib.assertMsg (
+  waylandSupport -> openglSupport
+) "SDL3 requires OpenGL support to enable Wayland";
+
 stdenv.mkDerivation (finalAttrs: {
   pname = "sdl3";
   version = "3.2.2";
@@ -173,7 +177,8 @@ stdenv.mkDerivation (finalAttrs: {
     # Many dependencies are not directly linked to, but dlopen()'d at runtime. Adding them to the RPATH
     # helps them be found
     NIX_LDFLAGS =
-      lib.optionalString (stdenv.hostPlatform.extensions.sharedLibrary == ".so")
+      lib.optionalString
+        (stdenv.hostPlatform.hasSharedLibraries && stdenv.hostPlatform.extensions.sharedLibrary == ".so")
         "-rpath ${
           lib.makeLibraryPath (finalAttrs.dlopenBuildInputs ++ finalAttrs.dlopenPropagatedBuildInputs)
         }";
@@ -230,7 +235,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/libsdl-org/SDL/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.zlib;
     maintainers = with lib.maintainers; [ getchoo ];
-    platforms = lib.platforms.unix;
+    platforms = lib.platforms.unix ++ lib.platforms.windows;
     pkgConfigModules = [ "sdl3" ];
   };
 })
diff --git a/pkgs/by-name/te/termusic/package.nix b/pkgs/by-name/te/termusic/package.nix
index 1557d1d407c3..a2465c9c5516 100644
--- a/pkgs/by-name/te/termusic/package.nix
+++ b/pkgs/by-name/te/termusic/package.nix
@@ -41,9 +41,9 @@ rustPlatform.buildRustPackage rec {
   ];
 
   postPatch = ''
-    pushd $cargoDepsCopy/stream-download
+    pushd $cargoDepsCopy/stream-download-0.6.0
     oldHash=$(sha256sum src/lib.rs | cut -d " " -f 1)
-    substituteInPlace $cargoDepsCopy/stream-download/src/lib.rs \
+    substituteInPlace $cargoDepsCopy/stream-download-0.6.0/src/lib.rs \
       --replace-warn '#![doc = include_str!("../README.md")]' ""
     substituteInPlace .cargo-checksum.json \
       --replace-warn $oldHash $(sha256sum src/lib.rs | cut -d " " -f 1)
diff --git a/pkgs/by-name/th/thermald/package.nix b/pkgs/by-name/th/thermald/package.nix
index 590b813f6644..fbf1e7fdf9aa 100644
--- a/pkgs/by-name/th/thermald/package.nix
+++ b/pkgs/by-name/th/thermald/package.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation rec {
   pname = "thermald";
-  version = "2.5.8";
+  version = "2.5.9";
 
   outputs = [
     "out"
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     owner = "intel";
     repo = "thermal_daemon";
     rev = "v${version}";
-    sha256 = "sha256-aqNaXg+XznIgsMzORcRcwfTI5tBYmSGA2pma2oUu8K4=";
+    sha256 = "sha256-ydv6wZ3r2QxVji9bSx0sgpaOQNtgN+Y4rPZ44XtxNh8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ve/venta/package.nix b/pkgs/by-name/ve/venta/package.nix
index 733f0aacac59..49d628894f11 100644
--- a/pkgs/by-name/ve/venta/package.nix
+++ b/pkgs/by-name/ve/venta/package.nix
@@ -6,6 +6,7 @@
   gtk-engine-murrine,
   gtk_engines,
   librsvg,
+  marwaita,
 }:
 
 stdenv.mkDerivation rec {
@@ -35,6 +36,7 @@ stdenv.mkDerivation rec {
     runHook preInstall
     mkdir -p $out/share/themes
     cp -a Venta* $out/share/themes
+    ln -sfT ${marwaita}/share/themes/Marwaita/plank $out/share/themes/Venta/plank/plank
     runHook postInstall
   '';
 
diff --git a/pkgs/by-name/ve/ventoy/package.nix b/pkgs/by-name/ve/ventoy/package.nix
index 82b06dc9dd8b..97edd77d3a89 100644
--- a/pkgs/by-name/ve/ventoy/package.nix
+++ b/pkgs/by-name/ve/ventoy/package.nix
@@ -56,11 +56,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ventoy";
-  version = "1.1.00";
+  version = "1.1.01";
 
   src = fetchurl {
     url = "https://github.com/ventoy/Ventoy/releases/download/v${finalAttrs.version}/ventoy-${finalAttrs.version}-linux.tar.gz";
-    hash = "sha256-J6Krr/pTHGcwWRkJdUVdt6YVg/IhUo4G2h7jjR6lcC8=";
+    hash = "sha256-YR0/zet8EuhkWv4OsHD8yK4NvAVWJ3ExyPaV4t2PKvE=";
   };
 
   patches = [
diff --git a/pkgs/by-name/vm/vmctl/package.nix b/pkgs/by-name/vm/vmctl/package.nix
index 910ecd5f9d6d..fd6f7a145da6 100644
--- a/pkgs/by-name/vm/vmctl/package.nix
+++ b/pkgs/by-name/vm/vmctl/package.nix
@@ -16,7 +16,7 @@
 
 stdenvNoCC.mkDerivation {
   pname = "vmctl";
-  version = "v0.99-unstable-2024-05-14";
+  version = "0.99-unstable-2024-05-14";
 
   src = fetchFromGitHub {
     owner = "SamsungDS";
diff --git a/pkgs/by-name/xt/xtrlock-pam/package.nix b/pkgs/by-name/xt/xtrlock-pam/package.nix
deleted file mode 100644
index 0136fbc5c287..000000000000
--- a/pkgs/by-name/xt/xtrlock-pam/package.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  python39,
-  pkg-config,
-  pam,
-  xorg,
-}:
-
-stdenv.mkDerivation {
-  pname = "xtrlock-pam";
-  version = "3.4-post-20150909";
-
-  src = fetchFromGitHub {
-    owner = "aanatoly";
-    repo = "xtrlock-pam";
-    rev = "6f4920fcfff54791c0779057e9efacbbbbc05df6";
-    sha256 = "sha256-TFfs418fpjBrAJNGW8U3jE0K7jQkfL4vCquAViKkXPw=";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    python39
-    pam
-    xorg.libX11
-  ];
-
-  configurePhase = ''
-    substituteInPlace .config/options.py --replace /usr/include/security/pam_appl.h ${pam}/include/security/pam_appl.h
-    substituteInPlace src/xtrlock.c --replace system-local-login xscreensaver
-    python configure --prefix=$out
-  '';
-
-  meta = {
-    homepage = "https://github.com/aanatoly/xtrlock-pam";
-    description = "PAM based X11 screen locker";
-    license = "unknown";
-    maintainers = with lib.maintainers; [ ondt ];
-    platforms = with lib.platforms; linux;
-  };
-}
diff --git a/pkgs/by-name/xx/xxgdb/package.nix b/pkgs/by-name/xx/xxgdb/package.nix
index 3eac7f58c30e..1942e11a88e2 100644
--- a/pkgs/by-name/xx/xxgdb/package.nix
+++ b/pkgs/by-name/xx/xxgdb/package.nix
@@ -11,12 +11,12 @@
   libXt,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "xxgdb";
   version = "1.12";
 
   src = fetchurl {
-    url = "http://deb.debian.org/debian/pool/main/x/xxgdb/xxgdb_${version}.orig.tar.gz";
+    url = "http://deb.debian.org/debian/pool/main/x/xxgdb/xxgdb_${finalAttrs.version}.orig.tar.gz";
     sha256 = "0jwazg99wk2l7r390ggw0yr8xipl07bp0qynni141xss530i6d1a";
   };
 
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
     ./xxgdb-pty.patch
   ];
 
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration -Wno-error=implicit-int";
+
   nativeBuildInputs = [
     imake
     gccmakedep
@@ -62,4 +64,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ emilytrau ];
     platforms = platforms.all;
   };
-}
+})
diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix
index c4bd7f0880b4..1fd304b5069f 100644
--- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix
+++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix
@@ -142,9 +142,9 @@ super: lib.trivial.pipe super [
   }))
 
   (patchExtension "pano@elhan.io" (final: prev: {
-    version = "v23-alpha3";
+    version = "23-alpha3";
     src = fetchzip {
-      url = "https://github.com/oae/gnome-shell-pano/releases/download/${final.version}/pano@elhan.io.zip";
+      url = "https://github.com/oae/gnome-shell-pano/releases/download/v${final.version}/pano@elhan.io.zip";
       hash = "sha256-LYpxsl/PC8hwz0ZdH5cDdSZPRmkniBPUCqHQxB4KNhc=";
       stripRoot = false;
     };
diff --git a/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix
index f3688b33d9e3..4d27e18dd569 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix
@@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     tests.vm = nixosTests.lomiri-music-app;
-    updateScript = gitUpdater { };
+    updateScript = gitUpdater { rev-prefix = "v"; };
   };
 
   meta = {
diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index 50b61ea18306..0068a43b30b1 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -1220,10 +1220,16 @@ let
       // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "20") {
         libc-overlay = callPackage ./libc {
           isFullBuild = false;
+          # Use clang due to "gnu::naked" not working on aarch64.
+          # Issue: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77882
+          stdenv = overrideCC stdenv buildLlvmTools.clang;
         };
 
         libc-full = callPackage ./libc {
           isFullBuild = true;
+          # Use clang due to "gnu::naked" not working on aarch64.
+          # Issue: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77882
+          stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcNoRt;
         };
 
         libc = if stdenv.targetPlatform.libc == "llvm" then libraries.libc-full else libraries.libc-overlay;
diff --git a/pkgs/development/compilers/llvm/common/libc/default.nix b/pkgs/development/compilers/llvm/common/libc/default.nix
index 09fbeb5e7cc6..900c884c72b4 100644
--- a/pkgs/development/compilers/llvm/common/libc/default.nix
+++ b/pkgs/development/compilers/llvm/common/libc/default.nix
@@ -14,6 +14,7 @@
   ninja,
   isFullBuild ? true,
   linuxHeaders,
+  fetchpatch,
 }:
 let
   pname = "libc";
@@ -25,26 +26,28 @@ let
     cp -r ${monorepoSrc}/llvm "$out"
     cp -r ${monorepoSrc}/${pname} "$out"
   '');
-
-  stdenv' =
-    if stdenv.cc.isClang then
-      stdenv.override {
-        cc = stdenv.cc.override {
-          nixSupport = stdenv.cc.nixSupport // {
-            cc-cflags = lib.remove "-lunwind" (stdenv.cc.nixSupport.cc-cflags or [ ]);
-          };
-        };
-      }
-    else
-      stdenv;
 in
-stdenv'.mkDerivation (finalAttrs: {
-  inherit pname version patches;
+stdenv.mkDerivation (finalAttrs: {
+  inherit pname version;
 
   src = src';
 
   sourceRoot = "${finalAttrs.src.name}/runtimes";
 
+  patches =
+    lib.optional (lib.versions.major version == "20")
+      # Removes invalid token from the LLVM version being placed in the namespace.
+      # Can be removed when LLVM 20 bumps to rc2.
+      # PR: https://github.com/llvm/llvm-project/pull/126284
+      (
+        fetchpatch {
+          url = "https://github.com/llvm/llvm-project/commit/3a3a3230d171e11842a9940b6da0f72022b1c5b3.patch";
+          stripLen = 1;
+          hash = "sha256-QiU1cWp+027ZZNVdvfGVwbIoRd9jqtSbftGsmaW1gig=";
+        }
+      )
+    ++ patches;
+
   nativeBuildInputs =
     [
       cmake
diff --git a/pkgs/development/libraries/libcryptui/default.nix b/pkgs/development/libraries/libcryptui/default.nix
index ab3f1bff6b81..a019b9437ec8 100644
--- a/pkgs/development/libraries/libcryptui/default.nix
+++ b/pkgs/development/libraries/libcryptui/default.nix
@@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkg-config
+    dbus-glib # dbus-binding-tool
+    gtk3 # AM_GLIB_GNU_GETTEXT
     intltool
     autoreconfHook
   ];
@@ -44,6 +46,9 @@ stdenv.mkDerivation rec {
   ];
   propagatedBuildInputs = [ dbus-glib ];
 
+  env.GNUPG = lib.getExe gnupg;
+  env.GPGME_CONFIG = lib.getExe' (lib.getDev gpgme) "gpgme-config";
+
   enableParallelBuilding = true;
 
   passthru = {
@@ -59,5 +64,8 @@ stdenv.mkDerivation rec {
     homepage = "https://gitlab.gnome.org/GNOME/libcryptui";
     license = licenses.lgpl21Plus;
     platforms = platforms.unix;
+    # ImportError: lib/gobject-introspection/giscanner/_giscanner.cpython-312-x86_64-linux-gnu.so
+    # cannot open shared object file: No such file or directory
+    broken = stdenv.buildPlatform != stdenv.hostPlatform;
   };
 }
diff --git a/pkgs/development/ocaml-modules/httpun/lwt-unix.nix b/pkgs/development/ocaml-modules/httpun/lwt-unix.nix
new file mode 100644
index 000000000000..3e56ca768532
--- /dev/null
+++ b/pkgs/development/ocaml-modules/httpun/lwt-unix.nix
@@ -0,0 +1,20 @@
+{
+  buildDunePackage,
+  httpun-lwt,
+  gluten-lwt-unix,
+}:
+
+buildDunePackage {
+  pname = "httpun-lwt-unix";
+
+  inherit (httpun-lwt) version src;
+
+  propagatedBuildInputs = [
+    httpun-lwt
+    gluten-lwt-unix
+  ];
+
+  meta = httpun-lwt.meta // {
+    description = "Lwt + Unix support for httpun";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/httpun/lwt.nix b/pkgs/development/ocaml-modules/httpun/lwt.nix
new file mode 100644
index 000000000000..c4c671a8c4e6
--- /dev/null
+++ b/pkgs/development/ocaml-modules/httpun/lwt.nix
@@ -0,0 +1,24 @@
+{
+  buildDunePackage,
+  httpun,
+  lwt,
+  gluten,
+  gluten-lwt,
+}:
+
+buildDunePackage {
+  pname = "httpun-lwt";
+
+  inherit (httpun) version src;
+
+  propagatedBuildInputs = [
+    gluten
+    gluten-lwt
+    httpun
+    lwt
+  ];
+
+  meta = httpun.meta // {
+    description = "Lwt support for httpun";
+  };
+}
diff --git a/pkgs/development/php-packages/uuid/default.nix b/pkgs/development/php-packages/uuid/default.nix
index f3efc0e8792c..0d54c7d07f6f 100644
--- a/pkgs/development/php-packages/uuid/default.nix
+++ b/pkgs/development/php-packages/uuid/default.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "v1.2.1";
+  version = "1.2.1";
 in
 buildPecl {
   inherit version;
@@ -15,7 +15,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "php";
     repo = "pecl-networking-uuid";
-    tag = version;
+    tag = "v${version}";
     hash = "sha256-C4SoSKkCTQOLKM1h47vbBgiHTG+ChocDB9tzhWfKUsw=";
   };
 
@@ -26,7 +26,7 @@ buildPecl {
   env.PHP_UUID_DIR = libuuid;
 
   meta = {
-    changelog = "https://github.com/php/pecl-networking-uuid/releases/tag/${version}";
+    changelog = "https://github.com/php/pecl-networking-uuid/releases/tag/v${version}";
     description = "A wrapper around Universally Unique IDentifier library (libuuid).";
     license = lib.licenses.php301;
     homepage = "https://github.com/php/pecl-networking-uuid";
diff --git a/pkgs/development/python-modules/dom-toml/default.nix b/pkgs/development/python-modules/dom-toml/default.nix
index 99ff069ce49f..76ff28c51b6a 100644
--- a/pkgs/development/python-modules/dom-toml/default.nix
+++ b/pkgs/development/python-modules/dom-toml/default.nix
@@ -9,13 +9,13 @@
 }:
 buildPythonPackage rec {
   pname = "dom-toml";
-  version = "2.0.0";
+  version = "2.0.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "dom_toml";
-    hash = "sha256-PAfoQ2U4mUl0Ensa4DdmHRp3mskVxE/Qazq1/hQP9Yk=";
+    hash = "sha256-McWHRZXHd/QcwZHDTGbb6iFcgomnsUi0Jft6EMP0+8g=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/falconpy/default.nix b/pkgs/development/python-modules/falconpy/default.nix
index 3b44df20b090..161ec4a7730e 100644
--- a/pkgs/development/python-modules/falconpy/default.nix
+++ b/pkgs/development/python-modules/falconpy/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "falconpy";
-  version = "v1.4.6";
+  version = "1.4.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CrowdStrike";
     repo = "falconpy";
-    tag = version;
+    tag = "v${version}";
     hash = "sha256-boebQI//NenEqctQbEdxiXKU3/07C6jVzWVHecmJjPk=";
   };
 
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   meta = {
     description = "The CrowdStrike Falcon SDK for Python";
     homepage = "https://github.com/CrowdStrike/falconpy";
-    changelog = "https://github.com/CrowdStrike/falconpy/releases/tag/${version}";
+    changelog = "https://github.com/CrowdStrike/falconpy/releases/tag/v${version}";
     license = lib.licenses.unlicense;
     maintainers = with lib.maintainers; [ levigross ];
   };
diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix
index 30693abfd054..722f5b17a8f8 100644
--- a/pkgs/development/python-modules/h5netcdf/default.nix
+++ b/pkgs/development/python-modules/h5netcdf/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   h5py,
   pytestCheckHook,
   netcdf4,
@@ -12,22 +12,22 @@
 
 buildPythonPackage rec {
   pname = "h5netcdf";
-  version = "1.4.1";
-  format = "pyproject";
+  version = "1.5.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-fIQBq4B/83yXmO3JDZlGdZWJLmxUGl1avrj1OqtTNf4=";
+  src = fetchFromGitHub {
+    owner = "h5netcdf";
+    repo = "h5netcdf";
+    tag = "v${version}";
+    hash = "sha256-fhLL8/XgYQmdHckh5xhYvnlc+MTIc2wcTOZaohFFGlk=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
   ];
 
-  propagatedBuildInputs = [ h5py ];
+  dependencies = [ h5py ];
 
   nativeCheckInputs = [
     pytestCheckHook
@@ -39,9 +39,9 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "h5netcdf" ];
 
   meta = with lib; {
-    description = "netCDF4 via h5py";
+    description = "Pythonic interface to netCDF4 via h5py";
     homepage = "https://github.com/shoyer/h5netcdf";
-    changelog = "https://github.com/h5netcdf/h5netcdf/releases/tag/v${version}";
+    changelog = "https://github.com/h5netcdf/h5netcdf/releases/tag/${src.tag}";
     license = licenses.bsd3;
     maintainers = [ ];
   };
diff --git a/pkgs/development/python-modules/hid/default.nix b/pkgs/development/python-modules/hid/default.nix
index f8d0535409a5..59af2d501e9a 100644
--- a/pkgs/development/python-modules/hid/default.nix
+++ b/pkgs/development/python-modules/hid/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "hid";
-  version = "1.0.6";
+  version = "1.0.7";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-SNdk166XRroSO5bb9FeJPKgCaLd5HEsdLgUTEO64OGA=";
+    hash = "sha256-P4CeKSq1LEQ1rRRCyO8gW+TJyk7rgPtHx9mODHVSeyo=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/inform/default.nix b/pkgs/development/python-modules/inform/default.nix
index d69941e15a85..ba25c90f66db 100644
--- a/pkgs/development/python-modules/inform/default.nix
+++ b/pkgs/development/python-modules/inform/default.nix
@@ -9,6 +9,7 @@
   num2words,
   pytestCheckHook,
   pythonOlder,
+  pythonAtLeast,
 }:
 
 buildPythonPackage rec {
@@ -38,7 +39,12 @@ buildPythonPackage rec {
     hypothesis
   ];
 
-  disabledTests = [ "test_prostrate" ];
+  disabledTests =
+    [ "test_prostrate" ]
+    ++ lib.optionals (pythonAtLeast "3.13") [
+      # doctest runs one more test than expected
+      "test_inform"
+    ];
 
   meta = with lib; {
     description = "Print and logging utilities";
diff --git a/pkgs/development/python-modules/pytrends/default.nix b/pkgs/development/python-modules/pytrends/default.nix
deleted file mode 100644
index c9e20859086b..000000000000
--- a/pkgs/development/python-modules/pytrends/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  setuptools,
-  setuptools-scm,
-  wheel,
-  requests,
-  lxml,
-  pandas,
-  pytestCheckHook,
-  pytest-recording,
-  responses,
-}:
-
-buildPythonPackage rec {
-  pname = "pytrends";
-  version = "4.9.2";
-  format = "pyproject";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-aRxuNrGuqkdU82kr260N/0RuUo/7BS7uLn8TmqosaYk=";
-  };
-
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'addopts = "--cov pytrends/"' ""
-  '';
-
-  nativeBuildInputs = [
-    setuptools
-    setuptools-scm
-    wheel
-  ];
-
-  propagatedBuildInputs = [
-    requests
-    lxml
-    pandas
-  ];
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    pytest-recording
-    responses
-  ];
-
-  pytestFlagsArray = [ "--block-network" ];
-
-  pythonImportsCheck = [ "pytrends" ];
-
-  meta = with lib; {
-    description = "Pseudo API for Google Trends";
-    homepage = "https://github.com/GeneralMills/pytrends";
-    license = [ licenses.asl20 ];
-    maintainers = [ maintainers.mmahut ];
-  };
-}
diff --git a/pkgs/development/python-modules/soundfile/default.nix b/pkgs/development/python-modules/soundfile/default.nix
index 4d095f06c9cb..aec21950eed7 100644
--- a/pkgs/development/python-modules/soundfile/default.nix
+++ b/pkgs/development/python-modules/soundfile/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "soundfile";
-  version = "0.13.0";
+  version = "0.13.1";
   pyproject = true;
   # https://github.com/bastibe/python-soundfile/issues/157
   disabled = isPyPy || stdenv.hostPlatform.isi686;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-6DOZ2L3n1zsRfDPWoeyFcTGDOPic5y9MPUV+l2h5g1U=";
+    hash = "sha256-ssaNqx4wKXMXCApbQ99X4wJYTEnilC3v3eCszMU/Dls=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix
index dbe1c51b7b1c..f56769a9220b 100644
--- a/pkgs/development/tools/misc/gede/default.nix
+++ b/pkgs/development/tools/misc/gede/default.nix
@@ -13,12 +13,12 @@
 
 mkDerivation rec {
   pname = "gede";
-  version = "v2.22.1";
+  version = "2.22.1";
 
   src = fetchFromGitHub {
     owner = "jhn98032";
     repo = "gede";
-    rev = version;
+    tag = "v${version}";
     hash = "sha256-6YSrqLDuV4G/uvtYy4vzbwqrMFftMvZdp3kr3R436rs=";
   };
 
diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix
index d60d167e4d9f..a6f053467a5b 100644
--- a/pkgs/servers/nosql/influxdb/default.nix
+++ b/pkgs/servers/nosql/influxdb/default.nix
@@ -16,11 +16,11 @@ let
   # This is copied from influxdb2 with the required flux version
   flux = rustPlatform.buildRustPackage rec {
     pname = "libflux";
-    version = "v${libflux_version}";
+    version = libflux_version;
     src = fetchFromGitHub {
       owner = "influxdata";
       repo = "flux";
-      rev = "v${libflux_version}";
+      tag = "v${libflux_version}";
       hash = "sha256-XHT/+JMu5q1cPjZT2x/OKEPgxFJcnjrQKqn8w9/Mb3s=";
     };
     patches = [
diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix
index 7fcb072926f6..c90a77f4af36 100644
--- a/pkgs/servers/nosql/influxdb2/default.nix
+++ b/pkgs/servers/nosql/influxdb2/default.nix
@@ -32,7 +32,7 @@ let
 
   flux = rustPlatform.buildRustPackage {
     pname = "libflux";
-    version = "v${libflux_version}";
+    version = libflux_version;
     src = fetchFromGitHub {
       owner = "influxdata";
       repo = "flux";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8713bc7459b9..a21c8258c31c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1559,6 +1559,7 @@ mapAliases {
   xplayer = throw "xplayer has been removed as the upstream project was archived"; # Added 2024-12-27
   xprite-editor = throw "'xprite-editor' has been removed due to lack of maintenance upstream. Consider using 'pablodraw' or 'aseprite' instead"; # Added 2024-09-14
   xsv = throw "'xsv' has been removed due to lack of upstream maintenance. Please see 'xan' for a maintained alternative";
+  xtrlock-pam = throw "xtrlock-pam has been removed because it is unmaintained for 10 years and doesn't support Python 3.10 or newer"; # Added 2025-01-25
   xulrunner = firefox-unwrapped; # Added 2023-11-03
   xvfb_run = throw "'xvfb_run' has been renamed to/replaced by 'xvfb-run'"; # Converted to throw 2024-10-17
   xwaylandvideobridge = libsForQt5.xwaylandvideobridge; # Added 2024-09-27
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 4706d9fa0ecd..09bda1d9cebe 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -711,6 +711,10 @@ let
 
     httpun-eio = callPackage ../development/ocaml-modules/httpun/eio.nix { };
 
+    httpun-lwt = callPackage ../development/ocaml-modules/httpun/lwt.nix { };
+
+    httpun-lwt-unix = callPackage ../development/ocaml-modules/httpun/lwt-unix.nix { };
+
     httpun-types = callPackage ../development/ocaml-modules/httpun/types.nix { };
 
     httpun-ws = callPackage ../development/ocaml-modules/httpun-ws { };
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 434e1b6f3cd9..993cc160d172 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -508,6 +508,7 @@ mapAliases ({
   pynose = throw "pynose was removed, because it violates the license of nose, by redistributing modified LGPL code under MIT.";
   python-ethtool = ethtool; # added 2024-07-23
   python-myq = throw "python-myq has been removed, as the service provider has decided to block its API requests"; # added 2023-12-07
+  pytrends = throw "pytrends has been removed, as it no longer works and is abandoned upstream"; # added 2025-02-02
   pyqt4 = throw "pyqt4 has been removed, because it depended on the long EOL qt4"; # added 2022-06-09
   pyqt5_sip = pyqt5-sip; # added 2024-01-07
   pyqt5_with_qtmultimedia = pyqt5-multimedia; # added 2024-01-07
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e8cbf8d10baf..d744d8763e37 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13621,8 +13621,6 @@ self: super: with self; {
 
   pytransportnswv2 = callPackage ../development/python-modules/pytransportnswv2 { };
 
-  pytrends = callPackage ../development/python-modules/pytrends { };
-
   pytricia = callPackage ../development/python-modules/pytricia { };
 
   pytrydan = callPackage ../development/python-modules/pytrydan { };