From be26867f67aafe512fecd6fe4722a2c494851f26 Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Tue, 22 Aug 2023 08:15:17 +0530 Subject: [PATCH 1/4] maintainers: add mfrw Signed-off-by: Muhammad Falak R Wani --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 39fb1ca3b58d..98670fbe7b1b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11007,6 +11007,12 @@ githubId = 3300322; name = "Mitchell Fossen"; }; + mfrw = { + email = "falakreyaz@gmail.com"; + github = "mfrw"; + githubId = 4929861; + name = "Muhammad Falak R Wani"; + }; mgdelacroix = { email = "mgdelacroix@gmail.com"; github = "mgdelacroix"; From 3f141be99c2001ffe3b4fdf1bb5070eb81867088 Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Tue, 22 Aug 2023 08:16:40 +0530 Subject: [PATCH 2/4] tailscale: add mfrw as maintainer Signed-off-by: Muhammad Falak R Wani --- nixos/modules/services/networking/tailscale.nix | 2 +- pkgs/servers/tailscale/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix index f308b7e33114..8b35cc8d6669 100644 --- a/nixos/modules/services/networking/tailscale.nix +++ b/nixos/modules/services/networking/tailscale.nix @@ -6,7 +6,7 @@ let cfg = config.services.tailscale; isNetworkd = config.networking.useNetworkd; in { - meta.maintainers = with maintainers; [ danderson mbaillie twitchyliquid64 ]; + meta.maintainers = with maintainers; [ danderson mbaillie twitchyliquid64 mfrw ]; options.services.tailscale = { enable = mkEnableOption (lib.mdDoc "Tailscale client daemon"); diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 05a6180fa9cd..78548b628fc2 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -43,6 +43,6 @@ buildGoModule { description = "The node agent for Tailscale, a mesh VPN built on WireGuard"; license = licenses.bsd3; mainProgram = "tailscale"; - maintainers = with maintainers; [ danderson mbaillie twitchyliquid64 jk ]; + maintainers = with maintainers; [ danderson mbaillie twitchyliquid64 jk mfrw ]; }; } From 069c21c203272106ffca526d9674e1db3d7531db Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Sun, 20 Aug 2023 12:18:14 +0530 Subject: [PATCH 3/4] tailscale: 1.46.1 -> 1.48.1 Diff: https://github.com/tailscale/tailscale/compare/v1.46.1...v1.48.1 Changelog: https://github.com/tailscale/tailscale/releases/tag/v1.48.1 Signed-off-by: Muhammad Falak R Wani --- pkgs/servers/tailscale/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 78548b628fc2..bfa583da8557 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps, shadow, getent }: +{ lib, stdenv, buildGo121Module, fetchFromGitHub, makeWrapper, iptables, iproute2, procps, shadow, getent }: let - version = "1.46.1"; + version = "1.48.1"; in -buildGoModule { +buildGo121Module { pname = "tailscale"; inherit version; @@ -11,9 +11,9 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-aweJys46MMnkSKJoLUFCzc6sWUP+Cv5+IFVVe9iEPGI="; + hash = "sha256-jWnke49b6inybPmiZOkxI3C8VoYe4Syi84YhvL8zxeI="; }; - vendorHash = "sha256-oELDIt+mRiBGAdoEUkSAs2SM6urkHm1aAtJnev8jDYM="; + vendorHash = "sha256-Fr4VZcKrXnT1PZuEG110KBefjcZzRsQRBSvByELKAy4="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; From 4cb26e2c478443d508c7c66649ab72fc5009643b Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Wed, 23 Aug 2023 06:43:48 +0530 Subject: [PATCH 4/4] tailscale: use buildGo121Module Signed-off-by: Muhammad Falak R Wani --- pkgs/servers/tailscale/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index bfa583da8557..5b1253cd8c8a 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, buildGo121Module, fetchFromGitHub, makeWrapper, iptables, iproute2, procps, shadow, getent }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps, shadow, getent }: let version = "1.48.1"; in -buildGo121Module { +buildGoModule { pname = "tailscale"; inherit version; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 771f9a19eed6..66c36c8cff5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27394,7 +27394,9 @@ with pkgs; systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; - tailscale = callPackage ../servers/tailscale { }; + tailscale = callPackage ../servers/tailscale { + buildGoModule = buildGo121Module; + }; tailscale-systray = callPackage ../applications/misc/tailscale-systray { };