cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #169896 from twitchyliquid64/master

Browse source 
tailscale: 1.22.2 -> 1.24.0
This commit is contained in:
maxine [they] 2022-04-23 11:38:09 +02:00 committed by GitHub
commit 9895dad40a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,20 +2,20 @@
buildGoModule rec { buildGoModule rec {
pname = "tailscale"; pname = "tailscale";
version = "1.22.2"; version = "1.24.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tailscale"; owner = "tailscale";
repo = "tailscale"; repo = "tailscale";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-W4BcUDMxUZKFXueSI/Xlml17Jabi/hnnOyXgitao76A="; sha256 = "12dn2dkk86ni7wqpl7zaxb8n840fnvg8kcjsg1lvf9k432dqhksn";
}; };
nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];
CGO_ENABLED = 0; CGO_ENABLED = 0;
vendorSha256 = "sha256-Bu0a9JI0rlsA4wvvX9Mj4+QH0ot6Jdl+t246HbXu6OA="; vendorSha256 = "01hh8v3mvl7fgv4w4y78jg50b383lgxfy876lkn7wg0sgg336dc8";
doCheck = false; doCheck = false;
@ -35,6 +35,6 @@ buildGoModule rec {
homepage = "https://tailscale.com"; homepage = "https://tailscale.com";
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;
maintainers = with maintainers; [ danderson mbaillie ]; maintainers = with maintainers; [ danderson mbaillie twitchyliquid64 ];
}; };
} }

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

@ -22464,7 +22464,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 = buildGo118Module;
};
thanos = callPackage ../servers/monitoring/thanos { }; thanos = callPackage ../servers/monitoring/thanos { };