nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-21 16:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

tailscale: 1.24.2 -> 1.32.3

Browse Source
This commit is contained in:
Michael Hoang
2022-11-26 10:40:32 +11:00
parent 695b351525
commit 84d6c9ff70
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/servers/tailscale/default.nix
View File

@@ -1,16 +1,16 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps }:
{ lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps, shadow, getent }:
buildGoModule rec {
pname = "tailscale";
version = "1.24.2";
version = "1.32.3";
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
sha256 = "sha256-PBYxbi7KqwZedP1m3W3gbhFR+9UhvTAftGi6eTv05ro=";
sha256 = "sha256-mM9+qumB7pbP1LIN3ZJRNYHywwASKL4jmsmz5jQGRtg=";
};
vendorSha256 = "sha256-WjAd7EV/9IbrJMGGVbmSkfEUxqmwWEPkB0Yp3rrjCRU=";
vendorSha256 = "sha256-VW6FvbgLcokVGunTCHUXKuH5+O6T55hGIP2g5kFfBsE=";
nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];
@@ -23,7 +23,7 @@ buildGoModule rec {
doCheck = false;
postInstall = lib.optionalString stdenv.isLinux ''
wrapProgram $out/bin/tailscaled --prefix PATH : ${lib.makeBinPath [ iproute2 iptables ]}
wrapProgram $out/bin/tailscaled --prefix PATH : ${lib.makeBinPath [ iproute2 iptables getent shadow ]}
wrapProgram $out/bin/tailscale --suffix PATH : ${lib.makeBinPath [ procps ]}
sed -i -e "s#/usr/sbin#$out/bin#" -e "/^EnvironmentFile/d" ./cmd/tailscaled/tailscaled.service

2
pkgs/top-level/all-packages.nix
View File

@@ -22747,7 +22747,7 @@ with pkgs;
systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { };
tailscale = callPackage ../servers/tailscale {
buildGoModule = buildGo118Module;
buildGoModule = buildGo119Module;
};
thanos = callPackage ../servers/monitoring/thanos { };