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"; 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..5b1253cd8c8a 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps, shadow, getent }: let - version = "1.46.1"; + version = "1.48.1"; in buildGoModule { pname = "tailscale"; @@ -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 ]; @@ -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 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f52106e87296..04b37e0ed205 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27404,7 +27404,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 { };