Merge pull request #170385 from bobby285271/testversion

various: use testers.testVersion
2 years ago · 44262ba2e0
parent 5a22a664c3 3a07bb6ae1
commit 44262ba2e0
6 changed files with 10 additions and 11 deletions
--- a/pkgs/applications/networking/cluster/kompose/default.nix
+++ b/pkgs/applications/networking/cluster/kompose/default.nix
@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testVersion, kompose }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kompose }:

 buildGoModule rec {
  pname = "kompose";
@ -26,7 +26,7 @@ buildGoModule rec {
    done
  '';

-  passthru.tests.version = testVersion {
+  passthru.tests.version = testers.testVersion {
    package = kompose;
    command = "kompose version";
  };
--- a/pkgs/development/tools/mysql-shell/default.nix
+++ b/pkgs/development/tools/mysql-shell/default.nix
@ -31,7 +31,6 @@
 , CoreServices
 , developer_cmds
 , DarwinTools
-, testVersion
 , mysql-shell
 }:

--- a/pkgs/os-specific/darwin/mas/default.nix
+++ b/pkgs/os-specific/darwin/mas/default.nix
@ -2,7 +2,7 @@
 , stdenvNoCC
 , fetchurl
 , installShellFiles
-, testVersion
+, testers
 , mas
 }:

@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec {
  '';

  passthru.tests = {
-    version = testVersion {
+    version = testers.testVersion {
      package = mas;
      command = "mas version";
    };
--- a/pkgs/tools/archivers/gbl/default.nix
+++ b/pkgs/tools/archivers/gbl/default.nix
@ -4,7 +4,7 @@
 , fetchpatch
 , pkg-config
 , openssl
-, testVersion
+, testers
 , gbl
 }:

@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
  buildInputs = [ openssl ];

  passthru.tests.version =
-    testVersion { package = gbl; };
+    testers.testVersion { package = gbl; };

  meta = with lib; {
    description = "GBL Firmware file manipulation";
--- a/pkgs/tools/misc/gosu/default.nix
+++ b/pkgs/tools/misc/gosu/default.nix
@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub, testVersion, gosu }:
+{ lib, buildGoModule, fetchFromGitHub, testers, gosu }:

 buildGoModule rec {
  pname = "gosu";
@ -15,7 +15,7 @@ buildGoModule rec {

  ldflags = [ "-d" "-s" "-w" ];

-  passthru.tests.version = testVersion {
+  passthru.tests.version = testers.testVersion {
    package = gosu;
  };

--- a/pkgs/tools/package-management/comma/default.nix
+++ b/pkgs/tools/package-management/comma/default.nix
@ -6,7 +6,7 @@
 , nix
 , nix-index
 , rustPlatform
-, testVersion
+, testers
 }:

 rustPlatform.buildRustPackage rec {
@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
  '';

  passthru.tests = {
-    version = testVersion { package = comma; };
+    version = testers.testVersion { package = comma; };
  };

  meta = with lib; {