lol

Merge pull request #205417 from kurnevsky/tox-node-0.2.0

tox-node: 0.1.1 -> 0.2.0

authored by

Bobby Rong and committed by
GitHub
ce96f009 9390a34d

+12 -27
+1 -1
nixos/modules/services/networking/tox-node.nix
··· 8 8 homeDir = "/var/lib/tox-node"; 9 9 10 10 configFile = let 11 - src = "${pkg.src}/dpkg/config.yml"; 11 + src = "${pkg.src}/tox_node/dpkg/config.yml"; 12 12 confJSON = pkgs.writeText "config.json" ( 13 13 builtins.toJSON { 14 14 log-type = cfg.logType;
+11 -26
pkgs/tools/networking/tox-node/default.nix
··· 1 - { lib, rustPlatform, fetchFromGitHub 2 - , libsodium, openssl 3 - , pkg-config 4 - , fetchpatch 5 - }: 1 + { lib, rustPlatform, fetchFromGitHub, nix-update-script }: 6 2 7 - with rustPlatform; 8 - 9 - buildRustPackage rec { 3 + rustPlatform.buildRustPackage rec { 10 4 pname = "tox-node"; 11 - version = "0.1.1"; 5 + version = "0.2.0"; 12 6 13 7 src = fetchFromGitHub { 14 8 owner = "tox-rs"; 15 - repo = "tox-node"; 9 + repo = "tox"; 16 10 rev = "v${version}"; 17 - sha256 = "sha256-tB6v2NEBdTNHf89USdQOr/pV0mbxxb8ftOYPPJMvz5Y="; 11 + sha256 = "sha256-3ZRpri3WxwHjMq88TxRJAaTXMui8N1uLek+q8g5PGD4="; 18 12 }; 19 13 20 - cargoPatches = [ 21 - # update cargo lock 22 - (fetchpatch { 23 - url = "https://github.com/tox-rs/tox-node/commit/63712d49d84e55df7bba9710e129780bbc636de3.patch"; 24 - sha256 = "sha256-jI6b5IHsAuGuM+7sPCdFnOOuV6K9rBmc5QqU5x72Fl0="; 25 - }) 26 - ]; 14 + buildAndTestSubdir = "tox_node"; 27 15 28 - buildInputs = [ libsodium openssl ]; 29 - nativeBuildInputs = [ pkg-config ]; 30 - 31 - SODIUM_USE_PKG_CONFIG = "yes"; 16 + cargoSha256 = "sha256-L5IvYA32W8cTnuWjeljge5X+LZ912ugtcvEKXLqYZ+k="; 32 17 33 - doCheck = false; 34 - 35 - cargoSha256 = "sha256-yHsYjKJJNjepvcNszj4XQ0DbOY3AEJMZOnz0cAiwO1A="; 18 + passthru.updateScript = nix-update-script { 19 + attrPath = pname; 20 + }; 36 21 37 22 meta = with lib; { 38 23 description = "A server application to run tox node written in pure Rust"; 39 - homepage = "https://github.com/tox-rs/tox-node"; 24 + homepage = "https://github.com/tox-rs/tox"; 40 25 license = [ licenses.gpl3Plus ]; 41 26 platforms = platforms.linux; 42 27 maintainers = with maintainers; [ suhr kurnevsky ];