From bd0dcbb8dad3bbda53d7473ac1bc0ebf40d9f0e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?= Date: Sun, 7 Apr 2019 15:28:59 +0300 Subject: [PATCH 1/2] maintainers: add `suhr` --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 039da8cbff8..249ba8da744 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4584,6 +4584,11 @@ github = "stumoss"; name = "Stuart Moss"; }; + suhr = { + email = "suhr@i2pmail.org"; + github = "suhr"; + name = "Сухарик"; + }; SuprDewd = { email = "suprdewd@gmail.com"; github = "SuprDewd"; From e090a62b79544b8d5ca4d923a81763a75aeeb9e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?= Date: Sun, 7 Apr 2019 15:29:30 +0300 Subject: [PATCH 2/2] tox-node: init at 0.0.7 --- pkgs/tools/networking/tox-node/default.nix | 43 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/tools/networking/tox-node/default.nix diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix new file mode 100644 index 00000000000..28be00099b8 --- /dev/null +++ b/pkgs/tools/networking/tox-node/default.nix @@ -0,0 +1,43 @@ +{ stdenv, rustPlatform, fetchFromGitHub +, libsodium, openssl +, pkgconfig +}: + +with rustPlatform; + +buildRustPackage rec { + name = "tox-node-${version}"; + version = "0.0.7"; + + src = fetchFromGitHub { + owner = "tox-rs"; + repo = "tox-node"; + rev = "v${version}"; + sha256 = "0p1k4glqm3xasck66fywkyg42lbccad9rc6biyvi24rn76qip4jm"; + }; + + buildInputs = [ libsodium openssl ]; + nativeBuildInputs = [ pkgconfig ]; + + SODIUM_USE_PKG_CONFIG = "yes"; + + installPhase = '' + runHook preInstall + + install -D target/release/tox-node $out/bin/tox-node + + runHook postInstall + ''; + + doCheck = false; + + cargoSha256 = "18w1ycvj2q4q8lj81wn5lfljh5wa7b230ahqdz30w20pv1cazsv2"; + + meta = with stdenv.lib; { + description = "A server application to run tox node written in pure Rust"; + homepage = https://github.com/tox-rs/tox-node; + license = [ licenses.mit ]; + platforms = platforms.linux; + maintainers = with maintainers; [ suhr ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 834418a364d..ed0b6df70c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5967,6 +5967,8 @@ in torsocks = callPackage ../tools/security/tor/torsocks.nix { }; + tox-node = callPackage ../tools/networking/tox-node { }; + toxvpn = callPackage ../tools/networking/toxvpn { }; toybox = callPackage ../tools/misc/toybox { };