Unverified Commit ef45c822 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #250648 from mfrw/mfrw/tailscale 

tailscale: 1.46.1 -> 1.48.1
parents 076493f2 4cb26e2c

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -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";

nixos/modules/services/networking/tailscale.nix

+1 −1
Original line number Diff line number Diff line
@@ -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");

pkgs/servers/tailscale/default.nix

+4 −4
Original line number Diff line number Diff line 
{ 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 ];

  };

}

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -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 { };