From 6a5370f0f1eb6d3942e3c6c75f2546508893e289 Mon Sep 17 00:00:00 2001
From: Twingate Build Bot <build-bot@twingate.com>
Date: Tue, 18 Jul 2023 14:01:22 +0000
Subject: [PATCH 1/2] twingate client: 1.0.60 -> 1.0.83

---
 .../modules/services/networking/twingate.nix  | 30 +++++++++++--------
 .../networking/twingate/default.nix           |  9 ++----
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/services/networking/twingate.nix b/nixos/modules/services/networking/twingate.nix
index 1454a7431cd2..ab6dca2bf1a0 100644
--- a/nixos/modules/services/networking/twingate.nix
+++ b/nixos/modules/services/networking/twingate.nix
@@ -1,24 +1,28 @@
 { config, lib, pkgs, ... }:
 
+with lib;
+
 let
   cfg = config.services.twingate;
-in
-{
+
+in {
+
   options.services.twingate = {
-    enable = lib.mkEnableOption (lib.mdDoc "Twingate Client daemon");
-    package = lib.mkPackageOptionMD pkgs "twingate" { };
+    enable = mkEnableOption (lib.mdDoc "Twingate Client daemon");
   };
 
-  config = lib.mkIf cfg.enable {
-    systemd.packages = [ cfg.package ];
-    systemd.services.twingate = {
-      preStart = "cp -r -n ${cfg.package}/etc/twingate/. /etc/twingate/";
-      wantedBy = [ "multi-user.target" ];
-    };
+  config = mkIf cfg.enable {
 
-    networking.firewall.checkReversePath = lib.mkDefault "loose";
-    services.resolved.enable = !(config.networking.networkmanager.enable);
+    networking.firewall.checkReversePath = lib.mkDefault false;
+    services.resolved.enable = true;
 
-    environment.systemPackages = [ cfg.package ]; # For the CLI.
+    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" ];
   };
 }
diff --git a/pkgs/applications/networking/twingate/default.nix b/pkgs/applications/networking/twingate/default.nix
index e555ddacffd8..e14d56956446 100644
--- a/pkgs/applications/networking/twingate/default.nix
+++ b/pkgs/applications/networking/twingate/default.nix
@@ -8,16 +8,15 @@
 , udev
 , cryptsetup
 , stdenv
-, nixosTests
 }:
 
 stdenv.mkDerivation rec {
   pname = "twingate";
-  version = "1.0.60";
+  version = "1.0.83+88994";
 
   src = fetchurl {
-    url = "https://binaries.twingate.com/client/linux/DEB/${version}/twingate-amd64.deb";
-    sha256 = "b308c422af8a33ecd58e21a10a72c353351a189df67006e38d1ec029a93d5678";
+    url = "https://binaries.twingate.com/client/linux/DEB/x86_64/${version}/twingate-amd64.deb";
+    sha256 = "acf623192ae348d49d8cc6513f419dedaf65442f88d3aa0ebd964450427ab399";
   };
 
   buildInputs = [ dbus curl libnl udev cryptsetup ];
@@ -42,8 +41,6 @@ stdenv.mkDerivation rec {
     mv usr/share $out/share
   '';
 
-  passthru.tests = { inherit (nixosTests) twingate; };
-
   meta = with lib; {
     description = "Twingate Client";
     homepage = "https://twingate.com";

From 946d940eba74304ebef6ee880f868b83ef3abba9 Mon Sep 17 00:00:00 2001
From: anton <anton@twingate.com>
Date: Fri, 21 Jul 2023 18:12:38 +0300
Subject: [PATCH 2/2] twingate: PR comments' fixes

---
 .../modules/services/networking/twingate.nix  | 30 ++++++++-----------
 .../networking/twingate/default.nix           |  7 +++--
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/services/networking/twingate.nix b/nixos/modules/services/networking/twingate.nix
index ab6dca2bf1a0..1454a7431cd2 100644
--- a/nixos/modules/services/networking/twingate.nix
+++ b/nixos/modules/services/networking/twingate.nix
@@ -1,28 +1,24 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
   cfg = config.services.twingate;
-
-in {
-
+in
+{
   options.services.twingate = {
-    enable = mkEnableOption (lib.mdDoc "Twingate Client daemon");
+    enable = lib.mkEnableOption (lib.mdDoc "Twingate Client daemon");
+    package = lib.mkPackageOptionMD pkgs "twingate" { };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
+    systemd.packages = [ cfg.package ];
+    systemd.services.twingate = {
+      preStart = "cp -r -n ${cfg.package}/etc/twingate/. /etc/twingate/";
+      wantedBy = [ "multi-user.target" ];
+    };
 
-    networking.firewall.checkReversePath = lib.mkDefault false;
-    services.resolved.enable = true;
+    networking.firewall.checkReversePath = lib.mkDefault "loose";
+    services.resolved.enable = !(config.networking.networkmanager.enable);
 
-    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" ];
+    environment.systemPackages = [ cfg.package ]; # For the CLI.
   };
 }
diff --git a/pkgs/applications/networking/twingate/default.nix b/pkgs/applications/networking/twingate/default.nix
index e14d56956446..51ca69496292 100644
--- a/pkgs/applications/networking/twingate/default.nix
+++ b/pkgs/applications/networking/twingate/default.nix
@@ -8,6 +8,7 @@
 , udev
 , cryptsetup
 , stdenv
+, nixosTests
 }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +17,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://binaries.twingate.com/client/linux/DEB/x86_64/${version}/twingate-amd64.deb";
-    sha256 = "acf623192ae348d49d8cc6513f419dedaf65442f88d3aa0ebd964450427ab399";
+    hash = "sha256-rPYjGSrjSNSdjMZRP0Gd7a9lRC+I06oOvZZEUEJ6s5k=";
   };
 
   buildInputs = [ dbus curl libnl udev cryptsetup ];
@@ -41,11 +42,13 @@ stdenv.mkDerivation rec {
     mv usr/share $out/share
   '';
 
+  passthru.tests = { inherit (nixosTests) twingate; };
+
   meta = with lib; {
     description = "Twingate Client";
     homepage = "https://twingate.com";
     license = licenses.unfree;
     maintainers = with maintainers; [ tonyshkurenko ];
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ];
   };
 }