From c50a10bf20e788f520ab12ee21b01fec1b9ce28f Mon Sep 17 00:00:00 2001 From: Jelle Besseling Date: Thu, 24 Oct 2019 17:10:16 +0200 Subject: [PATCH 1/2] maintainers: add pingiun --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6feb3ddd1aa..750fe82d2fa 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5093,6 +5093,16 @@ githubId = 1179566; name = "Nicolas B. Pierron"; }; + pingiun = { + email = "nixos@pingiun.com"; + github = "pingiun"; + githubId = 1576660; + name = "Jelle Besseling"; + keys = [{ + longkeyid = "rsa4096/0x9712452E8BE3372E"; + fingerprint = "A3A3 65AE 16ED A7A0 C29C 88F1 9712 452E 8BE3 372E"; + }]; + }; piotr = { email = "ppietrasa@gmail.com"; name = "Piotr Pietraszkiewicz"; From a25d98f39937dda6f69ad658275d2cfe87cf5139 Mon Sep 17 00:00:00 2001 From: Jelle Besseling Date: Fri, 1 Nov 2019 12:46:50 +0100 Subject: [PATCH 2/2] eternal-terminal: 5.1.10 -> 6.0.4 --- .../networking/eternal-terminal/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index ffd7d25a0dc..3382616bfb6 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -1,17 +1,23 @@ -{ stdenv, fetchFromGitHub, cmake, ninja, gflags, libsodium, protobuf }: +{ stdenv +, fetchFromGitHub +, cmake +, gflags +, libsodium +, protobuf +}: stdenv.mkDerivation rec { pname = "eternal-terminal"; - version = "5.1.10"; + version = "6.0.4"; src = fetchFromGitHub { owner = "MisterTea"; - repo = "EternalTCP"; - rev = "refs/tags/et-v${version}"; - sha256 = "0jh89229bd9s82h3aj6faaybwr5xvnk8w2kgz47gq263pz021zpl"; + repo = "EternalTerminal"; + rev = "et-v${version}"; + sha256 = "05hbcbbxpvwm17ascnrwrz413kp3i94kp4px3vqx0f635rm41dqc"; }; - nativeBuildInputs = [ cmake ninja ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ gflags libsodium protobuf ]; meta = with stdenv.lib; { @@ -19,6 +25,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; homepage = https://mistertea.github.io/EternalTerminal/; platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.dezgeg ]; + maintainers = with maintainers; [ dezgeg pingiun ]; }; }