From 7f3a5d09f6f8c32bfa6573f959d06de65c7baecf Mon Sep 17 00:00:00 2001 From: misuzu Date: Fri, 10 Jan 2025 20:34:45 +0200 Subject: [PATCH] nixos-option: move shellcheck validation to passthru.tests.shellcheck Fixes evaluation for riscv64-linux. --- pkgs/by-name/ni/nixos-option/package.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ni/nixos-option/package.nix b/pkgs/by-name/ni/nixos-option/package.nix index 10f1f51833ac..cd936c7380a6 100644 --- a/pkgs/by-name/ni/nixos-option/package.nix +++ b/pkgs/by-name/ni/nixos-option/package.nix @@ -8,6 +8,7 @@ nix, nixosTests, shellcheck, + runCommand, stdenvNoCC, }: @@ -19,7 +20,6 @@ stdenvNoCC.mkDerivation { nativeBuildInputs = [ installShellFiles makeWrapper - shellcheck ]; env = { @@ -42,15 +42,6 @@ stdenvNoCC.mkDerivation { runHook postInstall ''; - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - - shellcheck $out/bin/nixos-option - - runHook postInstallCheck - ''; - postFixup = '' wrapProgram $out/bin/nixos-option \ --prefix PATH : ${ @@ -63,7 +54,12 @@ stdenvNoCC.mkDerivation { } ''; - passthru.tests.installer-simpleUefiSystemdBoot = nixosTests.installer.simpleUefiSystemdBoot; + passthru.tests = { + installer-simpleUefiSystemdBoot = nixosTests.installer.simpleUefiSystemdBoot; + shellcheck = runCommand "nixos-option-shellchecked" { nativeBuildInputs = [ shellcheck ]; } '' + shellcheck ${./nixos-option.sh} && touch $out + ''; + }; meta = { description = "Evaluate NixOS configuration and return the properties of given option";