From 7049e68df79dfddf683b1ef922d2886be929d6be Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 2 Sep 2025 07:51:55 +0200 Subject: [PATCH] podman: use `versionCheckHook` --- pkgs/by-name/po/podman/package.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix index fe1029619d86..5ea42f0bce73 100644 --- a/pkgs/by-name/po/podman/package.nix +++ b/pkgs/by-name/po/podman/package.nix @@ -16,7 +16,6 @@ nixosTests, python3, makeWrapper, - runtimeShell, symlinkJoin, replaceVars, extraPackages ? [ ], @@ -34,8 +33,7 @@ netavark, passt, vfkit, - testers, - podman, + versionCheckHook, }: let # do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed @@ -124,7 +122,6 @@ buildGoModule rec { buildPhase = '' runHook preBuild patchShebangs . - substituteInPlace Makefile --replace "/bin/bash" "${runtimeShell}" ${ if stdenv.hostPlatform.isDarwin then '' @@ -164,13 +161,11 @@ buildGoModule rec { patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/.podman-wrapped ''; - passthru.tests = { - version = testers.testVersion { - package = podman; - command = "HOME=$TMPDIR podman --version"; - }; - } - // lib.optionalAttrs stdenv.hostPlatform.isLinux { + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + passthru.tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit (nixosTests) podman; # related modules inherit (nixosTests)