diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fc575a99684a..08392e400e6e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -26162,6 +26162,12 @@
     githubId = 43136984;
     name = "Sven Ziegler";
   };
+  svistoi = {
+    email = "svistoi@zohomailcloud.ca";
+    github = "svistoi";
+    githubId = 47987757;
+    name = "svistoi";
+  };
   svrana = {
     email = "shaw@vranix.com";
     github = "svrana";
diff --git a/pkgs/by-name/au/autobrr/package.nix b/pkgs/by-name/au/autobrr/package.nix
index f1911921ec2c..77900e44ee78 100644
--- a/pkgs/by-name/au/autobrr/package.nix
+++ b/pkgs/by-name/au/autobrr/package.nix
@@ -15,12 +15,12 @@
 
 let
   pname = "autobrr";
-  version = "1.74.0";
+  version = "1.75.1";
   src = fetchFromGitHub {
     owner = "autobrr";
     repo = "autobrr";
     tag = "v${version}";
-    hash = "sha256-iIKEF3b5mLKPiyR/2CqQiZz1e3M8H7HjtC0GWNSsJu8=";
+    hash = "sha256-y1whIPx4s399WmO2xzjLFXPKhINE9b3+jHJcmsP+3ZA=";
   };
 
   autobrr-web = stdenvNoCC.mkDerivation {
diff --git a/pkgs/by-name/be/bee/package.nix b/pkgs/by-name/be/bee/package.nix
index bdecd2383538..ad055a9d2859 100644
--- a/pkgs/by-name/be/bee/package.nix
+++ b/pkgs/by-name/be/bee/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "bee";
-  version = "2.7.0";
+  version = "2.7.1";
 
   src = fetchFromGitHub {
     owner = "ethersphere";
     repo = "bee";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-SteqSo2mfb3Mr5Zn1fZauhQbQ8iE3VgoDfLVj/IDhvs=";
+    hash = "sha256-C9kaTaqpMbJmgr+pxHZ9RjBEnzm1ykQLCItI0uoebBI=";
   };
 
-  vendorHash = "sha256-6yX2WnWH2K7/2Ou82mw7/LJfu5MEZp/MN61Z2N5pgPc=";
+  vendorHash = "sha256-AtyC7I1sr+uNRi6fNoOJ7QVmCB16iXOZacYDQBauBI0=";
 
   subPackages = [ "cmd/bee" ];
 
diff --git a/pkgs/by-name/be/bento/package.nix b/pkgs/by-name/be/bento/package.nix
index ca6613546390..cabbc1ce2e05 100644
--- a/pkgs/by-name/be/bento/package.nix
+++ b/pkgs/by-name/be/bento/package.nix
@@ -8,17 +8,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "bento";
-  version = "1.15.2";
+  version = "1.16.1";
 
   src = fetchFromGitHub {
     owner = "warpstreamlabs";
     repo = "bento";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Y7uQoWuf96+y0VVmCFgONr7zMMJCpJR1lisAd8oYvnw=";
+    hash = "sha256-iAPl23vj578hFgdVROED+owdBI9gJx6cnatpVeUSJgM=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-vHDHH5yyAFqBF08drxqEUFWDXLcW3QZ01gk4SBikzTU=";
+  vendorHash = "sha256-k98FIhsG4MeBNkcUYxZayRJHlJmY3giyCK5Gj7FMN5s=";
 
   subPackages = [
     "cmd/bento"
diff --git a/pkgs/by-name/ca/cairo-lang/package.nix b/pkgs/by-name/ca/cairo-lang/package.nix
index 6e97cbc68ff6..ff4acf1e2755 100644
--- a/pkgs/by-name/ca/cairo-lang/package.nix
+++ b/pkgs/by-name/ca/cairo-lang/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cairo";
-  version = "2.11.2";
+  version = "2.16.1";
 
   src = fetchFromGitHub {
     owner = "starkware-libs";
     repo = "cairo";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-VOyqKeiPJ3/VOqcdQXC/rZnTriC2ScmAQ4IlouHjvpI=";
+    hash = "sha256-uWnFj2oMEQvzzpi1UDK7OQ/2bAm7zlEPHhJXV+gj6nU=";
   };
 
-  cargoHash = "sha256-e2Nire1TLcliq5KxoINJIZJdgohHRTXqIZPj1GNIe2A=";
+  cargoHash = "sha256-FrLjo+Zu8OvNZ69jjzqR1uK0hius7nwbwdlJJkkvTKI=";
 
   # openssl crate requires perl during build process
   nativeBuildInputs = [
diff --git a/pkgs/by-name/cl/cliamp/package.nix b/pkgs/by-name/cl/cliamp/package.nix
index 6c5257e0e203..4980ae13b897 100644
--- a/pkgs/by-name/cl/cliamp/package.nix
+++ b/pkgs/by-name/cl/cliamp/package.nix
@@ -16,13 +16,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "cliamp";
-  version = "1.25.0";
+  version = "1.27.8";
 
   src = fetchFromGitHub {
     owner = "bjarneo";
     repo = "cliamp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SE8uUdA3u+bm3A65J2nMyG+17NCaq5mQgji7eYUQKd8=";
+    hash = "sha256-htgNQTOiT4JwkpXy27tTColbVgvJA2qmm1giNbr3P7M=";
   };
 
   vendorHash = "sha256-UMDCpfSGfvJmI+sImaFzgZpLNaLMgEnmGCqERwPokHM=";
diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix
index 187634e4e3bb..24497e4e9b53 100644
--- a/pkgs/by-name/do/dotenvx/package.nix
+++ b/pkgs/by-name/do/dotenvx/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "dotenvx";
-  version = "1.57.2";
+  version = "1.57.4";
 
   src = fetchFromGitHub {
     owner = "dotenvx";
     repo = "dotenvx";
     tag = "v${version}";
-    hash = "sha256-OJYE1oK2AJV1zHh1eIx1pdH5N9PQN9n559B+qk2BcXo=";
+    hash = "sha256-IagswzHoChAHUJKrtN9UDLhp4ZJSwUf9bX0+JN/DCmA=";
   };
 
-  npmDepsHash = "sha256-sCwQ43CC9N9FLI7gHY3n80Tjg+lKKc0bqDcw7r2ZC10=";
+  npmDepsHash = "sha256-QrQck7HG0jWohZ8hPIdrfvAX7Wk4r4url6zAtbSriWA=";
 
   dontNpmBuild = true;
 
diff --git a/pkgs/by-name/do/dovecot-fts-flatcurve/package.nix b/pkgs/by-name/do/dovecot-fts-flatcurve/package.nix
index 7cceb60a6fc5..857bdea41bae 100644
--- a/pkgs/by-name/do/dovecot-fts-flatcurve/package.nix
+++ b/pkgs/by-name/do/dovecot-fts-flatcurve/package.nix
@@ -4,7 +4,8 @@
   fetchFromGitHub,
   autoreconfHook,
   pkg-config,
-  dovecot,
+  # only build for dovecot 2.3 as the package is part of dovecot since 2.4
+  dovecot_2_3,
   xapian,
 }:
 
@@ -29,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   configureFlags = [
-    "--with-dovecot=${dovecot}/lib/dovecot"
+    "--with-dovecot=${lib.getLib dovecot_2_3}/lib/dovecot"
     "--with-moduledir=${placeholder "out"}/lib/dovecot/modules"
   ];
 
diff --git a/pkgs/by-name/do/dovecot/2.4.nix b/pkgs/by-name/do/dovecot/2.4.nix
new file mode 100644
index 000000000000..388cb6101cc4
--- /dev/null
+++ b/pkgs/by-name/do/dovecot/2.4.nix
@@ -0,0 +1,8 @@
+import ./generic.nix {
+  version = "2.4.2";
+  hash = "sha256-uOW0gOernPRb+3fkupTISiQ34An0HEMFrdH0mjmFLKQ=";
+  patches = _: [
+    # Fix loading extended modules.
+    ./load-extended-modules.patch
+  ];
+}
diff --git a/pkgs/by-name/do/dovecot/generic.nix b/pkgs/by-name/do/dovecot/generic.nix
new file mode 100644
index 000000000000..6bdba0038bc6
--- /dev/null
+++ b/pkgs/by-name/do/dovecot/generic.nix
@@ -0,0 +1,234 @@
+{
+  version,
+  hash,
+  patches,
+}:
+{
+  stdenv,
+  lib,
+  fetchzip,
+  flex,
+  bison,
+  perl,
+  pkg-config,
+  systemd,
+  openssl,
+  bzip2,
+  lz4,
+  zlib,
+  zstd,
+  xz,
+  inotify-tools,
+  pam,
+  libcap,
+  coreutils,
+  clucene-core_2,
+  icu75,
+  libexttextcat,
+  libsodium,
+  libxcrypt,
+  libstemmer,
+  cyrus_sasl,
+  nixosTests,
+  fetchpatch,
+  rpcsvc-proto,
+  libtirpc,
+  dovecot_pigeonhole_0_5,
+  dovecot_pigeonhole ? dovecot_pigeonhole_0_5,
+  withApparmor ? false,
+  libapparmor,
+  withLDAP ? true,
+  openldap,
+  withPCRE2 ? lib.strings.versionAtLeast version "2.4",
+  pcre2,
+  withUnwind ? false,
+  libunwind,
+  # Auth modules
+  withMySQL ? false,
+  libmysqlclient,
+  withPgSQL ? false,
+  libpq,
+  withSQLite ? true,
+  sqlite,
+  withLua ? false,
+  lua5_3,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "dovecot";
+  inherit version;
+
+  nativeBuildInputs = [
+    flex
+    bison
+    perl
+    pkg-config
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ];
+
+  buildInputs = [
+    openssl
+    bzip2
+    lz4
+    zlib
+    zstd
+    xz
+    clucene-core_2
+    icu75
+    libexttextcat
+    libsodium
+    libxcrypt
+    libstemmer
+    cyrus_sasl.dev
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux) [
+    systemd
+    pam
+    libcap
+    inotify-tools
+  ]
+  ++ lib.optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isDarwin) libtirpc
+  ++ lib.optional withApparmor libapparmor
+  ++ lib.optional withLDAP openldap
+  ++ lib.optional withPCRE2 pcre2
+  ++ lib.optional withUnwind libunwind
+  ++ lib.optional withMySQL libmysqlclient
+  ++ lib.optional withPgSQL libpq
+  ++ lib.optional withSQLite sqlite
+  ++ lib.optional withLua lua5_3;
+
+  src = fetchzip {
+    url = "https://dovecot.org/releases/${lib.versions.majorMinor finalAttrs.version}/dovecot-${finalAttrs.version}.tar.gz";
+    inherit hash;
+  };
+
+  enableParallelBuilding = true;
+
+  env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv";
+
+  postConfigure = lib.optionalString (lib.strings.versionAtLeast version "2.4") ''
+    substituteInPlace src/lib-regex/Makefile --replace-fail \
+      "test_regex_DEPENDENCIES = libdregex.la \$(LIBPCRE_LIBS)" \
+      "test_regex_DEPENDENCIES = libdregex.la"
+  '';
+
+  postPatch = ''
+    sed -i -E \
+      -e 's!/bin/sh\b!${stdenv.shell}!g' \
+      -e 's!([^[:alnum:]/_-])/bin/([[:alnum:]]+)\b!\1${coreutils}/bin/\2!g' \
+      -e 's!([^[:alnum:]/_-])(head|sleep|cat)\b!\1${coreutils}/bin/\2!g' \
+      src/lib-program-client/test-program-client-local.c
+
+    patchShebangs src/lib-smtp/test-bin/*.sh
+    sed -i -s -E 's!\bcat\b!${coreutils}/bin/cat!g' src/lib-smtp/test-bin/*.sh
+
+    patchShebangs src/config/settings-get.pl
+  ''
+  + (
+    let
+      filePath =
+        if lib.strings.versionAtLeast version "2.4" then
+          "src/lib-auth/test-password-scheme.c"
+        else
+          "src/auth/test-libpassword.c";
+    in
+    ''
+      # DES-encrypted passwords are not supported by Nixpkgs anymore
+      sed '/test_password_scheme("CRYPT"/d' -i ${filePath}
+    ''
+  )
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    export systemdsystemunitdir=$out/etc/systemd/system
+  '';
+
+  preBuild = lib.optionalString (lib.strings.versionOlder version "2.4" && stdenv.isDarwin) ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -undefined dynamic_lookup"
+  '';
+
+  # We need this for sysconfdir, see remark below.
+  installFlags = [ "DESTDIR=$(out)" ];
+
+  postInstall = ''
+    cp -r $out/$out/* $out
+    rm -rf $out/$(echo "$out" | cut -d "/" -f2)
+  '';
+
+  patches =
+    (patches fetchpatch)
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # fix timespec calls
+      ./timespec.patch
+    ];
+
+  configureFlags = [
+    # It will hardcode this for /var/lib/dovecot.
+    # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626211
+    "--localstatedir=/var"
+    # We need this so utilities default to reading /etc/dovecot/dovecot.conf file.
+    "--sysconfdir=/etc"
+    "--with-moduledir=${placeholder "out"}/lib/dovecot/modules"
+    "--with-ssl=openssl"
+    "--with-zlib"
+    "--with-bzlib"
+    "--with-lz4"
+    "--with-lucene"
+    "--with-icu"
+    "--with-textcat"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "i_cv_epoll_works=${lib.boolToYesNo stdenv.hostPlatform.isLinux}"
+    "i_cv_posix_fallocate_works=${lib.boolToYesNo stdenv.hostPlatform.isDarwin}"
+    "i_cv_inotify_works=${lib.boolToYesNo stdenv.hostPlatform.isLinux}"
+    "i_cv_signed_size_t=no"
+    "i_cv_signed_time_t=yes"
+    "i_cv_c99_vsnprintf=yes"
+    "lib_cv_va_copy=yes"
+    "i_cv_mmap_plays_with_write=yes"
+    "i_cv_gmtime_max_time_t=${toString stdenv.hostPlatform.parsed.cpu.bits}"
+    "i_cv_signed_time_t=yes"
+    "i_cv_fd_passing=yes"
+    "lib_cv_va_copy=yes"
+    "lib_cv___va_copy=yes"
+    "lib_cv_va_val_copy=yes"
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux "--with-systemd"
+  ++ lib.optional stdenv.hostPlatform.isDarwin "--enable-static"
+  ++ lib.optional withLDAP "--with-ldap"
+  ++ lib.optional withPCRE2 "--with-pcre2"
+  ++ lib.optional withLua "--with-lua"
+  ++ lib.optional withMySQL "--with-mysql"
+  ++ lib.optional withPgSQL "--with-pgsql"
+  ++ lib.optional withSQLite "--with-sqlite";
+
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
+  strictDeps = true;
+
+  meta = {
+    homepage = "https://dovecot.org/";
+    description = "Open source IMAP and POP3 email server written with security primarily in mind";
+    license = with lib.licenses; [
+      mit
+      publicDomain
+      lgpl21Only
+      bsd3
+      bsdOriginal
+    ];
+    mainProgram = "dovecot";
+    maintainers = with lib.maintainers; [
+      das_j
+      fpletz
+      helsinki-Jo
+      jappie3
+      prince213
+    ];
+    platforms = lib.platforms.unix;
+  };
+  passthru = {
+    inherit dovecot_pigeonhole;
+    tests = {
+      opensmtpd-interaction = nixosTests.opensmtpd;
+      inherit (nixosTests) dovecot;
+    };
+  };
+})
diff --git a/pkgs/by-name/do/dovecot/package.nix b/pkgs/by-name/do/dovecot/package.nix
index de811df59304..3b8ad371034e 100644
--- a/pkgs/by-name/do/dovecot/package.nix
+++ b/pkgs/by-name/do/dovecot/package.nix
@@ -1,127 +1,7 @@
-{
-  stdenv,
-  lib,
-  fetchurl,
-  flex,
-  bison,
-  perl,
-  pkg-config,
-  systemd,
-  openssl,
-  bzip2,
-  lz4,
-  zlib,
-  zstd,
-  xz,
-  inotify-tools,
-  pam,
-  libcap,
-  coreutils,
-  clucene-core_2,
-  icu75,
-  libexttextcat,
-  libsodium,
-  libxcrypt,
-  libstemmer,
-  cyrus_sasl,
-  nixosTests,
-  fetchpatch,
-  rpcsvc-proto,
-  libtirpc,
-  withApparmor ? false,
-  libapparmor,
-  withLDAP ? true,
-  openldap,
-  withUnwind ? false,
-  libunwind,
-  # Auth modules
-  withMySQL ? false,
-  libmysqlclient,
-  withPgSQL ? false,
-  libpq,
-  withSQLite ? true,
-  sqlite,
-  withLua ? false,
-  lua5_3,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "dovecot";
+import ./generic.nix {
   version = "2.3.21.1";
-
-  nativeBuildInputs = [
-    flex
-    bison
-    perl
-    pkg-config
-  ]
-  ++ lib.optionals (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ];
-
-  buildInputs = [
-    openssl
-    bzip2
-    lz4
-    zlib
-    zstd
-    xz
-    clucene-core_2
-    icu75
-    libexttextcat
-    libsodium
-    libxcrypt
-    libstemmer
-    cyrus_sasl.dev
-  ]
-  ++ lib.optionals (stdenv.hostPlatform.isLinux) [
-    systemd
-    pam
-    libcap
-    inotify-tools
-  ]
-  ++ lib.optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isDarwin) libtirpc
-  ++ lib.optional withApparmor libapparmor
-  ++ lib.optional withLDAP openldap
-  ++ lib.optional withUnwind libunwind
-  ++ lib.optional withMySQL libmysqlclient
-  ++ lib.optional withPgSQL libpq
-  ++ lib.optional withSQLite sqlite
-  ++ lib.optional withLua lua5_3;
-
-  src = fetchurl {
-    url = "https://dovecot.org/releases/${lib.versions.majorMinor finalAttrs.version}/dovecot-${finalAttrs.version}.tar.gz";
-    hash = "sha256-LZCheMQpdhEIi/farlSSo7w9WrYyjDoDLrQl0sJJCX4=";
-  };
-
-  enableParallelBuilding = true;
-
-  postPatch = ''
-    sed -i -E \
-      -e 's!/bin/sh\b!${stdenv.shell}!g' \
-      -e 's!([^[:alnum:]/_-])/bin/([[:alnum:]]+)\b!\1${coreutils}/bin/\2!g' \
-      -e 's!([^[:alnum:]/_-])(head|sleep|cat)\b!\1${coreutils}/bin/\2!g' \
-      src/lib-program-client/test-program-client-local.c
-
-    patchShebangs src/lib-smtp/test-bin/*.sh
-    sed -i -s -E 's!\bcat\b!${coreutils}/bin/cat!g' src/lib-smtp/test-bin/*.sh
-
-    patchShebangs src/config/settings-get.pl
-
-    # DES-encrypted passwords are not supported by NixPkgs anymore
-    sed '/test_password_scheme("CRYPT"/d' -i src/auth/test-libpassword.c
-  ''
-  + lib.optionalString stdenv.hostPlatform.isLinux ''
-    export systemdsystemunitdir=$out/etc/systemd/system
-  '';
-
-  # We need this for sysconfdir, see remark below.
-  installFlags = [ "DESTDIR=$(out)" ];
-
-  postInstall = ''
-    cp -r $out/$out/* $out
-    rm -rf $out/$(echo "$out" | cut -d "/" -f2)
-  '';
-
-  patches = [
+  hash = "sha256-1THBB401r6AnZbnHGhIq+o+nR8v94O0mIX68Pv0miiE=";
+  patches = fetchpatch: [
     # Fix loading extended modules.
     ./load-extended-modules.patch
     # fix openssl 3.0 compatibility
@@ -129,81 +9,10 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://salsa.debian.org/debian/dovecot/-/raw/debian/1%252.3.19.1+dfsg1-2/debian/patches/Support-openssl-3.0.patch";
       hash = "sha256-PbBB1jIY3jIC8Js1NY93zkV0gISGUq7Nc67Ul5tN7sw=";
     })
-    # Fix build with gcc15
     (fetchpatch {
       name = "dovecot-test-data-stack-drop-bogus-assertion.patch";
       url = "https://github.com/dovecot/core/commit/9f642dd868db6e7401f24e4fb4031b5bdca8aae7.patch";
       hash = "sha256-dAX80dRqOba9Fkzl11ChYJ6vqcgfkaw/o+TOQKCnnns=";
     })
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    # fix timespec calls
-    ./timespec.patch
   ];
-
-  configureFlags = [
-    # It will hardcode this for /var/lib/dovecot.
-    # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626211
-    "--localstatedir=/var"
-    # We need this so utilities default to reading /etc/dovecot/dovecot.conf file.
-    "--sysconfdir=/etc"
-    "--with-moduledir=${placeholder "out"}/lib/dovecot/modules"
-    "--with-ssl=openssl"
-    "--with-zlib"
-    "--with-bzlib"
-    "--with-lz4"
-    "--with-lucene"
-    "--with-icu"
-    "--with-textcat"
-  ]
-  ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-    "i_cv_epoll_works=${lib.boolToYesNo stdenv.hostPlatform.isLinux}"
-    "i_cv_posix_fallocate_works=${lib.boolToYesNo stdenv.hostPlatform.isDarwin}"
-    "i_cv_inotify_works=${lib.boolToYesNo stdenv.hostPlatform.isLinux}"
-    "i_cv_signed_size_t=no"
-    "i_cv_signed_time_t=yes"
-    "i_cv_c99_vsnprintf=yes"
-    "lib_cv_va_copy=yes"
-    "i_cv_mmap_plays_with_write=yes"
-    "i_cv_gmtime_max_time_t=${toString stdenv.hostPlatform.parsed.cpu.bits}"
-    "i_cv_signed_time_t=yes"
-    "i_cv_fd_passing=yes"
-    "lib_cv_va_copy=yes"
-    "lib_cv___va_copy=yes"
-    "lib_cv_va_val_copy=yes"
-  ]
-  ++ lib.optional stdenv.hostPlatform.isLinux "--with-systemd"
-  ++ lib.optional stdenv.hostPlatform.isDarwin "--enable-static"
-  ++ lib.optional withLDAP "--with-ldap"
-  ++ lib.optional withLua "--with-lua"
-  ++ lib.optional withMySQL "--with-mysql"
-  ++ lib.optional withPgSQL "--with-pgsql"
-  ++ lib.optional withSQLite "--with-sqlite";
-
-  doCheck = !stdenv.hostPlatform.isDarwin;
-
-  strictDeps = true;
-
-  meta = {
-    homepage = "https://dovecot.org/";
-    description = "Open source IMAP and POP3 email server written with security primarily in mind";
-    license = with lib.licenses; [
-      mit
-      publicDomain
-      lgpl21Only
-      bsd3
-      bsdOriginal
-    ];
-    mainProgram = "dovecot";
-    maintainers = with lib.maintainers; [
-      das_j
-      fpletz
-      helsinki-Jo
-    ];
-    platforms = lib.platforms.unix;
-  };
-  passthru.tests = {
-    opensmtpd-interaction = nixosTests.opensmtpd;
-    inherit (nixosTests) dovecot;
-  };
-})
+}
diff --git a/pkgs/by-name/do/dovecot_pigeonhole/2.4.nix b/pkgs/by-name/do/dovecot_pigeonhole/2.4.nix
new file mode 100644
index 000000000000..5c33ad27e677
--- /dev/null
+++ b/pkgs/by-name/do/dovecot_pigeonhole/2.4.nix
@@ -0,0 +1,18 @@
+import ./generic.nix {
+  version = "2.4.2";
+  url =
+    {
+      version,
+      dovecotMajorMinor,
+    }:
+    "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-pigeonhole-${version}.tar.gz";
+  hash = "sha256-nXiBii9LGe6VkGKkUBpvlntuvkQbqhAOqeSwwJb/ghE=";
+  patches = fetchpatch: [
+    ./max_lookup_size.patch
+    # https://github.com/NixOS/nixpkgs/pull/388463#issuecomment-3066016707
+    (fetchpatch {
+      url = "https://github.com/dovecot/pigeonhole/commit/517d74aa1d98b853b72608ce722bc58009c0f4a9.patch";
+      hash = "sha256-BLBz9ZhOGEIIitnXG0uM6bZBRNnQBy4K2IJlh1+Un50=";
+    })
+  ];
+}
diff --git a/pkgs/by-name/do/dovecot_pigeonhole/generic.nix b/pkgs/by-name/do/dovecot_pigeonhole/generic.nix
new file mode 100644
index 000000000000..5ae28acac1ce
--- /dev/null
+++ b/pkgs/by-name/do/dovecot_pigeonhole/generic.nix
@@ -0,0 +1,89 @@
+{
+  version,
+  url,
+  hash,
+  patches ? _: [ ],
+}:
+{
+  lib,
+  stdenv,
+  fetchpatch,
+  fetchzip,
+  dovecot_2_3,
+  dovecot ? dovecot_2_3,
+  openssl,
+  libstemmer,
+  perl,
+  withLDAP ? true,
+  cyrus_sasl,
+  openldap,
+}:
+let
+  dovecotMajorMinor = lib.versions.majorMinor dovecot.version;
+  isCurrent = lib.strings.versionAtLeast version "2.4";
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "dovecot-pigeonhole";
+  inherit version;
+
+  src = fetchzip {
+    url = url {
+      inherit (finalAttrs) version;
+      inherit dovecotMajorMinor;
+    };
+    inherit hash;
+  };
+
+  patches = patches fetchpatch;
+
+  postPatch = lib.optionalString isCurrent ''
+    patchShebangs src/plugins/settings/settings-get.pl
+  '';
+
+  nativeBuildInputs = lib.optional isCurrent perl;
+
+  buildInputs = [
+    dovecot
+    openssl
+  ]
+  ++ lib.optional (isCurrent && stdenv.hostPlatform.isDarwin) libstemmer
+  ++ lib.optionals withLDAP [
+    cyrus_sasl
+    openldap
+  ];
+
+  preConfigure = ''
+    substituteInPlace src/managesieve/managesieve-settings.c --replace \
+      ".executable = \"managesieve\"" \
+      ".executable = \"$out/libexec/dovecot/managesieve\""
+    substituteInPlace src/managesieve-login/managesieve-login-settings.c --replace \
+      ".executable = \"managesieve-login\"" \
+      ".executable = \"$out/libexec/dovecot/managesieve-login\""
+  '';
+
+  configureFlags = [
+    "--with-dovecot=${dovecot}/lib/dovecot"
+    "--with-moduledir=${placeholder "out"}/lib/dovecot/modules"
+    "--without-dovecot-install-dirs"
+  ]
+  ++ lib.optional withLDAP "--with-ldap";
+
+  preBuild = lib.optionalString (lib.strings.versionOlder version "2.4" && stdenv.isDarwin) ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -undefined dynamic_lookup"
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = "https://pigeonhole.dovecot.org/";
+    description = "Sieve plugin for the Dovecot IMAP server";
+    license = lib.licenses.lgpl21Only;
+    maintainers = with lib.maintainers; [
+      das_j
+      helsinki-Jo
+      jappie3
+      prince213
+    ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/do/dovecot_pigeonhole/max_lookup_size.patch b/pkgs/by-name/do/dovecot_pigeonhole/max_lookup_size.patch
new file mode 100644
index 000000000000..e1168a8f400c
--- /dev/null
+++ b/pkgs/by-name/do/dovecot_pigeonhole/max_lookup_size.patch
@@ -0,0 +1,11 @@
+--- a/src/lib-sieve/plugins/extlists/ext-extlists-settings.h
++++ b/src/lib-sieve/plugins/extlists/ext-extlists-settings.h
+@@ -12,7 +12,7 @@
+ 
+ 	const char *name;
+ 	/* Maximum size of lookup value */
+-	size_t max_lookup_size;
++	uoff_t max_lookup_size;
+ 
+ 	struct {
+ 		const char *name;
diff --git a/pkgs/by-name/do/dovecot_pigeonhole/package.nix b/pkgs/by-name/do/dovecot_pigeonhole/package.nix
index 90d50c6d5d20..4de2e7419269 100644
--- a/pkgs/by-name/do/dovecot_pigeonhole/package.nix
+++ b/pkgs/by-name/do/dovecot_pigeonhole/package.nix
@@ -1,52 +1,10 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  dovecot,
-  openssl,
-}:
-let
-  dovecotMajorMinor = lib.versions.majorMinor dovecot.version;
-in
-stdenv.mkDerivation (finalAttrs: {
-  pname = "dovecot-pigeonhole";
+import ./generic.nix {
   version = "0.5.21.1";
-
-  src = fetchurl {
-    url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${finalAttrs.version}.tar.gz";
-    hash = "sha256-A3fbKEtiByPeBgQxEV+y53keHfQyFBGvcYIB1pJcRpI=";
-  };
-
-  buildInputs = [
-    dovecot
-    openssl
-  ];
-
-  preConfigure = ''
-    substituteInPlace src/managesieve/managesieve-settings.c --replace \
-      ".executable = \"managesieve\"" \
-      ".executable = \"$out/libexec/dovecot/managesieve\""
-    substituteInPlace src/managesieve-login/managesieve-login-settings.c --replace \
-      ".executable = \"managesieve-login\"" \
-      ".executable = \"$out/libexec/dovecot/managesieve-login\""
-  '';
-
-  configureFlags = [
-    "--with-dovecot=${dovecot}/lib/dovecot"
-    "--with-moduledir=${placeholder "out"}/lib/dovecot/modules"
-    "--without-dovecot-install-dirs"
-  ];
-
-  enableParallelBuilding = true;
-
-  meta = {
-    homepage = "https://pigeonhole.dovecot.org/";
-    description = "Sieve plugin for the Dovecot IMAP server";
-    license = lib.licenses.lgpl21Only;
-    maintainers = with lib.maintainers; [
-      das_j
-      helsinki-Jo
-    ];
-    platforms = lib.platforms.unix;
-  };
-})
+  url =
+    {
+      version,
+      dovecotMajorMinor,
+    }:
+    "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz";
+  hash = "sha256-andOWZmgWYIPATEk0V+mHmReL+quG81azwPkBMoo9OE=";
+}
diff --git a/pkgs/by-name/el/eliot-tree/package.nix b/pkgs/by-name/el/eliot-tree/package.nix
index ed8bbc2edc97..85ea33f3541a 100644
--- a/pkgs/by-name/el/eliot-tree/package.nix
+++ b/pkgs/by-name/el/eliot-tree/package.nix
@@ -1,27 +1,22 @@
 {
   lib,
   python3Packages,
-  fetchPypi,
+  fetchFromGitHub,
   addBinToPathHook,
 }:
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "eliot-tree";
-  version = "21.0.0";
+  version = "24.0.0";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit (finalAttrs) pname version;
-    hash = "sha256-hTl+r+QJPPQ7ss73lty3Wm7DLy2SKGmmgIuJx38ilO8=";
+  src = fetchFromGitHub {
+    owner = "jonathanj";
+    repo = "eliottree";
+    tag = finalAttrs.version;
+    hash = "sha256-4P6eAhX7XBuxu8r/7xvm07u4PZzKP3YLj/5kekgYXG8=";
   };
 
-  # Patch Python 3.12 incompatibilities in versioneer.py.
-  postPatch = ''
-    substituteInPlace versioneer.py \
-      --replace-fail SafeConfigParser ConfigParser \
-      --replace-fail readfp read_file
-  '';
-
   build-system = with python3Packages; [ setuptools ];
 
   dependencies = with python3Packages; [
@@ -29,6 +24,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     eliot
     iso8601
     jmespath
+    six
     toolz
   ];
 
diff --git a/pkgs/by-name/fa/fastcompmgr/package.nix b/pkgs/by-name/fa/fastcompmgr/package.nix
index 46a881d0e5e4..ec9e1850ede5 100644
--- a/pkgs/by-name/fa/fastcompmgr/package.nix
+++ b/pkgs/by-name/fa/fastcompmgr/package.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "fastcompmgr";
-  version = "0.5";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "tycho-kirchner";
     repo = "fastcompmgr";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yH/+E2IBe9KZxKTiP8oNcb9fJcZ0ukuenqTSv97ed44=";
+    hash = "sha256-0UEy6Aq007pwI+FRYA9RFjP0XAuBrX0jIbu3L7OcjMo=";
   };
 
   nativeBuildInputs = [ pkgs.pkg-config ];
diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix
index f90dc224d677..1735bd3751d4 100644
--- a/pkgs/by-name/fl/flyctl/package.nix
+++ b/pkgs/by-name/fl/flyctl/package.nix
@@ -12,7 +12,7 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.4.20";
+  version = "0.4.27";
 
   src = fetchFromGitHub {
     owner = "superfly";
@@ -22,11 +22,11 @@ buildGoModule rec {
       cd "$out"
       git rev-parse HEAD > COMMIT
     '';
-    hash = "sha256-tXumQuaIs3vIhZGIf9wClqH4j2sy3dFp+AgAMzTUfSE=";
+    hash = "sha256-C0MlKxkd3fftaBoVsmpnBP+tLw1dTCckKS0BrZGt8/c=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-6J4xoGBcJK828Yz5KlfvebS8KrQH+gs1UFPDbYKOS/M=";
+  vendorHash = "sha256-BqlLRnyr0m57lshGsjElK39JKYoJrIr281SevOUVhzI=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/by-name/fr/fresh-editor/package.nix b/pkgs/by-name/fr/fresh-editor/package.nix
index bc57ec3ce076..a547afc47e55 100644
--- a/pkgs/by-name/fr/fresh-editor/package.nix
+++ b/pkgs/by-name/fr/fresh-editor/package.nix
@@ -12,16 +12,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "fresh";
-  version = "0.2.14";
+  version = "0.2.18";
 
   src = fetchFromGitHub {
     owner = "sinelaw";
     repo = "fresh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Vaoa+jcxlHPQy0rn67Va5ZKAegw5dXSL9Kkx/uazir4=";
+    hash = "sha256-LSMbG6ROFJv5Mc9TQ4ocZUXjqVlK9mvK3EtxEgEXKyk=";
   };
 
-  cargoHash = "sha256-6eYu1XCZL/RBlntEu6Cvynp0PudgjIPvVJ8rdKxYRtw=";
+  cargoHash = "sha256-XMl/1IVtZ15ukmouk7Ktz9W4N1lBuXJA++VzOrr/F2U=";
 
   nativeBuildInputs = [
     gzip
diff --git a/pkgs/by-name/gh/ghgrab/package.nix b/pkgs/by-name/gh/ghgrab/package.nix
index 1d360bd32066..cbc2b6fc5b4f 100644
--- a/pkgs/by-name/gh/ghgrab/package.nix
+++ b/pkgs/by-name/gh/ghgrab/package.nix
@@ -8,16 +8,16 @@
 # note: upstream has a flake
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ghgrab";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "abhixdd";
     repo = "ghgrab";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-09+DI1/jKfcbPNB1rUyXtu642TuU7z9UBbQllg9uoQM=";
+    hash = "sha256-eXyLIrXsMV1p6xicKA5QNRPc4pkBdVM+fovOSaJT9/8=";
   };
 
-  cargoHash = "sha256-9o5AQxe/G5Yc6T/Ogtvq1N32t2eM8jAKt6CIvNBzX70=";
+  cargoHash = "sha256-mYOl2yI6D6c7Xs8ABFnRazyQZYQJCElXqvqQUET0zEc=";
 
   # fails on darwin
   # https://github.com/abhixdd/ghgrab/issues/31
diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix
index 5ee3ef200038..074855910f3c 100644
--- a/pkgs/by-name/im/immich/package.nix
+++ b/pkgs/by-name/im/immich/package.nix
@@ -115,13 +115,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "immich";
-  version = "2.6.2";
+  version = "2.6.3";
 
   src = fetchFromGitHub {
     owner = "immich-app";
     repo = "immich";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/Kd7VQqTzAr3wAo8cmCziNdeY+Hx4FDKWffbaLm8WTk=";
+    hash = "sha256-7N11eqKxrSO7+KRvwbYG7VaMrcDNru12DXJHe+G6gj8=";
   };
 
   pnpmDeps = fetchPnpmDeps {
diff --git a/pkgs/by-name/mo/mozillavpn/package.nix b/pkgs/by-name/mo/mozillavpn/package.nix
index ec5b51c2b344..87fc743b4513 100644
--- a/pkgs/by-name/mo/mozillavpn/package.nix
+++ b/pkgs/by-name/mo/mozillavpn/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mozillavpn";
-  version = "2.34.1";
+  version = "2.35.0";
   src = fetchFromGitHub {
     owner = "mozilla-mobile";
     repo = "mozilla-vpn-client";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-ot+yN5PzMS4BP4G0XMsG2ZYWTjEfZrQ6glcmoRUUzDY=";
+    hash = "sha256-H3Oa0SJR74dzZvg9u2drLmH/FNsc1hVUz2MEz/TV1rg=";
   };
   patches = [
   ];
diff --git a/pkgs/by-name/mu/museum/package.nix b/pkgs/by-name/mu/museum/package.nix
index aa4f5043f25e..c4d76774bdb4 100644
--- a/pkgs/by-name/mu/museum/package.nix
+++ b/pkgs/by-name/mu/museum/package.nix
@@ -10,7 +10,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "museum";
-  version = "1.3.22";
+  version = "1.3.24";
 
   src = fetchFromGitHub {
     owner = "ente-io";
diff --git a/pkgs/by-name/ob/obsidian/package.nix b/pkgs/by-name/ob/obsidian/package.nix
index f2daf5c85466..0255df853502 100644
--- a/pkgs/by-name/ob/obsidian/package.nix
+++ b/pkgs/by-name/ob/obsidian/package.nix
@@ -12,7 +12,7 @@
 }:
 let
   pname = "obsidian";
-  version = "1.12.4";
+  version = "1.12.7";
   appname = "Obsidian";
   meta = {
     description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files";
@@ -41,9 +41,9 @@ let
     url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
     hash =
       if stdenv.hostPlatform.isDarwin then
-        "sha256-etm0JSji5H6EG6jgcie4/QxANsfEJx+zZzHLpFBNu7o="
+        "sha256-O4XBO0zlVRLobhcKfNKklOLbaVrIiMBgHhU8uFt3iBs="
       else
-        "sha256-cusm388SP44HvoCD90+gRfQAxx7B/mTlirkdnMCEyN4=";
+        "sha256-/L4IsRHZwf2wm5wIlSsG4cgpxiFj66JYTEtOyFm+B50=";
   };
 
   icon = fetchurl {
diff --git a/pkgs/by-name/sc/scrutiny-collector/package.nix b/pkgs/by-name/sc/scrutiny-collector/package.nix
index 05eefcbd9861..ea38815a0d3d 100644
--- a/pkgs/by-name/sc/scrutiny-collector/package.nix
+++ b/pkgs/by-name/sc/scrutiny-collector/package.nix
@@ -8,7 +8,7 @@
   nix-update-script,
 }:
 let
-  version = "0.8.1";
+  version = "0.8.6";
 in
 buildGoModule rec {
   inherit version;
@@ -18,12 +18,12 @@ buildGoModule rec {
     owner = "AnalogJ";
     repo = "scrutiny";
     tag = "v${version}";
-    hash = "sha256-WoU5rdsIEhZQ+kPoXcestrGXC76rFPvhxa0msXjFsNg=";
+    hash = "sha256-0NgAdgtlsAetXfFqJdYpvzEXL4Ibh4yzAjOaOFoMvrs=";
   };
 
   subPackages = "collector/cmd/collector-metrics";
 
-  vendorHash = "sha256-SiQw6pq0Fyy8Ia39S/Vgp9Mlfog2drtVn43g+GXiQuI=";
+  vendorHash = "sha256-4qjKGjCvB0ggf6Cda7LfMeqbbBbhGcxB2ZfymUhajq8=";
 
   nativeBuildInputs = [ makeWrapper ];
 
@@ -49,7 +49,10 @@ buildGoModule rec {
     description = "Hard disk metrics collector for Scrutiny";
     homepage = "https://github.com/AnalogJ/scrutiny";
     license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [
+      samasaur
+      svistoi
+    ];
     mainProgram = "scrutiny-collector-metrics";
   };
 }
diff --git a/pkgs/by-name/sc/scrutiny/package.nix b/pkgs/by-name/sc/scrutiny/package.nix
index 8ddd1898dbcc..559dcc0284d1 100644
--- a/pkgs/by-name/sc/scrutiny/package.nix
+++ b/pkgs/by-name/sc/scrutiny/package.nix
@@ -8,13 +8,13 @@
 }:
 let
   pname = "scrutiny";
-  version = "0.8.1";
+  version = "0.8.6";
 
   src = fetchFromGitHub {
     owner = "AnalogJ";
     repo = "scrutiny";
     tag = "v${version}";
-    hash = "sha256-WoU5rdsIEhZQ+kPoXcestrGXC76rFPvhxa0msXjFsNg=";
+    hash = "sha256-0NgAdgtlsAetXfFqJdYpvzEXL4Ibh4yzAjOaOFoMvrs=";
   };
 
   frontend = buildNpmPackage {
@@ -22,7 +22,7 @@ let
     pname = "${pname}-webapp";
     src = "${src}/webapp/frontend";
 
-    npmDepsHash = "sha256-M8P41LPg7oJ/C9abDuNM5Mn+OO0zK56CKi2BwLxv8oQ=";
+    npmDepsHash = "sha256-EgIM3iu/dGQhzanWjjBFmLHU3EOy2riScXCDSwAvAZc=";
 
     buildPhase = ''
       runHook preBuild
@@ -46,7 +46,7 @@ buildGoModule rec {
 
   subPackages = "webapp/backend/cmd/scrutiny";
 
-  vendorHash = "sha256-SiQw6pq0Fyy8Ia39S/Vgp9Mlfog2drtVn43g+GXiQuI=";
+  vendorHash = "sha256-4qjKGjCvB0ggf6Cda7LfMeqbbBbhGcxB2ZfymUhajq8=";
 
   env.CGO_ENABLED = 0;
 
@@ -67,7 +67,10 @@ buildGoModule rec {
     homepage = "https://github.com/AnalogJ/scrutiny";
     changelog = "https://github.com/AnalogJ/scrutiny/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [
+      samasaur
+      svistoi
+    ];
     mainProgram = "scrutiny";
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix
index 352bf4872b0e..7f15172322a6 100644
--- a/pkgs/by-name/we/weblate/package.nix
+++ b/pkgs/by-name/we/weblate/package.nix
@@ -94,6 +94,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   pythonRelaxDeps = [
     "certifi"
     "crispy-bootstrap5"
+    "dateparser"
   ];
 
   dependencies =
diff --git a/pkgs/by-name/xp/xpipe/package.nix b/pkgs/by-name/xp/xpipe/package.nix
index 3c5d673b962c..b950e4e780cb 100644
--- a/pkgs/by-name/xp/xpipe/package.nix
+++ b/pkgs/by-name/xp/xpipe/package.nix
@@ -39,7 +39,7 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-ehuEEoU+RZpYXjvdcF3Mx9oF+Q4ltPxZn7fG24jRVHQ=";
+      x86_64-linux = "sha256-mHKQKGhqJ80JHWxixC7IbEHMsLMP7ETcGswOonwCo1U=";
     }
     .${system} or throwSystem;
 
@@ -48,7 +48,7 @@ let
 in
 stdenvNoCC.mkDerivation rec {
   pname = "xpipe";
-  version = "21.6";
+  version = "22.0";
 
   src = fetchzip {
     url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";
diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix
index 9261412cbca9..48f708494245 100644
--- a/pkgs/development/python-modules/dateparser/default.nix
+++ b/pkgs/development/python-modules/dateparser/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "dateparser";
-  version = "1.3.0";
+  version = "1.4.0";
 
   pyproject = true;
 
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "scrapinghub";
     repo = "dateparser";
     tag = "v${version}";
-    hash = "sha256-X15zNHlF34+8Lmo6Ia3HyKOdfgsu76KbcJUxzHax0EE=";
+    hash = "sha256-CmcQf0cGcZVmZfpLSYDGdZUj83T7enNRl9FTY1Q6vtk=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/etelemetry/default.nix b/pkgs/development/python-modules/etelemetry/default.nix
index a6fa4ebc6c22..0b116393fba7 100644
--- a/pkgs/development/python-modules/etelemetry/default.nix
+++ b/pkgs/development/python-modules/etelemetry/default.nix
@@ -9,7 +9,7 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "etelemetry";
   version = "0.3.1";
   pyproject = true;
@@ -17,12 +17,12 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "sensein";
     repo = "etelemetry-client";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-UaE5JQhv2AtzXKY7YD2/g6Kj1igKhmnY3zlf1P9B/iQ=";
   };
 
   postPatch = ''
-    substituteInPlace setup.py --replace-fail "versioneer.get_version()" "'${version}'"
+    substituteInPlace setup.py --replace-fail "versioneer.get_version()" "'${finalAttrs.version}'"
   '';
 
   build-system = [
@@ -43,11 +43,19 @@ buildPythonPackage rec {
     "etelemetry.config"
   ];
 
+  disabledTests = [
+    # RuntimeError: Connection to server could not be made
+    # due to external network access
+    "test_etrequest"
+    "test_get_project"
+    "test_check_available"
+  ];
+
   meta = {
     description = "Lightweight python client to communicate with the etelemetry server";
     homepage = "https://github.com/sensein/etelemetry-client";
-    changelog = "https://github.com/sensein/etelemetry-client/releases/tag/v${version}";
+    changelog = "https://github.com/sensein/etelemetry-client/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix
index e70aca7b515b..58e632a2d84f 100644
--- a/pkgs/development/python-modules/google-cloud-firestore/default.nix
+++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix
@@ -20,13 +20,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "google-cloud-firestore";
-  version = "2.23.0";
+  version = "2.26.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "google_cloud_firestore";
     inherit (finalAttrs) version;
-    hash = "sha256-qc/7p83GEBER1tVM3iLVIcmPnn1BXmdIaxN/oW8GqgM=";
+    hash = "sha256-ED/Cve3LgBoxWQ/vmg1QdU7mO4A5RvmvyQSBfIW9k10=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix
index 5c7494c57dc0..36251d2b81f7 100644
--- a/pkgs/development/python-modules/libtmux/default.nix
+++ b/pkgs/development/python-modules/libtmux/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "libtmux";
-  version = "0.53.1";
+  version = "0.55.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tmux-python";
     repo = "libtmux";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mI6oqZ4FiWG8Xe70XV3JAm4Ula1r8JnNKLSVbs2QrGw=";
+    hash = "sha256-34YwI0QjewDeigHYLiTdEi8PgleW1VCiaQSQvrSpf/s=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/nanoeigenpy/default.nix b/pkgs/development/python-modules/nanoeigenpy/default.nix
index 29bb740b4aaa..f5e4424dc825 100644
--- a/pkgs/development/python-modules/nanoeigenpy/default.nix
+++ b/pkgs/development/python-modules/nanoeigenpy/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "nanoeigenpy";
-  version = "0.4.0";
+  version = "0.5.0";
   pyproject = false; # Built with cmake
 
   src = fetchFromGitHub {
     owner = "Simple-Robotics";
     repo = "nanoeigenpy";
     tag = "v${version}";
-    hash = "sha256-2Lp3fYw3rQYxjkCQCeHI+N32Y4vTJ8l+PoKqLCmAXIU=";
+    hash = "sha256-FWNIZFzY7BXC3vQKsIUFIJr3dQ8V1+OOmt5mKQP9/3M=";
   };
 
   # Fix:
diff --git a/pkgs/development/python-modules/niworkflows/default.nix b/pkgs/development/python-modules/niworkflows/default.nix
index b53adb8324f8..ef715c969fb3 100644
--- a/pkgs/development/python-modules/niworkflows/default.nix
+++ b/pkgs/development/python-modules/niworkflows/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -27,6 +28,7 @@
   scipy,
   seaborn,
   svgutils,
+  sysctl,
   templateflow,
   traits,
   transforms3d,
@@ -89,6 +91,10 @@ buildPythonPackage (finalAttrs: {
     pytest-env
     pytestCheckHook
     writableTmpDirAsHomeHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Needed for tests that read the system memory usage on Darwin
+    sysctl
   ];
 
   enabledTestPaths = [ "niworkflows" ];
diff --git a/pkgs/development/python-modules/pyghmi/default.nix b/pkgs/development/python-modules/pyghmi/default.nix
index 59d73ca4200e..25ab8dff73f9 100644
--- a/pkgs/development/python-modules/pyghmi/default.nix
+++ b/pkgs/development/python-modules/pyghmi/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "pyghmi";
-  version = "1.6.13";
+  version = "1.6.14";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-qZiiWopegiLSB9042tHypGZ1zCVO1UAQp5/0bA3DaK0=";
+    hash = "sha256-p6Rb+ltGeGHZFDhzTqln1MmZVSJzvwDg+liBPtgbVNU=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pyhocon/default.nix b/pkgs/development/python-modules/pyhocon/default.nix
index f2e27980f8cb..ca2d74d070e8 100644
--- a/pkgs/development/python-modules/pyhocon/default.nix
+++ b/pkgs/development/python-modules/pyhocon/default.nix
@@ -2,25 +2,28 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   mock,
   pyparsing,
   pytestCheckHook,
   python-dateutil,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pyhocon";
-  version = "0.3.61";
-  format = "setuptools";
+  version = "0.3.63";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "chimpler";
     repo = "pyhocon";
-    tag = version;
-    hash = "sha256-xXx30uxJ8+KPVdYC6yRzEDJbwYSzIO/Gy1xrehvI5ZE=";
+    tag = finalAttrs.version;
+    hash = "sha256-uguNvXBaccAUdQx1zcpn/i3jSa5Y4uWTqkFr6rI4fBc=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     pyparsing
     python-dateutil
   ];
@@ -61,4 +64,4 @@ buildPythonPackage rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ chreekat ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/pyintelliclima/default.nix b/pkgs/development/python-modules/pyintelliclima/default.nix
new file mode 100644
index 000000000000..5a95e7d0dcc8
--- /dev/null
+++ b/pkgs/development/python-modules/pyintelliclima/default.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  aiohttp,
+  buildPythonPackage,
+  dacite,
+  fetchFromGitHub,
+  hatchling,
+  pytest-asyncio,
+  pytestCheckHook,
+  uv-dynamic-versioning,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "pyintelliclima";
+  version = "0.2.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "dvdinth";
+    repo = "pyintelliclima";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-gfOfEc39o4JAdvr6GI9ly5AuRV+sseCvWY/jNAh1A5M=";
+  };
+
+  pythonRelaxDeps = [ "dacite" ];
+
+  build-system = [
+    hatchling
+    uv-dynamic-versioning
+  ];
+
+  dependencies = [
+    aiohttp
+    dacite
+  ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "pyintelliclima" ];
+
+  meta = {
+    description = "Python module for a HTTP API to communicate with the IntelliClima device server";
+    homepage = "https://github.com/dvdinth/pyintelliclima";
+    changelog = "https://github.com/dvdinth/pyintelliclima/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/development/python-modules/pyspnego/default.nix b/pkgs/development/python-modules/pyspnego/default.nix
index ee9fb61ce9f1..83b48c6bc7d3 100644
--- a/pkgs/development/python-modules/pyspnego/default.nix
+++ b/pkgs/development/python-modules/pyspnego/default.nix
@@ -3,30 +3,30 @@
   buildPythonPackage,
   cryptography,
   fetchFromGitHub,
+  glibcLocales,
   gssapi,
   krb5,
-  ruamel-yaml,
   pytest-mock,
   pytestCheckHook,
+  ruamel-yaml,
   setuptools,
-  glibcLocales,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pyspnego";
-  version = "0.12.0";
+  version = "0.12.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jborean93";
     repo = "pyspnego";
-    tag = "v${version}";
-    hash = "sha256-dkss+8Z0dS4MTunBZWEH+WK1+kGikCHf7VPCR1reMS0=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-nO+WNpgPAunBSFbrCRb/W511z0nXUIK7XT/SisTk2+0=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ cryptography ];
+  dependencies = [ cryptography ];
 
   optional-dependencies = {
     kerberos = [
@@ -47,11 +47,11 @@ buildPythonPackage rec {
   env.LC_ALL = "en_US.UTF-8";
 
   meta = {
-    changelog = "https://github.com/jborean93/pyspnego/blob/${src.tag}/CHANGELOG.md";
     description = "Python SPNEGO authentication library";
-    mainProgram = "pyspnego-parse";
     homepage = "https://github.com/jborean93/pyspnego";
-    license = with lib.licenses; [ mit ];
+    changelog = "https://github.com/jborean93/pyspnego/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "pyspnego-parse";
   };
-}
+})
diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix
index 9587e84956d0..1ab91eaa020c 100644
--- a/pkgs/development/python-modules/qiskit/default.nix
+++ b/pkgs/development/python-modules/qiskit/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "qiskit";
-  version = "2.3.0";
+  version = "2.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Qiskit";
     repo = "qiskit";
     tag = version;
-    hash = "sha256-YGsBpNyM28fDG+mXs3hIA6K2kuE1getB8tTMLdHMa5k=";
+    hash = "sha256-7/7MjwA3XJ65Ylw0WljS8PQSwGJ6g8towTqn17qKBxw=";
   };
 
   nativeBuildInputs = [
@@ -54,7 +54,7 @@ buildPythonPackage rec {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src pname version;
-    hash = "sha256-Mpy5KkqSjlTtezZ2BQnai+PBG+8qLPmYj1AocdIhhvI=";
+    hash = "sha256-/h5eCaZzGlXeoBp8+VvCrXF1RySjAKRP/QZjuB23ivU=";
   };
 
   dependencies = [
diff --git a/pkgs/development/python-modules/staticmap3/default.nix b/pkgs/development/python-modules/staticmap3/default.nix
index 765b2ddc2d87..c4c95410b391 100644
--- a/pkgs/development/python-modules/staticmap3/default.nix
+++ b/pkgs/development/python-modules/staticmap3/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "staticmap3";
-  version = "0.1.0";
+  version = "0.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SamR1";
     repo = "staticmap";
     tag = "v${version}";
-    hash = "sha256-SMy4yxHA9Z3BFW6kX8vC7WfsmuZMNqocJ9+dJB6zwSs=";
+    hash = "sha256-SV9D8wYph82IaITXxraC+8YO+taeEc6g/CPjFITzV5Q=";
   };
 
   build-system = [
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index b95cca64c699..e4e5d20c3e42 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -125,6 +125,7 @@
   libsysprof-capture,
   imlib2,
   autoSignDarwinBinariesHook,
+  systemd,
 }@args:
 
 let
@@ -483,6 +484,11 @@ in
       glib
       libsysprof-capture
       pcre2
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      util-linux
+      libselinux
+      libsepol
     ];
   };
 
@@ -491,12 +497,13 @@ in
       binutils
       pkg-config
     ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
+    buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
       util-linux
       libselinux
       libsepol
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ];
+      systemd
+    ];
     propagatedBuildInputs = [
       atk
       gdk-pixbuf
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 42ff5594450c..f344e5595ed2 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2904,7 +2904,8 @@
       ];
     "intelliclima" =
       ps: with ps; [
-      ]; # missing inputs: pyintelliclima
+        pyintelliclima
+      ];
     "intellifire" =
       ps: with ps; [
         intellifire4py
@@ -7665,6 +7666,7 @@
     "input_text"
     "insteon"
     "integration"
+    "intelliclima"
     "intellifire"
     "intent"
     "intent_script"
diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix
index 1147744310a7..b0c7c39646ea 100644
--- a/pkgs/servers/home-assistant/tests.nix
+++ b/pkgs/servers/home-assistant/tests.nix
@@ -75,6 +75,7 @@ let
     hyperion = getComponentDeps "camera";
     ifttt = getComponentDeps "assist_pipeline" ++ getComponentDeps "camera";
     image_processing = getComponentDeps "conversation";
+    intelliclima = getComponentDeps "intellifire";
     intent = getComponentDeps "conversation";
     light = getComponentDeps "conversation";
     local_file = getComponentDeps "camera";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f1c2f437c098..c990f4a15dcd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8082,6 +8082,16 @@ with pkgs;
 
   dodgy = with python3Packages; toPythonApplication dodgy;
 
+  dovecot_2_3 = dovecot;
+  dovecot_2_4 = callPackage ../by-name/do/dovecot/2.4.nix {
+    dovecot_pigeonhole = dovecot_pigeonhole_2_4;
+  };
+
+  dovecot_pigeonhole_0_5 = dovecot_pigeonhole;
+  dovecot_pigeonhole_2_4 = callPackage ../by-name/do/dovecot_pigeonhole/2.4.nix {
+    dovecot = dovecot_2_4;
+  };
+
   inherit (callPackages ../servers/firebird { })
     firebird_4
     firebird_3
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 335e3a9bcffd..529079cf0934 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13960,6 +13960,8 @@ self: super: with self; {
 
   pyinstrument = callPackage ../development/python-modules/pyinstrument { };
 
+  pyintelliclima = callPackage ../development/python-modules/pyintelliclima { };
+
   pyinterp = callPackage ../development/python-modules/pyinterp { };
 
   pyintesishome = callPackage ../development/python-modules/pyintesishome { };