Merge pull request #144455 from Twingate/master

This commit is contained in:
Wael Nasreddine 2022-12-06 09:33:20 -08:00 committed by GitHub
commit 69dff6a36c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 98 additions and 0 deletions

View file

@ -14127,6 +14127,12 @@
githubId = 8794235;
name = "Tom Siewert";
};
tonyshkurenko = {
email = "support@twingate.com";
github = "tonyshkurenko";
githubId = 8597964;
name = "Anton Shkurenko";
};
toonn = {
email = "nixpkgs@toonn.io";
matrix = "@toonn:matrix.org";

View file

@ -561,6 +561,14 @@
<link xlink:href="options.html#opt-services.prometheus.exporters.smartctl.enable">services.prometheus.exporters.smartctl</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://docs.twingate.com/docs/linux">twingate</link>,
a high performance, easy to use zero trust solution that
enables access to private resources from any device with
better security than a VPN.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-21.11-incompatibilities">

View file

@ -164,6 +164,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [smartctl_exporter](https://github.com/prometheus-community/smartctl_exporter), a Prometheus exporter for [S.M.A.R.T.](https://en.wikipedia.org/wiki/S.M.A.R.T.) data. Available as [services.prometheus.exporters.smartctl](options.html#opt-services.prometheus.exporters.smartctl.enable).
- [twingate](https://docs.twingate.com/docs/linux), a high performance, easy to use zero trust solution that enables access to private resources from any device with better security than a VPN.
## Backward Incompatibilities {#sec-release-21.11-incompatibilities}
- The NixOS VM test framework, `pkgs.nixosTest`/`make-test-python.nix` (`pkgs.testers.nixosTest` since 22.05), now requires detaching commands such as `succeed("foo &")` and `succeed("foo | xclip -i")` to close stdout.

View file

@ -988,6 +988,7 @@
./services/networking/tox-node.nix
./services/networking/toxvpn.nix
./services/networking/tvheadend.nix
./services/networking/twingate.nix
./services/networking/ucarp.nix
./services/networking/unbound.nix
./services/networking/unifi.nix

View file

@ -0,0 +1,28 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.twingate;
in {
options.services.twingate = {
enable = mkEnableOption (lib.mdDoc "Twingate Client daemon");
};
config = mkIf cfg.enable {
networking.firewall.checkReversePath = lib.mkDefault false;
networking.networkmanager.enable = true;
environment.systemPackages = [ pkgs.twingate ]; # for the CLI
systemd.packages = [ pkgs.twingate ];
systemd.services.twingate.preStart = ''
cp -r -n ${pkgs.twingate}/etc/twingate/. /etc/twingate/
'';
systemd.services.twingate.wantedBy = [ "multi-user.target" ];
};
}

View file

@ -0,0 +1,51 @@
{ autoPatchelfHook
, curl
, dpkg
, dbus
, fetchurl
, lib
, libnl
, udev
, cryptsetup
, stdenv
}:
stdenv.mkDerivation rec {
pname = "twingate";
version = "1.0.60";
src = fetchurl {
url = "https://binaries.twingate.com/client/linux/DEB/${version}/twingate-amd64.deb";
sha256 = "b308c422af8a33ecd58e21a10a72c353351a189df67006e38d1ec029a93d5678";
};
buildInputs = [ dbus curl libnl udev cryptsetup ];
nativeBuildInputs = [ dpkg autoPatchelfHook ];
unpackCmd = "mkdir root ; dpkg-deb -x $curSrc root";
postPatch = ''
while read file; do
substituteInPlace "$file" \
--replace "/usr/bin" "$out/bin" \
--replace "/usr/sbin" "$out/bin"
done < <(find etc usr/lib usr/share -type f)
'';
installPhase = ''
mkdir $out
mv etc $out/
mv usr/bin $out/bin
mv usr/sbin/* $out/bin
mv usr/lib $out/lib
mv usr/share $out/share
'';
meta = with lib; {
description = "Twingate Client";
homepage = "https://twingate.com";
license = licenses.unfree;
maintainers = with maintainers; [ tonyshkurenko ];
platforms = platforms.linux;
};
}

View file

@ -26052,6 +26052,8 @@ with pkgs;
twa = callPackage ../tools/networking/twa { };
twingate = callPackage ../applications/networking/twingate { };
# Upstream U-Boots:
inherit (callPackage ../misc/uboot {})
buildUBoot