ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-23 21:57:52 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #148956 from 0x4A6F/master-innernet

Browse Source 
innernet: 1.5.1 -> 1.5.2
This commit is contained in:
Guillaume Girol 2021-12-10 21:23:05 +00:00 committed by GitHub
commit 2332252849
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkgs/tools/networking/innernet/default.nix
View File

@ -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";