diff --git a/doc/build-helpers/fetchers.chapter.md b/doc/build-helpers/fetchers.chapter.md
index 9e199bda1c28..c665a5fa8436 100644
--- a/doc/build-helpers/fetchers.chapter.md
+++ b/doc/build-helpers/fetchers.chapter.md
@@ -860,7 +860,14 @@ A number of fetcher functions wrap part of `fetchurl` and `fetchzip`. They are m
 
 To use a different GitHub instance, use `githubBase` (defaults to `"github.com"`).
 
-`fetchFromGitHub` uses `fetchzip` to download the source archive generated by GitHub for the specified revision. If `leaveDotGit`, `deepClone` or `fetchSubmodules` are set to `true`, `fetchFromGitHub` will use `fetchgit` instead. Refer to its section for documentation of these options.
+By default, `fetchFromGitHub` uses `fetchzip` to download GitHub's source archive for the specified revision.
+However, `fetchFromGitHub` will automatically switch to using `fetchgit` in any of these cases:
+
+- `forceFetchGit`, `leaveDotGit`, `deepClone`, `fetchLFS`, or `fetchSubmodules` are set to `true`
+- `sparseCheckout` contains any entries (is a non-empty list)
+- `rootDir` is set to a non-empty string
+
+When `fetchgit` is used, refer to the `fetchgit` section for documentation of its available options.
 
 ## `fetchFromGitLab` {#fetchfromgitlab}
 
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0aa55447d929..178118462947 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11082,12 +11082,6 @@
     githubId = 7348004;
     name = "Benjamin Levy";
   };
-  iogamaster = {
-    email = "iogamastercode+nixpkgs@gmail.com";
-    name = "IogaMaster";
-    github = "IogaMaster";
-    githubId = 67164465;
-  };
   ionutnechita = {
     email = "ionut_n2001@yahoo.com";
     github = "ionutnechita";
@@ -13840,6 +13834,13 @@
     githubId = 1903418;
     name = "Kovacsics Robert";
   };
+  kozm9000 = {
+    email = "ubermailbox@protonmail.ch";
+    github = "kozm9000";
+    githubId = 80588292;
+    name = "Roman Balashov";
+    keys = [ { fingerprint = "E5A5 700D 96ED 42F2 13D4  D16B 2E79 1278 5DDB 96B5"; } ];
+  };
   kpbaks = {
     email = "kristoffer.pbs@gmail.com";
     github = "kpbaks";
@@ -14876,6 +14877,13 @@
     name = "legendofmiracles";
     keys = [ { fingerprint = "CC50 F82C 985D 2679 0703  AF15 19B0 82B3 DEFE 5451"; } ];
   };
+  lomenzel = {
+    name = "Leonard-Orlando Menzel";
+    email = "leonard.menzel@tutanota.com";
+    matrix = "@leonard:menzel.lol";
+    github = "lomenzel";
+    githubId = 79226837;
+  };
   lonerOrz = {
     email = "2788892716@qq.com";
     name = "lonerOrz";
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 29938829e244..9315a5de7c33 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -1175,6 +1175,15 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
+  secshell = {
+    members = [
+      felbinger
+      juli0604
+    ];
+    scope = "Maintain packages and modules created by members of Secure Shell Networks.";
+    shortName = "secshell";
+  };
+
   serokell = {
     # Verify additions by approval of an already existing member of the team.
     members = [ balsoft ];
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 6dfd71394f19..6496543fdad1 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1366,6 +1366,8 @@ let
         };
       };
 
+      docker.docker = callPackage ./docker.docker { };
+
       donjayamanne.githistory = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "githistory";
@@ -1429,31 +1431,7 @@ let
         };
       };
 
-      eamodio.gitlens = buildVscodeMarketplaceExtension {
-        mktplcRef = {
-          name = "gitlens";
-          publisher = "eamodio";
-          # Stable versions are listed on the GitHub releases page and use a
-          # semver scheme, contrary to preview versions which are listed on
-          # the VSCode Marketplace and use a calver scheme. We should avoid
-          # using preview versions, because they expire after two weeks.
-          version = "17.4.1";
-          hash = "sha256-H14LJ1diURp6dtZE5djSmvI7aJFBnwVAj7Qi7VFf5oo=";
-        };
-        meta = {
-          changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
-          description = "Visual Studio Code extension that improves its built-in Git capabilities";
-          longDescription = ''
-            Supercharge the Git capabilities built into Visual Studio Code — Visualize code authorship at a glance via Git
-            blame annotations and code lens, seamlessly navigate and explore Git repositories, gain valuable insights via
-            powerful comparison commands, and so much more
-          '';
-          downloadPage = "https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens";
-          homepage = "https://gitlens.amod.io/";
-          license = lib.licenses.mit;
-          maintainers = [ lib.maintainers.ratsclub ];
-        };
-      };
+      eamodio.gitlens = callPackage ./eamodio.gitlens { };
 
       earthly.earthfile-syntax-highlighting = buildVscodeMarketplaceExtension {
         mktplcRef = {
diff --git a/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix b/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix
new file mode 100644
index 000000000000..744005cb66d3
--- /dev/null
+++ b/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix
@@ -0,0 +1,48 @@
+{
+  stdenv,
+  lib,
+  vscode-utils,
+}:
+
+let
+  supported = {
+    x86_64-linux = {
+      hash = "sha256-2m1hVQ497zQs2pmk+F+5thO4cz7dP4dDEPznPBqKfX0=";
+      arch = "linux-x64";
+    };
+    x86_64-darwin = {
+      hash = "sha256-U2BcDUiper4chL8rF4ZUSos7erfXaq1LNqYYsRe2GDk=";
+      arch = "darwin-x64";
+    };
+    aarch64-linux = {
+      hash = "sha256-qYdYmPZPlf++cJWLbhvqeO0uePbAJE4hL2bVYlKbk0c=";
+      arch = "linux-arm64";
+    };
+    aarch64-darwin = {
+      hash = "sha256-oN3CWc/OLbeuyKfdPoh26yUQzH3d6YfpxacByWM43qk=";
+      arch = "darwin-arm64";
+    };
+  };
+
+  base =
+    supported.${stdenv.hostPlatform.system}
+      or (throw "unsupported platform ${stdenv.hostPlatform.system}");
+
+in
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = base // {
+    publisher = "docker";
+    name = "docker";
+    version = "0.17.0";
+  };
+
+  meta = {
+    description = "Official Docker DX (Developer Experience) extension. Edit smarter, ship faster with an enhanced Docker-development experience.";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=docker.docker";
+    homepage = "https://github.com/docker/vscode-extension#readme";
+    changelog = "https://marketplace.visualstudio.com/items/docker.docker/changelog";
+    license = lib.licenses.asl20;
+    platforms = builtins.attrNames supported;
+    maintainers = [ lib.maintainers.kozm9000 ];
+  };
+}
diff --git a/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix b/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix
new file mode 100644
index 000000000000..f04abe0be99e
--- /dev/null
+++ b/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix
@@ -0,0 +1,98 @@
+{
+  lib,
+  pkgs,
+  stdenvNoCC,
+  fetchFromGitHub,
+  pnpm,
+  nodejs,
+  vscode-utils,
+  nix-update-script,
+}:
+
+let
+  vsix = stdenvNoCC.mkDerivation (finalAttrs: {
+    name = "gitlens-${finalAttrs.version}.zip";
+    pname = "gitlens-vsix";
+    version = "17.5.1";
+
+    src = fetchFromGitHub {
+      owner = "gitkraken";
+      repo = "vscode-gitlens";
+      tag = "v${finalAttrs.version}";
+      hash = "sha256-DGV4liUpJNM6ktMy3jQ1iEQ7H5mPM17f0uqA8QYHoLc=";
+    };
+
+    pnpmDeps = pnpm.fetchDeps {
+      inherit (finalAttrs) pname version src;
+      fetcherVersion = 2;
+      hash = "sha256-Lx8YRG3B3t83t85PqDMevIm7M0ks2IsluwL1I5zThdA=";
+    };
+
+    postPatch = ''
+      substituteInPlace scripts/generateLicenses.mjs --replace-fail 'https://raw.githubusercontent.com/microsoft/vscode/refs/heads/main/LICENSE.txt' '${pkgs.vscode-json-languageserver.src}/LICENSE.txt'
+    '';
+
+    nativeBuildInputs = [
+      nodejs
+      pnpm.configHook
+      pnpm
+    ];
+
+    # Error: spawn /build/source/node_modules/.pnpm/sass-embedded-linux-x64@1.77.8/node_modules/sass-embedded-linux-x64/dart-sass/src/dart ENOENT
+    # Remove both node_modules/.pnpm/sass-embedded and node_modules/.pnpm/sass-embedded-linux-x64
+    preBuild = ''
+      rm -r node_modules/.pnpm/sass-embedded*
+    '';
+
+    buildPhase = ''
+      runHook preBuild
+
+      node --run package
+
+      runHook postBuild
+    '';
+
+    installPhase = ''
+      runHook preInstall
+
+      cp ./gitlens-$version.vsix $out
+
+      runHook postInstall
+    '';
+  });
+in
+vscode-utils.buildVscodeExtension (finalAttrs: {
+  pname = "gitlens";
+  inherit (finalAttrs.src) version;
+
+  vscodeExtPublisher = "eamodio";
+  vscodeExtName = "gitlens";
+  vscodeExtUniqueId = "${finalAttrs.vscodeExtPublisher}.${finalAttrs.vscodeExtName}";
+
+  src = vsix;
+
+  passthru = {
+    vsix = finalAttrs.src;
+    updateScript = nix-update-script {
+      attrPath = "vscode-extensions.eamodio.gitlens.vsix";
+    };
+  };
+
+  meta = {
+    changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
+    description = "Visual Studio Code extension that improves its built-in Git capabilities";
+    longDescription = ''
+      Supercharge the Git capabilities built into Visual Studio Code — Visualize code authorship at a glance via Git
+      blame annotations and code lens, seamlessly navigate and explore Git repositories, gain valuable insights via
+      powerful comparison commands, and so much more
+    '';
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens";
+    homepage = "https://gitlens.amod.io/";
+    license = lib.licenses.mit;
+    sourceProvenance = with lib.sourceTypes; [ fromSource ];
+    maintainers = with lib.maintainers; [
+      xiaoxiangmoe
+      ratsclub
+    ];
+  };
+})
diff --git a/pkgs/applications/editors/vscode/extensions/ethersync.ethersync/default.nix b/pkgs/applications/editors/vscode/extensions/ethersync.ethersync/default.nix
index 9af7cc59f2bc..b359b9c74088 100644
--- a/pkgs/applications/editors/vscode/extensions/ethersync.ethersync/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ethersync.ethersync/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "ethersync";
     name = "ethersync";
-    version = "0.4.0";
-    hash = "sha256-/09be/1KZVIDUr+YieeD7xc8PXdchRo3Kt1GqD3Pt6M=";
+    version = "0.6.0";
+    hash = "sha256-KuidePUxQ+FhnIGTUf6i+WxBQfbQVlq68xbuOeEouIE=";
   };
 
   meta = {
diff --git a/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-containers/default.nix b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-containers/default.nix
index cf48b6fdc464..9908fcaa5a91 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-containers/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-containers/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "ms-azuretools";
     name = "vscode-containers";
-    version = "2.1.0";
-    hash = "sha256-96JLAM2b/FUR1TA/u9GPdQJmhSGUNMarbuhEhID8c6g=";
+    version = "2.2.0";
+    hash = "sha256-UxWsu7AU28plnT0QMdpPJrcYZIV09FeC+rmYKf39a6M=";
   };
 
   meta = {
diff --git a/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/pkgs/applications/networking/instant-messengers/discord/darwin.nix
index f4ebf4537ded..876036b12a33 100644
--- a/pkgs/applications/networking/instant-messengers/discord/darwin.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/darwin.nix
@@ -6,6 +6,7 @@
   stdenv,
   binaryName,
   desktopName,
+  self,
   lib,
   undmg,
   makeWrapper,
@@ -116,5 +117,20 @@ stdenv.mkDerivation {
         lib.optionalString (!stdenv.buildPlatform.isDarwin) "pkgsCross.aarch64-darwin."
       }${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix --version-key=${branch}
     '';
+
+    tests = {
+      withVencord = self.override {
+        withVencord = true;
+      };
+      withEquicord = self.override {
+        withEquicord = true;
+      };
+      withMoonlight = self.override {
+        withMoonlight = true;
+      };
+      withOpenASAR = self.override {
+        withOpenASAR = true;
+      };
+    };
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index ee1c5084c27d..70a8321d6149 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -1,69 +1,127 @@
 {
-  branch ? "stable",
   callPackage,
   fetchurl,
   lib,
   stdenv,
+  discord,
+  discord-ptb,
+  discord-canary,
+  discord-development,
 }:
 let
-  versions =
-    if stdenv.hostPlatform.isLinux then
-      {
-        stable = "0.0.111";
-        ptb = "0.0.161";
-        canary = "0.0.761";
-        development = "0.0.89";
-      }
-    else
-      {
-        stable = "0.0.362";
-        ptb = "0.0.192";
-        canary = "0.0.867";
-        development = "0.0.100";
-      };
-  version = versions.${branch};
-  srcs = rec {
+  variants = rec {
     x86_64-linux = {
-      stable = fetchurl {
-        url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
-        hash = "sha256-o4U6i223Agtbt1N9v0GO/Ivx68OQcX/N3mHXUX2gruA=";
+      discord = rec {
+        version = "0.0.111";
+
+        src = fetchurl {
+          url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
+          hash = "sha256-o4U6i223Agtbt1N9v0GO/Ivx68OQcX/N3mHXUX2gruA=";
+        };
+
+        branch = "stable";
+        binaryName = desktopName;
+        desktopName = "Discord";
+        self = discord;
       };
-      ptb = fetchurl {
-        url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
-        hash = "sha256-pDWOnj8tQK9runi/QzcvEFbNGCwAb/gISM9LrLoTzxM=";
+      discord-ptb = rec {
+        version = "0.0.161";
+
+        src = fetchurl {
+          url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
+          hash = "sha256-pDWOnj8tQK9runi/QzcvEFbNGCwAb/gISM9LrLoTzxM=";
+        };
+
+        branch = "ptb";
+        binaryName = "DiscordPTB";
+        desktopName = "Discord PTB";
+        self = discord-ptb;
       };
-      canary = fetchurl {
-        url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-        hash = "sha256-L3MIcrz/xj8zOb2QVXBrBCHGt4BdHhjwKpPZ4iClQYQ=";
+      discord-canary = rec {
+        version = "0.0.761";
+
+        src = fetchurl {
+          url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
+          hash = "sha256-L3MIcrz/xj8zOb2QVXBrBCHGt4BdHhjwKpPZ4iClQYQ=";
+        };
+
+        branch = "canary";
+        binaryName = "DiscordCanary";
+        desktopName = "Discord Canary";
+        self = discord-canary;
       };
-      development = fetchurl {
-        url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
-        hash = "sha256-ZMsBR0LAISrM3dib8fehW/eZGkwSCinQF60jJG76O7M=";
+      discord-development = rec {
+        version = "0.0.89";
+
+        src = fetchurl {
+          url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
+          hash = "sha256-ZMsBR0LAISrM3dib8fehW/eZGkwSCinQF60jJG76O7M=";
+        };
+
+        branch = "development";
+        binaryName = "DiscordDevelopment";
+        desktopName = "Discord Development";
+        self = discord-development;
       };
     };
     x86_64-darwin = {
-      stable = fetchurl {
-        url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg";
-        hash = "sha256-DHe0WwJOB3mm1HbQwEOJ9NWqxzhOBQynhjJXYSNvA/k=";
+      discord = rec {
+        version = "0.0.362";
+
+        src = fetchurl {
+          url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg";
+          hash = "sha256-DHe0WwJOB3mm1HbQwEOJ9NWqxzhOBQynhjJXYSNvA/k=";
+        };
+
+        branch = "stable";
+        binaryName = desktopName;
+        desktopName = "Discord";
+        self = discord;
       };
-      ptb = fetchurl {
-        url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
-        hash = "sha256-AZ9enKJf6WZLELFLKrzeyAR/Q/pzD8SGvCPcInS8vsk=";
+      discord-ptb = rec {
+        version = "0.0.192";
+
+        src = fetchurl {
+          url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
+          hash = "sha256-AZ9enKJf6WZLELFLKrzeyAR/Q/pzD8SGvCPcInS8vsk=";
+        };
+
+        branch = "ptb";
+        binaryName = desktopName;
+        desktopName = "Discord PTB";
+        self = discord-ptb;
       };
-      canary = fetchurl {
-        url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
-        hash = "sha256-67B2wZRZEOKutMPsrRlc96UZWShYLAgwOoF2/QzBgzE=";
+      discord-canary = rec {
+        version = "0.0.867";
+
+        src = fetchurl {
+          url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
+          hash = "sha256-67B2wZRZEOKutMPsrRlc96UZWShYLAgwOoF2/QzBgzE=";
+        };
+
+        branch = "canary";
+        binaryName = desktopName;
+        desktopName = "Discord Canary";
+        self = discord-canary;
       };
-      development = fetchurl {
-        url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";
-        hash = "sha256-PknNHr9txxp3+nO7FgHH7n04qx6p6Jzbs92/Hcfh13Y=";
+      discord-development = rec {
+        version = "0.0.100";
+
+        src = fetchurl {
+          url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";
+          hash = "sha256-PknNHr9txxp3+nO7FgHH7n04qx6p6Jzbs92/Hcfh13Y=";
+        };
+
+        branch = "development";
+        binaryName = desktopName;
+        desktopName = "Discord Development";
+        self = discord-development;
       };
     };
+
     aarch64-darwin = x86_64-darwin;
+    default = x86_64-linux; # Used for unsupported platforms, so we can return *something* there.
   };
-  src =
-    srcs.${stdenv.hostPlatform.system}.${branch}
-      or (throw "${stdenv.hostPlatform.system} not supported on ${branch}");
 
   meta = {
     description = "All-in-one cross-platform voice and text chat for gamers";
@@ -86,43 +144,20 @@ let
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
   package = if stdenv.hostPlatform.isLinux then ./linux.nix else ./darwin.nix;
-
-  packages = (
-    builtins.mapAttrs
-      (
-        _: value:
-        callPackage package (
-          value
-          // {
-            inherit src version branch;
-            meta = meta // {
-              mainProgram = value.binaryName;
-            };
-          }
-        )
-      )
-      {
-        stable = {
-          pname = "discord";
-          binaryName = "Discord";
-          desktopName = "Discord";
-        };
-        ptb = rec {
-          pname = "discord-ptb";
-          binaryName = if stdenv.hostPlatform.isLinux then "DiscordPTB" else desktopName;
-          desktopName = "Discord PTB";
-        };
-        canary = rec {
-          pname = "discord-canary";
-          binaryName = if stdenv.hostPlatform.isLinux then "DiscordCanary" else desktopName;
-          desktopName = "Discord Canary";
-        };
-        development = rec {
-          pname = "discord-development";
-          binaryName = if stdenv.hostPlatform.isLinux then "DiscordDevelopment" else desktopName;
-          desktopName = "Discord Development";
-        };
-      }
-  );
 in
-packages.${branch}
+lib.genAttrs [ "discord" "discord-ptb" "discord-canary" "discord-development" ] (
+  pname:
+  let
+    args = (variants.${stdenv.hostPlatform.system} or variants.default).${pname};
+  in
+  callPackage package (
+    args
+    // {
+      inherit pname;
+
+      meta = meta // {
+        mainProgram = args.binaryName;
+      };
+    }
+  )
+)
diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix
index 4a5cee9613e0..fe876a5154f6 100644
--- a/pkgs/applications/networking/instant-messengers/discord/linux.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix
@@ -5,6 +5,7 @@
   meta,
   binaryName,
   desktopName,
+  self,
   autoPatchelfHook,
   makeDesktopItem,
   lib,
@@ -260,5 +261,20 @@ stdenv.mkDerivation (finalAttrs: {
       version=$(echo $url | grep -oP '/\K(\d+\.){2}\d+')
       update-source-version ${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix --version-key=${branch}
     '';
+
+    tests = {
+      withVencord = self.override {
+        withVencord = true;
+      };
+      withEquicord = self.override {
+        withEquicord = true;
+      };
+      withMoonlight = self.override {
+        withMoonlight = true;
+      };
+      withOpenASAR = self.override {
+        withOpenASAR = true;
+      };
+    };
   };
 })
diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix
index 2b3ab060418a..dfe210f32c41 100644
--- a/pkgs/build-support/fetchgithub/default.nix
+++ b/pkgs/build-support/fetchgithub/default.nix
@@ -18,7 +18,8 @@ lib.makeOverridable (
     private ? false,
     forceFetchGit ? false,
     fetchLFS ? false,
-    sparseCheckout ? [ ],
+    rootDir ? "",
+    sparseCheckout ? lib.optional (rootDir != "") rootDir,
     githubBase ? "github.com",
     varPrefix ? null,
     meta ? { },
@@ -69,6 +70,7 @@ lib.makeOverridable (
       || deepClone
       || forceFetchGit
       || fetchLFS
+      || (rootDir != "")
       || (sparseCheckout != [ ]);
     # We prefer fetchzip in cases we don't need submodules as the hash
     # is more stable in that case.
diff --git a/pkgs/build-support/fetchgithub/tests.nix b/pkgs/build-support/fetchgithub/tests.nix
new file mode 100644
index 000000000000..3274fad406d3
--- /dev/null
+++ b/pkgs/build-support/fetchgithub/tests.nix
@@ -0,0 +1,119 @@
+{ testers, fetchFromGitHub, ... }:
+{
+  simple = testers.invalidateFetcherByDrvHash fetchFromGitHub {
+    name = "simple-nix-source";
+    owner = "NixOS";
+    repo = "nix";
+    rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";
+    hash = "sha256-7DszvbCNTjpzGRmpIVAWXk20P0/XTrWZ79KSOGLrUWY=";
+  };
+
+  sparseCheckout = testers.invalidateFetcherByDrvHash fetchFromGitHub {
+    name = "sparse-checkout-nix-source";
+    owner = "NixOS";
+    repo = "nix";
+    rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";
+    sparseCheckout = [
+      "src"
+      "tests"
+    ];
+    sha256 = "sha256-g1PHGTWgAcd/+sXHo1o6AjVWCvC6HiocOfMbMh873LQ=";
+  };
+
+  sparseCheckoutNonConeMode = testers.invalidateFetcherByDrvHash fetchFromGitHub {
+    name = "sparse-checkout-non-cone-nix-source";
+    owner = "NixOS";
+    repo = "nix";
+    rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";
+    sparseCheckout = [
+      "src"
+      "tests"
+    ];
+    nonConeMode = true;
+    sha256 = "sha256-FknO6C/PSnMPfhUqObD4vsW4PhkwdmPa9blNzcNvJQ4=";
+  };
+
+  leave-git = testers.invalidateFetcherByDrvHash fetchFromGitHub {
+    name = "leave-git-nix-source";
+    owner = "NixOS";
+    repo = "nix";
+    rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";
+    sha256 = "sha256-VmQ38+lr+rNPaTnjjV41uC2XSN4fkfZAfytE2uKyLfo=";
+    leaveDotGit = true;
+  };
+
+  submodule-simple = testers.invalidateFetcherByDrvHash fetchFromGitHub {
+    name = "submodule-simple-source";
+    owner = "pineapplehunter";
+    repo = "nix-test-repo-with-submodule";
+    rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a";
+    sha256 = "sha256-rmP8PQT0wJBopdtr/hsB7Y/L1G+ZPdHC2r9LB05Qrj4=";
+    fetchSubmodules = true;
+  };
+
+  submodule-leave-git = testers.invalidateFetcherByDrvHash fetchFromGitHub {
+    name = "submodule-leave-git-source";
+    owner = "pineapplehunter";
+    repo = "nix-test-repo-with-submodule";
+    rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a";
+    sha256 = "sha256-EC2PMEEtA7f5OFdsluHn7pi4QXhCZuFML8tib4pV7Ek=";
+    leaveDotGit = true;
+    fetchSubmodules = true;
+  };
+
+  submodule-deep = testers.invalidateFetcherByDrvHash fetchFromGitHub {
+    name = "submodule-deep-source";
+    owner = "pineapplehunter";
+    repo = "nix-test-repo-with-submodule";
+    rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a";
+    sha256 = "sha256-3zWogs6EZBnzUfz6gBnigETTKGYl9KFKFgsy6Bl4DME=";
+    deepClone = true;
+    fetchSubmodules = true;
+    # deepClone implies leaveDotGit, so delete the .git directory after
+    # fetching to distinguish from the submodule-leave-git-deep test.
+    postFetch = "rm -r $out/.git";
+  };
+
+  submodule-leave-git-deep = testers.invalidateFetcherByDrvHash fetchFromGitHub {
+    name = "submodule-leave-git-deep-source";
+    owner = "pineapplehunter";
+    repo = "nix-test-repo-with-submodule";
+    rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a";
+    sha256 = "sha256-ieYn9I/0RgeSwQkSqwKaU3RgjKFlRqMg7zw0Nvu3azA=";
+    deepClone = true;
+    leaveDotGit = true;
+    fetchSubmodules = true;
+  };
+
+  dumb-http-signed-tag = testers.invalidateFetcherByDrvHash fetchFromGitHub {
+    name = "dumb-http-signed-tag-source";
+    owner = "NixOS";
+    repo = "nix";
+    tag = "2.9.2";
+    sha256 = "sha256-uZCaBo9rdWRO/AlQMvVVjpAwzYijB2H5KKQqde6eHkg=";
+  };
+
+  fetchTags = testers.invalidateFetcherByDrvHash fetchFromGitHub {
+    name = "fetchFromGitHub-fetch-tags-test";
+    owner = "NixOS";
+    repo = "nix";
+    rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";
+    fetchTags = true;
+    leaveDotGit = true;
+    sha256 = "sha256-y7l+46lVP2pzJwGON5qEV0EoxWofRoWAym5q9VXvpc8=";
+    postFetch = ''
+      cd $out && git describe --tags --always > describe-output.txt 2>&1 || echo "git describe failed" > describe-output.txt
+      # See https://github.com/NixOS/nixpkgs/issues/412967#issuecomment-2927452118
+      rm -rf .git
+    '';
+  };
+
+  rootDir = testers.invalidateFetcherByDrvHash fetchFromGitHub {
+    name = "fetchFromGitHub-with-rootdir";
+    owner = "NixOS";
+    repo = "nix";
+    rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";
+    rootDir = "misc/systemd";
+    hash = "sha256-UhxHk4SrXYq7ZDMtXLig5SigpbITrVgkpFTmryuvpcM=";
+  };
+}
diff --git a/pkgs/by-name/al/almonds/package.nix b/pkgs/by-name/al/almonds/package.nix
index e4e17e58d948..1a304476070a 100644
--- a/pkgs/by-name/al/almonds/package.nix
+++ b/pkgs/by-name/al/almonds/package.nix
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Tenchi2xh";
     repo = "Almonds";
-    rev = version;
+    tag = version;
     sha256 = "0j8d8jizivnfx8lpc4w6sbqj5hq35nfz0vdg7ld80sc5cs7jr3ws";
   };
 
diff --git a/pkgs/by-name/al/alp/package.nix b/pkgs/by-name/al/alp/package.nix
index e0e18e919397..1de39c8c3fd3 100644
--- a/pkgs/by-name/al/alp/package.nix
+++ b/pkgs/by-name/al/alp/package.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "gernotfeichter";
     repo = "alp";
-    rev = version;
+    tag = version;
     hash = "sha256-tE8qKNXLKvFcnDULVkJJ/EJyEsvATCk/3YFkZCmpHSo=";
   };
   vendorHash = "sha256-AHPVhtm6La7HWuxJfpxTsS5wFTUZUJoVyebLGYhNKTg=";
diff --git a/pkgs/by-name/al/alsa-scarlett-gui/package.nix b/pkgs/by-name/al/alsa-scarlett-gui/package.nix
index ca24560d3ab9..8edcd60bc5e7 100644
--- a/pkgs/by-name/al/alsa-scarlett-gui/package.nix
+++ b/pkgs/by-name/al/alsa-scarlett-gui/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "geoffreybennett";
     repo = "alsa-scarlett-gui";
-    rev = version;
+    tag = version;
     hash = "sha256-DkfpMK0T67B4mnriignf4hx6Ifddls0rN0SxyfEsPZg=";
   };
 
diff --git a/pkgs/by-name/am/amber-lang/package.nix b/pkgs/by-name/am/amber-lang/package.nix
index d096f0b8e9d6..e8576703bcd9 100644
--- a/pkgs/by-name/am/amber-lang/package.nix
+++ b/pkgs/by-name/am/amber-lang/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "amber-lang";
     repo = "amber";
-    rev = version;
+    tag = version;
     hash = "sha256-N9G/2G8+vrpr1/K7XLwgW+X2oAyAaz4qvN+EbLOCU1Q=";
   };
 
diff --git a/pkgs/by-name/am/amule/package.nix b/pkgs/by-name/am/amule/package.nix
index 69b7348417bc..c75658b642e2 100644
--- a/pkgs/by-name/am/amule/package.nix
+++ b/pkgs/by-name/am/amule/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "amule-project";
     repo = "amule";
-    rev = version;
+    tag = version;
     sha256 = "1nm4vxgmisn1b6l3drmz0q04x067j2i8lw5rnf0acaapwlp8qwvi";
   };
 
diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix
index e0a28364887b..e873734b269b 100644
--- a/pkgs/by-name/ap/apko/package.nix
+++ b/pkgs/by-name/ap/apko/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "apko";
-  version = "0.30.12";
+  version = "0.30.13";
 
   src = fetchFromGitHub {
     owner = "chainguard-dev";
     repo = "apko";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+Ttriv/CG2dMttig0YjVB6BkxuCDjuLZsH92ENNom2c=";
+    hash = "sha256-b90o1MmFYhEc8mwh7ejTm6I59zlaa8Jv46dtuZdC6GQ=";
     # 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;
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
       find "$out" -name .git -print0 | xargs -0 rm -rf
     '';
   };
-  vendorHash = "sha256-fv313+8FUmYgC9vOXVMYk6ZbGbT4aDtQLPaJ8izX7pc=";
+  vendorHash = "sha256-mZg8OXPMeBAJYQWB0vrZC5fo0+xuU8ho/IE2j624RV8=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/at/atopile/package.nix b/pkgs/by-name/at/atopile/package.nix
new file mode 100644
index 000000000000..12012cdceb16
--- /dev/null
+++ b/pkgs/by-name/at/atopile/package.nix
@@ -0,0 +1 @@
+{ python3Packages }: with python3Packages; toPythonApplication atopile
diff --git a/pkgs/by-name/b6/b612/package.nix b/pkgs/by-name/b6/b612/package.nix
index 1fee278400e5..77e0b38f3c1b 100644
--- a/pkgs/by-name/b6/b612/package.nix
+++ b/pkgs/by-name/b6/b612/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "polarsys";
     repo = "b612";
-    rev = version;
+    tag = version;
     hash = "sha256-uyBC8UNOwztCHXhR9XZuWDwrty0eClbo0E+gI1PmjEg=";
   };
 
diff --git a/pkgs/by-name/ba/badvpn/package.nix b/pkgs/by-name/ba/badvpn/package.nix
index d5fc259f1904..9f3372510b09 100644
--- a/pkgs/by-name/ba/badvpn/package.nix
+++ b/pkgs/by-name/ba/badvpn/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "ambrop72";
     repo = "badvpn";
-    rev = version;
+    tag = version;
     sha256 = "sha256-bLTDpq3ohUP+KooPvhv1/AZfdo0HwB3g9QOuE2E/pmY=";
   };
 
diff --git a/pkgs/by-name/ba/bamf/package.nix b/pkgs/by-name/ba/bamf/package.nix
index 66df815448ba..23f13a84f067 100644
--- a/pkgs/by-name/ba/bamf/package.nix
+++ b/pkgs/by-name/ba/bamf/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://git.launchpad.net/~unity-team/bamf";
-    rev = version;
+    tag = version;
     sha256 = "7U+2GcuDjPU8quZjkd8bLADGlG++tl6wSo0mUQkjAXQ=";
   };
 
diff --git a/pkgs/by-name/ba/bashmount/package.nix b/pkgs/by-name/ba/bashmount/package.nix
index 915d09a2c5cf..da584d14f5e0 100644
--- a/pkgs/by-name/ba/bashmount/package.nix
+++ b/pkgs/by-name/ba/bashmount/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jamielinux";
     repo = "bashmount";
-    rev = version;
+    tag = version;
     sha256 = "1irw47s6i1qwxd20cymzlfw5sv579cw877l27j3p66qfhgadwxrl";
   };
 
diff --git a/pkgs/by-name/ba/bastet/package.nix b/pkgs/by-name/ba/bastet/package.nix
index ef77b94218b3..593707065c44 100644
--- a/pkgs/by-name/ba/bastet/package.nix
+++ b/pkgs/by-name/ba/bastet/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fph";
     repo = "bastet";
-    rev = version;
+    tag = version;
     sha256 = "09kamxapm9jw9przpsgjfg33n9k94bccv65w95dakj0br33a75wn";
   };
 
diff --git a/pkgs/by-name/ba/batsignal/package.nix b/pkgs/by-name/ba/batsignal/package.nix
index ef6e34c57e8f..a3b3cedf19c1 100644
--- a/pkgs/by-name/ba/batsignal/package.nix
+++ b/pkgs/by-name/ba/batsignal/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "electrickite";
     repo = "batsignal";
-    rev = version;
+    tag = version;
     sha256 = "sha256-yngd2yP6XtRp8y8ZUd0NISdf8+8wJvpLogrQQMdB0lA=";
   };
 
diff --git a/pkgs/by-name/bc/bcg729/package.nix b/pkgs/by-name/bc/bcg729/package.nix
index 17ef2cdd090d..942e9e4d6ebc 100644
--- a/pkgs/by-name/bc/bcg729/package.nix
+++ b/pkgs/by-name/bc/bcg729/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     owner = "public";
     group = "BC";
     repo = "bcg729";
-    rev = version;
+    tag = version;
     sha256 = "1hal6b3w6f8y5r1wa0xzj8sj2jjndypaxyw62q50p63garp2h739";
   };
 
diff --git a/pkgs/by-name/bc/bctoolbox/package.nix b/pkgs/by-name/bc/bctoolbox/package.nix
index 3f33b2ed484e..46ccac25604e 100644
--- a/pkgs/by-name/bc/bctoolbox/package.nix
+++ b/pkgs/by-name/bc/bctoolbox/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     owner = "public";
     group = "BC";
     repo = "bctoolbox";
-    rev = version;
+    tag = version;
     hash = "sha256-OwwSGzMFwR2ajUUgAy7ea/Q2pWxn3DO72W7ukcjBJnU=";
   };
 
diff --git a/pkgs/by-name/bd/bdf2sfd/package.nix b/pkgs/by-name/bd/bdf2sfd/package.nix
index a1aac904fa2a..6f80caafaa8e 100644
--- a/pkgs/by-name/bd/bdf2sfd/package.nix
+++ b/pkgs/by-name/bd/bdf2sfd/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "fcambus";
     repo = "bdf2sfd";
-    rev = version;
+    tag = version;
     sha256 = "sha256-L1fIPZdVP4px73VbnEA6sb28WrmsNUJ2tqLeGPpwDbA=";
   };
 
diff --git a/pkgs/by-name/be/beefi/package.nix b/pkgs/by-name/be/beefi/package.nix
index 1c8c084711a0..5834cd848e33 100644
--- a/pkgs/by-name/be/beefi/package.nix
+++ b/pkgs/by-name/be/beefi/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jfeick";
     repo = "beefi";
-    rev = version;
+    tag = version;
     sha256 = "1180avalbw414q1gnfqdgc9zg3k9y0401kw9qvcn51qph81d04v5";
   };
 
diff --git a/pkgs/by-name/be/belcard/package.nix b/pkgs/by-name/be/belcard/package.nix
index 2dd3884d079a..57fbee6493a3 100644
--- a/pkgs/by-name/be/belcard/package.nix
+++ b/pkgs/by-name/be/belcard/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     owner = "public";
     group = "BC";
     repo = "belcard";
-    rev = version;
+    tag = version;
     sha256 = "sha256-pRNJ1bDS2v0Cn+6cxMeFa0JQ27UZR6kCI9P6gQ5W2GA=";
   };
 
diff --git a/pkgs/by-name/be/belle-sip/package.nix b/pkgs/by-name/be/belle-sip/package.nix
index 8d98b8168198..4efd5878e5a5 100644
--- a/pkgs/by-name/be/belle-sip/package.nix
+++ b/pkgs/by-name/be/belle-sip/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     owner = "public";
     group = "BC";
     repo = "belle-sip";
-    rev = version;
+    tag = version;
     hash = "sha256-PZnAB+LOlwkiJO0ICqYqn0TgqQY2KdUbgGJRFSzGxdE=";
   };
 
diff --git a/pkgs/by-name/be/belr/package.nix b/pkgs/by-name/be/belr/package.nix
index 45b9adf08ac0..470c07f01f4b 100644
--- a/pkgs/by-name/be/belr/package.nix
+++ b/pkgs/by-name/be/belr/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     owner = "public";
     group = "BC";
     repo = "belr";
-    rev = version;
+    tag = version;
     hash = "sha256-4keVUAsTs1DAhOfV71VD28I0PEHnyvW95blplY690LY=";
   };
 
diff --git a/pkgs/by-name/be/benchexec/package.nix b/pkgs/by-name/be/benchexec/package.nix
index bca21cbc4506..b992caa71598 100644
--- a/pkgs/by-name/be/benchexec/package.nix
+++ b/pkgs/by-name/be/benchexec/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "sosy-lab";
     repo = "benchexec";
-    rev = version;
+    tag = version;
     hash = "sha256-lokz7klAQAascij0T/T43/PrbMh6ZUAvFnIqg13pVUk=";
   };
 
diff --git a/pkgs/by-name/be/beyond-all-reason/package.nix b/pkgs/by-name/be/beyond-all-reason/package.nix
index 65190afee71d..380da7ac703e 100644
--- a/pkgs/by-name/be/beyond-all-reason/package.nix
+++ b/pkgs/by-name/be/beyond-all-reason/package.nix
@@ -12,12 +12,21 @@ let
     url = "https://github.com/beyond-all-reason/BYAR-Chobby/releases/download/v${version}/Beyond-All-Reason-${version}.AppImage";
     hash = "sha256-ZJW5BdxxqyrM2TJTO0SBp4BXt3ILyi77EZx73X8hqJE=";
   };
+  appimageContents = appimageTools.extract { inherit pname version src; };
 in
 appimageTools.wrapType2 {
   inherit pname version src;
 
   extraPkgs = pkgs: [ openal ];
 
+  extraInstallCommands = ''
+    install -m 444 -D ${appimageContents}/beyond-all-reason.desktop $out/share/applications/beyond-all-reason.desktop
+    install -m 444 -D ${appimageContents}/beyond-all-reason.png \
+      $out/share/icons/hicolor/256x256/apps/beyond-all-reason.png
+    substituteInPlace $out/share/applications/beyond-all-reason.desktop \
+      --replace-fail 'Exec=AppRun' 'Exec=beyond-all-reason'
+  '';
+
   meta = {
     homepage = "https://www.beyondallreason.info/";
     downloadPage = "https://www.beyondallreason.info/download";
diff --git a/pkgs/by-name/bf/bfs/package.nix b/pkgs/by-name/bf/bfs/package.nix
index b26f0de9c290..4e644915e18d 100644
--- a/pkgs/by-name/bf/bfs/package.nix
+++ b/pkgs/by-name/bf/bfs/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     repo = "bfs";
     owner = "tavianator";
-    rev = version;
+    tag = version;
     hash = "sha256-+hGxdsk9MU5MVvvx3C2cqomboNxD0UZ5y7t84fAwfqs=";
   };
 
diff --git a/pkgs/by-name/bg/bgpq4/package.nix b/pkgs/by-name/bg/bgpq4/package.nix
index fab207596ba4..b5ff94576863 100644
--- a/pkgs/by-name/bg/bgpq4/package.nix
+++ b/pkgs/by-name/bg/bgpq4/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bgp";
     repo = "bgpq4";
-    rev = version;
+    tag = version;
     sha256 = "sha256-3mfFj9KoQbDe0gH7Le03N1Yds/bTEmY+OiXNaOtHkpY=";
   };
 
diff --git a/pkgs/by-name/bi/biblesync/package.nix b/pkgs/by-name/bi/biblesync/package.nix
index c3047c802326..486244f71329 100644
--- a/pkgs/by-name/bi/biblesync/package.nix
+++ b/pkgs/by-name/bi/biblesync/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "karlkleinpaste";
     repo = "biblesync";
-    rev = version;
+    tag = version;
     sha256 = "0prmd12jq2cjdhsph5v89y38j7hhd51dr3r1hivgkhczr3m5hf4s";
   };
 
diff --git a/pkgs/by-name/bi/birdwatcher/package.nix b/pkgs/by-name/bi/birdwatcher/package.nix
index 21b1212c4216..cb27663b59ee 100644
--- a/pkgs/by-name/bi/birdwatcher/package.nix
+++ b/pkgs/by-name/bi/birdwatcher/package.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "alice-lg";
     repo = "birdwatcher";
-    rev = version;
+    tag = version;
     hash = "sha256-TTU5TYWD/KSh/orDdQnNrQJ/G7z5suBu7psF9V6AAIw=";
   };
 
diff --git a/pkgs/by-name/bi/biscuit-cli/package.nix b/pkgs/by-name/bi/biscuit-cli/package.nix
index 3c1eee2aef7a..7a007e0a8bbc 100644
--- a/pkgs/by-name/bi/biscuit-cli/package.nix
+++ b/pkgs/by-name/bi/biscuit-cli/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "biscuit-auth";
     repo = "biscuit-cli";
-    rev = version;
+    tag = version;
     sha256 = "sha256-s4Y4MhM79Z+4VxB03+56OqRQJaSHj2VQEJcL6CsT+2k=";
   };
 
diff --git a/pkgs/by-name/bj/bjumblr/package.nix b/pkgs/by-name/bj/bjumblr/package.nix
index af4c7d0d6407..e5c590cf0e04 100644
--- a/pkgs/by-name/bj/bjumblr/package.nix
+++ b/pkgs/by-name/bj/bjumblr/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sjaehn";
     repo = "BJumblr";
-    rev = version;
+    tag = version;
     sha256 = "sha256-qSoGmWUGaMjx/bkiCJ/qb4LBbuFPXXlJ0e9hrFBXzwE=";
   };
 
diff --git a/pkgs/by-name/bk/bkt/package.nix b/pkgs/by-name/bk/bkt/package.nix
index fb8f0758e7c4..6f608eb887ac 100644
--- a/pkgs/by-name/bk/bkt/package.nix
+++ b/pkgs/by-name/bk/bkt/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "dimo414";
     repo = "bkt";
-    rev = version;
+    tag = version;
     sha256 = "sha256-XQK7oZfutqCvFoGzMH5G5zoGvqB8YaXSdrwjS/SVTNU=";
   };
 
diff --git a/pkgs/by-name/bl/blis/package.nix b/pkgs/by-name/bl/blis/package.nix
index 6537877d804c..4782638f03c7 100644
--- a/pkgs/by-name/bl/blis/package.nix
+++ b/pkgs/by-name/bl/blis/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "flame";
     repo = "blis";
-    rev = version;
+    tag = version;
     sha256 = "sha256-+n8SbiiEJDN4j1IPmZfI5g1i2J+jWrUXh7S48JEDTAE=";
   };
 
diff --git a/pkgs/by-name/bl/blitz/package.nix b/pkgs/by-name/bl/blitz/package.nix
index f54c1861deba..e5e44fddc2f2 100644
--- a/pkgs/by-name/bl/blitz/package.nix
+++ b/pkgs/by-name/bl/blitz/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "blitzpp";
     repo = "blitz";
-    rev = version;
+    tag = version;
     hash = "sha256-wZDg+4lCd9iHvxuQQE/qs58NorkxZ0+mf+8PKQ57CDE=";
   };
 
diff --git a/pkgs/by-name/bl/bloop/package.nix b/pkgs/by-name/bl/bloop/package.nix
index ac7aba4042d8..4de4e5ff5007 100644
--- a/pkgs/by-name/bl/bloop/package.nix
+++ b/pkgs/by-name/bl/bloop/package.nix
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation rec {
   pname = "bloop";
-  version = "2.0.15";
+  version = "2.0.16";
 
   platform =
     if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then
@@ -42,11 +42,11 @@ stdenv.mkDerivation rec {
     url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}";
     sha256 =
       if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then
-        "sha256-JEhBIYHCsh2Ij8PBhLWbhyVR5wcN3FnYV03GuE1Y/Ow="
+        "sha256-66TYu/2HMvd58z2hDdOfQ51feZ/yYvzVfMmjD9U7lHs="
       else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then
-        "sha256-UrQuk4FuZ/J55vdQShOZ4OHzecjuYTmt5rXiYhz5seE="
+        "sha256-k8mUKcQcJZuqlEfphOIhXSTU4ny5WD0zHEhUsbtpVg0="
       else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then
-        "sha256-lIfXvBGK6r0akDgC9DYiU/m+BwHoFh7/RLnNtTBzkIo="
+        "sha256-eYKjT5k3UeSt/FUddzaYQ1xbYaC9Rf/HCEbYxkLaz50="
       else
         throw "unsupported platform";
   };
diff --git a/pkgs/by-name/bl/blueberry/package.nix b/pkgs/by-name/bl/blueberry/package.nix
index 17c28b564b6c..81b7c50f165c 100644
--- a/pkgs/by-name/bl/blueberry/package.nix
+++ b/pkgs/by-name/bl/blueberry/package.nix
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "blueberry";
-    rev = version;
+    tag = version;
     sha256 = "sha256-MyIjcTyKn1aC2th6fCOw4cIqrRKatk2s4QD5R9cm83A=";
   };
 
diff --git a/pkgs/by-name/bl/bluespec/package.nix b/pkgs/by-name/bl/bluespec/package.nix
index 2064ea2e70ce..ec1bf56298e2 100644
--- a/pkgs/by-name/bl/bluespec/package.nix
+++ b/pkgs/by-name/bl/bluespec/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "B-Lang-org";
     repo = "bsc";
-    rev = version;
+    tag = version;
     sha256 = "sha256-gA/vfAkkM2cuArN99JZVYEWTIJqg82HlC+BHNVS5Ot0=";
   };
 
diff --git a/pkgs/by-name/bl/blugon/package.nix b/pkgs/by-name/bl/blugon/package.nix
index f580ffd9d774..eb9f6bb543b1 100644
--- a/pkgs/by-name/bl/blugon/package.nix
+++ b/pkgs/by-name/bl/blugon/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jumper149";
     repo = "blugon";
-    rev = version;
+    tag = version;
     sha256 = "1i67v8jxvavgax3dwvns200iwwdcvgki04liq0x64q52lg0vrh7m";
   };
 
diff --git a/pkgs/by-name/bl/blur-effect/package.nix b/pkgs/by-name/bl/blur-effect/package.nix
index cfc183ff1517..b194a7884134 100644
--- a/pkgs/by-name/bl/blur-effect/package.nix
+++ b/pkgs/by-name/bl/blur-effect/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sonald";
     repo = "blur-effect";
-    rev = version;
+    tag = version;
     sha256 = "0cjw7iz0p7x1bi4vmwrivfidry5wlkgfgdl9wly88cm3z9ib98jj";
   };
 
diff --git a/pkgs/by-name/bo/bob/package.nix b/pkgs/by-name/bo/bob/package.nix
index 4d1662e8c24d..6d55e9688f3d 100644
--- a/pkgs/by-name/bo/bob/package.nix
+++ b/pkgs/by-name/bo/bob/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "benchkram";
     repo = "bob";
-    rev = version;
+    tag = version;
     hash = "sha256-zmWfOLBb+GWw9v6LdCC7/WaP1Wz7UipPwqkmI1+rG8Q=";
   };
 
diff --git a/pkgs/by-name/bo/bobcat/package.nix b/pkgs/by-name/bo/bobcat/package.nix
index 9004282553b5..8369ac6ee561 100644
--- a/pkgs/by-name/bo/bobcat/package.nix
+++ b/pkgs/by-name/bo/bobcat/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     domain = "gitlab.com";
     owner = "fbb-git";
     repo = "bobcat";
-    rev = version;
+    tag = version;
     hash = "sha256-JLJKaJmztputIon9JkKzpm3Ch60iwm4Imh9p42crYzA=";
   };
 
diff --git a/pkgs/by-name/bo/bolt/package.nix b/pkgs/by-name/bo/bolt/package.nix
index 0e430dd08f02..aedd111c7464 100644
--- a/pkgs/by-name/bo/bolt/package.nix
+++ b/pkgs/by-name/bo/bolt/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     domain = "gitlab.freedesktop.org";
     owner = "bolt";
     repo = "bolt";
-    rev = version;
+    tag = version;
     hash = "sha256-sDPipSIT2MJMdsOjOQSB+uOe6KXzVnyAqcQxPPr2NsU=";
   };
 
diff --git a/pkgs/by-name/bo/boltbrowser/package.nix b/pkgs/by-name/bo/boltbrowser/package.nix
index a16f46094afe..9b911dd6d9b4 100644
--- a/pkgs/by-name/bo/boltbrowser/package.nix
+++ b/pkgs/by-name/bo/boltbrowser/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "br0xen";
     repo = "boltbrowser";
-    rev = version;
+    tag = version;
     sha256 = "sha256-3t0U1bSJbo3RJZe+PwaUeuzSt23Gs++WRe/uehfa4cA=";
   };
 
diff --git a/pkgs/by-name/bo/bombadillo/package.nix b/pkgs/by-name/bo/bombadillo/package.nix
index a601fce10ee5..676b4e52fdd8 100644
--- a/pkgs/by-name/bo/bombadillo/package.nix
+++ b/pkgs/by-name/bo/bombadillo/package.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
 
   src = fetchgit {
     url = "https://tildegit.org/sloum/bombadillo.git";
-    rev = version;
+    tag = version;
     hash = "sha256-FjU9AyRAdGFr1bVpkmj5STkbzCXvpxOaOj7WNQJq7A0=";
   };
 
diff --git a/pkgs/by-name/bo/bomutils/package.nix b/pkgs/by-name/bo/bomutils/package.nix
index 3b60711df4e5..91d835b8c3ec 100644
--- a/pkgs/by-name/bo/bomutils/package.nix
+++ b/pkgs/by-name/bo/bomutils/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "hogliux";
     repo = "bomutils";
-    rev = version;
+    tag = version;
     sha256 = "1i7nhbq1fcbrjwfg64znz8p4l7662f7qz2l6xcvwd5z93dnmgmdr";
   };
 
diff --git a/pkgs/by-name/bo/bonzomatic/package.nix b/pkgs/by-name/bo/bonzomatic/package.nix
index 4ca7879051e2..85d329a21e42 100644
--- a/pkgs/by-name/bo/bonzomatic/package.nix
+++ b/pkgs/by-name/bo/bonzomatic/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Gargaj";
     repo = "bonzomatic";
-    rev = version;
+    tag = version;
     sha256 = "sha256-hwK3C+p1hRwnuY2/vBrA0QsJGIcJatqq+U5/hzVCXEg=";
   };
 
diff --git a/pkgs/by-name/bo/boolector/package.nix b/pkgs/by-name/bo/boolector/package.nix
index 072fb079a63c..ab80bc3fbdf7 100644
--- a/pkgs/by-name/bo/boolector/package.nix
+++ b/pkgs/by-name/bo/boolector/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "boolector";
     repo = "boolector";
-    rev = version;
+    tag = version;
     hash = "sha256-CdfpXUbU1+yEmrNyl+hvHlJfpzzzx356naim6vRafDg=";
   };
 
diff --git a/pkgs/by-name/bo/boops/package.nix b/pkgs/by-name/bo/boops/package.nix
index 8e5cfe9865ea..2d3addead3ea 100644
--- a/pkgs/by-name/bo/boops/package.nix
+++ b/pkgs/by-name/bo/boops/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "sjaehn";
     repo = "BOops";
-    rev = version;
+    tag = version;
     sha256 = "0nvpawk58g189z96xnjs4pyri5az3ckdi9mhi0i9s0a7k4gdkarr";
   };
 
diff --git a/pkgs/by-name/bo/booster/package.nix b/pkgs/by-name/bo/booster/package.nix
index e0fa317952a1..411d77b7ba2b 100644
--- a/pkgs/by-name/bo/booster/package.nix
+++ b/pkgs/by-name/bo/booster/package.nix
@@ -22,7 +22,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "anatol";
     repo = "booster";
-    rev = version;
+    tag = version;
     hash = "sha256-uHxPzuD3PxKAI2JOZd7lcLvcqYqk9gW9yeZgOS1Y7x4=";
   };
 
diff --git a/pkgs/by-name/bo/bossa-arduino/package.nix b/pkgs/by-name/bo/bossa-arduino/package.nix
index 519b9820278b..635840270da9 100644
--- a/pkgs/by-name/bo/bossa-arduino/package.nix
+++ b/pkgs/by-name/bo/bossa-arduino/package.nix
@@ -7,7 +7,7 @@ bossa.overrideAttrs (attrs: rec {
   src = fetchFromGitHub {
     owner = "arduino";
     repo = "BOSSA";
-    rev = version;
+    tag = version;
     sha256 = "sha256-sBJ6QMd7cTClDnGCeOU0FT6IczEjqqRxCD7kef5GuY8=";
   };
 })
diff --git a/pkgs/by-name/bo/bossa/package.nix b/pkgs/by-name/bo/bossa/package.nix
index 1a108f0a712d..1aa463aeeebd 100644
--- a/pkgs/by-name/bo/bossa/package.nix
+++ b/pkgs/by-name/bo/bossa/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "shumatech";
     repo = "BOSSA";
-    rev = version;
+    tag = version;
     sha256 = "sha256-8M3MU/+Y1L6SaQ1yoC9Z27A/gGruZdopLnL1z7h7YJw=";
   };
 
diff --git a/pkgs/by-name/bo/boxbuddy/package.nix b/pkgs/by-name/bo/boxbuddy/package.nix
index 3e65fdf4c693..5b18bbfaf058 100644
--- a/pkgs/by-name/bo/boxbuddy/package.nix
+++ b/pkgs/by-name/bo/boxbuddy/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "Dvlv";
     repo = "BoxBuddyRS";
-    rev = version;
+    tag = version;
     hash = "sha256-9BGgm4yRjCarJIGP/G9gPj/qsYWb96XGJmpgLj3XCdM=";
   };
 
diff --git a/pkgs/by-name/br/braincurses/package.nix b/pkgs/by-name/br/braincurses/package.nix
index 2a6a67b17aed..419248c40c00 100644
--- a/pkgs/by-name/br/braincurses/package.nix
+++ b/pkgs/by-name/br/braincurses/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "bderrly";
     repo = "braincurses";
-    rev = version;
+    tag = version;
     sha256 = "0gpny9wrb0zj3lr7iarlgn9j4367awj09v3hhxz9r9a6yhk4anf5";
   };
 
diff --git a/pkgs/by-name/br/brial/package.nix b/pkgs/by-name/br/brial/package.nix
index 81e989d8d004..776e5b105a2f 100644
--- a/pkgs/by-name/br/brial/package.nix
+++ b/pkgs/by-name/br/brial/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "BRiAl";
     repo = "BRiAl";
-    rev = version;
+    tag = version;
     sha256 = "sha256-I8p2jdc2/oq9piy1QvNl+N0+MHDE5Xv1kawkRTjrWSU=";
   };
 
diff --git a/pkgs/by-name/br/brightnessctl/package.nix b/pkgs/by-name/br/brightnessctl/package.nix
index 3762598709dc..ddfb76a1ce73 100644
--- a/pkgs/by-name/br/brightnessctl/package.nix
+++ b/pkgs/by-name/br/brightnessctl/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Hummer12007";
     repo = "brightnessctl";
-    rev = version;
+    tag = version;
     sha256 = "0immxc7almmpg80n3bdn834p3nrrz7bspl2syhb04s3lawa5y2lq";
   };
 
diff --git a/pkgs/by-name/br/brotab/package.nix b/pkgs/by-name/br/brotab/package.nix
index d7f5ae7a76c3..4c887d103f7e 100644
--- a/pkgs/by-name/br/brotab/package.nix
+++ b/pkgs/by-name/br/brotab/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "balta2ar";
     repo = "brotab";
-    rev = version;
+    tag = version;
     hash = "sha256-HKKjiW++FwjdorqquSCIdi1InE6KbMbFKZFYHBxzg8Q=";
   };
 
diff --git a/pkgs/by-name/ca/cargo-chef/package.nix b/pkgs/by-name/ca/cargo-chef/package.nix
index 31bf8b74b547..74f1c138ec42 100644
--- a/pkgs/by-name/ca/cargo-chef/package.nix
+++ b/pkgs/by-name/ca/cargo-chef/package.nix
@@ -6,14 +6,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-chef";
-  version = "0.1.72";
+  version = "0.1.73";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-mSzSc72/Y18O9nSoqeU4GQGa9lTwi34ojnIsZg8wBpE=";
+    hash = "sha256-zWyPVITx4wN0fd0bNVU5yt/ojsSVhbgIcoV6Z427RCA=";
   };
 
-  cargoHash = "sha256-l4h7DFl9WFB0uARk1P/EAYqAgSiHEEnRXS+h69qaL0Q=";
+  cargoHash = "sha256-diox0Vafn8881tW4Z5Udm6U2lNQKe9m/H5bRTRN3aGs=";
 
   meta = with lib; {
     description = "Cargo-subcommand to speed up Rust Docker builds using Docker layer caching";
diff --git a/pkgs/by-name/ca/cargo-temp/package.nix b/pkgs/by-name/ca/cargo-temp/package.nix
index bcd5a26e9c21..afe2dab17d27 100644
--- a/pkgs/by-name/ca/cargo-temp/package.nix
+++ b/pkgs/by-name/ca/cargo-temp/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-temp";
-  version = "0.3.3";
+  version = "0.3.4";
 
   src = fetchFromGitHub {
     owner = "yozhgoor";
     repo = "cargo-temp";
     rev = "v${version}";
-    hash = "sha256-71kAlZKSBnROZ8wXe4kQa8nNug5/hk6NKsqHoQU5pWc=";
+    hash = "sha256-SE96RFOW3/BHglOnQa/Hd5rwyzQLQLaa7wlNio57uMI=";
   };
 
-  cargoHash = "sha256-rHTEWc3JAnsz5z+NmTb84VSXHSR6nNlb5C+n9VxvnUQ=";
+  cargoHash = "sha256-osGKIskHZAx6gXbpYJua7pL02CdKmiudwnokUSM/U+E=";
 
   meta = with lib; {
     description = "CLI tool that allow you to create a temporary new Rust project using cargo with already installed dependencies";
diff --git a/pkgs/by-name/da/datafusion-cli/package.nix b/pkgs/by-name/da/datafusion-cli/package.nix
index 7edf32b73034..44dd61e2a17e 100644
--- a/pkgs/by-name/da/datafusion-cli/package.nix
+++ b/pkgs/by-name/da/datafusion-cli/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "datafusion-cli";
-  version = "50.0.0";
+  version = "50.1.0";
 
   src = fetchFromGitHub {
     name = "datafusion-cli-source";
     owner = "apache";
     repo = "arrow-datafusion";
     tag = finalAttrs.version;
-    hash = "sha256-CXElFGaWC+oU5EZcDfWkSE/cXxY4GO2AJy9FerWqVkI=";
+    hash = "sha256-SYvdz/rGs8bZHKuM5ws2c+pSdYx7mVfQ69dliCDp8ec=";
   };
 
-  cargoHash = "sha256-bC+IYH8iAVJTEFf2sm0JYY/XhgrbDfeO9HsWTf3OtCw=";
+  cargoHash = "sha256-WHmNbmP8rqP0W+5PvV9Qi5szdWIwLsZuNqDVnV6JL9o=";
 
   buildAndTestSubdir = "datafusion-cli";
 
diff --git a/pkgs/by-name/de/debian-goodies/package.nix b/pkgs/by-name/de/debian-goodies/package.nix
index d6857bfa1828..bf42aa211eb1 100644
--- a/pkgs/by-name/de/debian-goodies/package.nix
+++ b/pkgs/by-name/de/debian-goodies/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     domain = "salsa.debian.org";
     owner = "debian";
     repo = "debian-goodies";
-    rev = "debian/${version}";
+    tag = "debian/${version}";
     sha256 = "sha256-KPPRxYmCEYwlUAR29tc8w4rerXpswO/rbpEjXPoDV4Q=";
   };
 
diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix
index 1b89b8d69c50..34c4a78f9bfd 100644
--- a/pkgs/by-name/de/deno/package.nix
+++ b/pkgs/by-name/de/deno/package.nix
@@ -29,17 +29,17 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "deno";
-  version = "2.5.2";
+  version = "2.5.3";
 
   src = fetchFromGitHub {
     owner = "denoland";
     repo = "deno";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true; # required for tests
-    hash = "sha256-wpn79xY+Gsn48C5mYF1lryrgZZsr1YJayd+Rl0gbPXY=";
+    hash = "sha256-UqD9Va33XVX73bjwUdb6woZ3kP/Xz6iBVqV1ceRbXq0=";
   };
 
-  cargoHash = "sha256-KAHLZS6BfRgPBlBW0LSdHwPP6sRUN9kksMo0KuDtb5s=";
+  cargoHash = "sha256-OrKg3bOA5AyLQA+LIsHwWpk9DHodhcCVzdKW/S9+mNY=";
 
   patches = [
     # Patch out the remote upgrade (deno update) check.
@@ -53,6 +53,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ./patches/0002-tests-replace-hardcoded-paths.patch
     ./patches/0003-tests-linux-no-chown.patch
     ./patches/0004-tests-darwin-fixes.patch
+    # some new TS tests don't identify `deno` location from parent actively
+    # running `deno` instance
+    # https://github.com/denoland/deno/pull/30914
+    ./patches/0005-tests-fix-deno-path.patch
   ];
   postPatch = ''
     # Use patched nixpkgs libffi in order to fix https://github.com/libffi/libffi/pull/857
diff --git a/pkgs/by-name/de/deno/patches/0005-tests-fix-deno-path.patch b/pkgs/by-name/de/deno/patches/0005-tests-fix-deno-path.patch
new file mode 100644
index 000000000000..aab217408237
--- /dev/null
+++ b/pkgs/by-name/de/deno/patches/0005-tests-fix-deno-path.patch
@@ -0,0 +1,34 @@
+From 798fc5e7e87c1b985a383b7b92a7e55c82e41efa Mon Sep 17 00:00:00 2001
+From: 06kellyjac <dev@j-k.io>
+Date: Fri, 3 Oct 2025 14:20:53 +0100
+Subject: [PATCH] test: leverage `Deno.execPath()` matching other tests
+
+Currently most TS tests use `Deno.execPath()` to identify where `deno` lives
+In the event deno is not on the `$PATH` these tests will fail.
+If deno is on the `$PATH` you can end up testing the wrong instance of `deno`.
+---
+ tests/unit/process_test.ts | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/unit/process_test.ts b/tests/unit/process_test.ts
+index 7b82fe5ba782f5..1c26a6f990d1b0 100644
+--- a/tests/unit/process_test.ts
++++ b/tests/unit/process_test.ts
+@@ -623,7 +623,7 @@ Deno.test(
+ 
+     // @ts-ignore `Deno.run()` was soft-removed in Deno 2.
+     const p = Deno.run({
+-      cmd: ["deno", "run", "--watch", tempFile],
++      cmd: [Deno.execPath(), "run", "--watch", tempFile],
+       stdout: "piped",
+       stderr: "null",
+     });
+@@ -661,7 +661,7 @@ Deno.serve({ signal: ac.signal }, () => new Response("Hello World"));
+ 
+     // @ts-ignore `Deno.run()` was soft-removed in Deno 2.
+     const p = Deno.run({
+-      cmd: ["deno", "run", "--watch", tempFile],
++      cmd: [Deno.execPath(), "run", "--watch", tempFile],
+       stdout: "piped",
+       stderr: "null",
+     });
diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix
index 4af0e0485e5d..a24af9cc138c 100644
--- a/pkgs/by-name/eq/equicord/package.nix
+++ b/pkgs/by-name/eq/equicord/package.nix
@@ -6,6 +6,10 @@
   pnpm_10,
   stdenv,
   nix-update-script,
+  discord,
+  discord-ptb,
+  discord-canary,
+  discord-development,
   buildWebExtension ? false,
 }:
 stdenv.mkDerivation (finalAttrs: {
@@ -57,11 +61,16 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--version-regex"
-      "^(\\d{4}-\\d{2}-\\d{2})$"
-    ];
+  passthru = {
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex"
+        "^(\\d{4}-\\d{2}-\\d{2})$"
+      ];
+    };
+    tests = lib.genAttrs' [ discord discord-ptb discord-canary discord-development ] (
+      p: lib.nameValuePair p.pname p.tests.withEquicord
+    );
   };
 
   meta = {
diff --git a/pkgs/by-name/ex/exercism/package.nix b/pkgs/by-name/ex/exercism/package.nix
index 49fea4575759..88b8ce24ddfa 100644
--- a/pkgs/by-name/ex/exercism/package.nix
+++ b/pkgs/by-name/ex/exercism/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "exercism";
-  version = "3.5.7";
+  version = "3.5.8";
 
   src = fetchFromGitHub {
     owner = "exercism";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-DksutkeaI9F1lcCcEahX2eSi/DIy4ra1CcwqiUhpNfA=";
+    hash = "sha256-vYbOagP3RwqD2+x0Mvve66Xm88jeRVzHU7nsN432j6k=";
   };
 
   vendorHash = "sha256-xY3C3emqtPIKyxIN9aEkrLXhTxWNmo0EJXNZVtbtIvs=";
diff --git a/pkgs/by-name/fa/fastddsgen/package.nix b/pkgs/by-name/fa/fastddsgen/package.nix
index a6a82fbe9931..9167ff012b5b 100644
--- a/pkgs/by-name/fa/fastddsgen/package.nix
+++ b/pkgs/by-name/fa/fastddsgen/package.nix
@@ -9,7 +9,7 @@
 
 let
   pname = "fastddsgen";
-  version = "4.1.0";
+  version = "4.2.0";
 
   gradle = gradle_7;
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     repo = "Fast-DDS-Gen";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-4w6DYz0QhD8L27FE+SzptfoMjhiuJ6OFex2LNAqwmPw=";
+    hash = "sha256-weGS340MvPitWMgWx1cWTgYgGcQfJSTUus8EcBob7hY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fa/fastly/package.nix b/pkgs/by-name/fa/fastly/package.nix
index 626c68263697..65e04a33a091 100644
--- a/pkgs/by-name/fa/fastly/package.nix
+++ b/pkgs/by-name/fa/fastly/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule rec {
   pname = "fastly";
-  version = "12.0.0";
+  version = "12.1.0";
 
   src = fetchFromGitHub {
     owner = "fastly";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-Cq4pTp9K6vsQrdWz9kMdX1K1KR26e/qPL55xqiZ5kYM=";
+    hash = "sha256-P5n1CWGVu5rdfLOlKgnx5JtwDoI35y3zlvcqp48vQ7g=";
     # The git commit is part of the `fastly version` original output;
     # leave that output the same in nixpkgs. Use the `.git` directory
     # to retrieve the commit SHA, and remove the directory afterwards,
@@ -35,7 +35,7 @@ buildGoModule rec {
     "cmd/fastly"
   ];
 
-  vendorHash = "sha256-vjTqT/Gv8FU0HNvYqXIE9OCNRsJ8GbUNXIxXDdhDclc=";
+  vendorHash = "sha256-ff65Vi0BmYF72MbrMmFzqDTXQWaEtaBQaPdLub8ZToo=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix
index 49fa3eb7c0d6..23323780e849 100644
--- a/pkgs/by-name/fr/freecad/package.nix
+++ b/pkgs/by-name/fr/freecad/package.nix
@@ -43,7 +43,6 @@ let
     opencamlib
     pivy
     ply # for openSCAD file support
-    py-slvs
     pybind11
     pycollada
     pyside6
diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index 8cb60604b78e..215a55490c8c 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -170,11 +170,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "140.0.7339.207";
+    version = "141.0.7390.54";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-5g0t+EEJJeItjqKiTpp5qE/bkGKkxvOvLaxh5jCDPss=";
+      hash = "sha256-vJMHfwIPf+aM3uj3UlYGo/YxTerNLrVouKNNFApGl48=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -230,9 +230,6 @@ let
         --replace-fail /usr/bin/google-chrome-$dist $exe
       substituteInPlace $out/share/gnome-control-center/default-apps/google-$appname.xml \
         --replace-fail /opt/google/$appname/google-$appname $exe
-      substituteInPlace $out/share/menu/google-$appname.menu \
-        --replace-fail /opt $out/share \
-        --replace-fail $out/share/google/$appname/google-$appname $exe
 
       for icon_file in $out/share/google/chrome*/product_logo_[0-9]*.png; do
         num_and_suffix="''${icon_file##*logo_}"
@@ -275,11 +272,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "140.0.7339.214";
+    version = "141.0.7390.55";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/mfmmq5vcqbb2jdp3e77lsymylu_140.0.7339.214/GoogleChrome-140.0.7339.214.dmg";
-      hash = "sha256-oTyyTHMs3VhGRXWoVlGXvNvwnOWb1eF7iswfJkl8Pe0=";
+      url = "http://dl.google.com/release2/chrome/ft5t2atavjdcw35pqqr5b5rp6e_141.0.7390.55/GoogleChrome-141.0.7390.55.dmg";
+      hash = "sha256-F0IAksB2PHdl4yRV9Pdyd2iRAM7vLF7fJVO7V+l4KTE=";
     };
 
     dontPatch = true;
diff --git a/pkgs/by-name/hy/hypridle/package.nix b/pkgs/by-name/hy/hypridle/package.nix
index 30e1d2cd3e2f..062cb0908ebe 100644
--- a/pkgs/by-name/hy/hypridle/package.nix
+++ b/pkgs/by-name/hy/hypridle/package.nix
@@ -53,9 +53,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Hyprland's idle daemon";
     homepage = "https://github.com/hyprwm/hypridle";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [
-      iogamaster
-    ];
     teams = [ lib.teams.hyprland ];
     mainProgram = "hypridle";
     platforms = [
diff --git a/pkgs/by-name/hy/hyprlang/package.nix b/pkgs/by-name/hy/hyprlang/package.nix
index af961e86fbaf..de6eb578f0a3 100644
--- a/pkgs/by-name/hy/hyprlang/package.nix
+++ b/pkgs/by-name/hy/hyprlang/package.nix
@@ -39,9 +39,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Official implementation library for the hypr config language";
     license = lib.licenses.lgpl3Only;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [
-      iogamaster
-    ];
     teams = [ lib.teams.hyprland ];
   };
 })
diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix
index 0097048dfd3f..79b12b04664b 100644
--- a/pkgs/by-name/hy/hyprlock/package.nix
+++ b/pkgs/by-name/hy/hyprlock/package.nix
@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hyprlock";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprlock";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-hHTJ65uOiGqQgI2XbH9jqIGHUcA86K+GJbnhAKhRWNo=";
+    hash = "sha256-ucJ5C83hJy8XFO8Y+PL9hVcwdrQnj63BjXcO5A4qyNU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/in/intelli-shell/package.nix b/pkgs/by-name/in/intelli-shell/package.nix
index f9530bfe41e6..789c6c76b03d 100644
--- a/pkgs/by-name/in/intelli-shell/package.nix
+++ b/pkgs/by-name/in/intelli-shell/package.nix
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
     description = "Like IntelliSense, but for shells";
     homepage = "https://github.com/lasantosr/intelli-shell";
     license = licenses.asl20;
-    maintainers = with maintainers; [ iogamaster ];
+    maintainers = [ ];
     mainProgram = "intelli-shell";
   };
 }
diff --git a/pkgs/by-name/ka/kalamine/package.nix b/pkgs/by-name/ka/kalamine/package.nix
index 0d379dd1d126..017ac8ed19eb 100644
--- a/pkgs/by-name/ka/kalamine/package.nix
+++ b/pkgs/by-name/ka/kalamine/package.nix
@@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec {
     description = "Keyboard Layout Maker";
     homepage = "https://github.com/OneDeadKey/kalamine/";
     license = licenses.mit;
-    maintainers = with maintainers; [ iogamaster ];
+    maintainers = [ ];
     mainProgram = "kalamine";
   };
 }
diff --git a/pkgs/by-name/ku/kubefwd/package.nix b/pkgs/by-name/ku/kubefwd/package.nix
index de0b6d9003e0..27c3cccfdbc7 100644
--- a/pkgs/by-name/ku/kubefwd/package.nix
+++ b/pkgs/by-name/ku/kubefwd/package.nix
@@ -27,7 +27,7 @@ buildGoModule rec {
     description = "Bulk port forwarding Kubernetes services for local development";
     homepage = "https://github.com/txn2/kubefwd";
     license = licenses.asl20;
-    maintainers = with maintainers; [ iogamaster ];
+    maintainers = [ ];
     mainProgram = "kubefwd";
   };
 }
diff --git a/pkgs/by-name/le/leaf/package.nix b/pkgs/by-name/le/leaf/package.nix
index fbfe3189b3c2..c7daa1ef1e48 100644
--- a/pkgs/by-name/le/leaf/package.nix
+++ b/pkgs/by-name/le/leaf/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     description = "Simple system fetch written in rust";
     homepage = "https://github.com/IogaMaster/leaf";
     license = licenses.mit;
-    maintainers = with maintainers; [ iogamaster ];
+    maintainers = [ ];
     mainProgram = "leaf";
   };
 }
diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix
index 24406e0406fd..b52edd0e5cc8 100644
--- a/pkgs/by-name/lu/lunar-client/package.nix
+++ b/pkgs/by-name/lu/lunar-client/package.nix
@@ -7,11 +7,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "lunarclient";
-  version = "3.4.9";
+  version = "3.5.1";
 
   src = fetchurl {
-    url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage";
-    hash = "sha512-lzJFzOpJDCp8G+dZEcfvORJTHI5tqpvOcXGwyrSN+raaZJcCYbqLJC30u8trsNV7vgjUzoJdnhLHhwsTQp4RpQ==";
+    url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}-ow.AppImage";
+    hash = "sha512-gwJSDnf8treueqAejDuAaRV3yFpOFMCL6WOODhjuD9UxLNvg94Z4SXmcnYBBuuUeQQi4+r5lM7EM97XzX86sSA==";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/lu/lunar-client/update.sh b/pkgs/by-name/lu/lunar-client/update.sh
index d3c4529fcd01..a7ed0f9b76bb 100755
--- a/pkgs/by-name/lu/lunar-client/update.sh
+++ b/pkgs/by-name/lu/lunar-client/update.sh
@@ -4,8 +4,8 @@ set -eu -o pipefail
 
 target="$(dirname "$(readlink -f "$0")")/package.nix"
 host="https://launcherupdates.lunarclientcdn.com"
-metadata=$(curl "$host/latest-linux.yml")
-version=$(echo "$metadata" | yq .version -r)
+metadata=$(curl "$host/latest-ow-linux.yml")
+version=$(echo "$metadata" | yq .version -r | cut -d- -f1)
 hash=$(echo "$metadata" | yq .sha512 -r)
 
 sed -i "s@version = .*;@version = \"$version\";@g" "$target"
diff --git a/pkgs/by-name/ma/manix/package.nix b/pkgs/by-name/ma/manix/package.nix
index cd52e323a464..0840933f8316 100644
--- a/pkgs/by-name/ma/manix/package.nix
+++ b/pkgs/by-name/ma/manix/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/nix-community/manix";
     license = licenses.mpl20;
     maintainers = with maintainers; [
-      iogamaster
       lecoqjacob
     ];
     mainProgram = "manix";
diff --git a/pkgs/by-name/md/mdserve/package.nix b/pkgs/by-name/md/mdserve/package.nix
new file mode 100644
index 000000000000..bb56674ce6df
--- /dev/null
+++ b/pkgs/by-name/md/mdserve/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "mdserve";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "jfernandez";
+    repo = "mdserve";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-OCdWoQzmCvKo8EfLAczBud1FfY3vRMk7mivjhsqE840=";
+  };
+
+  cargoHash = "sha256-7J+a3Yt5sLtZb6xfWLS/eZXZtZRmeXmTqUcPKXqtOLY=";
+
+  __darwinAllowLocalNetworking = true;
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [
+    # times out on darwin during nixpkgs-review
+    "--skip test_file_modification_updates_via_websocket"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Fast markdown preview server with live reload and theme support";
+    homepage = "https://github.com/jfernandez/mdserve";
+    changelog = "https://github.com/jfernandez/mdserve/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ vinnymeller ];
+    mainProgram = "mdserve";
+  };
+})
diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix
index 719d405da731..7eed41acde6a 100644
--- a/pkgs/by-name/mo/moonlight/package.nix
+++ b/pkgs/by-name/mo/moonlight/package.nix
@@ -5,6 +5,10 @@
   nodejs_22,
   fetchFromGitHub,
   nix-update-script,
+  discord,
+  discord-ptb,
+  discord-canary,
+  discord-development,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "moonlight";
@@ -57,7 +61,12 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  passthru.updateScript = nix-update-script { };
+  passthru = {
+    updateScript = nix-update-script { };
+    tests = lib.genAttrs' [ discord discord-ptb discord-canary discord-development ] (
+      p: lib.nameValuePair p.pname p.tests.withMoonlight
+    );
+  };
 
   meta = with lib; {
     description = "Discord client modification, focused on enhancing user and developer experience";
diff --git a/pkgs/by-name/mp/mpdris2-rs/package.nix b/pkgs/by-name/mp/mpdris2-rs/package.nix
index 1615412a4ad9..96f7beee7611 100644
--- a/pkgs/by-name/mp/mpdris2-rs/package.nix
+++ b/pkgs/by-name/mp/mpdris2-rs/package.nix
@@ -2,6 +2,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  nix-update-script,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mpdris2-rs";
@@ -23,6 +24,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     install -Dm644 misc/mpdris2-rs.service -t $out/lib/systemd/user
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Exposing MPRIS V2.2 D-Bus interface for MPD";
     longDescription = ''
diff --git a/pkgs/by-name/na/narsil/package.nix b/pkgs/by-name/na/narsil/package.nix
index 2acc3b43896d..91985d915830 100644
--- a/pkgs/by-name/na/narsil/package.nix
+++ b/pkgs/by-name/na/narsil/package.nix
@@ -13,13 +13,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "narsil";
-  version = "1.4.0-91-g42f1f479d";
+  version = "1.4.0-93-g3d8664466";
 
   src = fetchFromGitHub {
     owner = "NickMcConnell";
     repo = "NarSil";
     tag = version;
-    hash = "sha256-eQg7dSfk2EhQiSeY5iaHDEshtYZd7+p4odNjkFVKDes=";
+    hash = "sha256-PsSotj2lkQcgyQ1rSJpuH+TvTWehgJsI9nWhDrQ/4Zk=";
   };
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix
index 64f143858e7b..7a627311af25 100644
--- a/pkgs/by-name/ni/niri/package.nix
+++ b/pkgs/by-name/ni/niri/package.nix
@@ -138,7 +138,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/YaLTeR/niri/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [
-      iogamaster
       foo-dogsquared
       sodiboo
       getchoo
diff --git a/pkgs/by-name/no/noice/package.nix b/pkgs/by-name/no/noice/package.nix
index 6c7a28e9f8e7..3ee3e1593081 100644
--- a/pkgs/by-name/no/noice/package.nix
+++ b/pkgs/by-name/no/noice/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     homepage = "https://git.2f30.org/noice/";
     license = licenses.bsd2;
     platforms = platforms.all;
-    maintainers = with maintainers; [ iogamaster ];
+    maintainers = [ ];
     mainProgram = "noice";
   };
 }
diff --git a/pkgs/by-name/nu/nufmt/package.nix b/pkgs/by-name/nu/nufmt/package.nix
index b05608011c41..0a7985e14636 100644
--- a/pkgs/by-name/nu/nufmt/package.nix
+++ b/pkgs/by-name/nu/nufmt/package.nix
@@ -36,7 +36,6 @@ rustPlatform.buildRustPackage {
     homepage = "https://github.com/nushell/nufmt";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      iogamaster
       khaneliman
     ];
     mainProgram = "nufmt";
diff --git a/pkgs/by-name/op/openasar/package.nix b/pkgs/by-name/op/openasar/package.nix
index fe71005c1b3b..d39a8b43905b 100644
--- a/pkgs/by-name/op/openasar/package.nix
+++ b/pkgs/by-name/op/openasar/package.nix
@@ -6,6 +6,10 @@
   nodejs,
   asar,
   unzip,
+  discord,
+  discord-ptb,
+  discord-canary,
+  discord-development,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -48,9 +52,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = false;
 
-  passthru.updateScript = unstableGitUpdater {
-    # Only has a "nightly" tag (untaged version 0.2 is latest) see https://github.com/GooseMod/OpenAsar/commit/8f79dcef9b1f7732421235a392f06e5bd7382659
-    hardcodeZeroVersion = true;
+  passthru = {
+    updateScript = unstableGitUpdater {
+      # Only has a "nightly" tag (untaged version 0.2 is latest) see https://github.com/GooseMod/OpenAsar/commit/8f79dcef9b1f7732421235a392f06e5bd7382659
+      hardcodeZeroVersion = true;
+    };
+    tests = lib.genAttrs' [ discord discord-ptb discord-canary discord-development ] (
+      p: lib.nameValuePair p.pname p.tests.withOpenASAR
+    );
   };
 
   meta = with lib; {
diff --git a/pkgs/by-name/pr/prometheus-ebpf-exporter/package.nix b/pkgs/by-name/pr/prometheus-ebpf-exporter/package.nix
index 02d934714c8b..9075e350ec6d 100644
--- a/pkgs/by-name/pr/prometheus-ebpf-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-ebpf-exporter/package.nix
@@ -1,82 +1,88 @@
 {
   lib,
+  clangStdenv,
   buildGoModule,
   fetchFromGitHub,
   nixosTests,
-  pkgs,
+  versionCheckHook,
+  nix-update-script,
   libbpf,
   libelf,
   libsystemtap,
   libz,
 }:
 
-let
-  version = "2.4.2";
-  tag = "v${version}";
-in
-buildGoModule.override
-  {
-    stdenv = pkgs.clangStdenv;
-  }
-  {
-    name = "ebpf_exporter";
+# BPF programs must be compiled with Clang
+buildGoModule.override { stdenv = clangStdenv; } (finalAttrs: {
+  pname = "prometheus-ebpf-exporter";
+  version = "2.5.1";
 
-    src = fetchFromGitHub {
-      inherit tag;
-      owner = "cloudflare";
-      repo = "ebpf_exporter";
-      hash = "sha256-gXzaMx9Z6LzrlDaQnagQIi183uKhJvdYiolYb8P+MIs=";
-    };
+  src = fetchFromGitHub {
+    owner = "cloudflare";
+    repo = "ebpf_exporter";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-zIevVZ4ldPj/4OvQFo+Nv/g//xNZEppO9ccB6y65rZA=";
+  };
 
-    vendorHash = "sha256-GhQvPp8baw2l91OUOg+/lrG27P/D4Uzng8XevJf8Pj4=";
+  vendorHash = "sha256-ZwKXIIoV4yEyjSpGjVDr91/CQmVuF9zc0IHkJYraE9o=";
 
-    postPatch = ''
-      substituteInPlace examples/Makefile \
-        --replace-fail "-Wall -Werror" ""
-    '';
+  postPatch = ''
+    substituteInPlace examples/Makefile \
+      --replace-fail "-Wall -Werror" ""
+  '';
 
-    buildInputs = [
-      libbpf
-      libelf
-      libsystemtap
-      libz
+  buildInputs = [
+    libbpf
+    libelf
+    libsystemtap
+    libz
+  ];
+
+  CGO_LDFLAGS = "-l bpf";
+
+  hardeningDisable = [ "zerocallusedregs" ];
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/prometheus/common/version.Version=${finalAttrs.version}"
+    "-X github.com/prometheus/common/version.Revision=${finalAttrs.src.tag}"
+    "-X github.com/prometheus/common/version.Branch=${finalAttrs.src.tag}"
+    "-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs"
+    "-X github.com/prometheus/common/version.BuildDate=unknown"
+  ];
+
+  postBuild = ''
+    BUILD_LIBBPF=0 make examples
+  '';
+
+  postInstall = ''
+    mkdir -p $out/examples
+    mv examples/*.o examples/*.yaml $out/examples
+  '';
+
+  # Tests fail on trying to access cgroups.
+  doCheck = false;
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
+  passthru = {
+    updateScript = nix-update-script { };
+    tests = { inherit (nixosTests.prometheus-exporters) ebpf; };
+  };
+
+  meta = {
+    description = "Prometheus exporter for custom eBPF metrics";
+    mainProgram = "ebpf_exporter";
+    homepage = "https://github.com/cloudflare/ebpf_exporter";
+    changelog = "https://github.com/cloudflare/ebpf_exporter/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      jpds
+      stepbrobd
     ];
-
-    CGO_LDFLAGS = "-l bpf";
-
-    hardeningDisable = [ "zerocallusedregs" ];
-
-    # Tests fail on trying to access cgroups.
-    doCheck = false;
-
-    ldflags = [
-      "-s"
-      "-w"
-      "-X github.com/prometheus/common/version.Version=${version}"
-      "-X github.com/prometheus/common/version.Revision=${tag}"
-      "-X github.com/prometheus/common/version.Branch=unknown"
-      "-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs"
-      "-X github.com/prometheus/common/version.BuildDate=unknown"
-    ];
-
-    postBuild = ''
-      BUILD_LIBBPF=0 make examples
-    '';
-
-    postInstall = ''
-      mkdir -p $out/examples
-      mv examples/*.o examples/*.yaml $out/examples
-    '';
-
-    passthru.tests = { inherit (nixosTests.prometheus-exporters) ebpf; };
-
-    meta = {
-      description = "Prometheus exporter for custom eBPF metrics";
-      mainProgram = "ebpf_exporter";
-      homepage = "https://github.com/cloudflare/ebpf_exporter";
-      changelog = "https://github.com/cloudflare/ebpf_exporter/releases/tag/v${tag}";
-      license = lib.licenses.mit;
-      maintainers = with lib.maintainers; [ jpds ];
-      platforms = lib.platforms.linux;
-    };
-  }
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix
index fe9f2f7ba55c..73750185fcec 100644
--- a/pkgs/by-name/qo/qownnotes/package.nix
+++ b/pkgs/by-name/qo/qownnotes/package.nix
@@ -13,6 +13,7 @@
   xvfb-run,
   versionCheckHook,
   nix-update-script,
+  aspell,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     qt6Packages.qtwebsockets
     botan3
     libgit2
+    aspell
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6Packages.qtwayland ];
 
@@ -49,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     "-DQON_QT6_BUILD=ON"
     "-DBUILD_WITH_SYSTEM_BOTAN=ON"
     "-DBUILD_WITH_LIBGIT2=ON"
+    "-DBUILD_WITH_ASPELL=ON"
   ];
 
   # Install shell completion on Linux (with xvfb-run)
@@ -103,5 +106,6 @@ stdenv.mkDerivation (finalAttrs: {
       matthiasbeyer
     ];
     platforms = lib.platforms.unix;
+    mainProgram = "qownnotes";
   };
 })
diff --git a/pkgs/by-name/ru/runc/package.nix b/pkgs/by-name/ru/runc/package.nix
index 684c7963509b..590910d5ac68 100644
--- a/pkgs/by-name/ru/runc/package.nix
+++ b/pkgs/by-name/ru/runc/package.nix
@@ -16,13 +16,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "runc";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "opencontainers";
     repo = "runc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-B7x1J2ijM+/RWzPTldBNhvrGa/8de6Unl47lOS/KxXs=";
+    hash = "sha256-Yva0zrcnuHCuIYVi07sxTxNc4fOXVo93jO1hbHjdYNo=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/ru/rustc-demangle/Cargo.lock b/pkgs/by-name/ru/rustc-demangle/Cargo.lock
index 0268b3bdd463..2a63ecb1553d 100644
--- a/pkgs/by-name/ru/rustc-demangle/Cargo.lock
+++ b/pkgs/by-name/ru/rustc-demangle/Cargo.lock
@@ -1,53 +1,91 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "arbitrary"
-version = "1.0.1"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "237430fd6ed3740afe94eefcc278ae21e050285be882804e0d6e8695f0c94691"
+checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"
 
 [[package]]
 name = "cc"
-version = "1.0.69"
+version = "1.2.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2"
-
-[[package]]
-name = "compiler_builtins"
-version = "0.1.49"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20b1438ef42c655665a8ab2c1c6d605a305f031d38d9be689ddfef41a20f3aa2"
-
-[[package]]
-name = "libfuzzer-sys"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36a9a84a6e8b55dfefb04235e55edb2b9a2a18488fcae777a6bdaa6f06f1deb3"
+checksum = "e1354349954c6fc9cb0deab020f27f783cf0b604e8bb754dc4658ecf0d29c35f"
 dependencies = [
- "arbitrary",
- "cc",
- "once_cell",
+ "find-msvc-tools",
+ "jobserver",
+ "libc",
+ "shlex",
 ]
 
 [[package]]
-name = "once_cell"
-version = "1.8.0"
+name = "cfg-if"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
+checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
+
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ced73b1dacfc750a6db6c0a0c3a3853c8b41997e2e2c563dc90804ae6867959"
+
+[[package]]
+name = "getrandom"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasi",
+]
+
+[[package]]
+name = "jobserver"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
+dependencies = [
+ "getrandom",
+ "libc",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.176"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174"
+
+[[package]]
+name = "libfuzzer-sys"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5037190e1f70cbeef565bd267599242926f724d3b8a9f510fd7e0b540cfa4404"
+dependencies = [
+ "arbitrary",
+ "cc",
+]
+
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.20"
+version = "0.1.26"
 dependencies = [
- "compiler_builtins",
  "rustc-std-workspace-core",
 ]
 
 [[package]]
 name = "rustc-demangle-capi"
-version = "0.1.0"
+version = "0.1.2"
 dependencies = [
  "rustc-demangle",
 ]
@@ -58,10 +96,48 @@ version = "0.0.0"
 dependencies = [
  "libfuzzer-sys",
  "rustc-demangle",
+ "rustc-demangle-native-c",
+]
+
+[[package]]
+name = "rustc-demangle-native-c"
+version = "0.1.0"
+dependencies = [
+ "cc",
 ]
 
 [[package]]
 name = "rustc-std-workspace-core"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1956f5517128a2b6f23ab2dadf1a976f4f5b27962e7724c2bf3d45e539ec098c"
+checksum = "aa9c45b374136f52f2d6311062c7146bff20fec063c3f5d46a410bd937746955"
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "wasi"
+version = "0.14.7+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c"
+dependencies = [
+ "wasip2",
+]
+
+[[package]]
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wit-bindgen"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
diff --git a/pkgs/by-name/ru/rustc-demangle/package.nix b/pkgs/by-name/ru/rustc-demangle/package.nix
index 9a868684f80d..27252eca2452 100644
--- a/pkgs/by-name/ru/rustc-demangle/package.nix
+++ b/pkgs/by-name/ru/rustc-demangle/package.nix
@@ -7,13 +7,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rustc-demangle";
-  version = "0.1.20";
+  version = "0.1.26";
 
   src = fetchFromGitHub {
-    owner = "alexcrichton";
+    owner = "rust-lang";
     repo = "rustc-demangle";
-    rev = version;
-    sha256 = "sha256-elxclyuLmr3N66s+pR4/6OU98k1oXI2wKVJtzWPY8FI=";
+    tag = "rustc-demangle-v${version}";
+    hash = "sha256-4/x3kUIKi3xnDRznr+6xmPeWHmhlpbuwSNH3Ej6+Ifc=";
   };
 
   cargoLock = {
@@ -32,19 +32,18 @@ rustPlatform.buildRustPackage rec {
 
   postInstall = ''
     mkdir -p $out/lib
-    cp target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/librustc_demangle.so $out/lib
+    cp target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/librustc_demangle${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib
     cp -R crates/capi/include $out
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Rust symbol demangling";
-    homepage = "https://github.com/alexcrichton/rustc-demangle";
-    license = with licenses; [
+    homepage = "https://github.com/rust-lang/rustc-demangle";
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    # upstream supports other platforms, but maintainer can only test on linux
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ _1000teslas ];
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ _1000teslas ];
   };
 }
diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix
index 4cea74a97fa2..8b02cd52a896 100644
--- a/pkgs/by-name/sa/saga/package.nix
+++ b/pkgs/by-name/sa/saga/package.nix
@@ -5,6 +5,7 @@
   # native
   cmake,
   desktopToDarwinBundle,
+  dos2unix,
   pkg-config,
   wrapGAppsHook3,
   # not native
@@ -42,8 +43,13 @@ stdenv.mkDerivation rec {
 
   sourceRoot = "saga-${version}/saga-gis";
 
+  postPatch = ''
+    dos2unix src/saga_core/saga_gui/res/org.saga_gis.saga_gui.desktop
+  '';
+
   nativeBuildInputs = [
     cmake
+    dos2unix
     wrapGAppsHook3
     pkg-config
   ]
diff --git a/pkgs/by-name/sl/slimserver/package.nix b/pkgs/by-name/sl/slimserver/package.nix
index fe6e18c54940..2572dac47353 100644
--- a/pkgs/by-name/sl/slimserver/package.nix
+++ b/pkgs/by-name/sl/slimserver/package.nix
@@ -26,6 +26,7 @@ let
     ]
     ++ (lib.optional stdenv.hostPlatform.isLinux monkeysAudio)
   );
+
   libPath = lib.makeLibraryPath [
     zlib
     stdenv.cc.cc
@@ -33,13 +34,13 @@ let
 in
 perlPackages.buildPerlPackage rec {
   pname = "slimserver";
-  version = "9.0.2";
+  version = "9.0.3";
 
   src = fetchFromGitHub {
     owner = "LMS-Community";
     repo = "slimserver";
-    rev = version;
-    hash = "sha256-rwaHlNM5KGqvk8SAdinvCGT5+UUAU8I2jiN5Ine/eds=";
+    tag = version;
+    hash = "sha256-Yc/XBINSX1JN7lJn4fin4qcTUSF8Bg+FbFe23KlYkfs=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/sn/snakemake/package.nix b/pkgs/by-name/sn/snakemake/package.nix
index f1ae8a21a218..00340e211bf3 100644
--- a/pkgs/by-name/sn/snakemake/package.nix
+++ b/pkgs/by-name/sn/snakemake/package.nix
@@ -10,14 +10,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "snakemake";
-  version = "9.5.1";
+  version = "9.11.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake";
     tag = "v${version}";
-    hash = "sha256-cSFqPSLeM7hw1bxQZ2FhlHUP+O3iyrwBz4+Jz90Zck8=";
+    hash = "sha256-fQCpQ3LB0Q1USZ9YTEniR5iKq68Zri9+14zqa/jzO2o=";
   };
 
   postPatch = ''
@@ -58,6 +58,7 @@ python3Packages.buildPythonApplication rec {
     snakemake-interface-logger-plugins
     snakemake-interface-storage-plugins
     snakemake-interface-report-plugins
+    snakemake-interface-scheduler-plugins
     stopit
     tabulate
     throttler
@@ -140,6 +141,11 @@ python3Packages.buildPythonApplication rec {
     # Requires snakemake-storage-plugin-http
     "test_keep_local"
     "test_retrieve"
+
+    # Requires conda
+    "test_jupyter_notebook"
+    "test_jupyter_notebook_nbconvert"
+    "test_jupyter_notebook_draft"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # Unclear failure:
diff --git a/pkgs/by-name/ta/tailwindcss_4/package.nix b/pkgs/by-name/ta/tailwindcss_4/package.nix
index 2e65996b27f1..da963b1858d1 100644
--- a/pkgs/by-name/ta/tailwindcss_4/package.nix
+++ b/pkgs/by-name/ta/tailwindcss_4/package.nix
@@ -7,7 +7,7 @@
   makeWrapper,
 }:
 let
-  version = "4.1.13";
+  version = "4.1.14";
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "tailwindcss has not been packaged for ${system} yet.";
 
@@ -22,10 +22,10 @@ let
 
   hash =
     {
-      aarch64-darwin = "sha256-xHaB6ZSNsgAmqROkrKTuAmm0wNTvP3E0PLiR39wel8k=";
-      aarch64-linux = "sha256-yQUpR1o5itvzMViYchwPn+hfQ0orPqPq+tpohnZBgZo=";
-      x86_64-darwin = "sha256-w7Iwvb+qRslMrY20TaH4J3PxC6xU9W+hlsiXfYGcCeQ=";
-      x86_64-linux = "sha256-ue2fj2QNMyNxH59oYIqiZt/zrbxC6GfDjqLQCblzvhE=";
+      aarch64-darwin = "sha256-5yK3UvUd74bULohrTBFx8tCaS+GnSHoKUeSv+OdgPOM=";
+      aarch64-linux = "sha256-MUlB9fbhQ+dOdAxYetH7qu3lRiVy3TMLvgk35hHpZts=";
+      x86_64-darwin = "sha256-Z7JbYQP6dndjflpd4zJ/7DM12jFtkNP9saTNcr2kHAo=";
+      x86_64-linux = "sha256-vDTDAbCAtua5jtJBGEGYM/lm9vNH5VaUXWVX02pEpW4=";
     }
     .${system} or throwSystem;
 in
diff --git a/pkgs/by-name/tf/tfswitch/package.nix b/pkgs/by-name/tf/tfswitch/package.nix
index 236b2554198d..f6162a40b3db 100644
--- a/pkgs/by-name/tf/tfswitch/package.nix
+++ b/pkgs/by-name/tf/tfswitch/package.nix
@@ -5,16 +5,16 @@
 }:
 buildGoModule rec {
   pname = "tfswitch";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "warrensbox";
     repo = "terraform-switcher";
     rev = "v${version}";
-    sha256 = "sha256-mkS53Bqw59F7Q8QyyMjQVm0uBR/HUUnzjCHNT/GiIEg=";
+    sha256 = "sha256-Lxczo2zlBqDyHAcGPR1UM1s8tR4+F80YeNI0JJXLN30=";
   };
 
-  vendorHash = "sha256-cc1ZvVCcjFlJcHs0DH4atyWISrrDfyXPK6j2dSgWD0k=";
+  vendorHash = "sha256-JnfRdircsabRP1O8dSs8/OGwTSvv4xmIXeFQsnbpb5o=";
 
   # Disable tests since it requires network access and relies on the
   # presence of release.hashicorp.com
diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index ce55c2c4b9c8..7b9297b40416 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -9,6 +9,10 @@
   pnpm_10,
   stdenv,
   writeShellScript,
+  discord,
+  discord-ptb,
+  discord-canary,
+  discord-development,
   buildWebExtension ? false,
 }:
 
@@ -58,23 +62,29 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  # We need to fetch the latest *tag* ourselves, as nix-update can only fetch the latest *releases* from GitHub
-  # Vencord had a single "devbuild" release that we do not care about
-  passthru.updateScript = writeShellScript "update-vencord" ''
-    export PATH="${
-      lib.makeBinPath [
-        curl
-        jq
-        nix-update
-      ]
-    }:$PATH"
-    ghTags=$(curl ''${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/Vendicated/Vencord/tags")
-    latestTag=$(echo "$ghTags" | jq -r .[0].name)
+  passthru = {
+    # We need to fetch the latest *tag* ourselves, as nix-update can only fetch the latest *releases* from GitHub
+    # Vencord had a single "devbuild" release that we do not care about
+    updateScript = writeShellScript "update-vencord" ''
+      export PATH="${
+        lib.makeBinPath [
+          curl
+          jq
+          nix-update
+        ]
+      }:$PATH"
+      ghTags=$(curl ''${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/Vendicated/Vencord/tags")
+      latestTag=$(echo "$ghTags" | jq -r .[0].name)
 
-    echo "Latest tag: $latestTag"
+      echo "Latest tag: $latestTag"
 
-    exec nix-update --version "$latestTag" "$@"
-  '';
+      exec nix-update --version "$latestTag" "$@"
+    '';
+
+    tests = lib.genAttrs' [ discord discord-ptb discord-canary discord-development ] (
+      p: lib.nameValuePair p.pname p.tests.withVencord
+    );
+  };
 
   meta = {
     description = "Cutest Discord client mod";
diff --git a/pkgs/by-name/wa/waitron/package.nix b/pkgs/by-name/wa/waitron/package.nix
deleted file mode 100644
index c72a117c772c..000000000000
--- a/pkgs/by-name/wa/waitron/package.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-}:
-
-buildGoModule rec {
-  pname = "waitron";
-  version = "unstable-2020-08-04";
-  rev = "2315857d94e3d1a1e79ac48f8f6a68d59d0ce300";
-
-  src = fetchFromGitHub {
-    owner = "ns1";
-    repo = "waitron";
-    inherit rev;
-    sha256 = "sha256-ZkGhEOckIOYGb6Yjr4I4e9cjAHDfksRwHW+zgOMZ/FE=";
-  };
-
-  vendorHash = null;
-
-  subPackages = [ "." ];
-
-  patches = [
-    ./staticfiles-directory.patch
-  ];
-
-  meta = with lib; {
-    description = "Tool to manage network booting of machines";
-    longDescription = ''
-      Waitron is used to build machines (primarily bare-metal, but anything that
-      understands PXE booting will work) based on definitions from any number of
-      specified inventory sources.
-    '';
-    homepage = "https://github.com/ns1/waitron";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ guibert ];
-    platforms = platforms.linux;
-    broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check
-  };
-}
diff --git a/pkgs/by-name/wa/waitron/staticfiles-directory.patch b/pkgs/by-name/wa/waitron/staticfiles-directory.patch
deleted file mode 100644
index b1096487fac1..000000000000
--- a/pkgs/by-name/wa/waitron/staticfiles-directory.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/main.go b/main.go
-index 4046911..a126bae 100644
---- a/main.go
-+++ b/main.go
-@@ -411,7 +411,7 @@ func main() {
- 
- 	if configuration.StaticFilesPath != "" {
- 		fs := http.FileServer(http.Dir(configuration.StaticFilesPath))
--		r.Handler("GET", "/files/:filename", http.StripPrefix("/files/", fs))
-+		r.Handler("GET", "/files/*filepath", http.StripPrefix("/files/", fs))
- 		log.Println("Serving static files from " + configuration.StaticFilesPath)
- 	}
- 
diff --git a/pkgs/by-name/wa/waypaper/package.nix b/pkgs/by-name/wa/waypaper/package.nix
index bca1f3039aa0..1e8eb98a3d1c 100644
--- a/pkgs/by-name/wa/waypaper/package.nix
+++ b/pkgs/by-name/wa/waypaper/package.nix
@@ -9,14 +9,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "waypaper";
-  version = "2.6";
+  version = "2.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anufrievroman";
     repo = "waypaper";
     tag = version;
-    hash = "sha256-MGfTuQcVChI4g7RONiTZZ4a5uX5SDjfLeMxbLIZ7VH4=";
+    hash = "sha256-wtYF9H56IARkrFbChtuhWtOietA88khQJSOpfDtGQro=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix
index 1d7779db9ca5..43a54152f3da 100644
--- a/pkgs/development/libraries/vtk/default.nix
+++ b/pkgs/development/libraries/vtk/default.nix
@@ -7,7 +7,7 @@ let
 in
 {
   vtk_9_5 = mkVtk {
-    version = "9.5.1";
-    sourceSha256 = "sha256-FEQ2YcewldBbTjdvs/QGE/Fz40/J1GWCNOnsHWJKYY8=";
+    version = "9.5.2";
+    sourceSha256 = "sha256-zuZLmNJw/3MC2vHvE0WN/11awey0XUdyODX399ViyYk=";
   };
 }
diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix
index 0d44a7c1e6b4..587984f4768b 100644
--- a/pkgs/development/libraries/vtk/generic.nix
+++ b/pkgs/development/libraries/vtk/generic.nix
@@ -44,8 +44,6 @@
   cgns,
   adios2,
   libLAS,
-  libgeotiff,
-  laszip_2,
   gdal,
   pdal,
   alembic,
@@ -108,7 +106,6 @@ let
       inherit mpi mpiSupport;
       cppSupport = !mpiSupport;
     };
-    openvdb = self.callPackage openvdb.override { };
     netcdf = self.callPackage netcdf.override { };
     catalyst = self.callPackage catalyst.override { };
     adios2 = self.callPackage adios2.override { };
@@ -140,8 +137,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libLAS
-    libgeotiff
-    laszip_2
     gdal
     pdal
     alembic
@@ -156,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: {
     openturns
     libarchive
     libGL
-    vtkPackages.openvdb
+    openvdb
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     libXfixes
@@ -224,12 +219,13 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  env = {
-    CMAKE_PREFIX_PATH = "${lib.getDev openvdb}/lib/cmake/OpenVDB";
-    NIX_LDFLAGS = "-L${lib.getLib libmysqlclient}/lib/mariadb";
-  };
-
   cmakeFlags = [
+    # During installPhase, keep rpath that came from target_link_libraries() of imported targets.
+    # Typically libgeotiff,liblaszip propagated from liblas and libmariadb found by pkg-config.
+    (lib.cmakeBool "CMAKE_INSTALL_RPATH_USE_LINK_PATH" true)
+    # Required for locating the findOpenVDB.cmake module
+    # TODO: Add a setup hook in openvdb to append CMAKE_MODULE_PATH to cmakeFlagsArray
+    (lib.cmakeFeature "CMAKE_MODULE_PATH" "${lib.getDev openvdb}/lib/cmake/OpenVDB")
     (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin")
     (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
     (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include")
@@ -283,7 +279,7 @@ stdenv.mkDerivation (finalAttrs: {
     # Remove thirdparty find module that have been provided in nixpkgs.
     ''
       rm -rf $out/lib/cmake/vtk/patches
-      rm $out/lib/cmake/vtk/Find{EXPAT,Freetype,utf8cpp,LibXml2,FontConfig}.cmake
+      rm $out/lib/cmake/vtk/Find{EXPAT,Freetype,utf8cpp,LibXml2,FontConfig,TBB}.cmake
     ''
     # libvtkglad.so will find and load libGL.so at runtime.
     + lib.optionalString stdenv.hostPlatform.isLinux ''
diff --git a/pkgs/development/php-packages/opentelemetry/default.nix b/pkgs/development/php-packages/opentelemetry/default.nix
index a4e2e62e2042..225d1663f39c 100644
--- a/pkgs/development/php-packages/opentelemetry/default.nix
+++ b/pkgs/development/php-packages/opentelemetry/default.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "1.2.0";
+  version = "1.2.1";
 in
 buildPecl rec {
   inherit version;
@@ -15,7 +15,7 @@ buildPecl rec {
     owner = "open-telemetry";
     repo = "opentelemetry-php-instrumentation";
     rev = version;
-    hash = "sha256-fZT6Mr+RD3HBN+OBnErX1pvSyAGyLP6H66/QdCavnHc=";
+    hash = "sha256-zUrcikGB3O44ihcw2zOAhInfgF+sXT+Xl2lF7XJphzY=";
   };
 
   sourceRoot = "${src.name}/ext";
diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix
index b4e89fec24a3..4787f3eec7ac 100644
--- a/pkgs/development/python-modules/hcloud/default.nix
+++ b/pkgs/development/python-modules/hcloud/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "hcloud";
-  version = "2.6.0";
+  version = "2.7.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-RZMzkHY+0IuWecYdebr94ay38Cltm4thN3wqTk4SyaE=";
+    hash = "sha256-2CND7VTwzPFHXiSYTL06BKxIMLVovzcH+FVAJD9hQ0s=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix
index aad60795f8cf..68dcc85cf483 100644
--- a/pkgs/development/python-modules/imageio/default.nix
+++ b/pkgs/development/python-modules/imageio/default.nix
@@ -4,7 +4,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   isPyPy,
-  fetchpatch2,
+  fetchpatch,
 
   # build-system
   setuptools,
@@ -55,7 +55,7 @@ buildPythonPackage rec {
   };
 
   patches = [
-    (fetchpatch2 {
+    (fetchpatch {
       # https://github.com/imageio/imageio/issues/1139
       # https://github.com/imageio/imageio/pull/1144
       name = "fix-pyav-13-1-compat";
@@ -63,7 +63,7 @@ buildPythonPackage rec {
       excludes = [
         "setup.py"
       ];
-      hash = "sha256-xBYdhK6XmJJuChqXOIdRVf8X6/GpWLG+21+cPVZ4bVg=";
+      hash = "sha256-ycsW1YXtiO3ZecIF1crYaX6vg/nRW4bF4So5uWCVzME=";
     })
   ];
 
diff --git a/pkgs/development/python-modules/manifestoo-core/default.nix b/pkgs/development/python-modules/manifestoo-core/default.nix
index 7bc73b5ae002..21f3278deb4b 100644
--- a/pkgs/development/python-modules/manifestoo-core/default.nix
+++ b/pkgs/development/python-modules/manifestoo-core/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "manifestoo-core";
-  version = "1.12";
+  version = "1.13";
   format = "pyproject";
 
   src = fetchPypi {
     inherit version;
     pname = "manifestoo_core";
-    hash = "sha256-cBWTXCIWBu9+mVnyj4jvGZuX8Hh6dePBRqB7BDf0gRQ=";
+    hash = "sha256-mJDs0k1Ea9E616/V/M5bikyKYVg+BvdwsdVf6VmqSQU=";
   };
 
   nativeBuildInputs = [ hatch-vcs ];
diff --git a/pkgs/development/python-modules/misoc/default.nix b/pkgs/development/python-modules/misoc/default.nix
index e573760769be..74d73dc5c964 100644
--- a/pkgs/development/python-modules/misoc/default.nix
+++ b/pkgs/development/python-modules/misoc/default.nix
@@ -2,33 +2,41 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # dependencies
   pyserial,
   asyncserial,
   jinja2,
   migen,
+
+  # tests
+  unittestCheckHook,
   numpy,
 }:
 
 buildPythonPackage {
   pname = "misoc";
-  version = "0-unstable-2024-05-14";
+  version = "0.12-unstable-2025-10-03";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "m-labs";
     repo = "misoc";
-    rev = "fea9de558c730bc394a5936094ae95bb9d6fa726";
-    hash = "sha256-zZ9LnUwvTvBL9iNFfmNTklQnd0I4PmV0BApMSblTnc0=";
+    rev = "59043e979f78934f2c2f99ac417c65aa0c7be0b9";
+    hash = "sha256-dXamAZkLdTC9UeZV6biipsZN4LHO+ZLoXV4LO+L7HTM=";
   };
 
-  propagatedBuildInputs = [
+  dependencies = [
     pyserial
     asyncserial
     jinja2
     migen
   ];
 
-  nativeCheckInputs = [ numpy ];
+  nativeCheckInputs = [
+    unittestCheckHook
+    numpy
+  ];
 
   pythonImportsCheck = [ "misoc" ];
 
diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix
index 8340153612d8..a7b126f7122f 100644
--- a/pkgs/development/python-modules/python-telegram-bot/default.nix
+++ b/pkgs/development/python-modules/python-telegram-bot/default.nix
@@ -24,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "python-telegram-bot";
-  version = "22.3";
+  version = "22.5";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     owner = "python-telegram-bot";
     repo = "python-telegram-bot";
     tag = "v${version}";
-    hash = "sha256-mckCkz5DBRjO4iFvRpkqLa7H8GBE/Lwi9CQ902pQ1nQ=";
+    hash = "sha256-++vDura+7AkqM7gV12O2CRRQ1H7G5G22VHGo4OdyffU=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/snakemake-interface-common/default.nix b/pkgs/development/python-modules/snakemake-interface-common/default.nix
index 3ec3baca2d5a..b1deaa0b84dd 100644
--- a/pkgs/development/python-modules/snakemake-interface-common/default.nix
+++ b/pkgs/development/python-modules/snakemake-interface-common/default.nix
@@ -4,43 +4,40 @@
   buildPythonPackage,
   configargparse,
   fetchFromGitHub,
-  poetry-core,
-  pythonOlder,
-  pytestCheckHook,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "snakemake-interface-common";
-  version = "1.17.4";
+  version = "1.22.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake-interface-common";
     tag = "v${version}";
-    hash = "sha256-PMEs7yeVfSnZKbabLrbXfIKCIPteNV1wzbt9RIDG3qU=";
+    hash = "sha256-DxbB/UaBkLbG18CGHyDMo7dmRlVY2tD3BhO0MShbnq4=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ setuptools ];
 
   dependencies = [
     argparse-dataclass
     configargparse
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
-
   pythonImportsCheck = [ "snakemake_interface_common" ];
 
-  enabledTestPaths = [ "tests/tests.py" ];
+  # test_snakemake_version: No module named 'snakemake'
+  # nativeCheckInputs = [ pytestCheckHook ];
 
-  meta = with lib; {
+  # enabledTestPaths = [ "tests/tests.py" ];
+
+  meta = {
     description = "Common functions and classes for Snakemake and its plugins";
     homepage = "https://github.com/snakemake/snakemake-interface-common";
     changelog = "https://github.com/snakemake/snakemake-interface-common/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ veprbl ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/development/python-modules/snakemake-interface-scheduler-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-scheduler-plugins/default.nix
new file mode 100644
index 000000000000..ccad1ca6f6a2
--- /dev/null
+++ b/pkgs/development/python-modules/snakemake-interface-scheduler-plugins/default.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  snakemake-interface-common,
+}:
+
+let
+  version = "2.0.1";
+
+  src = fetchFromGitHub {
+    owner = "snakemake";
+    repo = "snakemake-interface-scheduler-plugins";
+    tag = "v${version}";
+    hash = "sha256-Z/rJGkby9AcYB+Gil00xhbrySChqEIEOtzLyzQPhObk=";
+  };
+in
+buildPythonPackage {
+  pname = "snakemake-interface-scheduler-plugins";
+  inherit version src;
+  pyproject = true;
+
+  build-system = [ hatchling ];
+
+  dependencies = [ snakemake-interface-common ];
+
+  pythonImportsCheck = [ "snakemake_interface_scheduler_plugins" ];
+
+  # test_scheduler: No module named 'snakemake'
+  # nativeCheckInputs = [ pytestCheckHook ];
+
+  # enabledTestPaths = [ "tests/tests.py" ];
+
+  meta = {
+    description = "Provides a stable interface for interactions between Snakemake and its scheduler plugins";
+    homepage = "https://github.com/snakemake/snakemake-interface-scheduler-plugins";
+    changelog = "https://github.com/snakemake/snakemake-interface-scheduler-plugins/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kyehn ];
+  };
+}
diff --git a/pkgs/development/python-modules/temporalio/default.nix b/pkgs/development/python-modules/temporalio/default.nix
index de0d91404c7f..deda5f3bdc1b 100644
--- a/pkgs/development/python-modules/temporalio/default.nix
+++ b/pkgs/development/python-modules/temporalio/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "temporalio";
-  version = "1.18.0";
+  version = "1.18.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "temporalio";
     repo = "sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-uFcy348o4e7DZ+12Lc52wfANFHYCyMfLL/clhRsdkcI=";
+    hash = "sha256-53UDG6eN7Jv8nUUh84I1SX9Gc+gZK66o6e4pqe9aWq4=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/games/anki/addons/anki-utils.nix b/pkgs/games/anki/addons/anki-utils.nix
index 56096cf0f4c0..f27d4f511c57 100644
--- a/pkgs/games/anki/addons/anki-utils.nix
+++ b/pkgs/games/anki/addons/anki-utils.nix
@@ -54,7 +54,7 @@
         installPhase = ''
           runHook preInstall
 
-          mkdir -p "$out/$installPrefix"
+          mkdir -p "$out/$installPrefix/user_files"
           find . -mindepth 1 -maxdepth 1 | xargs -d'\n' mv -t "$out/$installPrefix/"
 
           runHook postInstall
@@ -89,7 +89,6 @@
                 rm -f meta.json
                 ln -s ${addonMetaConfig} meta.json
 
-                mkdir -p user_files
                 ${
                   if (userFiles != null) then
                     ''
diff --git a/pkgs/games/anki/addons/default.nix b/pkgs/games/anki/addons/default.nix
index 89adf8c5401d..d0ca4190fc44 100644
--- a/pkgs/games/anki/addons/default.nix
+++ b/pkgs/games/anki/addons/default.nix
@@ -12,6 +12,8 @@
 
   passfail2 = callPackage ./passfail2 { };
 
+  puppy-reinforcement = callPackage ./puppy-reinforcement { };
+
   recolor = callPackage ./recolor { };
 
   reviewer-refocus-card = callPackage ./reviewer-refocus-card { };
diff --git a/pkgs/games/anki/addons/puppy-reinforcement/default.nix b/pkgs/games/anki/addons/puppy-reinforcement/default.nix
new file mode 100644
index 000000000000..f4550d60bec8
--- /dev/null
+++ b/pkgs/games/anki/addons/puppy-reinforcement/default.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  anki-utils,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+anki-utils.buildAnkiAddon (finalAttrs: {
+  pname = "puppy-reinforcement";
+  version = "1.1.1";
+  src = fetchFromGitHub {
+    owner = "glutanimate";
+    repo = "puppy-reinforcement";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-y52AjmYrFTcTwd4QAcJzK5R9wwxUSlvnN3C2O/r5cHk=";
+  };
+  sourceRoot = "${finalAttrs.src.name}/src/puppy_reinforcement";
+  passthru.updateScript = nix-update-script { };
+  meta = {
+    description = "Encourage learners with pictures of cute puppies";
+    longDescription = ''
+      The options to configure this add-on can be found [here](https://github.com/glutanimate/puppy-reinforcement/blob/v${finalAttrs.version}/src/puppy_reinforcement/config.md).
+      Extra images can also be added with `userFiles`.
+
+      Example:
+
+      ```nix
+      pkgs.ankiAddons.puppy-reinforcement.withConfig {
+        config = {
+          encourage_every = 5;
+        };
+        userFiles = ./my-folder-of-the-most-cute-dogos;
+      }
+      ```
+    '';
+    homepage = "https://ankiweb.net/shared/info/1722658993";
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [ lomenzel ];
+  };
+})
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 6a1507df734d..d9f968c84300 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -47,10 +47,21 @@ rec {
     '';
   };
 
-  bootGCC = pkgs.gcc.cc.override {
-    enableLTO = false;
-    isl = null;
-  };
+  bootGCC =
+    (pkgs.gcc.cc.override {
+      enableLTO = false;
+      isl = null;
+    }).overrideAttrs
+      (old: {
+        patches = old.patches or [ ] ++ [
+          (pkgs.fetchpatch {
+            # c++tools: Don't check --enable-default-pie.
+            # --enable-default-pie breaks bootstrap gcc otherwise, because libiberty.a is not found
+            url = "https://github.com/gcc-mirror/gcc/commit/3f1f99ef82a65d66e3aaa429bf4fb746b93da0db.patch";
+            hash = "sha256-wKVuwrW22gSN1woYFYxsyVk49oYmbogIN6FWbU8cVds=";
+          })
+        ];
+      });
 
   bootBinutils = pkgs.binutils.bintools.override {
     withAllTargets = false;
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index 7d2f55ea440a..62e29d24ce0b 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -140,6 +140,7 @@ with pkgs;
     callPackages ../build-support/fetchnextcloudapp/tests.nix { }
   );
   fetchFromBitbucket = recurseIntoAttrs (callPackages ../build-support/fetchbitbucket/tests.nix { });
+  fetchFromGitHub = recurseIntoAttrs (callPackages ../build-support/fetchgithub/tests.nix { });
   fetchFirefoxAddon = recurseIntoAttrs (
     callPackages ../build-support/fetchfirefoxaddon/tests.nix { }
   );
diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix
index 3854d26dc74f..ab7cd852c3b5 100644
--- a/pkgs/tools/audio/beets/common.nix
+++ b/pkgs/tools/audio/beets/common.nix
@@ -152,6 +152,7 @@ python3Packages.buildPythonApplication {
       rarfile
       responses
       requests-mock
+      pillow
     ]
     ++ [
       writableTmpDirAsHomeHook
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index f82175e39bec..67e59ba8c7ea 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -42,23 +42,14 @@ lib.makeExtensible (
 
     beets-minimal = self.beets.override { disableAllPlugins = true; };
 
-    beets-unstable = callPackage ./common.nix {
-      inherit python3Packages;
-      version = "2.3.1";
-      src = fetchFromGitHub {
-        owner = "beetbox";
-        repo = "beets";
-        rev = "d487d675b9115672c484eab8a6729b1f0fd24b68";
-        hash = "sha256-INxL2XDn8kwRYYcZATv/NdLmAtfQvxVDWKB1OYo8dxY=";
-      };
-    };
-
     alternatives = callPackage ./plugins/alternatives.nix { beets = self.beets-minimal; };
     audible = callPackage ./plugins/audible.nix { beets = self.beets-minimal; };
     copyartifacts = callPackage ./plugins/copyartifacts.nix { beets = self.beets-minimal; };
     filetote = callPackage ./plugins/filetote.nix { beets = self.beets-minimal; };
   }
   // lib.optionalAttrs config.allowAliases {
+    beets-unstable = lib.warn "beets-unstable was aliased to beets, since upstream releases are frequent nowadays" self.beets;
+
     extrafiles = throw "extrafiles is unmaintained since 2020 and broken since beets 2.0.0";
   }
 )
diff --git a/pkgs/tools/audio/beets/plugins/alternatives.nix b/pkgs/tools/audio/beets/plugins/alternatives.nix
index 15599ce56c7a..9e5a8182e47b 100644
--- a/pkgs/tools/audio/beets/plugins/alternatives.nix
+++ b/pkgs/tools/audio/beets/plugins/alternatives.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "beets-alternatives";
-  version = "0.13.3";
+  version = "0.13.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     repo = "beets-alternatives";
     owner = "geigerzaehler";
     tag = "v${version}";
-    hash = "sha256-j56AzbpZFACXy5KqafE8PCC+zM6pXrxr/rWy9UjZPQg=";
+    hash = "sha256-jGHRoBBXqJq0r/Gbp7gkuaEFPVMGE6cqQRi84AHTXxQ=";
   };
 
   nativeBuildInputs = [
@@ -33,6 +33,7 @@ python3Packages.buildPythonApplication rec {
       pytest-cov-stub
       mock
       pillow
+      tomli
       typeguard
     ]
     ++ [
diff --git a/pkgs/tools/audio/beets/plugins/copyartifacts.nix b/pkgs/tools/audio/beets/plugins/copyartifacts.nix
index 717d8624eb94..49bc0dadf797 100644
--- a/pkgs/tools/audio/beets/plugins/copyartifacts.nix
+++ b/pkgs/tools/audio/beets/plugins/copyartifacts.nix
@@ -56,5 +56,7 @@ python3Packages.buildPythonApplication rec {
     changelog = "https://github.com/adammillerio/beets-copyartifacts/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     inherit (beets.meta) platforms;
+    # Isn't compatible with beets >= 2.3
+    broken = true;
   };
 }
diff --git a/pkgs/tools/audio/beets/plugins/filetote.nix b/pkgs/tools/audio/beets/plugins/filetote.nix
index d425012a2c57..d397658bd8da 100644
--- a/pkgs/tools/audio/beets/plugins/filetote.nix
+++ b/pkgs/tools/audio/beets/plugins/filetote.nix
@@ -9,14 +9,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "beets-filetote";
-  version = "1.0.2";
+  version = "1.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gtronset";
     repo = "beets-filetote";
     tag = "v${version}";
-    hash = "sha256-4goblrcSbjl8+xf1wwyoC2462kSy6biLUhTAVIJ8Pjc=";
+    hash = "sha256-5o0Hif0dNavYRH1pa1ZPTnOvk9VPXCU/Lqpg2rKzU/I=";
   };
 
   postPatch = ''
@@ -84,5 +84,7 @@ python3Packages.buildPythonApplication rec {
     maintainers = with maintainers; [ dansbandit ];
     license = licenses.mit;
     inherit (beets.meta) platforms;
+    # https://github.com/gtronset/beets-filetote/issues/211
+    broken = true;
   };
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a7df20160d28..6742de3491c8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -517,6 +517,7 @@ mapAliases {
   BeatSaberModManager = beatsabermodmanager; # Added 2024-06-12
   beam_nox = throw "beam_nox has been removed in favor of beam_minimal or beamMinimalPackages"; # Added 2025-04-01
   beatsabermodmanager = throw "'beatsabermodmanager' has been removed due to lack of upstream maintainenance. Consider using 'bs-manager' instead"; # Added 2025-03-18
+  inherit (beetsPackages) beets-unstable;
   betterbird = throw "betterbird has been removed as there were insufficient maintainer resources to keep up with security updates"; # Added 2024-10-25
   betterbird-unwrapped = throw "betterbird has been removed as there were insufficient maintainer resources to keep up with security updates"; # Added 2024-10-25
   bfc = throw "bfc has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
@@ -2670,6 +2671,7 @@ mapAliases {
 
   ### W ###
   w_scan = throw "'w_scan' has been removed due to lack of upstream maintenance"; # Added 2025-08-29
+  waitron = throw "'waitron' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
   wakatime = wakatime-cli; # 2024-05-30
   wavm = throw "wavm has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
   wal_e = throw "wal_e was removed as it is unmaintained upstream and depends on the removed boto package; upstream recommends using wal-g or pgbackrest"; # Added 2024-09-22
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8ab38fc0b95c..e51a0acf3e29 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2352,7 +2352,7 @@ with pkgs;
   };
 
   beetsPackages = lib.recurseIntoAttrs (callPackage ../tools/audio/beets { });
-  inherit (beetsPackages) beets beets-unstable;
+  inherit (beetsPackages) beets;
 
   binlore = callPackage ../development/tools/analysis/binlore { };
 
@@ -15005,30 +15005,12 @@ with pkgs;
 
   httraqt = libsForQt5.callPackage ../tools/backup/httrack/qt.nix { };
 
-  # Overriding does not work when using callPackage on discord using import instead. (https://github.com/NixOS/nixpkgs/pull/179906)
-  discord = import ../applications/networking/instant-messengers/discord {
-    inherit lib stdenv;
-    inherit (pkgs) callPackage fetchurl;
-    branch = "stable";
-  };
-
-  discord-ptb = import ../applications/networking/instant-messengers/discord {
-    inherit lib stdenv;
-    inherit (pkgs) callPackage fetchurl;
-    branch = "ptb";
-  };
-
-  discord-canary = import ../applications/networking/instant-messengers/discord {
-    inherit lib stdenv;
-    inherit (pkgs) callPackage fetchurl;
-    branch = "canary";
-  };
-
-  discord-development = import ../applications/networking/instant-messengers/discord {
-    inherit lib stdenv;
-    inherit (pkgs) callPackage fetchurl;
-    branch = "development";
-  };
+  inherit (callPackage ../applications/networking/instant-messengers/discord { })
+    discord
+    discord-ptb
+    discord-canary
+    discord-development
+    ;
 
   discord-screenaudio =
     qt6Packages.callPackage ../applications/networking/instant-messengers/discord-screenaudio
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 29c16aefc37a..049e3ac66f0d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17034,6 +17034,10 @@ self: super: with self; {
     callPackage ../development/python-modules/snakemake-interface-report-plugins
       { };
 
+  snakemake-interface-scheduler-plugins =
+    callPackage ../development/python-modules/snakemake-interface-scheduler-plugins
+      { };
+
   snakemake-interface-storage-plugins =
     callPackage ../development/python-modules/snakemake-interface-storage-plugins
       { };