diff --git a/pkgs/tools/networking/innernet/default.nix b/pkgs/tools/networking/innernet/default.nix index 608a7379ef9a..5baaf2e12205 100644 --- a/pkgs/tools/networking/innernet/default.nix +++ b/pkgs/tools/networking/innernet/default.nix @@ -1,16 +1,27 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, llvmPackages, sqlite, installShellFiles, Security, libiconv }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, llvmPackages +, sqlite +, installShellFiles +, Security +, libiconv +, innernet +, testVersion +}: rustPlatform.buildRustPackage rec { pname = "innernet"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "tonarino"; repo = "innernet"; rev = "v${version}"; - sha256 = "1ja7khvc4cy317ckglnlf11wfmin62ihic061phdp6rmfv95cza0"; + sha256 = "141zjfl125m5lrimam1dbpk40dqfq4vnaz42sbiq1v1avyg684fq"; }; - cargoSha256 = "18xpwav48xv7xm7r3w9qplmv2i18cg09pkahyvs5l4akdjgxyw10"; + cargoSha256 = "0559d0ayysvqs4k46fhgd4r8wa89abgx6rvhlh0gnlnga8vacpw5"; nativeBuildInputs = with llvmPackages; [ llvm @@ -28,21 +39,10 @@ rustPlatform.buildRustPackage rec { installShellCompletion doc/innernet-server.completions.{bash,fish,zsh} ''; - doInstallCheck = true; - installCheckPhase = '' - if [[ "$("$out/bin/${pname}"-server --version)" == "${pname}-server ${version}" ]]; then - echo '${pname}-server smoke check passed' - else - echo '${pname}-server smoke check failed' - return 1 - fi - if [[ "$("$out/bin/${pname}" --version)" == "${pname} ${version}" ]]; then - echo '${pname} smoke check passed' - else - echo '${pname} smoke check failed' - return 1 - fi - ''; + passthru.tests = { + serverVersion = testVersion { package = innernet; command = "innernet-server --version"; }; + version = testVersion { package = innernet; command = "innernet --version"; }; + }; meta = with lib; { description = "A private network system that uses WireGuard under the hood";