From 5331563b402c756449e916f17542ff96bb128cfc Mon Sep 17 00:00:00 2001 From: Mirza Arnaut Date: Fri, 24 Apr 2026 22:59:44 +0200 Subject: [PATCH 1/2] beszel: remove `testing` tag The `testing` tag was interfering with SMART data collection in sertain scenarios according to #512864. Since the tag isn't needed, removing it should solve this problem. --- pkgs/by-name/be/beszel/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/be/beszel/package.nix b/pkgs/by-name/be/beszel/package.nix index 0fc4f4a10241..2349cec610ab 100644 --- a/pkgs/by-name/be/beszel/package.nix +++ b/pkgs/by-name/be/beszel/package.nix @@ -53,8 +53,6 @@ buildGo126Module (finalAttrs: { vendorHash = "sha256-TVpZbK9V9/GqpVFcjF7QGD5XJJHzRgjVXZOImHQTR1k="; - tags = [ "testing" ]; - preBuild = '' mkdir -p internal/site/dist cp -r ${finalAttrs.webui}/* internal/site/dist @@ -68,7 +66,10 @@ buildGo126Module (finalAttrs: { "TestConfigSyncWithTokens" ]; in - [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + [ + "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" + "-tags=testing" + ]; postInstall = '' mv $out/bin/agent $out/bin/beszel-agent From 2d4b9adc893964be600c558a8946b7eb339ae49d Mon Sep 17 00:00:00 2001 From: Mirza Arnaut Date: Fri, 24 Apr 2026 23:08:31 +0200 Subject: [PATCH 2/2] beszel: fix check failures Darwin doesn't support Nvidia and AMD GPU utilities, so such test should be skipped. Co-authored-by: Sam Estep Assisted-by: Codex:gpt-5.5 Co-authored-by: Michael Daniels --- pkgs/by-name/be/beszel/package.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pkgs/by-name/be/beszel/package.nix b/pkgs/by-name/be/beszel/package.nix index 2349cec610ab..d9246f259450 100644 --- a/pkgs/by-name/be/beszel/package.nix +++ b/pkgs/by-name/be/beszel/package.nix @@ -1,7 +1,9 @@ { + stdenv, buildGo126Module, lib, fetchFromGitHub, + fetchpatch, nix-update-script, buildNpmPackage, nixosTests, @@ -53,6 +55,15 @@ buildGo126Module (finalAttrs: { vendorHash = "sha256-TVpZbK9V9/GqpVFcjF7QGD5XJJHzRgjVXZOImHQTR1k="; + patches = [ + # https://github.com/NixOS/nixpkgs/pull/513197 + (fetchpatch { + name = "fix-updater-after-system-manager-shutdown.patch"; + url = "https://github.com/henrygd/beszel/commit/c538d1de1cf3f4664a2d98086341884a217846e7.patch"; + hash = "sha256-voIT9b14pgfhnbJrqgoIbQtwZPU1JF0fblybjG9mzvM="; + }) + ]; + preBuild = '' mkdir -p internal/site/dist cp -r ${finalAttrs.webui}/* internal/site/dist @@ -64,6 +75,19 @@ buildGo126Module (finalAttrs: { "TestCollectorStartHelpers/nvtop_collector" "TestApiRoutesAuthentication/GET_/update_-_shouldn't_exist_without_CHECK_UPDATES_env_var" "TestConfigSyncWithTokens" + # This subtest assumes enough host CPUs for an 8s CPU delta over 1s to stay below 100%. + "TestServiceUpdateCPUPercent/subsequent_call_calculates_CPU_percentage" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "TestCollectorStartHelpers/nvidia-smi_collector" + "TestCollectorStartHelpers/rocm-smi_collector" + "TestCollectorStartHelpers/tegrastats_collector" + "TestNewGPUManagerPriorityNvtopFallback" + "TestNewGPUManagerPriorityMixedCollectors" + "TestNewGPUManagerPriorityNvmlFallbackToNvidiaSmi" + "TestNewGPUManagerConfiguredCollectorsMustStart" + "TestNewGPUManagerConfiguredNvmlBypassesCapabilityGate" + "TestNewGPUManagerJetsonIgnoresCollectorConfig" ]; in [ @@ -76,6 +100,8 @@ buildGo126Module (finalAttrs: { mv $out/bin/hub $out/bin/beszel-hub ''; + __darwinAllowLocalNetworking = true; + passthru = { updateScript = nix-update-script { extraArgs = [