From b7704dab0970ae237be8c1454eca2f0cb0c1ff71 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 27 Sep 2019 23:00:00 -0500 Subject: [PATCH 1/2] boringtun: 20190407 -> 0.2.0 --- pkgs/tools/networking/boringtun/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/tools/networking/boringtun/default.nix index 05e9ba1282e..56e0728739c 100644 --- a/pkgs/tools/networking/boringtun/default.nix +++ b/pkgs/tools/networking/boringtun/default.nix @@ -2,25 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "boringtun"; - # "boringtun" is still undergoing review for security concerns. - # The GitHub page does not show any release yet, - # use 20190407 as version number to indicate that it is an unstable version. - version = "20190407"; + version = "0.2.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; - rev = "b040eb4fd1591b1d5ceb07c6cbb0856553f50adc"; - sha256 = "04i53dvxld2a0xzr0gfl895rcwfvisj1rfs7rl0444gml8s8xyb3"; + rev = "v${version}"; + sha256 = "1mijy51hd8c4as9g4ivpfxismc9m5m3nhibfvclh3wrlcmp1ha9c"; }; cargoSha256 = "1gvmshwg9b486933vfgkg2r8nn6w6dyz42hqjy74p785fcg0v5hs"; - # To prevent configuration phase error that is caused by - # lacking a new line in file ".cargo/config", - # we append a new line to the end of file. - preConfigure = "echo '' >> .cargo/config"; - buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; # Testing this project requires sudo, Docker and network access, etc. From 2b5e13d3eaa4faa150804ed42b8e8da946ff73c9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 27 Sep 2019 23:01:00 -0500 Subject: [PATCH 2/2] boringtun: add marsam as maintainer --- pkgs/tools/networking/boringtun/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/tools/networking/boringtun/default.nix index 56e0728739c..dfb13f2168b 100644 --- a/pkgs/tools/networking/boringtun/default.nix +++ b/pkgs/tools/networking/boringtun/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { description = "Userspace WireGuard® implementation in Rust"; homepage = https://github.com/cloudflare/boringtun; license = licenses.bsd3; - maintainers = with maintainers; [ xrelkd ]; + maintainers = with maintainers; [ xrelkd marsam ]; platforms = platforms.linux ++ platforms.darwin; }; }