diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f86bb07d690f..22ca6a638631 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18493,6 +18493,11 @@
     githubId = 3579600;
     name = "Jacob Moody";
   };
+  mooses = {
+    name = "Remu Salminen";
+    github = "RemuSalminen";
+    githubId = 85031022;
+  };
   moosingin3space = {
     email = "moosingin3space@gmail.com";
     github = "moosingin3space";
@@ -25427,13 +25432,6 @@
     githubId = 819413;
     name = "Benedict Aas";
   };
-  shreerammodi = {
-    name = "Shreeram Modi";
-    email = "shreerammodi10@gmail.com";
-    github = "shreerammodi";
-    githubId = 67710369;
-    keys = [ { fingerprint = "EA88 EA07 26E9 6CBF 6365  3966 163B 16EE 76ED 24CE"; } ];
-  };
   shunueda = {
     name = "Shun Ueda";
     github = "shunueda";
diff --git a/nixos/modules/services/home-automation/openthread-border-router.nix b/nixos/modules/services/home-automation/openthread-border-router.nix
index 93e010c1c6f5..6ca8c8ffdc6d 100644
--- a/nixos/modules/services/home-automation/openthread-border-router.nix
+++ b/nixos/modules/services/home-automation/openthread-border-router.nix
@@ -203,15 +203,6 @@ in
       ]) cfg.backboneInterfaces
     );
 
-    # OTBR uses avahi for mDNS service publishing
-    services.avahi = {
-      enable = lib.mkDefault true;
-      publish = {
-        enable = lib.mkDefault true;
-        userServices = lib.mkDefault true;
-      };
-    };
-
     # The upstream service files (src/agent/otbr-agent.service.in, src/web/otbr-web.service.in) use
     # EnvironmentFile and CMake-substituted platform scripts that don't translate to NixOS, so the
     # services are rebuilt here from typed module options instead.
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 835b73604809..0b749e2678af 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -7311,14 +7311,15 @@ final: prev: {
 
   heirline-components-nvim = buildVimPlugin {
     pname = "heirline-components.nvim";
-    version = "2026-02-25";
+    version = "3.3.5";
     src = fetchFromGitHub {
       owner = "Zeioth";
       repo = "heirline-components.nvim";
-      rev = "5ea9a16286c01b7c36d58c91903d1f8ff0b7ddeb";
-      sha256 = "0gij9c9qgmqc99fnqnvp6icxp32q0wkz536ric2x5vpbqlzsdkik";
+      tag = "v3.3.5";
+      hash = "sha256-M86mP8Xr7tIFi9mM8icHWIzbWTR3W2xdSgzXhxNLMj4=";
     };
     meta.homepage = "https://github.com/Zeioth/heirline-components.nvim/";
+    meta.license = getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10137,6 +10138,20 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  mini-input = buildVimPlugin {
+    pname = "mini.input";
+    version = "0-unstable-2026-06-06";
+    src = fetchFromGitHub {
+      owner = "nvim-mini";
+      repo = "mini.input";
+      rev = "73a50edd8d0350feb8c018fe367121a241fd7c56";
+      hash = "sha256-6IC7krZ5pIKoR8t75h+z5yq3mKdyEaZ4iVl/dyc5Yis=";
+    };
+    meta.homepage = "https://github.com/nvim-mini/mini.input/";
+    meta.license = getLicenseFromSpdxId "MIT";
+    meta.hydraPlatforms = [ ];
+  };
+
   mini-jump = buildVimPlugin {
     pname = "mini.jump";
     version = "0.17.0-unstable-2026-05-19";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 8d8cdbcf3156..8eec0b617b60 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -520,8 +520,8 @@ https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,,
 https://github.com/travitch/hasksyn/,,
 https://github.com/StackInTheWild/headhunter.nvim/,,
 https://github.com/lukas-reineke/headlines.nvim/,,
-https://github.com/rebelot/heirline.nvim/,,
 https://github.com/Zeioth/heirline-components.nvim/,,
+https://github.com/rebelot/heirline.nvim/,,
 https://github.com/qvalentin/helm-ls.nvim/,,
 https://github.com/OXY2DEV/helpview.nvim/,,
 https://github.com/RaafatTurki/hex.nvim/,,
@@ -722,6 +722,7 @@ https://github.com/nvim-mini/mini.hipatterns/,,
 https://github.com/nvim-mini/mini.hues/,,
 https://github.com/nvim-mini/mini.icons/,,
 https://github.com/nvim-mini/mini.indentscope/,,
+https://github.com/nvim-mini/mini.input/,,
 https://github.com/nvim-mini/mini.jump/,,
 https://github.com/nvim-mini/mini.jump2d/,,
 https://github.com/nvim-mini/mini.keymap/,,
diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index 0a1f4c0ab2b5..1eb119129897 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -27,12 +27,12 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-gscXPWqnQV9nd9XWbL5YkCdyxxnDDEY4WpFAgx5G7a0=";
-      x86_64-darwin = "sha256-H6sKVtQi++U7NvSkKWipjDDJQsTu0Zg3tp9kijL85eU=";
-      aarch64-linux = "sha256-09C5ER/nZBphWHZRRAf9o/hyB6qc2mqIuxOLNdlVSfU=";
-      aarch64-darwin = "sha256-utDPI80JCPcXTFvK65UR5CBlyb+EsocpHM0KWeojaUI=";
-      armv7l-linux = "sha256-voNvX40YWm7oYrgNAIhoRE/9zZlIq/MgaGVlumDUaz4=";
-      loongarch64-linux = "sha256-T7QGiIilEL2lR01yUZ70ubQ2XGgnL7NQ4xkt0MeDD3s=";
+      x86_64-linux = "sha256-LJsGc11MH6zlcJNfSWjTWPn2Jp9dkjeBPQuCXH1woUM=";
+      x86_64-darwin = "sha256-bC7AfH2eKmmsWIOHifNGKD/kVQCYyuMfU3SUil0DXkM=";
+      aarch64-linux = "sha256-mT5dvw8GOZ0GnZaKRS/TAzQDEEYDOgcj6w6lNLy5kQ0=";
+      aarch64-darwin = "sha256-c8K17XKpRG1ji2mUfoyg2+cRF+qc1KVMYVkaQoUIz7Y=";
+      armv7l-linux = "sha256-91ZHhEUDVoDiRBLwMHVLhzKmb9gWcPBUsVRZVLhCA4M=";
+      loongarch64-linux = "sha256-7iUdsIyJkIi40Xn+/PWdCVgahQxbZtiMw0QLMisN+sg=";
     }
     .${system} or throwSystem;
 
@@ -43,8 +43,8 @@ buildVscode rec {
 
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.116.02821";
-  vscodeVersion = "1.116.0";
+  version = "1.121.03429";
+  vscodeVersion = "1.121.0";
   pname = "vscodium";
 
   executableName = "codium";
diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
index 769a97b1487b..04d25dced59e 100644
--- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
+++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "genesis-plus-gx";
-  version = "0-unstable-2026-05-15";
+  version = "0-unstable-2026-06-05";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "Genesis-Plus-GX";
-    rev = "162c3439a697ffdfa00a5d3f44af103bf671f5dc";
-    hash = "sha256-ExPuJjMYMKgGWqLdM1AdxHHZejBmFQ/BCfSDzoy8A7o=";
+    rev = "f2b40ca6c97b2ff7f70d3c00d7ace84200bb31eb";
+    hash = "sha256-mvPRDQpRFClcQS26ARf7Mp2eEhf8AbvDG9DdTGHOrlI=";
   };
 
   meta = {
diff --git a/pkgs/applications/emulators/libretro/cores/pokemini.nix b/pkgs/applications/emulators/libretro/cores/pokemini.nix
new file mode 100644
index 000000000000..7148b40ec13f
--- /dev/null
+++ b/pkgs/applications/emulators/libretro/cores/pokemini.nix
@@ -0,0 +1,24 @@
+{
+  lib,
+  fetchFromGitHub,
+  mkLibretroCore,
+}:
+mkLibretroCore {
+  core = "pokemini";
+  version = "0-unstable-2026-04-20";
+
+  src = fetchFromGitHub {
+    owner = "libretro";
+    repo = "PokeMini";
+    rev = "bb009b1379ad15f1514f20ca7cbf710b4af42b3e";
+    hash = "sha256-iXHUk0gWciJCKfbfIa2pOBPIOeKg1yRahNKesLRC8v8=";
+  };
+
+  makefile = "Makefile";
+
+  meta = {
+    description = "Obscure nintendo handheld emulator";
+    homepage = "https://github.com/libretro/PokeMini";
+    license = lib.licenses.gpl3Only;
+  };
+}
diff --git a/pkgs/applications/emulators/libretro/default.nix b/pkgs/applications/emulators/libretro/default.nix
index 85c0cdfde622..9aea44a64ecf 100644
--- a/pkgs/applications/emulators/libretro/default.nix
+++ b/pkgs/applications/emulators/libretro/default.nix
@@ -141,6 +141,8 @@ lib.makeScope newScope (self: {
 
   picodrive = self.callPackage ./cores/picodrive.nix { };
 
+  pokemini = self.callPackage ./cores/pokemini.nix { };
+
   play = self.callPackage ./cores/play.nix { };
 
   ppsspp = self.callPackage ./cores/ppsspp.nix { };
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index c6a7d718a91e..2b000d59d446 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -589,11 +589,11 @@
     "vendorHash": "sha256-R3Bd+n/ySx4FyDQAP72P0hIjTSQjzNJE2QqUgRV+eQE="
   },
   "hashicorp_google-beta": {
-    "hash": "sha256-MGiIQ+BPe5HUn60EnKwflhxfz1I6NaRxN/OyEh/tXKs=",
+    "hash": "sha256-WsZY4O5kUoOkDcP2iKmkLo85XaBM2oQxaB/7ibJMDwA=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
     "owner": "hashicorp",
     "repo": "terraform-provider-google-beta",
-    "rev": "v7.34.0",
+    "rev": "v7.35.0",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-CjrVDZpRlnPA1MnWEZdFyO3YzgaHqTsiw+kKOW+//2g="
   },
@@ -1409,13 +1409,13 @@
     "vendorHash": null
   },
   "ubiquiti-community_unifi": {
-    "hash": "sha256-Y3MgMRhWmXYp0aYLIkV2Ug5bZb8LsPYr3oJkXhPtQoo=",
+    "hash": "sha256-STJXSLtAN1HR46p/Vs3E0ZB/DQ1NW5HTPK50k9kk3EY=",
     "homepage": "https://registry.terraform.io/providers/ubiquiti-community/unifi",
     "owner": "ubiquiti-community",
     "repo": "terraform-provider-unifi",
-    "rev": "v0.41.25",
+    "rev": "v0.42.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-OVdhM8Zqnm1J8KducnkNkroBoSLER3fHfZBjyp7kBu8="
+    "vendorHash": "sha256-1leizEFn+5VFy3LOAFAogtDT4pyuaG5in0hMat1sORg="
   },
   "ucloud_ucloud": {
     "hash": "sha256-k+NkB1q0oiasLc4+b+mbJ0TNUD67XR9ga9MwSbEXjKQ=",
diff --git a/pkgs/by-name/am/amiberry/package.nix b/pkgs/by-name/am/amiberry/package.nix
index b3ba6478741d..62d9485d2fdf 100644
--- a/pkgs/by-name/am/amiberry/package.nix
+++ b/pkgs/by-name/am/amiberry/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "amiberry";
-  version = "8.1.5";
+  version = "8.1.6";
 
   src = fetchFromGitHub {
     owner = "BlitterStudio";
     repo = "amiberry";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-udSMQxpELpk3Shu3+weHA9S0i/WMdVnrOuLGZ0whEEI=";
+    hash = "sha256-XUq7L2udZDH78UHeZBjbiERRwEwv8+JfxpPnThOGV6k=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/an/anda/package.nix b/pkgs/by-name/an/anda/package.nix
index b4a0d6cbb0a9..949f0b0ba872 100644
--- a/pkgs/by-name/an/anda/package.nix
+++ b/pkgs/by-name/an/anda/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "anda";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "FyraLabs";
     repo = "anda";
     tag = finalAttrs.version;
-    hash = "sha256-9LGFOLlv1F6tTs/Tqe+3D2M+o/5dq3zJ4X0CH7HHzBc=";
+    hash = "sha256-bnjTXLxFDc/blyu2Ns8EV5ZCh97RLJpQsGtavxP9W+4=";
   };
 
-  cargoHash = "sha256-ErBPkTeeDJDcUMDMyOtfHnLpW6Xtsfukv6GqBSFX2DQ=";
+  cargoHash = "sha256-GWPl91Y2DDrFMvsUAZBYburNpPgl2O/ZLeYy0ivclOA=";
 
   __structuredAttrs = true;
 
diff --git a/pkgs/by-name/ap/apktool/package.nix b/pkgs/by-name/ap/apktool/package.nix
index 3132e200e007..a9426671e3b7 100644
--- a/pkgs/by-name/ap/apktool/package.nix
+++ b/pkgs/by-name/ap/apktool/package.nix
@@ -19,14 +19,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "apktool";
-  version = "2.12.1";
+  version = "3.0.2";
 
   src = fetchurl {
     urls = [
-      "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${finalAttrs.version}.jar"
       "https://github.com/iBotPeaches/Apktool/releases/download/v${finalAttrs.version}/apktool_${finalAttrs.version}.jar"
     ];
-    hash = "sha256-Zs9FJKSkWn9WVn0Issm27CN7zdeM7mn9SlnIoCQ66vo=";
+    hash = "sha256-7uRmmnBKFOBiNAfmcBsLkYh+YeHkBJy3qCgz4Urotf0=";
   };
 
   dontUnpack = true;
@@ -38,19 +37,26 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     install -D ${finalAttrs.src} "$out/libexec/apktool/apktool.jar"
     mkdir -p "$out/bin"
+
+    # Keep the default JVM flags from Apktool's upstream launcher script:
+    # https://github.com/iBotPeaches/Apktool/blob/b4a8719101b250b6ad26a7829482c06767a7bbc4/scripts/linux/apktool#L57-L61
     makeWrapper "${jre}/bin/java" "$out/bin/apktool" \
-        --add-flags "-jar $out/libexec/apktool/apktool.jar" \
-        --prefix PATH : ${lib.getBin aapt}
+      --add-flags "-Xmx1024M" \
+      --add-flags "-Dfile.encoding=utf-8" \
+      --add-flags "-Djdk.util.zip.disableZip64ExtraFieldValidation=true" \
+      --add-flags "-Djdk.nio.zipfs.allowDotZipEntry=true" \
+      --add-flags "-jar $out/libexec/apktool/apktool.jar" \
+      --prefix PATH : ${lib.getBin aapt}
   '';
 
   meta = {
     description = "Tool for reverse engineering Android apk files";
     mainProgram = "apktool";
-    homepage = "https://ibotpeaches.github.io/Apktool/";
+    homepage = "https://apktool.org";
     changelog = "https://github.com/iBotPeaches/Apktool/releases/tag/v${finalAttrs.version}";
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     license = lib.licenses.asl20;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ qrzbing ];
     platforms = with lib.platforms; unix;
   };
 })
diff --git a/pkgs/by-name/bl/blazingjj/package.nix b/pkgs/by-name/bl/blazingjj/package.nix
index e399293e9b26..a8668045d26e 100644
--- a/pkgs/by-name/bl/blazingjj/package.nix
+++ b/pkgs/by-name/bl/blazingjj/package.nix
@@ -35,6 +35,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
   doInstallCheck = true;
 
+  checkFlags = [
+    # This tests checks the output of `jj diff`. However, `jj diff` had a change upstream making the test fail. Skip for now, until the test is updated.
+    "--skip=commander::files::tests::get_file_diff"
+  ];
+
   __structuredAttrs = true;
 
   meta = {
diff --git a/pkgs/by-name/bo/bookstack/package.nix b/pkgs/by-name/bo/bookstack/package.nix
index 61bd3243059b..24072b1dd68f 100644
--- a/pkgs/by-name/bo/bookstack/package.nix
+++ b/pkgs/by-name/bo/bookstack/package.nix
@@ -8,16 +8,16 @@
 
 php83.buildComposerProject2 (finalAttrs: {
   pname = "bookstack";
-  version = "26.03.3";
+  version = "26.05";
 
   src = fetchFromGitHub {
     owner = "bookstackapp";
     repo = "bookstack";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HzFniRSt9lt5307K37sj1AbxCIPFVFvvYX1xo4qSSu0=";
+    hash = "sha256-hiq3cM5TpxlwyJwqEYQ1k+zUXsP23vsAb9OMXdXwCZA=";
   };
 
-  vendorHash = "sha256-ZNVJ38KqH1FEhrSlk8+0f3rjFT7FzMtTibmjxjNJFLY=";
+  vendorHash = "sha256-/L2QAc8ezz1cW7a847A7wGPk0DCHrFbnuj2J6KmFS/E=";
 
   passthru = {
     phpPackage = php83;
diff --git a/pkgs/by-name/ce/cert-x-gen/package.nix b/pkgs/by-name/ce/cert-x-gen/package.nix
new file mode 100644
index 000000000000..f34bbbe46596
--- /dev/null
+++ b/pkgs/by-name/ce/cert-x-gen/package.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  fetchFromGitHub,
+  libgit2,
+  openssl,
+  pkg-config,
+  rustPlatform,
+  versionCheckHook,
+  writableTmpDirAsHomeHook,
+  zlib,
+  zstd,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "cert-x-gen";
+  version = "1.1.1";
+
+  src = fetchFromGitHub {
+    owner = "Bugb-Technologies";
+    repo = "cert-x-gen";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-J3VPPOvBKitgtCi5h8LcXkcfFNciMKX0q8cQ/ytXncg=";
+  };
+
+  __structuredAttrs = true;
+
+  cargoHash = "sha256-ze5wLwwp2XdWQNEY+n+M6ZTYfw+QQZUR6V9/mgb32RI=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    libgit2
+    openssl
+    zlib
+    zstd
+  ];
+
+  nativeCheckInputs = [ writableTmpDirAsHomeHook ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+    writableTmpDirAsHomeHook
+  ];
+
+  env = {
+    OPENSSL_NO_VENDOR = true;
+    ZSTD_SYS_USE_PKG_CONFIG = true;
+  };
+
+  meta = {
+    description = "Polyglot execution engine and CLI for vulnerability detection using real code";
+    homepage = "https://github.com/Bugb-Technologies/cert-x-gen";
+    changelog = "https://github.com/Bugb-Technologies/cert-x-gen/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "cxg";
+  };
+})
diff --git a/pkgs/tools/security/chrome-token-signing/default.nix b/pkgs/by-name/ch/chrome-token-signing/package.nix
similarity index 95%
rename from pkgs/tools/security/chrome-token-signing/default.nix
rename to pkgs/by-name/ch/chrome-token-signing/package.nix
index a32680b02f4a..c4fe48cf8a5e 100644
--- a/pkgs/tools/security/chrome-token-signing/default.nix
+++ b/pkgs/by-name/ch/chrome-token-signing/package.nix
@@ -3,8 +3,7 @@
   stdenv,
   fetchFromGitHub,
   pkg-config,
-  wrapQtAppsHook,
-  qmake,
+  qt5,
   pcsclite,
   opensc,
 }:
@@ -22,10 +21,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkg-config
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qmake
+    qt5.qmake
     pcsclite
   ];
   dontUseQmakeConfigure = true;
diff --git a/pkgs/by-name/cr/crocoddyl/package.nix b/pkgs/by-name/cr/crocoddyl/package.nix
index b94bca7cd5cc..da6255b7b1e1 100644
--- a/pkgs/by-name/cr/crocoddyl/package.nix
+++ b/pkgs/by-name/cr/crocoddyl/package.nix
@@ -7,10 +7,13 @@
   ffmpeg,
   ipopt,
   lapack,
+  llvmPackages,
   lib,
   pinocchio,
   pkg-config,
   stdenv,
+
+  withMultithread ? true,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -45,6 +48,10 @@ stdenv.mkDerivation (finalAttrs: {
     pinocchio
   ];
 
+  buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && withMultithread) [
+    llvmPackages.openmp
+  ];
+
   checkInputs = [
     ffmpeg
   ];
@@ -53,8 +60,11 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "INSTALL_DOCUMENTATION" true)
     (lib.cmakeBool "BUILD_EXAMPLES" false)
     (lib.cmakeBool "BUILD_PYTHON_INTERFACE" false)
+    (lib.cmakeBool "BUILD_WITH_MULTITHREADS" withMultithread)
   ];
 
+  passthru = { inherit withMultithread; };
+
   prePatch = ''
     substituteInPlace \
       examples/CMakeLists.txt \
diff --git a/pkgs/by-name/do/domain-check/package.nix b/pkgs/by-name/do/domain-check/package.nix
new file mode 100644
index 000000000000..bc375829d78e
--- /dev/null
+++ b/pkgs/by-name/do/domain-check/package.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "domain-check";
+  version = "1.0.2";
+
+  src = fetchFromGitHub {
+    owner = "saidutt46";
+    repo = "domain-check";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-+gNuwJ0ohpAqpKygwIjBLpOIrW9QFFdyRo3mAFDbGJs=";
+  };
+
+  __structuredAttrs = true;
+
+  cargoHash = "sha256-txgOQvoQ6ADD5VqxUrJ1yr4ycje6b6FCOxIMg3he8Gw=";
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  checkFlags = [
+    # CLI tests
+    "--skip=test_all_with_bootstrap_returns_more_than_32_tlds"
+    "--skip=test_backward_compat_no_generation_flags"
+    "--skip=test_config_detailed_info_respected_without_flag"
+    "--skip=test_custom_preset_from_config"
+    "--skip=test_env_detailed_info_respected_without_flag"
+    # Tests require network access
+    "--skip=test_known_taken_domain_google_com"
+  ];
+
+  doInstallCheck = true;
+
+  meta = {
+    description = "Tool to check domain availability";
+    homepage = "https://github.com/saidutt46/domain-check";
+    changelog = "https://github.com/saidutt46/domain-check/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = with lib.licenses; [
+      asl20
+      mit
+    ];
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "domain-check";
+  };
+})
diff --git a/pkgs/by-name/du/dustracing2d/package.nix b/pkgs/by-name/du/dustracing2d/package.nix
new file mode 100644
index 000000000000..6576222888cb
--- /dev/null
+++ b/pkgs/by-name/du/dustracing2d/package.nix
@@ -0,0 +1,64 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  qt6Packages,
+  openal,
+  libvorbis,
+  libogg,
+  libGL,
+  libGLU,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "dustracing2d";
+  version = "2.2.0";
+
+  src = fetchFromGitHub {
+    owner = "juzzlin";
+    repo = "DustRacing2D";
+    tag = finalAttrs.version;
+    hash = "sha256-1+oKSO0pjUBgnlM9J2BB7Xyqbk8liebzUqxKY5M82qg=";
+  };
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    qt6Packages.wrapQtAppsHook
+    qt6Packages.qttools
+  ];
+
+  buildInputs = [
+    qt6Packages.qtbase
+    qt6Packages.qtsvg
+    qt6Packages.qtwayland
+    openal
+    libvorbis
+    libogg
+    libGL
+    libGLU
+  ];
+
+  cmakeFlags = [
+    "-DReleaseBuild=ON"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Top-down 2D racing game with split-screen multiplayer";
+    homepage = "https://juzzlin.github.io/DustRacing2D/index.html";
+    downloadPage = "https://github.com/juzzlin/DustRacing2D";
+    changelog = "https://github.com/juzzlin/DustRacing2D/releases/tag/${finalAttrs.version}";
+    mainProgram = "dustrac-game";
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ castorNova2 ];
+  };
+})
diff --git a/pkgs/tools/misc/fluentd/Gemfile b/pkgs/by-name/fl/fluentd/Gemfile
similarity index 100%
rename from pkgs/tools/misc/fluentd/Gemfile
rename to pkgs/by-name/fl/fluentd/Gemfile
diff --git a/pkgs/tools/misc/fluentd/Gemfile.lock b/pkgs/by-name/fl/fluentd/Gemfile.lock
similarity index 100%
rename from pkgs/tools/misc/fluentd/Gemfile.lock
rename to pkgs/by-name/fl/fluentd/Gemfile.lock
diff --git a/pkgs/tools/misc/fluentd/gemset.nix b/pkgs/by-name/fl/fluentd/gemset.nix
similarity index 100%
rename from pkgs/tools/misc/fluentd/gemset.nix
rename to pkgs/by-name/fl/fluentd/gemset.nix
diff --git a/pkgs/tools/misc/fluentd/default.nix b/pkgs/by-name/fl/fluentd/package.nix
similarity index 100%
rename from pkgs/tools/misc/fluentd/default.nix
rename to pkgs/by-name/fl/fluentd/package.nix
diff --git a/pkgs/by-name/in/inklecate/dotnet-8-upgrade.patch b/pkgs/by-name/in/inklecate/dotnet-8-upgrade.patch
deleted file mode 100644
index c16d94d476e6..000000000000
--- a/pkgs/by-name/in/inklecate/dotnet-8-upgrade.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/InkTestBed/InkTestBed.csproj b/InkTestBed/InkTestBed.csproj
-index d729fee..ea3e9e6 100644
---- a/InkTestBed/InkTestBed.csproj
-+++ b/InkTestBed/InkTestBed.csproj
-@@ -2,7 +2,7 @@
- 
-   <PropertyGroup>
-     <OutputType>Exe</OutputType>
--    <TargetFramework>net6.0</TargetFramework>
-+    <TargetFramework>net8.0</TargetFramework>
-     <TieredCompilation>true</TieredCompilation>
-     <RootNamespace>InkTestBed</RootNamespace>
-     <AssemblyName>InkTestBed</AssemblyName>
-diff --git a/compiler/ink_compiler.csproj b/compiler/ink_compiler.csproj
-index a6dd06b..c4708cc 100644
---- a/compiler/ink_compiler.csproj
-+++ b/compiler/ink_compiler.csproj
-@@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
- 
-   <PropertyGroup>
--    <TargetFramework>net6.0</TargetFramework>
-+    <TargetFramework>net8.0</TargetFramework>
-     <RootNamespace>Ink</RootNamespace>
-     <AssemblyName>ink_compiler</AssemblyName>
-   </PropertyGroup>
-diff --git a/ink-engine-runtime/ink-engine-runtime.csproj b/ink-engine-runtime/ink-engine-runtime.csproj
-index caba6df..777c109 100644
---- a/ink-engine-runtime/ink-engine-runtime.csproj
-+++ b/ink-engine-runtime/ink-engine-runtime.csproj
-@@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
- 
-   <PropertyGroup>
--    <TargetFrameworks>net6.0</TargetFrameworks>
-+    <TargetFramework>net8.0</TargetFramework>
-     <RootNamespace>Ink.Runtime</RootNamespace>
-     <AssemblyName>ink-engine-runtime</AssemblyName>
-   </PropertyGroup>
-diff --git a/inklecate/inklecate.csproj b/inklecate/inklecate.csproj
-index 0a02264..cf7b254 100644
---- a/inklecate/inklecate.csproj
-+++ b/inklecate/inklecate.csproj
-@@ -2,7 +2,7 @@
- 
-   <PropertyGroup>
-     <OutputType>Exe</OutputType>
--    <TargetFramework>net6.0</TargetFramework>
-+    <TargetFramework>net8.0</TargetFramework>
-     <RootNamespace>Ink</RootNamespace>
-     <AssemblyName>inklecate</AssemblyName>
-   </PropertyGroup>
-diff --git a/tests/tests.csproj b/tests/tests.csproj
-index 8d3bd6b..a9731c5 100644
---- a/tests/tests.csproj
-+++ b/tests/tests.csproj
-@@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
- 
-   <PropertyGroup>
--    <TargetFramework>net6.0</TargetFramework>
-+    <TargetFramework>net8.0</TargetFramework>
-     <RootNamespace>tests</RootNamespace>
-     <AssemblyName>ink-tests</AssemblyName>
- 
diff --git a/pkgs/by-name/in/inklecate/package.nix b/pkgs/by-name/in/inklecate/package.nix
index 00a10e71d0ae..4ff83e0b78a9 100644
--- a/pkgs/by-name/in/inklecate/package.nix
+++ b/pkgs/by-name/in/inklecate/package.nix
@@ -8,16 +8,20 @@
 
 buildDotnetModule rec {
   pname = "inklecate";
-  version = "1.1.1";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "inkle";
     repo = "ink";
     rev = "v${version}";
-    hash = "sha512-aUjjT5Qf64wrKRn1vkwJadMOBWMkvsXUjtZ7S3/ZWAh1CCDkQNO84mSbtbVc9ny0fKeJEqaDX2tJNwq7pYqAbA==";
+    hash = "sha256-IEYn7GHUTLABGVZH2AYUpbGeuZvUPbwHz5GcuMrRem8=";
   };
 
-  patches = [ ./dotnet-8-upgrade.patch ];
+  postPatch = ''
+    find . -name "*.csproj" -exec sed -i 's/net6.0/net8.0/g' {} +
+    find . -name "*.csproj" -exec sed -i 's/netstandard2.0/net8.0/g' {} +
+    find . -name "*.csproj" -exec sed -i 's/netstandard1.0;//g' {} +
+  '';
 
   buildInputs = [ (lib.getLib stdenv.cc.cc) ];
 
@@ -39,6 +43,6 @@ buildDotnetModule rec {
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     badPlatforms = lib.platforms.aarch64;
-    maintainers = with lib.maintainers; [ shreerammodi ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/networking/cluster/kubeval/schema.nix b/pkgs/by-name/ku/kubeval-schema/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kubeval/schema.nix
rename to pkgs/by-name/ku/kubeval-schema/package.nix
diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/by-name/ku/kubeval/package.nix
similarity index 80%
rename from pkgs/applications/networking/cluster/kubeval/default.nix
rename to pkgs/by-name/ku/kubeval/package.nix
index a27d056d10a9..e48c67c5dc0b 100644
--- a/pkgs/applications/networking/cluster/kubeval/default.nix
+++ b/pkgs/by-name/ku/kubeval/package.nix
@@ -5,15 +5,15 @@
   fetchpatch,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "kubeval";
   version = "0.16.1";
 
   src = fetchFromGitHub {
     owner = "instrumenta";
     repo = "kubeval";
-    rev = "v${version}";
-    sha256 = "sha256-pwJOV7V78H2XaMiiJvKMcx0dEwNDrhgFHmCRLAwMirg=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-pwJOV7V78H2XaMiiJvKMcx0dEwNDrhgFHmCRLAwMirg=";
   };
 
   patches = [
@@ -21,7 +21,7 @@ buildGoModule rec {
     (fetchpatch {
       name = "bump-golang.org/x/sys.patch";
       url = "https://github.com/instrumenta/kubeval/commit/d64502b04d9e1b85fd3d5509049adb50f3e39954.patch";
-      sha256 = "sha256-S/lgwdykFLU2QZRW927fgCPxaIAMK3vSqmH08pXBQxM=";
+      hash = "sha256-S/lgwdykFLU2QZRW927fgCPxaIAMK3vSqmH08pXBQxM=";
     })
   ];
 
@@ -39,4 +39,4 @@ buildGoModule rec {
       nicknovitski
     ];
   };
-}
+})
diff --git a/pkgs/by-name/li/libgourou/package.nix b/pkgs/by-name/li/libgourou/package.nix
index 8b88a758a885..fd5040c53f5c 100644
--- a/pkgs/by-name/li/libgourou/package.nix
+++ b/pkgs/by-name/li/libgourou/package.nix
@@ -12,14 +12,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libgourou";
-  version = "0.8.8";
+  version = "0.8.9";
 
   src = fetchFromGitea {
     domain = "forge.soutade.fr";
     owner = "soutade";
     repo = "libgourou";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WQOlanavMy1z3ze+c8d1a7ZkAU60/GjEFS5JJfyNHMg=";
+    hash = "sha256-KwDpyWtEsXacCcCbj0QlNucOy/S62NiPocf+G7YINwU=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/li/libks/package.nix b/pkgs/by-name/li/libks/package.nix
index f8df68f2f6aa..596135ce7112 100644
--- a/pkgs/by-name/li/libks/package.nix
+++ b/pkgs/by-name/li/libks/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libks";
-  version = "2.0.10";
+  version = "2.0.11";
 
   src = fetchFromGitHub {
     owner = "signalwire";
     repo = "libks";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oLf1ECSKa6KLTA8MO0le44eEDaLmPz/RHoLa8ZSwjWs=";
+    hash = "sha256-tPhGXDEAKgeODAcM6hu4GDU83A3Zi7sIMnTQkfCGlFc=";
   };
 
   patches = [
diff --git a/pkgs/by-name/me/mesen/deps.json b/pkgs/by-name/me/mesen/deps.json
index 47072422d04e..875f9b145830 100644
--- a/pkgs/by-name/me/mesen/deps.json
+++ b/pkgs/by-name/me/mesen/deps.json
@@ -1,8 +1,8 @@
 [
   {
     "pname": "Avalonia",
-    "version": "11.3.1",
-    "hash": "sha256-732wl4/JmvYFS26NLvPD7T/V3J3JZUDy6Xwj5p1TNyE="
+    "version": "11.3.14",
+    "hash": "sha256-HOC9J/SzIMQnVSWepH2CroVZl+mNLmluwKiF5Lb2c8c="
   },
   {
     "pname": "Avalonia.Angle.Windows.Natives",
@@ -11,73 +11,73 @@
   },
   {
     "pname": "Avalonia.AvaloniaEdit",
-    "version": "11.3.0",
-    "hash": "sha256-avrZ9um57Y3wTslyeBAXeCQrcb7a3kODFc0SSvthHF4="
+    "version": "11.4.1",
+    "hash": "sha256-OOozpi/5bq3dbZlXvFoXEtxTndJer0AjBYWPwgLR1xk="
   },
   {
     "pname": "Avalonia.BuildServices",
-    "version": "0.0.31",
-    "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA="
+    "version": "11.3.2",
+    "hash": "sha256-6wx06tjSKWQOlX2czdp6Wh0nuwVapx5qf/s8Qj5we40="
   },
   {
     "pname": "Avalonia.Controls.ColorPicker",
-    "version": "11.3.1",
-    "hash": "sha256-95sAkALievpuwLtCl7+6PgwNyxx9DAi/vVvQUFT7Qqs="
+    "version": "11.3.14",
+    "hash": "sha256-ndk+/+wC9VmrjlqAXOeWACu/G/GOqS6D8mGTaKKVbes="
   },
   {
     "pname": "Avalonia.Desktop",
-    "version": "11.3.1",
-    "hash": "sha256-H6SLCi3by9bFF1YR12PnNZSmtC44UQPKr+5+8LvqC90="
+    "version": "11.3.14",
+    "hash": "sha256-Y9f17/CMhHr5t93qQW+NbBXSt5U4y8NuUo/7HhWr/3U="
   },
   {
     "pname": "Avalonia.Diagnostics",
-    "version": "11.3.1",
-    "hash": "sha256-zDX3BfqUFUQ+p1ZWdHuhnV0n5B9RfiEtB8m0Px5AhsI="
+    "version": "11.3.14",
+    "hash": "sha256-e2djpATUmFtAMEtjaM1E2Bjg80iWUNHrI75EZqm5i/A="
   },
   {
     "pname": "Avalonia.FreeDesktop",
-    "version": "11.3.1",
-    "hash": "sha256-Iph1SQazNNr9liox0LR7ITidAEEWhp8Mg9Zn4MZVkRQ="
+    "version": "11.3.14",
+    "hash": "sha256-VCzQb1GjMhM2WlqYdlRMlZcY34XQWgHwpcq8BpUghlI="
   },
   {
     "pname": "Avalonia.Native",
-    "version": "11.3.1",
-    "hash": "sha256-jNzqmHm58bbPGs/ogp6gFvinbN81Psg+sg+Z5UsbcDs="
+    "version": "11.3.14",
+    "hash": "sha256-DVB/68Vnkvhj2TvFV6oPcZ7+vrvX55CxrnFBxuvELog="
   },
   {
     "pname": "Avalonia.ReactiveUI",
-    "version": "11.3.1",
-    "hash": "sha256-m7AFSxwvfz9LAueu0AFC+C7jHrB+lysBmpBh7bhpmUs="
+    "version": "11.3.8",
+    "hash": "sha256-QwIPrfoxNw/u/deWc5C3ps0eQDBFOocMH74nlVahQuM="
   },
   {
     "pname": "Avalonia.Remote.Protocol",
-    "version": "11.3.1",
-    "hash": "sha256-evkhJOxKjsR+jNLrXRcrhqjFdlrxYMMMRBJ6FK08vMM="
+    "version": "11.3.14",
+    "hash": "sha256-iaQE1lCVpTGFe33UhPpbONGwtWBJ3bCzr46MqRJBrI8="
   },
   {
     "pname": "Avalonia.Skia",
-    "version": "11.3.1",
-    "hash": "sha256-zN09CcuSqtLcQrTCQOoPJrhLd4LioZqt/Qi4sDp/cJI="
+    "version": "11.3.14",
+    "hash": "sha256-L9oxOx8sxyYeEgHwfHpgRMBYIBSsFNSMe+Go6L7NUow="
   },
   {
     "pname": "Avalonia.Themes.Fluent",
-    "version": "11.3.1",
-    "hash": "sha256-PApWHwIoLzbzrnyXJQLVy85Rbxag7NFEKMXOs2iVVaA="
+    "version": "11.3.14",
+    "hash": "sha256-TwUZlS6dKo6MVm25a+X2YXdGny6MoPQJDSxABrLl42I="
   },
   {
     "pname": "Avalonia.Themes.Simple",
-    "version": "11.3.1",
-    "hash": "sha256-U9btigJeFcuOu7T3ryyJJesffnZo1JBb9pWkF0PFu9s="
+    "version": "11.3.14",
+    "hash": "sha256-20PkEOaIzUsvOgqu5Rlx7ZTqi/BsgG77vemBDM+8elc="
   },
   {
     "pname": "Avalonia.Win32",
-    "version": "11.3.1",
-    "hash": "sha256-w3+8luJByeIchiVQ0wsq0olDabX/DndigyBEuK8Ty04="
+    "version": "11.3.14",
+    "hash": "sha256-0E+Jax/+VNIHY0FLiydXdkkRiQiGxWnzy1ZpRMvPU2g="
   },
   {
     "pname": "Avalonia.X11",
-    "version": "11.3.1",
-    "hash": "sha256-0iUFrDM+10T3OiOeGSEiqQ6EzEucQL3shZUNqOiqkyQ="
+    "version": "11.3.14",
+    "hash": "sha256-ZDNqbc2Rq1Sf7PvTPM+pDog7Lv4vcz2013EOe57w5FA="
   },
   {
     "pname": "CommunityToolkit.Mvvm",
@@ -261,7 +261,7 @@
   },
   {
     "pname": "Tmds.DBus.Protocol",
-    "version": "0.21.2",
-    "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI="
+    "version": "0.21.3",
+    "hash": "sha256-HVEIHSeSe29ergHxsNvWYu3o7Ai8VZKo09yFn+miTnI="
   }
 ]
diff --git a/pkgs/by-name/me/mesen/package.nix b/pkgs/by-name/me/mesen/package.nix
index 8f5287167819..137d8a419c94 100644
--- a/pkgs/by-name/me/mesen/package.nix
+++ b/pkgs/by-name/me/mesen/package.nix
@@ -12,13 +12,13 @@
 
 buildDotnetModule rec {
   pname = "mesen";
-  version = "2.1.1";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
-    owner = "SourMesen";
-    repo = "Mesen2";
+    owner = "nesdev-org";
+    repo = "MesenCE";
     tag = version;
-    hash = "sha256-vBwAPAnp6HIgI49vAZIqnzw8xHQ7ZMuALjf7G+acCXg=";
+    hash = "sha256-IH8Or+UVapQW0PXPanMVaOIQVT85TEYU2utKBbvuW6c=";
   };
 
   patches = [
diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 3bc1ca762a34..bb30db2dfd79 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -164,11 +164,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "148.0.3967.83";
+  version = "149.0.4022.52";
 
   src = fetchurl {
     url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
-    hash = "sha256-EFKJQROzVN0t1srIFUiC2NIlTiouFGkkIcRDaLS17OA=";
+    hash = "sha256-3lFhfxkS80P59dk00lpBp+8IIFUvSEJVGGTfAghxw4g=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly
diff --git a/pkgs/by-name/mi/mim-solvers/package.nix b/pkgs/by-name/mi/mim-solvers/package.nix
index 28bd2bf43e02..bd3ac880fd01 100644
--- a/pkgs/by-name/mi/mim-solvers/package.nix
+++ b/pkgs/by-name/mi/mim-solvers/package.nix
@@ -28,7 +28,9 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp;
+  buildInputs = lib.optional (
+    stdenv.hostPlatform.isDarwin && crocoddyl.withMultithread
+  ) llvmPackages.openmp;
 
   propagatedBuildInputs = [
     crocoddyl
@@ -38,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     (lib.cmakeBool "BUILD_PYTHON_INTERFACE" false)
     (lib.cmakeBool "BUILD_WITH_PROXSUITE" true)
+    (lib.cmakeBool "BUILD_WITH_MULTITHREADS" crocoddyl.withMultithread)
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/by-name/mo/mochi/package.nix b/pkgs/by-name/mo/mochi/package.nix
index 7713b9687388..8eb6000d6abd 100644
--- a/pkgs/by-name/mo/mochi/package.nix
+++ b/pkgs/by-name/mo/mochi/package.nix
@@ -12,14 +12,14 @@
 
 let
   pname = "mochi";
-  version = "1.21.11";
+  version = "1.21.14";
 
   linux = appimageTools.wrapType2 rec {
     inherit pname version meta;
 
     src = fetchurl {
       url = "https://download.mochi.cards/releases/Mochi-${version}.AppImage";
-      hash = "sha256-BJqExdJ8Li7tCEZ+2QBsrJ32OQoBsnngVjs3cXzrMv4=";
+      hash = "sha256-+iMT8xofQB2m1V4rNZHR6loRfxNGgcptD3FPlFXC5Mw=";
     };
 
     appimageContents = appimageTools.extractType2 { inherit pname version src; };
@@ -44,9 +44,9 @@ let
       url = "https://download.mochi.cards/releases/Mochi-${version}${lib.optionalString stdenv.hostPlatform.isAarch64 "-arm64"}.dmg";
       hash =
         if stdenv.hostPlatform.isAarch64 then
-          "sha256-PNsCI93TKmvaGvHGu2fR6mvWvdbnhjsOro386fAiBaM="
+          "sha256-/ML5jWTBVLzitZDaBoU6sVJ0iNmq0jjMIV33yLnX1io="
         else
-          "sha256-qe76TDQiIIH41FsEmT7fJUcFnf5WM2gXx9rrCZd7/6Y=";
+          "sha256-vldyC/VkHf+BofpKvOxzCTM8F77k2aX9CxFP+frKvKc=";
     };
 
     sourceRoot = ".";
diff --git a/pkgs/by-name/mp/mprocs/package.nix b/pkgs/by-name/mp/mprocs/package.nix
index f6b04bf56f53..0b7893c892eb 100644
--- a/pkgs/by-name/mp/mprocs/package.nix
+++ b/pkgs/by-name/mp/mprocs/package.nix
@@ -8,16 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mprocs";
-  version = "0.9.2";
+  version = "0.9.6";
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "pvolok";
     repo = "mprocs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UZFFeaesT71UQHPjiG2w5O2Ulyt86OVuFw7i3A7b91I=";
+    hash = "sha256-fh294Re4gEveWgX29m0SXdI8hwuiXuniTq7pVZ464ws=";
   };
 
-  cargoHash = "sha256-htgl0zh73oHXbc9E90xtb5jM8zhXvSJCE9DBhd1SH2E=";
+  cargoHash = "sha256-Qp0o7ruXUZBCi7Abrj8V5MAY/qzo5Uf7pwIcFGwCfnw=";
 
   nativeInstallCheckInputs = [
     versionCheckHook
diff --git a/pkgs/by-name/ms/msedgedriver/package.nix b/pkgs/by-name/ms/msedgedriver/package.nix
index 5598224b7e46..053d4e347fac 100644
--- a/pkgs/by-name/ms/msedgedriver/package.nix
+++ b/pkgs/by-name/ms/msedgedriver/package.nix
@@ -11,11 +11,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "msedgedriver";
-  version = "148.0.3967.83";
+  version = "149.0.4022.52";
 
   src = fetchzip {
     url = "https://msedgedriver.microsoft.com/${finalAttrs.version}/edgedriver_linux64.zip";
-    hash = "sha256-oD28vHpX/YS46fQ+006XoUVrN/Mr676qQ63IkK6ioJc=";
+    hash = "sha256-GLPkBOlXDTpjYrrc9odDeHXXZ8vLPiw06v1bIN1zOpo=";
     stripRoot = false;
   };
 
diff --git a/pkgs/by-name/my/mycelium/package.nix b/pkgs/by-name/my/mycelium/package.nix
index ad20602e7c27..b3fd2608f9d1 100644
--- a/pkgs/by-name/my/mycelium/package.nix
+++ b/pkgs/by-name/my/mycelium/package.nix
@@ -10,7 +10,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mycelium";
-  version = "0.7.9";
+  version = "0.7.10";
 
   sourceRoot = "${finalAttrs.src.name}/myceliumd";
 
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "threefoldtech";
     repo = "mycelium";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-YQq8lW+F/c92884XqUOw1XeNK6bL1EEkSyNJzj0OKLo=";
+    hash = "sha256-lKhq0+mymon6Xu82CSF96Kys1XSOpV/J+nwVywnUur4=";
   };
 
-  cargoHash = "sha256-Ctg5c88i/fn5AJNoAaEJ90HaKooAAQgflrA0mbHAaDU=";
+  cargoHash = "sha256-heHR/iR5OUctvXh6HUpfrJtoKeziY6bqT0vkXPOEjIU=";
 
   nativeBuildInputs = [ versionCheckHook ];
 
diff --git a/pkgs/by-name/ne/netwatch/package.nix b/pkgs/by-name/ne/netwatch/package.nix
new file mode 100644
index 000000000000..d38bda29f38f
--- /dev/null
+++ b/pkgs/by-name/ne/netwatch/package.nix
@@ -0,0 +1,44 @@
+{
+  fetchFromGitHub,
+  lib,
+  libpcap,
+  nix-update-script,
+  pkg-config,
+  rustPlatform,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "netwatch-tui";
+  version = "0.25.4";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "matthart1983";
+    repo = "netwatch";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-rbQ9lTQJgy93Z2WojaTkU5z1fkJX4mUjsx2Or7FNrJc=";
+  };
+
+  cargoHash = "sha256-D06ywfwurtfI8NAfGS88YOoSVi4KfjEBgUA8EfLKamQ=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ libpcap ];
+
+  doInstallCheck = true;
+  nativeCheckInputs = [ versionCheckHook ];
+
+  __darwinAllowLocalNetworking = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Real-time network diagnostics in your terminal.";
+    homepage = "https://github.com/matthart1983/netwatch";
+    changelog = "https://github.com/matthart1983/netwatch/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    mainProgram = "netwatch";
+    maintainers = with lib.maintainers; [ tomasrivera ];
+  };
+})
diff --git a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py
index 7dbb78e07588..5b3c30ee1da4 100644
--- a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py
+++ b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py
@@ -372,6 +372,7 @@ class ManualHTMLRenderer(RendererMixin, HTMLRenderer):
             '<html xmlns="http://www.w3.org/1999/xhtml">',
             ' <head>',
             '  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />',
+            '  <meta name="viewport" content="width=device-width, initial-scale=1" />',
             f' <title>{toc.target.title}</title>',
             "".join((f'<link rel="stylesheet" type="text/css" href="{html.escape(style, True)}" />'
                      for style in self._html_params.stylesheets)),
diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 558683192fc7..f05b371aaa27 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -16,7 +16,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "1.15.13";
+  version = "1.16.2";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     owner = "anomalyco";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+zHwO5ZY8D2s1gZzxoYI7c8yWmQSduPwv4MoFruhhPA=";
+    hash = "sha256-IpTD4YCgGNtYlZ6EoyY+YLD81rIFR0D2A4W3uhWSSfo=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {
@@ -78,7 +78,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     # NOTE: Required else we get errors that our fixed-output derivation references store paths
     dontFixup = true;
 
-    outputHash = "sha256-lDobNmjO+kAqjhYq+vCVa9v+H7DABlxwSJ0ILP4kgrA=";
+    outputHash = "sha256-4yjQlxN+U4CKwA/hE8gACuvA4bBeTrX0ACVBIK4UQCg=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };
diff --git a/pkgs/by-name/op/openthread-border-router/package.nix b/pkgs/by-name/op/openthread-border-router/package.nix
index b1c8bc935e02..edd4d40fd262 100644
--- a/pkgs/by-name/op/openthread-border-router/package.nix
+++ b/pkgs/by-name/op/openthread-border-router/package.nix
@@ -5,26 +5,23 @@
   cmake,
   pkg-config,
   systemdLibs,
-  avahi,
   dbus,
   protobuf,
   jsoncpp,
   boost,
-  libnetfilter_queue,
-  libnfnetlink,
   nodejs,
   bashNonInteractive,
   buildNpmPackage,
 }:
 let
   pname = "openthread-border-router";
-  version = "0-unstable-2025-06-12";
+  version = "2026.06.0";
 
   src = fetchFromGitHub {
     owner = "openthread";
     repo = "ot-br-posix";
-    rev = "thread-reference-20250612";
-    hash = "sha256-lPMMLtbPu9NpDcBCZE6XID7u1maCAhkZiSDEyFq7yvg=";
+    tag = "v${version}";
+    hash = "sha256-7si62h1nXnAzEmloThCcOeY3VhfSIFV+7kWKgJywcvk=";
     fetchSubmodules = true;
   };
 
@@ -42,9 +39,6 @@ stdenv.mkDerivation {
   strictDeps = true;
   __structuredAttrs = true;
 
-  # warning _FORTIFY_SOURCE requires compiling with optimization (-O)
-  env.NIX_CFLAGS_COMPILE = "-O";
-
   patches = [
     # Patch the firewall script so we can run it within the systemd start script
     ./firewall-script.patch
@@ -62,13 +56,10 @@ stdenv.mkDerivation {
   '';
 
   buildInputs = [
-    avahi # TODO: upstream deprecated OTBR_MDNS=avahi after this release (https://github.com/openthread/ot-br-posix/pull/3240)
     systemdLibs
     protobuf
     jsoncpp
     boost
-    libnetfilter_queue
-    libnfnetlink
     dbus
     (lib.getBin bashNonInteractive)
   ];
@@ -85,6 +76,9 @@ stdenv.mkDerivation {
     (lib.cmakeBool "Boost_USE_STATIC_LIBS" false)
     (lib.cmakeBool "OTBR_REST" true)
 
+    # OpenThread's built-in mDNS publisher (upstream default). No Avahi daemon needed.
+    (lib.cmakeFeature "OTBR_MDNS" "openthread")
+
     (lib.cmakeBool "OTBR_WEB" true)
     (lib.cmakeBool "OTBR_NAT64" true)
     (lib.cmakeBool "OTBR_BACKBONE_ROUTER" true)
@@ -93,9 +87,12 @@ stdenv.mkDerivation {
     (lib.cmakeBool "OTBR_TREL" true)
 
     (lib.cmakeFeature "OTBR_VERSION" version)
-    (lib.cmakeBool "OTBR_DNSSD_DISCOVERY_PROXY" true)
-    (lib.cmakeBool "OTBR_SRP_ADVERTISING_PROXY" true)
-    (lib.cmakeBool "OTBR_DUA_ROUTING" true)
+    # otbr-agent aborts on startup with "Vendor name must be set." unless a vendor
+    # and product name are baked in at build time.
+    (lib.cmakeFeature "OTBR_VENDOR_NAME" "NixOS")
+    (lib.cmakeFeature "OTBR_PRODUCT_NAME" "OpenThread Border Router")
+    # OTBR_MDNS=openthread turns on the OT-core advertising and discovery proxies by default.
+    # The discovery proxy gives us the DNS-SD server OTBR_DNS_UPSTREAM_QUERY needs.
     (lib.cmakeBool "OTBR_DNS_UPSTREAM_QUERY" true)
 
     (lib.cmakeBool "OT_CHANNEL_MANAGER" true)
diff --git a/pkgs/by-name/re/redumper/package.nix b/pkgs/by-name/re/redumper/package.nix
index 9e7eb75f491e..2e7df105a3cd 100644
--- a/pkgs/by-name/re/redumper/package.nix
+++ b/pkgs/by-name/re/redumper/package.nix
@@ -13,13 +13,13 @@
 # redumper is using C++ modules, this requires latest C++20 compiler and build tools
 llvmPackages.libcxxStdenv.mkDerivation (finalAttrs: {
   pname = "redumper";
-  version = "720";
+  version = "722";
 
   src = fetchFromGitHub {
     owner = "superg";
     repo = "redumper";
     tag = "b${finalAttrs.version}";
-    hash = "sha256-Gl+BJV9yWFGHk5HZudre+YUaaqCYcQpT50oeDcc39ds=";
+    hash = "sha256-6UphK1Dq7szUMNqVuFNDK6/5AraOHDGeTXa5bzZo3PI=";
   };
 
   patches = [
diff --git a/pkgs/by-name/tr/trusttunnel-endpoint/package.nix b/pkgs/by-name/tr/trusttunnel-endpoint/package.nix
index e1266df50626..be5c3aee93c3 100644
--- a/pkgs/by-name/tr/trusttunnel-endpoint/package.nix
+++ b/pkgs/by-name/tr/trusttunnel-endpoint/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "trusttunnel-endpoint";
-  version = "1.0.33";
+  version = "1.0.41";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "TrustTunnel";
     repo = "TrustTunnel";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uTAjZbPBCVucjjrl3cYCT6+6cSxiIe/Q3jm+Oa+Fl7E=";
+    hash = "sha256-ZFlHX17n0GQ+HVbJD9NQ5Jeg93G9A7dkjSkRD84ZNFQ=";
   };
 
-  cargoHash = "sha256-njQL6YtnRtfpyvsxoTmsSILvyKwYqg42DXsZ8zkhBWo=";
+  cargoHash = "sha256-2ivFP6JjFFlScO6jcaHOTzcmntKlmOmJQE0q/81NOxc=";
 
   postPatch = ''
     substituteInPlace $cargoDepsCopy/*/boring-sys-*/build/main.rs $cargoDepsCopy/*/quiche-*/src/build.rs \
diff --git a/pkgs/applications/networking/remote/x2gokdriveclient/default.nix b/pkgs/by-name/x2/x2gokdriveclient/package.nix
similarity index 92%
rename from pkgs/applications/networking/remote/x2gokdriveclient/default.nix
rename to pkgs/by-name/x2/x2gokdriveclient/package.nix
index 162f0fe8c8b7..e339c39a3a21 100644
--- a/pkgs/applications/networking/remote/x2gokdriveclient/default.nix
+++ b/pkgs/by-name/x2/x2gokdriveclient/package.nix
@@ -3,11 +3,7 @@
   lib,
   fetchgit,
   qt5,
-  qtbase,
-  qtx11extras,
-  qttools,
   zlib,
-  gnumake,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -27,9 +23,9 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    qtbase
-    qtx11extras
-    qttools
+    qt5.qtbase
+    qt5.qtx11extras
+    qt5.qttools
     zlib
   ];
 
@@ -42,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail "SHELL=/bin/bash" "SHELL=$SHELL" \
       --replace-fail "MAKEOVERRIDES" "NOMAKEOVERRIDES " \
       --replace-fail ".MAKEFLAGS" ".NOFLAGS " \
-      --replace-fail "qmake" "${qtbase.dev}/bin/qmake" \
+      --replace-fail "qmake" "${qt5.qtbase.dev}/bin/qmake" \
       --replace-fail "-o root -g root" ""
     substituteInPlace \
       VERSION.x2gokdriveclient \
diff --git a/pkgs/by-name/ya/yamlscript/package.nix b/pkgs/by-name/ya/yamlscript/package.nix
index edd2c83b2d39..36c286df2dcd 100644
--- a/pkgs/by-name/ya/yamlscript/package.nix
+++ b/pkgs/by-name/ya/yamlscript/package.nix
@@ -6,11 +6,11 @@
 
 buildGraalvmNativeImage (finalAttrs: {
   pname = "yamlscript";
-  version = "0.2.8";
+  version = "0.2.12";
 
   src = fetchurl {
     url = "https://github.com/yaml/yamlscript/releases/download/${finalAttrs.version}/yamlscript.cli-${finalAttrs.version}-standalone.jar";
-    hash = "sha256-qA8j14xUWtg2988ahklawnRZl9u3pvogjjXXs8byE2g=";
+    hash = "sha256-/+vvOvZFVzGNC5838vX2CnLD5V2gEWWTXzEfz0AoSb8=";
   };
 
   extraNativeImageBuildArgs = [
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 537bce427b8e..460cdc6dad5e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -832,6 +832,15 @@ with haskellLib;
   # Tests require a Kafka broker running locally
   haskakafka = dontCheck super.haskakafka;
 
+  # https://github.com/itchyny/qhs/issues/8
+  qhs = overrideSrc {
+    version = "0.4.3";
+    src = pkgs.fetchzip {
+      url = "mirror://hackage/qhs-0.4.3/qhs-0.4.3.tar.gz";
+      sha256 = "191015m47qdxzi8w5pvadgv95g8vk7v2gr76jzfgglyjy6zhb5wb";
+    };
+  } (warnAfterVersion "0.4.2" super.qhs);
+
   # Fix build with time >= 1.10 while retaining compat with time < 1.9
   mbox = appendPatch ./patches/mbox-time-1.10.patch (
     overrideCabal {
diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix
index 487db708c48d..bdab68723322 100644
--- a/pkgs/development/haskell-modules/configuration-darwin.nix
+++ b/pkgs/development/haskell-modules/configuration-darwin.nix
@@ -418,6 +418,13 @@ self: super:
         ${old.postInstall or ""}
       '';
     }) super.happy;
+    hadolint = overrideCabal (old: {
+      postInstall = ''
+        remove-references-to -t ${self.ShellCheck} "$out/bin/hadolint"
+
+        ${old.postInstall or ""}
+      '';
+    }) super.hadolint;
 
     # https://github.com/fpco/unliftio/issues/87
     unliftio = dontCheck super.unliftio;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index 683cd7ef0eba..3e2852cd6669 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -5160,7 +5160,6 @@ broken-packages:
   - qc-oi-testgenerator # failure in job https://hydra.nixos.org/build/233197822 at 2023-09-02
   - qd # failure in job https://hydra.nixos.org/build/233213936 at 2023-09-02
   - qed # failure in job https://hydra.nixos.org/build/233249635 at 2023-09-02
-  - qhs # failure in job https://hydra.nixos.org/build/315099159 at 2025-11-29
   - qhull-simple # failure in job https://hydra.nixos.org/build/233248108 at 2023-09-02
   - qif # failure in job https://hydra.nixos.org/build/233227609 at 2023-09-02
   - QIO # failure in job https://hydra.nixos.org/build/233233009 at 2023-09-02
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index eae4e1c104f6..601a7048781a 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -134,6 +134,18 @@ builtins.intersectAttrs super {
   ### END HASKELL-LANGUAGE-SERVER SECTION ###
   ###########################################
 
+  qhs = lib.pipe super.qhs [
+    # Package does not declare tool dependency hspec-discover
+    (addTestToolDepends [ self.hspec-discover ])
+    # tests depend on executable
+    (overrideCabal (drv: {
+      preCheck = ''
+        ${drv.preCheck or ""}
+        export PATH="$PWD/dist/build/qhs:$PATH"
+      '';
+    }))
+  ];
+
   # Test suite needs executable
   agda2lagda = overrideCabal (drv: {
     preCheck = ''
@@ -1641,10 +1653,6 @@ builtins.intersectAttrs super {
   # there are three very heavy test suites that need external repos, one requires network access
   hevm = dontCheck super.hevm;
 
-  # hadolint enables static linking by default in the cabal file, so we have to explicitly disable it.
-  # https://github.com/hadolint/hadolint/commit/e1305042c62d52c2af4d77cdce5d62f6a0a3ce7b
-  hadolint = disableCabalFlag "static" super.hadolint;
-
   # Test suite tries to execute the build product "doctest-driver-gen", but it's not in $PATH.
   doctest-driver-gen = dontCheck super.doctest-driver-gen;
 
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index da160a445ab3..b37b61acb201 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -569853,9 +569853,7 @@ self: {
       doHaddock = false;
       description = "Command line tool qhs, SQL queries on CSV and TSV files";
       license = lib.meta.getLicenseFromSpdxId "MIT";
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "qhs";
-      broken = true;
     }
   ) { };
 
diff --git a/pkgs/development/python-modules/atomicwrites/default.nix b/pkgs/development/python-modules/atomicwrites/default.nix
index e916a433d26d..a8f302f0f3ac 100644
--- a/pkgs/development/python-modules/atomicwrites/default.nix
+++ b/pkgs/development/python-modules/atomicwrites/default.nix
@@ -3,18 +3,21 @@
   buildPythonPackage,
   fetchPypi,
   pytest,
+  setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "atomicwrites";
   version = "1.4.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-gbLJBxpJNnp/dwFw5e7Iy2ZWfPu8jHPSDOXKSo1xzxE=";
   };
 
+  build-system = [ setuptools ];
+
   # Tests depend on pytest but atomicwrites is a dependency of pytest
   doCheck = false;
   nativeCheckInputs = [ pytest ];
@@ -25,4 +28,4 @@ buildPythonPackage rec {
     maintainers = with lib.maintainers; [ matthiasbeyer ];
     license = lib.licenses.mit;
   };
-}
+})
diff --git a/pkgs/development/python-modules/binho-host-adapter/default.nix b/pkgs/development/python-modules/binho-host-adapter/default.nix
index 0448fdb8145d..c149f79f46ec 100644
--- a/pkgs/development/python-modules/binho-host-adapter/default.nix
+++ b/pkgs/development/python-modules/binho-host-adapter/default.nix
@@ -2,20 +2,25 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   pyserial,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "binho-host-adapter";
   version = "0.1.6";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "0mp8xa1qwaww2k5g2nqg7mcivzsbfw2ny1l9yjsi73109slafv8y";
+    inherit (finalAttrs) pname version;
+    hash = "sha256-Hm2nqE4gjBO19IkGbwV3S/8dWT0PW/HKFJwrjoPq6FY=";
   };
 
-  propagatedBuildInputs = [ pyserial ];
+  build-system = [ setuptools ];
+
+  dependencies = [ pyserial ];
 
   # Project has no tests
   doCheck = false;
@@ -27,4 +32,4 @@ buildPythonPackage rec {
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/bitvavo-aio/default.nix b/pkgs/development/python-modules/bitvavo-aio/default.nix
index 4ca9b8c4b0b7..3ee94a68f024 100644
--- a/pkgs/development/python-modules/bitvavo-aio/default.nix
+++ b/pkgs/development/python-modules/bitvavo-aio/default.nix
@@ -3,21 +3,26 @@
   aiohttp,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "bitvavo-aio";
   version = "1.0.3";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "cyberjunky";
     repo = "bitvavo-aio";
-    rev = version;
-    sha256 = "1d9nbbvv7xnkixj03sfhs2da5j3i2m7p73r7j1yb7b39zas2rbig";
+    tag = finalAttrs.version;
+    hash = "sha256-L64stPpprLN8kCePc08VcciimtDQ6QFkj9P2s/daNrU=";
   };
 
-  propagatedBuildInputs = [ aiohttp ];
+  build-system = [ setuptools ];
+
+  dependencies = [ aiohttp ];
 
   # Project has no tests
   doCheck = false;
@@ -30,4 +35,4 @@ buildPythonPackage rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/bluepy-devices/default.nix b/pkgs/development/python-modules/bluepy-devices/default.nix
index ea87fd9d0ca2..f13aea81179c 100644
--- a/pkgs/development/python-modules/bluepy-devices/default.nix
+++ b/pkgs/development/python-modules/bluepy-devices/default.nix
@@ -3,20 +3,25 @@
   bluepy,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "bluepy-devices";
   version = "0.2.1";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;
 
   src = fetchPypi {
     pname = "bluepy_devices";
-    inherit version;
-    sha256 = "02zzzivxq2vifgs65m2rm8pqlsbzsbc419c032irzvfxjx539mr8";
+    inherit (finalAttrs) version;
+    hash = "sha256-KNc0Spfd7Z+jGIClQNjSf2mKL6pZ1GL0c3EL3Hf8/ws=";
   };
 
-  propagatedBuildInputs = [ bluepy ];
+  build-system = [ setuptools ];
+
+  dependencies = [ bluepy ];
 
   # Project has no test
   doCheck = false;
@@ -28,4 +33,4 @@ buildPythonPackage rec {
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/brelpy/default.nix b/pkgs/development/python-modules/brelpy/default.nix
index 8c82abd5304f..cb7d87995360 100644
--- a/pkgs/development/python-modules/brelpy/default.nix
+++ b/pkgs/development/python-modules/brelpy/default.nix
@@ -2,20 +2,25 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   pycryptodome,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "brelpy";
   version = "0.0.3";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-MYWSKYd7emHZfY+W/UweQtTg62GSUMybpecL9BR8dhg=";
   };
 
-  propagatedBuildInputs = [ pycryptodome ];
+  build-system = [ setuptools ];
+
+  dependencies = [ pycryptodome ];
 
   # Source not tagged and PyPI releases don't contain tests
   doCheck = false;
@@ -28,4 +33,4 @@ buildPythonPackage rec {
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/brottsplatskartan/default.nix b/pkgs/development/python-modules/brottsplatskartan/default.nix
index 6dd41b9c60cc..8868d88e0992 100644
--- a/pkgs/development/python-modules/brottsplatskartan/default.nix
+++ b/pkgs/development/python-modules/brottsplatskartan/default.nix
@@ -2,24 +2,29 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   pytest-cov-stub,
   pytestCheckHook,
   requests,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "brottsplatskartan";
   version = "1.0.5";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "chrillux";
     repo = "brottsplatskartan";
-    rev = version;
-    sha256 = "07iwmnchvpw156j23yfccg4c32izbwm8b02bjr1xgmcwzbq21ks9";
+    tag = finalAttrs.version;
+    hash = "sha256-Sc8g8Pqc1ddDlkuAhSpfP4rByGPM+SGkKYHfDZmtPB4=";
   };
 
-  propagatedBuildInputs = [ requests ];
+  build-system = [ setuptools ];
+
+  dependencies = [ requests ];
 
   nativeCheckInputs = [
     pytest-cov-stub
@@ -34,4 +39,4 @@ buildPythonPackage rec {
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/cart/default.nix b/pkgs/development/python-modules/cart/default.nix
index 90e4517f4e7f..e1735ef501a3 100644
--- a/pkgs/development/python-modules/cart/default.nix
+++ b/pkgs/development/python-modules/cart/default.nix
@@ -4,21 +4,26 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
+  setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "cart";
   version = "1.2.3";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "CybercentreCanada";
     repo = "cart";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-oeWeay1Pr9T4oR3XSrwv9hRr/sLTel1Bt6BG6jHXxIA=";
   };
 
-  propagatedBuildInputs = [ pycryptodome ];
+  build-system = [ setuptools ];
+
+  dependencies = [ pycryptodome ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
@@ -30,8 +35,8 @@ buildPythonPackage rec {
     description = "Python module for the CaRT Neutering format";
     mainProgram = "cart";
     homepage = "https://github.com/CybercentreCanada/cart";
-    changelog = "https://github.com/CybercentreCanada/cart/releases/tag/${src.tag}";
+    changelog = "https://github.com/CybercentreCanada/cart/releases/tag/${finalAttrs.src.tag}";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/claude-agent-sdk/default.nix b/pkgs/development/python-modules/claude-agent-sdk/default.nix
index fb1b5a1facc7..c80115c60cbb 100644
--- a/pkgs/development/python-modules/claude-agent-sdk/default.nix
+++ b/pkgs/development/python-modules/claude-agent-sdk/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "claude-agent-sdk";
-  version = "0.2.91";
+  version = "0.2.93";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anthropics";
     repo = "claude-agent-sdk-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rnVFerHFU7GoaTfkea28Cib8m1iLgs70eDhx+g/04Xs=";
+    hash = "sha256-QicWndxvYe2E9bYgIcPWVm2E9M5WRpH84C2biW/QhaE=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/cpe-search/default.nix b/pkgs/development/python-modules/cpe-search/default.nix
index b23a49dc4a08..208d416b58b5 100644
--- a/pkgs/development/python-modules/cpe-search/default.nix
+++ b/pkgs/development/python-modules/cpe-search/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "cpe-search";
-  version = "0.2.8";
+  version = "0.2.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ra1nb0rn";
     repo = "cpe_search";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4f8+f0BZjbTcqhioYLVa6sJIcYEte5SYqQo3gY8BMEU=";
+    hash = "sha256-TEZTQvUZJYP0+Dtp/VAjyPNkxmKLV/+ApjsRSqEiH6w=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/cross-web/default.nix b/pkgs/development/python-modules/cross-web/default.nix
index 738faa760522..827ce4c250ff 100644
--- a/pkgs/development/python-modules/cross-web/default.nix
+++ b/pkgs/development/python-modules/cross-web/default.nix
@@ -1,54 +1,43 @@
 {
   lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-
-  # build-system
-  hatchling,
-
-  # dependencies
-  typing-extensions,
-
-  # optional-dependencies
-  fastapi,
-  httpx,
-  python-multipart,
-  starlette,
-  django,
-  flask,
-  werkzeug,
-  sanic,
   aiohttp,
-  yarl,
-  quart,
+  buildPythonPackage,
   chalice,
+  django,
+  fastapi,
+  fetchFromGitHub,
+  flask,
+  hatchling,
+  httpx,
   litestar,
-  sanic-testing,
-
-  # tests
   pytest-asyncio,
+  pytest-django,
   pytestCheckHook,
+  python-multipart,
+  quart,
+  sanic-testing,
+  sanic,
+  starlette,
+  typing-extensions,
+  werkzeug,
+  yarl,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "cross-web";
-  version = "0.4.1";
+  version = "0.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "usecross";
     repo = "cross-web";
     rev = finalAttrs.version;
-    hash = "sha256-CH7SKePJcBgLPrdb3/qoim0Wzdx78+rNpJFWDHO7JWA=";
+    hash = "sha256-JxwzTU17jCQMFNCtmcZVAZQnwDZjHNxCGNdKhkCMoPs=";
   };
 
-  build-system = [
-    hatchling
-  ];
+  build-system = [ hatchling ];
 
-  dependencies = [
-    typing-extensions
-  ];
+  dependencies = [ typing-extensions ];
 
   optional-dependencies = {
     integrations = [
@@ -71,13 +60,18 @@ buildPythonPackage (finalAttrs: {
 
   nativeCheckInputs = [
     pytest-asyncio
+    pytest-django
     pytestCheckHook
   ]
   ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
 
-  pythonImportsCheck = [
-    "cross_web"
-  ];
+  pythonImportsCheck = [ "cross_web" ];
+
+  preCheck = ''
+    export PYTHONPATH="$PYTHONPATH:$PWD/tests"
+  '';
+
+  env.DJANGO_SETTINGS_MODULE = "testing._django_settings";
 
   meta = {
     description = "Universal web framework adapter for Python";
diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index 29c81d429812..02300e28f180 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "iamdata";
-  version = "0.1.202606051";
+  version = "0.1.202606061";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-B3yKeS7lKU98oilFWHBfx24A7bbnZwqZ7oBU0kTppGE=";
+    hash = "sha256-YF173OPIYdGR6m33wJEiH6gznVlAj2tMn1KDCzFND08=";
   };
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix b/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix
index 49a63bcd50cb..19f92869c51d 100644
--- a/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "microsoft-kiota-authentication-azure";
-  version = "1.10.1";
+  version = "1.10.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "kiota-python";
     tag = "microsoft-kiota-authentication-azure-v${finalAttrs.version}";
-    hash = "sha256-KBCjVNZDPMh0wxWm8UVLsrfl2AYp3rKMjAT5c8F7+64=";
+    hash = "sha256-rj0NpuXvqS5rB6TrD3FyuMWb7Dl8/SIBcW/Lzj4cY6I=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/packages/authentication/azure/";
diff --git a/pkgs/development/python-modules/onvif-zeep-async/default.nix b/pkgs/development/python-modules/onvif-zeep-async/default.nix
index 9be3c675d3b0..48e38d8e160d 100644
--- a/pkgs/development/python-modules/onvif-zeep-async/default.nix
+++ b/pkgs/development/python-modules/onvif-zeep-async/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "onvif-zeep-async";
-  version = "4.1.1";
+  version = "4.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "openvideolibs";
     repo = "python-onvif-zeep-async";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RpQakXzJ52OkKZP2RTabpCTFRC+JeNqURI3+Nz3Kips=";
+    hash = "sha256-GmrXU+aGjllrZ6MEaACTEXBQTd0UU45eD0yoMIn1dUI=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix
index b7fd3ccd2308..00fb9b0db85b 100644
--- a/pkgs/development/python-modules/pyftdi/default.nix
+++ b/pkgs/development/python-modules/pyftdi/default.nix
@@ -7,16 +7,16 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pyftdi";
-  version = "0.57.1";
+  version = "0.57.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "eblot";
     repo = "pyftdi";
-    tag = "v${version}";
-    hash = "sha256-RkZXcGvCZXmFrLvj7YqHc6FeZskEqMSQcYgizBSuwIk=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-v6WcDwKVnLB2SwWiKG0VYg1VTyaSDz0QvG3hAQs7YHI=";
   };
 
   build-system = [ setuptools ];
@@ -39,8 +39,8 @@ buildPythonPackage rec {
       bridges.
     '';
     homepage = "https://github.com/eblot/pyftdi";
-    changelog = "https://github.com/eblot/pyftdi/releases/tag/v${version}";
+    changelog = "https://github.com/eblot/pyftdi/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/strawberry-django/default.nix b/pkgs/development/python-modules/strawberry-django/default.nix
index b7b256cc71c7..15fd5d2b9313 100644
--- a/pkgs/development/python-modules/strawberry-django/default.nix
+++ b/pkgs/development/python-modules/strawberry-django/default.nix
@@ -34,14 +34,14 @@
 
 buildPythonPackage rec {
   pname = "strawberry-django";
-  version = "0.75.1";
+  version = "0.86.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "strawberry-graphql";
     repo = "strawberry-django";
     tag = version;
-    hash = "sha256-vosD0JZYZzzl6Mp+AAxdXVox/7ay4FqnwqE6f1lSw3s=";
+    hash = "sha256-pWhYJsfUxfK8FH9jSPWhd2P89AVYM5Z3wA2OlU6XLRo=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix
index b8524a2405fd..7a51e9782a7f 100644
--- a/pkgs/development/python-modules/strawberry-graphql/default.nix
+++ b/pkgs/development/python-modules/strawberry-graphql/default.nix
@@ -13,12 +13,13 @@
   fetchFromGitHub,
   flask,
   freezegun,
+  graphlib-backport,
   graphql-core,
   inline-snapshot,
   libcst,
   opentelemetry-api,
   opentelemetry-sdk,
-  poetry-core,
+  protobuf,
   pydantic,
   pygments,
   pyinstrument,
@@ -33,33 +34,35 @@
   python-dateutil,
   python-multipart,
   rich,
-  sanic,
   sanic-testing,
+  sanic,
   starlette,
-  typing-extensions,
-  uvicorn,
   typer,
-  graphlib-backport,
+  typing-extensions,
+  uv-build,
+  uvicorn,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "strawberry-graphql";
-  version = "0.289.2";
+  version = "0.316.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "strawberry-graphql";
     repo = "strawberry";
-    tag = version;
-    hash = "sha256-eiIyAYId5MHKWmn87Cj/TCNN4YU5KkAWMEMhoMIR8xM=";
+    tag = finalAttrs.version;
+    hash = "sha256-z9ZqIW0DD5/o2nuHqEjcjIaaHMMiT6jRoFddroSPP24=";
   };
 
   postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "uv_build>=0.11,<0.12" "uv_build"
     substituteInPlace pyproject.toml \
       --replace-fail "--emoji" ""
   '';
 
-  build-system = [ poetry-core ];
+  build-system = [ uv-build ];
 
   dependencies = [
     cross-web
@@ -77,6 +80,7 @@ buildPythonPackage rec {
       starlette
       python-multipart
     ];
+    apollo-federation = [ protobuf ];
     debug = [
       rich
       libcst
@@ -138,7 +142,7 @@ buildPythonPackage rec {
     pytestCheckHook
     sanic-testing
   ]
-  ++ lib.concatAttrValues optional-dependencies;
+  ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies);
 
   pythonImportsCheck = [ "strawberry" ];
 
@@ -163,9 +167,9 @@ buildPythonPackage rec {
   meta = {
     description = "GraphQL library for Python that leverages type annotations";
     homepage = "https://strawberry.rocks";
-    changelog = "https://github.com/strawberry-graphql/strawberry/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/strawberry-graphql/strawberry/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ izorkin ];
     mainProgram = "strawberry";
   };
-}
+})
diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix
index ae7b415a431d..894e449b3d1c 100644
--- a/pkgs/development/tools/pnpm/default.nix
+++ b/pkgs/development/tools/pnpm/default.nix
@@ -26,8 +26,8 @@ let
       hash = "sha256-WOFDJYhx31FYm2UcBiBdq+xIdmpdu6PCWZm2m1C+WY4=";
     };
     "11" = {
-      version = "11.5.1";
-      hash = "sha256-3npcG+2DAYBRg6h5l/4XIM1crvtXvoOFNaS/xKFZaVk=";
+      version = "11.5.2";
+      hash = "sha256-dJ3FT709zenkFLquMsF3yoR3DT/NaciBbVea3D5qLJk=";
     };
   };
 
diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix
index 9fabf29831a5..cee19b476b27 100644
--- a/pkgs/tools/misc/ultrastar-creator/default.nix
+++ b/pkgs/tools/misc/ultrastar-creator/default.nix
@@ -2,64 +2,108 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  qtbase,
+  qt6,
   pkg-config,
-  wrapQtAppsHook,
   taglib,
+  alsa-lib,
+  pulseaudio,
+  cld2,
   libbass,
   libbass_fx,
+  makeDesktopItem,
 }:
 
-# TODO: get rid of (unfree) libbass
-# issue:https://github.com/UltraStar-Deluxe/UltraStar-Creator/issues/3
-# there’s a WIP branch here:
-# https://github.com/UltraStar-Deluxe/UltraStar-Creator/commits/BASS_removed
-
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ultrastar-creator";
-  version = "2019-04-23";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "UltraStar-Deluxe";
     repo = "UltraStar-Creator";
-    rev = "36583b4e482b68f6aa949e77ef2744776aa587b1";
-    sha256 = "1rzz04l7s7pxj74xam0cxlq569lfpgig35kpbsplq531d4007pc9";
+    tag = finalAttrs.version;
+    hash = "sha256-QWlgMpyNadRh6Tkg1mAtb11mKbk4thE6sCQKiDyR/SA=";
   };
 
   postPatch = ''
-    # we don’t want prebuilt binaries checked into version control!
-    rm -rf lib include
-    sed -e "s|DESTDIR =.*$|DESTDIR = $out/bin|" \
-        -e 's|-L".*unix"||' \
-        -e "/QMAKE_POST_LINK/d" \
-        -e "s|../include/bass|${lib.getLib libbass}/include|g" \
-        -e "s|../include/bass_fx|${lib.getLib libbass_fx}/include|g" \
-        -e "s|../include/taglib|${lib.getLib taglib}/include|g" \
-        -i src/UltraStar-Creator.pro
+    rm -rf lib include/bass include/bass_fx include/cld2
+
+    echo 'const char *revision = "${finalAttrs.version}"; const char *date_time = "unknown";' \
+      > src/version.h
+
+    substituteInPlace src/UltraStar-Creator.pro \
+      --replace-fail 'DESTDIR = ../bin/release' "DESTDIR = $out/bin" \
+      --replace-fail 'DESTDIR = ../bin/debug'   "DESTDIR = $out/bin" \
+      --replace-fail '../include/bass_fx'        '${lib.getLib libbass_fx}/include' \
+      --replace-fail '../include/bass'           '${lib.getLib libbass}/include' \
+      --replace-fail '../include/cld2/public'    '${cld2}/include/cld2/public' \
+      --replace-fail '../include/taglib'         '${lib.getDev taglib}/include'
+
+    sed -i \
+      -e 's|-L"../lib/unix"||' \
+      -e 's|-L"/usr/lib/x86_64-linux-gnu"||' \
+      -e '/QMAKE_POST_LINK/d' \
+      src/UltraStar-Creator.pro
+
+    sed -i \
+      -e '/QMAKE_EXTRA_TARGETS.*revtarget/d' \
+      -e '/PRE_TARGETDEPS.*version\.h/d' \
+      -e '/^revtarget\.target/d' \
+      -e '/^\trevtarget\./d' \
+      -e '/^revtarget\.depends/,/[^\\]$/d' \
+      src/UltraStar-Creator.pro
   '';
 
   preConfigure = ''
     cd src
   '';
 
-  nativeBuildInputs = [
-    qmake
-    pkg-config
-    wrapQtAppsHook
+  qtWrapperArgs = [
+    "--prefix LD_LIBRARY_PATH : ${
+      lib.makeLibraryPath [
+        alsa-lib
+        pulseaudio
+      ]
+    }"
   ];
+
+  nativeBuildInputs = [
+    pkg-config
+    qt6.qmake
+    qt6.wrapQtAppsHook
+  ];
+
   buildInputs = [
-    qtbase
-    taglib
+    cld2
     libbass
     libbass_fx
+    qt6.qtbase
+    taglib
+    alsa-lib
+    pulseaudio
   ];
 
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 ../setup/unix/UltraStar-Creator.png $out/share/icons/hicolor/128x128/apps/ultrastar-creator.png
+    ln -s "$desktopItem/share/applications" "$out/share/"
+
+    runHook postInstall
+  '';
+
+  desktopItem = makeDesktopItem {
+    name = finalAttrs.pname;
+    desktopName = "UltraStar-Creator";
+    exec = "UltraStar-Creator";
+    icon = "ultrastar-creator";
+  };
+
   meta = {
     mainProgram = "UltraStar-Creator";
     description = "Ultrastar karaoke song creation tool";
     homepage = "https://github.com/UltraStar-Deluxe/UltraStar-Creator";
     license = lib.licenses.gpl2Only;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ mooses ];
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/binary-file-toolkit.nix b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/binary-file-toolkit.nix
index 4db9aae029e5..4ed2ebf19e71 100644
--- a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/binary-file-toolkit.nix
+++ b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/binary-file-toolkit.nix
@@ -3,14 +3,14 @@
   fetchFromGitHub,
   maven,
 }:
-maven.buildMavenPackage rec {
+maven.buildMavenPackage (finalAttrs: {
   pname = "binary-file-toolkit";
   version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "boricj";
     repo = "binary-file-toolkit";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-HMzRh/Q06Ik33mEkmh5U6qLiWk7ZCEstYq3Ll/pFhXM=";
   };
 
@@ -32,4 +32,4 @@ maven.buildMavenPackage rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ timschumi ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e04706bbbbe..b1dfe1e17ee6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2186,8 +2186,6 @@ with pkgs;
     buildProduct = "daemon";
   };
 
-  fluentd = callPackage ../tools/misc/fluentd { };
-
   fpm = callPackage ../tools/package-management/fpm { };
 
   ferdium = callPackage ../applications/networking/instant-messengers/ferdium {
@@ -5463,15 +5461,7 @@ with pkgs;
 
   griffe = with python3Packages; toPythonApplication griffe;
 
-  hadolint =
-    # TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013
-    (
-      if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then
-        lib.id
-      else
-        haskell.lib.compose.justStaticExecutables
-    )
-      haskellPackages.hadolint;
+  hadolint = haskell.lib.compose.justStaticExecutables haskellPackages.hadolint;
 
   iaca_2_1 = callPackage ../development/tools/iaca/2.1.nix { };
   iaca_3_0 = callPackage ../development/tools/iaca/3.0.nix { };
@@ -9313,10 +9303,6 @@ with pkgs;
     callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop
       { };
 
-  kubeval = callPackage ../applications/networking/cluster/kubeval { };
-
-  kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { };
-
   kubectl-convert = kubectl.convert;
 
   kubectl-view-allocations =
@@ -10159,8 +10145,6 @@ with pkgs;
 
   wrapThunderbird = callPackage ../applications/networking/mailreaders/thunderbird/wrapper.nix { };
 
-  x2gokdriveclient = libsForQt5.callPackage ../applications/networking/remote/x2gokdriveclient { };
-
   x32edit = callPackage ../applications/audio/midas/x32edit.nix { };
 
   kodiPackages = recurseIntoAttrs (kodi.packages);
@@ -10538,7 +10522,7 @@ with pkgs;
     ];
   };
 
-  ultrastar-creator = libsForQt5.callPackage ../tools/misc/ultrastar-creator { };
+  ultrastar-creator = callPackage ../tools/misc/ultrastar-creator { };
 
   ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { };
 
@@ -11522,8 +11506,6 @@ with pkgs;
   vdrPlugins = recurseIntoAttrs (callPackage ../applications/video/vdr/plugins.nix { });
   wrapVdr = callPackage ../applications/video/vdr/wrapper.nix { };
 
-  chrome-token-signing = libsForQt5.callPackage ../tools/security/chrome-token-signing { };
-
   phonetisaurus = callPackage ../development/libraries/phonetisaurus {
     # https://github.com/AdolfVonKleist/Phonetisaurus/issues/70
     openfst = openfst.overrideAttrs rec {