lol

Merge pull request #250648 from mfrw/mfrw/tailscale

tailscale: 1.46.1 -> 1.48.1

authored by

Pol Dellaiera and committed by
GitHub
ef45c822 076493f2

+14 -6
+6
maintainers/maintainer-list.nix
··· 11007 11007 githubId = 3300322; 11008 11008 name = "Mitchell Fossen"; 11009 11009 }; 11010 + mfrw = { 11011 + email = "falakreyaz@gmail.com"; 11012 + github = "mfrw"; 11013 + githubId = 4929861; 11014 + name = "Muhammad Falak R Wani"; 11015 + }; 11010 11016 mgdelacroix = { 11011 11017 email = "mgdelacroix@gmail.com"; 11012 11018 github = "mgdelacroix";
+1 -1
nixos/modules/services/networking/tailscale.nix
··· 6 6 cfg = config.services.tailscale; 7 7 isNetworkd = config.networking.useNetworkd; 8 8 in { 9 - meta.maintainers = with maintainers; [ danderson mbaillie twitchyliquid64 ]; 9 + meta.maintainers = with maintainers; [ danderson mbaillie twitchyliquid64 mfrw ]; 10 10 11 11 options.services.tailscale = { 12 12 enable = mkEnableOption (lib.mdDoc "Tailscale client daemon");
+4 -4
pkgs/servers/tailscale/default.nix
··· 1 1 { lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps, shadow, getent }: 2 2 3 3 let 4 - version = "1.46.1"; 4 + version = "1.48.1"; 5 5 in 6 6 buildGoModule { 7 7 pname = "tailscale"; ··· 11 11 owner = "tailscale"; 12 12 repo = "tailscale"; 13 13 rev = "v${version}"; 14 - hash = "sha256-aweJys46MMnkSKJoLUFCzc6sWUP+Cv5+IFVVe9iEPGI="; 14 + hash = "sha256-jWnke49b6inybPmiZOkxI3C8VoYe4Syi84YhvL8zxeI="; 15 15 }; 16 - vendorHash = "sha256-oELDIt+mRiBGAdoEUkSAs2SM6urkHm1aAtJnev8jDYM="; 16 + vendorHash = "sha256-Fr4VZcKrXnT1PZuEG110KBefjcZzRsQRBSvByELKAy4="; 17 17 18 18 nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; 19 19 ··· 43 43 description = "The node agent for Tailscale, a mesh VPN built on WireGuard"; 44 44 license = licenses.bsd3; 45 45 mainProgram = "tailscale"; 46 - maintainers = with maintainers; [ danderson mbaillie twitchyliquid64 jk ]; 46 + maintainers = with maintainers; [ danderson mbaillie twitchyliquid64 jk mfrw ]; 47 47 }; 48 48 }
+3 -1
pkgs/top-level/all-packages.nix
··· 27404 27404 27405 27405 systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; 27406 27406 27407 - tailscale = callPackage ../servers/tailscale { }; 27407 + tailscale = callPackage ../servers/tailscale { 27408 + buildGoModule = buildGo121Module; 27409 + }; 27408 27410 27409 27411 tailscale-systray = callPackage ../applications/misc/tailscale-systray { }; 27410 27412