Merge master into staging-next

pkgs/by-name/dw/dwproton-bin/package.nix

@@ -11,11 +11,11 @@ proton-ge-bin.overrideAttrs (
     inherit steamDisplayName;
 
     pname = "dwproton-bin";
-    version = "dwproton-11.0-9";
+    version = "dwproton-11.0-11";
 
     src = fetchzip {
       url = "https://dawn.wine/dawn-winery/dwproton/releases/download/${finalAttrs.version}/${finalAttrs.version}-x86_64.tar.xz";
-      hash = "sha256-kWMYlF0H9iYjRcKmq/G4Ws4sTl+gN8nSFgfYvAOd754=";
+      hash = "sha256-p1x1UAuXLG0MpYcyrssudKwpCRlKAPPxrv7UFyPe2lI=";
     };
 
     preFixup = ''

pkgs/by-name/gi/gittype/package.nix

@@ -15,16 +15,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gittype";
-  version = "0.10.1";
+  version = "0.10.2";
 
   src = fetchFromGitHub {
     owner = "unhappychoice";
     repo = "gittype";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9FzmL+52cOmaYR6sZYC9+rme7wAqtf6aHZHWs1cy/Y4=";
+    hash = "sha256-343lPlLrfHHZEfhFEZGAXwzxGg1I2YpGQERcFU2bJZY=";
   };
 
-  cargoHash = "sha256-XMcLJ2aD1QUoQt0F3szWfHSX0zQ4k9V8yJPLtv8ljj4=";
+  cargoHash = "sha256-tca8fV7KWd/Ab0+J3eymhjXZfGUsF6LXhgP4HKYisq4=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/by-name/li/libvirt/package.nix

@@ -37,7 +37,6 @@
   runtimeShell,
   stdenv,
   replaceVars,
-  xhtml1,
   json_c,
   writeScript,
   writeShellApplication,
@@ -121,14 +120,14 @@ assert enableZfs -> isLinux;
 stdenv.mkDerivation rec {
   pname = "libvirt";
   # if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
-  version = "12.4.0";
+  version = "12.6.0";
 
   src = fetchFromGitLab {
     owner = "libvirt";
     repo = "libvirt";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-xgXbgZ8UDdiKPJSGEHB5PasGws5VvCgd+DpoOxwceEA=";
+    hash = "sha256-SEscELXhiEoFnDDcxV7Jb2LjyheNJbgPp7AnXix2GVU=";
   };
 
   patches = [
@@ -233,7 +232,6 @@ stdenv.mkDerivation rec {
     libxml2
     python3
     readline
-    xhtml1
     json_c
   ]
   ++ lib.optionals isLinux [
@@ -350,6 +348,7 @@ stdenv.mkDerivation rec {
       (feat "tests" true)
       (feat "udev" isLinux)
       (feat "json_c" true)
+      (feat "libvirtd" true)
 
       (driver "ch" (isLinux && (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isAarch64)))
       (driver "esx" true)

pkgs/by-name/os/os-agent/package.nix

@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "os-agent";
-  version = "1.10.0";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "home-assistant";
     repo = "os-agent";
     tag = finalAttrs.version;
-    hash = "sha256-jO7TE4lBqyxUYcy3ZsZAFO98orGJ6hTM97+G/ueawNg=";
+    hash = "sha256-6dosIr12myPb6DKkf5focFwqToTDx84dPNqiaSDdEis=";
   };
 
-  vendorHash = "sha256-WC251fHO3XRICP7q7RdHCTnf8WfqNKnueCp36uEtrIg=";
+  vendorHash = "sha256-Kn3kEFCYWv/tVKVfIhhrgXU+ZTzHoseiQA2MiqfO0DU=";
 
   ldFlags = [
     "-X main.version="

pkgs/by-name/tu/tuxbox/package.nix

@@ -5,14 +5,14 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "tuxbox";
-  version = "3.1.6";
+  version = "3.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "AndyCappDev";
     repo = "tuxbox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BZUo02q2szaxnJYx8UvYvfCErJX4KFzToCvZLuBRJKQ=";
+    hash = "sha256-ZPfZ/0UtwZp0HdDc99EZx+Z0drmk0yPx1taoIXcHP+g=";
   };
 
   build-system = [ python3Packages.setuptools ];
@@ -36,6 +36,12 @@ python3Packages.buildPythonApplication (finalAttrs: {
     mkdir -p $out/lib/udev/rules.d/
     echo 'KERNEL=="uinput", MODE="0660", GROUP="input", OPTIONS+="static_node=uinput"' > $out/lib/udev/rules.d/99-tuxbox-uinput.rules
     chmod 0744 $out/lib/udev/rules.d/99-tuxbox-uinput.rules
+
+    # Keep ModemManager off the TourBox serial port
+    cat > $out/lib/udev/rules.d/99-tuxbox-modemmanager.rules <<'EOF'
+    SUBSYSTEM=="tty", ATTRS{idVendor}=="c251", ATTRS{idProduct}=="2005", ENV{ID_MM_DEVICE_IGNORE}="1"
+    SUBSYSTEM=="tty", ATTRS{idVendor}=="2e3c", ATTRS{idProduct}=="5740", ENV{ID_MM_DEVICE_IGNORE}="1"
+    EOF
   '';
 
   meta = {

pkgs/by-name/xh/xhtml1/package.nix

@@ -1,38 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchzip,
-  libxml2,
-}:
-
-stdenv.mkDerivation {
-  pname = "xhtml1";
-  version = "0-unstable-2002-08-01";
-
-  src = fetchzip {
-    url = "https://www.w3.org/TR/xhtml1/xhtml1.tgz";
-    hash = "sha256-Y/IZqFAPjRl5ol5hekCEmv6l4LEP0HUIuyxU/SPfC28=";
-  };
-
-  nativeBuildInputs = [ libxml2 ];
-
-  installPhase = ''
-    mkdir -p $out/xml/dtd/xhtml1
-    cp DTD/*.ent DTD/*.dtd $out/xml/dtd/xhtml1
-
-    # Generate an XML catalog.
-    cat=$out/xml/dtd/xhtml1/catalog.xml
-    xmlcatalog --noout --create $cat
-    grep PUBLIC DTD/*.soc | while read x; do
-        eval a=($x)
-        xmlcatalog --noout --add public "''${a[1]}" "''${a[2]}" $cat
-    done
-  '';
-
-  meta = {
-    homepage = "https://www.w3.org/TR/xhtml1/";
-    description = "DTDs for XHTML 1.0, the Extensible HyperText Markup Language";
-    platforms = lib.platforms.unix;
-    license = lib.licenses.w3c-19980720;
-  };
-}

pkgs/development/python-modules/libvirt-python/default.nix

@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "libvirt-python";
-  version = "12.4.0";
+  version = "12.6.0";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "libvirt";
     repo = "libvirt-python";
     tag = "v${version}";
-    hash = "sha256-8+o3ji7b0PCGxnHbsUJTUn1oudeN3rV+ehUILmufD1M=";
+    hash = "sha256-BJGXIc3Oggwod4d+JT7ag///oQIErqHVnORhn9CUUr0=";
   };
 
   postPatch = ''

pkgs/top-level/aliases.nix

@@ -2660,6 +2660,7 @@ mapAliases {
   xf86videowsfb = throw "The Xorg BSD wsdisplay framebuffer video driver is broken and hasn't had a release since 2012"; # added 2025-12-13
   xflux = throw "'xflux' has been removed as it was unmaintained"; # Added 2025-08-22
   xflux-gui = throw "'xflux-gui' has been removed as it was unmaintained"; # Added 2025-08-22
+  xhtml1 = throw "'xhtml1' has been removed because it was superseded in 2018"; # Added 2026-07-24
   xinput_calibrator = xinput-calibrator; # Added 2025-08-28
   xjump = throw "'xjump' has been removed as it is unmaintained"; # Added 2025-08-22
   xkeyboardconfig = xkeyboard-config; # Added 2026-02-04

pkgs/top-level/perl-packages.nix

@@ -32663,12 +32663,12 @@ with self;
 
   SysVirt = buildPerlModule rec {
     pname = "Sys-Virt";
-    version = "12.4.0";
+    version = "12.6.0";
     src = fetchFromGitLab {
       owner = "libvirt";
       repo = "libvirt-perl";
       tag = "v${version}";
-      hash = "sha256-GMZvSRZnxrPvhhLOJoFnNas7+ccsGXsL6s16EAeeFJQ=";
+      hash = "sha256-Na+O1sw5elyDsUutevcJh1WuhVHCBDu5usDx1zme9WI=";
     };
     nativeBuildInputs = [ pkgs.pkg-config ];
     buildInputs = [