b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #250648 from mfrw/mfrw/tailscale

Browse source 
tailscale: 1.46.1 -> 1.48.1
This commit is contained in:
Pol Dellaiera 2023-08-24 00:22:26 +02:00 committed by GitHub
parent 076493f2e2 4cb26e2c47
commit ef45c82289
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View file

@ -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";

2
nixos/modules/services/networking/tailscale.nix
View file

@ -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");

8
pkgs/servers/tailscale/default.nix
View file

@ -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 ];
};
}

4
pkgs/top-level/all-packages.nix
View file

@ -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 { };