JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 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
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; githubId = 3300322;
name = "Mitchell Fossen"; name = "Mitchell Fossen";
}; };
mfrw = {
email = "falakreyaz@gmail.com";
github = "mfrw";
githubId = 4929861;
name = "Muhammad Falak R Wani";
};
mgdelacroix = { mgdelacroix = {
email = "mgdelacroix@gmail.com"; email = "mgdelacroix@gmail.com";
github = "mgdelacroix"; github = "mgdelacroix";

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

@ -6,7 +6,7 @@ let
cfg = config.services.tailscale; cfg = config.services.tailscale;
isNetworkd = config.networking.useNetworkd; isNetworkd = config.networking.useNetworkd;
in { in {
meta.maintainers = with maintainers; [ danderson mbaillie twitchyliquid64 ]; meta.maintainers = with maintainers; [ danderson mbaillie twitchyliquid64 mfrw ];
options.services.tailscale = { options.services.tailscale = {
enable = mkEnableOption (lib.mdDoc "Tailscale client daemon"); 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 }: { lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps, shadow, getent }:
let let
version = "1.46.1"; version = "1.48.1";
in in
buildGoModule { buildGoModule {
pname = "tailscale"; pname = "tailscale";
@ -11,9 +11,9 @@ buildGoModule {
owner = "tailscale"; owner = "tailscale";
repo = "tailscale"; repo = "tailscale";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-aweJys46MMnkSKJoLUFCzc6sWUP+Cv5+IFVVe9iEPGI="; hash = "sha256-jWnke49b6inybPmiZOkxI3C8VoYe4Syi84YhvL8zxeI=";
}; };
vendorHash = "sha256-oELDIt+mRiBGAdoEUkSAs2SM6urkHm1aAtJnev8jDYM="; vendorHash = "sha256-Fr4VZcKrXnT1PZuEG110KBefjcZzRsQRBSvByELKAy4=";
nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];
@ -43,6 +43,6 @@ buildGoModule {
description = "The node agent for Tailscale, a mesh VPN built on WireGuard"; description = "The node agent for Tailscale, a mesh VPN built on WireGuard";
license = licenses.bsd3; license = licenses.bsd3;
mainProgram = "tailscale"; 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 { }; systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { };
tailscale = callPackage ../servers/tailscale { }; tailscale = callPackage ../servers/tailscale {
buildGoModule = buildGo121Module;
};
tailscale-systray = callPackage ../applications/misc/tailscale-systray { }; tailscale-systray = callPackage ../applications/misc/tailscale-systray { };