Merge master into staging-nixos

pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix

@@ -10,12 +10,12 @@
 (buildMozillaMach rec {
   pname = "firefox-devedition";
   binaryName = "firefox-devedition";
-  version = "159.0b1";
+  version = "160.0b1";
   applicationName = "Firefox Developer Edition";
   branding = "browser/branding/aurora";
   src = fetchurl {
     url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "ed21e4789376874e5937b57075005c1c19e7e31a86cac1246ce0871d3833385795318e1d1e02caaef5088d3589697bd4fa5e10ae216faebc0e19303e92783443";
+    sha512 = "3d156efc2a76543f11e7fd554bc2cd50916faaa705181f936347ee5a18b09013186002b002dba623d0fc03e2853069a956eaf000363bc5d32eca69b08bf67b27";
   };
 
   # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

pkgs/applications/video/vdr/default.nix

@@ -17,12 +17,12 @@
 stdenv.mkDerivation rec {
 
   pname = "vdr";
-  version = "2.8.3";
+  version = "2.8.4";
 
   src = fetchgit {
     url = "git://git.tvdr.de/vdr.git";
     rev = version;
-    hash = "sha256-7ofaDmuE6rLhzfVLU5GHc79vVN+xgGzQvJtztgXRDtA=";
+    hash = "sha256-gS+h6uJsPVGE/bmmKRfy9HFqQCRf3vYSpOOI7wOCuQg=";
   };
 
   enableParallelBuilding = true;

pkgs/by-name/al/alt-ergo/package.nix

@@ -8,11 +8,11 @@
 
 let
   pname = "alt-ergo";
-  version = "2.6.3";
+  version = "2.6.4";
 
   src = fetchurl {
     url = "https://github.com/OCamlPro/alt-ergo/releases/download/v${version}/alt-ergo-${version}.tbz";
-    hash = "sha256-SsK12K5sVKEaDMNJ7HahU6qVcnv1fvnLMwmnBqf7G/o=";
+    hash = "sha256-w1tbSewoFqJMkyWwg+7+I3g566zrgzMa7vBBvtcgsTc=";
   };
 in
 

pkgs/by-name/co/comfyui/package.nix

@@ -64,7 +64,7 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "comfyui";
-  version = "0.39.2";
+  version = "0.42.5";
 
   strictDeps = true;
   __structuredAttrs = true;
@@ -73,7 +73,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     owner = "Comfy-Org";
     repo = "ComfyUI";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ge4lnSKznoOFCUZIRB/R/RiGcKPM2/XZPhuqSEJ4W98=";
+    hash = "sha256-BcwaXDvVWf7JHa7mqKwZhe99LpBKtDqohb/ESgyMFiY=";
   };
 
   nativeBuildInputs = [ makeBinaryWrapper ];

pkgs/by-name/dr/draco/package.nix

@@ -18,21 +18,15 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "draco";
-  version = "1.5.7";
+  version = "1.5.9";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "draco";
     rev = finalAttrs.version;
-    hash = "sha256-Y1bwBFe3bCklZN2+TBs6mhqDKQjrezMiT5zXlPFuMew=";
+    hash = "sha256-g0RnJ5kDj6YKpk2KqbUQKrwW6NDphcl4YMjT5xrXcE0=";
   };
 
-  # ld: unknown option: --start-group
-  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    substituteInPlace cmake/draco_targets.cmake \
-      --replace-fail "^Clang" "^AppleClang"
-  '';
-
   nativeBuildInputs = [
     cmake
     python3

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

@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gitu";
-  version = "0.43.0";
+  version = "0.44.0";
 
   src = fetchFromGitHub {
     owner = "altsem";
     repo = "gitu";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NpDTXTBHZs5o6HlOfpffOfo1S6Bw/oNxGuvRHzwv2II=";
+    hash = "sha256-CeIERUp7F6cUVxiJkufmxLHpfWHhwyLylg1Cr481Txw=";
   };
 
-  cargoHash = "sha256-brGnoaaXTxGPHCAHh2i4NzUVxHySmT8H2jmC9le2v8Q=";
+  cargoHash = "sha256-+oxSG9PfXWYXBIzi6ZsO0S4/iLNIZPvTHZgWDQkbkLs=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/go/gotools/package.nix

@@ -4,6 +4,7 @@
   fetchFromGitHub,
   makeWrapper,
   go,
+  nix-update-script,
 }:
 
 buildGoModule (finalAttrs: {
@@ -18,19 +19,36 @@ buildGoModule (finalAttrs: {
     hash = "sha256-F9DyZAZdrKCrCIB6FZP0KrOwPNRLk0ZQoNMHGMHd0UY=";
   };
 
-  allowGoReference = true;
-  doCheck = false;
-
   vendorHash = "sha256-HpWkPsRJ0vCqJi9LoZcVbzeoPQ2B9ftZwuS1r47W7Sc=";
 
   nativeBuildInputs = [ makeWrapper ];
 
+  allowGoReference = true;
+
   postPatch = ''
     # The gopls folder contains a Go submodule which causes a build failure
     # and lives in its own package named gopls.
     rm -r gopls
   '';
 
+  # Keep toolchain references, but strip temporary paths from binaries.
+  preBuild = ''
+    export GOFLAGS="$GOFLAGS -trimpath"
+  '';
+
+  # Some tests start local HTTP servers which fails on macOS without this.
+  __darwinAllowLocalNetworking = true;
+
+  # Because GOFLAGS are passed through when running tests, the default of -mod=vendor breaks
+  # a bunch of tests which use modules without vendor directories.
+  preCheck = ''
+    export GOFLAGS="''${GOFLAGS//-mod=vendor/}"
+  '';
+
+  # Disable TestToolsCopyright which checks for a specific header, as this also scans the vendor
+  # directory created for the actual package and fails.
+  checkFlags = [ "-skip=^TestToolsCopyright$" ];
+
   # Set GOTOOLDIR for derivations adding this to buildInputs
   postInstall = ''
     mkdir -p $out/nix-support
@@ -43,6 +61,8 @@ buildGoModule (finalAttrs: {
       --suffix PATH : ${lib.makeBinPath [ go ]}
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Additional tools for Go development";
     longDescription = ''

pkgs/by-name/he/herdr/package.nix

@@ -75,12 +75,21 @@ rustPlatform.buildRustPackage (finalAttrs: {
     chmod -R u+w "$ZIG_GLOBAL_CACHE_DIR/p"
   '';
 
-  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-    installShellCompletion --cmd herdr \
-      --bash <("$out/bin/herdr" completion bash) \
-      --fish <("$out/bin/herdr" completion fish) \
-      --zsh <("$out/bin/herdr" completion zsh)
-  '';
+  postInstall =
+    lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      installShellCompletion --cmd herdr \
+        --bash <("$out/bin/herdr" completion bash) \
+        --fish <("$out/bin/herdr" completion fish) \
+        --zsh <("$out/bin/herdr" completion zsh)
+    ''
+    # Ship the per-agent hook/plugin sources so integrations can be wired up
+    # declaratively (e.g. home-manager) instead of running
+    # `herdr integration install <agent>`.
+    + ''
+      install -d "$out/share/herdr"
+      cp -r src/integration/assets "$out/share/herdr/integrations"
+      find "$out/share/herdr/integrations" -name '*.test.ts' -delete
+    '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;

pkgs/by-name/hi/hister/package.nix

@@ -14,18 +14,18 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "hister";
-  version = "0.20.0";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "asciimoo";
     repo = "hister";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8FKieCq7T87wIawCjVoto2kX1PU2sV1LFQtz2nydzBM=";
+    hash = "sha256-4B7RkqhuuEfXYxvmkoU4yHVFw5M8KJsa3E30g0sYvx0=";
   };
 
   __structuredAttrs = true;
 
-  vendorHash = "sha256-piPns+kq6ZCM4Bpe7nzdjHjkZKe1VV6UY9IIMshNGpo=";
+  vendorHash = "sha256-RoViVw/r/BzAmq5qG3AGAX5LnuJUGdRQQ5ubFXElM04=";
   proxyVendor = true;
 
   nativeBuildInputs = [
@@ -64,7 +64,7 @@ buildGoModule (finalAttrs: {
 
       npmWorkspace = "webui/app";
       npmDepsFetcherVersion = 2;
-      npmDepsHash = "sha256-9mcUiua8bKiGRDAJmGSQeRsbfdN4P2r/tcCzr7D0Ay4=";
+      npmDepsHash = "sha256-1agWFtnCag5gFRobWXg34itd6z2KSq4/ZauEJ7x9W7E=";
 
       # vite 8's rolldown pipeline does a dns.lookup('localhost') during `vite build`
       # which fails in darwin's relaxed sandbox without loopback access

pkgs/by-name/ne/nezha-theme-user/package.nix

@@ -13,13 +13,13 @@ let
 in
 buildNpmPackage (finalAttrs: {
   pname = "nezha-theme-user";
-  version = "2.5.1";
+  version = "2.7.0";
 
   src = fetchFromGitHub {
     owner = "hamster1963";
     repo = "nezha-dash-v2";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qtKU+icxGQKiBtwfZp/ec2SjDCWhlnsCVsmuwLrq+24=";
+    hash = "sha256-ECunE/tW83Ndp953SPiuZ5o8CozcI1GccgF8bhS1xtY=";
   };
 
   postPatch = ''

pkgs/by-name/ti/tideways-cli/package.nix

@@ -12,7 +12,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tideways-cli";
-  version = "1.3.4";
+  version = "1.3.6";
 
   strictDeps = true;
   __structuredAttrs = true;
@@ -44,15 +44,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     sources = {
       "x86_64-linux" = fetchurl {
         url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_linux_amd64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-Gu4sZC3y5D0G6LtO1YuZsltBXk28ajvaDty9ecYujqU=";
+        hash = "sha256-OA80l9n1r3aZurRH9GSzEHcZAOAfrV5Q/Mq8Hywl0gU=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_linux_arm64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-bwt+vKSGfvC4b2KpEVe6BoHDpNEs63HEyDRU1z7bj28=";
+        hash = "sha256-bZckCXe/C6G5pbCDJRMSBfw+OoNBJFkkoyJomPgGwKc=";
       };
       "aarch64-darwin" = fetchurl {
         url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_macos_arm64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-qTkoboI/aFN3/W1NZhr/bkn5bkvTzX5uXg/uowVkgO8=";
+        hash = "sha256-wZ6a6qMi3b6fBUsv5y5F//HraGfEJBxrRVyF6JYlHGU=";
       };
     };
 

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

@@ -1,20 +1,27 @@
 {
   lib,
-  fetchPypi,
+  fetchFromGitHub,
   buildPythonPackage,
+  hatchling,
+  pytestCheckHook,
 }:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "banal";
-  version = "1.0.6";
-  format = "setuptools";
+  version = "1.1.2";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-L+AskwX1MWhEGUj0oD37+i6sxz2zDbSpMwkIPLDiUKU=";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "pudo";
+    repo = "banal";
+    tag = finalAttrs.version;
+    hash = "sha256-+G4zSKJangqV1RBJcuK16gAJmpPQQmPg3vEkO9HSFss=";
   };
 
-  # no tests
-  doCheck = false;
+  build-system = [ hatchling ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "banal" ];
 
@@ -24,4 +31,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})

pkgs/development/python-modules/comfy-aimdo/default.nix

@@ -22,7 +22,7 @@ let
 in
 buildPythonPackage (finalAttrs: {
   pname = "comfy-aimdo";
-  version = "0.5.5";
+  version = "0.5.6";
   pyproject = true;
 
   # nixpkgs-update: no auto update
@@ -31,7 +31,7 @@ buildPythonPackage (finalAttrs: {
     owner = "Comfy-Org";
     repo = "comfy-aimdo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-f5r2UgkWU49Y/sc9MBwlrmzaY3w4wcHJ0HgcFoVe3QY=";
+    hash = "sha256-UzHdqf3BNFtRRJC4PRGftFuQUdGpDRHAEYLZvvu6rUM=";
   };
 
   postPatch = ''

pkgs/development/python-modules/comfy-kitchen/default.nix

@@ -17,7 +17,7 @@ let
 in
 buildPythonPackage (finalAttrs: {
   pname = "comfy-kitchen";
-  version = "0.2.37";
+  version = "0.2.39";
   pyproject = true;
 
   # nixpkgs-update: no auto update
@@ -27,7 +27,7 @@ buildPythonPackage (finalAttrs: {
     repo = "comfy-kitchen";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-BqqYlqqQmEM1uAV93WZi9Z6LIXULf8OHaBAvhbSX2oo=";
+    hash = "sha256-iGkW1jRUFVNAH+XzSQLjzzMDDPhPVWidUMuV8Goi9DU=";
   };
 
   buildInputs = lib.optionals cudaSupport (

pkgs/development/python-modules/comfyui-embedded-docs/default.nix

@@ -8,7 +8,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "comfyui-embedded-docs";
-  version = "0.5.13";
+  version = "0.5.14";
   pyproject = true;
 
   # nixpkgs-update: no auto update
@@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: {
   src = fetchPypi {
     pname = "comfyui_embedded_docs";
     inherit (finalAttrs) version;
-    hash = "sha256-odDCe13S0fyOC/PHe1jgZkrvCtRggE5Z4WVKqo4bhJw=";
+    hash = "sha256-5RvDspmbt6iR29KF8JetsRbgsRtc3yN2obrPkOsto4E=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/comfyui-frontend-package/default.nix

@@ -8,7 +8,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "comfyui-frontend-package";
-  version = "1.53.10";
+  version = "1.55.18";
   pyproject = true;
 
   # nixpkgs-update: no auto update
@@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: {
   src = fetchPypi {
     pname = "comfyui_frontend_package";
     inherit (finalAttrs) version;
-    hash = "sha256-yx3MvEfYtQ0yLmeBP+q5eYZBZ7LrLmKHn71YxU8tKrI=";
+    hash = "sha256-sxK3CTFrDEUk8VeJ4aIjgtp9QOgyFOf4iXloZTK2Z+Y=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/comfyui-workflow-templates-core/default.nix

@@ -8,7 +8,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "comfyui-workflow-templates-core";
-  version = "0.3.369";
+  version = "0.3.387";
   pyproject = true;
 
   # nixpkgs-update: no auto update
@@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: {
   src = fetchPypi {
     pname = "comfyui_workflow_templates_core";
     inherit (finalAttrs) version;
-    hash = "sha256-Lhlu/jhQJ5hFCmZLmUiZ5YDvtbWdjNLZXripCmk7y74=";
+    hash = "sha256-zzkoqoEAlOrNavEqUgiGEkiBTsF3gs1fIy5ncPz8h/M=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/comfyui-workflow-templates-json/default.nix

@@ -8,7 +8,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "comfyui-workflow-templates-json";
-  version = "0.1.104";
+  version = "0.1.122";
   pyproject = true;
 
   # nixpkgs-update: no auto update
@@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: {
   src = fetchPypi {
     pname = "comfyui_workflow_templates_json";
     inherit (finalAttrs) version;
-    hash = "sha256-ngwBRPbqkOcpKei5mQyHlLUeqB3kn/MfVsPfGvW4CGc=";
+    hash = "sha256-P4qGe3HJVZ8AH1Jjg6NcpKCG4oMd3xbXKTEPlWNh1NI=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/comfyui-workflow-templates-media-assets-02/default.nix

@@ -8,7 +8,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "comfyui-workflow-templates-media-assets-02";
-  version = "0.1.11";
+  version = "0.1.23";
   pyproject = true;
 
   # nixpkgs-update: no auto update
@@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: {
   src = fetchPypi {
     pname = "comfyui_workflow_templates_media_assets_02";
     inherit (finalAttrs) version;
-    hash = "sha256-DhJhA/C0/sPOjLhM/m2Z0hn6dUChjGQrOzJTPlc1XDg=";
+    hash = "sha256-Kskc/BLgJBqU5QBiDdD1yFtOkcuK3sRhljpg0a8hRDA=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/comfyui-workflow-templates/default.nix

@@ -16,7 +16,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "comfyui-workflow-templates";
-  version = "0.11.78";
+  version = "0.11.96";
   pyproject = true;
 
   # nixpkgs-update: no auto update
@@ -24,7 +24,7 @@ buildPythonPackage (finalAttrs: {
   src = fetchPypi {
     pname = "comfyui_workflow_templates";
     inherit (finalAttrs) version;
-    hash = "sha256-XuPIH8BN3IMeM8itlZAsHQXz2KnVJqmh1AdBATKmxsg=";
+    hash = "sha256-ZhupwfoqLQPsmE2OVqKj0/j2VAK7Y/A4Z8Zi5HeARLw=";
   };
 
   build-system = [ setuptools ];

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

@@ -24,7 +24,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pylint";
-  version = "4.0.7";
+  version = "4.1.3";
   pyproject = true;
 
   src = fetchFromGitHub {