diff options
| author | Arnout Engelen <arnout@bzzt.net> | 2021-08-14 10:11:33 +0200 |
|---|---|---|
| committer | Arnout Engelen <arnout@bzzt.net> | 2021-08-15 09:00:30 +0200 |
| commit | 1a604de2e7d722c740ab3b01189889d0e357ac11 (patch) | |
| tree | 14786a39813967f194f6c8d315804461f96b41e7 /pkgs | |
| parent | 4138cbd913fad85073e59007710e3f083d0eb7c6 (diff) | |
| download | nixpkgs-1a604de2e7d722c740ab3b01189889d0e357ac11.tar nixpkgs-1a604de2e7d722c740ab3b01189889d0e357ac11.tar.gz nixpkgs-1a604de2e7d722c740ab3b01189889d0e357ac11.tar.bz2 nixpkgs-1a604de2e7d722c740ab3b01189889d0e357ac11.tar.lz nixpkgs-1a604de2e7d722c740ab3b01189889d0e357ac11.tar.xz nixpkgs-1a604de2e7d722c740ab3b01189889d0e357ac11.tar.zst nixpkgs-1a604de2e7d722c740ab3b01189889d0e357ac11.zip | |
buf: use testVersion utility
`installCheckPhase` is mainly intended for checks that are part of the upstream package, for our 'own' checks we prefer `passthru.tests`. This loses running `buf --help`, but I'm not sure how much that adds on top of `buf --version`?
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/build-support/trivial-builders.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/buf/default.nix | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 6f51ba512c1..7d4f18dcc29 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -616,7 +616,7 @@ rec { command ? "${package.meta.mainProgram or package.pname or package.name} --version", version ? package.version, }: runCommand "test-version" { nativeBuildInputs = [ package ]; meta.timeout = 60; } '' - ${command} | grep -Fw ${version} + ${command} |& grep -Fw ${version} touch $out ''; } diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index 230f5b09b99..585791316f8 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , protobuf , git +, testVersion +, buf }: buildGoModule rec { @@ -54,13 +56,7 @@ buildGoModule rec { runHook postInstall ''; - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/buf --help - $out/bin/buf --version 2>&1 | grep "${version}" - runHook postInstallCheck - ''; + passthru.tests.version = testVersion { package = buf; }; meta = with lib; { homepage = "https://buf.build"; |