From d2e6750cffaf920940f12045128bcd05b917f38c Mon Sep 17 00:00:00 2001 From: Jack Baldry Date: Mon, 24 Aug 2020 10:07:36 +0100 Subject: [PATCH 1/2] maintainers: add jdbaldry Signed-off-by: Jack Baldry --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4154b2721179..5180115c030d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3466,6 +3466,12 @@ }]; name = "Jiri Daněk"; }; + jdbaldry = { + email = "jack.baldry@grafana.com"; + github = "jdbaldry"; + githubId = 4599384; + name = "Jack Baldry"; + }; jdehaas = { email = "qqlq@nullptr.club"; github = "jeroendehaas"; From 62b812fbc0864bf03e3fba267eff32f2794cb67a Mon Sep 17 00:00:00 2001 From: Jack Baldry Date: Mon, 24 Aug 2020 10:10:02 +0100 Subject: [PATCH 2/2] vpn-slice: init at 0.14 Python tool for convenient configuration of a split tunnel VPN Signed-off-by: Jack Baldry --- pkgs/tools/networking/vpn-slice/default.nix | 25 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/networking/vpn-slice/default.nix diff --git a/pkgs/tools/networking/vpn-slice/default.nix b/pkgs/tools/networking/vpn-slice/default.nix new file mode 100644 index 000000000000..9511c214c08c --- /dev/null +++ b/pkgs/tools/networking/vpn-slice/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonApplication, python3Packages, fetchFromGitHub }: + +buildPythonApplication rec { + pname = "vpn-slice"; + version = "0.14"; + + src = fetchFromGitHub { + owner = "dlenski"; + repo = pname; + rev = "v${version}"; + sha256 = "1z2mdl3arzl95zrj4ir57f762gcimmmq5nk91j679cshxz4snxyr"; + }; + + propagatedBuildInputs = with python3Packages; [ setproctitle dnspython ]; + + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/dlenski/vpn-slice"; + description = + "vpnc-script replacement for easy and secure split-tunnel VPN setup"; + license = licenses.gpl3; + maintainers = with maintainers; [ jdbaldry ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a643a0f8fa86..5c4066912c93 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7293,6 +7293,8 @@ in vpnc = callPackage ../tools/networking/vpnc { }; + vpn-slice = python3Packages.callPackage ../tools/networking/vpn-slice { }; + vp = callPackage ../applications/misc/vp { # Enable next line for console graphics. Note that # it requires `sixel` enabled terminals such as mlterm