diff --git a/doc/languages-frameworks/coq.section.md b/doc/languages-frameworks/coq.section.md
index f758d89d3269..0eab34d044e4 100644
--- a/doc/languages-frameworks/coq.section.md
+++ b/doc/languages-frameworks/coq.section.md
@@ -10,6 +10,25 @@ The Coq derivation is overridable through the `coq.override overrides`, where ov
 
 The associated package set can be obtained using `mkCoqPackages coq`, where `coq` is the derivation to use.
 
+## Creating custom Coq environments with `coq.withPackages` {#coq-withPackages}
+
+The `coq.withPackages` function provides a convenient way to create a Coq environment that includes additional Coq packages. This is similar to how `python.withPackages` works for Python environments.
+
+The function takes a function that receives the Coq package set and returns a list of packages. It returns a wrapped Coq environment where all Coq binaries (`coqtop`, `coqc`, `coqdep`, `coqchk`, `coqide`, etc.) are configured with the appropriate environment variables to find the packages.
+
+### Usage {#coq-withPackages-usage}
+
+Here is an example of creating a Coq environment with specific packages.
+
+```nix
+coq.withPackages (
+  ps: with ps; [
+    mathcomp
+    bignums
+  ]
+)
+```
+
 ## Coq packages attribute sets: `coqPackages` {#coq-packages-attribute-sets-coqpackages}
 
 The recommended way of defining a derivation for a Coq library, is to use the `coqPackages.mkCoqDerivation` function, which is essentially a specialization of `mkDerivation` taking into account most of the specifics of Coq libraries. The following attributes are supported:
diff --git a/doc/redirects.json b/doc/redirects.json
index 8e072af31e4e..cbff4ea2f226 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -20,6 +20,12 @@
   "cmake-ctest-variables": [
     "index.html#cmake-ctest-variables"
   ],
+  "coq-withPackages": [
+    "index.html#coq-withPackages"
+  ],
+  "coq-withPackages-usage": [
+    "index.html#coq-withPackages-usage"
+  ],
   "cuda": [
     "index.html#cuda"
   ],
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index ed6aa31bd6f1..fe37f175fff7 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -181,17 +181,6 @@ with lib.maintainers;
     github = "cuda-maintainers";
   };
 
-  cyberus = {
-    # Verify additions by approval of an already existing member of the team.
-    members = [
-      xanderio
-      snu
-      e1mo
-    ];
-    scope = "Team for Cyberus Technology employees who collectively maintain packages.";
-    shortName = "Cyberus Technology employees";
-  };
-
   danklinux = {
     members = [
       luckshiba
diff --git a/nixos/modules/services/web-apps/dependency-track.nix b/nixos/modules/services/web-apps/dependency-track.nix
index b19e3064c363..3da1e866e5df 100644
--- a/nixos/modules/services/web-apps/dependency-track.nix
+++ b/nixos/modules/services/web-apps/dependency-track.nix
@@ -629,6 +629,9 @@ in
   };
 
   meta = {
-    maintainers = lib.teams.cyberus.members;
+    maintainers = with lib.maintainers; [
+      e1mo
+      xanderio
+    ];
   };
 }
diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix
index 8e9f6aace6ab..23510534a24d 100644
--- a/nixos/modules/services/web-apps/plausible.nix
+++ b/nixos/modules/services/web-apps/plausible.nix
@@ -330,6 +330,9 @@ in
     ];
   };
 
-  meta.maintainers = teams.cyberus.members;
+  meta.maintainers = with lib.maintainers; [
+    e1mo
+    xanderio
+  ];
   meta.doc = ./plausible.md;
 }
diff --git a/nixos/tests/dependency-track.nix b/nixos/tests/dependency-track.nix
index c0d56707ac3c..053b9d244a72 100644
--- a/nixos/tests/dependency-track.nix
+++ b/nixos/tests/dependency-track.nix
@@ -5,7 +5,10 @@ in
 {
   name = "dependency-track";
   meta = {
-    maintainers = pkgs.lib.teams.cyberus.members;
+    maintainers = with pkgs.lib.maintainers; [
+      e1mo
+      xanderio
+    ];
   };
 
   nodes = {
diff --git a/nixos/tests/outline.nix b/nixos/tests/outline.nix
index 1085db6bf5b7..15abc22270d4 100644
--- a/nixos/tests/outline.nix
+++ b/nixos/tests/outline.nix
@@ -2,7 +2,10 @@
 {
   name = "outline";
 
-  meta.maintainers = lib.teams.cyberus.members;
+  meta.maintainers = with lib.maintainers; [
+    e1mo
+    xanderio
+  ];
 
   node.pkgsReadOnly = false;
 
diff --git a/nixos/tests/plausible.nix b/nixos/tests/plausible.nix
index 5253b521c99e..b7da2eb4bbb9 100644
--- a/nixos/tests/plausible.nix
+++ b/nixos/tests/plausible.nix
@@ -2,7 +2,10 @@
 {
   name = "plausible";
   meta = {
-    maintainers = lib.teams.cyberus.members;
+    maintainers = with lib.maintainers; [
+      e1mo
+      xanderio
+    ];
   };
 
   nodes.machine =
diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index 137e29086a37..6961354854fe 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-code";
     publisher = "anthropic";
-    version = "2.1.7";
-    hash = "sha256-Bj9VNhwgM0nO3b/Iptb70hkO2TjKxbEpxdYGyzFt3iA=";
+    version = "2.1.9";
+    hash = "sha256-1zrXLaTilKY11FVBGnP4ezRT5LAefGH1UKwqz+E/sFY=";
   };
 
   postInstall = ''
diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/applications/misc/stag/default.nix
index 3443179133b0..f5507ba47824 100644
--- a/pkgs/applications/misc/stag/default.nix
+++ b/pkgs/applications/misc/stag/default.nix
@@ -30,6 +30,11 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
+  postPatch = ''
+    substituteInPlace Makefile --replace-fail \
+      ' -Werror ' ' '
+  '';
+
   buildInputs = [ curses ];
 
   installPhase = ''
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 37a0922b93de..4203627da60f 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1004,13 +1004,13 @@
     "vendorHash": "sha256-ucXmHK7jrahc78nE2cf5p5PPCSNV5DAQ53KM2SfJnjo="
   },
   "okta_okta": {
-    "hash": "sha256-844cF3pAIegwOBhCwLmEaKZCGjgPnJry1DduXNfL8mg=",
+    "hash": "sha256-tihXPwZUyR8vfYRxbmzwrpbcyDxBoW+Zq//rr6CzqRc=",
     "homepage": "https://registry.terraform.io/providers/okta/okta",
     "owner": "okta",
     "repo": "terraform-provider-okta",
-    "rev": "v6.5.3",
+    "rev": "v6.5.4",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-XW0D9lsSkLyVPZQW+LmXrDoAeeYw337fAmU6GEZcMt0="
+    "vendorHash": "sha256-V5eM87qIVpHofeM7uKEJREDPGSw7HIWja/JZOp5CnbA="
   },
   "oktadeveloper_oktaasa": {
     "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=",
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 590c2d6a2d12..1884ef85fe57 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -320,7 +320,7 @@ let
         Zimmi48
       ];
       platforms = lib.platforms.unix;
-      mainProgram = "coqide";
+      mainProgram = if buildIde then "coqide" else "coqtop";
     };
   };
 in
diff --git a/pkgs/applications/science/logic/coq/with-packages.nix b/pkgs/applications/science/logic/coq/with-packages.nix
new file mode 100644
index 000000000000..62a95c927f84
--- /dev/null
+++ b/pkgs/applications/science/logic/coq/with-packages.nix
@@ -0,0 +1,63 @@
+{
+  buildEnv,
+  coq,
+  lib,
+  makeBinaryWrapper,
+  runCommand,
+}:
+
+packages:
+
+let
+  # At version 9.0, Coq underwent a name change to Rocq.
+  # A couple paths and environment variables need to change at this point.
+  isRocq = lib.versionAtLeast coq.coq-version "9.0";
+
+  collectPropagated =
+    pkg:
+    [ pkg ]
+    ++ (pkg.propagatedBuildInputs or [ ])
+    ++ (lib.concatMap collectPropagated (pkg.propagatedBuildInputs or [ ]));
+
+  allPackages = lib.unique (lib.concatMap collectPropagated packages);
+
+  coqPath = lib.makeSearchPath "/lib/coq/${coq.coq-version}/user-contrib" allPackages;
+
+  ocamlPath = lib.makeSearchPath "/lib/ocaml/${coq.ocaml.version}/site-lib" (
+    [ coq.ocamlPackages.findlib ] ++ allPackages
+  );
+
+  pathEnvVar = if isRocq then "ROCQPATH" else "COQPATH";
+in
+
+buildEnv {
+  name = "${coq.pname}-with-packages-${coq.version}";
+
+  paths = [ coq ] ++ allPackages;
+
+  nativeBuildInputs = [ makeBinaryWrapper ];
+
+  postBuild = ''
+    mkdir -p $out/bin
+
+    # If coq is the only path that has a bin dir, buildEnv may decide to
+    # symlink $out/bin directly to that. So we do this step to make sure we get a
+    # writable bin dir
+    mv $out/bin $out/bin-orig
+
+    for binary in $out/bin-orig/*; do
+      if [ -f "$binary" ] && [ -x "$binary" ]; then
+        makeWrapper "$binary" "$out/bin/$(basename "$binary")" \
+          --prefix ${pathEnvVar} : "${coqPath}" \
+          --prefix OCAMLPATH : "${ocamlPath}"
+      fi
+    done
+  '';
+
+  passthru = coq.passthru // {
+    unwrapped = coq;
+    packages = allPackages;
+  };
+
+  meta = coq.meta;
+}
diff --git a/pkgs/applications/version-management/blackbox/default.nix b/pkgs/applications/version-management/blackbox/default.nix
deleted file mode 100644
index 2b9f3587afc4..000000000000
--- a/pkgs/applications/version-management/blackbox/default.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  expect,
-  which,
-  gnupg,
-  coreutils,
-  git,
-  pinentry,
-  gnutar,
-  procps,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "blackbox";
-  version = "1.20220610";
-
-  src = fetchFromGitHub {
-    owner = "stackexchange";
-    repo = "blackbox";
-    rev = "v${version}";
-    hash = "sha256-g0oNV7Nj7ZMmsVQFVTDwbKtF4a/Fb3WDB+NRx9IGSWA=";
-  };
-
-  buildInputs = [ gnupg ];
-
-  # https://github.com/NixOS/nixpkgs/issues/134445
-  doCheck = !stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
-
-  nativeCheckInputs = [
-    expect
-    which
-    coreutils
-    pinentry
-    git
-    gnutar
-    procps
-  ];
-
-  postPatch = ''
-    patchShebangs bin tools
-    substituteInPlace Makefile \
-      --replace "PREFIX?=/usr/local" "PREFIX=$out"
-
-    substituteInPlace tools/confidence_test.sh \
-      --replace 'PATH="''${blackbox_home}:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/local/bin:/usr/pkg/bin:/usr/pkg/gnu/bin:/usr/local/MacGPG2/bin:/opt/homebrew/bin:''${blackbox_home}"' \
-        "PATH=/build/source/bin/:$PATH"
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/bin
-    make copy-install
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "Safely store secrets in a VCS repo";
-    homepage = "https://github.com/StackExchange/blackbox";
-    maintainers = [ ];
-    license = lib.licenses.mit;
-    platforms = lib.platforms.all;
-  };
-}
diff --git a/pkgs/by-name/al/algia/package.nix b/pkgs/by-name/al/algia/package.nix
index 1b70f222850d..5db39455f8fd 100644
--- a/pkgs/by-name/al/algia/package.nix
+++ b/pkgs/by-name/al/algia/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "algia";
-  version = "0.0.98";
+  version = "0.0.99";
 
   src = fetchFromGitHub {
     owner = "mattn";
     repo = "algia";
     tag = "v${version}";
-    hash = "sha256-Xd0WhXvEPt1VLIdsswk91hTb2UK6ikqhKMR3l/D0/jk=";
+    hash = "sha256-HT1JFCbC9FWJmbKs5H//OrgYaQEiJxhpuJwEu55WFoU=";
   };
 
   vendorHash = "sha256-JTTWVs0KwceiLy6tpyd48zORiXLc18zwgG1c+ceivKU=";
diff --git a/pkgs/by-name/an/antibody/package.nix b/pkgs/by-name/an/antibody/package.nix
deleted file mode 100644
index ebb0047a3844..000000000000
--- a/pkgs/by-name/an/antibody/package.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  lib,
-  stdenv,
-  buildGoModule,
-  fetchFromGitHub,
-}:
-
-buildGoModule rec {
-  pname = "antibody";
-  version = "6.1.1";
-
-  src = fetchFromGitHub {
-    owner = "getantibody";
-    repo = "antibody";
-    tag = "v${version}";
-    hash = "sha256-If7XAwtg1WqkDkrJ6qYED+DjwHWloPu3P7X9rUd5ikU=";
-  };
-
-  vendorHash = "sha256-0m+yDo+AMX5tZfOsjsZgulyjB9mVEjy2RfA2sYeqDn0=";
-
-  doCheck = false;
-
-  ldflags = [
-    "-s"
-    "-w"
-    "-X main.version=${version}"
-  ];
-
-  meta = {
-    description = "Fastest shell plugin manager";
-    mainProgram = "antibody";
-    homepage = "https://github.com/getantibody/antibody";
-    license = lib.licenses.mit;
-
-    # golang.org/x/sys needs to be updated due to:
-    #
-    #   https://github.com/golang/go/issues/49219
-    #
-    # but this package is no longer maintained.
-    #
-    broken = stdenv.hostPlatform.isDarwin;
-  };
-}
diff --git a/pkgs/by-name/be/beszel/package.nix b/pkgs/by-name/be/beszel/package.nix
index 6403a68c4775..5d87c316e8fd 100644
--- a/pkgs/by-name/be/beszel/package.nix
+++ b/pkgs/by-name/be/beszel/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule rec {
   pname = "beszel";
-  version = "0.17.0";
+  version = "0.18.2";
 
   src = fetchFromGitHub {
     owner = "henrygd";
     repo = "beszel";
     tag = "v${version}";
-    hash = "sha256-MY/rsWdIiYsqcw6gqDkfA8A/Ied3OSHfJI3KUBxoRKc=";
+    hash = "sha256-7jXhlstGuQc3EP4fm5k9FD22nge0ecXVZAk8mXdyKc0=";
   };
 
   webui = buildNpmPackage {
@@ -48,10 +48,10 @@ buildGoModule rec {
 
     sourceRoot = "${src.name}/internal/site";
 
-    npmDepsHash = "sha256-1au4kSxyjdwFExIoUBSPf/At0jQsfbzlEXuigygBTRM=";
+    npmDepsHash = "sha256-Ks78fCJeHoLCImkyEHo1fSRJqIOEEvL6Zyydpy5LlTw=";
   };
 
-  vendorHash = "sha256-gfQU3jGwTGmMJIy9KTjk/Ncwpk886vMo4CJvm5Y5xpA=";
+  vendorHash = "sha256-OnCX/0DGtkcACuWxGfIreS6SSx9dKq+feWKSymtkABs=";
 
   preBuild = ''
     mkdir -p internal/site/dist
diff --git a/pkgs/by-name/ca/cadical/package.nix b/pkgs/by-name/ca/cadical/package.nix
index 8cca4752544c..f3269d749265 100644
--- a/pkgs/by-name/ca/cadical/package.nix
+++ b/pkgs/by-name/ca/cadical/package.nix
@@ -96,7 +96,10 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Simplified Satisfiability Solver";
-    maintainers = with lib.maintainers; [ shnarazk ];
+    maintainers = with lib.maintainers; [
+      shnarazk
+      chrjabs
+    ];
     platforms = lib.platforms.unix;
     license = lib.licenses.mit;
     homepage = "https://fmv.jku.at/cadical/";
diff --git a/pkgs/by-name/ca/cargo-deny/package.nix b/pkgs/by-name/ca/cargo-deny/package.nix
index dbfd245e1717..42e6dc5a34f9 100644
--- a/pkgs/by-name/ca/cargo-deny/package.nix
+++ b/pkgs/by-name/ca/cargo-deny/package.nix
@@ -46,6 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     maintainers = with lib.maintainers; [
       matthiasbeyer
       jk
+      chrjabs
     ];
   };
 })
diff --git a/pkgs/by-name/ca/cargo-llvm-cov/package.nix b/pkgs/by-name/ca/cargo-llvm-cov/package.nix
index 4de52a2360c3..bed69775d64d 100644
--- a/pkgs/by-name/ca/cargo-llvm-cov/package.nix
+++ b/pkgs/by-name/ca/cargo-llvm-cov/package.nix
@@ -91,6 +91,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       wucke13
       matthiasbeyer
       CobaltCause
+      chrjabs
     ];
 
     broken = stdenv.targetPlatform.isRedox;
diff --git a/pkgs/by-name/ca/cargo-machete/package.nix b/pkgs/by-name/ca/cargo-machete/package.nix
index 28fb82e53a4b..988c6847c4c0 100644
--- a/pkgs/by-name/ca/cargo-machete/package.nix
+++ b/pkgs/by-name/ca/cargo-machete/package.nix
@@ -28,6 +28,7 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       matthiasbeyer
+      chrjabs
     ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-nextest/package.nix b/pkgs/by-name/ca/cargo-nextest/package.nix
index aee461f46a1c..17fe3011d6bc 100644
--- a/pkgs/by-name/ca/cargo-nextest/package.nix
+++ b/pkgs/by-name/ca/cargo-nextest/package.nix
@@ -46,6 +46,7 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = with lib.maintainers; [
       matthiasbeyer
+      chrjabs
     ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-rdme/package.nix b/pkgs/by-name/ca/cargo-rdme/package.nix
index e823b3455f98..56bd4a781552 100644
--- a/pkgs/by-name/ca/cargo-rdme/package.nix
+++ b/pkgs/by-name/ca/cargo-rdme/package.nix
@@ -21,6 +21,9 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/orium/cargo-rdme";
     changelog = "https://github.com/orium/cargo-rdme/blob/v${version}/release-notes.md";
     license = with lib.licenses; [ mpl20 ];
-    maintainers = with lib.maintainers; [ GoldsteinE ];
+    maintainers = with lib.maintainers; [
+      GoldsteinE
+      chrjabs
+    ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-semver-checks/package.nix b/pkgs/by-name/ca/cargo-semver-checks/package.nix
index 9c5470d90d9f..0dc65b843a93 100644
--- a/pkgs/by-name/ca/cargo-semver-checks/package.nix
+++ b/pkgs/by-name/ca/cargo-semver-checks/package.nix
@@ -34,10 +34,8 @@ rustPlatform.buildRustPackage rec {
     # requires internet access
     "--skip=detects_target_dependencies"
     "--skip=query::tests_lints::feature_missing"
-    # platform specific snapshots
-    "--skip=query::tests_lints::trait_method_target_feature_removed"
-    "--skip=query::tests_lints::unsafe_trait_method_requires_more_target_features"
-    "--skip=query::tests_lints::unsafe_trait_method_target_feature_added"
+    # platform specific tests
+    "--skip=target_feature"
   ];
 
   preCheck = ''
@@ -69,6 +67,7 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = with lib.maintainers; [
       matthiasbeyer
+      chrjabs
     ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-show-asm/package.nix b/pkgs/by-name/ca/cargo-show-asm/package.nix
index 8bbf2e701578..28d29bffcba2 100644
--- a/pkgs/by-name/ca/cargo-show-asm/package.nix
+++ b/pkgs/by-name/ca/cargo-show-asm/package.nix
@@ -48,6 +48,7 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [
       oxalica
       matthiasbeyer
+      chrjabs
     ];
     mainProgram = "cargo-asm";
   };
diff --git a/pkgs/by-name/ca/cargo-spellcheck/package.nix b/pkgs/by-name/ca/cargo-spellcheck/package.nix
index 09a8fc9ae031..cf879d345e88 100644
--- a/pkgs/by-name/ca/cargo-spellcheck/package.nix
+++ b/pkgs/by-name/ca/cargo-spellcheck/package.nix
@@ -42,6 +42,7 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [
       newam
       matthiasbeyer
+      chrjabs
     ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-udeps/package.nix b/pkgs/by-name/ca/cargo-udeps/package.nix
index bcfb58c99d53..0dbf4665f667 100644
--- a/pkgs/by-name/ca/cargo-udeps/package.nix
+++ b/pkgs/by-name/ca/cargo-udeps/package.nix
@@ -41,6 +41,7 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [
       b4dm4n
       matthiasbeyer
+      chrjabs
     ];
     mainProgram = "cargo-udeps";
   };
diff --git a/pkgs/by-name/ca/cargo-valgrind/package.nix b/pkgs/by-name/ca/cargo-valgrind/package.nix
index 995bbe5fcffa..7d99d1afc462 100644
--- a/pkgs/by-name/ca/cargo-valgrind/package.nix
+++ b/pkgs/by-name/ca/cargo-valgrind/package.nix
@@ -49,6 +49,7 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [
       otavio
       matthiasbeyer
+      chrjabs
     ];
   };
 }
diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index e681227b1d7e..5317603933df 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@anthropic-ai/claude-code",
-  "version": "2.1.7",
+  "version": "2.1.9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@anthropic-ai/claude-code",
-      "version": "2.1.7",
+      "version": "2.1.9",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 074e7b75e78a..6f8272aab60f 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -15,14 +15,14 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "claude-code";
-  version = "2.1.7";
+  version = "2.1.9";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-s/XPemwJYPUNFBgWo00VQ6W6eFIy44y9lFoRN0Duk9I=";
+    hash = "sha256-TU+54QVtcFaUErv8YB0NxmgP+0eUqa2JEjAVRHKPICs=";
   };
 
-  npmDepsHash = "sha256-BW3mW3fRXrv+TgW3q+Rc43o0q3t1ra/XUqlUSiA0hTU=";
+  npmDepsHash = "sha256-yZ5hFIqdKh6VYPGtdIaUq7CW9mnCyeFflr02laU8K0A=";
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix
index 59097f80307d..ac86d39e181c 100644
--- a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix
+++ b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix
@@ -7,16 +7,16 @@
 }:
 buildGoModule rec {
   pname = "cloudflare-dynamic-dns";
-  version = "4.3.17";
+  version = "4.4.1";
 
   src = fetchFromGitHub {
     owner = "zebradil";
     repo = "cloudflare-dynamic-dns";
     tag = version;
-    hash = "sha256-3almGQI4mS2JYJG3WrnCSm7ZgTwcSCOL9njau6peido=";
+    hash = "sha256-G3msehvCZPm5WZTVCN0NnVEApZBQtqxJKCt0SFWb6xk=";
   };
 
-  vendorHash = "sha256-dag6xFkf6F7lkgadsXmbMyZJ6KI0qvx9M1hF3cfyhZo=";
+  vendorHash = "sha256-Zdr6XTcblCi+YGhAgo0VqyN25jTGC5yA6YpQJXBCPGc=";
 
   subPackages = ".";
 
diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix
index 676ebd24e259..bb4756167fe9 100644
--- a/pkgs/by-name/cn/cnspec/package.nix
+++ b/pkgs/by-name/cn/cnspec/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnspec";
-  version = "12.17.0";
+  version = "12.18.0";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnspec";
     tag = "v${version}";
-    hash = "sha256-tuFdhaFp2gpMm8RzOs502TVy89btlpqklSW2OweREOA=";
+    hash = "sha256-U3nCL87fdlLkZLnRmJizGyQVGc7xCja2+hRLFGWkSUk=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-Q09fQoBrTMbnT0Edvue7/8hwAZQQdAJBjQ+9V/HFvY4=";
+  vendorHash = "sha256-HwlJq48wC/c8VeUQFSH/bBVZiSq2fH9E/JXfaHjSYIM=";
 
   subPackages = [ "apps/cnspec" ];
 
diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix
index 814c15dbbe35..c972582b243c 100644
--- a/pkgs/by-name/co/codex/package.nix
+++ b/pkgs/by-name/co/codex/package.nix
@@ -14,18 +14,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "codex";
-  version = "0.84.0";
+  version = "0.86.0";
 
   src = fetchFromGitHub {
     owner = "openai";
     repo = "codex";
     tag = "rust-v${finalAttrs.version}";
-    hash = "sha256-vaIloTD994jbGSEiU1NbVpIiWZCV/Rj0NjOvbD7smgU=";
+    hash = "sha256-sypqDp67nMnxSmdUs2W8TCmfe2Ye9jO3vXLOpNeqjlI=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/codex-rs";
 
-  cargoHash = "sha256-wCLngmqsIPT1ZEipP+cwBysCGaoZNpfIA0gfxcHNmBo=";
+  cargoHash = "sha256-Ryr5mFc+StT1d+jBtRsrOzMtyEJf7W1HbMbnC84ps4s=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix
index 37d6a1241ae7..351399c2e889 100644
--- a/pkgs/by-name/co/copilot-language-server/package.nix
+++ b/pkgs/by-name/co/copilot-language-server/package.nix
@@ -10,11 +10,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "copilot-language-server";
-  version = "1.408.0";
+  version = "1.410.0";
 
   src = fetchzip {
     url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip";
-    hash = "sha256-sO6ea8SV3/7V0wgotEp7eLs5BUjQlFxBgOdWF1aoHuY=";
+    hash = "sha256-pReUH/0PZ8q2z+rQScl/fcL1HIFnjH244hr6PjhX6JY=";
     stripRoot = false;
   };
 
diff --git a/pkgs/by-name/de/dependency-track/package.nix b/pkgs/by-name/de/dependency-track/package.nix
index d9613f18ee6b..300b45e0cfb0 100644
--- a/pkgs/by-name/de/dependency-track/package.nix
+++ b/pkgs/by-name/de/dependency-track/package.nix
@@ -120,7 +120,10 @@ maven.buildMavenPackage rec {
     description = "Intelligent Component Analysis platform that allows organizations to identify and reduce risk in the software supply chain";
     homepage = "https://github.com/DependencyTrack/dependency-track";
     license = lib.licenses.asl20;
-    teams = [ lib.teams.cyberus ];
+    maintainers = with lib.maintainers; [
+      e1mo
+      xanderio
+    ];
     mainProgram = "dependency-track";
     inherit (jre_headless.meta) platforms;
   };
diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
index e4b777e34ead..5c2cee48db3b 100644
--- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
+++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
@@ -2,6 +2,6 @@
   "version" = "1.12.7";
   "hashes" = {
     "desktopSrcHash" = "sha256-VnZyNrylYbKhd9YyuoUSJWbTEphOsTivbbYIUeEZv2U=";
-    "desktopYarnHash" = "sha256-SAIoJRX06oE4j2Gjb/0MSiUa0UGYkQmuyuV90VRbFtk=";
+    "desktopYarnHash" = "sha256-Gnd/ouRI/OxFwsvR5arfi/FcGld3XjtW9tzuwyX8IRg=";
   };
 }
diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix
index 28b3c267ba46..cd992a4489b1 100644
--- a/pkgs/by-name/el/element-desktop/package.nix
+++ b/pkgs/by-name/el/element-desktop/package.nix
@@ -4,24 +4,27 @@
   fetchFromGitHub,
   makeWrapper,
   makeDesktopItem,
-  yarn,
   nodejs,
-  jq,
-  electron_38,
+  electron_39,
   element-web,
   sqlcipher,
   callPackage,
-  desktopToDarwinBundle,
   typescript,
   # command line arguments which are always set
   commandLineArgs ? "",
+  yarnConfigHook,
+  yarnBuildHook,
+  fetchYarnDeps,
+  asar,
+  copyDesktopItems,
+  darwin,
 }:
 
 let
   pinData = import ./element-desktop-pin.nix;
   inherit (pinData.hashes) desktopSrcHash desktopYarnHash;
   executableName = "element-desktop";
-  electron = electron_38;
+  electron = electron_39;
   seshat = callPackage ./seshat { };
 in
 stdenv.mkDerivation (
@@ -37,24 +40,25 @@ stdenv.mkDerivation (
       hash = desktopSrcHash;
     };
 
-    # TODO: fetchYarnDeps currently does not deal properly with a dependency
-    # declared as a pin to a commit in a specific git repository.
-    # While it does download everything correctly, `yarn install --offline`
-    # always wants to `git ls-remote` to the repository, ignoring the local
-    # cached tarball.
-    offlineCache = callPackage ./yarn.nix {
-      inherit (finalAttrs) version src;
+    offlineCache = fetchYarnDeps {
+      yarnLock = finalAttrs.src + "/yarn.lock";
       hash = desktopYarnHash;
     };
 
+    env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+
     nativeBuildInputs = [
+      asar
+      copyDesktopItems
       nodejs
       makeWrapper
-      jq
-      yarn
       typescript
+      yarnConfigHook
+      yarnBuildHook
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      darwin.autoSignDarwinBinariesHook
+    ];
 
     inherit seshat;
 
@@ -63,90 +67,101 @@ stdenv.mkDerivation (
     # this shouldn't be in the closure just for unused scripts.
     dontPatchShebangs = true;
 
-    configurePhase = ''
-      runHook preConfigure
+    postPatch = ''
+      cp -r ${electron.dist} electron-dist
+      chmod -R u+w electron-dist
 
-      mkdir -p node_modules/
-      cp -r $offlineCache/node_modules/* node_modules/
-      substituteInPlace package.json --replace-fail "tsx " "node node_modules/tsx/dist/cli.mjs "
+      substituteInPlace package.json \
+        --replace-fail \
+        ' electron-builder",' \
+        ' electron-builder --dir -c.electronDist=electron-dist -c.electronVersion=${electron.version} -c.mac.identity=null",'
 
-      runHook postConfigure
+      # `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead
+      substituteInPlace ./electron-builder.ts \
+        --replace-fail "resetAdHocDarwinSignature:" "// resetAdHocDarwinSignature:"
+
+      # Need to disable asar integrity check to copy in native seshat files, see postBuild phase
+      substituteInPlace ./electron-builder.ts \
+        --replace-fail "enableEmbeddedAsarIntegrityValidation: true" "enableEmbeddedAsarIntegrityValidation: false"
     '';
 
-    # Workaround for darwin sandbox build failure: "Error: listen EPERM: operation not permitted ..tsx..."
-    preBuild = lib.optionalString stdenv.hostPlatform.isDarwin ''
-      export TMPDIR="$(mktemp -d)"
+    preBuild = ''
+      # Apply upstream patch
+      # Can be removed if upstream removes patches/@types+auto-launch+5.0.5.patch introduced in
+      # https://github.com/element-hq/element-desktop/commit/5e882f8e08d58bf9663c8e3ab33885bf7b3709de
+      node ./node_modules/patch-package/index.js
     '';
 
-    buildPhase = ''
-      runHook preBuild
+    postBuild = ''
+      # relative path to app.asar differs on Linux and MacOS
+      packed=$(find ./dist -name app.asar)
+      asar extract "$packed" tmp-app
 
-      yarn --offline run build:ts
-      node node_modules/matrix-web-i18n/scripts/gen-i18n.js
-      yarn --offline run i18n:sort
-      yarn --offline run build:res
+      # linking here leads to Error: tmp-app/node_modules/matrix-seshat: file ... links out of the package
+      cp -r $seshat tmp-app/node_modules/matrix-seshat
 
-      ln -s $seshat node_modules/matrix-seshat
-
-      runHook postBuild
+      asar pack tmp-app "$packed"
     '';
 
     installPhase = ''
       runHook preInstall
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      mkdir -p "$out/Applications" "$out/bin"
+      mv dist/mac*/Element.app "$out/Applications"
+
+      ln -s '${element-web}' "$out/Applications/Element.app/Contents/Resources/webapp"
+
+      wrapProgram "$out/Applications/Element.app/Contents/MacOS/Element" \
+        --add-flags ${lib.escapeShellArg commandLineArgs}
+
+      makeWrapper "$out/Applications/Element.app/Contents/MacOS/Element" "$out/bin/${executableName}"
+    ''
+    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+      mkdir -p "$out/bin" "$out/share"
+
+      cp -a dist/*-unpacked/resources $out/share/element
 
-      # resources
-      mkdir -p "$out/share/element"
       ln -s '${element-web}' "$out/share/element/webapp"
-      cp -r '.' "$out/share/element/electron"
-      chmod -R "a+w" "$out/share/element/electron/node_modules"
-      rm -rf "$out/share/element/electron/node_modules"
-      cp -r './node_modules' "$out/share/element/electron"
-      cp $out/share/element/electron/lib/i18n/strings/en_EN.json $out/share/element/electron/lib/i18n/strings/en-us.json
-      ln -s $out/share/element/electron/lib/i18n/strings/en{-us,}.json
 
-      # icon
+      # icon, used in makeDesktopItem
       mkdir -p "$out/share/icons/hicolor/512x512/apps"
-      ln -s "$out/share/element/electron/build/icon.png" "$out/share/icons/hicolor/512x512/apps/element.png"
-
-      # desktop item
-      mkdir -p "$out/share"
-      ln -s "${finalAttrs.desktopItem}/share/applications" "$out/share/applications"
+      ln -s "$out/share/element/build/icon.png" "$out/share/icons/hicolor/512x512/apps/element.png"
 
       # executable wrapper
       # LD_PRELOAD workaround for sqlcipher not found: https://github.com/matrix-org/seshat/issues/102
-      makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
+      makeWrapper '${lib.getExe electron}' "$out/bin/${executableName}" \
         --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \
-        --add-flags "$out/share/element/electron" \
+        --add-flags "$out/share/element/app.asar" \
         --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
         --add-flags ${lib.escapeShellArg commandLineArgs}
-
+    ''
+    + ''
       runHook postInstall
     '';
 
     # The desktop item properties should be kept in sync with data from upstream:
     # https://github.com/element-hq/element-desktop/blob/develop/package.json
-    desktopItem = makeDesktopItem {
-      name = "element-desktop";
-      exec = "${executableName} %u";
-      icon = "element";
-      desktopName = "Element";
-      genericName = "Matrix Client";
-      comment = finalAttrs.meta.description;
-      categories = [
-        "Network"
-        "InstantMessaging"
-        "Chat"
-      ];
-      startupWMClass = "Element";
-      mimeTypes = [
-        "x-scheme-handler/element"
-        "x-scheme-handler/io.element.desktop"
-      ];
-    };
-
-    postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
-      cp build/icon.icns $out/Applications/Element.app/Contents/Resources/element.icns
-    '';
+    desktopItems = [
+      (makeDesktopItem {
+        name = "element-desktop";
+        exec = "${executableName} %u";
+        icon = "element";
+        desktopName = "Element";
+        genericName = "Matrix Client";
+        comment = finalAttrs.meta.description;
+        categories = [
+          "Network"
+          "InstantMessaging"
+          "Chat"
+        ];
+        startupWMClass = "Element";
+        mimeTypes = [
+          "x-scheme-handler/element"
+          "x-scheme-handler/io.element.desktop"
+        ];
+      })
+    ];
 
     passthru = {
       # run with: nix-shell ./maintainers/scripts/update.nix --argstr package element-desktop
@@ -157,7 +172,7 @@ stdenv.mkDerivation (
       description = "Feature-rich client for Matrix.org";
       homepage = "https://element.io/";
       changelog = "https://github.com/element-hq/element-desktop/blob/v${finalAttrs.version}/CHANGELOG.md";
-      license = lib.licenses.asl20;
+      license = lib.licenses.agpl3Plus;
       teams = [ lib.teams.matrix ];
       platforms = electron.meta.platforms ++ lib.platforms.darwin;
       mainProgram = "element-desktop";
diff --git a/pkgs/by-name/el/element-desktop/yarn.nix b/pkgs/by-name/el/element-desktop/yarn.nix
deleted file mode 100644
index df839ddbc981..000000000000
--- a/pkgs/by-name/el/element-desktop/yarn.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  stdenvNoCC,
-  nodejs,
-  yarn,
-  cacert,
-  git,
-  version,
-  src,
-  hash,
-}:
-stdenvNoCC.mkDerivation {
-  pname = "element-desktop-yarn-deps";
-  inherit version src;
-
-  nativeBuildInputs = [
-    cacert
-    nodejs
-    yarn
-    git
-  ];
-
-  dontInstall = true;
-
-  NODE_EXTRA_CA_CERTS = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-
-  buildPhase = ''
-    export HOME=$(mktemp -d)
-    export YARN_ENABLE_TELEMETRY=0
-
-    yarn install --frozen-lockfile --ignore-platform --skip-integrity-check --ignore-scripts --no-progress --non-interactive
-    # Apply upstream patch
-    # Can be removed if upstream removes patches/@types+auto-launch+5.0.5.patch introduced in
-    # https://github.com/element-hq/element-desktop/commit/5e882f8e08d58bf9663c8e3ab33885bf7b3709de
-    node ./node_modules/patch-package/index.js
-
-    mkdir -p $out/node_modules
-    cp -r node_modules/* $out/node_modules/
-  '';
-
-  dontPatchShebangs = true;
-
-  outputHash = hash;
-  outputHashMode = "recursive";
-  outputHashAlgo = "sha256";
-}
diff --git a/pkgs/by-name/el/element-web-unwrapped/package.nix b/pkgs/by-name/el/element-web-unwrapped/package.nix
index 850a5217a91e..0da4b2771eae 100644
--- a/pkgs/by-name/el/element-web-unwrapped/package.nix
+++ b/pkgs/by-name/el/element-web-unwrapped/package.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation (
       homepage = "https://element.io/";
       changelog = "https://github.com/element-hq/element-web/blob/v${finalAttrs.version}/CHANGELOG.md";
       teams = [ lib.teams.matrix ];
-      license = lib.licenses.asl20;
+      license = lib.licenses.agpl3Plus;
       platforms = lib.platforms.all;
     };
   }
diff --git a/pkgs/by-name/fi/filebeat8/package.nix b/pkgs/by-name/fi/filebeat8/package.nix
index 1b3ad6ae64de..0959b2fc0ec5 100644
--- a/pkgs/by-name/fi/filebeat8/package.nix
+++ b/pkgs/by-name/fi/filebeat8/package.nix
@@ -8,18 +8,18 @@
 
 buildGoModule rec {
   pname = "filebeat";
-  version = "8.19.9";
+  version = "8.19.10";
 
   src = fetchFromGitHub {
     owner = "elastic";
     repo = "beats";
     tag = "v${version}";
-    hash = "sha256-ysxy4kMUvIYDoWjDF9gwXByAwdCh0Taw3JFCxh9j/Gk=";
+    hash = "sha256-Ky1oWqQXIjno14ZBfxR1FoXEkSn1kScdQQTyGDRvMTo=";
   };
 
   proxyVendor = true; # darwin/linux hash mismatch
 
-  vendorHash = "sha256-WvJwFmnT7m4757yMKhuj3RS/NuzkoH9zlda94OpoYNg=";
+  vendorHash = "sha256-b4W10tGAoxW1oAfmQqM8x0JOi0BD1WBYB2sUVl/hLHY=";
 
   subPackages = [ "filebeat" ];
 
diff --git a/pkgs/by-name/gi/github-backup/package.nix b/pkgs/by-name/gi/github-backup/package.nix
index 6190c2d57b4c..c8d800125c50 100644
--- a/pkgs/by-name/gi/github-backup/package.nix
+++ b/pkgs/by-name/gi/github-backup/package.nix
@@ -10,14 +10,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "github-backup";
-  version = "0.60.0";
+  version = "0.61.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "josegonzalez";
     repo = "python-github-backup";
     tag = version;
-    hash = "sha256-dK6qkso5GOV/eZRGcwOCKn8faMuTr7czTvISLioKgVs=";
+    hash = "sha256-1gUhwZLZ+D1ML5yOifEGVWXpgcLgsligB1+yCkAvX5I=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/by-name/gi/gitlab-container-registry/package.nix b/pkgs/by-name/gi/gitlab-container-registry/package.nix
index 191e02385fda..9f20e9bd65df 100644
--- a/pkgs/by-name/gi/gitlab-container-registry/package.nix
+++ b/pkgs/by-name/gi/gitlab-container-registry/package.nix
@@ -37,10 +37,8 @@ buildGo124Module rec {
   meta = {
     description = "GitLab Docker toolset to pack, ship, store, and deliver content";
     license = lib.licenses.asl20;
-    teams = with lib.teams; [
-      gitlab
-      cyberus
-    ];
+    maintainers = with lib.maintainers; [ e1mo ];
+    teams = with lib.teams; [ gitlab ];
     platforms = lib.platforms.unix;
     mainProgram = "registry";
   };
diff --git a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
index da15d43018aa..b8027fbdd3ee 100644
--- a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
+++ b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
@@ -54,7 +54,10 @@ buildGoModule rec {
     description = "Indexes Git repositories into Elasticsearch for GitLab";
     mainProgram = "gitlab-elasticsearch-indexer";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ yayayayaka ];
-    teams = [ lib.teams.cyberus ];
+    maintainers = with lib.maintainers; [
+      e1mo
+      xanderio
+      yayayayaka
+    ];
   };
 }
diff --git a/pkgs/by-name/ki/kissat/package.nix b/pkgs/by-name/ki/kissat/package.nix
index 136b6e1d6bc3..d4f113a724dd 100644
--- a/pkgs/by-name/ki/kissat/package.nix
+++ b/pkgs/by-name/ki/kissat/package.nix
@@ -17,7 +17,10 @@ let
       It is a port of CaDiCaL back to C with improved data structures,
       better scheduling of inprocessing and optimized algorithms and implementation.
     '';
-    maintainers = with lib.maintainers; [ shnarazk ];
+    maintainers = with lib.maintainers; [
+      shnarazk
+      chrjabs
+    ];
     platforms = lib.platforms.unix;
     license = lib.licenses.mit;
     homepage = "https://fmv.jku.at/kissat";
diff --git a/pkgs/by-name/ko/kompose/package.nix b/pkgs/by-name/ko/kompose/package.nix
index e8cc3639d38b..219033439940 100644
--- a/pkgs/by-name/ko/kompose/package.nix
+++ b/pkgs/by-name/ko/kompose/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "kompose";
-  version = "1.37.0";
+  version = "1.38.0";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kompose";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wS9YoYEsCALIJMxoVTS6EH6NiBfF+qkFIv7JALnVPgs=";
+    hash = "sha256-d2rUkLGU9s2+LTBI3N7WZx1ByDv05DOUq/2OCQViiOM=";
   };
 
-  vendorHash = "sha256-dBVrkTpeYtTVdA/BEcBGyBdSk3po7TQQwo0ux6qPK2Q=";
+  vendorHash = "sha256-53G3nkz+uTwpgiZZFfmrv7Wv6d8iVm6xVyRuxjKA5Po=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/la/lavacli/package.nix b/pkgs/by-name/la/lavacli/package.nix
index b505b4ebf8a3..02c46ed95105 100644
--- a/pkgs/by-name/la/lavacli/package.nix
+++ b/pkgs/by-name/la/lavacli/package.nix
@@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://lava.gitlab.io/lavacli/";
     changelog = "https://gitlab.com/lava/lavacli/-/commits/v${version}?ref_type=tags";
     license = lib.licenses.agpl3Only;
-    teams = [ lib.teams.cyberus ];
+    maintainers = with lib.maintainers; [ snu ];
     mainProgram = "lavacli";
   };
 }
diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix
index 847b9f720016..435c0cc4b349 100644
--- a/pkgs/by-name/lm/lmstudio/package.nix
+++ b/pkgs/by-name/lm/lmstudio/package.nix
@@ -7,10 +7,10 @@
 let
   pname = "lmstudio";
 
-  version_aarch64-darwin = "0.3.37-1";
-  hash_aarch64-darwin = "sha256-RvktWUS12XF5dEn1Uq94vKcZSe89D+xXy6/0tfRVYVU=";
-  version_x86_64-linux = "0.3.37-1";
-  hash_x86_64-linux = "sha256-wNyTEHnxjlXtmLs9yc8p7KRAJX4i5aKSkgjGJuimSJQ=";
+  version_aarch64-darwin = "0.3.39-1";
+  hash_aarch64-darwin = "sha256-A3TfbFr4H7NNXo9e7Ro3MkdJ/svF6PyeQT34VnMAs2I=";
+  version_x86_64-linux = "0.3.39-1";
+  hash_x86_64-linux = "sha256-XIwJ0Dgc34yKMsx2/eBAbdDz9MyKOCx7YpFtYBFWu0U=";
 
   meta = {
     description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
diff --git a/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix b/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix
index c057a7a914bd..38bcb287af16 100644
--- a/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix
+++ b/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mdbook-kroki-preprocessor";
-  version = "0.2.1";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "joelcourtney";
     repo = "mdbook-kroki-preprocessor";
     rev = "v${version}";
-    hash = "sha256-rTXieHa/EIg69vUQE2FOD1Xb4cUVe5CvBiv9CnhHB3I=";
+    hash = "sha256-NTsI/ANqm192sNE9yd2d7ldDLglWoq4L20t84PaAO3M=";
   };
 
-  cargoHash = "sha256-aTtjrCl13oOKqwPGiVlOfjGqAdBS94XGjcvn3bBWpa0=";
+  cargoHash = "sha256-BStTLg44XRdEaQKDNfR+jgjECjZantXTYNk/HX5h7eU=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/mu/multipath-tools/package.nix b/pkgs/by-name/mu/multipath-tools/package.nix
index ae52507b8464..e3c252848759 100644
--- a/pkgs/by-name/mu/multipath-tools/package.nix
+++ b/pkgs/by-name/mu/multipath-tools/package.nix
@@ -51,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
   strictDeps = true;
 
   makeFlags = [
+    "WARN_ONLY=1"
     "LIB=lib"
     "prefix=$(out)"
     "systemd_prefix=$(out)"
diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix
index 335ee9a1cd3c..72c64f5b9ab5 100644
--- a/pkgs/by-name/my/myks/package.nix
+++ b/pkgs/by-name/my/myks/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "myks";
-  version = "5.5.1";
+  version = "5.6.0";
 
   src = fetchFromGitHub {
     owner = "mykso";
     repo = "myks";
     tag = "v${version}";
-    hash = "sha256-6K/mlx1l8Ijmligefb2Wcwq9aSGh5PbvgoyJpx0U4w4=";
+    hash = "sha256-0bK5ZnzGhQc0s0nQiNTGe5Z45BpwqXiv8kt0ne8EkpE=";
   };
 
-  vendorHash = "sha256-Tl8ubucPn72TGD5ER3zeDHJUoSklNeeByitj/WfICoU=";
+  vendorHash = "sha256-jNPo6TotuBhG2GW9vHu1zC6BYCIRfyqRZB6vbtCNCpI=";
 
   subPackages = ".";
 
diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index 721ac2a49234..862438477fd9 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -138,13 +138,13 @@ in
 goBuild (finalAttrs: {
   pname = "ollama";
   # don't forget to invalidate all hashes each update
-  version = "0.14.0";
+  version = "0.14.1";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hJeEWkIWQHITxzo6VGqkWJHOktBJyVNIEKtUdSPyD24=";
+    hash = "sha256-r9Qwa1bAzLlr50mB+RLkRfuCFe6FUXtR9irqvU7PAvA=";
   };
 
   vendorHash = "sha256-WdHAjCD20eLj0d9v1K6VYP8vJ+IZ8BEZ3CciYLLMtxc=";
diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 94d08d0cbd97..0ead4f13d7c4 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -14,12 +14,12 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "1.1.21";
+  version = "1.1.23";
   src = fetchFromGitHub {
     owner = "anomalyco";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8ykONBWMiq9EACHOsdx1AFPoj53Tsxi3EbUDVciH5Ok=";
+    hash = "sha256-cvz4HO5vNwA3zWx7zdVfs59Z7vD/00+MMCDbLU5WKpM=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {
@@ -66,7 +66,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     # NOTE: Required else we get errors that our fixed-output derivation references store paths
     dontFixup = true;
 
-    outputHash = "sha256-gl/5eA4nPLQ2clOcAf0D8/ocjRO4xBm5AQtqrcSdkTw=";
+    outputHash = "sha256-ojbTZBWM353NLMMHckMjFf+k6TpeOoF/yeQR9dq0nNo=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };
diff --git a/pkgs/by-name/pl/plausible/package.nix b/pkgs/by-name/pl/plausible/package.nix
index b1acaae50a50..75fdf91ad317 100644
--- a/pkgs/by-name/pl/plausible/package.nix
+++ b/pkgs/by-name/pl/plausible/package.nix
@@ -182,7 +182,10 @@ beamPackages.mixRelease rec {
     changelog = "https://github.com/plausible/analytics/blob/${src.rev}/CHANGELOG.md";
     description = "Simple, open-source, lightweight (< 1 KB) and privacy-friendly web analytics alternative to Google Analytics";
     mainProgram = "plausible";
-    teams = with lib.teams; [ cyberus ];
+    maintainers = with lib.maintainers; [
+      e1mo
+      xanderio
+    ];
     platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/pl/plus42/package.nix b/pkgs/by-name/pl/plus42/package.nix
index b17df6a77af1..ea1d53e3c31d 100644
--- a/pkgs/by-name/pl/plus42/package.nix
+++ b/pkgs/by-name/pl/plus42/package.nix
@@ -11,11 +11,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "plus42";
-  version = "1.3.12";
+  version = "1.3.13";
 
   src = fetchurl {
     url = "https://thomasokken.com/plus42/upstream/plus42-upstream-${version}.tgz";
-    hash = "sha256-IBXQu1hI0bJZISL9wInAzf2z8zbynXXP15oG/od+MC8=";
+    hash = "sha256-I5SAR6vEufzT2Cgs4RQk8AWDZWm+QOLtHRqaED2DQtA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix
index 89103e7df3c1..fa52da1b670e 100644
--- a/pkgs/by-name/re/release-plz/package.nix
+++ b/pkgs/by-name/re/release-plz/package.nix
@@ -50,7 +50,10 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with lib.maintainers; [ dannixon ];
+    maintainers = with lib.maintainers; [
+      dannixon
+      chrjabs
+    ];
     mainProgram = "release-plz";
     broken = stdenv.hostPlatform.isDarwin;
   };
diff --git a/pkgs/by-name/sa/sandhole/package.nix b/pkgs/by-name/sa/sandhole/package.nix
index fa10203be944..7fbd99bc9ea3 100644
--- a/pkgs/by-name/sa/sandhole/package.nix
+++ b/pkgs/by-name/sa/sandhole/package.nix
@@ -8,16 +8,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sandhole";
-  version = "0.8.6";
+  version = "0.8.7";
 
   src = fetchFromGitHub {
     owner = "EpicEric";
     repo = "sandhole";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-30ltOQLobRy/M1v+0jFpBmH5ZkTmkZ+mQP7BX5RKo2s=";
+    hash = "sha256-C6LJj8bQAe23uLEdQ3b90wanTfZvEM6o8svoOg99K2g=";
   };
 
-  cargoHash = "sha256-BE7y4VlvINWdJM4/36CDn4YxPWUQnT22YJtcvjup0Ec=";
+  cargoHash = "sha256-HzSytIh/oMEXsd+sqR9jxi03FvbRs3WBmmscZydHL/k=";
 
   # All integration tests require networking.
   postPatch = ''
diff --git a/pkgs/by-name/st/steel/package.nix b/pkgs/by-name/st/steel/package.nix
index 25645e0f421f..9106284cd1f6 100644
--- a/pkgs/by-name/st/steel/package.nix
+++ b/pkgs/by-name/st/steel/package.nix
@@ -19,13 +19,13 @@
 }:
 rustPlatform.buildRustPackage {
   pname = "steel";
-  version = "0-unstable-2026-01-09";
+  version = "0-unstable-2026-01-15";
 
   src = fetchFromGitHub {
     owner = "mattwparas";
     repo = "steel";
-    rev = "b019511196ef987ee7e368590a852e385dfbae53";
-    hash = "sha256-qG2W6gWSft5xWhna2RwZ847WtBstBEGTQroC598hjTM=";
+    rev = "dd5980a4099afe2af9ce1ae3d8bb30b981294398";
+    hash = "sha256-lBKDRNaX4WMhJVc9162FEv+rXDXqt7ZL0YxNBq2oMcE=";
   };
 
   cargoHash = "sha256-mtRDasfCejM6o664+3XBZJ6sWw1BO+pYi/nrCaglsQ8=";
diff --git a/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix b/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix
index dbb0c637efe2..e8821359fff2 100644
--- a/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix
+++ b/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix
@@ -31,6 +31,9 @@ buildGoModule {
     description = "Allows users to use a GitOps flow for managing Tailscale ACLs";
     license = lib.licenses.bsd3;
     mainProgram = "gitops-pusher";
-    teams = [ lib.teams.cyberus ];
+    maintainers = with lib.maintainers; [
+      e1mo
+      xanderio
+    ];
   };
 }
diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix
index 83e5aa2c99d0..1cca082243f9 100644
--- a/pkgs/by-name/ty/typos/package.nix
+++ b/pkgs/by-name/ty/typos/package.nix
@@ -43,6 +43,7 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = with lib.maintainers; [
       mgttlinger
+      chrjabs
     ];
   };
 }
diff --git a/pkgs/by-name/ud/udiskie/package.nix b/pkgs/by-name/ud/udiskie/package.nix
index 519f01d1efc1..ec2111a516b8 100644
--- a/pkgs/by-name/ud/udiskie/package.nix
+++ b/pkgs/by-name/ud/udiskie/package.nix
@@ -17,7 +17,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "udiskie";
-  version = "2.6.0";
+  version = "2.6.1";
 
   pyproject = true;
 
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
     owner = "coldfix";
     repo = "udiskie";
     tag = "v${version}";
-    hash = "sha256-ZagfjzSikXuVGeJdQm0YpW+IqbUfJ2b9Pnj/RLUmsik=";
+    hash = "sha256-1/qQS2bAxoHbWWmMkDoV5QNSUVYCQfer6lWM9ptG+Vk=";
   };
 
   patches = [
diff --git a/pkgs/by-name/ve/versitygw/package.nix b/pkgs/by-name/ve/versitygw/package.nix
index e4fc52ea9841..948aeea2c79e 100644
--- a/pkgs/by-name/ve/versitygw/package.nix
+++ b/pkgs/by-name/ve/versitygw/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "versitygw";
-  version = "1.0.20";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "versity";
     repo = "versitygw";
     tag = "v${version}";
-    hash = "sha256-uRYGcV1vXZS7tCuj4riBU4ROQQkYbTFSYYNJa0Dy1mA=";
+    hash = "sha256-mjtW5Jyx5hDGAony3ZPK8u4QgDdXbP+RCCTglUc7AR0=";
   };
 
-  vendorHash = "sha256-tZUSxfy9wAFausFrEGRrgXZj8PHp6XeF10jPdD4zyDk=";
+  vendorHash = "sha256-3M2LOWEszQlfSvnIBN/mQ966qizOtUwa68ugTSvvw8U=";
 
   doCheck = false; # Require access to online S3 services
 
diff --git a/pkgs/by-name/wi/witr/package.nix b/pkgs/by-name/wi/witr/package.nix
index 1feb5788c844..d60643b00c32 100644
--- a/pkgs/by-name/wi/witr/package.nix
+++ b/pkgs/by-name/wi/witr/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "witr";
-  version = "0.2.4";
+  version = "0.2.5";
 
   src = fetchFromGitHub {
     owner = "pranshuparmar";
     repo = "witr";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-T3yngazwAxBSJ9SD5jthwbJd2NRBRZV3itgZacQ1Nlo=";
+    hash = "sha256-2Du3Z6p/IqrP7uqB1fz0d0prCX02+Iw59wikviV7z84=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
diff --git a/pkgs/by-name/ya/yaookctl/package.nix b/pkgs/by-name/ya/yaookctl/package.nix
index 880f72a1dbfa..36e59b6fbd88 100644
--- a/pkgs/by-name/ya/yaookctl/package.nix
+++ b/pkgs/by-name/ya/yaookctl/package.nix
@@ -6,13 +6,13 @@
 }:
 python3.pkgs.buildPythonApplication {
   pname = "yaookctl";
-  version = "0-unstable-2025-12-12";
+  version = "0-unstable-2026-01-13";
 
   src = fetchFromGitLab {
     owner = "yaook";
     repo = "yaookctl";
-    rev = "94215db203cd8e471616d557cd83d71f0bc9918d";
-    hash = "sha256-rAd69fJQSqo6Xe0yL4CmPn0/HmygWkojwBXPEOAY1dE=";
+    rev = "97ff5ceb948c6e61ef5fe288d84fca8b60e1c984";
+    hash = "sha256-+pWfm39WRybN9ldTf9Emm120NwvGQhtX0nU1CVZSot0=";
   };
 
   pyproject = true;
diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix
index 5c4277e3af7e..8de4b3ce48ae 100644
--- a/pkgs/development/compilers/go/1.24.nix
+++ b/pkgs/development/compilers/go/1.24.nix
@@ -24,11 +24,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "go";
-  version = "1.24.11";
+  version = "1.24.12";
 
   src = fetchurl {
     url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-/9+XdmpMSxNc1TgJcTl46e4alDssjiitIhpUKd4w4hA=";
+    hash = "sha256-+6LdZht757NNa9F+2S9BxEpeBZU62BqzS07HgOXn3EE=";
   };
 
   strictDeps = true;
diff --git a/pkgs/development/compilers/go/1.26.nix b/pkgs/development/compilers/go/1.26.nix
index ae9f4bb890a8..75f57c7d6973 100644
--- a/pkgs/development/compilers/go/1.26.nix
+++ b/pkgs/development/compilers/go/1.26.nix
@@ -25,11 +25,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "go";
-  version = "1.26rc1";
+  version = "1.26rc2";
 
   src = fetchurl {
     url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-ZeM0BQb0uhJaV5nsx4etSdTJ9NJX4sLBXT4pXlACtoQ=";
+    hash = "sha256-4lzIxf/hJBpdhxmSCSQ9cMJIRyYPsep7FjqVtTfeZaw=";
   };
 
   strictDeps = true;
diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index 94175437f80d..5cc3ef8af959 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -38,12 +38,12 @@ in
   );
   julia_112-bin = wrapJulia (
     callPackage (import ./generic-bin.nix {
-      version = "1.12.3";
+      version = "1.12.4";
       sha256 = {
-        x86_64-linux = "04mrysmaq0z6vzzr8az22zdf572x6hqxxxjxijx4xbkjfh7xaywg";
-        aarch64-linux = "036cvw7cnbfylpg106mb2d8gn23bljqpcq94w268m5wnp4jn2s9j";
-        x86_64-darwin = "1cwy57qvw196m9fm4j18smipikfyz1f8h5966bz71n652w1yqjpq";
-        aarch64-darwin = "1miv453pxnkih041nmdwbyjs6zkyi0f5db4gjs2ddgs43f56xb1l";
+        x86_64-linux = "0pcq75k0vg1gdl39p3chszwmlcig91nkj98srdm94h71iwbsyyy5";
+        aarch64-linux = "1p9xcv4sz69wry29vww0kvyy4hr7czf6fxg4d3yj84lkxvgs40m6";
+        x86_64-darwin = "15zl9gqca1c5ss95xmqrk9j0hihm9y926wvafyxg5802ndd4jd1c";
+        aarch64-darwin = "03vyvn7d5nkz0p7kgypa6c9l44ir6512sbrqdzl04havxc6v4ipa";
       };
     }) { }
   );
diff --git a/pkgs/development/coq-modules/stdlib/default.nix b/pkgs/development/coq-modules/stdlib/default.nix
index ebbe95b7fa64..eb1091ea642a 100644
--- a/pkgs/development/coq-modules/stdlib/default.nix
+++ b/pkgs/development/coq-modules/stdlib/default.nix
@@ -35,7 +35,8 @@ let
     '';
     installPhase = ''
       echo installing nothing
-      touch $out
+      # Make an output directory rather than a file, so this is more friendly to buildEnv
+      mkdir $out
     '';
 
     meta = {
diff --git a/pkgs/development/python-modules/flynt/default.nix b/pkgs/development/python-modules/flynt/default.nix
index 8b6a22087eef..2d531bc4500f 100644
--- a/pkgs/development/python-modules/flynt/default.nix
+++ b/pkgs/development/python-modules/flynt/default.nix
@@ -1,29 +1,28 @@
 {
-  astor,
   buildPythonPackage,
   fetchFromGitHub,
   hatchling,
   lib,
   pytestCheckHook,
-  pythonOlder,
-  tomli,
+  hatch-vcs,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "flynt";
-  version = "1.0.1";
+  version = "1.0.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ikamensh";
     repo = "flynt";
-    tag = version;
-    hash = "sha256-UHY4UDBHcP3ARikktIehSUD3Dx8A0xpOnfKWWrLCsOY=";
+    tag = finalAttrs.version;
+    hash = "sha256-SkkCA4fEHplt9HkEn+QOq4k9lW5qJeZzLZEbNEtKBSo=";
   };
 
-  build-system = [ hatchling ];
-
-  propagatedBuildInputs = [ astor ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  build-system = [
+    hatchling
+    hatch-vcs
+  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
@@ -38,9 +37,9 @@ buildPythonPackage rec {
   meta = {
     description = "Tool to automatically convert old string literal formatting to f-strings";
     homepage = "https://github.com/ikamensh/flynt";
-    changelog = "https://github.com/ikamensh/flynt/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/ikamensh/flynt/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ cpcloud ];
     mainProgram = "flynt";
   };
-}
+})
diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix
index 033cad18c38a..56aaef013e81 100644
--- a/pkgs/development/python-modules/imap-tools/default.nix
+++ b/pkgs/development/python-modules/imap-tools/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "imap-tools";
-  version = "1.11.0";
+  version = "1.11.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ikvk";
     repo = "imap_tools";
     tag = "v${version}";
-    hash = "sha256-8oPiCFoJ0mV7ZnteM9lufIbxwA/7hV91959weEx/e30=";
+    hash = "sha256-6DvK8X/P6ZksR9k7sd0RJXbFtrk3Zbyt+CT73j/Ej3M=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix
index 53465893fd40..8a7304f57812 100644
--- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix
+++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix
@@ -7,15 +7,15 @@
   hatchling,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "llama-index-llms-openai";
-  version = "0.6.12";
+  version = "0.6.13";
   pyproject = true;
 
   src = fetchPypi {
     pname = "llama_index_llms_openai";
-    inherit version;
-    hash = "sha256-m4sddDWYP5dPe0X3lCg2G/22jGIlQSBTkr+PD+oXm64=";
+    inherit (finalAttrs) version;
+    hash = "sha256-47dCK8ciduAKmA2CZHfQsU1b90O6acSk8L3uD1Il1FA=";
   };
 
   pythonRemoveDeps = [
@@ -41,4 +41,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/llama-stack-client/default.nix b/pkgs/development/python-modules/llama-stack-client/default.nix
index 572a79537e89..47dc336148e8 100644
--- a/pkgs/development/python-modules/llama-stack-client/default.nix
+++ b/pkgs/development/python-modules/llama-stack-client/default.nix
@@ -13,6 +13,7 @@
   httpx-aiohttp,
   httpx,
   nest-asyncio,
+  openai,
   pandas,
   prompt-toolkit,
   pyaml,
@@ -29,15 +30,15 @@
   typing-extensions,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "llama-stack-client";
-  version = "0.2.23";
+  version = "0.4.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "llama_stack_client";
-    inherit version;
-    hash = "sha256-aPNOisjupqc+2dSXfYSZkrLYvYNYBNdwoRhDQxzVv3Q=";
+    inherit (finalAttrs) version;
+    hash = "sha256-MFd9PJTtvjiOZ0Q8t69MX3ayZ+kq7RJ9NtHZaNRRCuw=";
   };
 
   postPatch = ''
@@ -78,12 +79,13 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     dirty-equals
     nest-asyncio
+    openai
     pytest-asyncio
     pytest-xdist
     pytestCheckHook
     respx
   ]
-  ++ lib.concatAttrValues optional-dependencies;
+  ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies);
 
   pythonImportsCheck = [ "llama_stack_client" ];
 
@@ -91,13 +93,17 @@ buildPythonPackage rec {
     # Tests require network access
     "tests/api_resources/"
     "tests/test_client.py"
+    "tests/integration/test_agent_turn_step_events.py"
+
+    # AttributeError: 'Agent' object has no attribute '_session_last_response_id'
+    "tests/lib/agents/test_agent_responses.py::test_agent_tracks_multiple_sessions"
   ];
 
   meta = {
     description = "Library for the llama-stack-client API";
     homepage = "https://github.com/llamastack/llama-stack-client-python";
-    changelog = "https://github.com/llamastack/llama-stack-client-python/releases/tag/v${version}";
+    changelog = "https://github.com/llamastack/llama-stack-client-python/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/mkdocs-include-markdown-plugin/default.nix b/pkgs/development/python-modules/mkdocs-include-markdown-plugin/default.nix
index f634c44c9983..94afb210b6d3 100644
--- a/pkgs/development/python-modules/mkdocs-include-markdown-plugin/default.nix
+++ b/pkgs/development/python-modules/mkdocs-include-markdown-plugin/default.nix
@@ -42,6 +42,9 @@ buildPythonPackage rec {
     description = "Mkdocs Markdown includer plugin";
     homepage = "https://pypi.org/project/mkdocs-include-markdown-plugin/";
     license = lib.licenses.asl20;
-    teams = [ lib.teams.cyberus ];
+    maintainers = with lib.maintainers; [
+      e1mo
+      xanderio
+    ];
   };
 }
diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix
index 1cd32fd1152a..6d68de1b1096 100644
--- a/pkgs/servers/web-apps/outline/default.nix
+++ b/pkgs/servers/web-apps/outline/default.nix
@@ -95,9 +95,10 @@ stdenv.mkDerivation rec {
     license = lib.licenses.bsl11;
     maintainers = with lib.maintainers; [
       cab404
+      e1mo
+      xanderio
       yrd
     ];
-    teams = [ lib.teams.cyberus ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2f7c24e94297..67e38dbe9b4b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -296,6 +296,7 @@ mapAliases {
   ansible_2_17 = throw "ansible_2_17 has been removed, as it is EOL"; # Added 2025-11-10
   ansible_2_18 = throw "ansible_2_18 has been removed; use overridePythonAttrs if you need a specific version"; # Added 2025-11-10
   ansible_2_19 = throw "ansible_2_19 has been removed; use overridePythonAttrs if you need a specific version"; # Added 2025-11-10
+  antibody = throw "antibody has been removed because it was deprecated and archived upstream. Consider using antidote instead"; # Added 2026-01-16
   antlr4_8 = throw "antlr4_8 has been removed. Consider using a more recent version of antlr4"; # Added 2025-10-20
   ao = throw "'ao' has been renamed to/replaced by 'libfive'"; # Converted to throw 2025-10-27
   apacheAnt = throw "'apacheAnt' has been renamed to/replaced by 'ant'"; # Converted to throw 2025-10-27
@@ -368,6 +369,7 @@ mapAliases {
   bitwarden_rs-postgresql = throw "'bitwarden_rs-postgresql' has been renamed to/replaced by 'vaultwarden-postgresql'"; # Converted to throw 2025-10-27
   bitwarden_rs-sqlite = throw "'bitwarden_rs-sqlite' has been renamed to/replaced by 'vaultwarden-sqlite'"; # Converted to throw 2025-10-27
   bitwarden_rs-vault = throw "'bitwarden_rs-vault' has been renamed to/replaced by 'vaultwarden-vault'"; # Converted to throw 2025-10-27
+  blackbox = throw "'blackbox' has been removed since it has been deprecated and archived upstream. Consider using pass instead"; # Added 2026-01-16
   blas-reference = throw "blas-reference has been removed since it has been discontinued as free-standing package. It is now contained within lapack-reference."; # Added 2025-10-21
   blender-hip = throw "blender-hip has been removed in favor of setting `config.rocmSupport = true` or using `pkgsRocm.blender`"; # Added 2026-01-04
   blender-with-packages = throw "blender-with-packages is deprecated in in favor of blender.withPackages, e.g. `blender.withPackages(ps: [ ps.foobar ])`"; # Converted to throw 2025-10-26
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 815e9bc04834..80348287cb3f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10169,10 +10169,6 @@ with pkgs;
 
   bitwig-studio = bitwig-studio5;
 
-  blackbox = callPackage ../applications/version-management/blackbox {
-    pinentry = pinentry-curses;
-  };
-
   blucontrol = callPackage ../applications/misc/blucontrol/wrapper.nix {
     inherit (haskellPackages) ghcWithPackages;
   };
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 8a35e3a59feb..6e2e29b41ea8 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -24,12 +24,12 @@ let
     self: coq:
     let
       callPackage = self.callPackage;
-    in
-    {
-      inherit coq lib;
       coqPackages = self // {
         recurseForDerivations = false;
       };
+    in
+    {
+      inherit coqPackages lib;
 
       metaFetch = import ../build-support/coq/meta-fetch/default.nix {
         inherit
@@ -41,6 +41,17 @@ let
       };
       mkCoqDerivation = lib.makeOverridable (callPackage ../build-support/coq { });
 
+      coq = coq.overrideAttrs (oldAttrs: {
+        passthru = (oldAttrs.passthru or { }) // {
+          withPackages =
+            f:
+            (callPackage ../applications/science/logic/coq/with-packages.nix {
+              inherit coq;
+            })
+              (f self);
+        };
+      });
+
       contribs = lib.recurseIntoAttrs (callPackage ../development/coq-modules/contribs { });
 
       aac-tactics = callPackage ../development/coq-modules/aac-tactics { };
@@ -302,39 +313,39 @@ rec {
     in
     self.filterPackages (!coq.dontFilter or false);
 
-  coq_8_7 = mkCoq "8.7" { };
-  coq_8_8 = mkCoq "8.8" { };
-  coq_8_9 = mkCoq "8.9" { };
-  coq_8_10 = mkCoq "8.10" { };
-  coq_8_11 = mkCoq "8.11" { };
-  coq_8_12 = mkCoq "8.12" { };
-  coq_8_13 = mkCoq "8.13" { };
-  coq_8_14 = mkCoq "8.14" { };
-  coq_8_15 = mkCoq "8.15" { };
-  coq_8_16 = mkCoq "8.16" { };
-  coq_8_17 = mkCoq "8.17" { };
-  coq_8_18 = mkCoq "8.18" { };
-  coq_8_19 = mkCoq "8.19" { };
-  coq_8_20 = mkCoq "8.20" { };
-  coq_9_0 = mkCoq "9.0" rocqPackages_9_0;
-  coq_9_1 = mkCoq "9.1" rocqPackages_9_1;
+  coqPackages_8_7 = mkCoqPackages (mkCoq "8.7" { });
+  coqPackages_8_8 = mkCoqPackages (mkCoq "8.8" { });
+  coqPackages_8_9 = mkCoqPackages (mkCoq "8.9" { });
+  coqPackages_8_10 = mkCoqPackages (mkCoq "8.10" { });
+  coqPackages_8_11 = mkCoqPackages (mkCoq "8.11" { });
+  coqPackages_8_12 = mkCoqPackages (mkCoq "8.12" { });
+  coqPackages_8_13 = mkCoqPackages (mkCoq "8.13" { });
+  coqPackages_8_14 = mkCoqPackages (mkCoq "8.14" { });
+  coqPackages_8_15 = mkCoqPackages (mkCoq "8.15" { });
+  coqPackages_8_16 = mkCoqPackages (mkCoq "8.16" { });
+  coqPackages_8_17 = mkCoqPackages (mkCoq "8.17" { });
+  coqPackages_8_18 = mkCoqPackages (mkCoq "8.18" { });
+  coqPackages_8_19 = mkCoqPackages (mkCoq "8.19" { });
+  coqPackages_8_20 = mkCoqPackages (mkCoq "8.20" { });
+  coqPackages_9_0 = mkCoqPackages (mkCoq "9.0" rocqPackages_9_0);
+  coqPackages_9_1 = mkCoqPackages (mkCoq "9.1" rocqPackages_9_1);
 
-  coqPackages_8_7 = mkCoqPackages coq_8_7;
-  coqPackages_8_8 = mkCoqPackages coq_8_8;
-  coqPackages_8_9 = mkCoqPackages coq_8_9;
-  coqPackages_8_10 = mkCoqPackages coq_8_10;
-  coqPackages_8_11 = mkCoqPackages coq_8_11;
-  coqPackages_8_12 = mkCoqPackages coq_8_12;
-  coqPackages_8_13 = mkCoqPackages coq_8_13;
-  coqPackages_8_14 = mkCoqPackages coq_8_14;
-  coqPackages_8_15 = mkCoqPackages coq_8_15;
-  coqPackages_8_16 = mkCoqPackages coq_8_16;
-  coqPackages_8_17 = mkCoqPackages coq_8_17;
-  coqPackages_8_18 = mkCoqPackages coq_8_18;
-  coqPackages_8_19 = mkCoqPackages coq_8_19;
-  coqPackages_8_20 = mkCoqPackages coq_8_20;
-  coqPackages_9_0 = mkCoqPackages coq_9_0;
-  coqPackages_9_1 = mkCoqPackages coq_9_1;
+  coq_8_7 = coqPackages_8_7.coq;
+  coq_8_8 = coqPackages_8_8.coq;
+  coq_8_9 = coqPackages_8_9.coq;
+  coq_8_10 = coqPackages_8_10.coq;
+  coq_8_11 = coqPackages_8_11.coq;
+  coq_8_12 = coqPackages_8_12.coq;
+  coq_8_13 = coqPackages_8_13.coq;
+  coq_8_14 = coqPackages_8_14.coq;
+  coq_8_15 = coqPackages_8_15.coq;
+  coq_8_16 = coqPackages_8_16.coq;
+  coq_8_17 = coqPackages_8_17.coq;
+  coq_8_18 = coqPackages_8_18.coq;
+  coq_8_19 = coqPackages_8_19.coq;
+  coq_8_20 = coqPackages_8_20.coq;
+  coq_9_0 = coqPackages_9_0.coq;
+  coq_9_1 = coqPackages_9_1.coq;
 
   coqPackages = lib.recurseIntoAttrs coqPackages_9_0;
   coq = coqPackages.coq;