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

Merge pull request #289228 from mfrw/mfrw/tailscale-1.60.0 

tailscale: 1.58.2 -> 1.60.0
parents 7dc3bd99 0adbce5f

pkgs/servers/tailscale/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
}:



let

  version = "1.58.2";

  version = "1.60.0";

in

buildGoModule {

  pname = "tailscale";
@@ -22,9 +22,9 @@ buildGoModule { 
    owner = "tailscale";

    repo = "tailscale";

    rev = "v${version}";

    hash = "sha256-FiFFfUtse0CKR4XJ82HEjpZNxCaa4FnwSJfEzJ5kZgk=";

    hash = "sha256-qx6ukgaEsdsq76E+GQkYH/Ydv3VKO9jLTh1zm0pGeWw=";

  };

  vendorHash = "sha256-BK1zugKGtx2RpWHDvFZaFqz/YdoewsG8SscGt25uwtQ=";

  vendorHash = "sha256-eci4f6golU1eIQOezplA+I+gmOfof40ktIdpr0v/uMc=";



  nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -27224,7 +27224,9 @@ with pkgs; 














  systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { };



























  tailscale = callPackage ../servers/tailscale { };













  tailscale = callPackage ../servers/tailscale {













    buildGoModule = buildGo122Module;













  };





























  tailscale-systray = callPackage ../applications/misc/tailscale-systray { };