From ca03063a0b01694d6f783d6bc2408163f6b924bb Mon Sep 17 00:00:00 2001 From: Poscat Date: Mon, 23 Nov 2020 15:21:34 +0800 Subject: [PATCH 1/2] maintainers: add poscat --- maintainers/maintainer-list.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f2e33938e051..0684b8d596d3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6953,6 +6953,18 @@ githubId = 138074; name = "Pedro Pombeiro"; }; + poscat = { + email = "poscat@mail.poscat.moe"; + github = "poscat0x04"; + githubId = 53291983; + name = "Poscat Tarski"; + keys = [ + { + longkeyid = "rsa4096/2D2595A00D08ACE0"; + fingerprint = "48AD DE10 F27B AFB4 7BB0 CCAF 2D25 95A0 0D08 ACE0"; + } + ]; + }; pradeepchhetri = { email = "pradeep.chhetri89@gmail.com"; github = "pradeepchhetri"; From 7489594a0707e3048d2c3df076beb35532208b52 Mon Sep 17 00:00:00 2001 From: Poscat Date: Mon, 23 Nov 2020 17:50:03 +0800 Subject: [PATCH 2/2] qv2ray: Init at 2.6.3 --- .../networking/qv2ray/default.nix | 66 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 68 insertions(+) create mode 100644 pkgs/applications/networking/qv2ray/default.nix diff --git a/pkgs/applications/networking/qv2ray/default.nix b/pkgs/applications/networking/qv2ray/default.nix new file mode 100644 index 000000000000..f4d41ee79e6d --- /dev/null +++ b/pkgs/applications/networking/qv2ray/default.nix @@ -0,0 +1,66 @@ +{ stdenv +, mkDerivation +, fetchFromGitHub +, qmake +, qttools +, cmake +, clang +, grpc +, protobuf +, openssl +, pkgconfig +, c-ares +, abseil-cpp +, libGL +, zlib +}: + +mkDerivation rec { + pname = "qv2ray"; + version = "2.6.3"; + + src = fetchFromGitHub { + owner = "Qv2ray"; + repo = "Qv2ray"; + rev = "v${version}"; + sha256 = "sha256-zf3IlpRbZGDZMEny0jp7S+kWtcE1Z10U9GzKC0W0mZI="; + fetchSubmodules = true; + }; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DQV2RAY_DISABLE_AUTO_UPDATE=on" + "-DQV2RAY_TRANSLATION_PATH=${placeholder "out"}/share/qv2ray/lang" + ]; + + preConfigure = '' + export _QV2RAY_BUILD_INFO_="Qv2ray Nixpkgs" + export _QV2RAY_BUILD_EXTRA_INFO_="(Nixpkgs build) nixpkgs" + ''; + + buildInputs = [ + libGL + zlib + grpc + protobuf + openssl + abseil-cpp + c-ares + ]; + + nativeBuildInputs = [ + cmake + clang + pkgconfig + qmake + qttools + ]; + + meta = with stdenv.lib; { + description = "An GUI frontend to v2ray"; + homepage = "https://qv2ray.github.io/en/"; + license = licenses.gpl3; + maintainers = with maintainers; [ poscat ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a4e623d213d..c0c78e6370e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15536,6 +15536,8 @@ in quicksynergy = callPackage ../applications/misc/quicksynergy { }; + qv2ray = libsForQt5.callPackage ../applications/networking/qv2ray {}; + qwt = callPackage ../development/libraries/qwt {}; qwt6_qt4 = callPackage ../development/libraries/qwt/6_qt4.nix {