Merge branch 'master' into current

nixos/modules/services/networking/lxd-image-server.nix

@@ -73,10 +73,7 @@ in
 
         description = "LXD Image Server";
 
-        script = ''
+        reloadTriggers = [ config.environment.etc."lxd-image-server/config.toml".source ];
-          ${pkgs.lxd-image-server}/bin/lxd-image-server init
-          ${pkgs.lxd-image-server}/bin/lxd-image-server watch
-        '';
 
         serviceConfig = {
           User = "lxd-image-server";
@@ -84,6 +81,8 @@ in
           DynamicUser = true;
           LogsDirectory = "lxd-image-server";
           RuntimeDirectory = "lxd-image-server";
+          ExecStartPre = "${pkgs.lxd-image-server}/bin/lxd-image-server init";
+          ExecStart = "${pkgs.lxd-image-server}/bin/lxd-image-server watch";
           ExecReload = "${pkgs.lxd-image-server}/bin/lxd-image-server reload";
           ReadWritePaths = [ location ];
         };

pkgs/applications/editors/vscode/extensions/default.nix

@@ -3863,8 +3863,8 @@ let
         mktplcRef = {
           publisher = "redhat";
           name = "vscode-yaml";
-          version = "1.19.0";
+          version = "1.19.1";
-          hash = "sha256-Nc/lkcZh5kp71eygkUCJQT7iNT+9Jg+ud1hgaXdV0Ls=";
+          hash = "sha256-ZLuGtB7DjIVrcYomcwptwJxGmIjz0Vu1fCFqYb2XLk4=";
         };
         meta = {
           description = "YAML Language Support by Red Hat, with built-in Kubernetes syntax support";

pkgs/by-name/ba/bashunit/package.nix

@@ -12,13 +12,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "bashunit";
-  version = "0.24.0";
+  version = "0.25.0";
 
   src = fetchFromGitHub {
     owner = "TypedDevs";
     repo = "bashunit";
     tag = finalAttrs.version;
-    hash = "sha256-TIt1EG/KQCslwZH9seF5SUgH242ZkUkWf8HWqNBIrD0=";
+    hash = "sha256-GYHI1vrZ+WlHCWR9O1LrVSFr3+HKO8aBLSs79RJyl2Y=";
     forceFetchGit = true; # needed to include the tests directory for the check phase
   };
 

pkgs/by-name/bo/bookstack/package.nix

@@ -8,16 +8,16 @@
 
 php83.buildComposerProject2 (finalAttrs: {
   pname = "bookstack";
-  version = "25.07.2";
+  version = "25.07.3";
 
   src = fetchFromGitHub {
     owner = "bookstackapp";
     repo = "bookstack";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-j6vDox70HPLwBlBDyewpwi1FUpNq62fj9RvqppjZ16Q=";
+    hash = "sha256-DR15EkvoFzAFo8Gv1bqD9ry4WtbNSIiR7qii1Va2b2g=";
   };
 
-  vendorHash = "sha256-UjIFk23BFfghieHnvomU0UAwZJslN8ya+IDat001RrE=";
+  vendorHash = "sha256-OTsH7MOmbhu6xeBg9YfUk08bjQEFU0Br+oXcuZUCVME=";
 
   passthru = {
     phpPackage = php83;

pkgs/by-name/cl/cloudflare-warp/package.nix

@@ -24,15 +24,15 @@
 }:
 
 let
-  version = "2025.7.176";
+  version = "2025.8.779";
   sources = {
     x86_64-linux = fetchurl {
       url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_amd64.deb";
-      hash = "sha256-tRz7T3Sevf00ViWYALzSdiyY1i3BEnFQUjRFs+Uybbk=";
+      hash = "sha256-488sXR0CqZAkeXSMawYVXHszK9NXsTCQc5RAd87Hj9k=";
     };
     aarch64-linux = fetchurl {
       url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_arm64.deb";
-      hash = "sha256-GYMC+v3yqP2G+WILhTTGg5SGnb7ts5MpWrhulj4udqA=";
+      hash = "sha256-rLDGY8kmYU/B0wks20oE1sQ7luaX6teTNfWZ6atJzhU=";
     };
   };
 in

pkgs/development/php-packages/xdebug/default.nix

@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "3.4.5";
+  version = "3.4.6";
 in
 buildPecl {
   inherit version;
@@ -16,7 +16,7 @@ buildPecl {
     owner = "xdebug";
     repo = "xdebug";
     rev = version;
-    hash = "sha256-tJNN1GNEH3z/bsmzNMPoF6TAgOQ4EiM4QheqmhCQzM4=";
+    hash = "sha256-xld8qUCkAOWqLQjqT9wl2PN+giXtq4gu/yFHBLdmg+c=";
   };
 
   doCheck = true;