Merge pull request #250648 from mfrw/mfrw/tailscale
tailscale: 1.46.1 -> 1.48.1
This commit is contained in:
commit
ef45c82289
|
@ -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";
|
||||
|
|
|
@ -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");
|
||||
|
|
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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 { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue