From 3f4171b8b38d716ae3a20ee12083f04c12bbb1fa Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Wed, 15 Oct 2025 22:38:43 +0530 Subject: [PATCH] bcachefs-tools: use versionCheckHook instead of a passthru.tests --- pkgs/by-name/bc/bcachefs-tools/package.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index e4f2f7659109..55bc7b9bcd4f 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -19,7 +19,7 @@ rustPlatform, makeWrapper, nix-update-script, - testers, + versionCheckHook, nixosTests, installShellFiles, fuseSupport ? false, @@ -45,7 +45,6 @@ stdenv.mkDerivation (finalAttrs: { rustPlatform.bindgenHook makeWrapper installShellFiles - udevCheckHook ]; buildInputs = [ @@ -98,6 +97,11 @@ stdenv.mkDerivation (finalAttrs: { doCheck = false; # needs bcachefs module loaded on builder doInstallCheck = true; + nativeInstallCheckInputs = [ + udevCheckHook + versionCheckHook + ]; + versionCheckProgramArg = "version"; postPatch = '' substituteInPlace Makefile \ @@ -121,11 +125,6 @@ stdenv.mkDerivation (finalAttrs: { kernelModule = import ./kernel-module.nix finalAttrs.finalPackage; tests = { - version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "${finalAttrs.meta.mainProgram} version"; - version = "${finalAttrs.version}"; - }; smoke-test = nixosTests.bcachefs; inherit (nixosTests.installer) bcachefsSimple bcachefsEncrypted bcachefsMulti; };