Merge master into staging-nixos

Changelog: https://github.com/yt-dlp/yt-dlp/releases/tag/2026.07.04
Diff: https://github.com/yt-dlp/yt-dlp/compare/2026.06.09...2026.07.04

pkgs/by-name/mk/mkfontscale/package.nix

@@ -11,11 +11,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "mkfontscale";
-  version = "1.2.3";
+  version = "1.2.4";
 
   src = fetchurl {
     url = "mirror://xorg/individual/app/mkfontscale-${finalAttrs.version}.tar.xz";
-    hash = "sha256-KSHNw0TxrO4EvNbqHilWXBMIJjAG4TSp7jjPnJ1v514=";
+    hash = "sha256-oBSSoXqbbA7j+S7leIUOMFMVufKY2l8AahzUtR2wGl4=";
   };
 
   strictDeps = true;

pkgs/by-name/yt/yt-dlp/package.nix

@@ -32,14 +32,14 @@ python3Packages.buildPythonApplication rec {
   # The websites yt-dlp deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2026.06.09";
+  version = "2026.07.04";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "yt-dlp";
     repo = "yt-dlp";
     tag = version;
-    hash = "sha256-ykqTDPzKKIWRGSQmw2esCRKyYqDZKXRYDeba888tkDU=";
+    hash = "sha256-+oHcVylLXFJTRR6jXF6IXvgntXJz0tRdtnwTruRPkoc=";
   };
 
   postPatch = ''